@krapht/ork 1.0.0-alpha.10 → 1.0.0-alpha.12

package/dist/{__build_info__-DFF18K8y.mjs → __build_info__-BJbE3Zvp.mjs}

@@ -1,4 +1,4 @@
-import { $t as targetOf, An as inside, Ct as runTree, Fn as plainPathInside, Ht as FEEDBACK_KINDS, In as writePlainFile, Mn as LESSON_CAP_TOKENS, Nn as estimateTokens, Pn as guardedBase, Tn as placeFor, Ut as FEEDBACK_SEVERITIES, Yt as publishPost, Zt as fingerprint, g as parseVersion, h as isNewer, m as compareVersions, un as maskSecrets, wn as placeFiles } from "./src-Df6KOIDC.mjs";
+import { Bn as placeFiles, En as maskSecrets, Jn as LESSON_CAP_TOKENS, Kn as inside, Qn as writePlainFile, Vn as placeFor, Xn as guardedBase, Yn as estimateTokens, Zn as plainPathInside, an as FEEDBACK_SEVERITIES, d as parseVersion, dn as publishPost, hn as targetOf, in as FEEDBACK_KINDS, l as compareVersions, pn as fingerprint, u as isNewer } from "./src-CdDTQLdQ.mjs";
 import path from "node:path";
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
@@ -402,6 +402,7 @@ const nodeSession = (events, node) => {
 			session.sessionId = inner.sessionId;
 			if (inner.cwd !== void 0) session.cwd = inner.cwd;
 			if (inner.driver !== void 0) session.driver = inner.driver;
+			if (inner.model !== "") session.model = inner.model;
 		}
 		if (inner.type === "session.finished" && inner.outcome.sessionId !== "") session.sessionId = inner.outcome.sessionId;
 	}
@@ -410,75 +411,6 @@ const nodeSession = (events, node) => {
 		outputs
 	};
 };
-// ../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;
-};
 /** The dist-tags every install follows, toward and after 1.0.0. */
 const CHANNEL_TAGS = [
 	"latest",
@@ -680,5 +612,5 @@ const registryShown = (registry) => {
 *   fails when it is stale.
 */
 const ORK_NAME = "@krapht/ork";
-const ORK_VERSION = "1.0.0-alpha.10";
-export { placeOf as C, lessonPlaceOf as S, openFixRun as T, nodeSession as _, registryShown as a, recordNote as b, checkDue as c, pendingNotice as d, readUpdateCache as f, activeTree as g, writeUpdateCache as h, registryOf as i, fetchLatest as l, updateCachePath as m, ORK_VERSION as n, updateSwitchOff as o, refreshUpdateCache as p, isSwitchedOn as r, runInstall as s, ORK_NAME as t, newerVersion as u, previewPost as v, feedbackActions as w, acceptItem as x, checkNote as y };
+const ORK_VERSION = "1.0.0-alpha.12";
+export { feedbackActions as C, placeOf as S, previewPost as _, registryShown as a, acceptItem as b, checkDue as c, pendingNotice as d, readUpdateCache as f, nodeSession as g, writeUpdateCache as h, registryOf as i, fetchLatest as l, updateCachePath as m, ORK_VERSION as n, updateSwitchOff as o, refreshUpdateCache as p, isSwitchedOn as r, runInstall as s, ORK_NAME as t, newerVersion as u, checkNote as v, openFixRun as w, lessonPlaceOf as x, recordNote as y };

package/dist/attach-BmV5ckb9.mjs

@@ -0,0 +1,89 @@
+import "./src-CdDTQLdQ.mjs";
+import { l as createTerminalHuman, n as attachRun, t as withStore } from "./store-B2OaE4ID.mjs";
+import { t as findRun } from "./find-p05wlbmu.mjs";
+import { a as style, o as write, s as writeErr } from "./output-CnRzrbUM.mjs";
+import { n as attachRefusal } from "./in-a-run-BI-hLIl_.mjs";
+import { defineCommand } from "citty";
+// src/commands/attach.ts
+/**
+* @file `ork attach`: follow a run and the runs it called on this terminal, and
+*   answer their open decisions here (specs/cli.md). Ctrl-C detaches: the run
+*   keeps going and its decisions stay open (specs/run-control.md).
+*/
+/**
+* Follows `runId` and what it called until it ends or the person detaches, and
+* returns the exit code: 0 when the run succeeded or they detached, else 1.
+*/
+const attachSession = async (store, runId, session) => {
+	const detach = new AbortController();
+	session.signal?.addEventListener("abort", () => {
+		detach.abort();
+	});
+	const interactive = session.terminal?.interactive === true;
+	const human = session.terminal === void 0 || !interactive ? void 0 : createTerminalHuman({
+		...session.terminal,
+		interrupt: () => {
+			detach.abort();
+		}
+	});
+	try {
+		const attached = await attachRun(store, runId, session.out, {
+			signal: detach.signal,
+			hintNoTerminal: human === void 0,
+			...human === void 0 ? {} : { human },
+			...session.home === void 0 ? {} : { home: session.home },
+			...session.intervalMs === void 0 ? {} : { intervalMs: session.intervalMs }
+		});
+		if (detach.signal.aborted) {
+			session.out(style("dim", `detached; run ${runId} keeps going · ork attach ${runId} · ork stop ${runId}`));
+			return 0;
+		}
+		return attached.exitCode;
+	} finally {
+		human?.close();
+	}
+};
+const attach = defineCommand({
+	meta: {
+		name: "attach",
+		description: "Follow a run and the runs it called, and answer their questions here; Ctrl-C detaches"
+	},
+	args: { run: {
+		type: "positional",
+		description: "A run id or a prefix of one",
+		required: true
+	} },
+	run: ({ args }) => withStore(async (store) => {
+		const refusal = process.stdin.isTTY ? attachRefusal() : null;
+		if (refusal !== null) {
+			writeErr(refusal);
+			process.exitCode = 1;
+			return;
+		}
+		const found = findRun(store, args.run, process.cwd());
+		if (!found.ok) {
+			writeErr(found.error);
+			process.exitCode = 1;
+			return;
+		}
+		const abort = new AbortController();
+		const onSigint = () => {
+			abort.abort();
+		};
+		process.once("SIGINT", onSigint);
+		try {
+			process.exitCode = await attachSession(store, found.run.id, {
+				out: write,
+				signal: abort.signal,
+				terminal: {
+					input: process.stdin,
+					output: process.stdout,
+					interactive: process.stdin.isTTY
+				}
+			});
+		} finally {
+			process.off("SIGINT", onSigint);
+		}
+	})
+});
+export { attach };