@fluid-app/fluid-cli-theme-dev 0.1.49 → 0.1.51

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { getAuthToken, readConfig, updateConfig } from "@fluid-app/fluid-cli";
+import { getAuthToken, gitSyncActorFromMe, gitSyncCommitSubject, readConfig, resolveGitSyncActor, summarizeChanges, updateConfig } from "@fluid-app/fluid-cli";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { createHash, randomBytes } from "node:crypto";
@@ -3974,40 +3974,32 @@ async function migrateLegacyChecksumsIntoShadow(input) {
 }
 //#endregion
 //#region src/theme/sync-identity.ts
-/** Legacy (actor-less) wording per verb. `Push`/`Pull` are byte-
-*  compatible with what the CLI has always written. */
-const LEGACY_WORDING = {
-	Push: "push",
-	Pull: "pull",
-	"Baseline from server": "baseline from server",
-	"Snapshot before pull": "snapshot before pull"
-};
-/** Human base message per verb, used in the stamped format. */
+/** Human action per verb, used as the canonical subject's action. */
 const BASE_MESSAGE = {
 	Push: "Push from Fluid CLI",
 	Pull: "Pull from Fluid CLI",
 	"Baseline from server": "Baseline from server",
 	"Snapshot before pull": "Snapshot before pull"
 };
-function syncCommitSubject(verb, actor, when = /* @__PURE__ */ new Date()) {
-	if (!actor) return `${LEGACY_WORDING[verb]} @ ${when.toISOString()}`;
-	const stamp = when.toISOString().slice(0, 19).replace("T", " ");
-	const idSuffix = actor.publicId ? ` (${actor.publicId})` : "";
-	return `${actor.name}: ${BASE_MESSAGE[verb]} · ${stamp}${idSuffix}`;
+/**
+* Build a shadow-repo commit subject.
+*
+* `changes` (when supplied) replaces the per-verb constant with a
+* description of what the sync actually carried, so the shadow log reads
+* `Update 3 files in templates` rather than `Push from Fluid CLI` on
+* every entry. Falls back to the constant for an empty change set — a
+* baseline or a no-op sync still deserves a sensible subject.
+*/
+function syncCommitSubject(verb, actor, when = /* @__PURE__ */ new Date(), changes = []) {
+	return gitSyncCommitSubject(summarizeChanges(changes) ?? BASE_MESSAGE[verb], actor, when);
 }
 /** Resolve a `/api/me` body to a commit actor. Exported for tests.
-*  Name fallback ordering matches the Mist CLI: full_name (or a
-*  first+last composition) → email → `user-<id>`; null when none of
-*  those exist — the caller then uses the legacy wording. */
+*  Delegates to the shared resolver so the name fallback chain
+*  (full_name → first+last → email → `user-<id>`) can't drift between
+*  CLIs. Null when the body carries no usable identity — the caller then
+*  writes a `Fluid:` system commit. */
 function actorFromMe(raw) {
-	const user = raw.user ?? raw;
-	const composed = [user.first_name, user.last_name].filter(Boolean).join(" ").trim();
-	const name = user.full_name && user.full_name.trim() || (composed.length > 0 ? composed : null) || user.email && user.email.trim() || (typeof user.id === "number" && Number.isFinite(user.id) ? `user-${user.id}` : null);
-	if (!name) return null;
-	return {
-		name,
-		publicId: user.public_id && user.public_id.trim() || null
-	};
+	return gitSyncActorFromMe(raw);
 }
 /**
 * Best-effort fetch of the signed-in user for commit stamping. Races
@@ -4016,6 +4008,9 @@ function actorFromMe(raw) {
 * this off early and await it only at commit time.
 */
 async function fetchSyncActor(api, timeoutMs = 5e3) {
+	return resolveGitSyncActor(() => requestSyncActor(api, timeoutMs));
+}
+async function requestSyncActor(api, timeoutMs) {
 	try {
 		return actorFromMe(await Promise.race([api.get("/api/me"), new Promise((_, reject) => {
 			setTimeout(() => reject(/* @__PURE__ */ new Error(`timed out after ${timeoutMs}ms`)), timeoutMs).unref?.();
@@ -4221,7 +4216,16 @@ function createPushCommand() {
 			for (const err of errors) console.error(`  ${err}`);
 			process.exitCode = 1;
 		} else spinner.succeed(`Pushed ${uploaded} file(s), saved ${linked} remote asset reference(s)` + (deletedCount > 0 ? `, deleted ${deletedCount} remote file(s).` : "."));
-		if (errors.length === 0) await commitPushedState(themeRoot, shadow, syncCommitSubject("Push", await getActor()));
+		if (errors.length === 0) {
+			const pushedChanges = [...changed.map((file) => ({
+				status: "modified",
+				path: file.relativePath
+			})), ...opts.nodelete ? [] : deleted.map((key) => ({
+				status: "deleted",
+				path: key
+			}))];
+			await commitPushedState(themeRoot, shadow, syncCommitSubject("Push", await getActor(), /* @__PURE__ */ new Date(), pushedChanges));
+		}
 		await persistConfig();
 		/**
 		* Persist `.fluid-theme.json`. When a config already exists,