buildx-cli 1.0.10 → 1.0.11

package/src/commands/sync.ts

@@ -1,778 +0,0 @@
-import { Command } from "commander";
-import chalk from "chalk";
-import ora from "ora";
-import fs from "fs-extra";
-import path from "path";
-import { configManager } from "../config/index";
-import { apiService } from "../services/api";
-import { buildCollectionsFromTypes, convertTypeFieldToSchemaField, mapScalarTypeToFieldType, mergeCollectionWithBase, mergeSchemaField, parseCollectionIdEnum, resolveCollectionId } from "../services/schema-types-convert";
-import { loadEnvConfig } from "../utils/env";
-import { matchByFilters, objectChecksum, parseFilters, readJsonIfExists, sha256, toAbsolutePath } from "../utils/sync";
-
-type CollectionManifest = {
-	version: 1;
-	projectId: string;
-	generatedAt: string;
-	collections: Record<string, { checksum: string }>;
-};
-
-const COLLECTION_EXPORT_KEYS = [
-	"collection_id",
-	"name",
-	"description",
-	"form_schema",
-	"timestamps",
-	"auditable"
-] as const;
-
-const FIELD_INTERNAL_KEYS = new Set(["_expanded", "inherited", "inheried"]);
-
-function applySchemaPullOptions(command: Command): Command {
-	return command
-		.option("-p, --project-id <project-id>", "Project ID to sync schema from (uses default if not specified)")
-		.option("-t, --target-dir <path>", "Base target directory for schema artifacts")
-		.option("-o, --output <path>", "Output path for generated TypeScript types", "./buildx/generated/types.ts")
-		.option("--collections-file <path>", "Path to store editable collections-as-code JSON", "./buildx/generated/collections.json")
-		.option("-u, --api-url <url>", "Custom API base URL")
-		.option("--filter <pattern...>", "Only include collections matching wildcard pattern(s), ex: users* or order_*")
-		.option("--dry-run", "Preview sync result without writing local files")
-		.option("--skip-collections-code", "Skip writing collections-as-code JSON")
-		.option("--no-annotate-types", "Disable @bx annotations injection into pulled types.ts")
-		.option("--raw-collections", "Export raw collections payload without normalization")
-		.option("--include-buildx", "Include buildx_* collections in collections-as-code JSON")
-		.option("-f, --force", "Force overwrite existing files");
-}
-
-function printDryRunFilePreview(filePath: string, content: string): void {
-	console.log(chalk.cyan(`\n--- DRY RUN: ${filePath} ---`));
-	console.log(content);
-	console.log(chalk.cyan(`--- END DRY RUN: ${filePath} ---\n`));
-}
-
-function ensureConfigured(): void {
-	if (!apiService.isConfigured()) {
-		console.error(chalk.red("❌ API not configured"));
-		console.log(chalk.yellow("Please configure your API endpoint and API key first:"));
-		console.log(chalk.cyan("  buildx config:setup"));
-		process.exit(1);
-	}
-
-	if (!configManager.isAuthenticated()) {
-		console.error(chalk.red("Error: Not authenticated"));
-		console.log(chalk.yellow("Run \"buildx auth:login\" to authenticate first"));
-		process.exit(1);
-	}
-}
-
-function resolveProjectId(projectId?: string): string {
-	if (projectId) return projectId;
-
-	const defaultProjectId = configManager.getDefaultProject();
-	if (defaultProjectId) {
-		console.log(chalk.blue("Using project ID:"), defaultProjectId);
-		return defaultProjectId;
-	}
-
-	const envConfig = loadEnvConfig();
-	if (envConfig.BUILDX_PROJECT_ID) {
-		console.log(chalk.blue("Using project ID from environment variable:"), envConfig.BUILDX_PROJECT_ID);
-		return envConfig.BUILDX_PROJECT_ID;
-	}
-
-	console.error(chalk.red("Error: No project ID specified"));
-	console.log(chalk.yellow("Use --project-id option, set a default project with 'buildx projects:set-default', or set BUILDX_PROJECT_ID environment variable"));
-	process.exit(1);
-}
-
-function findDuplicateCollectionIds(collections: any[]): string[] {
-	const seen = new Set<string>();
-	const duplicates = new Set<string>();
-	for (const collection of collections) {
-		const id = String(collection?.collection_id || "").trim();
-		if (!id) continue;
-		if (seen.has(id)) {
-			duplicates.add(id);
-			continue;
-		}
-		seen.add(id);
-	}
-	return [...duplicates];
-}
-
-function filterCollections(collections: any[], filters: string[]): any[] {
-	if (!filters.length) return collections;
-	return collections.filter((collection) => matchByFilters(String(collection.collection_id || ""), filters));
-}
-
-function sanitizeFieldValue(value: any): any {
-	if (Array.isArray(value)) return value.map(sanitizeFieldValue);
-	if (value && typeof value === "object") {
-		const result: Record<string, any> = {};
-		for (const [key, subValue] of Object.entries(value)) {
-			if (FIELD_INTERNAL_KEYS.has(key)) continue;
-			result[key] = sanitizeFieldValue(subValue);
-		}
-		return result;
-	}
-	return value;
-}
-
-function normalizeCollectionForCode(collection: any): any {
-	if (!collection || typeof collection !== "object") return null;
-	if (!collection.collection_id || typeof collection.collection_id !== "string") return null;
-
-	const result: Record<string, any> = {};
-	for (const key of COLLECTION_EXPORT_KEYS) {
-		if (collection[key] !== undefined) {
-			result[key] = key === "form_schema" ? sanitizeFieldValue(collection[key]) : collection[key];
-		}
-	}
-	if (!result.form_schema || typeof result.form_schema !== "object") {
-		result.form_schema = {};
-	}
-	return result;
-}
-
-function validateCollectionForPushDetailed(collection: any): string[] {
-	const errors: string[] = [];
-	if (!collection || typeof collection !== "object" || Array.isArray(collection)) {
-		return ["Collection must be an object"];
-	}
-
-	const collectionId = String(collection.collection_id || "");
-	if (!collectionId) {
-		errors.push("Missing collection_id");
-	} else {
-		if (collectionId.includes(" ")) {
-			errors.push(`collection_id "${collectionId}" cannot contain spaces`);
-		}
-		if (!/^[A-Za-z0-9_-]+$/.test(collectionId)) {
-			errors.push(`collection_id "${collectionId}" must match [A-Za-z0-9_-]+`);
-		}
-	}
-
-	if (!collection.form_schema || typeof collection.form_schema !== "object" || Array.isArray(collection.form_schema)) {
-		errors.push(`Collection "${collectionId || "unknown"}" is missing valid form_schema object`);
-		return errors;
-	}
-
-	const formSchema = collection.form_schema as Record<string, any>;
-	for (const [fieldName, fieldSchema] of Object.entries(formSchema)) {
-		const pathPrefix = `${collectionId || "unknown"}.form_schema.${fieldName}`;
-		if (!fieldSchema || typeof fieldSchema !== "object" || Array.isArray(fieldSchema)) {
-			errors.push(`${pathPrefix} must be an object`);
-			continue;
-		}
-		if (!fieldSchema.type || typeof fieldSchema.type !== "string") {
-			errors.push(`${pathPrefix}.type is required and must be a string`);
-			continue;
-		}
-		const fieldType = String(fieldSchema.type);
-
-		if (["DataObject", "DataObjects", "ReverseReference", "ReverseReferences"].includes(fieldType)) {
-			const ref = fieldSchema?.propertiesScheme?.ref;
-			if (!ref || typeof ref !== "string") {
-				errors.push(`${pathPrefix}.propertiesScheme.ref is required for ${fieldType}`);
-			}
-		}
-
-		if (["Choices", "MultipleChoices"].includes(fieldType)) {
-			const choices = fieldSchema?.propertiesScheme?.choices;
-			if (choices !== undefined) {
-				if (!Array.isArray(choices)) {
-					errors.push(`${pathPrefix}.propertiesScheme.choices must be an array`);
-				} else {
-					choices.forEach((choice: any, index: number) => {
-						const choicePath = `${pathPrefix}.propertiesScheme.choices[${index}]`;
-						if (!choice || typeof choice !== "object") {
-							errors.push(`${choicePath} must be an object`);
-							return;
-						}
-						if (choice.value === undefined || choice.value === null || String(choice.value).trim() === "") {
-							errors.push(`${choicePath}.value is required`);
-						}
-					});
-				}
-			}
-		}
-	}
-
-	return errors;
-}
-
-type CollectionDiffEntry = {
-	type: "added" | "removed" | "changed";
-	path: string;
-	local?: any;
-	remote?: any;
-};
-
-function diffCollectionsDetailed(local: any, remote: any, basePath = ""): CollectionDiffEntry[] {
-	if (local === remote) return [];
-
-	const localIsArray = Array.isArray(local);
-	const remoteIsArray = Array.isArray(remote);
-	if (localIsArray || remoteIsArray) {
-		if (JSON.stringify(local) === JSON.stringify(remote)) return [];
-		return [{
-			type: "changed",
-			path: basePath || ".",
-			local,
-			remote
-		}];
-	}
-
-	const localIsObject = !!local && typeof local === "object";
-	const remoteIsObject = !!remote && typeof remote === "object";
-	if (!localIsObject || !remoteIsObject) {
-		return [{
-			type: "changed",
-			path: basePath || ".",
-			local,
-			remote
-		}];
-	}
-
-	const result: CollectionDiffEntry[] = [];
-	const keys = new Set<string>([...Object.keys(local), ...Object.keys(remote)]);
-	for (const key of [...keys].sort()) {
-		const nextPath = basePath ? `${basePath}.${key}` : key;
-		const hasLocal = Object.prototype.hasOwnProperty.call(local, key);
-		const hasRemote = Object.prototype.hasOwnProperty.call(remote, key);
-		if (hasLocal && !hasRemote) {
-			result.push({
-				type: "removed",
-				path: nextPath,
-				local: local[key]
-			});
-			continue;
-		}
-		if (!hasLocal && hasRemote) {
-			result.push({
-				type: "added",
-				path: nextPath,
-				remote: remote[key]
-			});
-			continue;
-		}
-		result.push(...diffCollectionsDetailed(local[key], remote[key], nextPath));
-	}
-	return result;
-}
-
-function formatDiffValue(value: any): string {
-	const text = JSON.stringify(value);
-	if (text === undefined) return "undefined";
-	return text.length > 140 ? `${text.slice(0, 137)}...` : text;
-}
-
-function toSingleLineText(value: any): string {
-	return String(value ?? "")
-		.replace(/\s+/g, " ")
-		.trim();
-}
-
-function buildBxAnnotationLine(fieldSchema: any): string | null {
-	if (!fieldSchema || typeof fieldSchema !== "object") return null;
-	const tags: string[] = [];
-	const title = toSingleLineText(fieldSchema.title);
-	const description = toSingleLineText(fieldSchema.description);
-	if (title) tags.push(`@bx.title ${title}`);
-	if (description) tags.push(`@bx.description ${description}`);
-	if (fieldSchema.required === true) tags.push("@bx.required");
-	const ref = toSingleLineText(fieldSchema?.propertiesScheme?.ref);
-	if (ref) tags.push(`@bx.ref ${ref}`);
-	const choices = fieldSchema?.propertiesScheme?.choices;
-	if (Array.isArray(choices) && choices.length > 0) {
-		const encoded = choices
-			.map((choice: any) => {
-				const value = toSingleLineText(choice?.value);
-				if (!value) return null;
-				const hasLabel = !!choice && Object.prototype.hasOwnProperty.call(choice, "label");
-				const label = hasLabel ? toSingleLineText(choice?.label) : value;
-				return `${value}:${label}`;
-			})
-			.filter(Boolean)
-			.join("|");
-		if (encoded) tags.push(`@bx.choices ${encoded}`);
-	}
-	if (!tags.length) return null;
-	return `/** ${tags.join(" ")} */`;
-}
-
-function injectTypesAnnotations(typeContent: string, collections: any[]): string {
-	const enumMap = parseCollectionIdEnum(typeContent);
-	const collectionById = new Map<string, any>();
-	for (const collection of collections) {
-		const id = String(collection?.collection_id || "").trim();
-		if (!id) continue;
-		collectionById.set(id, collection);
-	}
-	if (!collectionById.size) return typeContent;
-
-	const typeRegex = /export\s+type\s+([A-Za-z0-9_]+)\s*=\s*{([\s\S]*?)}\s*;/g;
-	return typeContent.replace(typeRegex, (full, typeName, body) => {
-		const collectionId = resolveCollectionId(typeName, enumMap);
-		const collection = collectionById.get(collectionId);
-		if (!collection?.form_schema || typeof collection.form_schema !== "object") return full;
-
-		const formSchema = collection.form_schema as Record<string, any>;
-		const lines = body.split("\n");
-		const output: string[] = [];
-		for (const line of lines) {
-			const fieldMatch = line.match(/^(\s*)([A-Za-z_][A-Za-z0-9_]*)\??\s*:/);
-			if (!fieldMatch) {
-				output.push(line);
-				continue;
-			}
-			const [, indent, fieldName] = fieldMatch;
-			const fieldSchema = formSchema[fieldName];
-			const annotationLine = buildBxAnnotationLine(fieldSchema);
-			if (annotationLine) {
-				const prev = output.length > 0 ? output[output.length - 1] : "";
-				if (!/@bx\./.test(prev)) {
-					output.push(`${indent}${annotationLine}`);
-				}
-			}
-			output.push(line);
-		}
-		return `export type ${typeName} = {${output.join("\n")}};`;
-	});
-}
-
-async function runSchemaPull(options: any): Promise<void> {
-	ensureConfigured();
-	const projectId = resolveProjectId(options.projectId);
-
-	if (options.apiUrl) {
-		apiService.setBaseUrl(options.apiUrl);
-	}
-
-	const targetDirPath = options.targetDir ? toAbsolutePath(options.targetDir) : null;
-	const outputPath = targetDirPath
-		? path.join(targetDirPath, "types.ts")
-		: toAbsolutePath(options.output);
-	const collectionsFilePath = targetDirPath
-		? path.join(targetDirPath, "collections.json")
-		: toAbsolutePath(options.collectionsFile);
-	const manifestPath = path.join(path.dirname(collectionsFilePath), "collections.manifest.json");
-
-	const spinner = ora("Fetching TypeScript types...").start();
-	const typescriptCode = await apiService.getSchema(projectId);
-	if (!typescriptCode || typeof typescriptCode !== "string") {
-		spinner.fail("Failed to fetch TypeScript types");
-		throw new Error("Schema endpoint returned empty content");
-	}
-	spinner.succeed("TypeScript types fetched successfully");
-	let finalTypescriptCode = typescriptCode;
-
-	if (!options.skipCollectionsCode) {
-		const collectionsSpinner = ora("Fetching collections-as-code...").start();
-		const filters = parseFilters(options.filter);
-		const collections = await apiService.getCollections(projectId);
-		let editableCollections = options.rawCollections
-			? collections
-			: collections.map(normalizeCollectionForCode).filter(Boolean);
-		if (!options.includeBuildx) {
-			editableCollections = editableCollections.filter((col) => !String(col?.collection_id || "").startsWith("buildx_"));
-		}
-		editableCollections = filterCollections(editableCollections, filters);
-		editableCollections = editableCollections.sort((a, b) => String(a.collection_id).localeCompare(String(b.collection_id)));
-		if (options.annotateTypes) {
-			finalTypescriptCode = injectTypesAnnotations(finalTypescriptCode, editableCollections);
-		}
-
-		await fs.ensureDir(path.dirname(collectionsFilePath));
-
-		const manifest: CollectionManifest = {
-			version: 1,
-			projectId,
-			generatedAt: new Date().toISOString(),
-			collections: {}
-		};
-		for (const collection of editableCollections) {
-			manifest.collections[collection.collection_id] = { checksum: objectChecksum(collection) };
-		}
-		if (options.dryRun) {
-			collectionsSpinner.succeed("Collections-as-code preview ready");
-			console.log(chalk.cyan(`~ would write collections JSON: ${collectionsFilePath}`));
-			console.log(chalk.cyan(`~ would write collections manifest: ${manifestPath}`));
-			console.log(chalk.blue("Collections count:"), editableCollections.length);
-			printDryRunFilePreview(collectionsFilePath, JSON.stringify(editableCollections, null, 2));
-			printDryRunFilePreview(manifestPath, JSON.stringify(manifest, null, 2));
-		} else {
-			await fs.writeJson(collectionsFilePath, editableCollections, { spaces: 2 });
-			await fs.writeJson(manifestPath, manifest, { spaces: 2 });
-			collectionsSpinner.succeed("Collections-as-code saved");
-			console.log(chalk.green("✓ Collections JSON:"), collectionsFilePath);
-			console.log(chalk.green("✓ Collections manifest:"), manifestPath);
-		}
-	}
-
-	await fs.ensureDir(path.dirname(outputPath));
-
-	if ((await fs.pathExists(outputPath)) && !options.force) {
-		const existingContent = await fs.readFile(outputPath, "utf8");
-		if (sha256(existingContent) !== sha256(finalTypescriptCode)) {
-			throw new Error(`Output file already exists with local edits: ${outputPath}. Use --force to overwrite.`);
-		}
-	}
-
-	if (options.dryRun) {
-		console.log(chalk.cyan(`~ would write types to: ${outputPath}`));
-		console.log(chalk.blue("Types size:"), `${(finalTypescriptCode.length / 1024).toFixed(2)} KB`);
-		printDryRunFilePreview(outputPath, finalTypescriptCode);
-	} else {
-		await fs.writeFile(outputPath, finalTypescriptCode, "utf8");
-		console.log(chalk.green("✓ Types generated at:"), outputPath);
-		console.log(chalk.blue("File size:"), `${(finalTypescriptCode.length / 1024).toFixed(2)} KB`);
-	}
-}
-
-export const schemaSyncCommand = applySchemaPullOptions(
-	new Command("schema:sync")
-		.description("Deprecated alias of schema:pull (kept for compatibility)")
-).action(async (options) => {
-	try {
-		console.log(chalk.yellow("schema:sync is deprecated. Use schema:pull."));
-		await runSchemaPull(options);
-	} catch (error) {
-		console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-		process.exit(1);
-	}
-});
-
-export const schemaPullCommand = applySchemaPullOptions(
-	new Command("schema:pull")
-		.description("Pull project schema/types as code into local files")
-).action(async (options) => {
-	try {
-		await runSchemaPull(options);
-	} catch (error) {
-		console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-		process.exit(1);
-	}
-});
-
-export const schemaPushCommand = new Command("schema:push")
-	.description("Push local collections-as-code JSON back to project")
-	.option("-p, --project-id <project-id>", "Project ID to push schema to (uses default if not specified)")
-	.option("-t, --target-dir <path>", "Base target directory for schema artifacts")
-	.option("--collections-file <path>", "Path to collections-as-code JSON", "./buildx/generated/collections.json")
-	.option("-u, --api-url <url>", "Custom API base URL")
-	.option("--filter <pattern...>", "Only push collections matching wildcard pattern(s)")
-	.option("--dry-run", "Show what would change without pushing")
-	.option("--allow-create", "Allow creating new collections when collection_id does not exist on remote")
-	.option("-f, --force", "Force push even when remote drift is detected")
-	.action(async (options) => {
-		try {
-			ensureConfigured();
-			const projectId = resolveProjectId(options.projectId);
-
-			if (options.apiUrl) {
-				apiService.setBaseUrl(options.apiUrl);
-			}
-
-			const targetDirPath = options.targetDir ? toAbsolutePath(options.targetDir) : null;
-			const collectionsFilePath = targetDirPath
-				? path.join(targetDirPath, "collections.json")
-				: toAbsolutePath(options.collectionsFile);
-			const manifestPath = path.join(path.dirname(collectionsFilePath), "collections.manifest.json");
-			if (!(await fs.pathExists(collectionsFilePath))) {
-				throw new Error(`Collections file not found: ${collectionsFilePath}`);
-			}
-
-			const localCollections = await fs.readJson(collectionsFilePath);
-			if (!Array.isArray(localCollections)) {
-				throw new Error("Collections file must be a JSON array");
-			}
-			const normalizedLocalCollections = localCollections.map(normalizeCollectionForCode).filter(Boolean);
-			const filters = parseFilters(options.filter);
-			const targetCollections = filterCollections(normalizedLocalCollections, filters);
-
-			const duplicateIds = findDuplicateCollectionIds(targetCollections);
-			if (duplicateIds.length > 0) {
-				throw new Error(`Duplicate collection_id is not allowed:\n- ${duplicateIds.join("\n- ")}`);
-			}
-
-			const validationErrors: string[] = [];
-			for (const collection of targetCollections) {
-				validationErrors.push(...validateCollectionForPushDetailed(collection));
-			}
-			if (validationErrors.length > 0) {
-				throw new Error(`Invalid collections file:\n- ${validationErrors.join("\n- ")}`);
-			}
-
-			const manifest = await readJsonIfExists<CollectionManifest>(manifestPath);
-			const remoteCollections = (await apiService.getCollections(projectId))
-				.map(normalizeCollectionForCode)
-				.filter(Boolean);
-			const remoteById = new Map<string, any>(remoteCollections.map((collection) => [collection.collection_id, collection]));
-
-			let pushed = 0;
-			let skipped = 0;
-
-			for (const collection of targetCollections) {
-				const collectionId = collection.collection_id;
-				const remoteCollection = remoteById.get(collectionId);
-
-				if (!remoteCollection && !options.allowCreate) {
-					console.log(chalk.yellow(`⚠ Skipped ${collectionId}: does not exist on remote (use --allow-create to create)`));
-					skipped++;
-					continue;
-				}
-
-				const localChecksum = objectChecksum(collection);
-				const remoteChecksum = remoteCollection ? objectChecksum(remoteCollection) : null;
-				const lastPulledChecksum = manifest?.collections?.[collectionId]?.checksum;
-				const remoteDrifted = !!(lastPulledChecksum && remoteChecksum && lastPulledChecksum !== remoteChecksum);
-
-				if (remoteDrifted && !options.force) {
-					console.log(chalk.yellow(`⚠ Skipped ${collectionId}: remote changed since last pull (use --force to override)`));
-					skipped++;
-					continue;
-				}
-
-				if (localChecksum === remoteChecksum) {
-					console.log(chalk.gray(`- ${collectionId}: no changes`));
-					continue;
-				}
-
-				if (options.dryRun) {
-					console.log(chalk.cyan(`~ would push ${collectionId}`));
-					pushed++;
-					continue;
-				}
-
-				await apiService.upsertCollection(projectId, collection);
-				console.log(chalk.green(`✓ pushed ${collectionId}`));
-				pushed++;
-			}
-
-			console.log(chalk.blue(`Done. pushed=${pushed}, skipped=${skipped}`));
-		} catch (error) {
-			console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-			process.exit(1);
-		}
-	});
-
-export const schemaListCommand = new Command("schema:list")
-	.description("List remote collections in project")
-	.option("-p, --project-id <project-id>", "Project ID (uses default if not specified)")
-	.option("-u, --api-url <url>", "Custom API base URL")
-	.option("--include-buildx", "Include buildx_* collections")
-	.option("--filter <pattern...>", "Filter collection ids by wildcard pattern(s)")
-	.action(async (options) => {
-		try {
-			ensureConfigured();
-			const projectId = resolveProjectId(options.projectId);
-			if (options.apiUrl) {
-				apiService.setBaseUrl(options.apiUrl);
-			}
-			const filters = parseFilters(options.filter);
-
-			let collections = await apiService.getCollections(projectId);
-			if (!options.includeBuildx) {
-				collections = collections.filter((collection) => !String(collection.collection_id || "").startsWith("buildx_"));
-			}
-			collections = filterCollections(collections, filters).sort((a, b) => String(a.collection_id).localeCompare(String(b.collection_id)));
-
-			for (const collection of collections) {
-				console.log(collection.collection_id);
-			}
-			console.log(chalk.blue(`Total: ${collections.length}`));
-		} catch (error) {
-			console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-			process.exit(1);
-		}
-	});
-
-export const schemaDiffCommand = new Command("schema:diff")
-	.description("Diff local collections-as-code against remote project")
-	.option("-p, --project-id <project-id>", "Project ID (uses default if not specified)")
-	.option("-t, --target-dir <path>", "Base target directory for schema artifacts")
-	.option("--collections-file <path>", "Path to collections-as-code JSON", "./buildx/generated/collections.json")
-	.option("-u, --api-url <url>", "Custom API base URL")
-	.option("--include-buildx", "Include buildx_* collections")
-	.option("--filter <pattern...>", "Filter collection ids by wildcard pattern(s)")
-	.option("--details", "Show field-level diff details for changed collections")
-	.option("--details-limit <count>", "Max number of detail lines per changed collection", "30")
-	.action(async (options) => {
-		try {
-			ensureConfigured();
-			const projectId = resolveProjectId(options.projectId);
-			if (options.apiUrl) {
-				apiService.setBaseUrl(options.apiUrl);
-			}
-			const filters = parseFilters(options.filter);
-
-			const targetDirPath = options.targetDir ? toAbsolutePath(options.targetDir) : null;
-			const collectionsFilePath = targetDirPath
-				? path.join(targetDirPath, "collections.json")
-				: toAbsolutePath(options.collectionsFile);
-			if (!(await fs.pathExists(collectionsFilePath))) {
-				throw new Error(`Collections file not found: ${collectionsFilePath}`);
-			}
-
-			let localCollections = await fs.readJson(collectionsFilePath);
-			if (!Array.isArray(localCollections)) {
-				throw new Error("Collections file must be a JSON array");
-			}
-			let remoteCollections = await apiService.getCollections(projectId);
-			localCollections = localCollections.map(normalizeCollectionForCode).filter(Boolean);
-			remoteCollections = remoteCollections.map(normalizeCollectionForCode).filter(Boolean);
-
-			if (!options.includeBuildx) {
-				localCollections = localCollections.filter((collection: any) => !String(collection.collection_id || "").startsWith("buildx_"));
-				remoteCollections = remoteCollections.filter((collection) => !String(collection.collection_id || "").startsWith("buildx_"));
-			}
-			localCollections = filterCollections(localCollections, filters);
-			remoteCollections = filterCollections(remoteCollections, filters);
-
-			const localById = new Map<string, any>(localCollections.map((collection: any) => [collection.collection_id, collection]));
-			const remoteById = new Map<string, any>(remoteCollections.map((collection) => [collection.collection_id, collection]));
-
-			const localIds = new Set(localById.keys());
-			const remoteIds = new Set(remoteById.keys());
-			const allIds = [...new Set([...localIds, ...remoteIds])].sort((a, b) => a.localeCompare(b));
-
-			let onlyLocal = 0;
-			let onlyRemote = 0;
-			let changed = 0;
-			let same = 0;
-
-			for (const id of allIds) {
-				const local = localById.get(id);
-				const remote = remoteById.get(id);
-				if (local && !remote) {
-					console.log(chalk.yellow(`+ local-only ${id}`));
-					onlyLocal++;
-					continue;
-				}
-				if (!local && remote) {
-					console.log(chalk.yellow(`- remote-only ${id}`));
-					onlyRemote++;
-					continue;
-				}
-				if (local && remote) {
-					if (objectChecksum(local) === objectChecksum(remote)) {
-						console.log(chalk.gray(`= same ${id}`));
-						same++;
-					} else {
-						console.log(chalk.cyan(`~ changed ${id}`));
-						if (options.details) {
-							const detailsLimit = Number(options.detailsLimit) > 0 ? Number(options.detailsLimit) : 30;
-							const details = diffCollectionsDetailed(local, remote);
-							const show = details.slice(0, detailsLimit);
-							for (const item of show) {
-								if (item.type === "added") {
-									console.log(chalk.yellow(`  + ${item.path} (remote-only) = ${formatDiffValue(item.remote)}`));
-								} else if (item.type === "removed") {
-									console.log(chalk.yellow(`  - ${item.path} (local-only) = ${formatDiffValue(item.local)}`));
-								} else {
-									console.log(chalk.cyan(`  ~ ${item.path} local=${formatDiffValue(item.local)} remote=${formatDiffValue(item.remote)}`));
-								}
-							}
-							if (details.length > show.length) {
-								console.log(chalk.gray(`  ... and ${details.length - show.length} more changes`));
-							}
-						}
-						changed++;
-					}
-				}
-			}
-
-			console.log(chalk.blue(`Summary: changed=${changed}, same=${same}, local-only=${onlyLocal}, remote-only=${onlyRemote}`));
-		} catch (error) {
-			console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-			process.exit(1);
-		}
-	});
-
-
-export const schemaTypesConvertCommand = new Command("schema:types:convert")
-	.description("Convert local TypeScript types file into collections-as-code JSON (review before push)")
-	.option("-t, --target-dir <path>", "Base target directory for schema artifacts")
-	.option("--types-file <path>", "Path to TypeScript types file", "./buildx/generated/types.ts")
-	.option("--collections-file <path>", "Output collections JSON path", "./buildx/generated/collections.json")
-	.option("--base-collections-file <path>", "Optional base collections file to merge metadata from")
-	.option("--no-allow-lossy", "Require base collections metadata file (strict mode)")
-	.option("--filter <pattern...>", "Filter collection ids by wildcard pattern(s)")
-	.option("--dry-run", "Preview output content without writing files")
-	.action(async (options) => {
-		try {
-			const targetDirPath = options.targetDir ? toAbsolutePath(options.targetDir) : null;
-			const typesFilePath = targetDirPath
-				? path.join(targetDirPath, "types.ts")
-				: toAbsolutePath(options.typesFile);
-			const outputCollectionsFilePath = targetDirPath
-				? path.join(targetDirPath, "collections.json")
-				: toAbsolutePath(options.collectionsFile);
-			const baseCollectionsFilePath = options.baseCollectionsFile
-				? toAbsolutePath(options.baseCollectionsFile)
-				: outputCollectionsFilePath;
-			const filters = parseFilters(options.filter);
-
-			if (!(await fs.pathExists(typesFilePath))) {
-				throw new Error(`Types file not found: ${typesFilePath}`);
-			}
-			const typeContent = await fs.readFile(typesFilePath, "utf8");
-			const { collections, warnings } = buildCollectionsFromTypes(typeContent, filters);
-
-			let finalCollections = collections;
-			let hasBaseCollections = false;
-			if (baseCollectionsFilePath && await fs.pathExists(baseCollectionsFilePath)) {
-				hasBaseCollections = true;
-				const baseCollections = await fs.readJson(baseCollectionsFilePath);
-				if (Array.isArray(baseCollections)) {
-					const baseById = new Map<string, any>(baseCollections.map((collection) => [collection.collection_id, collection]));
-					finalCollections = collections.map((collection) => {
-						const base = baseById.get(collection.collection_id);
-						if (!base) return collection;
-						return normalizeCollectionForCode(mergeCollectionWithBase(base, collection));
-					}).filter(Boolean);
-				}
-			}
-			if (!hasBaseCollections && options.allowLossy === false) {
-				throw new Error([
-					`Base collections file not found: ${baseCollectionsFilePath || "(not specified)"}`,
-					"Conversion without base metadata is lossy and usually produces a large schema:diff.",
-					"Run schema:pull first, or pass --base-collections-file <path>, or remove --no-allow-lossy."
-				].join("\n"));
-			}
-			if (!hasBaseCollections) {
-				console.log(chalk.yellow("! Running lossy convert without base metadata (titles/choices/collection metadata may be dropped)"));
-			}
-
-			if (warnings.length) {
-				console.log(chalk.yellow(`Conversion warnings (${warnings.length}):`));
-				for (const warning of warnings) {
-					console.log(chalk.yellow(`  - ${warning}`));
-				}
-			}
-
-			if (options.dryRun) {
-				console.log(chalk.cyan(`~ would write converted collections to: ${outputCollectionsFilePath}`));
-				printDryRunFilePreview(outputCollectionsFilePath, JSON.stringify(finalCollections, null, 2));
-			} else {
-				await fs.ensureDir(path.dirname(outputCollectionsFilePath));
-				await fs.writeJson(outputCollectionsFilePath, finalCollections, { spaces: 2 });
-				console.log(chalk.green("✓ Converted collections written to:"), outputCollectionsFilePath);
-				console.log(chalk.blue("Next step:"));
-				console.log(chalk.cyan(`  buildx-cli schema:push --collections-file "${outputCollectionsFilePath}" --project-id <project-id> --dry-run`));
-			}
-		} catch (error) {
-			console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-			process.exit(1);
-		}
-	});
-
-export const syncCommand = schemaSyncCommand;
-
-export const __schemaTypesConvertInternals = {
-	mapScalarTypeToFieldType,
-	convertTypeFieldToSchemaField,
-	buildCollectionsFromTypes,
-	mergeSchemaField,
-	mergeCollectionWithBase
-};