@krapht/ork 1.0.0-alpha.5 → 1.0.0-alpha.7

package/dist/{src-QEycKJWk.mjs → src-BwnitlJh.mjs}

@@ -1,86 +1,17 @@
-import { B as linkNodes, Bn as readDocument, Cn as placeFiles, Ct as walkChecks, En as runDirOf, G as requestContinue, Gn as EdgeInputSchema, Gt as planPost, Hn as parseWorkflow, In as skillsIn, J as tellLiveRun, Jn as expandEdge, K as requestPause, Kt as runGh, Ln as WorkflowEditSchema, Nt as nodeSays, On as workflowDirOf, Rn as applyEdits, St as checkWorkflowText, U as unlinkNodes, Vn as renderJsonSchema, Wt as DISCUSSIONS, Xn as NodeSchema, _t as runStatus, bt as processAlive, ct as explainWorkflowText, d as runningRunIds, f as runningScript, gt as pausedOf, ht as liveStatus, jn as LESSON_CAP_TOKENS, kn as inside, l as planUpgrade, nn as readCondition, nt as resumable, o as limitsReport, ot as detachRun, p as detectInstaller, q as requestStop, qt as sendPost, r as capsHere, st as followEvents, tt as detachResume, u as releaseNotes, v as triggersReport, vn as loadAgents, vt as runTree, wn as placeFor, wt as walkSummary, zn as newWorkflowText } from "./src-Do_MhwiV.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__-Dl8yTEu-.mjs";
-import { n as pendingDecisions, r as builtinProblem, t as answerDecision } from "./decide-CK_-lI5V.mjs";
-import { n as newRunId, t as findRun } from "./find-DWiDJ5Lc.mjs";
-import { c as openStore, l as storePath, s as nodeOf } from "./output-BhYkshYq.mjs";
+import { Bn as readDocument, Cn as placeFiles, En as runDirOf, Et as processAlive, G as requestPause, Gt as planPost, H as unlinkNodes, In as skillsIn, K as requestStop, Kt as runGh, Ln as WorkflowEditSchema, Nt as nodeSays, On as workflowDirOf, Qn as NodeSchema, Rn as applyEdits, St as runStatus, Un as renderJsonSchema, W as requestContinue, Wn as parseWorkflow, Wt as DISCUSSIONS, Xn as expandEdge, at as followEvents, bt as liveStatus, d as runningRunIds, et as detachResume, f as runningScript, ht as walkSummary, it as detachRun, jn as LESSON_CAP_TOKENS, kn as inside, l as planUpgrade, mt as walkChecks, nn as readCondition, o as limitsReport, ot as explainWorkflowText, p as detectInstaller, pt as checkWorkflowText, q as tellLiveRun, qn as EdgeInputSchema, qt as sendPost, r as capsHere, tt as resumable, u as releaseNotes, v as triggersReport, vn as loadAgents, wn as placeFor, xt as pausedOf, z as linkNodes, zn as newWorkflowText } from "./src-BsLHKQRc.mjs";
+import { C as placeOf$1, S as lessonPlaceOf, T as openFixRun, _ as nodeSession, a as registryShown, b as recordNote, c as checkDue, f as readUpdateCache, g as activeTree, h as writeUpdateCache, i as registryOf, l as fetchLatest, m as updateCachePath, o as updateSwitchOff, p as refreshUpdateCache, s as runInstall, u as newerVersion, v as previewPost, w as feedbackActions, x as acceptItem } from "./__build_info__-BGoaUwLd.mjs";
+import { n as pendingDecisions, r as builtinProblem, t as answerDecision } from "./decide-DsA6kOT7.mjs";
+import { n as newRunId, t as findRun } from "./find-ntyniv2E.mjs";
+import { c as openStore, l as storePath, s as isNodeEvent } from "./output-CwqlG1Le.mjs";
 import { n as usageReport } from "./report-DK4LGqwF.mjs";
