@fluid-app/fluid-cli-widget 0.1.47 → 0.1.49

package/dist/index.mjs

@@ -4,7 +4,7 @@ import path from "node:path";
 import { randomUUID } from "node:crypto";
 import { execa } from "execa";
 import { fileURLToPath } from "node:url";
-import { findProjectConfig, readConfig } from "@fluid-app/fluid-cli";
+import { findProjectConfig, gitSyncActorFromMe, gitSyncCommitSubject, parseNameStatusZ, readConfig, resolveGitSyncActor, subjectFragment, summarizeChanges } from "@fluid-app/fluid-cli";
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { cp, mkdir, mkdtemp, readFile, readdir, rm, rmdir, stat, writeFile } from "node:fs/promises";
 import chalk from "chalk";
@@ -574,9 +574,9 @@ function isRecord$3(value) {
 }
 //#endregion
 //#region src/utils/template.ts
-const EMBEDDED_PORTAL_SDK_VERSION = "0.1.499";
-const EMBEDDED_CLI_CORE_VERSION = "0.1.21";
-const EMBEDDED_CLI_WIDGET_VERSION = "0.1.47";
+const EMBEDDED_PORTAL_SDK_VERSION = "0.1.506";
+const EMBEDDED_CLI_CORE_VERSION = "0.1.23";
+const EMBEDDED_CLI_WIDGET_VERSION = "0.1.49";
 function getDefaultTemplatePath() {
 	return path.join(findPackageRoot(), "templates", "default");
 }
