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

package/dist/ui/index.html

@@ -19,7 +19,7 @@
       href="/favicon.svg"
       type="image/svg+xml"
     />
-    <script type="module" crossorigin src="/assets/index-DV1ZaOk-.js"></script>
+    <script type="module" crossorigin src="/assets/index-By_8KKG6.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/theme-CdXvqTQ6.js">
     <link rel="stylesheet" crossorigin href="/assets/index-BPIbqRRb.css">
   </head>

package/dist/{ui-CBkHJdqk.mjs → ui-CIci4UBW.mjs}

@@ -1,7 +1,7 @@
-import { n as ORK_VERSION, t as ORK_NAME } from "./__build_info__-DFF18K8y.mjs";
-import { a as write, i as style, o as writeErr } from "./output-Bqljtmp_.mjs";
-import { a as mayShowSignIn } from "./in-a-run-BS9Nc-JW.mjs";
-import { i as uiFilePath, l as newToken, n as startServer, r as runningServer, t as DEFAULT_PORT } from "./src-i5k2Y-kf.mjs";
+import { n as ORK_VERSION, t as ORK_NAME } from "./__build_info__-CIchF6nr.mjs";
+import { a as write, i as style, o as writeErr } from "./output-CM95njYt.mjs";
+import { a as mayShowSignIn } from "./in-a-run-CgkVouyG.mjs";
+import { i as uiFilePath, l as newToken, n as startServer, r as runningServer, t as DEFAULT_PORT } from "./src-B6KvTm7B.mjs";
 import path from "node:path";
 import { constants } from "node:os";
 import { spawn } from "node:child_process";

package/dist/{usage-Cd8pEYyK.mjs → usage-GceBGMjU.mjs}

@@ -1,9 +1,10 @@
-import { D as openStore, Dn as runDirOf, Tn as placeFor, bt as liveStatus, c as usd } from "./src-Df6KOIDC.mjs";
-import { n as listOrkWorktrees, t as createdWorktrees } from "./list-Qxr6rwsY.mjs";
-import { n as usageReport, t as USAGE_DIMENSIONS } from "./report-DK4LGqwF.mjs";
-import { a as write, i as style, n as cost, o as writeErr, t as confirm } from "./output-Bqljtmp_.mjs";
-import "./format-Cb5_m-Qd.mjs";
-import { n as limitsHere } from "./limits-BSwEjQST.mjs";
+import { C as openStore, Un as runDirOf, Vn as placeFor, ot as usd, xt as liveStatus } from "./src-D6_xjm-x.mjs";
+import { n as listOrkWorktrees, t as createdWorktrees } from "./list-CEaJ07jd.mjs";
+import { n as usageReport, t as USAGE_DIMENSIONS } from "./report-CEN8VoUb.mjs";
+import { a as write, b as termOf, i as style, n as cost, o as writeErr, t as confirm } from "./output-CM95njYt.mjs";
+import { n as chip, t as CHIP_LABELS } from "./chips-BA7SrrH5.mjs";
+import { a as header, o as table } from "./format-lWhN-jYR.mjs";
+import { n as limitsHere } from "./limits-jZQp9ZJC.mjs";
 import { existsSync, rmSync } from "node:fs";
 import { defineCommand } from "citty";
 // ../core/src/store/prune.ts
@@ -197,24 +198,31 @@ const TITLES = {
 	driver: "By driver",
 	project: "By project"
 };
