kintone-migrator 0.34.6 → 0.35.1

package/dist/index.mjs

@@ -199,6 +199,7 @@ const ViewErrorCode = {
 * This error is thrown when domain logic determines that an operation cannot proceed.
 */
 var BusinessRuleError = class extends AnyError {
+	code;
 	name = "BusinessRuleError";
 	constructor(code, message, cause) {
 		super(message, cause);
@@ -228,6 +229,7 @@ function wrapBusinessRuleError(fn) {
 	}
 }
 var ApplicationError = class extends AnyError {
+	code;
 	name = "ApplicationError";
 	constructor(code, message, cause) {
 		super(message, cause);
@@ -239,6 +241,7 @@ const NotFoundErrorCode = {
 	AppNotFound: "APP_NOT_FOUND"
 };
 var NotFoundError = class extends ApplicationError {
+	code;
 	name = "NotFoundError";
 	constructor(code, message, cause) {
 		super(code, message, cause);
@@ -250,9 +253,18 @@ function isNotFoundError(error) {
 }
 const ConflictErrorCode = {
 	Conflict: "CONFLICT",
+	/**
+	* The remote config drifted from the base snapshot and the push was not
+	* forced (push-specific drift). Distinct from
+	* {@link Conflict}, which the kintone adapter uses for API optimistic-lock
+	* (409) conflicts, so the CLI can tell snapshot drift apart from TOCTOU
+	* conflicts by code rather than by message string. Shared by every config
+	* domain (schema, view, ...), not schema-specific.
+	*/
 	ConfigDrift: "CONFIG_DRIFT"
 };
 var ConflictError = class extends ApplicationError {
+	code;
 	name = "ConflictError";
 	constructor(code, message, cause) {
 		super(code, message, cause);
@@ -267,6 +279,7 @@ const UnauthenticatedErrorCode = {
 	InvalidCredentials: "INVALID_CREDENTIALS"
 };
 var UnauthenticatedError = class extends ApplicationError {
+	code;
 	name = "UnauthenticatedError";
 	constructor(code, message, cause) {
 		super(code, message, cause);
@@ -278,6 +291,7 @@ function isUnauthenticatedError(error) {
 }
 const ForbiddenErrorCode = { InsufficientPermissions: "INSUFFICIENT_PERMISSIONS" };
 var ForbiddenError = class extends ApplicationError {
+	code;
 	name = "ForbiddenError";
 	constructor(code, message, cause) {
 		super(code, message, cause);
@@ -289,6 +303,7 @@ function isForbiddenError(error) {
 }
 const ValidationErrorCode = { InvalidInput: "INVALID_INPUT" };
 var ValidationError = class extends ApplicationError {
+	code;
 	name = "ValidationError";
 	constructor(code, message, cause) {
 		super(code, message, cause);
@@ -308,6 +323,7 @@ const SystemErrorCode = {
 	ExecutionError: "EXECUTION_ERROR"
 };
 var SystemError = class extends ApplicationError {
+	code;
 	name = "SystemError";
 	constructor(code, message, cause) {
 		super(code, message, cause);
@@ -420,11 +436,11 @@ function validateParsedConfig(parsed, invalidConfigStructure, domainLabel) {
 	if (!isRecord(parsed)) throw new BusinessRuleError(invalidConfigStructure, `${domainLabel} config must be an object`);
 	return parsed;
 }
-const VALID_SRC_TYPES = new Set(["FIELD", "RECORD_URL"]);
+const VALID_SRC_TYPES = /* @__PURE__ */ new Set(["FIELD", "RECORD_URL"]);
 function isActionMappingSrcType(value) {
 	return VALID_SRC_TYPES.has(value);
 }
-const VALID_ENTITY_TYPES$9 = new Set([
+const VALID_ENTITY_TYPES$9 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION"
@@ -702,7 +718,7 @@ function buildDiffResult(entries, warnings = []) {
 * (absence) compared to a defined value (presence) is always "changed".
 */
 function classifyThreeWay(base, local, remote, eq) {
-	const keys = new Set([
+	const keys = /* @__PURE__ */ new Set([
 		...base.keys(),
 		...local.keys(),
 		...remote.keys()
@@ -948,6 +964,8 @@ function toKintoneAction$1(action) {
 	};
 }
 var KintoneActionConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -987,7 +1005,7 @@ var KintoneActionConfigurator = class {
 };
 //#endregion
 //#region src/core/adapters/kintone/appDeployer.ts
-const VALID_DEPLOY_STATUSES = new Set([
+const VALID_DEPLOY_STATUSES = /* @__PURE__ */ new Set([
 	"PROCESSING",
 	"SUCCESS",
 	"FAIL",
@@ -999,6 +1017,8 @@ function isDeployStatus(value) {
 const DEFAULT_POLL_INTERVAL_MS = 1e3;
 const DEFAULT_MAX_RETRIES = 180;
 var KintoneAppDeployer = class {
+	client;
+	appId;
 	pollIntervalMs;
 	maxRetries;
 	constructor(client, appId, config) {
@@ -1062,6 +1082,8 @@ var KintoneAppDeployer = class {
 * so the `--all` early-skip compares like-with-like against the stored base.
 */
 var KintoneAppRevisionReader = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -1134,7 +1156,7 @@ const configCodec = {
 		defaultStringType: "PLAIN"
 	})
 };
-const VALID_SCOPES = new Set([
+const VALID_SCOPES = /* @__PURE__ */ new Set([
 	"ALL",
 	"ADMIN",
 	"NONE"
@@ -1142,7 +1164,7 @@ const VALID_SCOPES = new Set([
 function isCustomizationScope(value) {
 	return VALID_SCOPES.has(value);
 }
-const VALID_RESOURCE_TYPES = new Set(["FILE", "URL"]);
+const VALID_RESOURCE_TYPES = /* @__PURE__ */ new Set(["FILE", "URL"]);
 function isResourceType(value) {
 	return VALID_RESOURCE_TYPES.has(value);
 }
@@ -1184,6 +1206,8 @@ function toKintoneResourceList(resources) {
 	return resources.map(toKintoneResource);
 }
 var KintoneCustomizationConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -1237,6 +1261,7 @@ var KintoneCustomizationConfigurator = class {
 //#endregion
 //#region src/core/adapters/kintone/fileDownloader.ts
 var KintoneFileDownloader = class {
+	client;
 	constructor(client) {
 		this.client = client;
 	}
@@ -1298,6 +1323,8 @@ function isSafePath(targetPath, baseDir) {
 //#endregion
 //#region src/core/adapters/kintone/fileUploader.ts
 var KintoneFileUploader = class {
+	client;
+	baseDir;
 	constructor(client, baseDir) {
 		this.client = client;
 		this.baseDir = baseDir;
@@ -1324,6 +1351,10 @@ var KintoneFileUploader = class {
 */
 const SKIP_REVISION_CHECK = Symbol("skip-revision-check");
 //#endregion
+//#region src/core/domain/formSchema/ports/formReadTarget.ts
+/** The generation read when a caller does not specify a target. */
+const DEFAULT_FORM_READ_TARGET = "preview";
+//#endregion
 //#region src/lib/charValidation.ts
 /** Returns true if the string contains any control characters (0x00–0x1f or 0x7f). */
 function hasControlChars(s) {
@@ -1360,7 +1391,7 @@ const FieldCode = { create: (code) => {
 } };
 //#endregion
 //#region src/core/adapters/kintone/formConfigurator.ts
-const KNOWN_FIELD_TYPES = new Set([
+const KNOWN_FIELD_TYPES = /* @__PURE__ */ new Set([
 	"SINGLE_LINE_TEXT",
 	"MULTI_LINE_TEXT",
 	"RICH_TEXT",
@@ -1382,7 +1413,7 @@ const KNOWN_FIELD_TYPES = new Set([
 	"SUBTABLE",
 	"REFERENCE_TABLE"
 ]);
-const SYSTEM_FIELD_TYPES$2 = new Set([
+const SYSTEM_FIELD_TYPES$2 = /* @__PURE__ */ new Set([
 	"RECORD_NUMBER",
 	"CREATOR",
 	"CREATED_TIME",
@@ -1392,7 +1423,7 @@ const SYSTEM_FIELD_TYPES$2 = new Set([
 	"STATUS",
 	"STATUS_ASSIGNEE"
 ]);
-const DECORATION_TYPES$1 = new Set([
+const DECORATION_TYPES$1 = /* @__PURE__ */ new Set([
 	"LABEL",
 	"SPACER",
 	"HR"
@@ -1677,20 +1708,31 @@ function toKintoneLayoutItem(item) {
 		default: throw new SystemError(SystemErrorCode.ExternalApiError, `Unknown layout item type: ${item.type}`);
 	}
 }
+const GET_FIELDS_FAILURE_MESSAGES = {
+	preview: "Failed to get form fields",
+	published: "Failed to get published form fields (the app may not be deployed yet, or the credentials may not be allowed to read it)"
+};
+const GET_LAYOUT_FAILURE_MESSAGES = {
+	preview: "Failed to get form layout",
+	published: "Failed to get published form layout (the app may not be deployed yet, or the credentials may not be allowed to read it)"
+};
 var KintoneFormConfigurator = class {
+	client;
+	appId;
 	revisionTracker;
 	constructor(client, appId, revisionTracker) {
 		this.client = client;
 		this.appId = appId;
 		this.revisionTracker = revisionTracker ?? new RevisionTracker();
 	}
-	async getFields() {
+	async getFields(target = DEFAULT_FORM_READ_TARGET) {
+		const preview = target === "preview";
 		try {
 			const { properties, revision } = await this.client.app.getFormFields({
 				app: this.appId,
-				preview: true
+				preview
 			});
-			if (revision) this.revisionTracker.track(revision);
+			if (revision && target === "preview") this.revisionTracker.track(revision);
 			const fields = /* @__PURE__ */ new Map();
 			for (const [code, prop] of Object.entries(properties)) {
 				const kintoneProp = prop;
@@ -1701,7 +1743,7 @@ var KintoneFormConfigurator = class {
 			}
 			return fields;
 		} catch (error) {
-			throw wrapKintoneError(error, "Failed to get form fields");
+			throw wrapKintoneError(error, GET_FIELDS_FAILURE_MESSAGES[target]);
 		}
 	}
 	async getRevision() {
@@ -1764,16 +1806,17 @@ var KintoneFormConfigurator = class {
 			throw wrapKintoneError(error, "Failed to delete form fields");
 		}
 	}
-	async getLayout() {
+	async getLayout(target = DEFAULT_FORM_READ_TARGET) {
+		const preview = target === "preview";
 		try {
 			const response = await this.client.app.getFormLayout({
 				app: this.appId,
-				preview: true
+				preview
 			});
-			if (response.revision) this.revisionTracker.track(response.revision);
+			if (response.revision && target === "preview") this.revisionTracker.track(response.revision);
 			return response.layout.map(fromKintoneLayoutItem);
 		} catch (error) {
-			throw wrapKintoneError(error, "Failed to get form layout");
+			throw wrapKintoneError(error, GET_LAYOUT_FAILURE_MESSAGES[target]);
 		}
 	}
 	async updateLayout(layout, expectedRevision) {
@@ -1793,7 +1836,7 @@ var KintoneFormConfigurator = class {
 };
 //#endregion
 //#region src/core/adapters/kintone/recordConverter.ts
-const SYSTEM_FIELDS = new Set([
+const SYSTEM_FIELDS = /* @__PURE__ */ new Set([
 	"$id",
 	"$revision",
 	"RECORD_NUMBER",
@@ -1805,7 +1848,7 @@ const SYSTEM_FIELDS = new Set([
 	"STATUS_ASSIGNEE",
 	"CATEGORY"
 ]);
-const SYSTEM_FIELD_TYPES$1 = new Set([
+const SYSTEM_FIELD_TYPES$1 = /* @__PURE__ */ new Set([
 	"RECORD_NUMBER",
 	"__ID__",
 	"__REVISION__",
@@ -1890,6 +1933,8 @@ function extractId(record) {
 	return $id.value;
 }
 var KintoneRecordManager = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -1978,6 +2023,7 @@ var LocalFileContentReader = class {
 //#endregion
 //#region src/core/adapters/local/fileWriter.ts
 var LocalFileWriter = class {
+	baseDir;
 	constructor(baseDir = process.cwd()) {
 		this.baseDir = baseDir;
 	}
@@ -2028,9 +2074,10 @@ function createCliContainer(config) {
 	};
 }
 function createSeedCliContainer(config) {
+	const client = config.client ?? createKintoneClient(config);
 	return {
 		configCodec,
-		recordManager: new KintoneRecordManager(config.client ?? createKintoneClient(config), config.appId),
+		recordManager: new KintoneRecordManager(client, config.appId),
 		seedStorage: createLocalFileSeedStorage(config.seedFilePath)
 	};
 }
@@ -2320,7 +2367,7 @@ async function executeMultiApp(plan, executor) {
 }
 //#endregion
 //#region src/core/domain/projectConfig/valueObject.ts
-const INVALID_APP_NAME_CHARS = new Set([
+const INVALID_APP_NAME_CHARS = /* @__PURE__ */ new Set([
 	"/",
 	"\\",
 	":",
@@ -2706,6 +2753,13 @@ function printCustomizationDiffResult(result) {
 		return `${colorize(prefix)} ${pc.dim("[")}${colorize(location)}${pc.dim("]")} ${entry.name}${pc.dim(":")} ${entry.details}`;
 	});
 }
+function printSchemaDiffTarget(target) {
+	if (target === "published") {
+		p.log.info("Comparing against the published (deployed) form (2-way; base snapshot not used).");
+		return;
+	}
+	p.log.info("Comparing against the preview (unpublished) form.");
+}
 function printDiffResult(result) {
 	if (result.isEmpty) {
 		p.log.info("No changes detected.");
@@ -2797,9 +2851,7 @@ function printMultiAppResult(result) {
 		case "skipped":
 			p.log.warn(`  ${pc.dim("-")} Skipped: ${r.name}`);
 			break;
-		default:
-			r.status;
-			break;
+		default: r.status;
 	}
 }
 async function confirmAndDeploy(containers, skipConfirm, successMessage = "Deployed to production.") {
@@ -3464,14 +3516,11 @@ function buildRecordThreeWayDiff(merge, label, extras = [], notes = []) {
 				kind: "remoteOnly"
 			});
 			break;
-		case "conflict":
-			conflicts.push({
-				key: entry.key,
-				label: label(entry),
-				kind: "conflict"
-			});
-			break;
-		default: break;
+		case "conflict": conflicts.push({
+			key: entry.key,
+			label: label(entry),
+			kind: "conflict"
+		});
 	}
 	const isEmpty = localChanges.length === 0 && remoteDrift.length === 0 && conflicts.length === 0 && extras.length === 0;
 	return {
@@ -3510,13 +3559,10 @@ function buildSingleThreeWayDiff(merge, key) {
 				kind: "remoteOnly"
 			});
 			break;
-		case "conflict":
-			conflicts.push({
-				...entry,
-				kind: "conflict"
-			});
-			break;
-		default: break;
+		case "conflict": conflicts.push({
+			...entry,
+			kind: "conflict"
+		});
 	}
 	return {
 		mode: "three-way",
@@ -4107,6 +4153,22 @@ function createPushCommand(config) {
 	});
 }
 //#endregion
+//#region src/cli/commands/action/push.ts
+var push_default$14 = createPushCommand({
+	description: "Push the local action config to kintone (with drift detection)",
+	args: actionArgs,
+	subject: "action config",
+	spinnerStopMessage: "Actions pushed to preview.",
+	createContainer: createActionCliContainer,
+	pushFn: pushAction,
+	toctouMessage: "The remote changed while applying. Run `action pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveActionContainerConfig,
+	resolveAppContainerConfig: resolveActionAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/action/index.ts
 var action_default = define({
 	name: "action",
@@ -4116,20 +4178,7 @@ var action_default = define({
 		capture: capture_default$14,
 		diff: diff_default$13,
 		pull: pull_default$13,
-		push: createPushCommand({
-			description: "Push the local action config to kintone (with drift detection)",
-			args: actionArgs,
-			subject: "action config",
-			spinnerStopMessage: "Actions pushed to preview.",
-			createContainer: createActionCliContainer,
-			pushFn: pushAction,
-			toctouMessage: "The remote changed while applying. Run `action pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveActionContainerConfig,
-			resolveAppContainerConfig: resolveActionAppContainerConfig
-		})
+		push: push_default$14
 	},
 	run: () => {}
 });
@@ -4204,6 +4253,8 @@ async function detectAdminNotesDiff({ container }) {
 //#endregion
 //#region src/core/adapters/kintone/adminNotesConfigurator.ts
 var KintoneAdminNotesConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -4648,6 +4699,22 @@ async function pushAdminNotes({ container, input }) {
 	};
 }
 //#endregion
+//#region src/cli/commands/admin-notes/push.ts
+var push_default$13 = createPushCommand({
+	description: "Push the local admin notes config to kintone (with drift detection)",
+	args: adminNotesArgs,
+	subject: "admin notes config",
+	spinnerStopMessage: "Admin notes pushed to preview.",
+	createContainer: createAdminNotesCliContainer,
+	pushFn: pushAdminNotes,
+	toctouMessage: "The remote changed while applying. Run `admin-notes pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveAdminNotesContainerConfig,
+	resolveAppContainerConfig: resolveAdminNotesAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/admin-notes/index.ts
 var admin_notes_default = define({
 	name: "admin-notes",
@@ -4657,26 +4724,13 @@ var admin_notes_default = define({
 		capture: capture_default$13,
 		diff: diff_default$12,
 		pull: pull_default$12,
-		push: createPushCommand({
-			description: "Push the local admin notes config to kintone (with drift detection)",
-			args: adminNotesArgs,
-			subject: "admin notes config",
-			spinnerStopMessage: "Admin notes pushed to preview.",
-			createContainer: createAdminNotesCliContainer,
-			pushFn: pushAdminNotes,
-			toctouMessage: "The remote changed while applying. Run `admin-notes pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveAdminNotesContainerConfig,
-			resolveAppContainerConfig: resolveAdminNotesAppContainerConfig
-		})
+		push: push_default$13
 	},
 	run: () => {}
 });
 //#endregion
 //#region src/core/domain/appPermission/services/configParser.ts
-const VALID_ENTITY_TYPES$8 = new Set([
+const VALID_ENTITY_TYPES$8 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -4801,7 +4855,7 @@ async function detectAppPermissionDiff({ container }) {
 }
 //#endregion
 //#region src/core/adapters/kintone/appPermissionConfigurator.ts
-const VALID_ENTITY_TYPES$7 = new Set([
+const VALID_ENTITY_TYPES$7 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -4848,6 +4902,8 @@ function toKintoneRight$2(right) {
 	};
 }
 var KintoneAppPermissionConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -5299,6 +5355,22 @@ async function pushAppPermission({ container, input }) {
 	};
 }
 //#endregion
+//#region src/cli/commands/app-acl/push.ts
+var push_default$12 = createPushCommand({
+	description: "Push the local app permission config to kintone (with drift detection)",
+	args: appAclArgs,
+	subject: "app permission config",
+	spinnerStopMessage: "App permissions pushed to preview.",
+	createContainer: createAppPermissionCliContainer,
+	pushFn: pushAppPermission,
+	toctouMessage: "The remote changed while applying. Run `app-acl pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveAppAclContainerConfig,
+	resolveAppContainerConfig: resolveAppAclAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/app-acl/index.ts
 var app_acl_default = define({
 	name: "app-acl",
@@ -5308,20 +5380,7 @@ var app_acl_default = define({
 		capture: capture_default$12,
 		diff: diff_default$11,
 		pull: pull_default$11,
-		push: createPushCommand({
-			description: "Push the local app permission config to kintone (with drift detection)",
-			args: appAclArgs,
-			subject: "app permission config",
-			spinnerStopMessage: "App permissions pushed to preview.",
-			createContainer: createAppPermissionCliContainer,
-			pushFn: pushAppPermission,
-			toctouMessage: "The remote changed while applying. Run `app-acl pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveAppAclContainerConfig,
-			resolveAppContainerConfig: resolveAppAclAppContainerConfig
-		})
+		push: push_default$12
 	},
 	run: () => {}
 });
@@ -5463,12 +5522,12 @@ async function applyCustomization({ container, input }) {
 }
 //#endregion
 //#region src/core/domain/fieldPermission/services/configParser.ts
-const VALID_ACCESSIBILITIES$1 = new Set([
+const VALID_ACCESSIBILITIES$1 = /* @__PURE__ */ new Set([
 	"READ",
 	"WRITE",
 	"NONE"
 ]);
-const VALID_ENTITY_TYPES$6 = new Set([
+const VALID_ENTITY_TYPES$6 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -5587,7 +5646,7 @@ function describePropertiesChanges(before, after) {
 	}
 	const bProps = before.properties;
 	const aProps = after.properties;
-	const allKeys = new Set([...Object.keys(bProps), ...Object.keys(aProps)]);
+	const allKeys = /* @__PURE__ */ new Set([...Object.keys(bProps), ...Object.keys(aProps)]);
 	const propChanges = [];
 	for (const key of allKeys) if (!deepEqual(bProps[key], aProps[key])) propChanges.push(`${key}: ${formatValue(bProps[key])} -> ${formatValue(aProps[key])}`);
 	return propChanges;
@@ -5772,19 +5831,19 @@ async function applySchemaChanges(schema, { container, expectedRevision }) {
 }
 //#endregion
 //#region src/core/domain/formSchema/services/schemaValidator.ts
-const SELECTION_TYPES = new Set([
+const SELECTION_TYPES = /* @__PURE__ */ new Set([
 	"CHECK_BOX",
 	"RADIO_BUTTON",
 	"MULTI_SELECT",
 	"DROP_DOWN"
 ]);
-const VALID_THUMBNAIL_SIZES = new Set([
+const VALID_THUMBNAIL_SIZES = /* @__PURE__ */ new Set([
 	"50",
 	"150",
 	"250",
 	"500"
 ]);
-const VALID_REFERENCE_TABLE_SIZES = new Set([
+const VALID_REFERENCE_TABLE_SIZES = /* @__PURE__ */ new Set([
 	"1",
 	"3",
 	"5",
@@ -5794,7 +5853,7 @@ const VALID_REFERENCE_TABLE_SIZES = new Set([
 	"40",
 	"50"
 ]);
-const LOOKUP_FIELD_TYPES = new Set([
+const LOOKUP_FIELD_TYPES = /* @__PURE__ */ new Set([
 	"SINGLE_LINE_TEXT",
 	"NUMBER",
 	"LINK"
@@ -5928,8 +5987,8 @@ const Schema = { create: (fields, layout) => {
 } };
 //#endregion
 //#region src/core/domain/formSchema/services/schemaParser.ts
-const VALID_UNIT_POSITIONS = new Set(["BEFORE", "AFTER"]);
-const VALID_CALC_FORMATS = new Set([
+const VALID_UNIT_POSITIONS = /* @__PURE__ */ new Set(["BEFORE", "AFTER"]);
+const VALID_CALC_FORMATS = /* @__PURE__ */ new Set([
 	"NUMBER",
 	"NUMBER_DIGIT",
 	"DATE",
@@ -5938,8 +5997,8 @@ const VALID_CALC_FORMATS = new Set([
 	"HOUR_MINUTE",
 	"DAY_HOUR_MINUTE"
 ]);
-const VALID_SELECTION_ALIGNS = new Set(["HORIZONTAL", "VERTICAL"]);
-const VALID_LINK_PROTOCOLS = new Set([
+const VALID_SELECTION_ALIGNS = /* @__PURE__ */ new Set(["HORIZONTAL", "VERTICAL"]);
+const VALID_LINK_PROTOCOLS = /* @__PURE__ */ new Set([
 	"WEB",
 	"CALL",
 	"MAIL"
@@ -5962,12 +6021,10 @@ function validateFieldProperties(code, fieldType, properties) {
 		case "DROP_DOWN":
 			validateEnumProperty(code, "align", properties.align, VALID_SELECTION_ALIGNS);
 			break;
-		case "LINK":
-			validateEnumProperty(code, "protocol", properties.protocol, VALID_LINK_PROTOCOLS);
-			break;
+		case "LINK": validateEnumProperty(code, "protocol", properties.protocol, VALID_LINK_PROTOCOLS);
 	}
 }
-const VALID_FIELD_TYPES = new Set([
+const VALID_FIELD_TYPES = /* @__PURE__ */ new Set([
 	"SINGLE_LINE_TEXT",
 	"MULTI_LINE_TEXT",
 	"RICH_TEXT",
@@ -5989,12 +6046,12 @@ const VALID_FIELD_TYPES = new Set([
 	"SUBTABLE",
 	"REFERENCE_TABLE"
 ]);
-const DECORATION_TYPES = new Set([
+const DECORATION_TYPES = /* @__PURE__ */ new Set([
 	"LABEL",
 	"SPACER",
 	"HR"
 ]);
-const SYSTEM_FIELD_TYPES = new Set([
+const SYSTEM_FIELD_TYPES = /* @__PURE__ */ new Set([
 	"RECORD_NUMBER",
 	"CREATOR",
 	"CREATED_TIME",
@@ -6004,16 +6061,16 @@ const SYSTEM_FIELD_TYPES = new Set([
 	"STATUS",
 	"STATUS_ASSIGNEE"
 ]);
-const BASE_ATTRIBUTES = new Set([
+const BASE_ATTRIBUTES = /* @__PURE__ */ new Set([
 	"code",
 	"type",
 	"label",
 	"noLabel"
 ]);
-const LAYOUT_ATTRIBUTES = new Set(["size"]);
-const DECORATION_ATTRIBUTES = new Set(["elementId"]);
-const GROUP_ATTRIBUTES = new Set(["openGroup", "layout"]);
-const SUBTABLE_ATTRIBUTES = new Set(["fields"]);
+const LAYOUT_ATTRIBUTES = /* @__PURE__ */ new Set(["size"]);
+const DECORATION_ATTRIBUTES = /* @__PURE__ */ new Set(["elementId"]);
+const GROUP_ATTRIBUTES = /* @__PURE__ */ new Set(["openGroup", "layout"]);
+const SUBTABLE_ATTRIBUTES = /* @__PURE__ */ new Set(["fields"]);
 /**
 * Parses a raw size object into an ElementSize.
 * Returns undefined when no size properties are present, treating an empty
@@ -6030,7 +6087,7 @@ function parseSize(raw) {
 		...obj.innerHeight !== void 0 ? { innerHeight: String(obj.innerHeight) } : {}
 	};
 }
-const BOOLEAN_PROPERTIES = new Set([
+const BOOLEAN_PROPERTIES = /* @__PURE__ */ new Set([
 	"required",
 	"unique",
 	"digit",
@@ -6419,7 +6476,7 @@ function parseOptionalBoolean(parsed, fieldName) {
 	if (value === void 0 || value === null) return void 0;
 	return parseStrictBoolean(value, fieldName, "Config", GeneralSettingsErrorCode.GsInvalidBooleanField);
 }
-const VALID_THEMES$1 = new Set([
+const VALID_THEMES$1 = /* @__PURE__ */ new Set([
 	"WHITE",
 	"RED",
 	"GREEN",
@@ -6431,9 +6488,9 @@ const VALID_THEMES$1 = new Set([
 	"PENCIL",
 	"CLIPS"
 ]);
-const VALID_ICON_TYPES$1 = new Set(["PRESET", "FILE"]);
-const VALID_SELECTION_MODES$1 = new Set(["AUTO", "MANUAL"]);
-const VALID_ROUNDING_MODES$1 = new Set([
+const VALID_ICON_TYPES$1 = /* @__PURE__ */ new Set(["PRESET", "FILE"]);
+const VALID_SELECTION_MODES$1 = /* @__PURE__ */ new Set(["AUTO", "MANUAL"]);
+const VALID_ROUNDING_MODES$1 = /* @__PURE__ */ new Set([
 	"HALF_EVEN",
 	"UP",
 	"DOWN"
@@ -6534,7 +6591,7 @@ async function applyGeneralSettings({ container }) {
 		notFoundMessage: "General settings config file not found"
 	});
 }
-const VALID_ENTITY_TYPES$5 = new Set([
+const VALID_ENTITY_TYPES$5 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -6755,12 +6812,12 @@ async function applyPlugin({ container }) {
 }
 //#endregion
 //#region src/core/domain/processManagement/services/configParser.ts
-const VALID_ASSIGNEE_TYPES$1 = new Set([
+const VALID_ASSIGNEE_TYPES$1 = /* @__PURE__ */ new Set([
 	"ONE",
 	"ALL",
 	"ANY"
 ]);
-const VALID_ENTITY_TYPES$4 = new Set([
+const VALID_ENTITY_TYPES$4 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -6768,7 +6825,7 @@ const VALID_ENTITY_TYPES$4 = new Set([
 	"CREATOR",
 	"CUSTOM_FIELD"
 ]);
-const VALID_ACTION_TYPES$1 = new Set(["PRIMARY", "SECONDARY"]);
+const VALID_ACTION_TYPES$1 = /* @__PURE__ */ new Set(["PRIMARY", "SECONDARY"]);
 function parseProcessEntity(raw, index) {
 	if (!isRecord(raw)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidConfigStructure, `Entity at index ${index} must be an object`);
 	const result = { type: parseEnum(raw.type, VALID_ENTITY_TYPES$4, ProcessManagementErrorCode.PmInvalidEntityType, `Entity at index ${index} has invalid type: ${String(raw.type)}. Must be USER, GROUP, ORGANIZATION, FIELD_ENTITY, CREATOR, or CUSTOM_FIELD`) };
@@ -6874,7 +6931,7 @@ async function applyProcessManagement({ container }) {
 }
 //#endregion
 //#region src/core/domain/recordPermission/services/configParser.ts
-const VALID_ENTITY_TYPES$3 = new Set([
+const VALID_ENTITY_TYPES$3 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -6944,7 +7001,7 @@ async function applyRecordPermission({ container }) {
 		notFoundMessage: "Record permission config file not found"
 	});
 }
-const VALID_CHART_TYPES = new Set([
+const VALID_CHART_TYPES = /* @__PURE__ */ new Set([
 	"BAR",
 	"COLUMN",
 	"PIE",
@@ -6958,7 +7015,7 @@ const VALID_CHART_TYPES = new Set([
 function isChartType(value) {
 	return VALID_CHART_TYPES.has(value);
 }
-const VALID_CHART_MODES = new Set([
+const VALID_CHART_MODES = /* @__PURE__ */ new Set([
 	"NORMAL",
 	"STACKED",
 	"PERCENTAGE"
@@ -6966,7 +7023,7 @@ const VALID_CHART_MODES = new Set([
 function isChartMode(value) {
 	return VALID_CHART_MODES.has(value);
 }
-const VALID_GROUP_PERS = new Set([
+const VALID_GROUP_PERS = /* @__PURE__ */ new Set([
 	"YEAR",
 	"QUARTER",
 	"MONTH",
@@ -6978,7 +7035,7 @@ const VALID_GROUP_PERS = new Set([
 function isGroupPer(value) {
 	return VALID_GROUP_PERS.has(value);
 }
-const VALID_AGGREGATION_TYPES = new Set([
+const VALID_AGGREGATION_TYPES = /* @__PURE__ */ new Set([
 	"COUNT",
 	"SUM",
 	"AVERAGE",
@@ -6988,7 +7045,7 @@ const VALID_AGGREGATION_TYPES = new Set([
 function isAggregationType(value) {
 	return VALID_AGGREGATION_TYPES.has(value);
 }
-const VALID_SORT_BYS = new Set([
+const VALID_SORT_BYS = /* @__PURE__ */ new Set([
 	"TOTAL",
 	"GROUP1",
 	"GROUP2",
@@ -6997,11 +7054,11 @@ const VALID_SORT_BYS = new Set([
 function isSortBy(value) {
 	return VALID_SORT_BYS.has(value);
 }
-const VALID_SORT_ORDERS = new Set(["ASC", "DESC"]);
+const VALID_SORT_ORDERS = /* @__PURE__ */ new Set(["ASC", "DESC"]);
 function isSortOrder(value) {
 	return VALID_SORT_ORDERS.has(value);
 }
-const VALID_PERIODIC_REPORT_EVERYS = new Set([
+const VALID_PERIODIC_REPORT_EVERYS = /* @__PURE__ */ new Set([
 	"YEAR",
 	"QUARTER",
 	"MONTH",
@@ -7012,7 +7069,7 @@ const VALID_PERIODIC_REPORT_EVERYS = new Set([
 function isPeriodicReportEvery(value) {
 	return VALID_PERIODIC_REPORT_EVERYS.has(value);
 }
-const VALID_PERIODIC_REPORT_PATTERNS = new Set([
+const VALID_PERIODIC_REPORT_PATTERNS = /* @__PURE__ */ new Set([
 	"JAN_APR_JUL_OCT",
 	"FEB_MAY_AUG_NOV",
 	"MAR_JUN_SEP_DEC"
@@ -7020,7 +7077,7 @@ const VALID_PERIODIC_REPORT_PATTERNS = new Set([
 function isPeriodicReportPattern(value) {
 	return VALID_PERIODIC_REPORT_PATTERNS.has(value);
 }
-const VALID_DAYS_OF_WEEK = new Set([
+const VALID_DAYS_OF_WEEK = /* @__PURE__ */ new Set([
 	"SUNDAY",
 	"MONDAY",
 	"TUESDAY",
@@ -7341,7 +7398,7 @@ async function upsertSeed({ container, input }) {
 		total: plan.toAdd.length + plan.toUpdate.length + plan.unchanged
 	};
 }
-const VALID_VIEW_TYPES = new Set([
+const VALID_VIEW_TYPES = /* @__PURE__ */ new Set([
 	"LIST",
 	"CALENDAR",
 	"CUSTOM"
@@ -7349,7 +7406,7 @@ const VALID_VIEW_TYPES = new Set([
 function isViewType(value) {
 	return VALID_VIEW_TYPES.has(value);
 }
-const VALID_DEVICE_TYPES = new Set(["DESKTOP", "ANY"]);
+const VALID_DEVICE_TYPES = /* @__PURE__ */ new Set(["DESKTOP", "ANY"]);
 function isDeviceType(value) {
 	return VALID_DEVICE_TYPES.has(value);
 }
@@ -7734,12 +7791,12 @@ async function applyAllForApp(args) {
 }
 //#endregion
 //#region src/core/adapters/kintone/fieldPermissionConfigurator.ts
-const VALID_ACCESSIBILITIES = new Set([
+const VALID_ACCESSIBILITIES = /* @__PURE__ */ new Set([
 	"READ",
 	"WRITE",
 	"NONE"
 ]);
-const VALID_ENTITY_TYPES$2 = new Set([
+const VALID_ENTITY_TYPES$2 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -7785,6 +7842,8 @@ function toKintoneRight$1(right) {
 	};
 }
 var KintoneFieldPermissionConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -7849,7 +7908,7 @@ function parseKintoneIntegerField(raw, fieldName) {
 }
 //#endregion
 //#region src/core/adapters/kintone/generalSettingsConfigurator.ts
-const VALID_THEMES = new Set([
+const VALID_THEMES = /* @__PURE__ */ new Set([
 	"WHITE",
 	"RED",
 	"GREEN",
@@ -7861,9 +7920,9 @@ const VALID_THEMES = new Set([
 	"PENCIL",
 	"CLIPS"
 ]);
-const VALID_ICON_TYPES = new Set(["PRESET", "FILE"]);
-const VALID_SELECTION_MODES = new Set(["AUTO", "MANUAL"]);
-const VALID_ROUNDING_MODES = new Set([
+const VALID_ICON_TYPES = /* @__PURE__ */ new Set(["PRESET", "FILE"]);
+const VALID_SELECTION_MODES = /* @__PURE__ */ new Set(["AUTO", "MANUAL"]);
+const VALID_ROUNDING_MODES = /* @__PURE__ */ new Set([
 	"HALF_EVEN",
 	"UP",
 	"DOWN"
@@ -7929,11 +7988,13 @@ function toKintoneSettings(config) {
 	if (config.description !== void 0) result.description = config.description;
 	if (config.icon !== void 0) result.icon = toKintoneIcon(config.icon);
 	if (config.theme !== void 0) result.theme = config.theme;
-	if (config.titleField !== void 0) if (config.titleField.selectionMode === "MANUAL") result.titleField = {
-		selectionMode: "MANUAL",
-		code: config.titleField.code
-	};
-	else result.titleField = { selectionMode: "AUTO" };
+	if (config.titleField !== void 0) {
+		if (config.titleField.selectionMode === "MANUAL") result.titleField = {
+			selectionMode: "MANUAL",
+			code: config.titleField.code
+		};
+		else result.titleField = { selectionMode: "AUTO" };
+	}
 	if (config.enableThumbnails !== void 0) result.enableThumbnails = config.enableThumbnails;
 	if (config.enableBulkDeletion !== void 0) result.enableBulkDeletion = config.enableBulkDeletion;
 	if (config.enableComments !== void 0) result.enableComments = config.enableComments;
@@ -7948,6 +8009,8 @@ function toKintoneSettings(config) {
 	return result;
 }
 var KintoneGeneralSettingsConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -8110,6 +8173,8 @@ function toKintoneReminderNotification(notification) {
 	};
 }
 var KintoneNotificationConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -8226,6 +8291,8 @@ function createNotificationCliContainer(config) {
 //#endregion
 //#region src/core/adapters/kintone/pluginConfigurator.ts
 var KintonePluginConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -8286,12 +8353,12 @@ function createPluginCliContainer(config) {
 }
 //#endregion
 //#region src/core/adapters/kintone/processManagementConfigurator.ts
-const VALID_ASSIGNEE_TYPES = new Set([
+const VALID_ASSIGNEE_TYPES = /* @__PURE__ */ new Set([
 	"ONE",
 	"ALL",
 	"ANY"
 ]);
-const VALID_ENTITY_TYPES$1 = new Set([
+const VALID_ENTITY_TYPES$1 = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -8299,7 +8366,7 @@ const VALID_ENTITY_TYPES$1 = new Set([
 	"CREATOR",
 	"CUSTOM_FIELD"
 ]);
-const VALID_ACTION_TYPES = new Set(["PRIMARY", "SECONDARY"]);
+const VALID_ACTION_TYPES = /* @__PURE__ */ new Set(["PRIMARY", "SECONDARY"]);
 function fromKintoneEntity$1(raw) {
 	if (!VALID_ENTITY_TYPES$1.has(raw.entity.type)) throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected entity type from kintone API: ${raw.entity.type}`);
 	const result = { type: raw.entity.type };
@@ -8372,6 +8439,8 @@ function toKintoneAction(action) {
 	return result;
 }
 var KintoneProcessManagementConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -8441,7 +8510,7 @@ function createProcessManagementCliContainer(config) {
 }
 //#endregion
 //#region src/core/adapters/kintone/recordPermissionConfigurator.ts
-const VALID_ENTITY_TYPES = new Set([
+const VALID_ENTITY_TYPES = /* @__PURE__ */ new Set([
 	"USER",
 	"GROUP",
 	"ORGANIZATION",
@@ -8485,6 +8554,8 @@ function toKintoneRight(right) {
 	};
 }
 var KintoneRecordPermissionConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -8574,11 +8645,13 @@ function fromKintonePeriodicReportPeriod(raw) {
 	if (!isPeriodicReportEvery(raw.every)) throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected periodicReport every value from kintone API: ${raw.every}`);
 	if (raw.pattern !== void 0 && !isPeriodicReportPattern(raw.pattern)) throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected periodicReport pattern value from kintone API: ${raw.pattern}`);
 	let dayOfMonth;
-	if (raw.dayOfMonth !== void 0) if (String(raw.dayOfMonth) === "END_OF_MONTH") dayOfMonth = "END_OF_MONTH";
-	else {
-		const parsed = Number(raw.dayOfMonth);
-		if (!Number.isFinite(parsed) || !Number.isInteger(parsed)) throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected periodicReport dayOfMonth value from kintone API: ${String(raw.dayOfMonth)}`);
-		dayOfMonth = parsed;
+	if (raw.dayOfMonth !== void 0) {
+		if (String(raw.dayOfMonth) === "END_OF_MONTH") dayOfMonth = "END_OF_MONTH";
+		else {
+			const parsed = Number(raw.dayOfMonth);
+			if (!Number.isFinite(parsed) || !Number.isInteger(parsed)) throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected periodicReport dayOfMonth value from kintone API: ${String(raw.dayOfMonth)}`);
+			dayOfMonth = parsed;
+		}
 	}
 	return {
 		every: raw.every,
@@ -8673,6 +8746,8 @@ function toKintoneReportConfig(config) {
 	return result;
 }
 var KintoneReportConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -8775,6 +8850,8 @@ function toKintoneView(config) {
 	return result;
 }
 var KintoneViewConfigurator = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
@@ -9172,11 +9249,12 @@ function toFieldDto(field) {
 		properties: fieldPropertiesToDto(field)
 	};
 }
-async function detectDiff({ container }) {
+async function detectDiff({ container, input }) {
+	const target = input?.target ?? "preview";
 	const result = await container.schemaStorage.get();
 	if (!result.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Schema file not found");
 	const schema = parseSchemaText(container.configCodec, result.content);
-	const [currentFields, currentLayout] = await Promise.all([container.formConfigurator.getFields(), container.formConfigurator.getLayout()]);
+	const [currentFields, currentLayout] = await Promise.all([container.formConfigurator.getFields(target), container.formConfigurator.getLayout(target)]);
 	const diff = DiffDetector.detect(schema, currentFields);
 	const enrichedCurrentLayout = enrichLayoutWithFields(currentLayout, currentFields);
 	const hasLayoutChanges = DiffDetector.detectLayoutChanges(schema.layout, enrichedCurrentLayout);
@@ -10094,10 +10172,7 @@ function printSuccessResult(result) {
 		case "admin-notes":
 			printAdminNotesDiffResult(result.result);
 			break;
-		case "plugin":
-			printPluginDiffResult(result.result);
-			break;
-		default:
+		case "plugin": printPluginDiffResult(result.result);
 	}
 }
 function isResultEmpty(result) {
@@ -11983,7 +12058,7 @@ function difference(keys, digests) {
 	return new Set([...keys].filter((key) => !digests.has(key)));
 }
 function union(a, b) {
-	return new Set([...a, ...b]);
+	return /* @__PURE__ */ new Set([...a, ...b]);
 }
 function intersect(a, b) {
 	const result = /* @__PURE__ */ new Set();
@@ -12720,6 +12795,40 @@ async function runPush(containerConfig, force, skipConfirm) {
 	p.log.success("Push completed successfully.");
 	await confirmAndDeploy([container], skipConfirm);
 }
+var push_default$11 = define({
+	name: "push",
+	description: "Push the local customization config to kintone (with drift detection)",
+	args: {
+		...customizeArgs,
+		...confirmArgs,
+		force: {
+			type: "boolean",
+			description: "Skip drift detection and overwrite remote"
+		}
+	},
+	run: async (ctx) => {
+		try {
+			const values = ctx.values;
+			const force = ctx.values.force === true;
+			const skipConfirm = values.yes === true;
+			const notSupportedAll = new ValidationError(ValidationErrorCode.InvalidInput, "customize push does not support --all yet. Use --app <name> or a single app.");
+			if (values.all === true) throw notSupportedAll;
+			await routeMultiApp(values, {
+				singleLegacy: async () => {
+					await runPush(resolveCustomizeConfig(values), force, skipConfirm);
+				},
+				singleApp: async (app, projectConfig) => {
+					await runPush(resolveCustomizeAppConfig(app, projectConfig, values), force, skipConfirm);
+				},
+				multiApp: async () => {
+					throw notSupportedAll;
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
 //#endregion
 //#region src/cli/commands/customize/index.ts
 var customize_default = define({
@@ -12730,40 +12839,7 @@ var customize_default = define({
 		capture: capture_default$10,
 		diff: diff_default$10,
 		pull: pull_default$10,
-		push: define({
-			name: "push",
-			description: "Push the local customization config to kintone (with drift detection)",
-			args: {
-				...customizeArgs,
-				...confirmArgs,
-				force: {
-					type: "boolean",
-					description: "Skip drift detection and overwrite remote"
-				}
-			},
-			run: async (ctx) => {
-				try {
-					const values = ctx.values;
-					const force = ctx.values.force === true;
-					const skipConfirm = values.yes === true;
-					const notSupportedAll = new ValidationError(ValidationErrorCode.InvalidInput, "customize push does not support --all yet. Use --app <name> or a single app.");
-					if (values.all === true) throw notSupportedAll;
-					await routeMultiApp(values, {
-						singleLegacy: async () => {
-							await runPush(resolveCustomizeConfig(values), force, skipConfirm);
-						},
-						singleApp: async (app, projectConfig) => {
-							await runPush(resolveCustomizeAppConfig(app, projectConfig, values), force, skipConfirm);
-						},
-						multiApp: async () => {
-							throw notSupportedAll;
-						}
-					});
-				} catch (error) {
-					handleCliError(error);
-				}
-			}
-		})
+		push: push_default$11
 	},
 	run: () => {}
 });
@@ -13279,6 +13355,22 @@ async function pushFieldPermission({ container, input }) {
 	};
 }
 //#endregion
+//#region src/cli/commands/field-acl/push.ts
+var push_default$10 = createPushCommand({
+	description: "Push the local field permission config to kintone (with drift detection)",
+	args: fieldAclArgs,
+	subject: "field permission config",
+	spinnerStopMessage: "Field permissions pushed to preview.",
+	createContainer: createFieldPermissionCliContainer,
+	pushFn: pushFieldPermission,
+	toctouMessage: "The remote changed while applying. Run `field-acl pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveFieldAclContainerConfig,
+	resolveAppContainerConfig: resolveFieldAclAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/field-acl/index.ts
 var field_acl_default = define({
 	name: "field-acl",
@@ -13288,20 +13380,7 @@ var field_acl_default = define({
 		capture: capture_default$9,
 		diff: diff_default$8,
 		pull: pull_default$9,
-		push: createPushCommand({
-			description: "Push the local field permission config to kintone (with drift detection)",
-			args: fieldAclArgs,
-			subject: "field permission config",
-			spinnerStopMessage: "Field permissions pushed to preview.",
-			createContainer: createFieldPermissionCliContainer,
-			pushFn: pushFieldPermission,
-			toctouMessage: "The remote changed while applying. Run `field-acl pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveFieldAclContainerConfig,
-			resolveAppContainerConfig: resolveFieldAclAppContainerConfig
-		})
+		push: push_default$10
 	},
 	run: () => {}
 });
@@ -13310,6 +13389,7 @@ var field_acl_default = define({
 const PAGE_LIMIT = 100;
 const MAX_PAGES = 1e3;
 var KintoneAppLister = class {
+	client;
 	constructor(client) {
 		this.client = client;
 	}
@@ -13356,6 +13436,7 @@ var KintoneAppLister = class {
 * @see https://kintone.dev/en/docs/kintone/rest-api/spaces/get-space/
 */
 var KintoneSpaceReader = class {
+	client;
 	constructor(client) {
 		this.client = client;
 	}
@@ -13930,13 +14011,10 @@ function pushScalar(scalar, key, label, localChanges, remoteDrift, conflicts, ex
 				kind: "conflict"
 			});
 			break;
-		case "bothSame":
-			extras.push({
-				key,
-				kind: "change"
-			});
-			break;
-		default: break;
+		case "bothSame": extras.push({
+			key,
+			kind: "change"
+		});
 	}
 }
 function buildThreeWay(merge) {
@@ -13962,13 +14040,10 @@ function buildThreeWay(merge) {
 					kind: "remoteOnly"
 				});
 				break;
-			case "conflict":
-				conflicts.push({
-					...base,
-					kind: "conflict"
-				});
-				break;
-			default: break;
+			case "conflict": conflicts.push({
+				...base,
+				kind: "conflict"
+			});
 		}
 	}
 	pushScalar(merge.generalScalar, "general:notifyToCommenter", "notifyToCommenter", localChanges, remoteDrift, conflicts, extras);
@@ -14234,6 +14309,22 @@ async function pushNotification({ container, input }) {
 	};
 }
 //#endregion
+//#region src/cli/commands/notification/push.ts
+var push_default$9 = createPushCommand({
+	description: "Push the local notification config to kintone (with drift detection)",
+	args: notificationArgs,
+	subject: "notification config",
+	spinnerStopMessage: "Notifications pushed to preview.",
+	createContainer: createNotificationCliContainer,
+	pushFn: pushNotification,
+	toctouMessage: "The remote changed while applying. Run `notification pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveNotificationContainerConfig,
+	resolveAppContainerConfig: resolveNotificationAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/notification/index.ts
 var notification_default = define({
 	name: "notification",
@@ -14243,20 +14334,7 @@ var notification_default = define({
 		capture: capture_default$8,
 		diff: diff_default$7,
 		pull: pull_default$8,
-		push: createPushCommand({
-			description: "Push the local notification config to kintone (with drift detection)",
-			args: notificationArgs,
-			subject: "notification config",
-			spinnerStopMessage: "Notifications pushed to preview.",
-			createContainer: createNotificationCliContainer,
-			pushFn: pushNotification,
-			toctouMessage: "The remote changed while applying. Run `notification pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveNotificationContainerConfig,
-			resolveAppContainerConfig: resolveNotificationAppContainerConfig
-		})
+		push: push_default$9
 	},
 	run: () => {}
 });
@@ -14595,12 +14673,13 @@ function partitionPushOps(local, remoteById, localById, remotePlugins) {
 	const skipped = [];
 	for (const localPlugin of local.plugins) {
 		const remotePlugin = remoteById.get(localPlugin.id);
-		if (remotePlugin === void 0) if (localPlugin.enabled) idsToAdd.push(localPlugin.id);
-		else skipped.push({
-			pluginId: localPlugin.id,
-			reason: "add-disabled"
-		});
-		else if (remotePlugin.name !== localPlugin.name || remotePlugin.enabled !== localPlugin.enabled) skipped.push({
+		if (remotePlugin === void 0) {
+			if (localPlugin.enabled) idsToAdd.push(localPlugin.id);
+			else skipped.push({
+				pluginId: localPlugin.id,
+				reason: "add-disabled"
+			});
+		} else if (remotePlugin.name !== localPlugin.name || remotePlugin.enabled !== localPlugin.enabled) skipped.push({
 			pluginId: localPlugin.id,
 			reason: "modify"
 		});
@@ -14670,6 +14749,29 @@ async function pushPlugin({ container, input }) {
 	};
 }
 //#endregion
+//#region src/cli/commands/plugin/push.ts
+var push_default$8 = createPushCommand({
+	description: "Push the local plugin config to kintone (add-only, with drift detection)",
+	args: pluginArgs,
+	subject: "plugin config",
+	spinnerStopMessage: "Plugins pushed to preview.",
+	createContainer: createPluginCliContainer,
+	pushFn: pushPlugin,
+	toctouMessage: "The remote changed while applying. Run `plugin pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+		if (result.addedPluginIds.length > 0) p.log.info(`Added plugins: ${result.addedPluginIds.join(", ")}`);
+		const deletions = result.skipped.filter((o) => o.reason === "delete").map((o) => o.pluginId);
+		const modifications = result.skipped.filter((o) => o.reason === "modify").map((o) => o.pluginId);
+		const addDisabled = result.skipped.filter((o) => o.reason === "add-disabled").map((o) => o.pluginId);
+		if (deletions.length > 0) p.log.warn(`Cannot remove plugins via the kintone API (add-only); left on the app: ${deletions.join(", ")}`);
+		if (modifications.length > 0) p.log.warn(`Cannot modify existing plugins (name/enabled) via the kintone API (add-only); unchanged: ${modifications.join(", ")}`);
+		if (addDisabled.length > 0) p.log.warn(`Cannot add plugins in a disabled state via the kintone API (add-only; adding would force-enable them); not added — set enabled: false manually in the kintone admin UI: ${addDisabled.join(", ")}`);
+	},
+	resolveContainerConfig: resolvePluginContainerConfig,
+	resolveAppContainerConfig: resolvePluginAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/plugin/index.ts
 var plugin_default = define({
 	name: "plugin",
@@ -14679,27 +14781,7 @@ var plugin_default = define({
 		capture: capture_default$7,
 		diff: diff_default$6,
 		pull: pull_default$7,
-		push: createPushCommand({
-			description: "Push the local plugin config to kintone (add-only, with drift detection)",
-			args: pluginArgs,
-			subject: "plugin config",
-			spinnerStopMessage: "Plugins pushed to preview.",
-			createContainer: createPluginCliContainer,
-			pushFn: pushPlugin,
-			toctouMessage: "The remote changed while applying. Run `plugin pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-				if (result.addedPluginIds.length > 0) p.log.info(`Added plugins: ${result.addedPluginIds.join(", ")}`);
-				const deletions = result.skipped.filter((o) => o.reason === "delete").map((o) => o.pluginId);
-				const modifications = result.skipped.filter((o) => o.reason === "modify").map((o) => o.pluginId);
-				const addDisabled = result.skipped.filter((o) => o.reason === "add-disabled").map((o) => o.pluginId);
-				if (deletions.length > 0) p.log.warn(`Cannot remove plugins via the kintone API (add-only); left on the app: ${deletions.join(", ")}`);
-				if (modifications.length > 0) p.log.warn(`Cannot modify existing plugins (name/enabled) via the kintone API (add-only); unchanged: ${modifications.join(", ")}`);
-				if (addDisabled.length > 0) p.log.warn(`Cannot add plugins in a disabled state via the kintone API (add-only; adding would force-enable them); not added — set enabled: false manually in the kintone admin UI: ${addDisabled.join(", ")}`);
-			},
-			resolveContainerConfig: resolvePluginContainerConfig,
-			resolveAppContainerConfig: resolvePluginAppContainerConfig
-		})
+		push: push_default$8
 	},
 	run: () => {}
 });
@@ -15030,6 +15112,22 @@ async function pushProcessManagement({ container, input }) {
 	};
 }
 //#endregion
+//#region src/cli/commands/process/push.ts
+var push_default$7 = createPushCommand({
+	description: "Push the local process management config to kintone (with drift detection)",
+	args: processArgs,
+	subject: "process management config",
+	spinnerStopMessage: "Process management pushed to preview.",
+	createContainer: createProcessManagementCliContainer,
+	pushFn: pushProcessManagement,
+	toctouMessage: "The remote changed while applying. Run `process pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveProcessContainerConfig,
+	resolveAppContainerConfig: resolveProcessAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/process/index.ts
 var process_default = define({
 	name: "process",
@@ -15039,20 +15137,7 @@ var process_default = define({
 		capture: capture_default$6,
 		diff: diff_default$5,
 		pull: pull_default$6,
-		push: createPushCommand({
-			description: "Push the local process management config to kintone (with drift detection)",
-			args: processArgs,
-			subject: "process management config",
-			spinnerStopMessage: "Process management pushed to preview.",
-			createContainer: createProcessManagementCliContainer,
-			pushFn: pushProcessManagement,
-			toctouMessage: "The remote changed while applying. Run `process pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveProcessContainerConfig,
-			resolveAppContainerConfig: resolveProcessAppContainerConfig
-		})
+		push: push_default$7
 	},
 	run: () => {}
 });
@@ -15100,11 +15185,12 @@ function computeThreeWayMerge(base, local, remote) {
 	let layoutConflict = false;
 	let mergedLayout;
 	let layoutAutoSide;
-	if (layoutLocalChanged && layoutRemoteChanged) if (isLayoutEqual(enrichedLocalLayout, enrichedRemoteLayout)) {
-		mergedLayout = enrichedLocalLayout;
-		layoutAutoSide = "local";
-	} else layoutConflict = true;
-	else if (layoutLocalChanged) {
+	if (layoutLocalChanged && layoutRemoteChanged) {
+		if (isLayoutEqual(enrichedLocalLayout, enrichedRemoteLayout)) {
+			mergedLayout = enrichedLocalLayout;
+			layoutAutoSide = "local";
+		} else layoutConflict = true;
+	} else if (layoutLocalChanged) {
 		mergedLayout = enrichedLocalLayout;
 		layoutAutoSide = "local";
 	} else if (layoutRemoteChanged) {
@@ -15205,9 +15291,7 @@ function collectLayoutFieldCodes(layout) {
 			placed.add(item.code);
 			collectElements(item.fields);
 			break;
-		case "REFERENCE_TABLE":
-			placed.add(item.code);
-			break;
+		case "REFERENCE_TABLE": placed.add(item.code);
 	}
 	return {
 		placed,
@@ -17333,6 +17417,84 @@ async function runDiff$4(containerConfig) {
 	s.stop("Comparison complete.");
 	printThreeWayDiffResult(result, printRecordPermissionDiffResult);
 }
+var diff_default$4 = define({
+	name: "diff",
+	description: "Compare local record permission config with remote kintone app (3-way)",
+	args: recordAclArgs,
+	run: async (ctx) => {
+		try {
+			await routeMultiApp(ctx.values, {
+				singleLegacy: async () => {
+					await runDiff$4(resolveRecordAclContainerConfig(ctx.values));
+				},
+				singleApp: async (app, projectConfig) => {
+					await runDiff$4(resolveRecordAclAppContainerConfig(app, projectConfig, ctx.values));
+				},
+				multiApp: async (plan, projectConfig) => {
+					await runMultiAppWithFailCheck(plan, async (app) => {
+						printAppHeader(app.name, app.appId);
+						await runDiff$4(resolveRecordAclAppContainerConfig(app, projectConfig, ctx.values));
+					}, "All record permission diffs completed successfully.");
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
+//#endregion
+//#region src/cli/commands/record-acl/pull.ts
+var pull_default$4 = createPullCommand({
+	description: "Pull remote record permissions into the local record-acl config (3-way merge)",
+	args: recordAclArgs,
+	subject: "record permission config",
+	conflictNoun: "record permission",
+	createContainer: createRecordPermissionCliContainer,
+	pullFn: async ({ container, input }) => {
+		const result = await pullRecordPermission({
+			container,
+			input
+		});
+		if (result.mode === "merged") return {
+			mode: "merged",
+			merged: result
+		};
+		return { mode: result.mode };
+	},
+	getMergeView: (merged) => ({
+		hasConflict: merged.merge.hasConflict,
+		conflicts: merged.merge.conflicts
+	}),
+	applyMerge: async ({ container, merged, resolution }) => {
+		await applyPulledRecordPermissionMerge({
+			container,
+			input: {
+				merge: merged.merge,
+				resolution,
+				remoteConfig: merged.remoteConfig,
+				remoteRevision: merged.remoteRevision
+			}
+		});
+	},
+	resolveContainerConfig: resolveRecordAclContainerConfig,
+	resolveAppContainerConfig: resolveRecordAclAppContainerConfig
+});
+//#endregion
+//#region src/cli/commands/record-acl/push.ts
+var push_default$5 = createPushCommand({
+	description: "Push the local record permission config to kintone (with drift detection)",
+	args: recordAclArgs,
+	subject: "record permission config",
+	spinnerStopMessage: "Record permissions pushed to preview.",
+	createContainer: createRecordPermissionCliContainer,
+	pushFn: pushRecordPermission,
+	toctouMessage: "The remote changed while applying. Run `record-acl pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveRecordAclContainerConfig,
+	resolveAppContainerConfig: resolveRecordAclAppContainerConfig
+});
 //#endregion
 //#region src/cli/commands/record-acl/index.ts
 var record_acl_default = define({
@@ -17341,80 +17503,9 @@ var record_acl_default = define({
 	subCommands: {
 		apply: apply_default$4,
 		capture: capture_default$5,
-		diff: define({
-			name: "diff",
-			description: "Compare local record permission config with remote kintone app (3-way)",
-			args: recordAclArgs,
-			run: async (ctx) => {
-				try {
-					await routeMultiApp(ctx.values, {
-						singleLegacy: async () => {
-							await runDiff$4(resolveRecordAclContainerConfig(ctx.values));
-						},
-						singleApp: async (app, projectConfig) => {
-							await runDiff$4(resolveRecordAclAppContainerConfig(app, projectConfig, ctx.values));
-						},
-						multiApp: async (plan, projectConfig) => {
-							await runMultiAppWithFailCheck(plan, async (app) => {
-								printAppHeader(app.name, app.appId);
-								await runDiff$4(resolveRecordAclAppContainerConfig(app, projectConfig, ctx.values));
-							}, "All record permission diffs completed successfully.");
-						}
-					});
-				} catch (error) {
-					handleCliError(error);
-				}
-			}
-		}),
-		pull: createPullCommand({
-			description: "Pull remote record permissions into the local record-acl config (3-way merge)",
-			args: recordAclArgs,
-			subject: "record permission config",
-			conflictNoun: "record permission",
-			createContainer: createRecordPermissionCliContainer,
-			pullFn: async ({ container, input }) => {
-				const result = await pullRecordPermission({
-					container,
-					input
-				});
-				if (result.mode === "merged") return {
-					mode: "merged",
-					merged: result
-				};
-				return { mode: result.mode };
-			},
-			getMergeView: (merged) => ({
-				hasConflict: merged.merge.hasConflict,
-				conflicts: merged.merge.conflicts
-			}),
-			applyMerge: async ({ container, merged, resolution }) => {
-				await applyPulledRecordPermissionMerge({
-					container,
-					input: {
-						merge: merged.merge,
-						resolution,
-						remoteConfig: merged.remoteConfig,
-						remoteRevision: merged.remoteRevision
-					}
-				});
-			},
-			resolveContainerConfig: resolveRecordAclContainerConfig,
-			resolveAppContainerConfig: resolveRecordAclAppContainerConfig
-		}),
-		push: createPushCommand({
-			description: "Push the local record permission config to kintone (with drift detection)",
-			args: recordAclArgs,
-			subject: "record permission config",
-			spinnerStopMessage: "Record permissions pushed to preview.",
-			createContainer: createRecordPermissionCliContainer,
-			pushFn: pushRecordPermission,
-			toctouMessage: "The remote changed while applying. Run `record-acl pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveRecordAclContainerConfig,
-			resolveAppContainerConfig: resolveRecordAclAppContainerConfig
-		})
+		diff: diff_default$4,
+		pull: pull_default$4,
+		push: push_default$5
 	},
 	run: () => {}
 });
@@ -17519,7 +17610,85 @@ async function runDiff$3(containerConfig) {
 	s.stop("Comparison complete.");
 	printThreeWayDiffResult(result, printReportDiffResult);
 }
-//#endregion
+var diff_default$3 = define({
+	name: "diff",
+	description: "Compare local report config with remote kintone app (3-way)",
+	args: reportArgs,
+	run: async (ctx) => {
+		try {
+			await routeMultiApp(ctx.values, {
+				singleLegacy: async () => {
+					await runDiff$3(resolveReportContainerConfig(ctx.values));
+				},
+				singleApp: async (app, projectConfig) => {
+					await runDiff$3(resolveReportAppContainerConfig(app, projectConfig, ctx.values));
+				},
+				multiApp: async (plan, projectConfig) => {
+					await runMultiAppWithFailCheck(plan, async (app) => {
+						printAppHeader(app.name, app.appId);
+						await runDiff$3(resolveReportAppContainerConfig(app, projectConfig, ctx.values));
+					}, "All report diffs completed successfully.");
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
+//#endregion
+//#region src/cli/commands/report/pull.ts
+var pull_default$3 = createPullCommand({
+	description: "Pull remote reports into the local report config (3-way merge)",
+	args: reportArgs,
+	subject: "report config",
+	conflictNoun: "report",
+	createContainer: createReportCliContainer,
+	pullFn: async ({ container, input }) => {
+		const result = await pullReport({
+			container,
+			input
+		});
+		if (result.mode === "merged") return {
+			mode: "merged",
+			merged: result
+		};
+		return { mode: result.mode };
+	},
+	getMergeView: (merged) => ({
+		hasConflict: merged.merge.hasConflict,
+		conflicts: merged.merge.conflicts
+	}),
+	applyMerge: async ({ container, merged, resolution }) => {
+		await applyPulledReportMerge({
+			container,
+			input: {
+				merge: merged.merge,
+				resolution,
+				remoteConfig: merged.remoteConfig,
+				remoteRevision: merged.remoteRevision
+			}
+		});
+	},
+	resolveContainerConfig: resolveReportContainerConfig,
+	resolveAppContainerConfig: resolveReportAppContainerConfig
+});
+//#endregion
+//#region src/cli/commands/report/push.ts
+var push_default$4 = createPushCommand({
+	description: "Push the local report config to kintone (with drift detection)",
+	args: reportArgs,
+	subject: "report config",
+	spinnerStopMessage: "Reports pushed to preview.",
+	createContainer: createReportCliContainer,
+	pushFn: pushReport,
+	toctouMessage: "The remote changed while applying. Run `report pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveReportContainerConfig,
+	resolveAppContainerConfig: resolveReportAppContainerConfig
+});
+//#endregion
 //#region src/cli/commands/report/index.ts
 var report_default = define({
 	name: "report",
@@ -17527,80 +17696,9 @@ var report_default = define({
 	subCommands: {
 		apply: apply_default$3,
 		capture: capture_default$4,
-		diff: define({
-			name: "diff",
-			description: "Compare local report config with remote kintone app (3-way)",
-			args: reportArgs,
-			run: async (ctx) => {
-				try {
-					await routeMultiApp(ctx.values, {
-						singleLegacy: async () => {
-							await runDiff$3(resolveReportContainerConfig(ctx.values));
-						},
-						singleApp: async (app, projectConfig) => {
-							await runDiff$3(resolveReportAppContainerConfig(app, projectConfig, ctx.values));
-						},
-						multiApp: async (plan, projectConfig) => {
-							await runMultiAppWithFailCheck(plan, async (app) => {
-								printAppHeader(app.name, app.appId);
-								await runDiff$3(resolveReportAppContainerConfig(app, projectConfig, ctx.values));
-							}, "All report diffs completed successfully.");
-						}
-					});
-				} catch (error) {
-					handleCliError(error);
-				}
-			}
-		}),
-		pull: createPullCommand({
-			description: "Pull remote reports into the local report config (3-way merge)",
-			args: reportArgs,
-			subject: "report config",
-			conflictNoun: "report",
-			createContainer: createReportCliContainer,
-			pullFn: async ({ container, input }) => {
-				const result = await pullReport({
-					container,
-					input
-				});
-				if (result.mode === "merged") return {
-					mode: "merged",
-					merged: result
-				};
-				return { mode: result.mode };
-			},
-			getMergeView: (merged) => ({
-				hasConflict: merged.merge.hasConflict,
-				conflicts: merged.merge.conflicts
-			}),
-			applyMerge: async ({ container, merged, resolution }) => {
-				await applyPulledReportMerge({
-					container,
-					input: {
-						merge: merged.merge,
-						resolution,
-						remoteConfig: merged.remoteConfig,
-						remoteRevision: merged.remoteRevision
-					}
-				});
-			},
-			resolveContainerConfig: resolveReportContainerConfig,
-			resolveAppContainerConfig: resolveReportAppContainerConfig
-		}),
-		push: createPushCommand({
-			description: "Push the local report config to kintone (with drift detection)",
-			args: reportArgs,
-			subject: "report config",
-			spinnerStopMessage: "Reports pushed to preview.",
-			createContainer: createReportCliContainer,
-			pushFn: pushReport,
-			toctouMessage: "The remote changed while applying. Run `report pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveReportContainerConfig,
-			resolveAppContainerConfig: resolveReportAppContainerConfig
-		})
+		diff: diff_default$3,
+		pull: pull_default$3,
+		push: push_default$4
 	},
 	run: () => {}
 });
@@ -17693,14 +17791,11 @@ async function detectThreeWayDiff({ container }) {
 					kind: "remoteOnly"
 				});
 				break;
-			case "conflict":
-				conflicts.push({
-					key: entry.key,
-					label,
-					kind: "conflict"
-				});
-				break;
-			default: break;
+			case "conflict": conflicts.push({
+				key: entry.key,
+				label,
+				kind: "conflict"
+			});
 		}
 	}
 	const enrichedBaseLayout = enrichLayoutWithFields(state.schema.layout, state.schema.fields);
@@ -17736,41 +17831,71 @@ function buildLayoutExtras(layoutConflict, layoutLocalChanged, layoutRemoteChang
 	return [];
 }
 //#endregion
+//#region src/cli/commands/schema/formReadTarget.ts
+/**
+* Shared `--published` flag for the schema commands that read a form definition
+* (`dump` / `diff`). Kept next to its users rather than in `src/cli/config.ts`,
+* which holds only domain-agnostic connection/execution-mode options.
+*/
+const formReadTargetArgs = { published: {
+	type: "boolean",
+	description: "Read the published (deployed) form instead of the preview (unpublished) one"
+} };
+function resolveFormReadTarget(values) {
+	return values.published ? "published" : "preview";
+}
+//#endregion
 //#region src/cli/commands/schema/diff.ts
-async function runDiff$2(container) {
+async function runDiff$2(container, target) {
+	printSchemaDiffTarget(target);
 	const s = p.spinner();
 	s.start("Comparing schema...");
 	let result;
 	try {
-		result = await detectThreeWayDiff({ container });
+		result = target === "published" ? {
+			kind: "published",
+			value: await detectDiff({
+				container,
+				input: { target }
+			})
+		} : {
+			kind: "preview",
+			value: await detectThreeWayDiff({ container })
+		};
 	} catch (error) {
 		s.stop("Comparison failed.");
 		throw error;
 	}
 	s.stop("Comparison complete.");
-	printThreeWayDiffResult(result, printDiffResult);
+	if (result.kind === "published") {
+		printDiffResult(result.value);
+		return;
+	}
+	printThreeWayDiffResult(result.value, printDiffResult);
 }
 var diff_default$2 = define({
 	name: "diff",
 	description: "Detect differences between schema file and current kintone form",
 	args: {
 		...kintoneArgs,
-		...multiAppArgs
+		...multiAppArgs,
+		...formReadTargetArgs
 	},
 	run: async (ctx) => {
 		try {
+			const target = resolveFormReadTarget(ctx.values);
 			await routeMultiApp(ctx.values, {
 				singleLegacy: async () => {
-					await runDiff$2(createCliContainer(resolveConfig(ctx.values)));
+					await runDiff$2(createCliContainer(resolveConfig(ctx.values)), target);
 				},
 				singleApp: async (app, projectConfig) => {
-					await runDiff$2(createCliContainer(resolveAppCliConfig(app, projectConfig, ctx.values)));
+					await runDiff$2(createCliContainer(resolveAppCliConfig(app, projectConfig, ctx.values)), target);
 				},
 				multiApp: async (plan, projectConfig) => {
 					await runMultiAppWithFailCheck(plan, async (app) => {
 						const container = createCliContainer(resolveAppCliConfig(app, projectConfig, ctx.values));
 						printAppHeader(app.name, app.appId);
-						await runDiff$2(container);
+						await runDiff$2(container, target);
 					}, "All schema diffs completed successfully.");
 				}
 			});
@@ -17781,32 +17906,41 @@ var diff_default$2 = define({
 });
 //#endregion
 //#region src/core/adapters/kintone/formDumpReader.ts
+const GET_RAW_FORM_DATA_FAILURE_MESSAGES = {
+	preview: "Failed to fetch raw form data for dump",
+	published: "Failed to fetch published raw form data for dump (the app may not be deployed yet, or the credentials may not be allowed to read it)"
+};
 var KintoneFormDumpReader = class {
+	client;
+	appId;
 	constructor(client, appId) {
 		this.client = client;
 		this.appId = appId;
 	}
-	async getRawFormData() {
+	async getRawFormData(target = DEFAULT_FORM_READ_TARGET) {
+		const preview = target === "preview";
 		try {
 			const [fields, layout] = await Promise.all([this.client.app.getFormFields({
 				app: this.appId,
-				preview: true
+				preview
 			}), this.client.app.getFormLayout({
 				app: this.appId,
-				preview: true
+				preview
 			})]);
 			return {
 				fields,
 				layout
 			};
 		} catch (error) {
-			throw wrapKintoneError(error, "Failed to fetch raw form data for dump");
+			throw wrapKintoneError(error, GET_RAW_FORM_DATA_FAILURE_MESSAGES[target]);
 		}
 	}
 };
 //#endregion
 //#region src/core/adapters/local/dumpStorage.ts
 var LocalFileDumpStorage = class {
+	filePrefix;
+	baseDir;
 	constructor(filePrefix, baseDir = process.cwd()) {
 		this.filePrefix = filePrefix;
 		this.baseDir = baseDir;
@@ -17844,29 +17978,38 @@ function createDumpCliContainer(config) {
 }
 //#endregion
 //#region src/core/application/formSchema/dumpForm.ts
-async function dumpForm({ container }) {
-	const rawData = await container.formDumpReader.getRawFormData();
+async function dumpForm({ container, input }) {
+	const rawData = await container.formDumpReader.getRawFormData(input?.target ?? "preview");
 	await Promise.all([container.dumpStorage.saveFields(JSON.stringify(rawData.fields, null, 2)), container.dumpStorage.saveLayout(JSON.stringify(rawData.layout, null, 2))]);
 }
 //#endregion
 //#region src/cli/commands/schema/dump.ts
-async function runSingleDump(config) {
-	const container = createDumpCliContainer(config);
+async function runSingleDump(config, basePrefix, target) {
+	const filePrefix = `${basePrefix}${target === "published" ? "published-" : ""}`;
+	const container = createDumpCliContainer({
+		...config,
+		filePrefix
+	});
 	const s = p.spinner();
-	s.start("Fetching form fields and layout...");
-	await dumpForm({ container });
+	s.start(target === "published" ? "Fetching published form fields and layout..." : "Fetching form fields and layout...");
+	await dumpForm({
+		container,
+		input: { target }
+	});
 	s.stop("Form data fetched.");
-	p.log.success(`Saved ${pc.cyan(`${config.filePrefix}fields.json`)} and ${pc.cyan(`${config.filePrefix}layout.json`)}`);
+	p.log.success(`Saved ${pc.cyan(`${filePrefix}fields.json`)} and ${pc.cyan(`${filePrefix}layout.json`)}`);
 }
 var dump_default = define({
 	name: "dump",
 	description: "Dump current kintone form fields and layout as JSON",
 	args: {
 		...kintoneArgs,
-		...multiAppArgs
+		...multiAppArgs,
+		...formReadTargetArgs
 	},
 	run: async (ctx) => {
 		try {
+			const target = resolveFormReadTarget(ctx.values);
 			await routeMultiApp(ctx.values, {
 				singleLegacy: async () => {
 					const config = resolveConfig(ctx.values);
@@ -17874,9 +18017,8 @@ var dump_default = define({
 						baseUrl: config.baseUrl,
 						auth: config.auth,
 						appId: config.appId,
-						guestSpaceId: config.guestSpaceId,
-						filePrefix: ""
-					});
+						guestSpaceId: config.guestSpaceId
+					}, "", target);
 				},
 				singleApp: async (app, projectConfig) => {
 					const config = resolveAppCliConfig(app, projectConfig, ctx.values);
@@ -17884,9 +18026,8 @@ var dump_default = define({
 						baseUrl: config.baseUrl,
 						auth: config.auth,
 						appId: config.appId,
-						guestSpaceId: config.guestSpaceId,
-						filePrefix: `${app.name}-`
-					});
+						guestSpaceId: config.guestSpaceId
+					}, `${app.name}-`, target);
 				},
 				multiApp: async (plan, projectConfig) => {
 					await runMultiAppWithFailCheck(plan, async (app) => {
@@ -17896,9 +18037,8 @@ var dump_default = define({
 							baseUrl: config.baseUrl,
 							auth: config.auth,
 							appId: config.appId,
-							guestSpaceId: config.guestSpaceId,
-							filePrefix: `${app.name}-`
-						});
+							guestSpaceId: config.guestSpaceId
+						}, `${app.name}-`, target);
 					}, "All dumps completed successfully.");
 				}
 			});
@@ -18221,21 +18361,23 @@ async function resolveConflicts(merge, options) {
 		fields.set(conflict.key, choice);
 	}
 	let layout = "noConflict";
-	if (merge.layoutConflict) if (options.ours) layout = "local";
-	else if (options.theirs) layout = "remote";
-	else {
-		const selected = await p.select({
-			message: "Conflict on layout. Keep which side?",
-			options: [{
-				value: "local",
-				label: "local (ours)"
-			}, {
-				value: "remote",
-				label: "remote (theirs)"
-			}]
-		});
-		if (p.isCancel(selected)) return;
-		layout = selected;
+	if (merge.layoutConflict) {
+		if (options.ours) layout = "local";
+		else if (options.theirs) layout = "remote";
+		else {
+			const selected = await p.select({
+				message: "Conflict on layout. Keep which side?",
+				options: [{
+					value: "local",
+					label: "local (ours)"
+				}, {
+					value: "remote",
+					label: "remote (theirs)"
+				}]
+			});
+			if (p.isCancel(selected)) return;
+			layout = selected;
+		}
 	}
 	return {
 		fields,
@@ -18437,6 +18579,41 @@ async function runValidate(schemaFilePath) {
 function resolveSchemaFilePath(values, appSchemaFile) {
 	return values["schema-file"] ?? process.env.SCHEMA_FILE_PATH ?? appSchemaFile ?? "schema.yaml";
 }
+var validate_default = define({
+	name: "validate",
+	description: "Validate schema file without connecting to kintone",
+	args: validateArgs,
+	run: async (ctx) => {
+		try {
+			const values = ctx.values;
+			await routeMultiApp(values, {
+				singleLegacy: async () => {
+					if (!await runValidate(resolveSchemaFilePath(values))) {
+						p.outro("Validation failed.");
+						process.exit(1);
+					}
+					p.outro("Validation passed.");
+				},
+				singleApp: async (app) => {
+					if (!await runValidate(resolveSchemaFilePath(values, app.schemaFile))) {
+						p.outro("Validation failed.");
+						process.exit(1);
+					}
+					p.outro("Validation passed.");
+				},
+				multiApp: async (plan) => {
+					await runMultiAppWithFailCheck(plan, async (app) => {
+						printAppHeader(app.name, app.appId);
+						const schemaFilePath = resolveSchemaFilePath(values, app.schemaFile);
+						if (!printValidationResult(await validateSchema({ container: createValidateCliContainer({ schemaFilePath }) }), schemaFilePath)) throw new ValidationError(ValidationErrorCode.InvalidInput, `Validation failed for app "${app.name}"`);
+					}, "All validations passed.");
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
 //#endregion
 //#region src/cli/commands/schema/index.ts
 var schema_default = define({
@@ -18447,41 +18624,7 @@ var schema_default = define({
 		migrate: migrate_default,
 		override: override_default,
 		capture: capture_default$3,
-		validate: define({
-			name: "validate",
-			description: "Validate schema file without connecting to kintone",
-			args: validateArgs,
-			run: async (ctx) => {
-				try {
-					const values = ctx.values;
-					await routeMultiApp(values, {
-						singleLegacy: async () => {
-							if (!await runValidate(resolveSchemaFilePath(values))) {
-								p.outro("Validation failed.");
-								process.exit(1);
-							}
-							p.outro("Validation passed.");
-						},
-						singleApp: async (app) => {
-							if (!await runValidate(resolveSchemaFilePath(values, app.schemaFile))) {
-								p.outro("Validation failed.");
-								process.exit(1);
-							}
-							p.outro("Validation passed.");
-						},
-						multiApp: async (plan) => {
-							await runMultiAppWithFailCheck(plan, async (app) => {
-								printAppHeader(app.name, app.appId);
-								const schemaFilePath = resolveSchemaFilePath(values, app.schemaFile);
-								if (!printValidationResult(await validateSchema({ container: createValidateCliContainer({ schemaFilePath }) }), schemaFilePath)) throw new ValidationError(ValidationErrorCode.InvalidInput, `Validation failed for app "${app.name}"`);
-							}, "All validations passed.");
-						}
-					});
-				} catch (error) {
-					handleCliError(error);
-				}
-			}
-		}),
+		validate: validate_default,
 		dump: dump_default,
 		pull: pull_default$2,
 		push: push_default$3
@@ -18641,6 +18784,34 @@ async function runSeedCapture(config, keyField) {
 	if (!keyField) p.log.info("No key field specified. All records will be added on apply.");
 	if (result.hasExistingSeed) p.log.warn("Existing seed file was overwritten.");
 }
+var capture_default$2 = define({
+	name: "capture",
+	description: "Capture records from kintone app to seed file",
+	args: seedCaptureArgs,
+	run: async (ctx) => {
+		try {
+			const values = ctx.values;
+			const keyField = values["key-field"];
+			await routeMultiApp(values, {
+				singleLegacy: async () => {
+					await runSeedCapture(resolveSeedConfig(values), keyField);
+				},
+				singleApp: async (app, projectConfig) => {
+					await runSeedCapture(resolveSeedAppConfig(app, projectConfig, values), keyField);
+				},
+				multiApp: async (plan, projectConfig) => {
+					await runMultiAppWithFailCheck(plan, async (app) => {
+						const config = resolveSeedAppConfig(app, projectConfig, values);
+						printAppHeader(app.name, app.appId);
+						await runSeedCapture(config, keyField);
+					}, "All captures completed successfully.");
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
 //#endregion
 //#region src/cli/commands/seed/index.ts
 var seed_default = define({
@@ -18649,34 +18820,7 @@ var seed_default = define({
 	subCommands: {
 		push: push_default$2,
 		apply: apply_default$2,
-		capture: define({
-			name: "capture",
-			description: "Capture records from kintone app to seed file",
-			args: seedCaptureArgs,
-			run: async (ctx) => {
-				try {
-					const values = ctx.values;
-					const keyField = values["key-field"];
-					await routeMultiApp(values, {
-						singleLegacy: async () => {
-							await runSeedCapture(resolveSeedConfig(values), keyField);
-						},
-						singleApp: async (app, projectConfig) => {
-							await runSeedCapture(resolveSeedAppConfig(app, projectConfig, values), keyField);
-						},
-						multiApp: async (plan, projectConfig) => {
-							await runMultiAppWithFailCheck(plan, async (app) => {
-								const config = resolveSeedAppConfig(app, projectConfig, values);
-								printAppHeader(app.name, app.appId);
-								await runSeedCapture(config, keyField);
-							}, "All captures completed successfully.");
-						}
-					});
-				} catch (error) {
-					handleCliError(error);
-				}
-			}
-		})
+		capture: capture_default$2
 	},
 	run: () => {}
 });
@@ -18810,6 +18954,57 @@ var diff_default$1 = define({
 //#region src/cli/commands/settings/pull.ts
 /** Fixed conflict key for the single (whole-entity) settings config. */
 const SETTINGS_CONFLICT_KEY = "settings";
+var pull_default$1 = createPullCommand({
+	description: "Pull remote general settings into the local settings config (3-way merge)",
+	args: settingsArgs,
+	subject: "general settings config",
+	conflictNoun: "settings",
+	createContainer: createGeneralSettingsCliContainer,
+	pullFn: async ({ container, input }) => {
+		const result = await pullGeneralSettings({
+			container,
+			input
+		});
+		if (result.mode === "merged") return {
+			mode: "merged",
+			merged: result
+		};
+		return { mode: result.mode };
+	},
+	getMergeView: (merged) => ({
+		hasConflict: merged.merge.hasConflict,
+		conflicts: merged.merge.hasConflict ? [{ key: SETTINGS_CONFLICT_KEY }] : []
+	}),
+	applyMerge: async ({ container, merged, resolution }) => {
+		await applyPulledGeneralSettingsMerge({
+			container,
+			input: {
+				merge: merged.merge,
+				resolution: resolution.get(SETTINGS_CONFLICT_KEY),
+				remoteConfig: merged.remoteConfig,
+				remoteRevision: merged.remoteRevision
+			}
+		});
+	},
+	resolveContainerConfig: resolveSettingsContainerConfig,
+	resolveAppContainerConfig: resolveSettingsAppContainerConfig
+});
+//#endregion
+//#region src/cli/commands/settings/push.ts
+var push_default$1 = createPushCommand({
+	description: "Push the local general settings config to kintone (with drift detection)",
+	args: settingsArgs,
+	subject: "general settings config",
+	spinnerStopMessage: "General settings pushed to preview.",
+	createContainer: createGeneralSettingsCliContainer,
+	pushFn: pushGeneralSettings,
+	toctouMessage: "The remote changed while applying. Run `settings pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+	},
+	resolveContainerConfig: resolveSettingsContainerConfig,
+	resolveAppContainerConfig: resolveSettingsAppContainerConfig
+});
 //#endregion
 //#region src/cli/commands/settings/index.ts
 var settings_default = define({
@@ -18819,55 +19014,8 @@ var settings_default = define({
 		apply: apply_default$1,
 		capture: capture_default$1,
 		diff: diff_default$1,
-		pull: createPullCommand({
-			description: "Pull remote general settings into the local settings config (3-way merge)",
-			args: settingsArgs,
-			subject: "general settings config",
-			conflictNoun: "settings",
-			createContainer: createGeneralSettingsCliContainer,
-			pullFn: async ({ container, input }) => {
-				const result = await pullGeneralSettings({
-					container,
-					input
-				});
-				if (result.mode === "merged") return {
-					mode: "merged",
-					merged: result
-				};
-				return { mode: result.mode };
-			},
-			getMergeView: (merged) => ({
-				hasConflict: merged.merge.hasConflict,
-				conflicts: merged.merge.hasConflict ? [{ key: SETTINGS_CONFLICT_KEY }] : []
-			}),
-			applyMerge: async ({ container, merged, resolution }) => {
-				await applyPulledGeneralSettingsMerge({
-					container,
-					input: {
-						merge: merged.merge,
-						resolution: resolution.get(SETTINGS_CONFLICT_KEY),
-						remoteConfig: merged.remoteConfig,
-						remoteRevision: merged.remoteRevision
-					}
-				});
-			},
-			resolveContainerConfig: resolveSettingsContainerConfig,
-			resolveAppContainerConfig: resolveSettingsAppContainerConfig
-		}),
-		push: createPushCommand({
-			description: "Push the local general settings config to kintone (with drift detection)",
-			args: settingsArgs,
-			subject: "general settings config",
-			spinnerStopMessage: "General settings pushed to preview.",
-			createContainer: createGeneralSettingsCliContainer,
-			pushFn: pushGeneralSettings,
-			toctouMessage: "The remote changed while applying. Run `settings pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-			},
-			resolveContainerConfig: resolveSettingsContainerConfig,
-			resolveAppContainerConfig: resolveSettingsAppContainerConfig
-		})
+		pull: pull_default$1,
+		push: push_default$1
 	},
 	run: () => {}
 });
@@ -18975,6 +19123,85 @@ async function runDiff(containerConfig) {
 	s.stop("Comparison complete.");
 	printThreeWayDiffResult(result, printViewDiffResult);
 }
+var diff_default = define({
+	name: "diff",
+	description: "Compare local view config with remote kintone app (3-way)",
+	args: viewArgs,
+	run: async (ctx) => {
+		try {
+			await routeMultiApp(ctx.values, {
+				singleLegacy: async () => {
+					await runDiff(resolveViewContainerConfig(ctx.values));
+				},
+				singleApp: async (app, projectConfig) => {
+					await runDiff(resolveViewAppContainerConfig(app, projectConfig, ctx.values));
+				},
+				multiApp: async (plan, projectConfig) => {
+					await runMultiAppWithFailCheck(plan, async (app) => {
+						printAppHeader(app.name, app.appId);
+						await runDiff(resolveViewAppContainerConfig(app, projectConfig, ctx.values));
+					}, "All view diffs completed successfully.");
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
+//#endregion
+//#region src/cli/commands/view/pull.ts
+var pull_default = createPullCommand({
+	description: "Pull remote views into the local view config (3-way merge)",
+	args: viewArgs,
+	subject: "view config",
+	conflictNoun: "view",
+	createContainer: createViewCliContainer,
+	pullFn: async ({ container, input }) => {
+		const result = await pullView({
+			container,
+			input
+		});
+		if (result.mode === "merged") return {
+			mode: "merged",
+			merged: result
+		};
+		return { mode: result.mode };
+	},
+	getMergeView: (merged) => ({
+		hasConflict: merged.merge.hasConflict,
+		conflicts: merged.merge.conflicts
+	}),
+	applyMerge: async ({ container, merged, resolution }) => {
+		await applyPulledViewMerge({
+			container,
+			input: {
+				merge: merged.merge,
+				resolution,
+				remoteConfig: merged.remoteConfig,
+				remoteRevision: merged.remoteRevision
+			}
+		});
+	},
+	resolveContainerConfig: resolveViewContainerConfig,
+	resolveAppContainerConfig: resolveViewAppContainerConfig
+});
+//#endregion
+//#region src/cli/commands/view/push.ts
+var push_default = createPushCommand({
+	description: "Push the local view config to kintone (with drift detection)",
+	args: viewArgs,
+	subject: "view config",
+	spinnerStopMessage: "Views pushed to preview.",
+	createContainer: createViewCliContainer,
+	pushFn: pushView,
+	toctouMessage: "The remote changed while applying. Run `view pull` and retry.",
+	onResult: (result) => {
+		if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
+		if (result.skippedBuiltinViews.length > 0) p.log.warn(`Skipped builtin views (cannot be updated): ${result.skippedBuiltinViews.join(", ")}`);
+	},
+	resolveContainerConfig: resolveViewContainerConfig,
+	resolveAppContainerConfig: resolveViewAppContainerConfig
+});
 //#endregion
 //#region src/cli/commands/view/index.ts
 var view_default = define({
@@ -18983,81 +19210,9 @@ var view_default = define({
 	subCommands: {
 		apply: apply_default,
 		capture: capture_default,
-		diff: define({
-			name: "diff",
-			description: "Compare local view config with remote kintone app (3-way)",
-			args: viewArgs,
-			run: async (ctx) => {
-				try {
-					await routeMultiApp(ctx.values, {
-						singleLegacy: async () => {
-							await runDiff(resolveViewContainerConfig(ctx.values));
-						},
-						singleApp: async (app, projectConfig) => {
-							await runDiff(resolveViewAppContainerConfig(app, projectConfig, ctx.values));
-						},
-						multiApp: async (plan, projectConfig) => {
-							await runMultiAppWithFailCheck(plan, async (app) => {
-								printAppHeader(app.name, app.appId);
-								await runDiff(resolveViewAppContainerConfig(app, projectConfig, ctx.values));
-							}, "All view diffs completed successfully.");
-						}
-					});
-				} catch (error) {
-					handleCliError(error);
-				}
-			}
-		}),
-		pull: createPullCommand({
-			description: "Pull remote views into the local view config (3-way merge)",
-			args: viewArgs,
-			subject: "view config",
-			conflictNoun: "view",
-			createContainer: createViewCliContainer,
-			pullFn: async ({ container, input }) => {
-				const result = await pullView({
-					container,
-					input
-				});
-				if (result.mode === "merged") return {
-					mode: "merged",
-					merged: result
-				};
-				return { mode: result.mode };
-			},
-			getMergeView: (merged) => ({
-				hasConflict: merged.merge.hasConflict,
-				conflicts: merged.merge.conflicts
-			}),
-			applyMerge: async ({ container, merged, resolution }) => {
-				await applyPulledViewMerge({
-					container,
-					input: {
-						merge: merged.merge,
-						resolution,
-						remoteConfig: merged.remoteConfig,
-						remoteRevision: merged.remoteRevision
-					}
-				});
-			},
-			resolveContainerConfig: resolveViewContainerConfig,
-			resolveAppContainerConfig: resolveViewAppContainerConfig
-		}),
-		push: createPushCommand({
-			description: "Push the local view config to kintone (with drift detection)",
-			args: viewArgs,
-			subject: "view config",
-			spinnerStopMessage: "Views pushed to preview.",
-			createContainer: createViewCliContainer,
-			pushFn: pushView,
-			toctouMessage: "The remote changed while applying. Run `view pull` and retry.",
-			onResult: (result) => {
-				if (result.mode === "firstTime") p.log.warn("No base snapshot found. Applied without drift guard and initialized state.");
-				if (result.skippedBuiltinViews.length > 0) p.log.warn(`Skipped builtin views (cannot be updated): ${result.skippedBuiltinViews.join(", ")}`);
-			},
-			resolveContainerConfig: resolveViewContainerConfig,
-			resolveAppContainerConfig: resolveViewAppContainerConfig
-		})
+		diff: diff_default,
+		pull: pull_default,
+		push: push_default
 	},
 	run: () => {}
 });