@krapht/ork 1.0.0-alpha.17 → 1.0.0-alpha.19

package/dist/{src-DmmrX2_C.mjs → src-DP02RP9O.mjs}

@@ -1,5 +1,5 @@
-import { $r as beforeOf, At as endedWith, Bn as countedTokens, Dt as runScope, Et as heldTimeout, It as lowerChild, Jn as END_DETAIL_LIMIT, Kn as endOf, Mt as stoppedEnd, Nt as declaredProblem, Ot as calledWorkflows, Pt as slotClock, R as storePath, Rt as startAt, Ti as AGENT_DRIVERS, Xn as endFor, Y as sessionRefusals, _i as INTEGRATIONS, _t as planNodeSession, an as sessionDriver, cn as MCP_FILE, di as isClaudeNode, dr as parseTemplate, ei as programsRunBy, fi as isToolNode, fr as renderTemplate, gi as timeoutMs, ii as markValue, jt as failedWith, ln as mcpNotText, mt as planReason, nn as envReadsOf, qn as outcomeEnd, sn as declaredOutputOf, un as serversIn, ur as evaluate, vi as TOOL_PREFIX, yi as integrationFor, yt as reportSchemaFor } from "./src-DLsFsmOD.mjs";
-import { t as runOnce } from "./run-BfxdsQJk.mjs";
+import { At as runScope, Di as TOOL_PREFIX, Ei as INTEGRATIONS, Ft as stoppedEnd, It as declaredProblem, Lt as slotClock, Nt as endedWith, Oi as integrationFor, Pi as AGENT_DRIVERS, Pt as failedWith, Q as sessionRefusals, St as reportSchemaFor, Ti as timeoutMs, Un as countedTokens, Vt as startAt, Wr as placeFor, _t as planReason, an as envReadsOf, bi as isClaudeNode, br as parseTemplate, bt as planNodeSession, ci as beforeOf, cn as sessionDriver, di as parseWorkflow, dn as MCP_FILE, er as endOf, fn as mcpNotText, ir as endFor, jt as calledWorkflows, kt as heldTimeout, li as programsRunBy, nr as END_DETAIL_LIMIT, pi as markValue, pn as serversIn, tr as outcomeEnd, un as declaredOutputOf, xi as isToolNode, xr as renderTemplate, yr as evaluate, z as storePath, zt as lowerChild } from "./src-Ciy7i3se.mjs";
+import { t as runOnce } from "./run-D6yU2rLf.mjs";
 import { n as holdGuard, r as orphanGuard, t as KILL_AFTER_MS } from "./orphan-guard-BFKg8VSd.mjs";
 import path from "node:path";
 import { accessSync, constants, lstatSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
@@ -8,6 +8,169 @@ import { Readable } from "node:stream";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+// ../core/src/project/environ.ts
+/** A variable of the user's. */
+const readEnv = (environ, name) => Object.hasOwn(environ, name) ? environ[name] : void 0;
+// ../core/src/store/scrub.ts
+/**
+* @file Masking the values of the user's secret variables in text Ork stores:
+*   what a tool node's program prints, and a run's own messages. A plain
+*   search, so a value of any size or shape takes time in step with the text:
+*   it looks in the text as it is, and with JSON's escapes decoded once and
+*   twice, so that it does not matter which characters an encoder chose to
+*   escape. It masks the value, and the pieces programs print on their own:
+*   each line, and each value of a JSON document. Other encodings, such as
+*   base64, are out of its reach (L81).
+*/
+/** Shorter values than this would mask ordinary text: `1`, `true`, a word. */
+const MIN_SECRET_LENGTH = 8;
+const SHORT_ESCAPES = {
+	"\"": "\"",
+	"\\": "\\",
+	"/": "/",
+	b: "\b",
+	f: "\f",
+	n: "\n",
+	r: "\r",
+	t: "	"
+};
+/** The unit an escape at `at` stands for, and how long it is written. */
+const escapeAt = (text, at) => {
+	const next = text.charAt(at + 1);
+	const short = SHORT_ESCAPES[next];
+	if (short !== void 0) return {
+		unit: short,
+		width: 2
+	};
+	if (next !== "u") return null;
+	const hex = text.slice(at + 2, at + 6);
+	return /^[\da-f]{4}$/iu.test(hex) ? {
+		unit: String.fromCodePoint(Number(`0x${hex}`)),
+		width: 6
+	} : null;
+};
+/** The last mark at or before `index`, by a binary search. */
+const lastMark = (marks, index) => {
+	let low = 0;
+	let high = marks.length - 1;
+	while (low < high) {
+		const middle = Math.ceil((low + high) / 2);
+		if ((marks[middle] ?? 0) <= index) low = middle;
+		else high = middle - 1;
+	}
+	return low;
+};
+/** The view with its escapes decoded; `null` when it has none. */
+const decoded = (view) => {
+	const { text } = view;
+	const parts = [];
+	const decodedAt = [0];
+	const sourceAt = [0];
+	let from = 0;
+	let length = 0;
+	let at = text.indexOf("\\");
+	while (at !== -1) {
+		const escape = escapeAt(text, at);
+		if (escape === null) at = text.indexOf("\\", at + 1);
+		else {
+			parts.push(text.slice(from, at), escape.unit);
+			length += at - from;
+			decodedAt.push(length);
+			sourceAt.push(at);
+			length += 1;
+			from = at + escape.width;
+			decodedAt.push(length);
+			sourceAt.push(from);
+			at = text.indexOf("\\", from);
+		}
+	}
+	if (from === 0) return null;
+	parts.push(text.slice(from));
+	return {
+		text: parts.join(""),
+		toSource: (index) => {
+			const mark = lastMark(decodedAt, index);
+			return view.toSource((sourceAt[mark] ?? 0) + (index - (decodedAt[mark] ?? 0)));
+		}
+	};
+};
+/** The text as it is, then decoded as far as JSON inside JSON goes. */
+const viewsOf = (text) => {
+	const raw = {
+		text,
+		toSource: (index) => index
+	};
+	const once = decoded(raw);
+	const twice = once === null ? null : decoded(once);
+	return [
+		raw,
+		...once === null ? [] : [once],
+		...twice === null ? [] : [twice]
+	];
+};
+/** Where each secret is in the text, overlapping ones joined. */
+const rangesOf = (text, secrets) => {
+	const found = [];
+	for (const view of viewsOf(text)) for (const secret of secrets) {
+		let at = view.text.indexOf(secret);
+		while (at !== -1) {
+			found.push([view.toSource(at), view.toSource(at + secret.length)]);
+			at = view.text.indexOf(secret, at + secret.length);
+		}
+	}
+	const joined = [];
+	for (const [start, end] of found.toSorted((a, b) => a[0] - b[0])) {
+		const last = joined.at(-1);
+		if (last !== void 0 && start < last[1]) last[1] = Math.max(last[1], end);
+		else joined.push([start, end]);
+	}
+	return joined;
+};
+/** The strings and numbers inside a parsed JSON document. */
+const leavesOf = (value) => {
+	if (typeof value === "string") return [value];
+	if (typeof value === "number") return [String(value)];
+	if (typeof value === "object" && value !== null) return Object.values(value).flatMap((item) => leavesOf(item));
+	return [];
+};
+/** A value's leaves, when it is a JSON object or array. */
+const jsonLeavesOf = (value) => {
+	if (!/^\s*[[{]/u.test(value)) return [];
+	try {
+		return leavesOf(JSON.parse(value));
+	} catch {
+		return [];
+	}
+};
+/** A value, and the pieces of it a program may well print on their own. */
+const formsOf = (value) => [
+	value,
+	value.trim(),
+	...value.split(/\r?\n|\r/u).map((line) => line.trim()),
+	...jsonLeavesOf(value)
+];
+/** Replaces the values, in any form JSON writes them, with `[masked]`. */
+const scrubberOf = (values) => {
+	const secrets = [...new Set(values.flatMap((value) => formsOf(value)))].filter((secret) => secret.trim().length >= MIN_SECRET_LENGTH);
+	return (text) => {
+		if (secrets.length === 0) return text;
+		const parts = [];
+		let from = 0;
+		for (const [start, end] of rangesOf(text, secrets)) {
+			parts.push(text.slice(from, start), "[masked]");
+			from = end;
+		}
+		parts.push(text.slice(from));
+		return parts.join("");
+	};
+};
+/** The values of the variables named that are set. */
+const envValuesOf = (names, environ) => names.flatMap((name) => {
+	const value = readEnv(environ, name);
+	return value === void 0 ? [] : [value];
+});
+/** What a run masks in a message of its own: the named variables' values. */
+const runScrubber = (names, environ) => scrubberOf(envValuesOf(names, environ));
 // ../nodes/src/call.ts
 /**
 * @file The `workflow.call` node type (RFC-004): renders what the node asks for
@@ -166,9 +329,6 @@ const resultOf = (outcome, declared) => {
 		...ran
 	}, endFor(ok ? "done" : "reported_failure"));
 };
-// ../nodes/src/environ.ts
-/** A variable of the user's. */
-const readEnv = (environ, name) => Object.hasOwn(environ, name) ? environ[name] : void 0;
 // ../nodes/src/mcp-servers.ts
 /**
 * @file Reading an MCP server's definition from the project's `.mcp.json`, the
@@ -1043,6 +1203,37 @@ const runUnlessPassed = async ({ node, context, cwd, shown, environ, execute })
 	context.skipped?.(shown, once.pass);
 	return null;
 };
+// ../nodes/src/tool-dash.ts
+/**
+* @file The leading-`-` guard on a tool node's command: an argument that starts
+*   with a template reading `nodes.*.output` and renders to a leading `-` would
+*   read as an option of the program, so it is refused unless a `--` comes
+*   before it. A literal `-x` and `--flag={{…}}` are not affected. Also how a
+*   tool node renders one argument (or its `cwd`) with that guard.
+*/
+/** The error for a rendered argument that reads as an option, or `undefined`. */
+const leadingDashError = (parts, value) => {
+	const first = parts[0];
+	if (!value.startsWith("-") || typeof first !== "object" || first.expr.kind !== "path" || first.expr.segments[0] !== "nodes" || first.expr.segments[2] !== "output") return;
+	return `argument from nodes.${String(first.expr.segments[1])}.output starts with \`-\`; put \`--\` before it in the command`;
+};
+/** One templated argument, rendered; `guardDash` refuses a leading `-`. */
+const renderArg = (text, context, guardDash = false) => {
+	const template = parseTemplate(text);
+	if (!template.ok) return {
+		ok: false,
+		error: template.message
+	};
+	const value = renderTemplate(template.parts, runScope(context.inputs, context.outputs, context.runId, context.item));
+	const error = guardDash ? leadingDashError(template.parts, value) : void 0;
+	return error === void 0 ? {
+		ok: true,
+		value
+	} : {
+		ok: false,
+		error
+	};
+};
 // ../nodes/src/tool-ends.ts
 /**
 * @file How a tool node ended (specs/runtime/session-ends.md): a node that
@@ -1156,158 +1347,6 @@ const storeGuarded = (env, store) => {
 * that holds.
 */
 const guardOf = (env, store = storePath()) => guardedStoresIn(env) === "all" ? {} : { [GUARDED_STORES_ENV]: JSON.stringify([.../* @__PURE__ */ new Set([...listIn(env) ?? [], realStore(store)])]) };
-// ../nodes/src/tool-scrub.ts
-/**
-* @file Masking a secret in what a program prints. A plain search, so a value
-*   of any size or shape takes time in step with the text: it looks in the text
-*   as it is, and with JSON's escapes decoded once and twice, so that it does
-*   not matter which characters an encoder chose to escape. It masks the value,
-*   and the pieces programs print on their own: each line, and each value of a
-*   JSON document. Other encodings, such as base64, are out of its reach
-*   (L81).
-*/
-/** Shorter values than this would mask ordinary text: `1`, `true`, a word. */
-const MIN_SECRET_LENGTH = 8;
-const SHORT_ESCAPES = {
-	"\"": "\"",
-	"\\": "\\",
-	"/": "/",
-	b: "\b",
-	f: "\f",
-	n: "\n",
-	r: "\r",
-	t: "	"
-};
-/** The unit an escape at `at` stands for, and how long it is written. */
-const escapeAt = (text, at) => {
-	const next = text.charAt(at + 1);
-	const short = SHORT_ESCAPES[next];
-	if (short !== void 0) return {
-		unit: short,
-		width: 2
-	};
-	if (next !== "u") return null;
-	const hex = text.slice(at + 2, at + 6);
-	return /^[\da-f]{4}$/iu.test(hex) ? {
-		unit: String.fromCodePoint(Number(`0x${hex}`)),
-		width: 6
-	} : null;
-};
-/** The last mark at or before `index`, by a binary search. */
-const lastMark = (marks, index) => {
-	let low = 0;
-	let high = marks.length - 1;
-	while (low < high) {
-		const middle = Math.ceil((low + high) / 2);
-		if ((marks[middle] ?? 0) <= index) low = middle;
-		else high = middle - 1;
-	}
-	return low;
-};
-/** The view with its escapes decoded; `null` when it has none. */
-const decoded = (view) => {
-	const { text } = view;
-	const parts = [];
-	const decodedAt = [0];
-	const sourceAt = [0];
-	let from = 0;
-	let length = 0;
-	let at = text.indexOf("\\");
-	while (at !== -1) {
-		const escape = escapeAt(text, at);
-		if (escape === null) at = text.indexOf("\\", at + 1);
-		else {
-			parts.push(text.slice(from, at), escape.unit);
-			length += at - from;
-			decodedAt.push(length);
-			sourceAt.push(at);
-			length += 1;
-			from = at + escape.width;
-			decodedAt.push(length);
-			sourceAt.push(from);
-			at = text.indexOf("\\", from);
-		}
-	}
-	if (from === 0) return null;
-	parts.push(text.slice(from));
-	return {
-		text: parts.join(""),
-		toSource: (index) => {
-			const mark = lastMark(decodedAt, index);
-			return view.toSource((sourceAt[mark] ?? 0) + (index - (decodedAt[mark] ?? 0)));
-		}
-	};
-};
-/** The text as it is, then decoded as far as JSON inside JSON goes. */
-const viewsOf = (text) => {
-	const raw = {
-		text,
-		toSource: (index) => index
-	};
-	const once = decoded(raw);
-	const twice = once === null ? null : decoded(once);
-	return [
-		raw,
-		...once === null ? [] : [once],
-		...twice === null ? [] : [twice]
-	];
-};
-/** Where each secret is in the text, overlapping ones joined. */
-const rangesOf = (text, secrets) => {
-	const found = [];
-	for (const view of viewsOf(text)) for (const secret of secrets) {
-		let at = view.text.indexOf(secret);
-		while (at !== -1) {
-			found.push([view.toSource(at), view.toSource(at + secret.length)]);
-			at = view.text.indexOf(secret, at + secret.length);
-		}
-	}
-	const joined = [];
-	for (const [start, end] of found.toSorted((a, b) => a[0] - b[0])) {
-		const last = joined.at(-1);
-		if (last !== void 0 && start < last[1]) last[1] = Math.max(last[1], end);
-		else joined.push([start, end]);
-	}
-	return joined;
-};
-/** The strings and numbers inside a parsed JSON document. */
-const leavesOf = (value) => {
-	if (typeof value === "string") return [value];
-	if (typeof value === "number") return [String(value)];
-	if (typeof value === "object" && value !== null) return Object.values(value).flatMap((item) => leavesOf(item));
-	return [];
-};
-/** A value's leaves, when it is a JSON object or array. */
-const jsonLeavesOf = (value) => {
-	if (!/^\s*[[{]/u.test(value)) return [];
-	try {
-		return leavesOf(JSON.parse(value));
-	} catch {
-		return [];
-	}
-};
-/** A value, and the pieces of it a program may well print on their own. */
-const formsOf = (value) => [
-	value,
-	value.trim(),
-	...value.split(/\r?\n|\r/u).map((line) => line.trim()),
-	...jsonLeavesOf(value)
-];
-/** Replaces the values, in any form JSON writes them, with `[masked]`. */
-const scrubberOf = (values) => {
-	const secrets = [...new Set(values.flatMap((value) => formsOf(value)))].filter((secret) => secret.trim().length >= MIN_SECRET_LENGTH);
-	return (text) => {
-		if (secrets.length === 0) return text;
-		const parts = [];
-		let from = 0;
-		for (const [start, end] of rangesOf(text, secrets)) {
-			parts.push(text.slice(from, start), "[masked]");
-			from = end;
-		}
-		parts.push(text.slice(from));
-		return parts.join("");
-	};
-};
 // ../nodes/src/tool-env.ts
 /**
 * @file What a tool node's program sees besides what it inherits: who it is
@@ -1386,6 +1425,23 @@ const inheritedNames = (environ) => (environ[MASKED_ENV] ?? "").split(",").filte
 */
 const maskedNamesOfRun = (workflow, own, registered, environ = process.env) => [...new Set([workflow, ...calledWorkflows(workflow, own, registered, { everyCall: true })].flatMap((one) => secretNamesOf(one)).concat(mcpVariablesOf(workflow, own.root), inheritedNames(environ)))];
 /**
+* The env-value scrubber of a recorded run, from its workflow file as it is
+* now, for what is written to it from outside the run (a person's note);
+* `undefined` when the file is gone or no longer parses.
+*/
+const scrubberOfRun = (run, registered, environ = process.env) => {
+	let text;
+	try {
+		text = readFileSync(run.file, "utf8");
+	} catch {
+		return;
+	}
+	const parsed = parseWorkflow(text);
+	if (!parsed.ok) return void 0;
+	const own = placeFor(path.dirname(run.file), registered);
+	return runScrubber(maskedNamesOfRun(parsed.workflow, own, registered, environ), environ);
+};
+/**
 * A program learns the names too, never their values: `ork send` masks with
 * them before it writes to the store, and a run the program starts passes them
 * on.
@@ -1395,18 +1451,12 @@ const namesToMask = (workflow, environ, also = []) => [.../* @__PURE__ */ new Se
 	...also,
 	...inheritedNames(environ)
 ])];
-const valuesOf = (names, environ) => names.flatMap((name) => {
-	const value = readEnv(environ, name);
-	return value === void 0 ? [] : [value];
-});
 /** What a process in a program masks: what its run told it to. */
-const inheritedScrubber = (environ) => scrubberOf(valuesOf(inheritedNames(environ), environ));
-/** What a run masks in a message of its own: the same names' values. */
-const runScrubber = (names, environ) => scrubberOf(valuesOf(names, environ));
+const inheritedScrubber = (environ) => scrubberOf(envValuesOf(inheritedNames(environ), environ));
 /** What a run tells a run it calls: names, never values. */
 const maskedEnv = (names) => names.length === 0 ? {} : { [MASKED_ENV]: names.join(",") };
 /** The values to mask: what the workflow reads, and the names given. */
-const secretsOf = (workflow, environ, also = []) => valuesOf(namesToMask(workflow, environ, also), environ);
+const secretsOf = (workflow, environ, also = []) => envValuesOf(namesToMask(workflow, environ, also), environ);
 /** A node's `env:`, rendered. */
 const renderEnv = (node, context, environ) => {
 	const values = {};
@@ -1490,21 +1540,16 @@ const clearStateFiles = (runDir, warn) => {
 /** How much of stdout and stderr a node's output keeps. */
 const OUTPUT_LIMIT = 65536;
 const ERROR_LIMIT = 1024;
+/** The interpreters whose script's commands a heavy check reads. */
+const SHELLS = /* @__PURE__ */ new Set([
+	"sh",
+	"bash",
+	"zsh"
+]);
 /** Whether `args` starts with one of the allowed prefixes (`"pr merge"`). */
 const isAllowed = (args, allow) => allow === void 0 || allow.some((prefix) => {
 	return prefix.trim().split(/\s+/u).every((word, i) => args[i] === word);
 });
-const render = (text, context) => {
-	const template = parseTemplate(text);
-	if (!template.ok) return {
-		ok: false,
-		error: template.message
-	};
-	return {
-		ok: true,
-		value: renderTemplate(template.parts, runScope(context.inputs, context.outputs, context.runId, context.item))
-	};
-};
 /** The program and arguments a tool node runs, before the allow check. */
 const commandOf = (node, context) => {
 	const line = commandLineOf(node);
@@ -1515,12 +1560,14 @@ const commandOf = (node, context) => {
 	const tokens = tokenize(line);
 	if (!tokens.ok) return tokens;
 	const args = [];
+	let afterSeparator = false;
 	for (const token of tokens.args) {
 		if (node.script !== void 0) {
 			args.push(token);
 			continue;
 		}
-		const rendered = render(token, context);
+		const rendered = renderArg(token, context, !afterSeparator);
+		afterSeparator ||= token === "--";
 		if (!rendered.ok) return rendered;
 		args.push(rendered.value);
 	}
@@ -1570,7 +1617,7 @@ const toolExecutor = (given, options = {}) => async (context) => {
 	if (!isAllowed(checked, allow)) return failed$1(scrub(`${markValue(checked.join(" "))} is not in the node's allow list (${(allow ?? []).map((entry) => markValue(entry)).join(", ")})`));
 	let cwd = context.cwd;
 	if (node.cwd !== void 0) {
-		const rendered = render(node.cwd, context);
+		const rendered = renderArg(node.cwd, context);
 		if (!rendered.ok) return failed$1(rendered.error);
 		cwd = path.resolve(context.cwd, rendered.value);
 	}
@@ -1592,7 +1639,7 @@ const toolExecutor = (given, options = {}) => async (context) => {
 		...node.script === void 0 ? [] : ["<script>"]
 	].join(" "));
 	const execute = async () => {
-		const release = await context.machine?.slot([command.program, ...command.args].join(" "), context.signal);
+		const release = await context.machine?.slot([command.program, ...command.args].join(" "), context.signal, node.script !== void 0 && SHELLS.has(path.basename(command.program)) ? { script: node.script } : {});
 		context.emit({
 			type: "tool.called",
 			id: context.id,
@@ -2515,4 +2562,4 @@ const missingPrograms = (workflow, installed = (program) => onPath(program)) =>
 	}
 	return [...missing.values()];
 };
-export { clearOutputFiles as _, builtinExecutors as a, toolExecutor as c, maskedEnv as d, maskedNamesOfRun as f, storeGuarded as g, runMarkerIn as h, onPath as i, clearStateFiles as l, sessionEnv as m, missingProgramMessage as n, spawnTool as o, runScrubber as p, missingPrograms as r, mcpCallExecutor as s, envProblems as t, inheritedScrubber as u, namedMcpEntries as v, resultOf as y };
+export { clearOutputFiles as _, builtinExecutors as a, runScrubber as b, toolExecutor as c, maskedEnv as d, maskedNamesOfRun as f, storeGuarded as g, runMarkerIn as h, onPath as i, clearStateFiles as l, sessionEnv as m, missingProgramMessage as n, spawnTool as o, scrubberOfRun as p, missingPrograms as r, mcpCallExecutor as s, envProblems as t, inheritedScrubber as u, namedMcpEntries as v, resultOf as y };