-const table = (groups) => {
-	const rows = groups.map((group) => ({
-		key: group.key,
-		cost: cost(group.costUsd),
-		sessions: String(group.sessions),
-		tokens: `${tokens(group.inputTokens + group.cacheReadTokens + group.cacheWriteTokens)} in / ${tokens(group.outputTokens)} out`,
-		cache: percent(group.cacheHitRate)
-	}));
-	const width = (pick, title) => Math.max(title.length, ...rows.map((row) => pick(row).length));
-	const w = {
-		key: width((r) => r.key, ""),
-		cost: width((r) => r.cost, "COST"),
-		sessions: width((r) => r.sessions, "SESSIONS"),
-		tokens: width((r) => r.tokens, "TOKENS")
-	};
-	const line = (key, c, s, t, h) => `  ${key.padEnd(w.key)}  ${c.padStart(w.cost)}  ${s.padStart(w.sessions)}  ${t.padEnd(w.tokens)}  ${h}`;
-	return [style("dim", line("", "COST", "SESSIONS", "TOKENS", "CACHE")), ...rows.map((r) => line(r.key, r.cost, r.sessions, r.tokens, r.cache))];
-};
+/** Seconds of CPU, `12.3 s`; empty with none. */
+const cpuText = (ms) => ms === 0 ? "" : `${(ms / 1e3).toFixed(1)} s`;
+/** `cpu`: a column for the CPU Ork's tool commands used. */
+const usageTable = (term, groups, cpu = false) => table(term, [
+	{ flex: true },
+	{ align: "right" },
+	{ align: "right" },
+	{},
+	{},
+	...cpu ? [{ align: "right" }] : []
+], [[
+	header(""),
+	header("COST"),
+	header("SESSIONS"),
+	header("TOKENS"),
+	header("CACHE"),
+	...cpu ? [header("TOOL CPU")] : []
+], ...groups.map((group) => [
+	{ text: group.key },
+	{ text: cost(group.costUsd) },
+	{ text: String(group.sessions) },
+	{ text: `${tokens(group.inputTokens + group.cacheReadTokens + group.cacheWriteTokens)} in / ${tokens(group.outputTokens)} out` },
+	{ text: percent(group.cacheHitRate) },
+	...cpu ? [{ text: cpuText(group.cpuMs) }] : []
+])], "  ");
 /** What `ork usage` prints without `--by`. */
 const OVERVIEW = [
 	"day",
@@ -228,29 +236,31 @@ const shortTime = (iso) => new Date(iso).toLocaleString(void 0, {
 	dateStyle: "medium",
 	timeStyle: "short"
 });
+/** A warning line: a `WARN` chip when rich, else the line in yellow. */
+const warned = (term, text) => term.rich ? `  ${chip(term, CHIP_LABELS.warn, "warn")} ${text}` : style("yellow", `  ${text}`);
 /** The limits across runs, above a report; nothing with none set. */
-const formatLimits = ({ problems, caps, plan }) => {
+const formatLimits = ({ problems, caps, plan }, term = termOf(process.stdout)) => {
 	if (problems.length === 0 && caps.length === 0 && plan.length === 0) return [];
 	return [
 		style("bold", "Limits"),
-		...problems.map((problem) => style("yellow", `  ${problem}`)),
+		...problems.map((problem) => warned(term, problem)),
 		...caps.map((cap) => {
 			const line = `  ${cap.project === void 0 ? "all projects" : "this project"}, this ${cap.window}: ${usd(cap.spentUsd)} of ${usd(cap.capUsd)}, resets ${shortTime(cap.resetsAt)}`;
-			return cap.leftUsd <= 0 ? style("yellow", line) : line;
+			return cap.leftUsd <= 0 ? warned(term, line.trimStart()) : line;
 		}),
-		...plan.map((limit) => style("yellow", `  Claude plan's ${limit.window.replaceAll("_", " ")} limit ${limit.status === "rejected" ? "was reached" : "is close"}${limit.resetsAt === void 0 ? "" : `, resets ${shortTime(limit.resetsAt)}`}`)),
+		...plan.map((limit) => warned(term, `Claude plan's ${limit.window.replaceAll("_", " ")} limit ${limit.status === "rejected" ? "was reached" : "is close"}${limit.resetsAt === void 0 ? "" : `, resets ${shortTime(limit.resetsAt)}`}`)),
 		""
 	];
 };
 /** The report, as the terminal shows it. */
-const formatUsage = (report, scope, by) => {
+const formatUsage = (report, scope, by, term = termOf(process.stdout)) => {
 	const { totals } = report;
 	if (totals.sessions === 0) return [`No Claude sessions in ${scope}.`];
 	const lines = [`${style("bold", cost(totals.costUsd))} in ${scope}`, `${counted(totals.runs, "run")} · ${counted(totals.sessions, "session")} · ${counted(totals.turns, "turn")} · ${tokens(totals.inputTokens + totals.cacheReadTokens + totals.cacheWriteTokens)} in / ${tokens(totals.outputTokens)} out · ${percent(totals.cacheHitRate)} from cache`];
 	for (const dimension of by === void 0 ? OVERVIEW : [by]) {
 		const groups = report.groups[dimension];
 		const shown = by === void 0 ? dimension === "day" ? groups.slice(-10) : groups.slice(0, OVERVIEW_ROWS) : groups;
-		lines.push("", style("bold", TITLES[dimension]), ...table(shown));
+		lines.push("", style("bold", TITLES[dimension]), ...usageTable(term, shown, dimension === "node"));
 		if (shown.length < groups.length) lines.push(style("dim", `  and ${String(groups.length - shown.length)} more (--by ${dimension})`));
 	}
 	const hints = report.hints.length === 0 ? [] : [
@@ -333,12 +343,13 @@ const usage = defineCommand({
 		const store = openStore();
 		try {
 			if (args["clear-plan-limits"]) store.clearPlanLimits();
-			const report = usageReport(store.usage({
+			const filter = {
 				...args.all ? {} : { project: placeFor(process.cwd(), store.projects()).root },
 				...args.workflow === void 0 ? {} : { workflow: args.workflow },
 				...since === void 0 ? {} : { since },
 				...until === void 0 ? {} : { until }
-			}));
+			};
+			const report = usageReport(store.usage(filter), store.toolCpu(filter));
 			const limits = limitsHere(store, args.all ? void 0 : placeFor(process.cwd(), store.projects()));
 			if (args.json) {
 				write(JSON.stringify({

package/dist/{watch-DW5R2OPO.mjs → watch-BmoybMQg.mjs}

@@ -1,9 +1,10 @@
-import { D as openStore, Et as stillTheSameProcess, S as readProjectTriggers, T as watchingPid, Xn as CheckReportSchema, ar as timeoutMs, b as triggerStanding, bt as liveStatus, it as detachRun, tr as isToolNode, v as triggersReport, w as takeWatchLock, wn as placeFiles, x as declaredTriggers, y as createWatcher } from "./src-Df6KOIDC.mjs";
-import { n as newRunId } from "./find-DEjjOlTG.mjs";
-import { a as write, i as style, o as writeErr, r as plain, t as confirm } from "./output-Bqljtmp_.mjs";
-import { c as toolExecutor, o as spawnTool, s as mcpCallExecutor } from "./src-cmmXKHn1.mjs";
-import { i as runLimits, r as limitsRefusal } from "./limits-BSwEjQST.mjs";
-import { t as acceptRefusal } from "./in-a-run-BS9Nc-JW.mjs";
+import { Bn as placeFiles, C as openStore, Ot as stillTheSameProcess, _ as readProjectTriggers, _r as isToolNode, b as watchingPid, et as detachRun, fr as CheckReportSchema, g as declaredTriggers, h as triggerStanding, m as createWatcher, p as triggersReport, xr as timeoutMs, xt as liveStatus, y as takeWatchLock } from "./src-D6_xjm-x.mjs";
+import { n as newRunId } from "./find-BicBbGMg.mjs";
+import { C as widthOf, a as write, b as termOf, i as style, o as writeErr, r as plain, t as confirm, x as cut } from "./output-CM95njYt.mjs";
+import { n as chip, t as CHIP_LABELS } from "./chips-BA7SrrH5.mjs";
+import { c as toolExecutor, o as spawnTool, s as mcpCallExecutor } from "./src-9iGkjnsy.mjs";
+import { i as runLimits, r as limitsRefusal } from "./limits-jZQp9ZJC.mjs";
+import { t as acceptRefusal } from "./in-a-run-CgkVouyG.mjs";
 import path from "node:path";
 import { mkdirSync } from "node:fs";
 import { homedir } from "node:os";
@@ -63,7 +64,7 @@ const lookAt = async (options) => {
 	});
 	return result.ok ? resultOf(result.output["json"]) : {
 		ok: false,
-		error: result.error ?? "the check failed"
+		error: [result.error ?? "the check failed", result.end?.detail].filter((part) => part !== void 0).join(": ")
 	};
 };
 // src/watch/report.ts
@@ -73,10 +74,21 @@ const STANDING = {
 	changed: "off: changed since it was accepted",
 	invalid: "off: has an error"
 };
-const brokenLines = (broken) => broken.map(({ file, message }) => `${style("red", "✗")} ${plain(file)}: ${plain(message)}`);
-const statusLines = (report) => {
+/** A failure's mark: a `FAIL` chip when rich, else the red `✗`. */
+const failMark = (term) => term.rich ? chip(term, CHIP_LABELS.fail, "danger") : style("red", "✗");
+/** A warning's mark: a `WARN` chip when rich, else the yellow `!`. */
+const warnMark = (term) => term.rich ? chip(term, CHIP_LABELS.warn, "warn") : style("yellow", "!");
+/** A trigger's standing, rich: a chip and what it adds. */
+const standingChip = (term, standing) => {
+	const live = standing === "live";
+	const label = live ? "LIVE" : "OFF";
+	const text = STANDING[standing] ?? standing;
+	return `${chip(term, label, live ? "ok" : standing === "invalid" ? "danger" : "warn")}${live ? "" : ` ${text.replace(/^off: /u, "")}`}`;
+};
+const brokenLines = (broken, term = termOf(process.stdout)) => broken.map(({ file, message }) => `${failMark(term)} ${plain(file)}: ${plain(message)}`);
+const statusLines = (report, term = termOf(process.stdout)) => {
 	const head = report.pid === void 0 ? "ork watch isn't running. Start it with `ork watch`, or `ork watch --detach`." : `ork watch is running (process ${String(report.pid)}).`;
-	const broken = brokenLines(report.broken);
+	const broken = brokenLines(report.broken, term);
 	if (report.triggers.length === 0) return [
 		head,
 		...broken,
@@ -86,11 +98,11 @@ const statusLines = (report) => {
 		head,
 		...broken,
 		...report.triggers.flatMap((status) => [
-			`${style("bold", plain(status.trigger))} ${style("dim", plain(`${status.project} → ${status.run}, every ${status.every}`))}`,
-			`  ${STANDING[status.standing] ?? status.standing}${status.lookedAt === void 0 ? "" : `, last looked ${status.lookedAt}`}`,
+			term.rich ? `${style("bold", plain(status.trigger))} ${style("dim", cut(plain(`${status.project} → ${status.run}, every ${status.every}`), Math.max(8, term.width - widthOf(status.trigger) - 1)))}` : `${style("bold", plain(status.trigger))} ${style("dim", plain(`${status.project} → ${status.run}, every ${status.every}`))}`,
+			`  ${term.rich ? standingChip(term, status.standing) : STANDING[status.standing] ?? status.standing}${status.lookedAt === void 0 ? "" : `, last looked ${status.lookedAt}`}`,
 			...status.error === void 0 ? [] : [`  last look: ${plain(status.error)}`],
 			...status.held === void 0 ? [] : [`  waiting: ${plain(status.held)}`],
-			...status.problems.map((problem) => `  ${style("red", "✗")} ${plain(problem)}`)
+			...status.problems.map((problem) => `  ${failMark(term)} ${plain(problem)}`)
 		])
 	];
 };
@@ -126,16 +138,16 @@ const STANDS = {
 	new: "new",
 	changed: "changed since you accepted it, here or in the workflow it starts"
 };
-const acceptLines = (item, standing) => [
+const acceptLines = (item, standing, term = termOf(process.stdout)) => [
 	`${style("bold", plain(item.id))} ${style("dim", plain(item.place.root))}`,
 	`  ${STANDS[standing] ?? standing}`,
 	...checkLines(item),
 	`  starts: ${plain(item.trigger.run)}, looking every ${item.trigger.every}, with up to ${String(item.trigger.maxRunsPerDay ?? 10)} runs a day`,
 	...workflowLines(item),
-	...item.diagnostics.filter(({ severity }) => severity === "warning").map(({ message }) => `  ${style("yellow", "!")} ${plain(message)}`)
+	...item.diagnostics.filter(({ severity }) => severity === "warning").map(({ message }) => `  ${warnMark(term)} ${plain(message)}`)
 ];
 /** The triggers `--accept` can't offer, so they aren't silently left out. */
-const unacceptableLines = (item) => [`${style("bold", plain(item.id))} ${style("dim", plain(item.place.root))}`, ...item.diagnostics.filter(({ severity }) => severity === "error").map(({ message }) => `  ${style("red", "✗")} ${plain(message)}`)];
+const unacceptableLines = (item, term = termOf(process.stdout)) => [`${style("bold", plain(item.id))} ${style("dim", plain(item.place.root))}`, ...item.diagnostics.filter(({ severity }) => severity === "error").map(({ message }) => `  ${failMark(term)} ${plain(message)}`)];
 // src/watch/start.ts
 /**
 * @file Starting a trigger's run (RFC-011): an ordinary run in the background,

package/dist/{workflows-BT1gDRIV.mjs → workflows-DZvW3i1e.mjs}

@@ -1,6 +1,6 @@
-import { An as inside, D as openStore, Dn as runDirOf, O as storePath, Tn as placeFor, wn as placeFiles } from "./src-Df6KOIDC.mjs";
-import { i as builtinWorkflowFile, r as builtinProblem, s as isBuiltinArg } from "./decide-3l9q8UtX.mjs";
-import { o as writeErr } from "./output-Bqljtmp_.mjs";
+import { Bn as placeFiles, C as openStore, Kn as inside, Un as runDirOf, Vn as placeFor, w as storePath } from "./src-D6_xjm-x.mjs";
+import { i as builtinWorkflowFile, r as builtinProblem, s as isBuiltinArg } from "./decide-B6PnKeqo.mjs";
+import { o as writeErr } from "./output-CM95njYt.mjs";
 import path from "node:path";
 import { existsSync, readdirSync, statSync } from "node:fs";
 // src/project/place.ts

package/dist/{worktrees-g1MQMGie.mjs → worktrees-Be51E2rB.mjs}

@@ -1,7 +1,8 @@
-import { A as inspectProject, D as openStore } from "./src-Df6KOIDC.mjs";
-import { a as planClean, i as keyOf, o as stepActs, t as applyClean } from "./clean-DVaEH9e7.mjs";
-import { a as readWorktrees, c as mergeStateOf, d as stateParts, l as planLine, n as lostWork, o as repoRoot, r as planRemove, s as labelOf, t as applyRemove } from "./remove-0IQZVWmI.mjs";
-import { a as write, i as style, o as writeErr, t as confirm } from "./output-Bqljtmp_.mjs";
+import { C as openStore, E as inspectProject } from "./src-D6_xjm-x.mjs";
+import { a as planClean, i as keyOf, o as stepActs, t as applyClean } from "./clean-Di-KT7Mf.mjs";
+import { a as readWorktrees, c as mergeStateOf, d as stateParts, l as planLine, n as lostWork, o as repoRoot, r as planRemove, s as labelOf, t as applyRemove } from "./remove-CpMb4NDl.mjs";
+import { a as write, b as termOf, f as paint, i as style, o as writeErr, t as confirm, x as cut } from "./output-CM95njYt.mjs";
+import { n as chip } from "./chips-BA7SrrH5.mjs";
 import path from "node:path";
 import { realpathSync } from "node:fs";
 import { defineCommand } from "citty";
@@ -19,7 +20,7 @@ const goAhead = async (yes, verb, terminal = process.stdin.isTTY, ask = confirm)
 		process.exitCode = 1;
 		return false;
 	}
-	if (await ask("Go ahead? [y/N] ")) return true;
+	if (await ask("Go ahead?")) return true;
 	write("Cancelled.");
 	return false;
 };
@@ -32,18 +33,18 @@ const goAhead = async (yes, verb, terminal = process.stdin.isTTY, ask = confirm)
 *   them.
 */
 /** One line of state: its merge state, then what clean would care about. */
-const worktreeState = (item) => {
+const worktreeState = (item, term = termOf(process.stdout)) => {
 	const merge = mergeStateOf(item);
-	const head = merge === "merged" ? [style("green", "merged")] : merge === "detached" ? ["detached"] : [];
-	const parts = stateParts(item).map((part) => part.risk ? style("yellow", part.text) : part.text);
+	const head = merge === "merged" ? [term.rich ? chip(term, "MERGED", "ok") : style("green", "merged")] : merge === "detached" ? ["detached"] : [];
+	const parts = stateParts(item).map((part) => part.risk ? paint(term, "warn", part.text) : part.text);
 	return [...head, ...parts].join(" · ");
 };
 /** A name as the list shows it, saying when it's detached. */
 const nameOf = (item) => mergeStateOf(item) === "detached" ? `${labelOf(item)} (detached)` : labelOf(item);
-const formatWorktrees = (items) => {
+const formatWorktrees = (items, term = termOf(process.stdout)) => {
 	if (items.length === 0) return ["No Ork worktrees or branches."];
 	const width = Math.max(...items.map((i) => nameOf(i).length));
-	return items.flatMap((item) => [`${style("bold", nameOf(item).padEnd(width))}  ${worktreeState(item)}`, ...item.path === null ? [] : [`  ${style("dim", item.path)}`]]);
+	return items.flatMap((item) => [`${style("bold", nameOf(item).padEnd(width))}  ${worktreeState(item, term)}`, ...item.path === null ? [] : [`  ${style("dim", term.rich ? cut(item.path, term.width - 2) : item.path)}`]]);
 };
 const formatPlan = (steps) => steps.map((step) => {
 	const { text, reason } = planLine(step);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krapht/ork",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.11",
   "description": "Orchestrate Claude agents on your machine: hierarchical, serializable workflows with a CLI and a localhost UI.",
   "keywords": [
     "claude",

package/dist/output-Bqljtmp_.mjs

@@ -1,40 +0,0 @@
-import { createInterface } from "node:readline/promises";
-import { stripVTControlCharacters, styleText } from "node:util";
-// src/output.ts
-/**
-* @file Terminal output helpers: styled text that turns plain when stdout is
-*   not a TTY or `NO_COLOR` is set, and a yes-or-no question on the terminal.
-*/
-/** Styles text for stdout; plain when stdout is not a TTY or NO_COLOR is set. */
-const style = (format, text) => styleText(format, text, { stream: process.stdout });
-/**
-* Text from outside, fit for a terminal: escape sequences could hide a line on
-* the very screen a person judges from, and a line break could forge one.
-*/
-const plain = (text) => stripVTControlCharacters(text).replaceAll(/[\p{Cc}\p{Bidi_Control}]/gu, " ");
-const write = (text) => {
-	process.stdout.write(`${text}\n`);
-};
-const writeErr = (text) => {
-	process.stderr.write(`${text}\n`);
-};
-/** What a run spent: `$0.0312`, or `$0.00` for nothing. */
-const cost = (usd) => usd === 0 ? "$0.00" : `$${usd.toFixed(4)}`;
-/** Asks a yes-or-no question on the terminal; anything but yes is no. */
-const confirm = async (question) => {
-	const rl = createInterface({
-		input: process.stdin,
-		output: process.stderr
-	});
-	const { promise: ended, resolve: end } = Promise.withResolvers();
-	rl.once("close", () => {
-		end("");
-	});
-	try {
-		const answer = await Promise.race([rl.question(question), ended]);
-		return ["y", "yes"].includes(answer.trim().toLowerCase());
-	} finally {
-		rl.close();
-	}
-};
-export { write as a, style as i, cost as n, writeErr as o, plain as r, confirm as t };