@krapht/ork 1.0.0-alpha.11 → 1.0.0-alpha.13

package/dist/{src-B6KvTm7B.mjs → src-CGJGL1sZ.mjs}

@@ -1,10 +1,11 @@
-import { $n as skillsIn, $t as endOf, At as nestItems, B as linkNodes, Bn as placeFiles, C as openStore, Ct as runStatus, Dt as processAlive, G as requestContinue, Gn as workflowDirOf, In as loadAgents, J as tellLiveRun, Jn as LESSON_CAP_TOKENS, K as requestPause, Kn as inside, S as isNodeEvent, St as pausedOf, U as unlinkNodes, Un as runDirOf, Ut as nodeSays, Vn as placeFor, X as detachResume, Z as resumable, a as releaseNotes, c as detectInstaller, cn as planPost, er as WorkflowEditSchema, et as detachRun, gt as walkSummary, hr as NodeSchema, ht as walkChecks, i as planUpgrade, it as limitsReport, ln as runGh, mt as checkWorkflowText, nn as END_KINDS, nr as newWorkflowText, o as runningRunIds, or as renderJsonSchema, p as triggersReport, pr as expandEdge, q as requestStop, r as capsHere, rr as readDocument, s as runningScript, sn as DISCUSSIONS, sr as parseWorkflow, st as explainWorkflowText, tr as applyEdits, tt as followEvents, un as sendPost, ur as EdgeInputSchema, w as storePath, x as activeTree, xt as liveStatus, yn as readCondition } from "./src-D6_xjm-x.mjs";
-import { C as feedbackActions, S as placeOf$1, _ as previewPost, a as registryShown, b as acceptItem, c as checkDue, f as readUpdateCache, g as nodeSession, h as writeUpdateCache, i as registryOf, l as fetchLatest, m as updateCachePath, o as updateSwitchOff, p as refreshUpdateCache, s as runInstall, u as newerVersion, w as openFixRun, x as lessonPlaceOf, y as recordNote } from "./__build_info__-CIchF6nr.mjs";
-import { n as pendingDecisions, r as builtinProblem, t as answerDecision } from "./decide-B6PnKeqo.mjs";
-import { n as newRunId, t as findRun } from "./find-BicBbGMg.mjs";
+import { $ as followEvents, C as isNodeEvent, Ct as processAlive, Et as nestItems, G as requestStop, Gn as runDirOf, Gt as nodeSays, Hn as placeFiles, J as detachResume, Jn as inside, K as tellLiveRun, Q as detachRun, R as linkNodes, Rn as loadAgents, S as activeTree, T as storePath, U as requestContinue, Un as placeFor, V as unlinkNodes, W as requestPause, Xn as LESSON_CAP_TOKENS, Y as resumable, _t as liveStatus, a as planUpgrade, ar as readDocument, at as explainWorkflowText, c as runningScript, dn as runGh, dt as walkChecks, fn as sendPost, ft as walkSummary, gr as expandEdge, i as capsHere, in as END_KINDS, ir as newWorkflowText, l as detectInstaller, ln as DISCUSSIONS, lr as renderJsonSchema, m as triggersReport, nr as WorkflowEditSchema, nt as limitsReport, o as releaseNotes, pr as EdgeInputSchema, qn as workflowDirOf, rr as applyEdits, s as runningRunIds, tn as endOf, tr as skillsIn, un as planPost, ur as parseWorkflow, ut as checkWorkflowText, vr as NodeSchema, vt as pausedOf, w as openStore, xn as readCondition, yt as runStatus } from "./src-BeR6f70A.mjs";
+import { C as feedbackActions, S as placeOf$1, _ as previewPost, a as registryShown, b as acceptItem, c as checkDue, f as readUpdateCache, g as nodeSession, h as writeUpdateCache, i as registryOf, l as fetchLatest, m as updateCachePath, o as updateSwitchOff, p as refreshUpdateCache, s as runInstall, u as newerVersion, w as openFixRun, x as lessonPlaceOf, y as recordNote } from "./__build_info__-Da73_nBs.mjs";
+import { t as builtinProblem } from "./builtin-files-n6o6oWpB.mjs";
+import { n as pendingDecisions, t as answerDecision } from "./decide-DuIHACvH.mjs";
+import { n as newRunId, t as findRun } from "./find-CjsNYAAf.mjs";
 import { n as usageReport } from "./report-CEN8VoUb.mjs";
