kintone-migrator 0.24.9 → 0.26.0

package/dist/index.mjs

@@ -497,6 +497,236 @@ async function applyAction({ container }) {
 	});
 }
 //#endregion
+//#region src/lib/deepEqual.ts
+function isArrayEqual(a, b, stack) {
+	if (!Array.isArray(b)) return false;
+	if (a.length !== b.length) return false;
+	for (let i = 0; i < a.length; i++) if (!deepEqualInner(a[i], b[i], stack)) return false;
+	return true;
+}
+/**
+* Compare two objects by own enumerable string keys (via `Object.keys`).
+*
+* Note: Custom class instances (e.g. `new Error()`) that pass `isRecord` are
+* accepted. Because `Error.prototype.message` is non-enumerable, two Error
+* objects with different messages will compare as equal. Callers should not
+* rely on this function for types with non-enumerable significant state.
+*/
+function isRecordEqual(a, b, stack) {
+	if (!isRecord(b)) return false;
+	const keysA = Object.keys(a);
+	const keysB = Object.keys(b);
+	if (keysA.length !== keysB.length) return false;
+	for (const key of keysA) {
+		if (!Object.hasOwn(b, key)) return false;
+		if (!deepEqualInner(a[key], b[key], stack)) return false;
+	}
+	return true;
+}
+/**
+* Map keys are compared by reference (SameValueZero), not by deep equality.
+* Two Maps with structurally equal but referentially different object keys
+* will be considered unequal.
+*/
+function isMapEqual$1(a, b, stack) {
+	if (!(b instanceof Map)) return false;
+	if (a.size !== b.size) return false;
+	for (const [key, valA] of a) {
+		if (!b.has(key)) return false;
+		if (!deepEqualInner(valA, b.get(key), stack)) return false;
+	}
+	return true;
+}
+function isPrimitiveSet(s) {
+	for (const val of s) {
+		if (val !== null && typeof val === "object") return false;
+		if (typeof val === "function") return false;
+	}
+	return true;
+}
+function isSetEqual(a, b, stack) {
+	if (!(b instanceof Set)) return false;
+	if (a.size !== b.size) return false;
+	if (isPrimitiveSet(a) && isPrimitiveSet(b)) {
+		for (const val of a) if (!b.has(val)) return false;
+		return true;
+	}
+	const remaining = [...b];
+	for (const valA of a) {
+		const stackLen = stack.length;
+		const idx = remaining.findIndex((valB) => {
+			const result = deepEqualInner(valA, valB, stack);
+			if (!result) stack.length = stackLen;
+			return result;
+		});
+		if (idx === -1) return false;
+		remaining.splice(idx, 1);
+	}
+	return true;
+}
+function compareDateOrRegExp(objA, objB) {
+	if (objA instanceof Date && objB instanceof Date) {
+		const ta = objA.getTime();
+		const tb = objB.getTime();
+		return ta === tb || Number.isNaN(ta) && Number.isNaN(tb);
+	}
+	if (objA instanceof Date || objB instanceof Date) return false;
+	if (objA instanceof RegExp && objB instanceof RegExp) return String(objA) === String(objB);
+	if (objA instanceof RegExp || objB instanceof RegExp) return false;
+}
+function compareCollectionOrRecord(objA, objB, stack) {
+	if (Array.isArray(objA)) return isArrayEqual(objA, objB, stack);
+	if (objA instanceof Map) return isMapEqual$1(objA, objB, stack);
+	if (objB instanceof Map) return false;
+	if (objA instanceof Set) return isSetEqual(objA, objB, stack);
+	if (objB instanceof Set) return false;
+	if (isRecord(objA)) return isRecordEqual(objA, objB, stack);
+	return false;
+}
+function deepEqualInner(a, b, stack) {
+	if (a === b) return true;
+	if (typeof a === "number" && typeof b === "number" && Number.isNaN(a) && Number.isNaN(b)) return true;
+	if (a === null || b === null) return a === b;
+	if (typeof a !== typeof b) return false;
+	if (typeof a !== "object") return false;
+	const objA = a;
+	const objB = b;
+	const dateRegExpResult = compareDateOrRegExp(objA, objB);
+	if (dateRegExpResult !== void 0) return dateRegExpResult;
+	for (const [sa, sb] of stack) if (sa === objA && sb === objB) return true;
+	stack.push([objA, objB]);
+	try {
+		return compareCollectionOrRecord(objA, objB, stack);
+	} finally {
+		stack.pop();
+	}
+}
+/**
+* Deep equality comparison for structured data.
+* Supports primitives, plain objects, arrays, Date, RegExp, Map, and Set.
+*
+* Note: `{ a: undefined }` and `{}` are NOT considered equal. This differs from
+* JSON.stringify behavior but is intentional — explicit undefined properties are
+* semantically distinct from absent properties.
+*
+* Set comparison is order-independent: each element in one set is matched to an
+* element in the other using deep equality (O(n²) for non-primitive elements,
+* O(n) fast path for primitive-only sets).
+*
+* Map keys are compared by reference (SameValueZero), not by deep equality.
+* Two Maps with structurally equal but referentially different object keys
+* will be considered unequal.
+*
+* NaN handling: `deepEqual(NaN, NaN)` returns `true`. Invalid Date objects
+* (whose `getTime()` returns NaN) are also considered equal to each other.
+*
+* Signed zero: `-0` and `0` are considered equal (`-0 === 0` is `true`).
+*
+* Circular reference handling: uses a stack-based pair tracker. When the same
+* `(objA, objB)` pair is encountered again on the current comparison path,
+* structural equality is assumed to break the cycle. Shared references (DAG
+* structures) are correctly handled — the same sub-object appearing in multiple
+* properties does not cause false negatives.
+*/
+function deepEqual(a, b) {
+	return deepEqualInner(a, b, []);
+}
+//#endregion
+//#region src/core/domain/diff.ts
+const typeOrder = {
+	added: 0,
+	modified: 1,
+	deleted: 2
+};
+function buildDiffResult(entries, warnings = []) {
+	const sorted = [...entries].sort((a, b) => typeOrder[a.type] - typeOrder[b.type]);
+	let added = 0;
+	let modified = 0;
+	let deleted = 0;
+	for (const e of sorted) if (e.type === "added") added++;
+	else if (e.type === "modified") modified++;
+	else deleted++;
+	return {
+		entries: sorted,
+		summary: {
+			added,
+			modified,
+			deleted,
+			total: sorted.length
+		},
+		isEmpty: sorted.length === 0,
+		warnings
+	};
+}
+//#endregion
+//#region src/core/domain/services/recordDiffDetector.ts
+function detectRecordDiff(localRecord, remoteRecord, callbacks) {
+	const entries = [];
+	for (const [key, localValue] of Object.entries(localRecord)) if (!Object.hasOwn(remoteRecord, key)) entries.push(callbacks.onAdded(key, localValue));
+	else {
+		const entry = callbacks.onModified(key, localValue, remoteRecord[key]);
+		if (entry !== void 0) entries.push(entry);
+	}
+	for (const [key, remoteValue] of Object.entries(remoteRecord)) if (!Object.hasOwn(localRecord, key)) entries.push(callbacks.onDeleted(key, remoteValue));
+	return entries;
+}
+//#endregion
+//#region src/core/domain/action/services/diffDetector.ts
+function compareActions$1(local, remote) {
+	const diffs = [];
+	if (local.index !== remote.index) diffs.push(`index: ${remote.index} -> ${local.index}`);
+	if (!deepEqual(local.destApp, remote.destApp)) diffs.push("destApp changed");
+	if (local.filterCond !== remote.filterCond) diffs.push("filterCond changed");
+	if (!deepEqual(local.mappings, remote.mappings)) if (local.mappings.length !== remote.mappings.length) diffs.push(`mappings: ${remote.mappings.length} -> ${local.mappings.length}`);
+	else diffs.push("mappings changed");
+	if (!deepEqual(local.entities, remote.entities)) diffs.push("entities changed");
+	return diffs;
+}
+function destAppLabel(action) {
+	return `dest: ${action.destApp.app ?? action.destApp.code ?? "(unspecified)"}`;
+}
+const ActionDiffDetector = { detect: (local, remote) => {
+	return buildDiffResult(detectRecordDiff(local.actions, remote.actions, {
+		onAdded: (name, localAction) => ({
+			type: "added",
+			actionName: name,
+			details: destAppLabel(localAction)
+		}),
+		onModified: (name, localAction, remoteAction) => {
+			const diffs = compareActions$1(localAction, remoteAction);
+			if (diffs.length > 0) return {
+				type: "modified",
+				actionName: name,
+				details: diffs.join(", ")
+			};
+		},
+		onDeleted: (name, remoteAction) => ({
+			type: "deleted",
+			actionName: name,
+			details: destAppLabel(remoteAction)
+		})
+	}));
+} };
+//#endregion
+//#region src/core/application/detectDiffBase.ts
+async function detectDiffFromConfig(config) {
+	const [storageResult, remote] = await Promise.all([config.getStorage(), config.fetchRemote()]);
+	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, config.notFoundMessage);
+	const local = config.parseConfig(storageResult.content);
+	return config.detect(local, remote);
+}
+//#endregion
+//#region src/core/application/action/detectActionDiff.ts
+async function detectActionDiff({ container }) {
+	return detectDiffFromConfig({
+		getStorage: () => container.actionStorage.get(),
+		fetchRemote: () => container.actionConfigurator.getActions(),
+		parseConfig: (content) => parseActionConfigText(container.configCodec, content),
+		detect: (local, remote) => ActionDiffDetector.detect(local, { actions: remote.actions }),
+		notFoundMessage: "Action config file not found"
+	});
+}
+//#endregion
 //#region src/core/adapters/kintone/wrapKintoneError.ts
 const KINTONE_REVISION_CONFLICT_CODE = "GAIA_CO02";
 const KINTONE_MAINTENANCE_MODE_CODE = "GAIA_NO02";
