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

package/dist/{__build_info__-dPf4cEGL.mjs → __build_info__-D6mXC4cD.mjs}

@@ -1,4 +1,4 @@
-import { E as parseVersion, T as isNewer, w as compareVersions } from "./src-Ciy7i3se.mjs";
+import { E as parseVersion, T as isNewer, w as compareVersions } from "./src-8cOPOgrT.mjs";
 import path from "node:path";
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
@@ -224,5 +224,5 @@ const registryShown = (registry) => {
 *   fails when it is stale.
 */
 const ORK_NAME = "@krapht/ork";
-const ORK_VERSION = "1.0.0-alpha.19";
+const ORK_VERSION = "1.0.0-alpha.20";
 export { registryShown as a, fetchLatest as c, readUpdateCache as d, refreshUpdateCache as f, nodeSession as h, registryOf as i, newerVersion as l, writeUpdateCache as m, ORK_VERSION as n, updateSwitchOff as o, updateCachePath as p, isSwitchedOn as r, checkDue as s, ORK_NAME as t, pendingNotice as u };

package/dist/argument-error-CihH46Le.mjs

@@ -0,0 +1,27 @@
+import { parseArgs } from "citty";
+// src/argument-error.ts
+/**
+* @file The error citty's `runMain` takes for an argument error: the plugins
+*   that refuse a flag (`list/known-flags.ts`) or an extra word
+*   (`extra-arguments.ts`) throw one, so the message is one line and the exit
+*   code is 1, as for a wrong enum value.
+*/
+/**
+* An error citty's `runMain` takes for an argument error (its `CLIError`, which
+* it does not export): a failed parse gives one, and it takes `message`.
+*/
+const argumentError = (message) => {
+	try {
+		parseArgs([], { x: {
+			type: "string",
+			required: true
+		} });
+	} catch (error) {
+		if (error instanceof Error) {
+			error.message = message;
+			return error;
+		}
+	}
+	return new Error(message);
+};
+export { argumentError as t };

package/dist/{attach-BQl8nQz2.mjs → attach-C1OnxyMh.mjs}

@@ -1,9 +1,10 @@
-import "./src-Ciy7i3se.mjs";
-import { t as findRun } from "./find-B30-rd-u.mjs";
+import "./src-8cOPOgrT.mjs";
+import { t as findRun } from "./find-BTikxc54.mjs";
 import { c as write, l as writeErr, s as style } from "./output-B1kwo0YU.mjs";
-import { l as createTerminalHuman, t as attachRun } from "./attach-DhZQ87Nz.mjs";
-import { n as attachRefusal } from "./in-a-run-CZFzoT3R.mjs";
-import { t as withStore } from "./store-2KXzMCEN.mjs";
+import { m as createTerminalHuman, t as attachRun } from "./attach-CEGbRg1D.mjs";
+import { n as attachRefusal } from "./in-a-run-CbnKjO7t.mjs";
+import { t as refuseExtraArguments } from "./extra-arguments-BxQMXARO.mjs";
+import { t as withStore } from "./store-CDpk8Wtz.mjs";
 import { defineCommand } from "citty";
 // src/commands/attach.ts
 /**
@@ -49,6 +50,7 @@ const attach = defineCommand({
 		name: "attach",
 		description: "Follow a run and the runs it called, and answer their questions here; Ctrl-C detaches"
 	},
+	plugins: [refuseExtraArguments],
 	args: { run: {
 		type: "positional",
 		description: "A run id or a prefix of one",

package/dist/{attach-DhZQ87Nz.mjs → attach-CEGbRg1D.mjs}

@@ -1,4 +1,4 @@
-import { Dr as maskReplacer, L as isNodeEvent, Mt as lockWaitLine, Or as maskSecrets, Rt as slotWaitLine, Tr as TOOL_INPUT_KEYS, at as answerDecision, dt as DETACHED_ENV, er as endOf, it as followRunTree, ot as pendingDecisions, pt as followEvents, rr as END_KINDS, tr as outcomeEnd } from "./src-Ciy7i3se.mjs";
+import { Er as TOOL_INPUT_KEYS, L as isNodeEvent, Nt as lockWaitLine, Or as maskReplacer, at as followRunTree, ft as DETACHED_ENV, ir as END_KINDS, kr as maskSecrets, mt as followEvents, nr as outcomeEnd, ot as answerDecision, st as pendingDecisions, tr as endOf, zt as slotWaitLine } from "./src-8cOPOgrT.mjs";
 import { t as applyFilters } from "./apply-Mb0fNpCX.mjs";
 import { t as outputsText } from "./outputs-text-CNTJ7Qq_.mjs";
 import { C as termOf, D as wrap, E as widthOf, O as readKeys, _ as interrupt, a as plain, b as canKey, g as createRegion, h as paint, m as bold, n as cost, p as apply, r as costOf, s as style, u as confirmOrStop, v as readLine, w as cut, x as plainEnv, y as withdrawn } from "./output-B1kwo0YU.mjs";
@@ -16,7 +16,11 @@ const cardLines = (t, q, place, verbose, document) => {
 	const context = q.context === void 0 ? void 0 : clean(q.context);
 	if (!t.rich) return {
 		lines: [
-			...place === void 0 ? [] : [`run ${place.run}${place.path === void 0 ? "" : ` · ${place.path}`} · decision ${place.decision}`],
+			...place === void 0 ? [] : [`${[
+				`run ${place.run}`,
+				place.workflow,
+				place.path
+			].filter((part) => part !== void 0).join(" · ")} · decision ${place.decision}`],
 			...document === void 0 ? [] : [document],
 			`? ${plain(q.nodeId)} asks: ${clean(q.question)}`,
 			...context === void 0 ? [] : [`  ${context.replaceAll("\n", "\n  ")}`]
@@ -28,6 +32,7 @@ const cardLines = (t, q, place, verbose, document) => {
 	const body = cutShort ? shown.slice(0, CONTEXT_LINES) : shown;
 	const where = place === void 0 ? "" : `  ${paint(t, "muted", [
 		`run ${place.run}`,
+		place.workflow,
 		place.path,
 		place.index === void 0 || place.total === void 0 ? void 0 : `${String(place.index)} of ${String(place.total)}`
 	].filter((part) => part !== void 0).join(" · "))}`;
@@ -415,11 +420,15 @@ const previewInput = (toolName, input) => {
 	const line = (key === void 0 ? JSON.stringify(input) : `${key}: ${String(input[key])}`).replaceAll(/\s+/gu, " ").trim();
 	return line.length > PREVIEW ? `${toolName} ${line.slice(0, 159)}…` : `${toolName} ${line}`;
 };
-/** Never answers, until `signal` withdraws it: what a stopped prompt leaves. */
+/** Never answers until `signal` withdraws it, at once if it already has. */
 const parked = (signal) => new Promise((_, reject) => {
+	if (signal?.aborted === true) {
+		reject(withdrawn(signal));
+		return;
+	}
 	signal?.addEventListener("abort", () => {
 		reject(withdrawn(signal));
-	});
+	}, { once: true });
 });
 /**
 * Answers permission prompts and `ask_user` questions on the terminal, one at a
@@ -981,6 +990,8 @@ const logListTable = { fields: [{
 	type: "until",
 	get: (stored) => stored.at
 }] };
+/** Whether an event is one `--since`, `--until` and `--node` let through. */
+const matcher = (options) => (stored) => applyFilters(logListTable, [stored], options.filter ?? {}).length > 0 && (options.node === void 0 || isNodeEvent(stored.event, options.node));
 /**
 * Prints a run's events; with `follow`, then each new one as it is stored:
 * pushed over the run's socket, or polled from the store when there is none.
@@ -989,7 +1000,7 @@ const logListTable = { fields: [{
 */
 const followRun = async (store, run, out, options) => {
 	const print = createLogPrinter(options);
-	const matches = (stored) => applyFilters(logListTable, [stored], options.filter ?? {}).length > 0 && (options.node === void 0 || isNodeEvent(stored.event, options.node));
+	const matches = matcher(options);
 	const replayed = options.limit === void 0 ? [] : store.events(run.id, options.after ?? 0).filter((stored) => matches(stored)).slice(0, -options.limit);
 	const dropped = new Set(replayed.map((stored) => stored.seq));
 	if (await followEvents(store, run.id, (stored) => {
@@ -1004,6 +1015,38 @@ const followRun = async (store, run, out, options) => {
 		...options.signal === void 0 ? {} : { signal: options.signal }
 	}) === "crashed") out(style("red", `run ${run.id} stopped without finishing (its process is gone)`));
 };
+// src/runs/gutter.ts
+/**
+* @file The gutter before a called run's log lines (its call path, then `›`)
+*   and a log printer laid out in the columns the gutter leaves. Shared by `ork
+*   attach` and the commands that print several runs.
+*/
+/** A call path for reading: `plan › build`. */
+const callPathOf = (path) => path.join(" › ");
+/** The gutter before a called run's lines: its call path, then ` › `. */
+const gutterOf = (path) => path.length === 0 ? "" : `${callPathOf(path)} › `;
+/**
+* A run's printer, laid out in the columns its gutter leaves, so a line fits
+* the terminal with the gutter before it and a wrapped line goes on under its
+* own text, not at the terminal's first column.
+*/
+const printerFor = (term, path, options = {}) => createLogPrinter({
+	...options,
+	json: false,
+	view: {
+		term: {
+			...term,
+			width: Math.max(20, term.width - widthOf(gutterOf(path)))
+		},
+		roots: /* @__PURE__ */ new Map()
+	}
+});
+/** Prints `lines` through `out`, each (not blank) behind `path`'s muted gutter. */
+const printUnder = (out, term, path, lines) => {
+	const gutter = gutterOf(path);
+	const prefix = gutter === "" ? "" : paint(term, "muted", gutter);
+	for (const line of lines) out(line === "" ? line : `${prefix}${line}`);
+};
 // src/runs/ask-stored.ts
 /**
 * @file Asks one stored decision on a terminal and stores the answer: the
@@ -1044,68 +1087,39 @@ const askStored = async (store, human, decision, { place, by, signal, home }) =>
 		message: answered.error
 	};
 };
-// src/runs/attach.ts
-/**
-* @file Following a run and every run it called on a terminal, and answering
-*   their open decisions there (`ork attach`, and a foreground `ork run` that
-*   calls workflows; specs/cli.md, specs/scheduler/calls.md). Each run has its
-*   own log printer behind its call path; a decision opened in any of them is
-*   asked through one `TerminalHuman`, withdrawn when it closes elsewhere.
-*/
-const where = (path) => path.join(" › ");
-/** The gutter before a called run's lines: its call path, then ` › `. */
-const gutterOf = (path) => path.length === 0 ? "" : `${where(path)} › `;
-/**
-* Prints the events of `root` and of the runs it called until the root ends or
-* `signal` aborts, and asks each open decision with `options.human`.
-*/
-const attachRun = async (store, root, out, options = {}) => {
-	const { human, basePath = [] } = options;
-	const { term } = options.view ?? createView();
+// src/runs/prompts.ts
+const closedLine = (id, closed) => {
+	if (closed.type === "decision.withdrawn") return `${id} withdrawn`;
+	const by = closed.by === "owner" ? closed.owner ?? ANSWERED_BY.owner : ANSWERED_BY[closed.by];
+	return `${id} answered elsewhere: ${closed.answer} (${by})`;
+};
+/** Creates the prompts a command owns over `store`, asked on `human`. */
+const createPrompts = (store, human, options) => {
+	const { term, out } = options;
 	const say = styler(term);
-	const printers = /* @__PURE__ */ new Map();
 	const prompts = /* @__PURE__ */ new Map();
 	/** Decisions answered here: their `decision.answered` line is the card's. */
 	const mine = /* @__PURE__ */ new Set();
 	const asks = [];
-	const seen = {
-		hinted: false,
-		succeeded: false
-	};
+	const state = {};
 	const show = (path, lines) => {
-		const gutter = gutterOf(path);
-		const prefix = gutter === "" ? "" : paint(term, "muted", gutter);
-		for (const line of lines) out(line === "" ? line : `${prefix}${line}`);
+		printUnder(out, term, path, lines);
 	};
-	/**
-	* A run's printer, laid out in the columns its gutter leaves, so a line fits
-	* the terminal with the gutter before it and a wrapped line goes on under its
-	* own text, not at the terminal's first column.
-	*/
-	const printerFor = (path) => createLogPrinter({
-		json: false,
-		view: {
-			term: {
-				...term,
-				width: Math.max(20, term.width - widthOf(gutterOf(path)))
-			},
-			roots: /* @__PURE__ */ new Map()
-		}
-	});
-	const ask = (run, path, id) => {
+	const ask = ({ run, path = [], workflow }, id) => {
 		const decision = store.decision(id);
-		if (human === void 0 || decision === void 0) return;
+		if (decision === void 0) return;
 		const prompt = { controller: new AbortController() };
 		prompts.set(id, prompt);
 		const settle = async () => {
 			try {
 				const asked = await askStored(store, human, decision, {
-					by: "terminal",
+					by: options.by ?? "terminal",
 					signal: prompt.controller.signal,
 					place: {
 						run,
 						decision: id,
-						...path.length === 0 ? {} : { path: where(path) }
+						...workflow === void 0 ? {} : { workflow },
+						...path.length === 0 ? {} : { path: callPathOf(path) }
 					},
 					...options.home === void 0 ? {} : { home: options.home }
 				});
@@ -1115,33 +1129,77 @@ const attachRun = async (store, root, out, options = {}) => {
 					mine.add(id);
 					if (!term.rich) show(path, [`${say("green", "✓")} ${id}: ${asked.choice}`]);
 				} else if (asked.kind === "refused") show(path, [paint(term, "warn", `! ${asked.message}`)]);
-				else if (asked.kind === "withdrawn" && closed !== void 0) {
-					const by = closed.type === "decision.answered" ? closed.by === "owner" ? closed.owner ?? ANSWERED_BY.owner : ANSWERED_BY[closed.by] : "";
-					show(path, [say("dim", closed.type === "decision.answered" ? `${id} answered elsewhere: ${closed.answer} (${by})` : `${id} withdrawn`)]);
-				}
+				else if (asked.kind === "withdrawn" && closed !== void 0) show(path, [say("dim", closedLine(id, closed))]);
 			} catch (error) {
 				prompts.delete(id);
-				seen.failure ??= { error };
+				state.failure ??= { error };
 			}
 		};
 		asks.push(settle());
 	};
-	const { end, stillRunning } = await followRunTree(store, root, ({ run, path: below, stored }) => {
-		const path = [...basePath, ...below];
-		const { event } = stored;
-		if (event.type === "run.finished" && below.length === 0) seen.succeeded = event.result.status === "succeeded";
-		if (event.type === "decision.answered" || event.type === "decision.withdrawn") {
+	return {
+		ask,
+		has: (id) => prompts.has(id) || mine.has(id),
+		seen: (event) => {
+			if (event.type !== "decision.answered" && event.type !== "decision.withdrawn") return false;
 			const prompt = prompts.get(event.decision);
 			if (prompt !== void 0) {
 				prompt.closed = event;
 				prompt.controller.abort();
-				return;
+				return true;
 			}
-			if (event.type === "decision.answered" && mine.has(event.decision)) return;
+			return event.type === "decision.answered" && mine.has(event.decision);
+		},
+		open: () => prompts.size,
+		abort: () => {
+			for (const prompt of prompts.values()) prompt.controller.abort();
+		},
+		settled: async () => {
+			await Promise.all(asks);
+			if (state.failure !== void 0) throw state.failure.error;
 		}
+	};
+};
+// src/runs/attach.ts
+/**
+* @file Following a run and every run it called on a terminal, and answering
+*   their open decisions there (`ork attach`, and a foreground `ork run` that
+*   calls workflows; specs/cli.md, specs/scheduler/calls.md). Each run has its
+*   own log printer behind its call path; a decision opened in any of them is
+*   asked through one `TerminalHuman`, withdrawn when it closes elsewhere.
+*/
+/**
+* Prints the events of `root` and of the runs it called until the root ends or
+* `signal` aborts, and asks each open decision with `options.human`.
+*/
+const attachRun = async (store, root, out, options = {}) => {
+	const { human, basePath = [] } = options;
+	const { term } = options.view ?? createView();
+	const say = styler(term);
+	const printers = /* @__PURE__ */ new Map();
+	const seen = {
+		hinted: false,
+		succeeded: false
+	};
+	const show = (path, lines) => {
+		printUnder(out, term, path, lines);
+	};
+	const prompts = human === void 0 ? void 0 : createPrompts(store, human, {
+		out,
+		term,
+		...options.home === void 0 ? {} : { home: options.home }
+	});
+	const { end, stillRunning } = await followRunTree(store, root, ({ run, path: below, stored }) => {
+		const path = [...basePath, ...below];
+		const { event } = stored;
+		if (event.type === "run.finished" && below.length === 0) seen.succeeded = event.result.status === "succeeded";
+		if (prompts?.seen(event) === true) return;
 		if (event.type === "decision.opened" && event.owner === void 0 && pendingDecisions(store, { runId: run }).some((d) => d.id === event.decision)) {
-			if (human !== void 0) {
-				ask(run, path, event.decision);
+			if (prompts !== void 0) {
+				prompts.ask({
+					run,
+					path
+				}, event.decision);
 				return;
 			}
 			if (options.hintNoTerminal === true && !seen.hinted) {
@@ -1151,7 +1209,7 @@ const attachRun = async (store, root, out, options = {}) => {
 		}
 		let print = printers.get(run);
 		if (print === void 0) {
-			print = printerFor(path);
+			print = printerFor(term, path);
 			printers.set(run, print);
 		}
 		show(path, print(stored));
@@ -1160,9 +1218,8 @@ const attachRun = async (store, root, out, options = {}) => {
 		...options.intervalMs === void 0 ? {} : { intervalMs: options.intervalMs },
 		...options.signal === void 0 ? {} : { signal: options.signal }
 	});
-	for (const prompt of prompts.values()) prompt.controller.abort();
-	await Promise.all(asks);
-	if (seen.failure !== void 0) throw seen.failure.error;
+	prompts?.abort();
+	await prompts?.settled();
 	if (end === "crashed") show(basePath, [say("red", `run ${root} stopped without finishing (its process is gone)`)]);
 	for (const id of stillRunning) out(say("dim", `↳ run ${id} still running · ork attach ${id}`));
 	return {
@@ -1170,4 +1227,4 @@ const attachRun = async (store, root, out, options = {}) => {
 		exitCode: end === "aborted" || seen.succeeded ? 0 : 1
 	};
 };
-export { unknownNode as a, callsShown as c, logListTable as i, createTerminalHuman as l, askStored as n, formatEvent as o, followRun as r, formatRunEvent as s, attachRun as t, readText as u };
+export { printerFor as a, logListTable as c, formatEvent as d, formatRunEvent as f, readText as h, printUnder as i, matcher as l, createTerminalHuman as m, createPrompts as n, createLogPrinter as o, callsShown as p, askStored as r, followRun as s, attachRun as t, unknownNode as u };