-import { a as planClean, i as keyOf, o as stepActs, r as cleanStep, s as stepPrunes, t as applyClean } from "./clean-DYVmLkd4.mjs";
-import { a as readWorktrees, c as planLine, i as projectHead, l as removeRefusal, n as lostWork, o as labelOf, r as planRemove, s as mergeStateOf, t as applyRemove, u as stateParts } from "./remove-RVcX1KqP.mjs";
+import { a as planClean, i as keyOf, o as stepActs, r as cleanStep, s as stepPrunes, t as applyClean } from "./clean-BPITM-6p.mjs";
+import { a as readWorktrees, c as planLine, i as projectHead, l as removeRefusal, n as lostWork, o as labelOf, r as planRemove, s as mergeStateOf, t as applyRemove, u as stateParts } from "./remove-CSpT_nJH.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";
 import { createHash, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
 import { homedir } from "node:os";
 import { createServer } from "node:http";
-// ../core/src/store/activity.ts
-const LONGEST_LINE = 120;
-/**
-* The fields of a tool's input that say what it's working on, best first. Only
-* these are shown, so what else a tool was given stays in the logs.
-*/
-const TARGETS = [
-	"file_path",
-	"notebook_path",
-	"path",
-	"url",
-	"pattern",
-	"query",
-	"command"
-];
-const oneLine = (text) => {
-	const line = text.replaceAll(/\s+/gu, " ").trim();
-	return line.length > LONGEST_LINE ? `${line.slice(0, 119)}…` : line;
-};
-const toolLine = ({ name, input }) => {
-	const target = TARGETS.map((field) => input[field]).find((value) => typeof value === "string" && value.trim() !== "");
-	if (typeof target !== "string") return name;
-	return oneLine(target.startsWith(`${name} `) ? target : `${name} ${target}`);
-};
-/** What a finished node said, or why it failed. */
-const finishedNow = (ok, error, summary) => {
-	if (!ok) return error === void 0 ? void 0 : oneLine(error);
-	return typeof summary === "string" && summary.trim() !== "" ? oneLine(summary) : void 0;
-};
-/** Each node's activity, by id; a node that never started has none. */
-const runActivity = (stored) => {
-	const nodes = /* @__PURE__ */ new Map();
-	const of = (id) => {
-		const found = nodes.get(id);
-		if (found !== void 0) return found;
-		const fresh = {};
-		nodes.set(id, fresh);
-		return fresh;
-	};
-	for (const { at, event } of stored) if (event.type === "node.started") {
-		const node = of(event.id);
-		node.startedAt ??= at;
-		delete node.finishedAt;
-		delete node.now;
-	} else if (event.type === "node.event") {
-		if (event.event.type === "tool.called") of(event.id).now = toolLine(event.event);
-	} else if (event.type === "decision.opened") of(event.node).now = oneLine(`Asked: ${event.question}`);
-	else if (event.type === "decision.answered") of(event.node).now = oneLine(`Answered: ${event.answer}`);
-	else if (event.type === "decision.withdrawn") delete of(event.node).now;
-	else if (event.type === "node.finished") {
-		const node = of(event.id);
-		node.finishedAt = at;
-		const now = finishedNow(event.ok, event.error, event.output["summary"]);
-		if (now === void 0) delete node.now;
-		else node.now = now;
-	}
-	return nodes;
-};
-/** The ownership tree, with what each node is doing and when it ran. */
-const activeTree = (stored) => {
-	const activity = runActivity(stored);
-	const dress = (node) => {
-		Object.assign(node, activity.get(node.id));
-		for (const child of node.children) dress(child);
-	};
-	const roots = runTree(stored.map(({ event }) => event));
-	for (const root of roots) dress(root);
-	return roots;
-};
 // ../server/src/contract-builder.ts
 /** A new workflow's name, as its file and its `name:` take it. */
 const NewWorkflowSchema = z.strictObject({ name: z.string().min(1) });
@@ -1623,7 +1554,7 @@ const readRoutes = (context) => ({
 	events: ({ params, query }) => {
 		const found = runOf(context, params.id);
 		if (!found.ok) return found.refusal;
-		const events = context.store.events(found.run.id, query.after ?? 0).filter((s) => query.node === void 0 || nodeOf(s.event) === query.node);
+		const events = context.store.events(found.run.id, query.after ?? 0).filter((s) => query.node === void 0 || isNodeEvent(s.event, query.node));
 		const newest = query.last === void 0 ? events : events.slice(-query.last);
 		return ok(query.limit === void 0 ? newest : newest.slice(0, query.limit));
 	},

package/dist/{src-HxtJOMRr.mjs → src-CUeMUVwW.mjs}

@@ -1,4 +1,4 @@
-import { $n as isToolNode, $t as evaluate, At as runScope, Bt as serversIn, F as declaredProblem, Mt as envReadsOf, Ot as heldTimeout, Pt as declaredOutputOf, Rt as MCP_FILE, Wn as markValue, Zn as beforeOf, ar as integrationFor, en as parseTemplate, er as programsRunBy, ft as sessionDriver, ir as TOOL_PREFIX, jt as calledWorkflows, mt as reportSchemaFor, nr as timeoutMs, rr as INTEGRATIONS, s as planReason, tn as renderTemplate, ut as planNodeSession, zt as mcpNotText } from "./src-Do_MhwiV.mjs";
+import { $t as evaluate, At as declaredProblem, Bt as serversIn, Hn as programsRunBy, Kn as markValue, Mt as envReadsOf, Ot as runScope, Pt as declaredOutputOf, Rt as MCP_FILE, Vn as beforeOf, ar as integrationFor, ct as planNodeSession, en as parseTemplate, er as isToolNode, ft as reportSchemaFor, ir as TOOL_PREFIX, jt as calledWorkflows, nr as timeoutMs, rr as INTEGRATIONS, s as planReason, tn as renderTemplate, ut as sessionDriver, yt as heldTimeout, zt as mcpNotText } from "./src-BsLHKQRc.mjs";
 import path from "node:path";
 import { accessSync, constants, lstatSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { spawn } from "node:child_process";
@@ -35,7 +35,7 @@ const callExecutor = (context) => {
 		output: { status: "fail" },
 		error: "This run cannot call workflows."
 	});
-	const scope = runScope(context.inputs, context.outputs, context.runId);
+	const scope = runScope(context.inputs, context.outputs, context.runId, context.item);
 	const render = (text) => {
 		const template = parseTemplate(text);
 		return template.ok ? renderTemplate(template.parts, scope) : text;
@@ -61,6 +61,32 @@ const callExecutor = (context) => {
 		}
 	}, context.signal).then(limitedCall);
 };
+// ../nodes/src/claude-plan.ts
+/**
+* @file What a Claude node's session is planned with, read from the node's
+*   context.
+*/
+/** The plan options every session of a node starts from. */
+const planOptionsOf = (context, inPlace) => {
+	const planOptions = {
+		cwd: context.cwd,
+		inputs: context.inputs,
+		outputs: context.outputs,
+		inPlace,
+		workflowDir: context.workflowDir,
+		projectRoot: context.projectRoot,
+		...context.orkDir === void 0 ? {} : { orkDir: context.orkDir },
+		pluginDir: path.join(context.runDir, "plugins", context.id)
+	};
+	if (context.checkout !== void 0) planOptions.checkout = context.checkout;
+	if (context.brief !== void 0) planOptions.brief = context.brief;
+	if (context.template !== void 0) planOptions.template = context.template;
+	if (context.item !== void 0) planOptions.item = context.item;
+	if (context.ownership !== void 0) planOptions.ownership = context.ownership;
+	if (context.mailbox !== void 0) planOptions.mailbox = context.mailbox;
+	if (context.claims !== void 0) planOptions.claims = context.claims;
+	return planOptions;
+};
 // ../nodes/src/claude-result.ts
 /**
 * @file A finished session as a node's result: its report is the output, held
@@ -991,7 +1017,9 @@ const IDENTITY_KEYS = /* @__PURE__ */ new Set([
 	"ORK_WORKFLOW",
 	"ORK_BIN",
 	OUTPUT_ENV,
-	STATE_ENV
+	STATE_ENV,
+	"ORK_ITEM",
+	"ORK_INDEX"
 ]);
 /**
 * `env` without Ork's identity variables. A run started by a program in another
@@ -1019,7 +1047,11 @@ const identityOf = (context, orkBin) => ({
 	ORK_RUN_DIR: context.runDir,
 	ORK_PROJECT: context.projectRoot,
 	ORK_WORKFLOW: context.workflow.name,
-	...orkBin === void 0 ? {} : { ORK_BIN: orkBin }
+	...orkBin === void 0 ? {} : { ORK_BIN: orkBin },
+	...context.item === void 0 ? {} : {
+		ORK_ITEM: typeof context.item.value === "string" ? context.item.value : JSON.stringify(context.item.value),
+		ORK_INDEX: String(context.item.index)
+	}
 });
 /** The variables a workflow's nodes read that no `plainEnv` excuses. */
 const secretNamesOf = (workflow) => Object.values(workflow.nodes).flatMap((node) => programsRunBy(node, workflow.defaults)).flatMap(({ program }) => {
@@ -1061,7 +1093,7 @@ const secretsOf = (workflow, environ, also = []) => valuesOf(namesToMask(workflo
 const renderEnv = (node, context, environ) => {
 	const values = {};
 	const scope = {
-		...runScope(context.inputs, context.outputs, context.runId),
+		...runScope(context.inputs, context.outputs, context.runId, context.item),
 		output: { env: environ }
 	};
 	for (const [key, text] of Object.entries(node.env ?? {})) {
@@ -1151,7 +1183,7 @@ const render = (text, context) => {
 	};
 	return {
 		ok: true,
-		value: renderTemplate(template.parts, runScope(context.inputs, context.outputs, context.runId))
+		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. */
@@ -1538,22 +1570,7 @@ const specFor = (spec, context) => {
 };
 /** Runs a `claude.leader` or `claude.worker` as one session. */
 const claudeExecutor = (options) => async (context) => {
-	const planOptions = {
-		cwd: context.cwd,
-		inputs: context.inputs,
-		outputs: context.outputs,
-		inPlace: options.inPlace,
-		workflowDir: context.workflowDir,
-		projectRoot: context.projectRoot,
-		...context.orkDir === void 0 ? {} : { orkDir: context.orkDir },
-		pluginDir: path.join(context.runDir, "plugins", context.id)
-	};
-	if (context.checkout !== void 0) planOptions.checkout = context.checkout;
-	if (context.brief !== void 0) planOptions.brief = context.brief;
-	if (context.template !== void 0) planOptions.template = context.template;
-	if (context.ownership !== void 0) planOptions.ownership = context.ownership;
-	if (context.mailbox !== void 0) planOptions.mailbox = context.mailbox;
-	if (context.claims !== void 0) planOptions.claims = context.claims;
+	const planOptions = planOptionsOf(context, options.inPlace);
 	const before = beforeOf(context.node, context.workflow.defaults);
 	if (before !== void 0) {
 		const ran = await runStep(options.steps ?? noSteps, context, before, {
@@ -1853,7 +1870,7 @@ const mcpCallExecutor = (options = {}) => async (context) => {
 	}, node.plainEnv);
 	if (!expanded.ok) return failed(expanded.error);
 	const scrub = scrubberOf([...secretsOf(context.workflow, environ, options.maskedNames), ...expanded.value.values]);
-	const scope = runScope(context.inputs, context.outputs, context.runId);
+	const scope = runScope(context.inputs, context.outputs, context.runId, context.item);
 	const args = Object.fromEntries(Object.entries(node.arguments ?? {}).map(([key, value]) => [key, renderValue(value, scope)]));
 	const name = `${node.server}.${node.tool}`;
 	context.emit({

package/dist/{src-CxZr4Bp2.mjs → src-DhGLtYR-.mjs}

@@ -1,4 +1,4 @@
-import { Ht as FEEDBACK_SEVERITIES, Ut as FEEDBACK_TARGETS, Vt as FEEDBACK_KINDS, pt as parseReport } from "./src-Do_MhwiV.mjs";
+import { Ht as FEEDBACK_SEVERITIES, Ut as FEEDBACK_TARGETS, Vt as FEEDBACK_KINDS, dt as parseReport } from "./src-BsLHKQRc.mjs";
 import { z } from "zod";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { createInterface } from "node:readline";
@@ -336,20 +336,45 @@ const text = (value) => ({ content: [{
 	type: "text",
 	text: value
 }] });
-const defineTool = (definition) => {
-	const schema = z.object(definition.shape);
-	return {
-		name: definition.name,
-		bind: (context) => definition.available?.(context) ?? true ? {
+const issueAt = (issue) => {
+	const where = z.core.toDotPath(issue.path);
+	return where === "" ? "" : `${where}: `;
+};
+/** Whether `issue` is about a field of the object `parent` is about. */
+const isFieldOf = (issue, parent) => issue.path.length === parent.path.length + 1 && parent.path.every((key, index) => key === issue.path[index]);
+const expectedField = (issue) => `; the field is \`${String(issue.path.at(-1))}\`${issue.code === "invalid_value" ? `, one of: ${issue.values.join(", ")}` : ""}`;
+/**
+* A failed parse as text a model can act on. A stray key is reported with the
+* fields its object lacks, read from the schema's own issues: a wrong name is
+* otherwise only a "missing" error that hides what was sent.
+*/
+const readableIssues = (issues) => {
+	const strays = issues.filter((issue) => issue.code === "unrecognized_keys");
+	const lacking = issues.filter((issue) => issue.input === void 0 && strays.some((stray) => isFieldOf(issue, stray)));
+	return [...strays.map((stray) => `${issueAt(stray)}unknown field ${stray.keys.map((key) => `\`${key}\``).join(", ")}${lacking.filter((issue) => isFieldOf(issue, stray)).map((issue) => expectedField(issue)).join("")}`), ...issues.filter((issue) => issue.code !== "unrecognized_keys" && !lacking.includes(issue)).map((issue) => `${issueAt(issue)}${issue.message}`)].join("\n");
+};
+const defineTool = (definition) => ({
+	name: definition.name,
+	bind: (context) => {
+		if (!(definition.available?.(context) ?? true)) return null;
+		const shape = typeof definition.shape === "function" ? definition.shape(context) : definition.shape;
+		const schema = z.object(shape);
+		return {
 			name: definition.name,
-			description: definition.description,
-			shape: definition.shape,
+			description: typeof definition.description === "function" ? definition.description(context) : definition.description,
+			shape,
 			schema,
 			preapproved: definition.preapproved ?? true,
-			call: (args) => definition.run(context, schema.parse(args))
-		} : null
-	};
-};
+			call: (args) => {
+				const parsed = schema.safeParse(args, { reportInput: true });
+				return parsed.success ? definition.run(context, parsed.data) : Promise.resolve({
+					...text(readableIssues(parsed.error.issues)),
+					isError: true
+				});
+			}
+		};
+	}
+});
 // ../runtime-claude/src/mcp-http.ts
 /**
 * @file A minimal MCP server over the streamable HTTP transport, for the
@@ -618,13 +643,18 @@ const delegationText = (delegation) => text(JSON.stringify({
 	reports: delegation.reports.map(reportLine),
 	...delegation.notes.length > 0 ? { notes: delegation.notes } : {}
 }));
+/** Why a child the leader owns isn't offered, so it doesn't go looking. */
+const fannedNote = (fanned) => fanned.length === 0 ? "" : ` Not listed: ${fanned.join(", ")}; such a node runs once per item of a list, from its edges, so it can't be delegated to.`;
 const delegateTool = defineTool({
 	name: "delegate",
-	description: "Hand tasks to nodes you own. Tasks in one call run in parallel; the call returns every child's report when all are done. Ork merges a passing child's branch into yours.",
-	shape: { tasks: z.array(z.object({
-		child: z.string().describe("The id of a node you own."),
-		brief: BRIEF
-	})).min(1) },
+	description: ({ ports }) => `Hand tasks to nodes you own. Tasks in one call run in parallel; the call returns every child's report when all are done. Ork merges a passing child's branch into yours.${fannedNote(ports.ownership?.fanned ?? [])}`,
+	shape: ({ ports }) => {
+		const ids = ports.ownership?.children.map((child) => child.id) ?? [];
+		return { tasks: z.array(z.strictObject({
+			child: z.enum(ids).describe(`The id of a node you own: ${ids.join(", ")}.`),
+			brief: BRIEF
+		})).min(1) };
+	},
 	available: ({ ports }) => (ports.ownership?.children.length ?? 0) > 0,
 	run: async ({ ports }, args) => {
 		if (ports.ownership === void 0) return text("You own no nodes.");
@@ -634,10 +664,13 @@ const delegateTool = defineTool({
 const spawnWorkerTool = defineTool({
 	name: "spawn_worker",
 	description: "Start new instances of a child worker for work that splits into independent parts. Each runs in its own worktree; the call returns their reports when all are done.",
-	shape: { tasks: z.array(z.object({
-		template: z.string().describe("The id of a child worker you own."),
-		brief: BRIEF
-	})).min(1) },
+	shape: ({ ports }) => {
+		const ids = ports.ownership?.templates ?? [];
+		return { tasks: z.array(z.strictObject({
+			template: z.enum(ids).describe(`The id of a child worker you own: ${ids.join(", ")}.`),
+			brief: BRIEF
+		})).min(1) };
+	},
 	available: ({ ports }) => ports.ownership !== void 0 && ports.ownership.templates.length > 0 && ports.ownership.workersLeft() > 0,
 	run: async ({ ports }, args) => {
 		if (ports.ownership === void 0) return text("You own no workers.");