@@ -2508,9 +2738,27 @@ const { resolveFilePath: resolveActionFilePath, resolveContainerConfig: resolveA
 //#endregion
 //#region src/cli/commands/applyCommandFactory.ts
 function createApplyCommand(config) {
-	async function runApply(containerConfig) {
+	async function runDiffPreview(containerConfig, diffPreview) {
 		const container = config.createContainer(containerConfig);
 		const s = p.spinner();
+		s.start("Detecting changes...");
+		let result;
+		try {
+			result = await diffPreview.detectDiff({ container });
+		} catch (error) {
+			s.stop("Comparison failed.");
+			throw error;
+		}
+		s.stop("Comparison complete.");
+		diffPreview.printResult(result);
+		return {
+			container,
+			hasChanges: !result.isEmpty
+		};
+	}
+	async function runApply(containerConfig, existingContainer) {
+		const container = existingContainer ?? config.createContainer(containerConfig);
+		const s = p.spinner();
 		s.start(config.spinnerMessage);
 		let result;
 		try {
@@ -2537,21 +2785,91 @@ function createApplyCommand(config) {
 				const skipConfirm = ctx.values.yes === true;
 				await routeMultiApp(values, {
 					singleLegacy: async () => {
-						await confirmAndDeploy([await runApply(config.resolveContainerConfig(values))], skipConfirm);
+						const containerConfig = config.resolveContainerConfig(values);
+						if (config.diffPreview) {
+							const { container, hasChanges } = await runDiffPreview(containerConfig, config.diffPreview);
+							if (!hasChanges) {
+								p.log.success("No changes detected.");
+								return;
+							}
+							if (!skipConfirm) {
+								const shouldContinue = await p.confirm({ message: "Apply these changes?" });
+								if (p.isCancel(shouldContinue) || !shouldContinue) {
+									p.cancel("Apply cancelled.");
+									return;
+								}
+							}
+							await confirmAndDeploy([await runApply(containerConfig, container)], skipConfirm);
+						} else await confirmAndDeploy([await runApply(containerConfig)], skipConfirm);
 					},
 					singleApp: async (app, projectConfig) => {
-						await confirmAndDeploy([await runApply(config.resolveAppContainerConfig(app, projectConfig, values))], skipConfirm);
+						const containerConfig = config.resolveAppContainerConfig(app, projectConfig, values);
+						if (config.diffPreview) {
+							const { container, hasChanges } = await runDiffPreview(containerConfig, config.diffPreview);
+							if (!hasChanges) {
+								p.log.success("No changes detected.");
+								return;
+							}
+							if (!skipConfirm) {
+								const shouldContinue = await p.confirm({ message: "Apply these changes?" });
+								if (p.isCancel(shouldContinue) || !shouldContinue) {
+									p.cancel("Apply cancelled.");
+									return;
+								}
+							}
+							await confirmAndDeploy([await runApply(containerConfig, container)], skipConfirm);
+						} else await confirmAndDeploy([await runApply(containerConfig)], skipConfirm);
 					},
 					multiApp: async (plan, projectConfig) => {
-						const containers = [];
-						await runMultiAppWithHeaders(plan, async (app) => {
-							const container = await runApply(config.resolveAppContainerConfig(app, projectConfig, values));
-							containers.push({
-								appDeployer: container.appDeployer,
-								appName: app.name
+						if (config.diffPreview) {
+							const appDiffResults = [];
+							for (const app of plan.orderedApps) {
+								const containerConfig = config.resolveAppContainerConfig(app, projectConfig, values);
+								printAppHeader(app.name, app.appId);
+								const { container, hasChanges } = await runDiffPreview(containerConfig, config.diffPreview);
+								appDiffResults.push({
+									app,
+									container,
+									hasChanges
+								});
+							}
+							if (!appDiffResults.some((a) => a.hasChanges)) {
+								p.log.success("No changes detected in any app.");
+								return;
+							}
+							if (!skipConfirm) {
+								const shouldContinue = await p.confirm({ message: "Apply these changes to all apps?" });
+								if (p.isCancel(shouldContinue) || !shouldContinue) {
+									p.cancel("Apply cancelled.");
+									return;
+								}
+							}
+							const containers = [];
+							await runMultiAppWithHeaders(plan, async (app) => {
+								const entry = appDiffResults.find((a) => a.app.name === app.name);
+								if (!entry) throw new SystemError(SystemErrorCode.InternalServerError, `App container not found for "${app.name}"`);
+								if (!entry.hasChanges) {
+									p.log.info("No changes. Skipping.");
+									return;
+								}
+								await runApply(config.resolveAppContainerConfig(app, projectConfig, values), entry.container);
+								containers.push({
+									appDeployer: entry.container.appDeployer,
+									appName: app.name
+								});
 							});
-						});
-						await confirmAndDeploy(containers, skipConfirm);
+							await confirmAndDeploy(containers, skipConfirm);
+						} else {
+							const containers = [];
+							await runMultiAppWithHeaders(plan, async (app) => {
+								const container = await runApply(config.resolveAppContainerConfig(app, projectConfig, values));
+								containers.push({
+									appDeployer: container.appDeployer,
+									appName: app.name
+								});
+							});
+							await confirmAndDeploy(containers, skipConfirm);
+						}
 					}
 				});
 			} catch (error) {
@@ -2570,6 +2888,10 @@ var apply_default$12 = createApplyCommand({
 	successMessage: "Action settings applied successfully.",
 	createContainer: createActionCliContainer,
 	applyFn: applyAction,
+	diffPreview: {
+		detectDiff: detectActionDiff,
+		printResult: printActionDiffResult
+	},
 	resolveContainerConfig: resolveActionContainerConfig,
 	resolveAppContainerConfig: resolveActionAppContainerConfig
 });
@@ -2710,236 +3032,6 @@ var capture_default$13 = createCaptureCommand({
 	resolveAppContainerConfig: resolveActionAppContainerConfig
 });
 //#endregion
-//#region src/lib/deepEqual.ts
-function isArrayEqual(a, b, stack) {
-	if (!Array.isArray(b)) return false;
-	if (a.length !== b.length) return false;
-	for (let i = 0; i < a.length; i++) if (!deepEqualInner(a[i], b[i], stack)) return false;
-	return true;
-}
-/**
-* Compare two objects by own enumerable string keys (via `Object.keys`).
-*
-* Note: Custom class instances (e.g. `new Error()`) that pass `isRecord` are
-* accepted. Because `Error.prototype.message` is non-enumerable, two Error
-* objects with different messages will compare as equal. Callers should not
-* rely on this function for types with non-enumerable significant state.
-*/
-function isRecordEqual(a, b, stack) {
-	if (!isRecord(b)) return false;
-	const keysA = Object.keys(a);
-	const keysB = Object.keys(b);
-	if (keysA.length !== keysB.length) return false;
-	for (const key of keysA) {
-		if (!Object.hasOwn(b, key)) return false;
-		if (!deepEqualInner(a[key], b[key], stack)) return false;
-	}
-	return true;
-}
-/**
-* Map keys are compared by reference (SameValueZero), not by deep equality.
-* Two Maps with structurally equal but referentially different object keys
-* will be considered unequal.
-*/
-function isMapEqual$1(a, b, stack) {
-	if (!(b instanceof Map)) return false;
-	if (a.size !== b.size) return false;
-	for (const [key, valA] of a) {
-		if (!b.has(key)) return false;
-		if (!deepEqualInner(valA, b.get(key), stack)) return false;
-	}
-	return true;
-}
-function isPrimitiveSet(s) {
-	for (const val of s) {
-		if (val !== null && typeof val === "object") return false;
-		if (typeof val === "function") return false;
-	}
-	return true;
-}
-function isSetEqual(a, b, stack) {
-	if (!(b instanceof Set)) return false;
-	if (a.size !== b.size) return false;
-	if (isPrimitiveSet(a) && isPrimitiveSet(b)) {
-		for (const val of a) if (!b.has(val)) return false;
-		return true;
-	}
-	const remaining = [...b];
-	for (const valA of a) {
-		const stackLen = stack.length;
-		const idx = remaining.findIndex((valB) => {
-			const result = deepEqualInner(valA, valB, stack);
-			if (!result) stack.length = stackLen;
-			return result;
-		});
-		if (idx === -1) return false;
-		remaining.splice(idx, 1);
-	}
-	return true;
-}
-function compareDateOrRegExp(objA, objB) {
-	if (objA instanceof Date && objB instanceof Date) {
-		const ta = objA.getTime();
-		const tb = objB.getTime();
-		return ta === tb || Number.isNaN(ta) && Number.isNaN(tb);
-	}
-	if (objA instanceof Date || objB instanceof Date) return false;
-	if (objA instanceof RegExp && objB instanceof RegExp) return String(objA) === String(objB);
-	if (objA instanceof RegExp || objB instanceof RegExp) return false;
-}
-function compareCollectionOrRecord(objA, objB, stack) {
-	if (Array.isArray(objA)) return isArrayEqual(objA, objB, stack);
-	if (objA instanceof Map) return isMapEqual$1(objA, objB, stack);
-	if (objB instanceof Map) return false;
-	if (objA instanceof Set) return isSetEqual(objA, objB, stack);
-	if (objB instanceof Set) return false;
-	if (isRecord(objA)) return isRecordEqual(objA, objB, stack);
-	return false;
-}
-function deepEqualInner(a, b, stack) {
-	if (a === b) return true;
-	if (typeof a === "number" && typeof b === "number" && Number.isNaN(a) && Number.isNaN(b)) return true;
-	if (a === null || b === null) return a === b;
-	if (typeof a !== typeof b) return false;
-	if (typeof a !== "object") return false;
-	const objA = a;
-	const objB = b;
-	const dateRegExpResult = compareDateOrRegExp(objA, objB);
-	if (dateRegExpResult !== void 0) return dateRegExpResult;
-	for (const [sa, sb] of stack) if (sa === objA && sb === objB) return true;
-	stack.push([objA, objB]);
-	try {
-		return compareCollectionOrRecord(objA, objB, stack);
-	} finally {
-		stack.pop();
-	}
-}
-/**
-* Deep equality comparison for structured data.
-* Supports primitives, plain objects, arrays, Date, RegExp, Map, and Set.
-*
-* Note: `{ a: undefined }` and `{}` are NOT considered equal. This differs from
-* JSON.stringify behavior but is intentional — explicit undefined properties are
-* semantically distinct from absent properties.
-*
-* Set comparison is order-independent: each element in one set is matched to an
-* element in the other using deep equality (O(n²) for non-primitive elements,
-* O(n) fast path for primitive-only sets).
-*
-* Map keys are compared by reference (SameValueZero), not by deep equality.
-* Two Maps with structurally equal but referentially different object keys
-* will be considered unequal.
-*
-* NaN handling: `deepEqual(NaN, NaN)` returns `true`. Invalid Date objects
-* (whose `getTime()` returns NaN) are also considered equal to each other.
-*
-* Signed zero: `-0` and `0` are considered equal (`-0 === 0` is `true`).
-*
-* Circular reference handling: uses a stack-based pair tracker. When the same
-* `(objA, objB)` pair is encountered again on the current comparison path,
-* structural equality is assumed to break the cycle. Shared references (DAG
-* structures) are correctly handled — the same sub-object appearing in multiple
-* properties does not cause false negatives.
-*/
-function deepEqual(a, b) {
-	return deepEqualInner(a, b, []);
-}
-//#endregion
-//#region src/core/domain/diff.ts
-const typeOrder = {
-	added: 0,
-	modified: 1,
-	deleted: 2
-};
-function buildDiffResult(entries, warnings = []) {
-	const sorted = [...entries].sort((a, b) => typeOrder[a.type] - typeOrder[b.type]);
-	let added = 0;
-	let modified = 0;
-	let deleted = 0;
-	for (const e of sorted) if (e.type === "added") added++;
-	else if (e.type === "modified") modified++;
-	else deleted++;
-	return {
-		entries: sorted,
-		summary: {
-			added,
-			modified,
-			deleted,
-			total: sorted.length
-		},
-		isEmpty: sorted.length === 0,
-		warnings
-	};
-}
-//#endregion
-//#region src/core/domain/services/recordDiffDetector.ts
-function detectRecordDiff(localRecord, remoteRecord, callbacks) {
-	const entries = [];
-	for (const [key, localValue] of Object.entries(localRecord)) if (!Object.hasOwn(remoteRecord, key)) entries.push(callbacks.onAdded(key, localValue));
-	else {
-		const entry = callbacks.onModified(key, localValue, remoteRecord[key]);
-		if (entry !== void 0) entries.push(entry);
-	}
-	for (const [key, remoteValue] of Object.entries(remoteRecord)) if (!Object.hasOwn(localRecord, key)) entries.push(callbacks.onDeleted(key, remoteValue));
-	return entries;
-}
-//#endregion
-//#region src/core/domain/action/services/diffDetector.ts
-function compareActions$1(local, remote) {
-	const diffs = [];
-	if (local.index !== remote.index) diffs.push(`index: ${remote.index} -> ${local.index}`);
-	if (!deepEqual(local.destApp, remote.destApp)) diffs.push("destApp changed");
-	if (local.filterCond !== remote.filterCond) diffs.push("filterCond changed");
-	if (!deepEqual(local.mappings, remote.mappings)) if (local.mappings.length !== remote.mappings.length) diffs.push(`mappings: ${remote.mappings.length} -> ${local.mappings.length}`);
-	else diffs.push("mappings changed");
-	if (!deepEqual(local.entities, remote.entities)) diffs.push("entities changed");
-	return diffs;
-}
-function destAppLabel(action) {
-	return `dest: ${action.destApp.app ?? action.destApp.code ?? "(unspecified)"}`;
-}
-const ActionDiffDetector = { detect: (local, remote) => {
-	return buildDiffResult(detectRecordDiff(local.actions, remote.actions, {
-		onAdded: (name, localAction) => ({
-			type: "added",
-			actionName: name,
-			details: destAppLabel(localAction)
-		}),
-		onModified: (name, localAction, remoteAction) => {
-			const diffs = compareActions$1(localAction, remoteAction);
-			if (diffs.length > 0) return {
-				type: "modified",
-				actionName: name,
-				details: diffs.join(", ")
-			};
-		},
-		onDeleted: (name, remoteAction) => ({
-			type: "deleted",
-			actionName: name,
-			details: destAppLabel(remoteAction)
-		})
-	}));
-} };
-//#endregion
-//#region src/core/application/detectDiffBase.ts
-async function detectDiffFromConfig(config) {
-	const [storageResult, remote] = await Promise.all([config.getStorage(), config.fetchRemote()]);
-	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, config.notFoundMessage);
-	const local = config.parseConfig(storageResult.content);
-	return config.detect(local, remote);
-}
-//#endregion
-//#region src/core/application/action/detectActionDiff.ts
-async function detectActionDiff({ container }) {
-	return detectDiffFromConfig({
-		getStorage: () => container.actionStorage.get(),
-		fetchRemote: () => container.actionConfigurator.getActions(),
-		parseConfig: (content) => parseActionConfigText(container.configCodec, content),
-		detect: (local, remote) => ActionDiffDetector.detect(local, { actions: remote.actions }),
-		notFoundMessage: "Action config file not found"
-	});
-}
-//#endregion
 //#region src/cli/commands/diffCommandFactory.ts
 function createDiffCommand(config) {
 	async function runDiff(containerConfig) {
@@ -3040,6 +3132,41 @@ async function applyAdminNotes({ container }) {
 	});
 }
 //#endregion
+//#region src/core/domain/adminNotes/services/diffDetector.ts
+const CONTENT_TRUNCATE_LENGTH = 30;
+function truncate(text, maxLength) {
+	if (text.length <= maxLength) return text;
+	return `${text.slice(0, maxLength)}...`;
+}
+function compareConfigs$2(local, remote) {
+	const entries = [];
+	if (local.content !== remote.content) entries.push({
+		type: "modified",
+		field: "content",
+		details: `"${truncate(remote.content, CONTENT_TRUNCATE_LENGTH)}" -> "${truncate(local.content, CONTENT_TRUNCATE_LENGTH)}"`
+	});
+	if (local.includeInTemplateAndDuplicates !== remote.includeInTemplateAndDuplicates) entries.push({
+		type: "modified",
+		field: "includeInTemplateAndDuplicates",
+		details: `${String(remote.includeInTemplateAndDuplicates)} -> ${String(local.includeInTemplateAndDuplicates)}`
+	});
+	return entries;
+}
+const AdminNotesDiffDetector = { detect: (local, remote) => {
+	return buildDiffResult(compareConfigs$2(local, remote));
+} };
+//#endregion
+//#region src/core/application/adminNotes/detectAdminNotesDiff.ts
+async function detectAdminNotesDiff({ container }) {
+	return detectDiffFromConfig({
+		getStorage: () => container.adminNotesStorage.get(),
+		fetchRemote: () => container.adminNotesConfigurator.getAdminNotes(),
+		parseConfig: (content) => parseAdminNotesConfigText(container.configCodec, content),
+		detect: (local, remote) => AdminNotesDiffDetector.detect(local, remote.config),
+		notFoundMessage: "Admin notes config file not found"
+	});
+}
+//#endregion
 //#region src/core/adapters/kintone/adminNotesConfigurator.ts
 var KintoneAdminNotesConfigurator = class {
 	constructor(client, appId) {
@@ -3124,6 +3251,10 @@ var apply_default$11 = createApplyCommand({
 	successMessage: "Admin notes applied successfully.",
 	createContainer: createAdminNotesCliContainer,
 	applyFn: applyAdminNotes,
+	diffPreview: {
+		detectDiff: detectAdminNotesDiff,
+		printResult: printAdminNotesDiffResult
+	},
 	resolveContainerConfig: resolveAdminNotesContainerConfig,
 	resolveAppContainerConfig: resolveAdminNotesAppContainerConfig
 });
@@ -3150,59 +3281,26 @@ async function saveAdminNotes({ container, input }) {
 	await container.adminNotesStorage.update(input.configText);
 }
 //#endregion
-//#region src/cli/commands/admin-notes/capture.ts
-var capture_default$12 = createCaptureCommand({
-	description: "Capture current admin notes from kintone app to file",
-	args: adminNotesArgs,
-	spinnerMessage: "Capturing admin notes...",
-	spinnerStopMessage: "Admin notes captured.",
-	domainLabel: "Admin notes",
-	multiAppSuccessMessage: "All admin notes captures completed successfully.",
-	createContainer: createAdminNotesCliContainer,
-	captureFn: captureAdminNotes,
-	saveFn: saveAdminNotes,
-	getConfigFilePath: (config) => config.adminNotesFilePath,
-	resolveContainerConfig: resolveAdminNotesContainerConfig,
-	resolveAppContainerConfig: resolveAdminNotesAppContainerConfig
-});
-//#endregion
-//#region src/core/domain/adminNotes/services/diffDetector.ts
-function compareConfigs$2(local, remote) {
-	const entries = [];
-	if (local.content !== remote.content) entries.push({
-		type: "modified",
-		field: "content",
-		details: "content changed"
-	});
-	if (local.includeInTemplateAndDuplicates !== remote.includeInTemplateAndDuplicates) entries.push({
-		type: "modified",
-		field: "includeInTemplateAndDuplicates",
-		details: `${String(remote.includeInTemplateAndDuplicates)} -> ${String(local.includeInTemplateAndDuplicates)}`
-	});
-	return entries;
-}
-const AdminNotesDiffDetector = { detect: (local, remote) => {
-	return buildDiffResult(compareConfigs$2(local, remote));
-} };
-//#endregion
-//#region src/core/application/adminNotes/detectAdminNotesDiff.ts
-async function detectAdminNotesDiff({ container }) {
-	return detectDiffFromConfig({
-		getStorage: () => container.adminNotesStorage.get(),
-		fetchRemote: () => container.adminNotesConfigurator.getAdminNotes(),
-		parseConfig: (content) => parseAdminNotesConfigText(container.configCodec, content),
-		detect: (local, remote) => AdminNotesDiffDetector.detect(local, remote.config),
-		notFoundMessage: "Admin notes config file not found"
-	});
-}
-//#endregion
 //#region src/cli/commands/admin-notes/index.ts
 var admin_notes_default = define({
 	name: "admin-notes",
 	description: "Manage kintone admin notes",
 	subCommands: {
 		apply: apply_default$11,
-		capture: capture_default$12,
+		capture: createCaptureCommand({
+			description: "Capture current admin notes from kintone app to file",
+			args: adminNotesArgs,
+			spinnerMessage: "Capturing admin notes...",
+			spinnerStopMessage: "Admin notes captured.",
+			domainLabel: "Admin notes",
+			multiAppSuccessMessage: "All admin notes captures completed successfully.",
+			createContainer: createAdminNotesCliContainer,
+			captureFn: captureAdminNotes,
+			saveFn: saveAdminNotes,
+			getConfigFilePath: (config) => config.adminNotesFilePath,
+			resolveContainerConfig: resolveAdminNotesContainerConfig,
+			resolveAppContainerConfig: resolveAdminNotesAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local admin notes config with remote kintone app",
 			args: adminNotesArgs,
@@ -3281,6 +3379,68 @@ async function applyAppPermission({ container }) {
 	});
 }
 //#endregion
+//#region src/core/domain/appPermission/services/diffDetector.ts
+const BOOLEAN_FLAGS = [
+	"includeSubs",
+	"appEditable",
+	"recordViewable",
+	"recordAddable",
+	"recordEditable",
+	"recordDeletable",
+	"recordImportable",
+	"recordExportable"
+];
+function entityKey(right) {
+	return `${right.entity.type}:${right.entity.code}`;
+}
+function describeRight$1(right) {
+	const flags = BOOLEAN_FLAGS.filter((f) => f !== "includeSubs" && right[f]);
+	return flags.length > 0 ? flags.join(", ") : "no permissions";
+}
+function compareRights(local, remote) {
+	const diffs = [];
+	for (const flag of BOOLEAN_FLAGS) if (local[flag] !== remote[flag]) diffs.push(`${flag}: ${String(remote[flag])} -> ${String(local[flag])}`);
+	return diffs;
+}
+const AppPermissionDiffDetector = { detect: (local, remote) => {
+	const entries = [];
+	const localMap = new Map(local.rights.map((r) => [entityKey(r), r]));
+	const remoteMap = new Map(remote.rights.map((r) => [entityKey(r), r]));
+	for (const [key, localRight] of localMap) {
+		const remoteRight = remoteMap.get(key);
+		if (!remoteRight) entries.push({
+			type: "added",
+			entityKey: key,
+			details: describeRight$1(localRight)
+		});
+		else {
+			const diffs = compareRights(localRight, remoteRight);
+			if (diffs.length > 0) entries.push({
+				type: "modified",
+				entityKey: key,
+				details: diffs.join(", ")
+			});
+		}
+	}
+	for (const [key, remoteRight] of remoteMap) if (!localMap.has(key)) entries.push({
+		type: "deleted",
+		entityKey: key,
+		details: describeRight$1(remoteRight)
+	});
+	return buildDiffResult(entries);
+} };
+//#endregion
+//#region src/core/application/appPermission/detectAppPermissionDiff.ts
+async function detectAppPermissionDiff({ container }) {
+	return detectDiffFromConfig({
+		getStorage: () => container.appPermissionStorage.get(),
+		fetchRemote: () => container.appPermissionConfigurator.getAppPermissions(),
+		parseConfig: (content) => parseAppPermissionConfigText(container.configCodec, content),
+		detect: (local, remote) => AppPermissionDiffDetector.detect(local, { rights: remote.rights }),
+		notFoundMessage: "App permission config file not found"
+	});
+}
+//#endregion
 //#region src/core/adapters/kintone/appPermissionConfigurator.ts
 const VALID_ENTITY_TYPES$7 = new Set([
 	"USER",
@@ -3407,6 +3567,10 @@ var apply_default$10 = createApplyCommand({
 	successMessage: "App access permissions applied successfully.",
 	createContainer: createAppPermissionCliContainer,
 	applyFn: applyAppPermission,
+	diffPreview: {
+		detectDiff: detectAppPermissionDiff,
+		printResult: printAppPermissionDiffResult
+	},
 	resolveContainerConfig: resolveAppAclContainerConfig,
 	resolveAppContainerConfig: resolveAppAclAppContainerConfig
 });
@@ -3446,91 +3610,26 @@ async function saveAppPermission({ container, input }) {
 	await container.appPermissionStorage.update(input.configText);
 }
 //#endregion
-//#region src/cli/commands/app-acl/capture.ts
-var capture_default$11 = createCaptureCommand({
-	description: "Capture current app access permissions from kintone app to file",
-	args: appAclArgs,
-	spinnerMessage: "Capturing app access permissions...",
-	spinnerStopMessage: "App access permissions captured.",
-	domainLabel: "App ACL",
-	multiAppSuccessMessage: "All app ACL captures completed successfully.",
-	createContainer: createAppPermissionCliContainer,
-	captureFn: captureAppPermission,
-	saveFn: saveAppPermission,
-	getConfigFilePath: (config) => config.appAclFilePath,
-	resolveContainerConfig: resolveAppAclContainerConfig,
-	resolveAppContainerConfig: resolveAppAclAppContainerConfig
-});
-//#endregion
-//#region src/core/domain/appPermission/services/diffDetector.ts
-const BOOLEAN_FLAGS = [
-	"includeSubs",
-	"appEditable",
-	"recordViewable",
-	"recordAddable",
-	"recordEditable",
-	"recordDeletable",
-	"recordImportable",
-	"recordExportable"
-];
-function entityKey(right) {
-	return `${right.entity.type}:${right.entity.code}`;
-}
-function describeRight$1(right) {
-	const flags = BOOLEAN_FLAGS.filter((f) => f !== "includeSubs" && right[f]);
-	return flags.length > 0 ? flags.join(", ") : "no permissions";
-}
-function compareRights(local, remote) {
-	const diffs = [];
-	for (const flag of BOOLEAN_FLAGS) if (local[flag] !== remote[flag]) diffs.push(`${flag}: ${String(remote[flag])} -> ${String(local[flag])}`);
-	return diffs;
-}
-const AppPermissionDiffDetector = { detect: (local, remote) => {
-	const entries = [];
-	const localMap = new Map(local.rights.map((r) => [entityKey(r), r]));
-	const remoteMap = new Map(remote.rights.map((r) => [entityKey(r), r]));
-	for (const [key, localRight] of localMap) {
-		const remoteRight = remoteMap.get(key);
-		if (!remoteRight) entries.push({
-			type: "added",
-			entityKey: key,
-			details: describeRight$1(localRight)
-		});
-		else {
-			const diffs = compareRights(localRight, remoteRight);
-			if (diffs.length > 0) entries.push({
-				type: "modified",
-				entityKey: key,
-				details: diffs.join(", ")
-			});
-		}
-	}
-	for (const [key, remoteRight] of remoteMap) if (!localMap.has(key)) entries.push({
-		type: "deleted",
-		entityKey: key,
-		details: describeRight$1(remoteRight)
-	});
-	return buildDiffResult(entries);
-} };
-//#endregion
-//#region src/core/application/appPermission/detectAppPermissionDiff.ts
-async function detectAppPermissionDiff({ container }) {
-	return detectDiffFromConfig({
-		getStorage: () => container.appPermissionStorage.get(),
-		fetchRemote: () => container.appPermissionConfigurator.getAppPermissions(),
-		parseConfig: (content) => parseAppPermissionConfigText(container.configCodec, content),
-		detect: (local, remote) => AppPermissionDiffDetector.detect(local, { rights: remote.rights }),
-		notFoundMessage: "App permission config file not found"
-	});
-}
-//#endregion
 //#region src/cli/commands/app-acl/index.ts
 var app_acl_default = define({
 	name: "app-acl",
 	description: "Manage kintone app access permissions",
 	subCommands: {
 		apply: apply_default$10,
-		capture: capture_default$11,
+		capture: createCaptureCommand({
+			description: "Capture current app access permissions from kintone app to file",
+			args: appAclArgs,
+			spinnerMessage: "Capturing app access permissions...",
+			spinnerStopMessage: "App access permissions captured.",
+			domainLabel: "App ACL",
+			multiAppSuccessMessage: "All app ACL captures completed successfully.",
+			createContainer: createAppPermissionCliContainer,
+			captureFn: captureAppPermission,
+			saveFn: saveAppPermission,
+			getConfigFilePath: (config) => config.appAclFilePath,
+			resolveContainerConfig: resolveAppAclContainerConfig,
+			resolveAppContainerConfig: resolveAppAclAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local app permission config with remote kintone app",
 			args: appAclArgs,
@@ -3650,35 +3749,124 @@ async function resolveResources(platform, basePath, fileUploader) {
 		css
 	};
 }
-function mergePlatform(current, incoming) {
-	return {
-		js: ResourceMerger.mergeResources(current.js, incoming.js),
-		css: ResourceMerger.mergeResources(current.css, incoming.css)
-	};
+function mergePlatform(current, incoming) {
+	return {
+		js: ResourceMerger.mergeResources(current.js, incoming.js),
+		css: ResourceMerger.mergeResources(current.css, incoming.css)
+	};
+}
+async function applyCustomization({ container, input }) {
+	const result = await container.customizationStorage.get();
+	if (!result.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Customization config file not found");
+	const config = parseCustomizationConfigText(container.configCodec, result.content);
+	const currentCustomization = await container.customizationConfigurator.getCustomization();
+	const [resolvedDesktop, resolvedMobile] = await Promise.all([resolveResources(config.desktop, input.basePath, container.fileUploader), resolveResources(config.mobile, input.basePath, container.fileUploader)]);
+	const mergedDesktop = mergePlatform(currentCustomization.desktop, resolvedDesktop);
+	const mergedMobile = mergePlatform(currentCustomization.mobile, resolvedMobile);
+	ResourceMerger.assertResourceCount("desktop.js", mergedDesktop.js);
+	ResourceMerger.assertResourceCount("desktop.css", mergedDesktop.css);
+	ResourceMerger.assertResourceCount("mobile.js", mergedMobile.js);
+	ResourceMerger.assertResourceCount("mobile.css", mergedMobile.css);
+	await container.customizationConfigurator.updateCustomization({
+		scope: config.scope,
+		desktop: {
+			js: mergedDesktop.js,
+			css: mergedDesktop.css
+		},
+		mobile: {
+			js: mergedMobile.js,
+			css: mergedMobile.css
+		},
+		revision: currentCustomization.revision
+	});
+}
+//#endregion
+//#region src/core/domain/customization/services/diffDetector.ts
+function resourceName(resource) {
+	if (resource.type === "URL") return resource.url;
+	const parts = resource.path.replace(/\\/g, "/").split("/").filter(Boolean);
+	return parts[parts.length - 1];
+}
+function remoteResourceName(resource) {
+	if (resource.type === "URL") return resource.url;
+	return resource.file.name;
+}
+function compareResourceLists(localResources, remoteResources, platform, resourceType, warnings) {
+	const entries = [];
+	const localNames = localResources.map(resourceName);
+	const remoteNames = remoteResources.map(remoteResourceName);
+	const localNameSet = new Set(localNames);
+	const remoteNameSet = new Set(remoteNames);
+	const hasDuplicates = localNames.length !== localNameSet.size || remoteNames.length !== remoteNameSet.size;
+	if (hasDuplicates) warnings.push(`[${platform}.${resourceType}] duplicate basenames detected; diff results may be inaccurate for FILE resources`);
+	const localTypeMap = /* @__PURE__ */ new Map();
+	for (const r of localResources) localTypeMap.set(resourceName(r), r.type);
+	const remoteTypeMap = /* @__PURE__ */ new Map();
+	for (const r of remoteResources) remoteTypeMap.set(remoteResourceName(r), r.type);
+	for (const name of localNameSet) if (!remoteNameSet.has(name)) {
+		const resType = localTypeMap.get(name) ?? "FILE";
+		entries.push({
+			type: "added",
+			platform,
+			category: resourceType,
+			name,
+			details: `new ${resType} resource`
+		});
+	}
+	for (const name of remoteNameSet) if (!localNameSet.has(name)) {
+		const resType = remoteTypeMap.get(name) ?? "FILE";
+		entries.push({
+			type: "deleted",
+			platform,
+			category: resourceType,
+			name,
+			details: `removed ${resType} resource`
+		});
+	}
+	const matchedFiles = [...localNameSet].filter((n) => remoteNameSet.has(n));
+	const hasLocalFiles = localResources.some((r) => r.type === "FILE");
+	const hasRemoteFiles = remoteResources.some((r) => r.type === "FILE");
+	if (matchedFiles.length > 0 && hasLocalFiles && hasRemoteFiles) warnings.push(`[${platform}.${resourceType}] FILE resources are compared by name only; content changes are not detected`);
+	if (!hasDuplicates) {
+		const localShared = localNames.filter((n) => remoteNameSet.has(n));
+		const remoteShared = remoteNames.filter((n) => localNameSet.has(n));
+		if (localShared.length > 1 && localShared.length === remoteShared.length && localShared.some((n, i) => n !== remoteShared[i])) entries.push({
+			type: "modified",
+			platform,
+			category: resourceType,
+			name: "(order)",
+			details: "resource load order changed"
+		});
+	}
+	return entries;
+}
+function comparePlatform(localJs, localCss, remote, platform, warnings) {
+	return [...compareResourceLists(localJs, remote.js, platform, "js", warnings), ...compareResourceLists(localCss, remote.css, platform, "css", warnings)];
 }
-async function applyCustomization({ container, input }) {
-	const result = await container.customizationStorage.get();
-	if (!result.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Customization config file not found");
-	const config = parseCustomizationConfigText(container.configCodec, result.content);
-	const currentCustomization = await container.customizationConfigurator.getCustomization();
-	const [resolvedDesktop, resolvedMobile] = await Promise.all([resolveResources(config.desktop, input.basePath, container.fileUploader), resolveResources(config.mobile, input.basePath, container.fileUploader)]);
-	const mergedDesktop = mergePlatform(currentCustomization.desktop, resolvedDesktop);
-	const mergedMobile = mergePlatform(currentCustomization.mobile, resolvedMobile);
-	ResourceMerger.assertResourceCount("desktop.js", mergedDesktop.js);
-	ResourceMerger.assertResourceCount("desktop.css", mergedDesktop.css);
-	ResourceMerger.assertResourceCount("mobile.js", mergedMobile.js);
-	ResourceMerger.assertResourceCount("mobile.css", mergedMobile.css);
-	await container.customizationConfigurator.updateCustomization({
-		scope: config.scope,
-		desktop: {
-			js: mergedDesktop.js,
-			css: mergedDesktop.css
-		},
-		mobile: {
-			js: mergedMobile.js,
-			css: mergedMobile.css
-		},
-		revision: currentCustomization.revision
+const CustomizationDiffDetector = { detect: (local, remote) => {
+	const entries = [];
+	const warnings = [];
+	const localScope = local.scope ?? "ALL";
+	if (localScope !== remote.scope) entries.push({
+		type: "modified",
+		platform: "config",
+		category: "scope",
+		name: "scope",
+		details: `${remote.scope} -> ${localScope}`
+	});
+	entries.push(...comparePlatform(local.desktop.js, local.desktop.css, remote.desktop, "desktop", warnings));
+	entries.push(...comparePlatform(local.mobile.js, local.mobile.css, remote.mobile, "mobile", warnings));
+	return buildDiffResult(entries, warnings);
+} };
+//#endregion
+//#region src/core/application/customization/detectCustomizationDiff.ts
+async function detectCustomizationDiff({ container }) {
+	return detectDiffFromConfig({
+		getStorage: () => container.customizationStorage.get(),
+		fetchRemote: () => container.customizationConfigurator.getCustomization(),
+		parseConfig: (content) => parseCustomizationConfigText(container.configCodec, content),
+		detect: (local, remote) => CustomizationDiffDetector.detect(local, remote),
+		notFoundMessage: "Customization config file not found"
 	});
 }
 //#endregion
@@ -3945,132 +4133,46 @@ var capture_default$10 = define({
 });
 //#endregion
 //#region src/cli/commands/customize/apply.ts
-async function applyCustomizationForApp(config) {
+function createCustomizationContainer(config) {
 	const container = createCustomizationCliContainer(config);
 	const filePrefix = deriveFilePrefix(config.customizeFilePath);
-	const basePath = join(dirname(resolve(config.customizeFilePath)), filePrefix);
-	const s = p.spinner();
-	s.start("Applying customization...");
-	await applyCustomization({
+	return {
 		container,
-		input: { basePath }
-	});
-	s.stop("Customization applied.");
-	return container;
-}
-var apply_default$9 = define({
-	name: "apply",
-	description: "Apply JS/CSS customization to kintone app",
-	args: {
-		...customizeArgs,
-		...confirmArgs
-	},
-	run: async (ctx) => {
-		try {
-			const values = ctx.values;
-			const skipConfirm = values.yes === true;
-			await routeMultiApp(values, {
-				singleLegacy: async () => {
-					await confirmAndDeploy([await applyCustomizationForApp(resolveCustomizeConfig(values))], skipConfirm, "Customization applied and deployed successfully.");
-				},
-				singleApp: async (app, projectConfig) => {
-					await confirmAndDeploy([await applyCustomizationForApp(resolveCustomizeAppConfig(app, projectConfig, values))], skipConfirm, "Customization applied and deployed successfully.");
-				},
-				multiApp: async (plan, projectConfig) => {
-					const containers = [];
-					await runMultiAppWithHeaders(plan, async (app) => {
-						const container = await applyCustomizationForApp(resolveCustomizeAppConfig(app, projectConfig, values));
-						containers.push({
-							appDeployer: container.appDeployer,
-							appName: app.name
-						});
-					});
-					await confirmAndDeploy(containers, skipConfirm, "Customization applied and deployed successfully.");
-				}
-			});
-		} catch (error) {
-			handleCliError(error);
-		}
-	}
-});
-//#endregion
-//#region src/core/domain/customization/services/diffDetector.ts
-function resourceName(resource) {
-	if (resource.type === "URL") return resource.url;
-	const parts = resource.path.replace(/\\/g, "/").split("/").filter(Boolean);
-	return parts[parts.length - 1];
-}
-function remoteResourceName(resource) {
-	if (resource.type === "URL") return resource.url;
-	return resource.file.name;
+		basePath: join(dirname(resolve(config.customizeFilePath)), filePrefix)
+	};
 }
-function compareResourceLists(localResources, remoteResources, platform, resourceType, warnings) {
-	const entries = [];
-	const localNames = localResources.map(resourceName);
-	const remoteNames = remoteResources.map(remoteResourceName);
-	const localNameSet = new Set(localNames);
-	const remoteNameSet = new Set(remoteNames);
-	const hasDuplicates = localNames.length !== localNameSet.size || remoteNames.length !== remoteNameSet.size;
-	if (hasDuplicates) warnings.push(`[${platform}.${resourceType}] duplicate basenames detected; diff results may be inaccurate for FILE resources`);
-	for (const name of localNameSet) if (!remoteNameSet.has(name)) entries.push({
-		type: "added",
-		platform,
-		category: resourceType,
-		name,
-		details: "new resource"
-	});
-	for (const name of remoteNameSet) if (!localNameSet.has(name)) entries.push({
-		type: "deleted",
-		platform,
-		category: resourceType,
-		name,
-		details: "removed"
-	});
-	const matchedFiles = [...localNameSet].filter((n) => remoteNameSet.has(n));
-	const hasLocalFiles = localResources.some((r) => r.type === "FILE");
-	const hasRemoteFiles = remoteResources.some((r) => r.type === "FILE");
-	if (matchedFiles.length > 0 && hasLocalFiles && hasRemoteFiles) warnings.push(`[${platform}.${resourceType}] FILE resources are compared by name only; content changes are not detected`);
-	if (!hasDuplicates) {
-		const localShared = localNames.filter((n) => remoteNameSet.has(n));
-		const remoteShared = remoteNames.filter((n) => localNameSet.has(n));
-		if (localShared.length > 1 && localShared.length === remoteShared.length && localShared.some((n, i) => n !== remoteShared[i])) entries.push({
-			type: "modified",
-			platform,
-			category: resourceType,
-			name: "(order)",
-			details: "resource load order changed"
+async function runCustomizationApply(container, basePath) {
+	const s = p.spinner();
+	s.start("Applying customization...");
+	try {
+		await applyCustomization({
+			container,
+			input: { basePath }
 		});
+	} catch (error) {
+		s.stop("Apply failed.");
+		throw error;
 	}
-	return entries;
-}
-function comparePlatform(localJs, localCss, remote, platform, warnings) {
-	return [...compareResourceLists(localJs, remote.js, platform, "js", warnings), ...compareResourceLists(localCss, remote.css, platform, "css", warnings)];
+	s.stop("Customization applied.");
 }
-const CustomizationDiffDetector = { detect: (local, remote) => {
-	const entries = [];
-	const warnings = [];
-	const localScope = local.scope ?? "ALL";
-	if (localScope !== remote.scope) entries.push({
-		type: "modified",
-		platform: "config",
-		category: "scope",
-		name: "scope",
-		details: `${remote.scope} -> ${localScope}`
-	});
-	entries.push(...comparePlatform(local.desktop.js, local.desktop.css, remote.desktop, "desktop", warnings));
-	entries.push(...comparePlatform(local.mobile.js, local.mobile.css, remote.mobile, "mobile", warnings));
-	return buildDiffResult(entries, warnings);
-} };
-//#endregion
-//#region src/core/application/customization/detectCustomizationDiff.ts
-async function detectCustomizationDiff({ container }) {
-	return detectDiffFromConfig({
-		getStorage: () => container.customizationStorage.get(),
-		fetchRemote: () => container.customizationConfigurator.getCustomization(),
-		parseConfig: (content) => parseCustomizationConfigText(container.configCodec, content),
-		detect: (local, remote) => CustomizationDiffDetector.detect(local, remote),
-		notFoundMessage: "Customization config file not found"
-	});
+async function runDiffPreview(config) {
+	const { container, basePath } = createCustomizationContainer(config);
+	const s = p.spinner();
+	s.start("Detecting changes...");
+	let result;
+	try {
+		result = await detectCustomizationDiff({ container });
+	} catch (error) {
+		s.stop("Comparison failed.");
+		throw error;
+	}
+	s.stop("Comparison complete.");
+	printCustomizationDiffResult(result);
+	return {
+		container,
+		basePath,
+		hasChanges: !result.isEmpty
+	};
 }
 //#endregion
 //#region src/cli/commands/customize/index.ts
@@ -4078,7 +4180,96 @@ var customize_default = define({
 	name: "customize",
 	description: "Manage kintone JS/CSS customizations",
 	subCommands: {
-		apply: apply_default$9,
+		apply: define({
+			name: "apply",
+			description: "Apply JS/CSS customization to kintone app",
+			args: {
+				...customizeArgs,
+				...confirmArgs
+			},
+			run: async (ctx) => {
+				try {
+					const values = ctx.values;
+					const skipConfirm = values.yes === true;
+					await routeMultiApp(values, {
+						singleLegacy: async () => {
+							const { container, basePath, hasChanges } = await runDiffPreview(resolveCustomizeConfig(values));
+							if (!hasChanges) {
+								p.log.success("No changes detected.");
+								return;
+							}
+							if (!skipConfirm) {
+								const shouldContinue = await p.confirm({ message: "Apply these changes?" });
+								if (p.isCancel(shouldContinue) || !shouldContinue) {
+									p.cancel("Apply cancelled.");
+									return;
+								}
+							}
+							await runCustomizationApply(container, basePath);
+							await confirmAndDeploy([container], skipConfirm, "Customization applied and deployed successfully.");
+						},
+						singleApp: async (app, projectConfig) => {
+							const { container, basePath, hasChanges } = await runDiffPreview(resolveCustomizeAppConfig(app, projectConfig, values));
+							if (!hasChanges) {
+								p.log.success("No changes detected.");
+								return;
+							}
+							if (!skipConfirm) {
+								const shouldContinue = await p.confirm({ message: "Apply these changes?" });
+								if (p.isCancel(shouldContinue) || !shouldContinue) {
+									p.cancel("Apply cancelled.");
+									return;
+								}
+							}
+							await runCustomizationApply(container, basePath);
+							await confirmAndDeploy([container], skipConfirm, "Customization applied and deployed successfully.");
+						},
+						multiApp: async (plan, projectConfig) => {
+							const appDiffResults = [];
+							for (const app of plan.orderedApps) {
+								const config = resolveCustomizeAppConfig(app, projectConfig, values);
+								printAppHeader(app.name, app.appId);
+								const { container, basePath, hasChanges } = await runDiffPreview(config);
+								appDiffResults.push({
+									app,
+									container,
+									basePath,
+									hasChanges
+								});
+							}
+							if (!appDiffResults.some((a) => a.hasChanges)) {
+								p.log.success("No changes detected in any app.");
+								return;
+							}
+							if (!skipConfirm) {
+								const shouldContinue = await p.confirm({ message: "Apply these changes to all apps?" });
+								if (p.isCancel(shouldContinue) || !shouldContinue) {
+									p.cancel("Apply cancelled.");
+									return;
+								}
+							}
+							const containers = [];
+							await runMultiAppWithHeaders(plan, async (app) => {
+								const entry = appDiffResults.find((a) => a.app.name === app.name);
+								if (!entry) throw new SystemError(SystemErrorCode.InternalServerError, `App container not found for "${app.name}"`);
+								if (!entry.hasChanges) {
+									p.log.info("No changes. Skipping.");
+									return;
+								}
+								await runCustomizationApply(entry.container, entry.basePath);
+								containers.push({
+									appDeployer: entry.container.appDeployer,
+									appName: app.name
+								});
+							});
+							await confirmAndDeploy(containers, skipConfirm, "Customization applied and deployed successfully.");
+						}
+					});
+				} catch (error) {
+					handleCliError(error);
+				}
+			}
+		}),
 		capture: capture_default$10,
 		diff: createDiffCommand({
 			description: "Compare local customization config with remote kintone app",
@@ -4258,14 +4449,71 @@ function parseFieldPermissionConfigText(codec, rawText) {
 async function applyFieldPermission({ container }) {
 	await applyFromConfig({
 		getStorage: () => container.fieldPermissionStorage.get(),
-		parseConfig: (content) => parseFieldPermissionConfigText(container.configCodec, content),
+		parseConfig: (content) => parseFieldPermissionConfigText(container.configCodec, content),
+		fetchRemote: () => container.fieldPermissionConfigurator.getFieldPermissions(),
+		update: async (config, current) => {
+			await container.fieldPermissionConfigurator.updateFieldPermissions({
+				rights: config.rights,
+				revision: current.revision
+			});
+		},
+		notFoundMessage: "Field permission config file not found"
+	});
+}
+//#endregion
+//#region src/core/domain/fieldPermission/services/diffDetector.ts
+function isEntitiesEqual$1(a, b) {
+	return deepEqual(a.entities.map((e) => ({
+		accessibility: e.accessibility,
+		type: e.entity.type,
+		code: e.entity.code,
+		includeSubs: e.includeSubs ?? false
+	})), b.entities.map((e) => ({
+		accessibility: e.accessibility,
+		type: e.entity.type,
+		code: e.entity.code,
+		includeSubs: e.includeSubs ?? false
+	})));
+}
+function describeEntities(entities) {
+	if (entities.length === 0) return "no entities";
+	return entities.map((e) => {
+		const access = e.accessibility.toLowerCase();
+		return `${e.entity.type}:${e.entity.code}(${access})`;
+	}).join(", ");
+}
+const FieldPermissionDiffDetector = { detect: (local, remote) => {
+	const entries = [];
+	const localMap = new Map(local.rights.map((r) => [r.code, r]));
+	const remoteMap = new Map(remote.rights.map((r) => [r.code, r]));
+	for (const [code, localRight] of localMap) {
+		const remoteRight = remoteMap.get(code);
+		if (!remoteRight) entries.push({
+			type: "added",
+			fieldCode: code,
+			details: `entities: ${describeEntities(localRight.entities)}`
+		});
+		else if (!isEntitiesEqual$1(localRight, remoteRight)) entries.push({
+			type: "modified",
+			fieldCode: code,
+			details: `entities: ${describeEntities(localRight.entities)}`
+		});
+	}
+	for (const [code, remoteRight] of remoteMap) if (!localMap.has(code)) entries.push({
+		type: "deleted",
+		fieldCode: code,
+		details: `entities: ${describeEntities(remoteRight.entities)}`
+	});
+	return buildDiffResult(entries);
+} };
+//#endregion
+//#region src/core/application/fieldPermission/detectFieldPermissionDiff.ts
+async function detectFieldPermissionDiff({ container }) {
+	return detectDiffFromConfig({
+		getStorage: () => container.fieldPermissionStorage.get(),
 		fetchRemote: () => container.fieldPermissionConfigurator.getFieldPermissions(),
-		update: async (config, current) => {
-			await container.fieldPermissionConfigurator.updateFieldPermissions({
-				rights: config.rights,
-				revision: current.revision
-			});
-		},
+		parseConfig: (content) => parseFieldPermissionConfigText(container.configCodec, content),
+		detect: (local, remote) => FieldPermissionDiffDetector.detect(local, { rights: remote.rights }),
 		notFoundMessage: "Field permission config file not found"
 	});
 }
@@ -4300,6 +4548,10 @@ var apply_default$8 = createApplyCommand({
 	successMessage: "Field access permissions applied successfully.",
 	createContainer: createFieldPermissionCliContainer,
 	applyFn: applyFieldPermission,
+	diffPreview: {
+		detectDiff: detectFieldPermissionDiff,
+		printResult: printFieldPermissionDiffResult
+	},
 	resolveContainerConfig: resolveFieldAclContainerConfig,
 	resolveAppContainerConfig: resolveFieldAclAppContainerConfig
 });
@@ -4337,79 +4589,26 @@ async function saveFieldPermission({ container, input }) {
 	await container.fieldPermissionStorage.update(input.configText);
 }
 //#endregion
-//#region src/cli/commands/field-acl/capture.ts
-var capture_default$9 = createCaptureCommand({
-	description: "Capture current field access permissions from kintone app to file",
-	args: fieldAclArgs,
-	spinnerMessage: "Capturing field access permissions...",
-	spinnerStopMessage: "Field access permissions captured.",
-	domainLabel: "Field ACL",
-	multiAppSuccessMessage: "All field ACL captures completed successfully.",
-	createContainer: createFieldPermissionCliContainer,
-	captureFn: captureFieldPermission,
-	saveFn: saveFieldPermission,
-	getConfigFilePath: (config) => config.fieldAclFilePath,
-	resolveContainerConfig: resolveFieldAclContainerConfig,
-	resolveAppContainerConfig: resolveFieldAclAppContainerConfig
-});
-//#endregion
-//#region src/core/domain/fieldPermission/services/diffDetector.ts
-function isEntitiesEqual$1(a, b) {
-	return deepEqual(a.entities.map((e) => ({
-		accessibility: e.accessibility,
-		type: e.entity.type,
-		code: e.entity.code,
-		includeSubs: e.includeSubs ?? false
-	})), b.entities.map((e) => ({
-		accessibility: e.accessibility,
-		type: e.entity.type,
-		code: e.entity.code,
-		includeSubs: e.includeSubs ?? false
-	})));
-}
-const FieldPermissionDiffDetector = { detect: (local, remote) => {
-	const entries = [];
-	const localMap = new Map(local.rights.map((r) => [r.code, r]));
-	const remoteMap = new Map(remote.rights.map((r) => [r.code, r]));
-	for (const [code, localRight] of localMap) {
-		const remoteRight = remoteMap.get(code);
-		if (!remoteRight) entries.push({
-			type: "added",
-			fieldCode: code,
-			details: `${localRight.entities.length} entities`
-		});
-		else if (!isEntitiesEqual$1(localRight, remoteRight)) entries.push({
-			type: "modified",
-			fieldCode: code,
-			details: "entities changed"
-		});
-	}
-	for (const code of remoteMap.keys()) if (!localMap.has(code)) entries.push({
-		type: "deleted",
-		fieldCode: code,
-		details: "removed"
-	});
-	return buildDiffResult(entries);
-} };
-//#endregion
-//#region src/core/application/fieldPermission/detectFieldPermissionDiff.ts
-async function detectFieldPermissionDiff({ container }) {
-	return detectDiffFromConfig({
-		getStorage: () => container.fieldPermissionStorage.get(),
-		fetchRemote: () => container.fieldPermissionConfigurator.getFieldPermissions(),
-		parseConfig: (content) => parseFieldPermissionConfigText(container.configCodec, content),
-		detect: (local, remote) => FieldPermissionDiffDetector.detect(local, { rights: remote.rights }),
-		notFoundMessage: "Field permission config file not found"
-	});
-}
-//#endregion
 //#region src/cli/commands/field-acl/index.ts
 var field_acl_default = define({
 	name: "field-acl",
 	description: "Manage kintone field access permissions",
 	subCommands: {
 		apply: apply_default$8,
-		capture: capture_default$9,
+		capture: createCaptureCommand({
+			description: "Capture current field access permissions from kintone app to file",
+			args: fieldAclArgs,
+			spinnerMessage: "Capturing field access permissions...",
+			spinnerStopMessage: "Field access permissions captured.",
+			domainLabel: "Field ACL",
+			multiAppSuccessMessage: "All field ACL captures completed successfully.",
+			createContainer: createFieldPermissionCliContainer,
+			captureFn: captureFieldPermission,
+			saveFn: saveFieldPermission,
+			getConfigFilePath: (config) => config.fieldAclFilePath,
+			resolveContainerConfig: resolveFieldAclContainerConfig,
+			resolveAppContainerConfig: resolveFieldAclAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local field permission config with remote kintone app",
 			args: fieldAclArgs,
@@ -5548,6 +5747,42 @@ function createCliCaptureContainers(input) {
 	};
 }
 //#endregion
+//#region src/core/adapters/kintone/appLister.ts
+const PAGE_LIMIT = 100;
+const MAX_PAGES = 1e3;
+var KintoneAppLister = class {
+	constructor(client) {
+		this.client = client;
+	}
+	async getAllApps() {
+		const result = [];
+		try {
+			let offset = 0;
+			let completed = false;
+			for (let page = 0; page < MAX_PAGES; page++) {
+				const { apps } = await this.client.app.getApps({
+					limit: PAGE_LIMIT,
+					offset
+				});
+				for (const app of apps) result.push({
+					appId: app.appId,
+					code: app.code,
+					name: app.name
+				});
+				if (apps.length < PAGE_LIMIT) {
+					completed = true;
+					break;
+				}
+				offset += PAGE_LIMIT;
+			}
+			if (!completed) throw new SystemError(SystemErrorCode.ExternalApiError, `Pagination did not complete within ${MAX_PAGES} pages (fetched ${result.length} apps). This may indicate an API issue.`);
+			return result;
+		} catch (error) {
+			throw wrapKintoneError(error, `Failed to get apps (fetched ${result.length} so far)`);
+		}
+	}
+};
+//#endregion
 //#region src/core/adapters/kintone/spaceReader.ts
 /**
 * Reads space information from the kintone REST API.
@@ -5597,8 +5832,10 @@ function createLocalFileProjectConfigStorage(filePath) {
 //#endregion
 //#region src/core/application/container/initCli.ts
 function createInitCliContainer(config) {
+	const client = config.client ?? createKintoneClient(config);
 	return {
-		spaceReader: new KintoneSpaceReader(config.client ?? createKintoneClient(config)),
+		spaceReader: new KintoneSpaceReader(client),
+		appLister: new KintoneAppLister(client),
 		projectConfigStorage: createLocalFileProjectConfigStorage(config.configFilePath)
 	};
 }
@@ -6300,6 +6537,13 @@ async function captureAllForApp(args) {
 	return results;
 }
 //#endregion
+//#region src/core/application/init/fetchAllApps.ts
+async function fetchAllApps(args) {
+	const apps = await args.container.appLister.getAllApps();
+	if (apps.length === 0) throw new NotFoundError(NotFoundErrorCode.NotFound, "No apps found. Please check your API token permissions.");
+	return apps;
+}
+//#endregion
 //#region src/core/application/init/fetchSpaceApps.ts
 async function fetchSpaceApps(args) {
 	const apps = await args.container.spaceReader.getSpaceApps(args.input.spaceId);
@@ -6307,7 +6551,7 @@ async function fetchSpaceApps(args) {
 	return apps;
 }
 //#endregion
-//#region src/core/domain/space/entity.ts
+//#region src/core/domain/app/entity.ts
 const UNSAFE_PATH_CHARS = /[<>:"/\\|?*\u0000-\u001f]/g;
 function sanitizeForFileSystem(name) {
 	const sanitized = name.replace(UNSAFE_PATH_CHARS, "_").replace(/\.+$/, "");
@@ -6347,8 +6591,7 @@ const initArgs = {
 	"space-id": {
 		type: "string",
 		short: "s",
-		description: "kintone space ID",
-		required: true
+		description: "kintone space ID"
 	},
 	domain: kintoneArgs.domain,
 	username: kintoneArgs.username,
@@ -6378,15 +6621,52 @@ function printCaptureResults(results) {
 		logError(result.error);
 	}
 }
+function printDryRunPreview(apps, configPath, configText, output) {
+	p.log.info(pc.dim("(dry-run mode - no files will be written)"));
+	p.log.step(`\nConfig file: ${pc.cyan(configPath)}`);
+	p.log.message(configText);
+	for (const app of apps) {
+		const appName = resolveAppName(app);
+		const paths = buildAppFilePaths(appName, output);
+		p.log.step(`\n=== [${pc.bold(appName)}] (appId: ${app.appId}) ===`);
+		p.log.message("  Files that would be created:");
+		for (const [domain, filePath] of Object.entries(paths)) p.log.message(`    ${domain}: ${pc.dim(filePath)}`);
+	}
+	p.log.success("\nDry run complete. No files were written.");
+}
+async function captureApps(apps, config) {
+	for (const app of apps) {
+		const appName = resolveAppName(app);
+		p.log.step(`\n=== [${pc.bold(appName)}] (appId: ${app.appId}) ===`);
+		const { containers, paths } = createCliCaptureContainers({
+			baseUrl: config.baseUrl,
+			auth: config.auth,
+			appId: app.appId,
+			guestSpaceId: config.guestSpaceId,
+			appName,
+			baseDir: config.output
+		});
+		const cs = p.spinner();
+		cs.start(`Capturing all domains for ${appName}...`);
+		const results = await captureAllForApp({
+			container: containers,
+			input: { customizeBasePath: dirname(resolve(paths.customize)) }
+		});
+		const successCount = results.filter((r) => r.success).length;
+		const failCount = results.length - successCount;
+		cs.stop(`Captured ${successCount}/${results.length} domains.` + (failCount > 0 ? pc.red(` (${failCount} failed)`) : ""));
+		printCaptureResults(results);
+	}
+}
 var init_default = define({
 	name: "init",
-	description: "Initialize project from a kintone space",
+	description: "Initialize project from kintone",
 	args: initArgs,
 	run: async (ctx) => {
 		try {
 			const values = ctx.values;
 			const spaceId = values["space-id"];
-			if (!/^[1-9]\d*$/.test(spaceId)) throw new ValidationError(ValidationErrorCode.InvalidInput, `Invalid space ID: "${spaceId}" (must be a positive integer, e.g. 1, 42, 100)`);
+			if (spaceId && !/^[1-9]\d*$/.test(spaceId)) throw new ValidationError(ValidationErrorCode.InvalidInput, `Invalid space ID: "${spaceId}" (must be a positive integer, e.g. 1, 42, 100)`);
 			const kintoneDomain = values.domain ?? process.env.KINTONE_DOMAIN;
 			if (!kintoneDomain) throw new ValidationError(ValidationErrorCode.InvalidInput, "Missing required configuration:\n  KINTONE_DOMAIN is required");
 			const apiToken = values["api-token"] ?? process.env.KINTONE_API_TOKEN;
@@ -6399,19 +6679,26 @@ var init_default = define({
 			const configPath = DEFAULT_CONFIG_PATH;
 			const skipConfirm = values.yes ?? false;
 			const dryRun = values["dry-run"] ?? false;
-			const { spaceReader, projectConfigStorage } = createInitCliContainer({
+			const { spaceReader, appLister, projectConfigStorage } = createInitCliContainer({
 				baseUrl,
 				auth,
 				guestSpaceId,
 				configFilePath: configPath
 			});
 			const s = p.spinner();
-			s.start("Fetching space info...");
-			const apps = await fetchSpaceApps({
-				container: { spaceReader },
-				input: { spaceId }
-			});
-			s.stop(`Found ${apps.length} app(s) in the space.`);
+			let apps;
+			if (spaceId) {
+				s.start("Fetching space info...");
+				apps = await fetchSpaceApps({
+					container: { spaceReader },
+					input: { spaceId }
+				});
+				s.stop(`Found ${apps.length} app(s) in the space.`);
+			} else {
+				s.start("Fetching all apps...");
+				apps = await fetchAllApps({ container: { appLister } });
+				s.stop(`Found ${apps.length} app(s).`);
+			}
 			p.log.info("Apps:");
 			for (const app of apps) {
 				const name = resolveAppName(app);
@@ -6424,17 +6711,7 @@ var init_default = define({
 				baseDir: output
 			}, configCodec);
 			if (dryRun) {
-				p.log.info(pc.dim("(dry-run mode - no files will be written)"));
-				p.log.step(`\nConfig file: ${pc.cyan(configPath)}`);
-				p.log.message(configText);
-				for (const app of apps) {
-					const appName = resolveAppName(app);
-					const paths = buildAppFilePaths(appName, output);
-					p.log.step(`\n=== [${pc.bold(appName)}] (appId: ${app.appId}) ===`);
-					p.log.message("  Files that would be created:");
-					for (const [domain, filePath] of Object.entries(paths)) p.log.message(`    ${domain}: ${pc.dim(filePath)}`);
-				}
-				p.log.success("\nDry run complete. No files were written.");
+				printDryRunPreview(apps, configPath, configText, output);
 				return;
 			}
 			if ((await projectConfigStorage.get()).exists && !skipConfirm) {
@@ -6446,28 +6723,12 @@ var init_default = define({
 			}
 			await projectConfigStorage.update(configText);
 			p.log.success(`Config written to: ${pc.cyan(configPath)}`);
-			for (const app of apps) {
-				const appName = resolveAppName(app);
-				p.log.step(`\n=== [${pc.bold(appName)}] (appId: ${app.appId}) ===`);
-				const { containers, paths } = createCliCaptureContainers({
-					baseUrl,
-					auth,
-					appId: app.appId,
-					guestSpaceId,
-					appName,
-					baseDir: output
-				});
-				const cs = p.spinner();
-				cs.start(`Capturing all domains for ${appName}...`);
-				const results = await captureAllForApp({
-					container: containers,
-					input: { customizeBasePath: dirname(resolve(paths.customize)) }
-				});
-				const successCount = results.filter((r) => r.success).length;
-				const failCount = results.length - successCount;
-				cs.stop(`Captured ${successCount}/${results.length} domains.` + (failCount > 0 ? pc.red(` (${failCount} failed)`) : ""));
-				printCaptureResults(results);
-			}
+			await captureApps(apps, {
+				baseUrl,
+				auth,
+				guestSpaceId,
+				output
+			});
 			p.log.info(`Add authentication settings (auth) to ${pc.cyan(configPath)} or set KINTONE_API_TOKEN / KINTONE_USERNAME + KINTONE_PASSWORD environment variables.`);
 			p.log.success("\nProject initialization complete.");
 		} catch (error) {
@@ -6627,56 +6888,6 @@ async function applyNotification({ container }) {
 	}
 }
 //#endregion
-//#region src/cli/notificationConfig.ts
-const notificationArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"notification-file": {
-		type: "string",
-		description: "Notification file path (default: notification.yaml)"
-	}
-};
-const { resolveFilePath: resolveNotificationFilePath, resolveContainerConfig: resolveNotificationContainerConfig, resolveAppContainerConfig: resolveNotificationAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "notification-file",
-	envVar: () => process.env.NOTIFICATION_FILE_PATH,
-	appFileField: (a) => a.notificationFile,
-	defaultDir: "notification",
-	defaultFileName: "notification.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		notificationFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/notification/apply.ts
-var apply_default$7 = createApplyCommand({
-	description: "Apply notification settings from YAML to kintone app",
-	args: notificationArgs,
-	spinnerMessage: "Applying notification settings...",
-	spinnerStopMessage: "Notification settings applied.",
-	successMessage: "Notification settings applied successfully.",
-	createContainer: createNotificationCliContainer,
-	applyFn: applyNotification,
-	resolveContainerConfig: resolveNotificationContainerConfig,
-	resolveAppContainerConfig: resolveNotificationAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/notification/capture.ts
-var capture_default$8 = createCaptureCommand({
-	description: "Capture current notification settings from kintone app to file",
-	args: notificationArgs,
-	spinnerMessage: "Capturing notification settings...",
-	spinnerStopMessage: "Notification settings captured.",
-	domainLabel: "Notification settings",
-	multiAppSuccessMessage: "All notification captures completed successfully.",
-	createContainer: createNotificationCliContainer,
-	captureFn: captureNotification,
-	saveFn: saveNotification,
-	getConfigFilePath: (config) => config.notificationFilePath,
-	resolveContainerConfig: resolveNotificationContainerConfig,
-	resolveAppContainerConfig: resolveNotificationAppContainerConfig
-});
-//#endregion
 //#region src/lib/groupByKey.ts
 /**
 * Groups items by a key function into a Map where each key maps to an array of items.
@@ -6906,13 +7117,61 @@ async function detectNotificationDiff({ container }) {
 	return NotificationDiffDetector.detect(localConfig, remoteConfig);
 }
 //#endregion
+//#region src/cli/notificationConfig.ts
+const notificationArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"notification-file": {
+		type: "string",
+		description: "Notification file path (default: notification.yaml)"
+	}
+};
+const { resolveFilePath: resolveNotificationFilePath, resolveContainerConfig: resolveNotificationContainerConfig, resolveAppContainerConfig: resolveNotificationAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "notification-file",
+	envVar: () => process.env.NOTIFICATION_FILE_PATH,
+	appFileField: (a) => a.notificationFile,
+	defaultDir: "notification",
+	defaultFileName: "notification.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		notificationFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/notification/index.ts
 var notification_default = define({
 	name: "notification",
 	description: "Manage kintone notification settings",
 	subCommands: {
-		apply: apply_default$7,
-		capture: capture_default$8,
+		apply: createApplyCommand({
+			description: "Apply notification settings from YAML to kintone app",
+			args: notificationArgs,
+			spinnerMessage: "Applying notification settings...",
+			spinnerStopMessage: "Notification settings applied.",
+			successMessage: "Notification settings applied successfully.",
+			createContainer: createNotificationCliContainer,
+			applyFn: applyNotification,
+			diffPreview: {
+				detectDiff: detectNotificationDiff,
+				printResult: printNotificationDiffResult
+			},
+			resolveContainerConfig: resolveNotificationContainerConfig,
+			resolveAppContainerConfig: resolveNotificationAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current notification settings from kintone app to file",
+			args: notificationArgs,
+			spinnerMessage: "Capturing notification settings...",
+			spinnerStopMessage: "Notification settings captured.",
+			domainLabel: "Notification settings",
+			multiAppSuccessMessage: "All notification captures completed successfully.",
+			createContainer: createNotificationCliContainer,
+			captureFn: captureNotification,
+			saveFn: saveNotification,
+			getConfigFilePath: (config) => config.notificationFilePath,
+			resolveContainerConfig: resolveNotificationContainerConfig,
+			resolveAppContainerConfig: resolveNotificationAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local notification config with remote kintone app",
 			args: notificationArgs,
@@ -6971,56 +7230,6 @@ async function applyPlugin({ container }) {
 	});
 }
 //#endregion
-//#region src/cli/pluginConfig.ts
-const pluginArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"plugin-file": {
-		type: "string",
-		description: "Plugin file path (default: plugins.yaml)"
-	}
-};
-const { resolveFilePath: resolvePluginFilePath, resolveContainerConfig: resolvePluginContainerConfig, resolveAppContainerConfig: resolvePluginAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "plugin-file",
-	envVar: () => process.env.PLUGIN_FILE_PATH,
-	appFileField: (a) => a.pluginFile,
-	defaultDir: "plugin",
-	defaultFileName: "plugins.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		pluginFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/plugin/apply.ts
-var apply_default$6 = createApplyCommand({
-	description: "Apply plugins from YAML to kintone app",
-	args: pluginArgs,
-	spinnerMessage: "Applying plugins...",
-	spinnerStopMessage: "Plugins applied.",
-	successMessage: "Plugins applied successfully.",
-	createContainer: createPluginCliContainer,
-	applyFn: applyPlugin,
-	resolveContainerConfig: resolvePluginContainerConfig,
-	resolveAppContainerConfig: resolvePluginAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/plugin/capture.ts
-var capture_default$7 = createCaptureCommand({
-	description: "Capture current plugins from kintone app to file",
-	args: pluginArgs,
-	spinnerMessage: "Capturing plugins...",
-	spinnerStopMessage: "Plugins captured.",
-	domainLabel: "Plugins",
-	multiAppSuccessMessage: "All plugin captures completed successfully.",
-	createContainer: createPluginCliContainer,
-	captureFn: capturePlugin,
-	saveFn: savePlugin,
-	getConfigFilePath: (config) => config.pluginFilePath,
-	resolveContainerConfig: resolvePluginContainerConfig,
-	resolveAppContainerConfig: resolvePluginAppContainerConfig
-});
-//#endregion
 //#region src/core/domain/plugin/services/diffDetector.ts
 const PluginDiffDetector = { detect: (local, remote) => {
 	const entries = [];
@@ -7063,13 +7272,61 @@ async function detectPluginDiff({ container }) {
 	});
 }
 //#endregion
+//#region src/cli/pluginConfig.ts
+const pluginArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"plugin-file": {
+		type: "string",
+		description: "Plugin file path (default: plugins.yaml)"
+	}
+};
+const { resolveFilePath: resolvePluginFilePath, resolveContainerConfig: resolvePluginContainerConfig, resolveAppContainerConfig: resolvePluginAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "plugin-file",
+	envVar: () => process.env.PLUGIN_FILE_PATH,
+	appFileField: (a) => a.pluginFile,
+	defaultDir: "plugin",
+	defaultFileName: "plugins.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		pluginFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/plugin/index.ts
 var plugin_default = define({
 	name: "plugin",
 	description: "Manage kintone plugins",
 	subCommands: {
-		apply: apply_default$6,
-		capture: capture_default$7,
+		apply: createApplyCommand({
+			description: "Apply plugins from YAML to kintone app",
+			args: pluginArgs,
+			spinnerMessage: "Applying plugins...",
+			spinnerStopMessage: "Plugins applied.",
+			successMessage: "Plugins applied successfully.",
+			createContainer: createPluginCliContainer,
+			applyFn: applyPlugin,
+			diffPreview: {
+				detectDiff: detectPluginDiff,
+				printResult: printPluginDiffResult
+			},
+			resolveContainerConfig: resolvePluginContainerConfig,
+			resolveAppContainerConfig: resolvePluginAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current plugins from kintone app to file",
+			args: pluginArgs,
+			spinnerMessage: "Capturing plugins...",
+			spinnerStopMessage: "Plugins captured.",
+			domainLabel: "Plugins",
+			multiAppSuccessMessage: "All plugin captures completed successfully.",
+			createContainer: createPluginCliContainer,
+			captureFn: capturePlugin,
+			saveFn: savePlugin,
+			getConfigFilePath: (config) => config.pluginFilePath,
+			resolveContainerConfig: resolvePluginContainerConfig,
+			resolveAppContainerConfig: resolvePluginAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local plugin config with remote kintone app",
 			args: pluginArgs,
@@ -7204,59 +7461,6 @@ async function applyProcessManagement({ container }) {
 	};
 }
 //#endregion
-//#region src/cli/processConfig.ts
-const processArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"process-file": {
-		type: "string",
-		description: "Process management file path (default: process.yaml)"
-	}
-};
-const { resolveFilePath: resolveProcessFilePath, resolveContainerConfig: resolveProcessContainerConfig, resolveAppContainerConfig: resolveProcessAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "process-file",
-	envVar: () => process.env.PROCESS_FILE_PATH,
-	appFileField: (a) => a.processFile,
-	defaultDir: "process",
-	defaultFileName: "process.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		processFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/process/apply.ts
-var apply_default$5 = createApplyCommand({
-	description: "Apply process management settings from YAML to kintone app",
-	args: processArgs,
-	spinnerMessage: "Applying process management settings...",
-	spinnerStopMessage: "Process management settings applied.",
-	successMessage: "Process management settings applied successfully.",
-	createContainer: createProcessManagementCliContainer,
-	applyFn: applyProcessManagement,
-	onResult: (result) => {
-		if (result.enableChanged) p.log.warn(result.newEnable ? "Process management will be ENABLED. This activates workflow processing for this app." : "Process management will be DISABLED. This deactivates workflow processing for this app.");
-	},
-	resolveContainerConfig: resolveProcessContainerConfig,
-	resolveAppContainerConfig: resolveProcessAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/process/capture.ts
-var capture_default$6 = createCaptureCommand({
-	description: "Capture current process management settings from kintone app to file",
-	args: processArgs,
-	spinnerMessage: "Capturing process management settings...",
-	spinnerStopMessage: "Process management settings captured.",
-	domainLabel: "Process management settings",
-	multiAppSuccessMessage: "All process management captures completed successfully.",
-	createContainer: createProcessManagementCliContainer,
-	captureFn: captureProcessManagement,
-	saveFn: saveProcessManagement,
-	getConfigFilePath: (config) => config.processFilePath,
-	resolveContainerConfig: resolveProcessContainerConfig,
-	resolveAppContainerConfig: resolveProcessAppContainerConfig
-});
-//#endregion
 //#region src/core/domain/processManagement/services/diffDetector.ts
 function isEntityEqual(a, b) {
 	if (a.type !== b.type) return false;
@@ -7368,13 +7572,64 @@ async function detectProcessManagementDiff({ container }) {
 	});
 }
 //#endregion
+//#region src/cli/processConfig.ts
+const processArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"process-file": {
+		type: "string",
+		description: "Process management file path (default: process.yaml)"
+	}
+};
+const { resolveFilePath: resolveProcessFilePath, resolveContainerConfig: resolveProcessContainerConfig, resolveAppContainerConfig: resolveProcessAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "process-file",
+	envVar: () => process.env.PROCESS_FILE_PATH,
+	appFileField: (a) => a.processFile,
+	defaultDir: "process",
+	defaultFileName: "process.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		processFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/process/index.ts
 var process_default = define({
 	name: "process",
 	description: "Manage kintone process management settings",
 	subCommands: {
-		apply: apply_default$5,
-		capture: capture_default$6,
+		apply: createApplyCommand({
+			description: "Apply process management settings from YAML to kintone app",
+			args: processArgs,
+			spinnerMessage: "Applying process management settings...",
+			spinnerStopMessage: "Process management settings applied.",
+			successMessage: "Process management settings applied successfully.",
+			createContainer: createProcessManagementCliContainer,
+			applyFn: applyProcessManagement,
+			onResult: (result) => {
+				if (result.enableChanged) p.log.warn(result.newEnable ? "Process management will be ENABLED. This activates workflow processing for this app." : "Process management will be DISABLED. This deactivates workflow processing for this app.");
+			},
+			diffPreview: {
+				detectDiff: detectProcessManagementDiff,
+				printResult: printProcessDiffResult
+			},
+			resolveContainerConfig: resolveProcessContainerConfig,
+			resolveAppContainerConfig: resolveProcessAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current process management settings from kintone app to file",
+			args: processArgs,
+			spinnerMessage: "Capturing process management settings...",
+			spinnerStopMessage: "Process management settings captured.",
+			domainLabel: "Process management settings",
+			multiAppSuccessMessage: "All process management captures completed successfully.",
+			createContainer: createProcessManagementCliContainer,
+			captureFn: captureProcessManagement,
+			saveFn: saveProcessManagement,
+			getConfigFilePath: (config) => config.processFilePath,
+			resolveContainerConfig: resolveProcessContainerConfig,
+			resolveAppContainerConfig: resolveProcessAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local process management settings with remote kintone app",
 			args: processArgs,
@@ -7462,56 +7717,6 @@ async function applyRecordPermission({ container }) {
 	});
 }
 //#endregion
-//#region src/cli/recordAclConfig.ts
-const recordAclArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"record-acl-file": {
-		type: "string",
-		description: "Record ACL file path (default: record-acl.yaml)"
-	}
-};
-const { resolveFilePath: resolveRecordAclFilePath, resolveContainerConfig: resolveRecordAclContainerConfig, resolveAppContainerConfig: resolveRecordAclAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "record-acl-file",
-	envVar: () => process.env.RECORD_ACL_FILE_PATH,
-	appFileField: (a) => a.recordAclFile,
-	defaultDir: "record-acl",
-	defaultFileName: "record-acl.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		recordAclFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/record-acl/apply.ts
-var apply_default$4 = createApplyCommand({
-	description: "Apply record access permissions from YAML to kintone app",
-	args: recordAclArgs,
-	spinnerMessage: "Applying record access permissions...",
-	spinnerStopMessage: "Record access permissions applied.",
-	successMessage: "Record access permissions applied successfully.",
-	createContainer: createRecordPermissionCliContainer,
-	applyFn: applyRecordPermission,
-	resolveContainerConfig: resolveRecordAclContainerConfig,
-	resolveAppContainerConfig: resolveRecordAclAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/record-acl/capture.ts
-var capture_default$5 = createCaptureCommand({
-	description: "Capture current record access permissions from kintone app to file",
-	args: recordAclArgs,
-	spinnerMessage: "Capturing record access permissions...",
-	spinnerStopMessage: "Record access permissions captured.",
-	domainLabel: "Record ACL",
-	multiAppSuccessMessage: "All record ACL captures completed successfully.",
-	createContainer: createRecordPermissionCliContainer,
-	captureFn: captureRecordPermission,
-	saveFn: saveRecordPermission,
-	getConfigFilePath: (config) => config.recordAclFilePath,
-	resolveContainerConfig: resolveRecordAclContainerConfig,
-	resolveAppContainerConfig: resolveRecordAclAppContainerConfig
-});
-//#endregion
 //#region src/core/domain/recordPermission/services/diffDetector.ts
 function isRightEqual(a, b) {
 	return deepEqual(a.entities.map((e) => ({
@@ -7558,7 +7763,7 @@ function compareRightsForFilter(filterCond, localRights, remoteRights, entries)
 		});
 		else if (localRight && remoteRight) {
 			if (!isRightEqual(localRight, remoteRight)) {
-				const detail = localRight.entities.length !== remoteRight.entities.length ? `entities: ${remoteRight.entities.length} -> ${localRight.entities.length}` : "entities changed";
+				const detail = localRight.entities.length !== remoteRight.entities.length ? `entities: ${remoteRight.entities.length} -> ${localRight.entities.length}` : `entities: ${describeRight(localRight)}`;
 				entries.push({
 					type: "modified",
 					filterCond,
@@ -7592,13 +7797,61 @@ async function detectRecordPermissionDiff({ container }) {
 	});
 }
 //#endregion
+//#region src/cli/recordAclConfig.ts
+const recordAclArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"record-acl-file": {
+		type: "string",
+		description: "Record ACL file path (default: record-acl.yaml)"
+	}
+};
+const { resolveFilePath: resolveRecordAclFilePath, resolveContainerConfig: resolveRecordAclContainerConfig, resolveAppContainerConfig: resolveRecordAclAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "record-acl-file",
+	envVar: () => process.env.RECORD_ACL_FILE_PATH,
+	appFileField: (a) => a.recordAclFile,
+	defaultDir: "record-acl",
+	defaultFileName: "record-acl.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		recordAclFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/record-acl/index.ts
 var record_acl_default = define({
 	name: "record-acl",
 	description: "Manage kintone record access permissions",
 	subCommands: {
-		apply: apply_default$4,
-		capture: capture_default$5,
+		apply: createApplyCommand({
+			description: "Apply record access permissions from YAML to kintone app",
+			args: recordAclArgs,
+			spinnerMessage: "Applying record access permissions...",
+			spinnerStopMessage: "Record access permissions applied.",
+			successMessage: "Record access permissions applied successfully.",
+			createContainer: createRecordPermissionCliContainer,
+			applyFn: applyRecordPermission,
+			diffPreview: {
+				detectDiff: detectRecordPermissionDiff,
+				printResult: printRecordPermissionDiffResult
+			},
+			resolveContainerConfig: resolveRecordAclContainerConfig,
+			resolveAppContainerConfig: resolveRecordAclAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current record access permissions from kintone app to file",
+			args: recordAclArgs,
+			spinnerMessage: "Capturing record access permissions...",
+			spinnerStopMessage: "Record access permissions captured.",
+			domainLabel: "Record ACL",
+			multiAppSuccessMessage: "All record ACL captures completed successfully.",
+			createContainer: createRecordPermissionCliContainer,
+			captureFn: captureRecordPermission,
+			saveFn: saveRecordPermission,
+			getConfigFilePath: (config) => config.recordAclFilePath,
+			resolveContainerConfig: resolveRecordAclContainerConfig,
+			resolveAppContainerConfig: resolveRecordAclAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local record permission config with remote kintone app",
 			args: recordAclArgs,
@@ -7777,56 +8030,6 @@ async function applyReport({ container }) {
 	});
 }
 //#endregion
-//#region src/cli/reportConfig.ts
-const reportArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"report-file": {
-		type: "string",
-		description: "Report file path (default: reports.yaml)"
-	}
-};
-const { resolveFilePath: resolveReportFilePath, resolveContainerConfig: resolveReportContainerConfig, resolveAppContainerConfig: resolveReportAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "report-file",
-	envVar: () => process.env.REPORT_FILE_PATH,
-	appFileField: (a) => a.reportFile,
-	defaultDir: "report",
-	defaultFileName: "reports.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		reportFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/report/apply.ts
-var apply_default$3 = createApplyCommand({
-	description: "Apply report settings from YAML to kintone app",
-	args: reportArgs,
-	spinnerMessage: "Applying report settings...",
-	spinnerStopMessage: "Report settings applied.",
-	successMessage: "Report settings applied successfully.",
-	createContainer: createReportCliContainer,
-	applyFn: applyReport,
-	resolveContainerConfig: resolveReportContainerConfig,
-	resolveAppContainerConfig: resolveReportAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/report/capture.ts
-var capture_default$4 = createCaptureCommand({
-	description: "Capture current report settings from kintone app to file",
-	args: reportArgs,
-	spinnerMessage: "Capturing report settings...",
-	spinnerStopMessage: "Report settings captured.",
-	domainLabel: "Reports",
-	multiAppSuccessMessage: "All report captures completed successfully.",
-	createContainer: createReportCliContainer,
-	captureFn: captureReport,
-	saveFn: saveReport,
-	getConfigFilePath: (config) => config.reportFilePath,
-	resolveContainerConfig: resolveReportContainerConfig,
-	resolveAppContainerConfig: resolveReportAppContainerConfig
-});
-//#endregion
 //#region src/core/domain/report/services/diffDetector.ts
 function compareReports(local, remote) {
 	const diffs = [];
@@ -7875,13 +8078,61 @@ async function detectReportDiff({ container }) {
 	});
 }
 //#endregion
+//#region src/cli/reportConfig.ts
+const reportArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"report-file": {
+		type: "string",
+		description: "Report file path (default: reports.yaml)"
+	}
+};
+const { resolveFilePath: resolveReportFilePath, resolveContainerConfig: resolveReportContainerConfig, resolveAppContainerConfig: resolveReportAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "report-file",
+	envVar: () => process.env.REPORT_FILE_PATH,
+	appFileField: (a) => a.reportFile,
+	defaultDir: "report",
+	defaultFileName: "reports.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		reportFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/report/index.ts
 var report_default = define({
 	name: "report",
 	description: "Manage kintone report settings",
 	subCommands: {
-		apply: apply_default$3,
-		capture: capture_default$4,
+		apply: createApplyCommand({
+			description: "Apply report settings from YAML to kintone app",
+			args: reportArgs,
+			spinnerMessage: "Applying report settings...",
+			spinnerStopMessage: "Report settings applied.",
+			successMessage: "Report settings applied successfully.",
+			createContainer: createReportCliContainer,
+			applyFn: applyReport,
+			diffPreview: {
+				detectDiff: detectReportDiff,
+				printResult: printReportDiffResult
+			},
+			resolveContainerConfig: resolveReportContainerConfig,
+			resolveAppContainerConfig: resolveReportAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current report settings from kintone app to file",
+			args: reportArgs,
+			spinnerMessage: "Capturing report settings...",
+			spinnerStopMessage: "Report settings captured.",
+			domainLabel: "Reports",
+			multiAppSuccessMessage: "All report captures completed successfully.",
+			createContainer: createReportCliContainer,
+			captureFn: captureReport,
+			saveFn: saveReport,
+			getConfigFilePath: (config) => config.reportFilePath,
+			resolveContainerConfig: resolveReportContainerConfig,
+			resolveAppContainerConfig: resolveReportAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local report config with remote kintone app",
 			args: reportArgs,
@@ -9762,56 +10013,6 @@ async function applyGeneralSettings({ container }) {
 	});
 }
 //#endregion
-//#region src/cli/settingsConfig.ts
-const settingsArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"settings-file": {
-		type: "string",
-		description: "General settings file path (default: settings.yaml)"
-	}
-};
-const { resolveFilePath: resolveSettingsFilePath, resolveContainerConfig: resolveSettingsContainerConfig, resolveAppContainerConfig: resolveSettingsAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "settings-file",
-	envVar: () => process.env.SETTINGS_FILE_PATH,
-	appFileField: (a) => a.settingsFile,
-	defaultDir: "settings",
-	defaultFileName: "settings.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		settingsFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/settings/apply.ts
-var apply_default$1 = createApplyCommand({
-	description: "Apply general settings from YAML to kintone app",
-	args: settingsArgs,
-	spinnerMessage: "Applying general settings...",
-	spinnerStopMessage: "General settings applied.",
-	successMessage: "General settings applied successfully.",
-	createContainer: createGeneralSettingsCliContainer,
-	applyFn: applyGeneralSettings,
-	resolveContainerConfig: resolveSettingsContainerConfig,
-	resolveAppContainerConfig: resolveSettingsAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/settings/capture.ts
-var capture_default$1 = createCaptureCommand({
-	description: "Capture current general settings from kintone app to file",
-	args: settingsArgs,
-	spinnerMessage: "Capturing general settings...",
-	spinnerStopMessage: "General settings captured.",
-	domainLabel: "General settings",
-	multiAppSuccessMessage: "All general settings captures completed successfully.",
-	createContainer: createGeneralSettingsCliContainer,
-	captureFn: captureGeneralSettings,
-	saveFn: saveGeneralSettings,
-	getConfigFilePath: (config) => config.settingsFilePath,
-	resolveContainerConfig: resolveSettingsContainerConfig,
-	resolveAppContainerConfig: resolveSettingsAppContainerConfig
-});
-//#endregion
 //#region src/core/domain/generalSettings/services/diffDetector.ts
 const DEFAULT_STRING = "";
 const DEFAULT_BOOLEAN = false;
@@ -9884,13 +10085,61 @@ async function detectGeneralSettingsDiff({ container }) {
 	});
 }
 //#endregion
+//#region src/cli/settingsConfig.ts
+const settingsArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"settings-file": {
+		type: "string",
+		description: "General settings file path (default: settings.yaml)"
+	}
+};
+const { resolveFilePath: resolveSettingsFilePath, resolveContainerConfig: resolveSettingsContainerConfig, resolveAppContainerConfig: resolveSettingsAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "settings-file",
+	envVar: () => process.env.SETTINGS_FILE_PATH,
+	appFileField: (a) => a.settingsFile,
+	defaultDir: "settings",
+	defaultFileName: "settings.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		settingsFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/settings/index.ts
 var settings_default = define({
 	name: "settings",
 	description: "Manage kintone general settings",
 	subCommands: {
-		apply: apply_default$1,
-		capture: capture_default$1,
+		apply: createApplyCommand({
+			description: "Apply general settings from YAML to kintone app",
+			args: settingsArgs,
+			spinnerMessage: "Applying general settings...",
+			spinnerStopMessage: "General settings applied.",
+			successMessage: "General settings applied successfully.",
+			createContainer: createGeneralSettingsCliContainer,
+			applyFn: applyGeneralSettings,
+			diffPreview: {
+				detectDiff: detectGeneralSettingsDiff,
+				printResult: printGeneralSettingsDiffResult
+			},
+			resolveContainerConfig: resolveSettingsContainerConfig,
+			resolveAppContainerConfig: resolveSettingsAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current general settings from kintone app to file",
+			args: settingsArgs,
+			spinnerMessage: "Capturing general settings...",
+			spinnerStopMessage: "General settings captured.",
+			domainLabel: "General settings",
+			multiAppSuccessMessage: "All general settings captures completed successfully.",
+			createContainer: createGeneralSettingsCliContainer,
+			captureFn: captureGeneralSettings,
+			saveFn: saveGeneralSettings,
+			getConfigFilePath: (config) => config.settingsFilePath,
+			resolveContainerConfig: resolveSettingsContainerConfig,
+			resolveAppContainerConfig: resolveSettingsAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local general settings config with remote kintone app",
 			args: settingsArgs,
@@ -9974,59 +10223,6 @@ async function applyView({ container }) {
 	return { skippedBuiltinViews };
 }
 //#endregion
-//#region src/cli/viewConfig.ts
-const viewArgs = {
-	...kintoneArgs,
-	...multiAppArgs,
-	"view-file": {
-		type: "string",
-		description: "View file path (default: views.yaml)"
-	}
-};
-const { resolveFilePath: resolveViewFilePath, resolveContainerConfig: resolveViewContainerConfig, resolveAppContainerConfig: resolveViewAppContainerConfig } = createDomainConfigResolver({
-	fileArgKey: "view-file",
-	envVar: () => process.env.VIEW_FILE_PATH,
-	appFileField: (a) => a.viewFile,
-	defaultDir: "view",
-	defaultFileName: "views.yaml",
-	buildConfig: (base, filePath) => ({
-		...base,
-		viewFilePath: filePath
-	})
-});
-//#endregion
-//#region src/cli/commands/view/apply.ts
-var apply_default = createApplyCommand({
-	description: "Apply view settings from YAML to kintone app",
-	args: viewArgs,
-	spinnerMessage: "Applying views...",
-	spinnerStopMessage: "Views applied.",
-	successMessage: "Views applied successfully.",
-	createContainer: createViewCliContainer,
-	applyFn: applyView,
-	onResult: (result) => {
-		if (result.skippedBuiltinViews.length > 0) p.log.warn(`Skipped built-in views: ${result.skippedBuiltinViews.join(", ")}`);
-	},
-	resolveContainerConfig: resolveViewContainerConfig,
-	resolveAppContainerConfig: resolveViewAppContainerConfig
-});
-//#endregion
-//#region src/cli/commands/view/capture.ts
-var capture_default = createCaptureCommand({
-	description: "Capture current view settings from kintone app to file",
-	args: viewArgs,
-	spinnerMessage: "Capturing views...",
-	spinnerStopMessage: "Views captured.",
-	domainLabel: "Views",
-	multiAppSuccessMessage: "All view captures completed successfully.",
-	createContainer: createViewCliContainer,
-	captureFn: captureView,
-	saveFn: saveView,
-	getConfigFilePath: (config) => config.viewFilePath,
-	resolveContainerConfig: resolveViewContainerConfig,
-	resolveAppContainerConfig: resolveViewAppContainerConfig
-});
-//#endregion
 //#region src/core/domain/view/services/diffDetector.ts
 function checkOptionalStringChange(changes, field, localVal, remoteVal) {
 	if ((localVal ?? "") !== (remoteVal ?? "")) changes.push(`${field} changed`);
@@ -10048,10 +10244,10 @@ function describeChanges(local, remote) {
 }
 const ViewDiffDetector = { detect: (localViews, remoteViews) => {
 	return buildDiffResult(detectRecordDiff(localViews, remoteViews, {
-		onAdded: (name) => ({
+		onAdded: (name, localView) => ({
 			type: "added",
 			viewName: name,
-			details: "new view"
+			details: `new ${localView.type} view`
 		}),
 		onModified: (name, localView, remoteView) => {
 			const changes = describeChanges(localView, remoteView);
@@ -10061,10 +10257,10 @@ const ViewDiffDetector = { detect: (localViews, remoteViews) => {
 				details: changes.join(", ")
 			};
 		},
-		onDeleted: (name) => ({
+		onDeleted: (name, remoteView) => ({
 			type: "deleted",
 			viewName: name,
-			details: "removed"
+			details: `removed ${remoteView.type} view`
 		})
 	}));
 } };
@@ -10080,13 +10276,64 @@ async function detectViewDiff({ container }) {
 	});
 }
 //#endregion
+//#region src/cli/viewConfig.ts
+const viewArgs = {
+	...kintoneArgs,
+	...multiAppArgs,
+	"view-file": {
+		type: "string",
+		description: "View file path (default: views.yaml)"
+	}
+};
+const { resolveFilePath: resolveViewFilePath, resolveContainerConfig: resolveViewContainerConfig, resolveAppContainerConfig: resolveViewAppContainerConfig } = createDomainConfigResolver({
+	fileArgKey: "view-file",
+	envVar: () => process.env.VIEW_FILE_PATH,
+	appFileField: (a) => a.viewFile,
+	defaultDir: "view",
+	defaultFileName: "views.yaml",
+	buildConfig: (base, filePath) => ({
+		...base,
+		viewFilePath: filePath
+	})
+});
+//#endregion
 //#region src/cli/commands/view/index.ts
 var view_default = define({
 	name: "view",
 	description: "Manage kintone view settings",
 	subCommands: {
-		apply: apply_default,
-		capture: capture_default,
+		apply: createApplyCommand({
+			description: "Apply view settings from YAML to kintone app",
+			args: viewArgs,
+			spinnerMessage: "Applying views...",
+			spinnerStopMessage: "Views applied.",
+			successMessage: "Views applied successfully.",
+			createContainer: createViewCliContainer,
+			applyFn: applyView,
+			onResult: (result) => {
+				if (result.skippedBuiltinViews.length > 0) p.log.warn(`Skipped built-in views: ${result.skippedBuiltinViews.join(", ")}`);
+			},
+			diffPreview: {
+				detectDiff: detectViewDiff,
+				printResult: printViewDiffResult
+			},
+			resolveContainerConfig: resolveViewContainerConfig,
+			resolveAppContainerConfig: resolveViewAppContainerConfig
+		}),
+		capture: createCaptureCommand({
+			description: "Capture current view settings from kintone app to file",
+			args: viewArgs,
+			spinnerMessage: "Capturing views...",
+			spinnerStopMessage: "Views captured.",
+			domainLabel: "Views",
+			multiAppSuccessMessage: "All view captures completed successfully.",
+			createContainer: createViewCliContainer,
+			captureFn: captureView,
+			saveFn: saveView,
+			getConfigFilePath: (config) => config.viewFilePath,
+			resolveContainerConfig: resolveViewContainerConfig,
+			resolveAppContainerConfig: resolveViewAppContainerConfig
+		}),
 		diff: createDiffCommand({
 			description: "Compare local view config with remote kintone app",
 			args: viewArgs,