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

package/dist/{run-OOWQIKMJ.mjs → run-C0C54UiU.mjs}

@@ -1,86 +1,70 @@
-import { $r as beforeOf, $t as git, An as liveStatus, Br as inside, Cn as endLinksOf, Ct as startRun, Ei as DRIVER_IDS, Fn as templateOf, G as parseInputPairs, Gn as createSignals, Hn as gitRulesOf, K as resolveInputs, Kn as endOf, L as openStore, Lr as runDirOf, Pr as placeFiles, Qt as inspectProject, R as storePath, Si as readyDriver, St as walkSummary, Ti as AGENT_DRIVERS, Tt as userMessageText, U as createReplay, Un as loadProject, W as replayLoopAnswers, Wn as machineRulesOf, _n as takeFollowUps, _t as planNodeSession, an as sessionDriver, at as adoptedCalls, ct as DETACHED_ENV, di as isClaudeNode, dr as parseTemplate, dt as NOT_STARTED, et as createRelay, fn as createFollowUps, fr as renderTemplate, hi as retiredDriverHint, hr as socketPath, it as createCalls, lt as detachRun, m as resolveBase, mr as serveRun, n as resumedOptions, nr as runGh, or as createFeedback, pn as checkFollowUpsDue, t as createWorkspace, vn as deliverFollowUp, vr as maskReplacer } from "./src-DLsFsmOD.mjs";
-import { c as callsShown, d as createDecisionQueue, l as createTerminalHuman, o as formatEvent, s as formatRunEvent, t as attachRun } from "./attach-RQx__RzH.mjs";
-import { h as nodeSession, n as ORK_VERSION, v as findFollowUp } from "./__build_info__-C1Nm0hlJ.mjs";
-import { n as newRunId } from "./find-k489laBa.mjs";
-import { c as write, i as detachHint, l as writeErr, s as style } from "./output-B1kwo0YU.mjs";
-import { _ as clearOutputFiles, a as builtinExecutors, d as maskedEnv, f as maskedNamesOfRun, i as onPath, l as clearStateFiles, m as sessionEnv, n as missingProgramMessage, p as runScrubber, r as missingPrograms, t as envProblems, v as namedMcpEntries, y as resultOf } from "./src-DmmrX2_C.mjs";
-import { i as refusedBuiltin, o as workflowArg } from "./workflows-Djo1edlK.mjs";
-import { a as formatReport, c as checksHere, d as runReadyDriver, f as unfitLines, i as walkLoaded, l as chooseReadyDriver, o as warningLines, s as budgetWarningLines, t as loadWorkflow, u as overrideRefusal } from "./validate-BS0nCccW.mjs";
+import { $n as createSignals, B as appendRecorder, Cr as startControl, En as endLinksOf, Et as startRun, Fi as DRIVER_IDS, Gn as gitRulesOf, J as parseInputPairs, K as createReplay, Kn as loadProject, Kr as runDirOf, Nn as liveStatus, Ot as userMessageText, Pi as AGENT_DRIVERS, R as openStore, Rn as templateOf, Tt as walkSummary, Ur as placeFiles, V as createRecorder, Xn as findFollowUp, Y as resolveInputs, Yr as inside, _n as checkFollowUpsDue, bi as isClaudeNode, br as parseTemplate, bt as planNodeSession, ci as beforeOf, cn as sessionDriver, ct as adoptedCalls, dt as DETACHED_ENV, er as endOf, h as resolveBase, hn as createFollowUps, hr as createFeedback, ji as readyDriver, mt as NOT_STARTED, n as resumedOptions, nn as git, pr as runGh, q as replayLoopAnswers, qn as machineRulesOf, rt as createRelay, st as createCalls, t as createWorkspace, tn as inspectProject, wi as retiredDriverHint, xn as deliverFollowUp, xr as renderTemplate, z as storePath } from "./src-Ciy7i3se.mjs";
+import { _ as clearOutputFiles, a as builtinExecutors, b as runScrubber, d as maskedEnv, f as maskedNamesOfRun, i as onPath, l as clearStateFiles, m as sessionEnv, n as missingProgramMessage, r as missingPrograms, t as envProblems, v as namedMcpEntries, y as resultOf } from "./src-DP02RP9O.mjs";
+import { n as newRunId } from "./find-B30-rd-u.mjs";
+import { h as nodeSession, n as ORK_VERSION } from "./__build_info__-dPf4cEGL.mjs";
+import { c as write, l as writeErr, s as style } from "./output-B1kwo0YU.mjs";
+import { c as callsShown, l as createTerminalHuman, o as formatEvent, s as formatRunEvent, t as attachRun } from "./attach-DhZQ87Nz.mjs";
+import { a as refusedBuiltin, s as workflowArg, t as WORKFLOW_DIR } from "./workflows-8GV-SeRm.mjs";
+import { a as formatReport, c as checksHere, d as runReadyDriver, f as unfitLines, i as walkLoaded, l as chooseReadyDriver, o as warningLines, s as budgetWarningLines, t as loadWorkflow, u as overrideRefusal } from "./validate-UrmC5AG1.mjs";
 import { a as createView, o as styler } from "./verdict-CMvPCpWC.mjs";
