@ascorbic/pds 0.2.1 → 0.2.2

package/dist/cli.js

@@ -339,6 +339,63 @@ const secretCommand = defineCommand({
 	}
 });
 
+//#endregion
+//#region src/cli/utils/cli-helpers.ts
+/**
+* Shared CLI utilities for PDS commands
+*/
+/**
+* Prompt for text input, exiting on cancel
+*/
+async function promptText(options) {
+	const result = await p.text(options);
+	if (p.isCancel(result)) {
+		p.cancel("Cancelled");
+		process.exit(0);
+	}
+	return result;
+}
+/**
+* Prompt for confirmation, exiting on cancel
+*/
+async function promptConfirm(options) {
+	const result = await p.confirm(options);
+	if (p.isCancel(result)) {
+		p.cancel("Cancelled");
+		process.exit(0);
+	}
+	return result;
+}
+/**
+* Prompt for selection, exiting on cancel
+*/
+async function promptSelect(options) {
+	const result = await p.select(options);
+	if (p.isCancel(result)) {
+		p.cancel("Cancelled");
+		process.exit(0);
+	}
+	return result;
+}
+/**
+* Get target PDS URL based on mode
+*/
+function getTargetUrl(isDev, pdsHostname) {
+	if (isDev) return `http://localhost:${process.env.PORT ? parseInt(process.env.PORT) ?? "5173" : "5173"}`;
+	if (!pdsHostname) throw new Error("PDS_HOSTNAME not configured in wrangler.jsonc");
+	return `https://${pdsHostname}`;
+}
+/**
+* Extract domain from URL
+*/
+function getDomain(url) {
+	try {
+		return new URL(url).hostname;
+	} catch {
+		return url;
+	}
+}
+
 //#endregion
 //#region src/cli/utils/handle-resolver.ts
 /**
@@ -456,6 +513,22 @@ var DidResolver = class {
 function slugifyHandle(handle) {
 	return handle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") + "-pds";
 }
+const defaultWorkerName = "my-pds";
+/**
+* Prompt for worker name with validation
+*/
+async function promptWorkerName(handle, currentWorkerName) {
+	const placeholder = currentWorkerName && currentWorkerName !== defaultWorkerName ? currentWorkerName : slugifyHandle(handle);
+	return promptText({
+		message: "Cloudflare Worker name:",
+		placeholder,
+		initialValue: placeholder,
+		validate: (v) => {
+			if (!v) return "Worker name is required";
+			if (!/^[a-z0-9-]+$/.test(v)) return "Worker name can only contain lowercase letters, numbers, and hyphens";
+		}
+	});
+}
 /**
 * Run wrangler types to regenerate TypeScript types
 */
