fleetfizz 0.5.1 → 0.5.2

package/dist/fleetfizz.mjs

@@ -32440,7 +32440,7 @@ const runWith = (command, config) => {
 };
 //#endregion
 //#region package.json
-var version = "0.5.1";
+var version = "0.5.2";
 //#endregion
 //#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 /**
@@ -35274,7 +35274,7 @@ const stampText = (text, stamp) => {
 	const fleet = machinesOf(previous);
 	const shippedTo = {
 		...Object.fromEntries(Object.entries(shippedToOf(previous)).filter(([name]) => fleet.includes(name))),
-		...Object.fromEntries(stamp.reached.map((name) => [name, stamp.shippedAt]))
+		...Object.fromEntries([...stamp.reached, ...stamp.own === void 0 ? [] : [stamp.own]].map((name) => [name, stamp.shippedAt]))
 	};
 	let out = set(text, "shippedAt", stamp.shippedAt);
 	out = set(out, "shippedFrom", stamp.shippedFrom);
@@ -35292,6 +35292,7 @@ const shippedToOf = (config) => {
 	return Object.fromEntries(Object.entries(value).filter((entry) => typeof entry[1] === "string"));
 };
 const isNewer = (remote, local) => remote !== void 0 && (local === void 0 || remote > local);
+const staleCopies = (config, copies, own) => copies.filter((c) => c.machine !== own && isNewer(c.config.shippedTo?.[c.machine], config.shippedTo?.[c.machine]));
 //#endregion
 //#region ../../packages/remote/src/shell.ts
 const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
@@ -35319,11 +35320,11 @@ const fingerprintFn = [
 	"}"
 ].join("\n");
 //#endregion
-//#region ../../packages/remote/src/gather.ts
+//#region ../../packages/remote/src/check.ts
 const STATE_DIR = "~/.local/state/fleetfizz";
 const RECORDS_DIR = `${STATE_DIR}/records`;
 const CONFIG_DIR_SH = "\"${XDG_CONFIG_HOME:-$HOME/.config}/fleetfizz\"";
-const gatherScript = (input) => {
+const checkScript = (input) => {
 	const lines = [
 		prelude,
 		fingerprintFn,
@@ -35816,6 +35817,7 @@ const doneLine = (id, ok, code) => code === void 0 ? `printf 'ff-done {"id":"%s"
 const jsonString = encodeSync(fromJsonString(String$5));
 const jsonRecord = encodeSync(fromJsonString(Record(String$5, String$5)));
 const stepId = (repo, step) => `repo:${repo}:${step}`;
+const isFetchStep = (id) => id.startsWith("repo:") && id.endsWith(":fetch");
 const vpStepId = (step) => step.kind === "reinstall" ? `vp:reinstall:${step.name}` : step.kind === "globals" ? "vp:globals" : `vp:${step.kind}`;
 const CONFIG_STEP = "config";
 const VP_INSTALL = [
@@ -35823,6 +35825,15 @@ const VP_INSTALL = [
 	...vpEnv.split("\n"),
 	"{ hash -r 2>/dev/null || true; }"
 ].join(" && ");
+const marked = (id, run, then = []) => [
+	stepLine(id),
+	...run,
+	`ff_code=$?`,
+	`if [ "$ff_code" -ne 0 ]; then ${doneLine(id, false, "$ff_code")}; else`,
+	doneLine(id, true),
+	...then,
+	"fi"
+];
 const vpStep = (step) => {
 	const id = vpStepId(step);
 	const command = (() => {
@@ -35834,22 +35845,12 @@ const vpStep = (step) => {
 			case "globals": return `command vp install -g ${step.packages.map((p) => quote(`${p.name}@${p.version}`)).join(" ")}`;
 		}
 	})();
-	return [
-		stepLine(id),
-		step.kind === "bootstrap" ? command : `( ${command} )`,
-		`ff_code=$?`,
-		`if [ "$ff_code" -ne 0 ]; then ${doneLine(id, false, "$ff_code")}; else ${doneLine(id, true)}; fi`
-	];
+	return marked(id, [step.kind === "bootstrap" ? command : `( ${command} )`]);
 };
 const configStep = () => {
 	const dir = CONFIG_DIR_SH;
 	const write = (variable, file) => `printf '%s' "$${variable}" | base64 -d > ${dir}/${quote(`${file}.tmp`)} && mv -f ${dir}/${quote(`${file}.tmp`)} ${dir}/${quote(file)}`;
-	return [
-		stepLine(CONFIG_STEP),
-		`( mkdir -p ${dir} && ${write("ff_config", CONFIG_FILE)} && ${write("ff_schema", SCHEMA_FILE)} )`,
-		`ff_code=$?`,
-		`if [ "$ff_code" -ne 0 ]; then ${doneLine(CONFIG_STEP, false, "$ff_code")}; else ${doneLine(CONFIG_STEP, true)}; fi`
-	];
+	return marked(CONFIG_STEP, [`( mkdir -p ${dir} && ${write("ff_config", CONFIG_FILE)} && ${write("ff_schema", SCHEMA_FILE)} )`]);
 };
 const writeRecord = (repo) => {
 	return [
@@ -35874,34 +35875,32 @@ const repoSteps = (repo, input) => {
 	return [
 		`ff_d="$ff_root"/${quote(repo.name)}`,
 		`ff_before=$(git -C "$ff_d" rev-parse HEAD 2>/dev/null || true)`,
-		stepLine(fetch),
-		"(",
-		"  set -e",
-		`  if [ ! -d "$ff_d/.git" ]; then ff_git clone --quiet ${quote(url)} "$ff_d"; fi`,
-		`  if [ "$(git -C "$ff_d" remote get-url origin)" != ${quote(url)} ]; then echo "origin is $(git -C "$ff_d" remote get-url origin), expected ${url}"; exit 1; fi`,
-		...sync.map((l) => `  ${l}`),
-		`  git -C "$ff_d" clean --quiet -fd`,
-		...writeFiles(repo).map((l) => `  ${l}`),
-		")",
-		`ff_code=$?`,
-		`if [ "$ff_code" -ne 0 ]; then ${doneLine(fetch, false, "$ff_code")}; else`,
-		`${doneLine(fetch, true)}`,
-		`ff_after=$(git -C "$ff_d" rev-parse HEAD)`,
-		`ff_state "{\\"fact\\":\\"repo\\",\\"name\\":\\"$(ff_json ${quote(repo.name)})\\",\\"present\\":true,\\"head\\":\\"$(ff_json "$ff_after")\\"}"`,
-		`if [ ${repo.decision.run ? "true" : "false"} = true ] || [ "$ff_after" != "$ff_before" ]; then`,
-		`  ${stepLine(install)}`,
-		`  (cd "$ff_d" && ${envPrefix} "\${SHELL:-/bin/sh}" -lc ${quote(repo.install)})`,
-		`  ff_code=$?`,
-		`  if [ "$ff_code" -ne 0 ]; then ${doneLine(install, false, "$ff_code")}; else`,
-		"    (",
-		"      set -e",
-		...writeRecord(repo).map((l) => `      ${l}`),
-		"    )",
-		`    ff_code=$?`,
-		`    if [ "$ff_code" -ne 0 ]; then echo "could not write the install record"; ${doneLine(install, false, "$ff_code")}; else ${doneLine(install, true)}; fi`,
-		"  fi",
-		"fi",
-		"fi"
+		...marked(fetch, [
+			"(",
+			"  set -e",
+			`  if [ ! -d "$ff_d/.git" ]; then ff_git clone --quiet ${quote(url)} "$ff_d"; fi`,
+			`  if [ "$(git -C "$ff_d" remote get-url origin)" != ${quote(url)} ]; then echo "origin is $(git -C "$ff_d" remote get-url origin), expected ${url}"; exit 1; fi`,
+			...sync.map((l) => `  ${l}`),
+			`  git -C "$ff_d" clean --quiet -fd`,
+			...writeFiles(repo).map((l) => `  ${l}`),
+			")"
+		], [
+			`ff_after=$(git -C "$ff_d" rev-parse HEAD)`,
+			`ff_state "{\\"fact\\":\\"repo\\",\\"name\\":\\"$(ff_json ${quote(repo.name)})\\",\\"present\\":true,\\"head\\":\\"$(ff_json "$ff_after")\\"}"`,
+			`if [ ${repo.decision.run ? "true" : "false"} = true ] || [ "$ff_after" != "$ff_before" ]; then`,
+			`  ${stepLine(install)}`,
+			`  (cd "$ff_d" && ${envPrefix} "\${SHELL:-/bin/sh}" -lc ${quote(repo.install)})`,
+			`  ff_code=$?`,
+			`  if [ "$ff_code" -ne 0 ]; then ${doneLine(install, false, "$ff_code")}; else`,
+			"    (",
+			"      set -e",
+			...writeRecord(repo).map((l) => `      ${l}`),
+			"    )",
+			`    ff_code=$?`,
+			`    if [ "$ff_code" -ne 0 ]; then echo "could not write the install record"; ${doneLine(install, false, "$ff_code")}; else ${doneLine(install, true)}; fi`,
+			"  fi",
+			"fi"
+		])
 	];
 };
 const applyStdin = (token, config, schema) => [
@@ -37489,8 +37488,8 @@ const exitAlternativeScreen = "\x1B[?1049l";
 //#endregion
 //#region ../../node_modules/.pnpm/is-in-ci@2.0.0/node_modules/is-in-ci/index.js
 var import_react = /* @__PURE__ */ __toESM(require_react(), 1);
-const check = (key) => key in env && env[key] !== "0" && env[key] !== "false";
-const isInCi = check("CI") || check("CONTINUOUS_INTEGRATION");
+const check$1 = (key) => key in env && env[key] !== "0" && env[key] !== "false";
+const isInCi = check$1("CI") || check$1("CONTINUOUS_INTEGRATION");
 //#endregion
 //#region ../../node_modules/.pnpm/auto-bind@5.0.1/node_modules/auto-bind/index.js
 const getAllProperties = (object) => {
@@ -64260,8 +64259,7 @@ const LedgerState = Struct({
 	ended: optionalKey(Number$2)
 });
 const short = (sha) => sha === void 0 ? void 0 : sha.slice(0, 7);
-const FETCH = ":fetch";
-const doingOf = (id) => id === "config" ? "copying" : id.endsWith(FETCH) ? "fetching" : "installing";
+const doingOf = (id) => id === "config" ? "copying" : isFetchStep(id) ? "fetching" : "installing";
 const itemsOf = (p, state) => {
 	const items = /* @__PURE__ */ new Map();
 	const key = (kind, name) => `${kind}:${name}`;
@@ -64343,15 +64341,7 @@ const itemsOf = (p, state) => {
 	return [...items.values()];
 };
 const outcomeOf = (m, dryRun) => m.status === "skipped" ? "skipped" : m.status === "failed" || m.items.some((i) => i.status === "failed") ? "failed" : m.status === "ok" || m.status === "planned" && dryRun ? "ok" : void 0;
-const tally = (state) => {
-	const outcomes = state.machines.map((m) => outcomeOf(m, state.dryRun));
-	const n = (o) => outcomes.filter((x) => x === o).length;
-	return {
-		ok: n("ok"),
-		skipped: n("skipped"),
-		failed: n("failed")
-	};
-};
+const anyFailed = (state) => state.machines.some((m) => outcomeOf(m, state.dryRun) === "failed");
 const makeLedger = fn("makeLedger")(function* (input) {
 	const started = yield* currentTimeMillis;
 	let snapshot = {
@@ -64436,7 +64426,7 @@ const makeLedger = fn("makeLedger")(function* (input) {
 			})),
 			stepStarted: (name, id) => items(name, id, (item, now) => item.status === "failed" ? item : {
 				...item,
-				changes: item.changes || !(id === "config" || id.endsWith(FETCH)),
+				changes: item.changes || !(id === "config" || isFetchStep(id)),
 				status: "running",
 				doing: doingOf(id),
 				started: item.started ?? now
@@ -64452,7 +64442,7 @@ const makeLedger = fn("makeLedger")(function* (input) {
 					ended: now
 				};
 				const { doing: _, ...rest } = item;
-				if (id.endsWith(FETCH)) return item.changes ? item : {
+				if (isFetchStep(id)) return item.changes ? item : {
 					...rest,
 					status: "idle",
 					ended: now
@@ -64908,10 +64898,38 @@ const summaryOf = (m, dryRun) => {
 		text: `${skipped} skipped`,
 		tone: "skip"
 	});
-	return parts.flatMap((part, n) => n === 0 ? [part] : [{
-		text: ", ",
+	return joined(parts);
+};
+const joined = (parts) => parts.flatMap((part, n) => n === 0 ? [part] : [{
+	text: ", ",
+	tone: "dim"
+}, part]);
+const shipSummary = (state) => {
+	const outcomes = state.machines.map((m) => {
+		const outcome = outcomeOf(m, state.dryRun);
+		if (outcome !== "ok") return outcome;
+		const { changes, skipped } = countsOf(m);
+		if (changes > 0) return state.dryRun ? "to change" : "updated";
+		return skipped > 0 ? "skipped" : "up to date";
+	});
+	const counted = (outcome, tone) => {
+		const n = outcomes.filter((o) => o === outcome).length;
+		return n === 0 ? [] : [{
+			text: `${n} ${outcome}`,
+			tone
+		}];
+	};
+	const parts = joined([
+		...counted("updated", "ok"),
+		...counted("to change", "dim"),
+		...counted("up to date", "ok"),
+		...counted("failed", "fail"),
+		...counted("skipped", "skip")
+	]);
+	return parts.length === 0 ? [{
+		text: "nothing changed",
 		tone: "dim"
-	}, part]);
+	}] : parts;
 };
 const elapsed = (started, ended, now) => started === void 0 ? "" : duration((ended ?? now) - started);
 const Parts = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Line, { children: props.parts.map((part, n) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(T, {
@@ -65067,7 +65085,6 @@ const LedgerView = (props) => {
 	const shown = lines.length <= room ? lines : lines.slice(0, Math.max(0, room - 1));
 	const hidden = count(blocks) - (shown.length - cuts);
 	if (room < 1) return null;
-	const t = tally(state);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 		flexDirection: "column",
 		marginTop: 1,
@@ -65079,26 +65096,10 @@ const LedgerView = (props) => {
 			}),
 			state.ended !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 				marginTop: 1,
-				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Parts, { parts: [
-					{
-						text: `${dryRun ? "planned" : "ok"} ${t.ok}`,
-						...t.ok > 0 ? { tone: "ok" } : {}
-					},
-					{ text: "  " },
-					{
-						text: `skipped ${t.skipped}`,
-						...t.skipped > 0 ? { tone: "skip" } : {}
-					},
-					{ text: "  " },
-					{
-						text: `failed ${t.failed}`,
-						...t.failed > 0 ? { tone: "fail" } : {}
-					},
-					...dryRun ? [] : [{
-						text: `  in ${duration(state.ended - state.started)}`,
-						tone: "dim"
-					}]
-				] })
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Parts, { parts: [...shipSummary(state), ...dryRun ? [] : [{
+					text: `  in ${duration(state.ended - state.started)}`,
+					tone: "dim"
+				}]] })
 			}),
 			state.ended !== void 0 && props.hint !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Line, {
 				tone: "dim",
@@ -65287,16 +65288,16 @@ const runOn = fn("runOn")(function* (target, script, secrets, onLine, ledger) {
 	}
 	return run;
 });
-const GATHER_TIMEOUT = "2 minutes";
-const gather = fn("gather")(function* (target, script, ledger) {
+const CHECK_TIMEOUT = "2 minutes";
+const check = fn("check")(function* (target, script, ledger) {
 	const facts = [];
 	const output = [];
 	const run = yield* runOn(target, script, [], (line) => sync(() => {
 		if (line.kind === "state") facts.push(line.fact);
 		else if (line.kind === "text" && line.text.trim() !== "") output.push(line.text.trimEnd());
 	}), ledger).pipe(timeoutOrElse({
-		duration: GATHER_TIMEOUT,
-		orElse: () => ledger.fail(target.name, [`checking took more than ${GATHER_TIMEOUT}; something on that Machine is blocking`, ...output]).pipe(as({ kind: "failed" }))
+		duration: CHECK_TIMEOUT,
+		orElse: () => ledger.fail(target.name, [`checking took more than ${CHECK_TIMEOUT}; something on that Machine is blocking`, ...output]).pipe(as({ kind: "failed" }))
 	}));
 	if (run.kind !== "ran") return { kind: run.kind };
 	const state = assembleState(facts);
@@ -65305,7 +65306,7 @@ const gather = fn("gather")(function* (target, script, ledger) {
 		return { kind: "failed" };
 	}
 	return {
-		kind: "gathered",
+		kind: "checked",
 		state
 	};
 });
@@ -65389,7 +65390,7 @@ const askQuestions = fn("askQuestions")(function* (questions, flags, ledger, ask
 				value: bump
 			},
 			{
-				title: "skip on these Machines (leave as is, report SKIP)",
+				title: "skip on these Machines (leave as is, shown as skipped)",
 				value: { kind: "skip" }
 			},
 			{
@@ -65427,19 +65428,18 @@ const packagesToResolve = (config) => {
 	];
 };
 const rebuildOf = (flags) => flags.rebuild.length === 0 ? "none" : flags.rebuild.includes("all") ? "all" : flags.rebuild;
-const staleConfigs = fn("staleConfigs")(function* (local, inputIsLocalFile, gathered, ledger) {
-	const stale = [];
-	for (const { machine, local: isLocal, state } of gathered) {
-		if (isLocal && inputIsLocalFile || state.config === void 0) continue;
+const staleConfigs = fn("staleConfigs")(function* (config, own, checked, ledger) {
+	const copies = [];
+	for (const { machine, state } of checked) {
+		if (state.config === void 0) continue;
 		const parsed = yield* result(parseConfig(machine.name, state.config));
-		if (parsed._tag === "Failure") {
-			yield* ledger.note("info", `the config on ${machine.name} does not parse; it will be overwritten`);
-			continue;
-		}
-		const remote = parsed.success;
-		if (isNewer(remote.shippedTo?.[machine.name], local.shippedTo?.[machine.name])) stale.push(`${machine.name} (shipped ${remote.shippedAt} from ${remote.shippedFrom ?? "unknown"})`);
+		if (parsed._tag === "Failure") yield* ledger.note("info", `the config on ${machine.name} does not parse; it will be overwritten`);
+		else copies.push({
+			machine: machine.name,
+			config: parsed.success
+		});
 	}
-	return stale;
+	return staleCopies(config, copies, own).map((c) => `${c.machine} (shipped ${c.config.shippedAt} from ${c.config.shippedFrom ?? "unknown"})`);
 });
 const schemaJson = encodeSync(fromJsonString(Unknown, { space: 2 }));
 const ship = fn("ship")(function* (flags) {
@@ -65450,6 +65450,7 @@ const ship = fn("ship")(function* (flags) {
 	const unknown = unknownMachines(config, tailnet, flags.only);
 	if (unknown.length > 0) return yield* fail$1(new ShipError(`unknown Machine: ${unknown.join(", ")} (the tailnet has: ${tailnet.fleet.map((m) => m.name).join(", ")})`));
 	const fleet = new Set(Object.keys(config.machines));
+	const own = flags.config === void 0 ? tailnet.self.name : void 0;
 	if (!fleet.has(tailnet.self.name)) return yield* fail$1(new ShipError(`this Machine (${tailnet.self.name}) is not in machines in ${path}`));
 	const outsideFleet = flags.only.filter((name) => !fleet.has(name));
 	if (outsideFleet.length > 0) return yield* fail$1(new ShipError(`not in machines in ${path}: ${outsideFleet.join(", ")}`));
@@ -65477,16 +65478,16 @@ const ship = fn("ship")(function* (flags) {
 			full: true,
 			now: state.ended ?? 0
 		}, color));
-		if (tally(state).failed > 0) process.exitCode = 1;
+		if (anyFailed(state)) process.exitCode = 1;
 	});
 	yield* addFinalizer(() => finish());
 	const live = redraw ? yield* startLive(store, color) : noLive;
 	const cloneRootOf = (machine) => config.machines[machine.name]?.clones ?? "~/.local/share/fleetfizz/clones";
-	const gatherRepos = (config.repos ?? []).map((r) => ({
+	const checkRepos = (config.repos ?? []).map((r) => ({
 		name: repoName(r),
 		outputs: r.outputs ?? []
 	}));
-	const gathered = yield* forEach$1(targetsList, fn("gatherOne")(function* (machine) {
+	const checked = yield* forEach$1(targetsList, fn("checkOne")(function* (machine) {
 		const local = machine.name === tailnet.self.name;
 		if (!machine.online) {
 			yield* ledger.skip(machine.name, "offline");
@@ -65496,15 +65497,15 @@ const ship = fn("ship")(function* (flags) {
 			yield* ledger.skip(machine.name, "no Tailscale SSH server");
 			return;
 		}
-		const script = gatherScript({
+		const script = checkScript({
 			cloneRoot: cloneRootOf(machine),
-			repos: gatherRepos
+			repos: checkRepos
 		});
-		const result = yield* gather({
+		const result = yield* check({
 			name: machine.name,
 			local
 		}, script, ledger);
-		if (result.kind !== "gathered") return void 0;
+		if (result.kind !== "checked") return void 0;
 		yield* ledger.checked(machine.name);
 		return {
 			machine,
@@ -65512,7 +65513,7 @@ const ship = fn("ship")(function* (flags) {
 			state: result.state
 		};
 	}), { concurrency: "unbounded" }).pipe(map$5((list) => list.filter((g) => g !== void 0)));
-	const stale = yield* staleConfigs(config, flags.config === void 0, gathered, ledger);
+	const stale = yield* staleConfigs(config, own, checked, ledger);
 	if (stale.length > 0) {
 		const what = `newer config on ${stale.join(", ")}`;
 		if (flags.dryRun) yield* ledger.note("info", `${what}; a Ship would ask before overwriting it`);
@@ -65532,7 +65533,7 @@ const ship = fn("ship")(function* (flags) {
 		}
 	}
 	const versions = yield* resolveVersions(packagesToResolve(config));
-	const planAll = (cfg, answers) => gathered.map((g) => ({
+	const planAll = (cfg, answers) => checked.map((g) => ({
 		...g,
 		plan: plan({
 			config: cfg,
@@ -65573,7 +65574,8 @@ const ship = fn("ship")(function* (flags) {
 	const stampWith = (reached) => stampText(original, {
 		shippedAt,
 		shippedFrom: tailnet.self.name,
-		reached: [...reached, ...flags.config === void 0 ? [tailnet.self.name] : []]
+		reached,
+		own
 	});
 	const stamped = stampWith(planned.map((g) => g.machine.name));
 	yield* fs.writeFileString(path, stamped);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetfizz",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Keep every Machine on your tailnet in line with one config.",
   "license": "MIT",
   "repository": {