-import { i as runLimits, r as limitsRefusal, t as chatNotice } from "./limits-CHqBO7wb.mjs";
+import { i as runLimits, r as limitsRefusal, t as chatNotice } from "./limits-CXh052II.mjs";
 import path from "node:path";
-import { appendFileSync, existsSync, linkSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, linkSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { defineCommand } from "citty";
-// ../core/src/control/control.ts
-const startControl = async (options) => {
-	const { store, runId } = options;
-	const waiting = /* @__PURE__ */ new Map();
-	let stopped = false;
-	const check = () => {
-		for (const [id, resolve] of waiting) {
-			const decision = store.decision(id);
-			if (decision !== void 0 && decision.status !== "open") {
-				waiting.delete(id);
-				resolve(decision);
-			}
-		}
-		for (const command of store.takeCommands(runId)) if (command.kind === "message") options.onMessage(command.node, command.body);
-		else if (command.kind === "relay") options.onRelay?.(command.node, command.from, command.body);
-		else if (command.kind === "script") options.onScript?.(command.node, command.from, command.body);
-		else if (command.kind === "notice") options.onNotice?.(command.node, command.body);
-		else if (command.kind === "stop" && command.node === void 0) {
-			if (stopped) continue;
-			stopped = true;
-			options.emit({
-				type: "run.command",
-				command: "stop"
-			});
-			options.onStop();
-		} else if (!stopped) {
-			if (options.onControl?.(command.kind, command.node) ?? false) options.emit({
-				type: "run.command",
-				command: command.kind,
-				...command.node === void 0 ? {} : { node: command.node }
-			});
-		}
+// ../core/src/follow-ups/take.ts
+const put = (rows, f, run, at) => {
+	const next = {
+		...f,
+		takenBy: run,
+		updatedAt: at
 	};
-	const timer = setInterval(check, options.intervalMs ?? 1e3);
-	let socket;
-	try {
-		socket = await serveRun({
-			path: socketPath(runId, options.home),
-			onWake: check,
-			backlog: (after) => store.events(runId, after)
-		});
-	} catch {}
+	rows.putFollowUp(next);
+	return next;
+};
+/**
+* Whether another, live run has taken `f`: it is not free to take again. A run
+* the store does not know counts as live while the mark is recent, so a run
+* that fails its preflight frees its follow-ups when the window ends.
+*/
+const heldByLive = (f, run, isLive, now) => {
+	if (f.takenBy === void 0 || f.takenBy === run) return false;
+	return isLive(f.takenBy) ?? now - Date.parse(f.updatedAt) < 12e4;
+};
+/**
+* The project's due `agent` follow-ups no live run has taken (`ids`), and those
+* a live run holds (`held`), so a second `--follow-ups due` doesn't take them
+* twice.
+*/
+const availableDue = (rows, project, isLive, run = "", now = () => (/* @__PURE__ */ new Date()).toISOString()) => {
+	const at = Date.parse(now());
+	const due = rows.followUps(project).filter((f) => f.for === "agent" && f.status === "due");
 	return {
-		human: createDecisionQueue({
-			store,
-			runId,
-			emit: options.emit,
-			waitFor: (id, signal) => {
-				const { promise, resolve, reject } = Promise.withResolvers();
-				waiting.set(id, resolve);
-				signal.addEventListener("abort", () => {
-					waiting.delete(id);
-					reject(/* @__PURE__ */ new Error("settled"));
-				}, { once: true });
-				check();
-				return promise;
-			},
-			...options.local === void 0 ? {} : { local: options.local }
-		}),
-		publish: (stored) => {
-			socket?.publish(stored);
-		},
-		check,
-		close: async () => {
-			clearInterval(timer);
-			await socket?.close();
-		}
+		ids: due.filter((f) => !heldByLive(f, run, isLive, at)).map((f) => f.id),
+		held: due.filter((f) => heldByLive(f, run, isLive, at))
+	};
+};
+/**
+* `ork run start --follow-ups <ids>`: the open `agent` follow-ups among `ids`
+* become `run`'s brief; why each other id wasn't taken. One a live run took is
+* refused; one a finished, failed or crashed run took can be taken again.
+*/
+const takeFollowUps = (rows, taking, now = () => (/* @__PURE__ */ new Date()).toISOString()) => {
+	const taken = [];
+	const refused = [];
+	for (const id of taking.ids) {
+		const f = rows.followUp(taking.project, id);
+		if (f === void 0) refused.push(`${id}: there is no such follow-up`);
+		else if (f.for !== "agent") refused.push(`${id}: it is for ${f.for}`);
+		else if (f.status === "done" || f.status === "dropped") refused.push(`${id}: it is ${f.status}`);
+		else if (heldByLive(f, taking.run, taking.isLive, Date.parse(now()))) refused.push(`${id}: taken by run ${f.takenBy}, still running`);
+		else taken.push(put(rows, f, taking.run, now()));
+	}
+	return {
+		taken,
+		refused
 	};
 };
 /** `ORK_HEAVY_SLOTS` as a count; anything but a positive integer is the default. */
@@ -288,31 +272,6 @@ const sweepLocks = (dir) => {
 		slots: 1
 	}).sweep());
 };
