fleetfizz 0.9.0 → 0.9.1

package/dist/fleetfizz.mjs

@@ -33032,7 +33032,7 @@ const runWith = (command, config) => {
 };
 //#endregion
 //#region package.json
-var version = "0.9.0";
+var version = "0.9.1";
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.2/node_modules/effect/dist/Logger.js
 const TypeId = "~effect/Logger";
@@ -65150,6 +65150,8 @@ const MachineEntry = Struct({
 	detail: optionalKey(String$6),
 	output: optionalKey(ArraySchema(String$6)),
 	items: ArraySchema(Item),
+	connected: optionalKey(Boolean$4),
+	checked: optionalKey(Number$2),
 	started: optionalKey(Number$2),
 	ended: optionalKey(Number$2)
 });
@@ -65158,6 +65160,10 @@ const LedgerState = Struct({
 	dryRun: Boolean$4,
 	notes: ArraySchema(Note),
 	machines: ArraySchema(MachineEntry),
+	resolving: optionalKey(Struct({
+		started: Number$2,
+		items: Number$2
+	})),
 	started: Number$2,
 	ended: optionalKey(Number$2)
 });
@@ -65271,9 +65277,14 @@ const makeLedger = fn("makeLedger")(function* (input) {
 				});
 				yield* logInfo(`${kind}: ${text}`);
 			}),
