@fluid-app/fluid-cli-mist 0.1.17 → 0.1.19

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { Command } from "commander";
 import chalk from "chalk";
-import { getAuthToken } from "@fluid-app/fluid-cli";
+import { getAuthToken, gitSyncActorFromMe, gitSyncCommitSubject, parseNameStatusZ, resolveGitSyncActor, summarizeChanges } from "@fluid-app/fluid-cli";
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import path, { join, resolve } from "node:path";
 import os from "node:os";
@@ -655,6 +655,31 @@ function excludeMistMarkerFromGit(cwd) {
 * is left alone — this only prevents *new* adds, it does not untrack
 * anything or rewrite history.
 */
+/**
+* The staged file set, as {@link ChangeEntry}s — the input a
+* {@link CommitMessage} resolver summarizes.
+*
+* `-z` (NUL-delimited) rather than the default: paths with spaces or
+* quotes are legal in git and common in themes and asset folders, and
+* the newline form quotes and escapes them, which would corrupt both the
+* path and the count.
+*
+* Best-effort — a summary is a nicety, never a reason to fail a publish.
+* An empty result makes the resolver fall back to its own constant.
+*/
+async function stagedChanges(cwd) {
+	try {
+		const { stdout } = await execa("git", [
+			"diff",
+			"--cached",
+			"--name-status",
+			"-z"
+		], { cwd });
+		return parseNameStatusZ(stdout);
+	} catch {
+		return [];
+	}
+}
 async function gitAutoCommit(cwd, message) {
 	await ensureBotIdentity(cwd);
 	let repoRoot = cwd;
@@ -690,6 +715,7 @@ async function gitAutoCommit(cwd, message) {
 			".mist-desktop"
 		], { cwd: repoRoot });
 	} catch {}
+	const subject = typeof message === "string" ? message : await message(await stagedChanges(cwd));
 	const identityArgs = [
 		"-c",
 		`user.name=${MIST_GIT_AUTHOR_NAME}`,
@@ -707,7 +733,7 @@ async function gitAutoCommit(cwd, message) {
 			...identityArgs,
 			"commit",
 			"-m",
-			message
+			subject
 		], {
 			cwd,
 			env: {
@@ -2094,6 +2120,8 @@ async function fetchCurrentUser(client) {
 * `fluid mist push [--watch]` — mints a credential, pushes to origin, and
 * (with --watch) polls /deployments until READY/ERROR. Spec §3 + §4.
 */
+/** Used when there's no `-m` and no readable diff to describe. */
+const FALLBACK_ACTION = "Publish from Mist Desktop";
 const POLL_MS$1 = 2e3;
 const LOCATE_TIMEOUT_MS = 2 * 6e4;
 const READY_TIMEOUT_MS = 5 * 6e4;
@@ -2144,24 +2172,24 @@ const pushCommand = new Command("push").description("Commit working-tree changes
 	}
 	if (opts.commit !== false) {
 		if (await hasUncommittedChanges(cwd)) {
-			const baseMessage = opts.message ?? `Publish from Mist Desktop · ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", " ")}`;
-			let namePrefix = "";
-			let idSuffix = "";
-			try {
-				const me = await withTimeout(fetchCurrentUser(client), 5e3);
-				const name = me.full_name && me.full_name.trim() || me.email || (Number.isFinite(me.id) ? `user-${me.id}` : null);
-				const id = me.public_id && me.public_id.trim();
-				if (name) namePrefix = `${name}: `;
-				if (id) idSuffix = ` (${id})`;
-			} catch (err) {
-				const reason = err instanceof Error ? err.message : String(err);
-				console.warn(chalk.yellow(`  (skipping user-stamp on commit — couldn't fetch /api/me: ${reason})`));
-			}
-			const message = `${namePrefix}${baseMessage}${idSuffix}`;
-			const commitSpinner = ora(`Committing changes (${message.length > 60 ? message.slice(0, 57) + "…" : message})…`).start();
+			const explicit = opts.message?.trim();
+			const actor = await resolveGitSyncActor(async () => {
+				try {
+					return gitSyncActorFromMe(await withTimeout(fetchCurrentUser(client), 5e3));
+				} catch (err) {
+					const reason = err instanceof Error ? err.message : String(err);
+					console.warn(chalk.yellow(`  (skipping user-stamp on commit — couldn't fetch /api/me: ${reason})`));
+					return null;
+				}
+			});
+			let subject = "";
+			const commitSpinner = ora("Committing changes…").start();
 			try {
-				await gitAutoCommit(cwd, message);
-				commitSpinner.succeed("Committed");
+				await gitAutoCommit(cwd, (changes) => {
+					subject = gitSyncCommitSubject(explicit || summarizeChanges(changes) || FALLBACK_ACTION, actor);
+					return subject;
+				});
+				commitSpinner.succeed(subject ? `Committed — ${subject}` : "Committed");
 			} catch (err) {
 				commitSpinner.fail("Commit failed");
 				throw err;