-// ../core/src/store/recorder.ts
-/**
-* @file Records a run as it happens: each event appended to the store and
-*   copied to the run's `events.jsonl`, both with secrets masked, before
-*   anything else sees it; and adds to a finished run (`ork chat`).
-*/
-const EVENTS_FILE = "events.jsonl";
-/**
-* Appends to a run already in the store, e.g. `ork chat` resuming a finished
-* node's session; `runDir` gets the JSONL copy.
-*/
-const appendRecorder = (store, runId, runDir) => {
-	mkdirSync(runDir, { recursive: true });
-	const file = path.join(runDir, EVENTS_FILE);
-	return (event) => {
-		const stored = store.append(runId, event);
-		appendFileSync(file, `${JSON.stringify(stored, maskReplacer)}\n`);
-		return stored;
-	};
-};
-/** Begins `run` in the store; `runDir` gets the JSONL copy. */
-const createRecorder = (store, run, runDir) => {
-	store.begin(run);
-	return appendRecorder(store, run.id, runDir);
-};
 // src/runs/chat.ts
 /**
 * @file `ork chat`'s two paths. A node of a live run gets the message through
@@ -512,6 +471,15 @@ const briefOf = (followUps) => ["Do these follow-ups left by earlier changes:",
 	...f.body === "" ? [] : [f.body],
 	...f.where.length === 0 ? [] : [`Files: ${f.where.join(", ")}`]
 ])].join("\n");
+/**
+* Whether a run is going, as `ork ps` decides: running with its process alive.
+* `undefined` for a run the store does not know yet: core holds its mark for a
+* short while, as the run may be about to begin.
+*/
+const runIsLive = (store) => (runId) => {
+	const [run] = store.lookup(runId);
+	return run === void 0 ? void 0 : liveStatus(run) === "running";
+};
 const nothing = () => {};
 /**
 * The follow-ups `ids` (or prefixes) name, when every one can be taken as a
@@ -532,7 +500,8 @@ const checkTakeable = (store, project, ids) => {
 	}, {
 		project,
 		run: "",
-		ids: full
+		ids: full,
+		isLive: runIsLive(store)
 	});
 	const all = [...lines, ...refused];
 	return all.length > 0 ? {
@@ -547,8 +516,8 @@ const checkTakeable = (store, project, ids) => {
 /**
 * @file Where a run's feedback comes from, beyond what its events say: Ork's
 *   version (bound from the CLI's `package.json`) and the workflow file's
-*   content hash; and the `follow_up` port of the one node `ork run --node`
-*   runs.
+*   content hash; and the feedback and `follow_up` ports of the one node `ork
+*   run --node` runs.
 */
 /** Ork's version and the workflow's hash, for the run's feedback records. */
 /** The Ork version a run records in `run.started` and `run.resumed`. */