-			checked: (name) => machine(name, (m) => ({
+			connected: (name) => machine(name, (m) => ({
+				...m,
+				connected: true
+			})).pipe(andThen(log(name, logInfo("connected")))),
+			checked: (name) => machine(name, (m, now) => ({
 				...m,
-				status: "waiting"
+				status: "waiting",
+				checked: now
 			})).pipe(andThen(log(name, logInfo("checked")))),
 			skip: (name, reason) => machine(name, (m) => ({
 				...m,
@@ -65287,6 +65298,14 @@ const makeLedger = fn("makeLedger")(function* (input) {
 				...output.length === 0 ? {} : { output },
 				ended: now
 			})).pipe(andThen(log(name, logError(`failed: ${reason}`)))),
+			resolving: (n) => update((state, now) => ({
+				...state,
+				resolving: {
+					started: now,
+					items: n
+				}
+			})).pipe(andThen(logInfo(`resolving ${n} items`))),
+			resolved: update(({ resolving: _, ...state }) => state).pipe(andThen(logInfo("resolved"))),
 			plan: (name, p) => machine(name, (m) => ({
 				...m,
 				status: "planned",
@@ -65298,6 +65317,7 @@ const makeLedger = fn("makeLedger")(function* (input) {
 			start: (name) => machine(name, (m, now) => ({
 				...m,
 				status: "running",
+				connected: false,
 				started: now
 			})).pipe(andThen(log(name, logInfo("applying")))),
 			stepStarted: (name, id) => items(name, id, (item, now) => item.status === "failed" || item.status === "skipped" ? item : {
@@ -65348,7 +65368,7 @@ const makeLedger = fn("makeLedger")(function* (input) {
 				ended: m.ended ?? now
 			})).pipe(andThen(log(name, logInfo(`finished: ${outcome}`)))),
 			end: gen(function* () {
-				yield* update((state, now) => ({
+				yield* update(({ resolving: _, ...state }, now) => ({
 					...state,
 					ended: now,
 					machines: state.machines.map((m) => m.status === "running" || m.status === "checking" ? {
@@ -67402,15 +67422,23 @@ const countsOf = (m) => {
 		skipped: m.items.filter((i) => i.status === "skipped").length
 	};
 };
-const settled = (m, dryRun) => dryRun || m.status === "ok" || m.status === "failed";
+const settled = (m, dryRun) => dryRun && m.status === "planned" || m.status === "ok" || m.status === "failed";
 const upToDate = (m, dryRun) => {
 	const c = countsOf(m);
 	return c.changes === 0 && c.skipped === 0 && settled(m, dryRun);
 };
-const summaryOf = (m, dryRun) => {
-	if (m.status === "checking" || m.status === "waiting") return [{
-		text: m.status,
-		tone: "dim"
+const summaryOf = (m, dryRun, glyph) => {
+	if (m.status === "checking") return [{
+		text: `${glyph} ${m.connected === true ? "checking" : "connecting"}`,
+		tone: "run"
+	}];
+	if (m.status === "waiting") return [{
+		text: "✓ checked",
+		tone: "ok"
+	}];
+	if (m.status === "running" && m.connected !== true) return [{
+		text: `${glyph} connecting`,
+		tone: "run"
 	}];
 	if (m.status === "skipped") return [{
 		text: "– skipped",
@@ -67421,6 +67449,10 @@ const summaryOf = (m, dryRun) => {
 		tone: "fail"
 	}, { text: `  ${m.detail}` }];
 	const { changes, done, failed, skipped } = countsOf(m);
+	if (changes === 0 && skipped === 0 && m.status === "running") return [{
+		text: "applying",
+		tone: "dim"
+	}];
 	if (changes === 0 && skipped === 0) return [{
 		text: "up to date",
 		tone: settled(m, dryRun) ? "ok" : "dim"
@@ -67478,6 +67510,7 @@ const shipSummary = (state) => {
 	}] : parts;
 };
 const elapsed = (started, ended, now) => started === void 0 ? "" : duration((ended ?? now) - started);
+const machineTime = (m, shipStarted, now) => m.status === "checking" || m.status === "waiting" ? elapsed(shipStarted, m.checked, now) : elapsed(m.started, m.ended, now);
 const Parts = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Line, { children: props.parts.map((part, n) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(T, {
 	tone: part.tone,
 	children: part.text
@@ -67518,9 +67551,9 @@ const MachineLine = (props) => {
 				width: w.time,
 				right: true,
 				tone: "dim",
-				children: upToDate(m, props.dryRun) ? "" : elapsed(m.started, m.ended, props.now)
+				children: upToDate(m, props.dryRun) ? "" : machineTime(m, props.shipStarted, props.now)
 			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Parts, { parts: summaryOf(m, props.dryRun) })
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Parts, { parts: summaryOf(m, props.dryRun, props.glyph) })
 		]
 	});
 };
@@ -67565,8 +67598,18 @@ const LedgerView = (props) => {
 	const { live } = (0, import_react.useContext)(ModeContext);
 	const running = live && state.ended === void 0;
 	const glyph = runGlyph(live, now);
-	const shownItems = (m) => m.items.filter((i) => full || i.changes || i.status === "failed" || i.status === "skipped");
-	const visible = state.machines.flatMap(shownItems);
+	const shownItems = (m) => m.items.filter((i) => full || i.changes || i.status === "failed" || i.status === "skipped" || i.status === "running");
+	const resolve = state.resolving === void 0 || state.ended !== void 0 ? void 0 : {
+		name: "versions and commits",
+		kind: "range",
+		from: `${state.resolving.items} items`,
+		changes: false,
+		status: "running",
+		doing: "resolving",
+		steps: [],
+		started: state.resolving.started
+	};
+	const visible = [...state.machines.flatMap(shownItems), ...resolve === void 0 ? [] : [resolve]];
 	const width = (texts) => Math.max(0, ...texts.map((t) => t.length));
 	const item = width(visible.map((i) => i.name));
 	const status = width(visible.map((i) => statusOf(i, dryRun, glyph).text));
@@ -67574,7 +67617,7 @@ const LedgerView = (props) => {
 		status,
 		item,
 		value: Math.max(width(visible.map(value)), width(state.machines.map((m) => m.name)) - (status + GAP + INDENT + item + GAP)),
-		time: width([...visible.map((i) => elapsed(i.started, i.ended, now)), ...state.machines.map((m) => elapsed(m.started, m.ended, now))])
+		time: width([...visible.map((i) => elapsed(i.started, i.ended, now)), ...state.machines.map((m) => machineTime(m, state.started, now))])
 	};
 	const blocks = state.machines.map((m) => ({
 		m,
@@ -67582,7 +67625,9 @@ const LedgerView = (props) => {
 			m,
 			w,
 			dryRun,
-			now
+			shipStarted: state.started,
+			now,
+			glyph
 		}, m.name),
 		body: [...m.output === void 0 ? [] : outputLines(m.name, m.output, nameAt(w), running), ...shownItems(m).flatMap((i) => [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ItemLine, {
 			i,
@@ -67593,7 +67638,7 @@ const LedgerView = (props) => {
 		}, `${m.name}/${i.kind}:${i.name}`), ...i.output === void 0 ? [] : outputLines(`${m.name}/${i.kind}:${i.name}`, i.output, nameAt(w), running)])]
 	}));
 	const legend = state.ended === void 0 ? `f ${full ? "changes only" : "full list"}  ·  ctrl-c stop` : void 0;
-	const room = height === void 0 ? Infinity : height - (legend === void 0 ? 1 : 3);
+	const room = height === void 0 ? Infinity : height - (legend === void 0 ? 1 : 3) - (resolve === void 0 ? 0 : 2);
 	const count = (bs) => bs.reduce((n, b) => n + 1 + b.body.length, Math.max(0, bs.length - 1));
 	const fits = count(blocks) <= room;
 	let spare = room - count(blocks.map((b) => ({
@@ -67642,6 +67687,16 @@ const LedgerView = (props) => {
 				tone: "dim",
 				children: "…"
 			}),
+			resolve !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+				marginTop: 1,
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ItemLine, {
+					i: resolve,
+					w,
+					dryRun,
+					now,
+					glyph
+				})
+			}),
 			state.ended !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 				marginTop: 1,
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Parts, { parts: [...shipSummary(state), ...dryRun ? [] : [{
@@ -68001,11 +68056,12 @@ const decideRepo = (repo, root, observed, resolved, ctx) => {
 };
 const fetchStep = ({ item, root, commit }) => {
 	const url = originUrl(item.origin);
+	const fetch = (what) => `if [ "$(git -C "$ff_d" rev-parse HEAD)" != ${quote(commit)} ]; then ff_git -C "$ff_d" fetch --quiet origin ${quote(what)}; fi`;
 	const sync = isPin(item.ref) ? [
-		`if [ "$(git -C "$ff_d" rev-parse HEAD)" != ${quote(commit)} ]; then ff_git -C "$ff_d" fetch --quiet origin ${quote(commit)}; fi`,
+		fetch(commit),
 		`git -C "$ff_d" checkout --quiet --detach ${quote(commit)}`,
 		`git -C "$ff_d" reset --quiet --hard ${quote(commit)}`
-	] : [`ff_git -C "$ff_d" fetch --quiet origin ${quote(item.ref)}`, `git -C "$ff_d" reset --quiet --hard ${quote(commit)}`];
+	] : [fetch(item.ref), `git -C "$ff_d" reset --quiet --hard ${quote(commit)}`];
 	return {
 		id: `repos:${item.name}:fetch`,
 		items: [item.name],
@@ -68556,12 +68612,15 @@ const canRedraw = () => Boolean(process.stdout.isTTY) && process.env.TERM !== "d
 const decodeAt = decodeUnknownOption(AtFact);
 const runOn = fn("runOn")(function* (target, script, secrets, onLine, ledger) {
 	let first;
+	let connected = false;
 	yield* logDebug(`script:\n${script}`);
 	const started = yield* currentTimeMillis;
 	const run = yield* runScript(target, script, secrets, (line) => {
 		const parsed = parseLine(line);
 		if (parsed.kind === "text" && first === void 0 && line.trim() !== "") first = line.trim();
-		return logDebug(`> ${line}`).pipe(andThen(onLine(parsed)));
+		const connect = connected ? void_ : ledger.connected(target.name);
+		connected = true;
+		return logDebug(`> ${line}`).pipe(andThen(connect), andThen(onLine(parsed)));
 	}).pipe(map$5((exitCode) => ({
 		kind: "ran",
 		exitCode
@@ -68911,11 +68970,13 @@ const shipPass = fn("shipPass")(function* (flags, tailnet, hidden) {
 		provider,
 		items: checked.flatMap(({ machine }) => targetedItems(provider, config, machine))
 	}));
+	yield* ledger.resolving(new Set(targeted.flatMap(({ provider, items }) => items.map((i) => `${provider.name}:${i.name}`))).size);
 	const lent = targeted.some(({ provider, items }) => provider.name === "repos" && items.length > 0) ? yield* readLentToken() : { token: void 0 };
 	if (lent.token !== void 0) hidden.add(lent.token);
 	yield* logInfo(lent.token !== void 0 ? "gh token: lent" : `gh token: none (${lent.reason ?? "no repos"})`);
 	if (lent.token === void 0 && lent.reason !== void 0) yield* ledger.note("info", `no gh token (${lent.reason}); private repos will fail`);
 	const resolved = Object.fromEntries(yield* forEach$1(targeted, ({ provider, items }) => provider.resolve(items, lent.token === void 0 ? {} : { token: lent.token }).pipe(map$5((r) => [provider.name, r])), { concurrency: "unbounded" }));
+	yield* ledger.resolved;
 	const planAll = (cfg, answer) => checked.map((g) => ({
 		...g,
 		plan: planMachine({

package/package.json

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