-import { a as planClean, i as keyOf, o as stepActs, r as cleanStep, s as stepPrunes, t as applyClean } from "./clean-Di-KT7Mf.mjs";
-import { a as readWorktrees, c as mergeStateOf, d as stateParts, i as projectHead, l as planLine, n as lostWork, r as planRemove, s as labelOf, t as applyRemove, u as removeRefusal } from "./remove-CpMb4NDl.mjs";
+import { a as planClean, i as keyOf, o as stepActs, r as cleanStep, s as stepPrunes, t as applyClean } from "./clean-Bh4KZgzc.mjs";
+import { a as readWorktrees, c as mergeStateOf, d as stateParts, i as projectHead, l as planLine, n as lostWork, r as planRemove, s as labelOf, t as applyRemove, u as removeRefusal } from "./remove-BkFWGVYo.mjs";
 import path from "node:path";
 import { z } from "zod";
 import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";

package/dist/{src-BnZgZGrf.mjs → src-CqRqsb2t.mjs}

@@ -1,4 +1,4 @@
-import { Ar as AGENT_DRIVERS, Bt as lowerChild, En as maskSecrets, Vt as startAt, an as FEEDBACK_SEVERITIES, en as outcomeEnd, ft as parseReport, in as FEEDBACK_KINDS, nn as END_KINDS, on as FEEDBACK_TARGETS, rn as endFor, wn as MASK } from "./src-D6_xjm-x.mjs";
+import { En as MASK, It as lowerChild, Lt as startAt, Nr as AGENT_DRIVERS, On as maskSecrets, an as endFor, cn as FEEDBACK_TARGETS, ct as parseReport, in as END_KINDS, nn as outcomeEnd, on as FEEDBACK_KINDS, sn as FEEDBACK_SEVERITIES } from "./src-BeR6f70A.mjs";
 import path from "node:path";
 import { z } from "zod";
 import { existsSync, linkSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
@@ -969,7 +969,7 @@ const permissionTool = defineTool({
 *   kept as the session's report, and the session runner ends the session with
 *   it instead of what the tool's last line says.
 */
-const REPORT_TOOL = "report";
+const REPORT_TOOL$1 = "report";
 /** Whether the driver holds a session's final answer to its schema itself. */
 const checksItsReport = (driver) => AGENT_DRIVERS.find((d) => d.id === driver)?.capabilities.reportSchema ?? true;
 /**
@@ -985,13 +985,13 @@ const reportValidator = (schema) => {
 	}
 };
 const failed = (why) => ({
-	...text(`The report was not accepted; fix it and call ${REPORT_TOOL} again.\n${why}`),
+	...text(`The report was not accepted; fix it and call ${REPORT_TOOL$1} again.\n${why}`),
 	isError: true
 });
 const bound = (report) => {
 	const schema = reportValidator(report.schema);
 	return {
-		name: REPORT_TOOL,
+		name: REPORT_TOOL$1,
 		description: "Hand in your final report: call this once your work is done, as your last step, with the report the task asks for. A report that does not fit comes back with what to fix; call again with the fixed report. The last report accepted is the one your owner gets.",
 		shape: schema instanceof z.ZodObject ? schema.shape : {},
 		schema,
@@ -1025,7 +1025,7 @@ const ORK_TOOLS = [
 	releaseTool,
 	feedbackTool,
 	{
-		name: REPORT_TOOL,
+		name: REPORT_TOOL$1,
 		bind: (context) => context.report === void 0 || checksItsReport(context.driver) ? null : bound(context.report)
 	}
 ];
@@ -1135,7 +1135,7 @@ const createSessionRuntime = (adapter, options = {}) => ({
 					}
 				}
 			});
-			const byTool = tools.some((tool) => tool.name === REPORT_TOOL);
+			const byTool = tools.some((tool) => tool.name === REPORT_TOOL$1);
 			const mcp = await startOrkMcpHttp(tools, hold === void 0 || hook === void 0 ? void 0 : toolHook({
 				hold,
 				heavy,
@@ -1243,7 +1243,8 @@ const createSessionRuntime = (adapter, options = {}) => ({
 /**
 * @file The `claude-code` adapter's `EventDecoder` and `UsageReader`: maps the
 *   `claude` CLI's `stream-json` lines to Ork's runtime events, marks the
-*   result of a turn the hold hook deferred, and adds up a session's legs.
+*   result of a turn the hold hook deferred, and adds up a session's legs. Its
+*   leg decoder keeps a report the session handed in and then wrote past.
 */
 const isObject$2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 const get$1 = (value, key) => isObject$2(value) ? value[key] : void 0;
@@ -1378,6 +1379,41 @@ const decodeClaudeLine = (line) => {
 		deferred: isDeferredResult(message)
 	};
 };
+/** The tool `claude` hands a `--json-schema` report in with. */
+const REPORT_TOOL = "StructuredOutput";
+/**
+* A leg's decoder that keeps the last report `claude` accepted (a
+* `StructuredOutput` call whose result was not an error). When the session
+* writes on after it, `claude`'s result can come without `structured_output`;
+* the kept report is then the result's, so a session that reported is not read
+* as one that didn't.
+*/
+const claudeDecoder = () => {
+	const calls = /* @__PURE__ */ new Map();
+	let accepted;
+	return {
+		decode: (line) => {
+			const message = parseLine$2(line);
+			for (const block of blocks(message)) {
+				if (block["type"] === "tool_use" && block["name"] === REPORT_TOOL) calls.set(str$2(block["id"]), block["input"]);
+				const id = str$2(block["tool_use_id"]);
+				if (block["type"] === "tool_result" && calls.has(id)) {
+					if (block["is_error"] !== true) accepted = calls.get(id);
+					calls.delete(id);
+				}
+			}
+			const kept = isObject$2(message) && message["type"] === "result" && (message["structured_output"] ?? null) === null && accepted !== void 0 ? {
+				...message,
+				structured_output: accepted
+			} : message;
+			return {
+				events: normalize(kept),
+				deferred: isDeferredResult(message)
+			};
+		},
+		exit: () => []
+	};
+};
 /**
 * Two legs of one session, as one: the tokens of both, and the later leg's
 * cost, which is already the session's total (ADR-046).
@@ -1540,6 +1576,7 @@ const claudeCodeAdapter = {
 		input: userLine
 	},
 	decode: decodeClaudeLine,
+	legDecoder: claudeDecoder,
 	mcp: {
 		kind: "flag",
 		wire: () => Promise.resolve({

package/dist/{src-9iGkjnsy.mjs → src-D93tHZ5B.mjs}

@@ -1,4 +1,5 @@
-import { $t as endOf, Bt as lowerChild, Cr as TOOL_PREFIX, Ft as failedWith, Ht as envReadsOf, It as stoppedEnd, Lt as calledWorkflows, Mt as runScope, Nt as declaredProblem, Pt as endedWith, Rt as slotClock, Sr as INTEGRATIONS, Vt as startAt, Wt as declaredOutputOf, Xt as mcpNotText, Yt as MCP_FILE, Zt as serversIn, _n as parseTemplate, _r as isToolNode, ar as programsRunBy, at as planReason, bt as heldTimeout, dt as sessionDriver, en as outcomeEnd, gn as evaluate, gr as isClaudeNode, ir as beforeOf, lr as markValue, lt as planNodeSession, pt as reportSchemaFor, rn as endFor, tn as END_DETAIL_LIMIT, vn as renderTemplate, wr as integrationFor, xr as timeoutMs } from "./src-D6_xjm-x.mjs";
+import { $t as serversIn, At as endedWith, Dr as integrationFor, Er as TOOL_PREFIX, Ht as envReadsOf, It as lowerChild, Kt as declaredOutputOf, Lt as startAt, M as sessionRefusals, Mt as stoppedEnd, Nr as AGENT_DRIVERS, Nt as calledWorkflows, Ot as runScope, Pt as slotClock, Qt as mcpNotText, Tr as INTEGRATIONS, Wt as sessionDriver, Zt as MCP_FILE, an as endFor, bn as renderTemplate, br as isToolNode, cr as programsRunBy, fr as markValue, gt as heldTimeout, jt as failedWith, kt as declaredProblem, lt as reportSchemaFor, nn as outcomeEnd, rn as END_DETAIL_LIMIT, rt as planReason, sr as beforeOf, st as planNodeSession, tn as endOf, vn as evaluate, wr as timeoutMs, yn as parseTemplate, yr as isClaudeNode } from "./src-BeR6f70A.mjs";
+import { t as runOnce } from "./run-CQIfq918.mjs";
 import path from "node:path";
 import { accessSync, constants, lstatSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { spawn } from "node:child_process";
@@ -323,7 +324,7 @@ const forkPrompt = (question, passOn) => [
 /** The fork's report: one of the options or the pass-on, and a note. */
 const forkReportSchema = (ids) => {
 	const node = {
-		type: "claude.worker",
+		type: "agent.worker",
 		prompt: "",
 		output: { schema: {
 			choice: [...ids],
@@ -628,6 +629,34 @@ const notStarted = (kind, reason, limited) => ({
 	}),
 	...limited === void 0 ? {} : { limited }
 });
+// ../nodes/src/session-driver.ts
+/**
+* @file The driver a Claude node's session starts on (core's `sessionDriver`),
+*   and, when its model names that driver (`command-code.deepseek/…`, RFC-015),
+*   the fit check on the value an item rendered: the run's own check before it
+*   started saw only the written model.
+*/
+/** What stops the node from running on `driver`, in one line, or nothing. */
+const refusalOn = (context, driver, drivers) => {
+	const id = context.template ?? context.id;
+	const node = context.workflow.nodes[id];
+	const descriptor = drivers.find((d) => d.id === driver);
+	if (node === void 0 || descriptor === void 0) return void 0;
+	const refusals = sessionRefusals(id, node, context.workflow, descriptor);
+	return refusals.length === 0 ? void 0 : refusals.map((r) => r.message).join("; ");
+};
+/** The session's driver, or the node's result when none fits. */
+const sessionDriverOf = (context, plan, options) => {
+	const driver = sessionDriver({
+		pinned: plan.pinned,
+		override: options.driver,
+		named: plan.driver,
+		ready: options.readyDriver
+	});
+	if (driver === void 0) return notStarted("tool_missing", "no agent driver is ready; see `ork doctor`");
+	const unfit = plan.pinned === void 0 ? void 0 : refusalOn(context, driver, options.drivers ?? AGENT_DRIVERS);
+	return unfit === void 0 ? driver : notStarted("invalid_node", unfit);
+};
 // ../nodes/src/tool-output.ts
 /**
 * @file A tool node's structured result (`output: { format: json }`): the file
@@ -870,6 +899,28 @@ const tokenize = (command) => {
 		args
 	};
 };
+/**
+* Runs `execute`, or, with `once: true`, skips it after a pass on these files:
+* `null` then, and `verify.skipped` is recorded. `shown` is the scrubbed
+* command.
+*/
+const runUnlessPassed = async ({ node, context, cwd, shown, environ, execute }) => {
+	if (node.once !== true) return execute();
+	const done = {};
+	const once = await runOnce({
+		cwd,
+		name: node.script === void 0 ? shown : `${shown}\n${node.script}`,
+		who: `${context.runId}/${context.id}`,
+		env: environ,
+		run: async () => {
+			done.run = await execute();
+			return done.run.exitCode;
+		}
+	});
+	if (!once.skipped) return done.run ?? execute();
+	context.skipped?.(shown, once.pass);
+	return null;
+};
 // ../nodes/src/tool-ends.ts
 /**
 * @file How a tool node ended (specs/runtime/session-ends.md): a node that
@@ -915,6 +966,18 @@ const exitEnd = (output, run, context, program, signedOut) => {
 		output
 	}, end);
 };
+/** The result of a skipped check: it passed, and printed nothing this time. */
+const skippedCheck = (outputFile) => {
+	if (outputFile !== void 0) removeOutputFile(outputFile);
+	return endedWith({
+		ok: true,
+		output: {
+			exitCode: 0,
+			stdout: "",
+			stderr: ""
+		}
+	}, endFor("done"));
+};
 // ../nodes/src/tool-scrub.ts
 /**
 * @file Masking a secret in what a program prints. A plain search, so a value
@@ -1245,7 +1308,8 @@ const clearStateFiles = (runDir, warn) => {
 *   without a shell, checked against `allow` (or the integration's default),
 *   its arguments and observed output fields from the integration's adapter,
 *   long output kept in run files. It sees who it is and the node's `env:`
-*   (`tool-env.ts`), and may return JSON (`tool-output.ts`).
+*   (`tool-env.ts`), may return JSON (`tool-output.ts`), and may run once per
+*   set of files (`runUnlessPassed` in `tool-command.ts`).
 */
 /** How much of stdout and stderr a node's output keeps. */
 const OUTPUT_LIMIT = 65536;
@@ -1346,29 +1410,43 @@ const toolExecutor = (given, options = {}) => async (context) => {
 		...node.watch === void 0 ? {} : { [STATE_ENV]: prepareStateFile(context.runDir, context.id) }
 	};
 	const names = Object.keys(nodeEnv.values);
-	const release = await context.machine?.slot([command.program, ...command.args].join(" "), context.signal);
-	context.emit({
-		type: "tool.called",
-		id: context.id,
-		name: scrub(command.program),
-		input: {
-			command: scrub([
-				command.program,
-				...command.args,
-				...node.script === void 0 ? [] : ["<script>"]
-			].join(" ")),
-			...names.length === 0 ? {} : { env: names }
-		}
-	});
-	const scriptFile = node.script === void 0 ? void 0 : writeScriptFile(context.runDir, context.id, context.round, node.script);
-	const priority = context.machine?.priority;
-	const raw = await runner(command.program, scriptFile === void 0 ? command.args : [...command.args, scriptFile], {
+	const shown = scrub([
+		command.program,
+		...command.args,
+		...node.script === void 0 ? [] : ["<script>"]
+	].join(" "));
+	const execute = async () => {
+		const release = await context.machine?.slot([command.program, ...command.args].join(" "), context.signal);
+		context.emit({
+			type: "tool.called",
+			id: context.id,
+			name: scrub(command.program),
+			input: {
+				command: shown,
+				...names.length === 0 ? {} : { env: names }
+			}
+		});
+		const scriptFile = node.script === void 0 ? void 0 : writeScriptFile(context.runDir, context.id, context.round, node.script);
+		const priority = context.machine?.priority;
+		return runner(command.program, scriptFile === void 0 ? command.args : [...command.args, scriptFile], {
+			cwd,
+			signal: context.signal,
+			env,
+			...priority === void 0 ? {} : { priority }
+		}).finally(() => {
+			release?.();
+			if (scriptFile !== void 0) removeOutputFile(scriptFile);
+		});
+	};
+	const raw = await runUnlessPassed({
+		node,
+		context,
 		cwd,
-		signal: context.signal,
-		env,
-		...priority === void 0 ? {} : { priority }
-	}).finally(() => release?.());
-	if (scriptFile !== void 0) removeOutputFile(scriptFile);
+		shown,
+		environ,
+		execute
+	});
+	if (raw === null) return skippedCheck(outputFile);
 	const run = {
 		exitCode: raw.exitCode,
 		stdout: scrub(raw.stdout),
@@ -1597,7 +1675,7 @@ const checkedResult = (result, { check, resumes }) => {
 };
 // ../nodes/src/claude.ts
 /**
-* @file The Claude node type: runs a `claude.leader` or `claude.worker` as one
+* @file The Claude node type: runs an `agent.leader` or `agent.worker` as one
 *   session, planned with the run's outputs (and the brief its owner gave it),
 *   and turns its report into the node's output. A leader gets its children
 *   through the session's ports, and resumes its session on re-entry
@@ -1640,7 +1718,7 @@ const specFor = (spec, context) => {
 	};
 	return spec;
 };
-/** Runs a `claude.leader` or `claude.worker` as one session. */
+/** Runs an `agent.leader` or `agent.worker` as one session. */
 const claudeExecutor = (options) => async (context) => {
 	const planOptions = planOptionsOf(context, options.inPlace);
 	const before = beforeOf(context.node, context.workflow.defaults);
@@ -1676,12 +1754,8 @@ const claudeExecutor = (options) => async (context) => {
 		...servers.value
 	};
 	if (options.machineClaude === true) spec.machineClaude = true;
-	const driver = sessionDriver({
-		override: options.driver,
-		named: plan.driver,
-		ready: options.readyDriver
-	});
-	if (driver === void 0) return notStarted("tool_missing", "no agent driver is ready; see `ork doctor`");
+	const driver = sessionDriverOf(context, plan, options);
+	if (typeof driver !== "string") return driver;
 	const runtime = await options.runtimeFor(driver);
 	const ports = { human: context.owner === void 0 ? withdrawnOnStop(context) : ownerFirst(context, context.owner, {
 		runtimeFor: options.runtimeFor,
@@ -1824,6 +1898,7 @@ const gateExecutor = async (context) => {
 		nodeId: context.id,
 		question,
 		options,
+		waits: true,
 		signal: withdraw.signal,
 		onNote: (given) => {
 			note = given;
@@ -2143,8 +2218,8 @@ const builtinExecutors = (options) => {
 		steps: tool
 	});
 	const executors = {
-		"claude.leader": claude,
-		"claude.worker": claude,
+		"agent.leader": claude,
+		"agent.worker": claude,
 		"human.gate": gateExecutor,
 		"workflow.call": callExecutor,
 		"mcp.call": mcpCallExecutor(options.maskedNames === void 0 ? {} : { maskedNames: options.maskedNames })