@@ -560,11 +529,27 @@ const feedbackOrigin = (workflowFile) => {
 	} catch {}
 	return origin;
 };
-/** The `follow_up` port of node `id`, kept as the project's rule says. */
-const nodeFollowUps = (options) => createFollowUps({
-	runId: options.runId,
-	sink: followUpSink(options)
-}).port(options.id, options.cwd);
+/**
+* Node `id`'s feedback port (with a graph) and `follow_up` port, kept as the
+* project's rule says; both mask the values of what its run masks.
+*/
+const nodeReports = (options, { workflow, graph, record }) => {
+	const { place, id } = options;
+	const scrub = runScrubber(maskedNamesOfRun(workflow, place, options.store.projects()), process.env);
+	const sink = followUpSink(options);
+	return {
+		...graph === null ? {} : { feedback: createFeedback({
+			graph,
+			onEvent: record,
+			scrub
+		}).port(id) },
+		followUps: createFollowUps({
+			runId: options.runId,
+			sink,
+			scrub
+		}).port(id, options.cwd)
+	};
+};
 // src/run/node.ts
 /**
 * @file `ork run --node`: checks a workflow and its inputs, plans one Claude
@@ -705,16 +690,16 @@ const runNode = async (options) => {
 		...servers.value
 	}, {
 		human: control.human,
-		...graph === null ? {} : { feedback: createFeedback({
-			graph,
-			onEvent: record
-		}).port(id) },
-		followUps: nodeFollowUps({
+		...nodeReports({
 			...options,
 			place,
 			runId,
 			id,
 			cwd
+		}, {
+			workflow,
+			graph,
+			record
 		})
 	});
 	started.resolve(session);
@@ -956,6 +941,15 @@ const dirtyAgentMessage = (files) => [
 ];
 /** Claude nodes that get their own worktree. */
 const worktreeNodes = (workflow) => Object.entries(workflow.nodes).filter(([, node]) => isClaudeNode(node) && node.type !== "agent.subagent" && (node.isolation ?? workflow.defaults?.isolation ?? "worktree") === "worktree").map(([id]) => id);