@@ -486,28 +559,24 @@ const initCommand = defineCommand({
 	},
 	args: { production: {
 		type: "boolean",
-		description: "Deploy secrets to Cloudflare (prompts to reuse .dev.vars values)",
+		description: "Deploy secrets to Cloudflare?",
 		default: false
 	} },
 	async run({ args }) {
 		p.intro("🦋 PDS Setup");
 		const isProduction = args.production;
-		if (isProduction) p.log.info("Production mode: secrets will be deployed via wrangler");
-		else p.log.info("Let's set up your new home in the Atmosphere!");
+		if (isProduction) p.log.info("Production mode: secrets will be deployed to Cloudflare");
+		p.log.info("Let's set up your new home in the Atmosphere!");
 		const wranglerVars = getVars();
 		const devVars = readDevVars();
 		const currentVars = {
 			...devVars,
 			...wranglerVars
 		};
-		const isMigrating = await p.confirm({
-			message: "Are you migrating an existing Bluesky account? 🦋",
+		const isMigrating = await promptConfirm({
+			message: "Are you migrating an existing Bluesky/ATProto account?",
 			initialValue: false
 		});
-		if (p.isCancel(isMigrating)) {
-			p.cancel("Setup cancelled");
-			process.exit(0);
-		}
 		let did;
 		let handle;
 		let hostname;
@@ -516,28 +585,24 @@ const initCommand = defineCommand({
 		const currentWorkerName = getWorkerName();
 		if (isMigrating) {
 			p.log.info("Time to pack your bags! 🧳");
-			p.log.info("Your account will be inactive until you've moved your data over.");
+			p.log.info("Your new account will be inactive until you're ready to go live.");
 			let hostedDomains = [
 				".bsky.social",
 				".bsky.network",
 				".bsky.team"
 			];
-			const isHostedHandle = (h) => hostedDomains.some((domain) => h.endsWith(domain));
+			const isHostedHandle = (h) => hostedDomains.some((domain) => h?.endsWith(domain));
 			let resolvedDid = null;
 			let existingHandle = null;
 			let attempts = 0;
 			const MAX_ATTEMPTS = 3;
 			while (!resolvedDid && attempts < MAX_ATTEMPTS) {
 				attempts++;
-				const currentHandle = await p.text({
+				const currentHandle = await promptText({
 					message: "Your current Bluesky/ATProto handle:",
 					placeholder: "example.bsky.social",
 					validate: (v) => !v ? "Handle is required" : void 0
 				});
-				if (p.isCancel(currentHandle)) {
-					p.cancel("Cancelled");
-					process.exit(0);
-				}
 				existingHandle = currentHandle;
 				const spinner$1 = p.spinner();
 				spinner$1.start("Finding you in the Atmosphere...");
@@ -545,7 +610,7 @@ const initCommand = defineCommand({
 				if (!resolvedDid) {
 					spinner$1.stop("Not found");
 					p.log.error(`Failed to resolve handle "${currentHandle}"`);
-					const action = await p.select({
+					if (await promptSelect({
 						message: "What would you like to do?",
 						options: [{
 							value: "retry",
@@ -554,26 +619,14 @@ const initCommand = defineCommand({
 							value: "manual",
 							label: "Enter DID manually"
 						}]
-					});
-					if (p.isCancel(action)) {
-						p.cancel("Cancelled");
-						process.exit(0);
-					}
-					if (action === "manual") {
-						const manualDid = await p.text({
-							message: "Enter your DID:",
-							placeholder: "did:plc:...",
-							validate: (v) => {
-								if (!v) return "DID is required";
-								if (!v.startsWith("did:")) return "DID must start with did:";
-							}
-						});
-						if (p.isCancel(manualDid)) {
-							p.cancel("Cancelled");
-							process.exit(0);
+					}) === "manual") resolvedDid = await promptText({
+						message: "Enter your DID:",
+						placeholder: "did:plc:...",
+						validate: (v) => {
+							if (!v) return "DID is required";
+							if (!v.startsWith("did:")) return "DID must start with did:";
 						}
-						resolvedDid = manualDid;
-					}
+					});
 				} else {
 					try {
 						const pdsService = (await new DidResolver().resolve(resolvedDid))?.service?.find((s) => s.type === "AtprotoPersonalDataServer" || s.id === "#atproto_pds");
@@ -587,7 +640,7 @@ const initCommand = defineCommand({
 					} catch {}
 					spinner$1.stop(`Found you! ${resolvedDid}`);
 					if (isHostedHandle(existingHandle)) {
-						const theirDomain = hostedDomains.find((d) => existingHandle.endsWith(d));
+						const theirDomain = hostedDomains.find((d) => existingHandle?.endsWith(d));
 						const domainExample = theirDomain ? `*${theirDomain}` : "*.bsky.social";
 						p.log.warn(`You'll need a custom domain for your new handle (not ${domainExample}). You can set this up after transferring your data.`);
 					}
@@ -604,95 +657,48 @@ const initCommand = defineCommand({
 				}
 			}
 			did = resolvedDid;
-			const defaultHandle = existingHandle && !isHostedHandle(existingHandle) ? existingHandle : currentVars.HANDLE || "";
-			handle = await p.text({
+			handle = await promptText({
 				message: "New account handle (must be a domain you control):",
 				placeholder: "example.com",
-				initialValue: defaultHandle,
+				initialValue: existingHandle && !isHostedHandle(existingHandle) ? existingHandle : currentVars.HANDLE || "",
 				validate: (v) => {
 					if (!v) return "Handle is required";
 					if (isHostedHandle(v)) return "You need a custom domain - hosted handles like *.bsky.social won't work";
 				}
 			});
-			if (p.isCancel(handle)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
-			hostname = await p.text({
+			hostname = await promptText({
 				message: "Domain where you'll deploy your PDS:",
 				placeholder: handle,
 				initialValue: currentVars.PDS_HOSTNAME || handle,
 				validate: (v) => !v ? "Hostname is required" : void 0
 			});
-			if (p.isCancel(hostname)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
-			const defaultWorkerName = currentWorkerName || slugifyHandle(handle);
-			workerName = await p.text({
-				message: "Cloudflare Worker name:",
-				placeholder: defaultWorkerName,
-				initialValue: defaultWorkerName,
-				validate: (v) => {
-					if (!v) return "Worker name is required";
-					if (!/^[a-z0-9-]+$/.test(v)) return "Worker name can only contain lowercase letters, numbers, and hyphens";
-				}
-			});
-			if (p.isCancel(workerName)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
+			workerName = await promptWorkerName(handle, currentWorkerName);
 			initialActive = "false";
 		} else {
 			p.log.info("A fresh start in the Atmosphere! ✨");
-			hostname = await p.text({
+			hostname = await promptText({
 				message: "Domain where you'll deploy your PDS:",
 				placeholder: "pds.example.com",
 				initialValue: currentVars.PDS_HOSTNAME || "",
 				validate: (v) => !v ? "Hostname is required" : void 0
 			});
-			if (p.isCancel(hostname)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
-			handle = await p.text({
+			handle = await promptText({
 				message: "Account handle:",
 				placeholder: hostname,
 				initialValue: currentVars.HANDLE || hostname,
 				validate: (v) => !v ? "Handle is required" : void 0
 			});
-			if (p.isCancel(handle)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
 			const didDefault = "did:web:" + hostname;
-			did = await p.text({
+			did = await promptText({
 				message: "Account DID:",
 				placeholder: didDefault,
 				initialValue: currentVars.DID || didDefault,
 				validate: (v) => {
 					if (!v) return "DID is required";
-					if (!v.startsWith("did:")) return "DID must start with did:";
-				}
-			});
-			if (p.isCancel(did)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
-			const defaultWorkerName = currentWorkerName || slugifyHandle(handle);
-			workerName = await p.text({
-				message: "Cloudflare Worker name:",
-				placeholder: defaultWorkerName,
-				initialValue: defaultWorkerName,
-				validate: (v) => {
-					if (!v) return "Worker name is required";
-					if (!/^[a-z0-9-]+$/.test(v)) return "Worker name can only contain lowercase letters, numbers, and hyphens";
+					if (!v.startsWith("did:")) return "DID must start with 'did:'";
 				}
 			});
-			if (p.isCancel(workerName)) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
+			workerName = await promptWorkerName(handle, currentWorkerName);
 			initialActive = "true";
 			if (handle === hostname) p.note([
 				"Your handle matches your PDS hostname, so your PDS will",
@@ -719,55 +725,32 @@ const initCommand = defineCommand({
 			].join("\n"), "Identity Setup 🪪");
 		}
 		const spinner = p.spinner();
-		let authToken;
-		let signingKey;
-		let signingKeyPublic;
-		let jwtSecret;
-		let passwordHash;
-		if (isProduction) {
-			authToken = await getOrGenerateSecret("AUTH_TOKEN", devVars, async () => {
-				spinner.start("Generating auth token...");
-				const token = generateAuthToken();
-				spinner.stop("Auth token generated");
-				return token;
-			});
-			signingKey = await getOrGenerateSecret("SIGNING_KEY", devVars, async () => {
-				spinner.start("Generating signing keypair...");
-				const { privateKey } = await generateSigningKeypair();
-				spinner.stop("Signing keypair generated");
-				return privateKey;
-			});
-			signingKeyPublic = await derivePublicKey(signingKey);
-			jwtSecret = await getOrGenerateSecret("JWT_SECRET", devVars, async () => {
-				spinner.start("Generating JWT secret...");
-				const secret = generateJwtSecret();
-				spinner.stop("JWT secret generated");
-				return secret;
-			});
-			passwordHash = await getOrGenerateSecret("PASSWORD_HASH", devVars, async () => {
-				const password = await promptPassword(handle);
-				spinner.start("Hashing password...");
-				const hash = await hashPassword(password);
-				spinner.stop("Password hashed");
-				return hash;
-			});
-		} else {
-			const password = await promptPassword(handle);
-			spinner.start("Hashing password...");
-			passwordHash = await hashPassword(password);
-			spinner.stop("Password hashed");
-			spinner.start("Generating JWT secret...");
-			jwtSecret = generateJwtSecret();
-			spinner.stop("JWT secret generated");
+		const authToken = await getOrGenerateSecret("AUTH_TOKEN", devVars, async () => {
 			spinner.start("Generating auth token...");
-			authToken = generateAuthToken();
+			const token = generateAuthToken();
 			spinner.stop("Auth token generated");
+			return token;
+		});
+		const signingKey = await getOrGenerateSecret("SIGNING_KEY", devVars, async () => {
 			spinner.start("Generating signing keypair...");
-			const keypair = await generateSigningKeypair();
-			signingKey = keypair.privateKey;
-			signingKeyPublic = keypair.publicKey;
+			const { privateKey } = await generateSigningKeypair();
 			spinner.stop("Signing keypair generated");
-		}
+			return privateKey;
+		});
+		const signingKeyPublic = await derivePublicKey(signingKey);
+		const jwtSecret = await getOrGenerateSecret("JWT_SECRET", devVars, async () => {
+			spinner.start("Generating JWT secret...");
+			const secret = generateJwtSecret();
+			spinner.stop("JWT secret generated");
+			return secret;
+		});
+		const passwordHash = await getOrGenerateSecret("PASSWORD_HASH", devVars, async () => {
+			const password = await promptPassword(handle);
+			spinner.start("Hashing password...");
+			const hash = await hashPassword(password);
+			spinner.stop("Password hashed");
+			return hash;
+		});
 		spinner.start("Updating wrangler.jsonc...");
 		setWorkerName(workerName);
 		setVars({
@@ -844,15 +827,10 @@ const initCommand = defineCommand({
 */
 async function getOrGenerateSecret(name, devVars, generate) {
 	if (devVars[name]) {
-		const useExisting = await p.confirm({
+		if (await p.confirm({
 			message: `Use ${name} from .dev.vars?`,
 			initialValue: true
-		});
-		if (p.isCancel(useExisting)) {
-			p.cancel("Cancelled");
-			process.exit(0);
-		}
-		if (useExisting) return devVars[name];
+		}) === true) return devVars[name];
 	}
 	return generate();
 }
@@ -1063,31 +1041,6 @@ var PDSClient = class {
 	}
 };
 
-//#endregion
-//#region src/cli/utils/cli-helpers.ts
-/**
-* Shared CLI utilities for PDS commands
-*/
-/**
-* Get target PDS URL based on mode
-*/
-function getTargetUrl(isDev, pdsHostname) {
-	const LOCAL_PDS_URL = "http://localhost:5173";
-	if (isDev) return LOCAL_PDS_URL;
-	if (!pdsHostname) throw new Error("PDS_HOSTNAME not configured in wrangler.jsonc");
-	return `https://${pdsHostname}`;
-}
-/**
-* Extract domain from URL
-*/
-function getDomain(url) {
-	try {
-		return new URL(url).hostname;
-	} catch {
-		return url;
-	}
-}
-
 //#endregion
 //#region src/cli/commands/migrate.ts
 function detectPackageManager() {
@@ -1098,11 +1051,10 @@ function detectPackageManager() {
 	return "npm";
 }
 const brightNote$1 = (lines) => lines.map((l) => `\x1b[0m${l}`).join("\n");
-const bold$1 = (text) => pc.bold(text);
 /**
 * Format number with commas
 */
-function formatNumber(n) {
+function num(n) {
 	return n.toLocaleString();
 }
 /**
@@ -1131,7 +1083,8 @@ const migrateCommand = defineCommand({
 		}
 	},
 	async run({ args }) {
-		const pm = detectPackageManager();
+		const packageManager = detectPackageManager();
+		const pm = packageManager === "npm" ? "npm run" : packageManager;
 		const isDev = args.dev;
 		const vars = getVars();
 		let targetUrl;
@@ -1198,6 +1151,7 @@ const migrateCommand = defineCommand({
 		const sourceDomain = getDomain(sourcePdsUrl);
 		spinner.stop(`Found your account at ${sourceDomain}`);
 		spinner.start("Checking account status...");
+		const pdsDisplayName = sourceDomain.endsWith(".bsky.network") ? "bsky.social" : sourceDomain;
 		let status;
 		try {
 			status = await targetClient.getAccountStatus();
@@ -1212,7 +1166,7 @@ const migrateCommand = defineCommand({
 			if (status.active) {
 				p.log.error("Cannot reset: account is active");
 				p.log.info("The --clean flag only works on deactivated accounts.");
-				p.log.info("Your account is already live in the Atmosphere.");
+				p.log.info("Your account is already live");
 				p.log.info("");
 				p.log.info("If you need to re-import, first deactivate:");
 				p.log.info("  pnpm pds deactivate");
@@ -1220,13 +1174,13 @@ const migrateCommand = defineCommand({
 				process.exit(1);
 			}
 			p.note(brightNote$1([
-				bold$1("This will permanently delete from your new PDS:"),
+				pc.bold("This will permanently delete from your new PDS:"),
 				"",
-				`  • ${formatNumber(status.repoBlocks)} repository blocks`,
-				`  • ${formatNumber(status.importedBlobs)} imported images`,
+				`  • ${num(status.repoBlocks)} repository blocks`,
+				`  • ${num(status.importedBlobs)} imported images`,
 				"  • All blob tracking data",
 				"",
-				bold$1(`Your data on ${sourceDomain} is NOT affected.`),
+				pc.bold(`Your data on ${pdsDisplayName} is NOT affected.`),
 				"You'll need to re-import everything."
 			]), "⚠️  Reset Migration Data");
 			const confirmReset = await p.confirm({
@@ -1240,7 +1194,7 @@ const migrateCommand = defineCommand({
 			spinner.start("Resetting migration state...");
 			try {
 				const result = await targetClient.resetMigration();
-				spinner.stop(`Deleted ${formatNumber(result.blocksDeleted)} blocks, ${formatNumber(result.blobsCleared)} blobs`);
+				spinner.stop(`Deleted ${num(result.blocksDeleted)} blocks, ${num(result.blobsCleared)} blobs`);
 			} catch (err) {
 				spinner.stop("Reset failed");
 				p.log.error(err instanceof Error ? err.message : "Could not reset migration");
@@ -1251,12 +1205,12 @@ const migrateCommand = defineCommand({
 			status = await targetClient.getAccountStatus();
 		}
 		if (status.active) {
-			p.log.warn("Your account is already active in the Atmosphere!");
+			p.log.warn(`Your account is already active at ${targetDomain}!`);
 			p.log.info("No migration needed - your PDS is live.");
-			p.outro("All good! 🦋");
+			p.outro("All good!");
 			return;
 		}
-		spinner.start(`Fetching your account details from ${sourceDomain}...`);
+		spinner.start(`Fetching your account details from ${pdsDisplayName}...`);
 		const sourceClient = new PDSClient(sourcePdsUrl);
 		try {
 			await sourceClient.describeRepo(did);
@@ -1277,10 +1231,10 @@ const migrateCommand = defineCommand({
 				`@${handle} (${did.slice(0, 20)}...)`,
 				"",
 				"✓ Repository imported",
-				`◐ Images: ${formatNumber(status.importedBlobs)}/${formatNumber(status.expectedBlobs)} transferred`
+				`◐ Media: ${num(status.importedBlobs)}/${num(status.expectedBlobs)} images and videos transferred`
 			].join("\n"), "Migration Progress");
 			const continueTransfer = await p.confirm({
-				message: "Continue transferring images?",
+				message: "Continue transferring images and video?",
 				initialValue: true
 			});
 			if (p.isCancel(continueTransfer) || !continueTransfer) {
@@ -1289,14 +1243,14 @@ const migrateCommand = defineCommand({
 			}
 		} else if (needsRepoImport) {
 			p.log.info("Time to pack your bags!");
-			p.log.info("Let's move your Bluesky account to its new home in the Atmosphere.");
+			p.log.info("Let's clone your account to its new home in the Atmosphere.");
 			const statsLines = profileStats ? [
-				`  📝 ${formatNumber(profileStats.postsCount)} posts`,
-				`  👥 ${formatNumber(profileStats.followsCount)} follows`,
-				`  ...plus all your images, likes, and blocks`
-			] : [`  📝 Posts, follows, images, likes, and blocks`];
+				`  📝 ${num(profileStats.postsCount)} posts`,
+				`  👥 ${num(profileStats.followsCount)} follows`,
+				`  ...plus all your images, likes and preferences`
+			] : [`  📝 Posts, follows, images, likes and preferences`];
 			p.note(brightNote$1([
-				bold$1(`@${handle}`) + ` (${did.slice(0, 20)}...)`,
+				pc.bold(`@${handle}`) + ` (${did.slice(0, 20)}...)`,
 				"",
 				`Currently at:  ${sourceDomain}`,
 				`Moving to:     ${targetDomain}`,
@@ -1304,9 +1258,9 @@ const migrateCommand = defineCommand({
 				"What you're bringing:",
 				...statsLines
 			]), "Your Bluesky Account 🦋");
-			p.log.info("This will copy your data - nothing is changed or deleted on Bluesky.");
+			p.log.info(`This will copy your data - nothing is changed or deleted on your current PDS.`);
 			const proceed = await p.confirm({
-				message: "Ready to start packing?",
+				message: "Ready to start moving?",
 				initialValue: true
 			});
 			if (p.isCancel(proceed) || !proceed) {
@@ -1314,19 +1268,17 @@ const migrateCommand = defineCommand({
 				process.exit(0);
 			}
 		} else {
-			p.log.success("All packed and moved! 🦋");
-			showNextSteps(pm, sourceDomain);
+			p.log.success("Everything looks good!");
+			showNextSteps(pm, pdsDisplayName);
 			p.outro("Welcome to your new home in the Atmosphere! 🦋");
 			return;
 		}
-		const isBlueskyPds = sourceDomain.endsWith(".bsky.network");
-		const passwordPrompt = isBlueskyPds ? "Your current Bluesky password:" : `Your ${sourceDomain} password:`;
-		const password = await p.password({ message: passwordPrompt });
+		const password = await p.password({ message: `Your password for ${pdsDisplayName}:` });
 		if (p.isCancel(password)) {
 			p.cancel("Migration cancelled.");
 			process.exit(0);
 		}
-		spinner.start(`Logging in to ${isBlueskyPds ? "Bluesky" : sourceDomain}...`);
+		spinner.start(`Logging in to ${pdsDisplayName}...`);
 		try {
 			const session = await sourceClient.createSession(did, password);
 			sourceClient.setAuthToken(session.accessJwt);
@@ -1339,7 +1291,7 @@ const migrateCommand = defineCommand({
 			process.exit(1);
 		}
 		if (needsRepoImport) {
-			spinner.start("Packing your repository...");
+			spinner.start(`Exporting your repository from ${pdsDisplayName}...`);
 			let carBytes;
 			try {
 				carBytes = await sourceClient.getRepo(did);
@@ -1350,7 +1302,7 @@ const migrateCommand = defineCommand({
 				p.outro("Migration cancelled.");
 				process.exit(1);
 			}
-			spinner.start(`Unpacking at ${targetDomain}...`);
+			spinner.start(`Importing to ${targetDomain}...`);
 			try {
 				await targetClient.importRepo(carBytes);
 				spinner.stop("Repository imported");
@@ -1391,7 +1343,7 @@ const migrateCommand = defineCommand({
 				totalBlobs += page.blobs.length;
 				countCursor = page.cursor;
 			} while (countCursor);
-			spinner.message(`Transferring images ${progressBar(0, totalBlobs)}`);
+			spinner.message(`Transferring media ${progressBar(0, totalBlobs)}`);
 			do {
 				const page = await targetClient.listMissingBlobs(100, cursor);
 				cursor = page.cursor;
@@ -1399,40 +1351,40 @@ const migrateCommand = defineCommand({
 					const { bytes, mimeType } = await sourceClient.getBlob(did, blob.cid);
 					await targetClient.uploadBlob(bytes, mimeType);
 					synced++;
-					spinner.message(`Transferring images ${progressBar(synced, totalBlobs)}`);
+					spinner.message(`Transferring media ${progressBar(synced, totalBlobs)}`);
 				} catch (err) {
 					synced++;
 					failedBlobs.push(blob.cid);
-					spinner.message(`Transferring images ${progressBar(synced, totalBlobs)}`);
+					spinner.message(`Transferring media ${progressBar(synced, totalBlobs)}`);
 				}
 			} while (cursor);
 			if (failedBlobs.length > 0) {
-				spinner.stop(`Transferred ${formatNumber(synced - failedBlobs.length)} images (${failedBlobs.length} failed)`);
+				spinner.stop(`Transferred ${num(synced - failedBlobs.length)} images and videos (${failedBlobs.length} failed)`);
 				p.log.warn(`Run 'pds migrate' again to retry failed transfers.`);
-			} else spinner.stop(`Transferred ${formatNumber(synced)} images`);
+			} else spinner.stop(`Transferred ${num(synced)} images and videos`);
 		}
 		spinner.start("Verifying migration...");
 		const finalStatus = await targetClient.getAccountStatus();
 		spinner.stop("Verification complete");
-		if (finalStatus.importedBlobs >= finalStatus.expectedBlobs) p.log.success("All packed and moved! 🦋");
+		if (finalStatus.importedBlobs >= finalStatus.expectedBlobs) p.log.success("All packed and moved!");
 		else {
 			p.log.warn(`Migration partially complete. ${finalStatus.expectedBlobs - finalStatus.importedBlobs} images remaining.`);
 			p.log.info("Run 'pds migrate' again to continue.");
 		}
-		showNextSteps(pm, sourceDomain);
+		showNextSteps(pm, pdsDisplayName);
 		p.outro("Welcome to your new home in the Atmosphere! 🦋");
 	}
 });
 function showNextSteps(pm, sourceDomain) {
 	p.note(brightNote$1([
-		bold$1("Your data is safe in your new PDS."),
-		"Two more steps to go live in the Atmosphere:",
+		pc.bold("Your data is safe in your new PDS."),
+		"Two more steps to go live:",
 		"",
-		bold$1("1. Update your identity"),
+		pc.bold("1. Update your identity"),
 		"   Tell the network where you live now.",
 		`   (Requires email verification from ${sourceDomain})`,
 		"",
-		bold$1("2. Flip the switch"),
+		pc.bold("2. Flip the switch"),
 		`   ${pm} pds activate`,
 		"",
 		"Docs: https://atproto.com/guides/account-migration"