@@ -2138,6 +2138,31 @@ const DEFAULT_COMMIT_IDENTITY = {
 *
 * Steps 2 and 3 are best-effort and never fail the push.
 */
+/**
+* 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, identity = DEFAULT_COMMIT_IDENTITY) {
 	const repoRoot = await resolveRepoRoot(cwd);
 	excludeLocalStateFromGit(repoRoot);
@@ -2166,13 +2191,14 @@ async function gitAutoCommit(cwd, message, identity = DEFAULT_COMMIT_IDENTITY) {
 			".mist-desktop"
 		], { cwd: repoRoot });
 	} catch {}
+	const subject = typeof message === "string" ? message : await message(await stagedChanges(cwd));
 	const identityArgs = await resolveIdentityArgs(cwd, identity);
 	try {
 		await execa("git", [
 			...identityArgs,
 			"commit",
 			"-m",
-			message
+			subject
 		], {
 			cwd,
 			stdio: [
@@ -2291,6 +2317,24 @@ function writeWidgetMarker(dir, marker) {
 	} : { package_key: marker.package_key };
 	writeFileSync(resolveWidgetMarkerPath(dir), JSON.stringify(payload, null, 2) + "\n", "utf8");
 }
+function readWidgetMarker(dir) {
+	const filePath = resolveWidgetMarkerPath(dir);
+	if (!existsSync(filePath)) return null;
+	try {
+		const parsed = JSON.parse(readFileSync(filePath, "utf8"));
+		if (!parsed || typeof parsed !== "object") return null;
+		const obj = parsed;
+		const packageKey = obj["package_key"];
+		if (typeof packageKey !== "string" || packageKey.length === 0) return null;
+		const droplet = obj["droplet"];
+		return {
+			package_key: packageKey,
+			...typeof droplet === "string" && droplet.length > 0 ? { droplet } : {}
+		};
+	} catch {
+		return null;
+	}
+}
 //#endregion
 //#region src/commands/clone.ts
 const cloneCommand = new Command("clone").description("Clone a widget package's git repository (mints a fresh token per call)").argument("<package>", "Widget package key to clone").option("--droplet <uuid>", "Droplet UUID that owns the package (defaults to the company-owned package)").option("--dir <dir>", "Target directory (defaults to ./<package>/)").option("--skip-install", "Skip dependency installation").action((packageKey, options) => runCliAction(async () => {
@@ -3085,25 +3129,24 @@ function printWidgetPublishSummary(options) {
 }
 //#endregion
 //#region src/utils/me.ts
-function str(value) {
-	if (typeof value === "string" && value.trim().length > 0) return value.trim();
-	return null;
-}
+/**
+* `GET /api/me` — the authenticated user's identity, used to stamp
+* auto-commit messages in the canonical GitSync format. The name fallback
+* chain and the shape it feeds both live in `@fluid-app/fluid-cli`'s
+* git-sync/commit-subject.ts, shared with the mist / portal / theme CLIs.
+*
+* Best-effort by contract: callers treat a rejection (or a null actor) as
+* a system-attributed commit rather than failing the push.
+*/
 async function fetchCurrentUser(client) {
-	const raw = await client.get({
+	return gitSyncActorFromMe(await client.get({
 		responseStyle: "data",
 		security: [{
 			scheme: "bearer",
 			type: "http"
 		}],
 		url: "/api/me"
-	});
-	const composed = [str(raw.first_name), str(raw.last_name)].filter((part) => part !== null).join(" ").trim();
-	const idValue = str(raw.public_id) ?? (typeof raw.id === "number" && Number.isFinite(raw.id) ? String(raw.id) : null);
-	return {
-		name: str(raw.full_name) ?? (composed.length > 0 ? composed : null) ?? str(raw.email),
-		publicId: idValue
-	};
+	}));
 }
 //#endregion
 //#region src/lib/git-sync.ts
@@ -3120,6 +3163,7 @@ async function fetchCurrentUser(client) {
 async function syncWidgetGitRepo(options) {
 	const { cwd, client } = options;
 	const branch = options.branch ?? "main";
+	const actor = memoizeActor(client);
 	if (!await isGitRepository(cwd)) await gitInit(cwd, branch);
 	await ensureLocalStateExcluded(cwd);
 	const cred = await mintWidgetGitCredential({
@@ -3148,10 +3192,11 @@ async function syncWidgetGitRepo(options) {
 			}
 		} else pulled = await gitAdoptFetchHead(cwd);
 	}
-	await purgeLocalStateFromIndex(cwd, "Remove private Mist Desktop state from the widget repository", await resolveCommitIdentity(client));
+	await purgeLocalStateFromIndex(cwd, gitSyncCommitSubject("Remove private Mist Desktop state from the widget repository", null), commitIdentity(await actor()));
 	let committed = false;
 	if (options.commit !== false && await hasUncommittedChanges(cwd)) {
-		await gitAutoCommit(cwd, await buildCommitMessage(client, options.message), await resolveCommitIdentity(client));
+		const resolved = await actor();
+		await gitAutoCommit(cwd, (changes) => buildCommitMessage(cwd, resolved, changes, options.message), commitIdentity(resolved));
 		committed = true;
 	}
 	await gitPush(cwd, cred.remoteUrl, branch);
@@ -3161,33 +3206,33 @@ async function syncWidgetGitRepo(options) {
 		committed
 	};
 }
-const DEFAULT_MESSAGE_PREFIX = "Publish from Fluid widget CLI";
-function timestamp() {
-	return (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", " ");
-}
 /**
-* Build the auto-commit message, stamped as `<name>: <msg> (<public_id>)` so
-* collaboration history traces back to a real person. Best-effort: a failed or
-* slow /api/me still yields a usable bare message.
+* Build the auto-commit message in the canonical GitSync shape —
+* `<name>: <action> · <timestamp> (<public_id>)` — so widget history reads
+* the same as mist / theme / portal history and always says who published.
+* A `-m` message replaces the action but keeps the stamp. An unknown actor
+* yields a `Fluid:` system commit rather than an unattributed one.
 */
-async function buildCommitMessage(client, base) {
-	const baseMessage = base ?? `${DEFAULT_MESSAGE_PREFIX} · ${timestamp()}`;
-	try {
-		const me = await withTimeout(fetchCurrentUser(client), 5e3);
-		return `${me.name ? `${me.name}: ` : ""}${baseMessage}${me.publicId ? ` (${me.publicId})` : ""}`;
-	} catch {
-		return baseMessage;
-	}
+function buildCommitMessage(cwd, actor, changes, base) {
+	const packageKey = readWidgetMarker(cwd)?.package_key;
+	const fallback = packageKey ? `Publish widget ${subjectFragment(packageKey)}` : "Publish widget";
+	return gitSyncCommitSubject(base?.trim() || summarizeChanges(changes) || fallback, actor);
 }
 /** Prefer the Fluid user for the git author when the repo has no identity. */
-async function resolveCommitIdentity(client) {
-	try {
-		const me = await withTimeout(fetchCurrentUser(client), 5e3);
-		if (me.name) return {
-			name: me.name,
-			email: "cli@fluid.app"
-		};
-	} catch {}
+function commitIdentity(actor) {
+	return actor ? {
+		name: actor.name,
+		email: "cli@fluid.app"
+	} : void 0;
+}
+/**
+* Resolve the signed-in user once per sync, cached across callers.
+* Best-effort by contract: a failed or slow `/api/me` resolves to null (a
+* system-attributed commit) instead of failing the push.
+*/
+function memoizeActor(client) {
+	let pending = null;
+	return () => pending ??= resolveGitSyncActor(() => withTimeout(fetchCurrentUser(client), 5e3));
 }
 function withTimeout(promise, ms) {
 	return Promise.race([promise, new Promise((_, reject) => setTimeout(() => reject(/* @__PURE__ */ new Error(`timed out after ${ms}ms`)), ms))]);