+/**
+* The project's folder for a message. Outside git, the place's root is the
+* folder of the workflow file, which is `<project>/.ork/workflows` for a
+* project's own workflow.
+*/
+const projectFolder = (root) => {
+	const tail = path.sep + WORKFLOW_DIR;
+	return root.endsWith(tail) ? root.slice(0, -tail.length) : root;
+};
 /** Checks the project for a run's worktrees, and resolves `git.base`. */
 const prepareCheckout = async (workflow, options, inputs) => {
 	const isolated = worktreeNodes(workflow);
@@ -966,7 +960,7 @@ const prepareCheckout = async (workflow, options, inputs) => {
 	const project = await inspectProject(options.cwd);
 	if (project === null) return {
 		ok: false,
-		lines: [`${isolated.join(", ")} need a git worktree, but ${options.cwd} is not in a git repository with a commit; make a first commit (\`git commit --allow-empty -m "Start"\`) first, or pass --in-place to run them here`]
+		lines: [`${isolated.join(", ")} ${isolated.length === 1 ? "needs" : "need"} a git worktree, but ${projectFolder(options.cwd)} is not in a git repository with a commit; make a first commit (\`git commit --allow-empty -m "Start"\`) first, or pass --in-place to run them here`]
 	};
 	if (project.dirtyAgentFiles.length > 0 && options.allowDirty !== true) return {
 		ok: false,
@@ -1252,7 +1246,7 @@ const isDriver = (value) => AGENT_DRIVERS.some((d) => d.id === value);
 /** Why `--driver` refuses a value: a retired id names its replacement. */
 const badDriver = (value) => `--${retiredDriverHint(value) ?? `driver must be one of ${AGENT_DRIVERS.map((d) => d.id).join(", ")}, got \`${value}\``}`;
 /** Loads the drivers only when a run starts, so other commands stay fast. */
-const loadRuntime = async (driver, runs) => (await import("./src-BHod38UQ.mjs")).createRuntime(driver, sessionEnv(process.env), runs);
+const loadRuntime = async (driver, runs) => (await import("./src-D2qpd-G7.mjs")).createRuntime(driver, sessionEnv(process.env), runs);
 /**
 * Ctrl-C asks the run to stop, and so does a terminal closing or a polite kill,
 * so that the run ends tidily and leaves no result unscrubbed.
@@ -1374,35 +1368,20 @@ const run = defineCommand({
 			process.exitCode = 1;
 			return;
 		}
-		const { prepareFollowUps: prepare, followUpsFlagFine: flagFine } = await import("./brief-Bs3cMQU0.mjs");
+		const { prepareFollowUps: prepare, followUpsFlagFine: flagFine } = await import("./brief-BQbeoPMc.mjs");
 		const cwd = process.cwd();
 		if (refusedBuiltin([args.workflow], cwd) || !flagFine(rawArgs)) return;
 		const target = workflowArg(args.workflow, cwd);
 		const store = openStore();
 		if (args.detach) {
 			try {
-				const single = args.node !== void 0 && args.node !== "";
-				const runId = newRunId(store, single ? "node-" : "");
-				const detached = await detachRun({
-					store,
-					runId,
-					args: [
-						"run",
-						...rawArgs.filter((arg) => arg !== "--detach"),
-						"--run-id",
-						runId
-					],
+				const { startDetached } = await import("./detached-BQlbmqR0.mjs");
+				await startDetached(store, {
+					rawArgs,
 					cwd,
-					runDir: target.runDir(runId)
+					target,
+					node: args.node
 				});
-				if (detached.ok) {
-					write(`▸ run ${detached.runId} started in the background`);
-					write(style("dim", `  ${detachHint(detached.runId)}`));
-				} else {
-					writeErr(detached.error);
-					writeErr(style("dim", `(output: ${detached.log})`));
-					process.exitCode = 1;
-				}
 			} finally {
 				store.close();
 			}
@@ -1461,4 +1440,4 @@ const run = defineCommand({
 		}
 	}
 });
-export { onInterrupt as a, runWorkflowFile as c, followUpsRule as d, refreshDue as f, machineSlotLedger as g, sweepLocks as h, loadRuntime as i, briefOf as l, machineLocksDir as m, flagValues as n, run as o, resumeChat as p, isDriver as r, terminalHuman as s, badDriver as t, checkTakeable as u };
+export { machineSlotLedger as _, onInterrupt as a, runWorkflowFile as c, followUpsRule as d, refreshDue as f, sweepLocks as g, machineLocksDir as h, loadRuntime as i, briefOf as l, resumeChat as m, flagValues as n, run as o, runIsLive as p, isDriver as r, terminalHuman as s, badDriver as t, checkTakeable as u, availableDue as v, takeFollowUps as y };

package/dist/{run-BfxdsQJk.mjs → run-D6yU2rLf.mjs}

@@ -1,4 +1,4 @@
-import { $t as git, en as gitOk } from "./src-DLsFsmOD.mjs";
+import { nn as git, rn as gitOk } from "./src-Ciy7i3se.mjs";
 import path from "node:path";
 import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";

package/dist/{send-CKth_vgn.mjs → send-DqgF58hb.mjs}

@@ -1,6 +1,6 @@
-import { $ as sendFromScript, L as openStore, Q as scriptRefusal, Z as TOO_LONG } from "./src-DLsFsmOD.mjs";
+import { R as openStore, et as TOO_LONG, nt as sendFromScript, tt as scriptRefusal } from "./src-Ciy7i3se.mjs";
+import { u as inheritedScrubber } from "./src-DP02RP9O.mjs";
 import { l as writeErr } from "./output-B1kwo0YU.mjs";
-import { u as inheritedScrubber } from "./src-DmmrX2_C.mjs";
 import { defineCommand } from "citty";
 // src/commands/send.ts
 /**