kintone-migrator 0.35.2 → 0.35.4

package/dist/index.mjs

@@ -121,7 +121,6 @@ const ProcessManagementErrorCode = {
 	PmInvalidEntityType: "PM_INVALID_ENTITY_TYPE",
 	PmInvalidBooleanField: "PM_INVALID_BOOLEAN_FIELD",
 	PmInvalidActionReference: "PM_INVALID_ACTION_REFERENCE",
-	PmDuplicateActionName: "PM_DUPLICATE_ACTION_NAME",
 	PmUnresolvedConflict: "PM_UNRESOLVED_CONFLICT"
 };
 //#endregion
@@ -6600,6 +6599,13 @@ const VALID_ENTITY_TYPES$5 = /* @__PURE__ */ new Set([
 function isNotificationEntityType(value) {
 	return VALID_ENTITY_TYPES$5.has(value);
 }
+/**
+* Normalizes a reminder timezone read at a boundary (kintone API or config
+* file) to the domain form: `null` and `""` mean unset (`undefined`).
+*/
+function normalizeReminderTimezone(value) {
+	return value === null || value === "" ? void 0 : value;
+}
 //#endregion
 //#region src/core/domain/notification/services/configParser.ts
 const REMINDER_OFFSET_MIN = -1e4;
@@ -6695,10 +6701,13 @@ function parseReminderConfig(raw) {
 	if (!isRecord(raw)) throw new BusinessRuleError(NotificationErrorCode.NtInvalidConfigStructure, "\"reminder\" must be an object");
 	if (!Array.isArray(raw.notifications)) throw new BusinessRuleError(NotificationErrorCode.NtInvalidConfigStructure, "\"reminder\" must have a \"notifications\" array");
 	const notifications = raw.notifications.map((item, i) => parseReminderNotification(item, i));
-	return {
-		timezone: typeof raw.timezone === "string" ? raw.timezone : "Asia/Tokyo",
+	const rawTimezone = raw.timezone ?? null;
+	if (rawTimezone !== null && typeof rawTimezone !== "string") throw new BusinessRuleError(NotificationErrorCode.NtInvalidConfigStructure, `"reminder" has non-string "timezone": ${String(rawTimezone)}`);
+	const timezone = normalizeReminderTimezone(rawTimezone);
+	return timezone !== void 0 ? {
+		timezone,
 		notifications
-	};
+	} : { notifications };
 }
 const NotificationConfigParser = { parse: (parsed) => {
 	const obj = validateParsedConfig(parsed, NotificationErrorCode.NtInvalidConfigStructure, "Notification");
@@ -6747,8 +6756,7 @@ async function applyNotification({ container }) {
 	if (config.reminder !== void 0) {
 		const currentReminder = await container.notificationConfigurator.getReminderNotifications();
 		await container.notificationConfigurator.updateReminderNotifications({
-			timezone: config.reminder.timezone,
-			notifications: config.reminder.notifications,
+			...config.reminder,
 			revision: currentReminder.revision
 		});
 	}
@@ -6811,6 +6819,16 @@ async function applyPlugin({ container }) {
 	};
 }
 //#endregion
+//#region src/core/domain/processManagement/valueObject.ts
+/**
+* Human-readable label of an action, e.g. `申請する (未申請 → 部長承認待ち)`.
+* The name alone is ambiguous: kintone allows several actions with the same
+* name, both from different states and as conditional branches from one state.
+*/
+function describeProcessAction(action) {
+	return `${action.name} (${action.from} → ${action.to})`;
+}
+//#endregion
 //#region src/core/domain/processManagement/services/configParser.ts
 const VALID_ASSIGNEE_TYPES$1 = /* @__PURE__ */ new Set([
 	"ONE",
@@ -6890,15 +6908,10 @@ const ProcessManagementConfigParser = { parse: (parsed) => {
 	for (const [name, value] of Object.entries(rawStates)) states[name] = parseState(value, name);
 	if (!Array.isArray(obj.actions) && obj.actions !== void 0) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidConfigStructure, "Config \"actions\" must be an array");
 	const actions = (Array.isArray(obj.actions) ? obj.actions : []).map((item, i) => parseAction(item, i));
-	const actionNames = /* @__PURE__ */ new Set();
-	for (const action of actions) {
-		if (actionNames.has(action.name)) throw new BusinessRuleError(ProcessManagementErrorCode.PmDuplicateActionName, `Duplicate action name: "${action.name}"`);
-		actionNames.add(action.name);
-	}
 	const stateNames = new Set(Object.keys(states));
 	for (const action of actions) {
-		if (!stateNames.has(action.from)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${action.name}" references unknown "from" state: "${action.from}"`);
-		if (!stateNames.has(action.to)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${action.name}" references unknown "to" state: "${action.to}"`);
+		if (!stateNames.has(action.from)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${describeProcessAction(action)}" references unknown "from" state: "${action.from}"`);
+		if (!stateNames.has(action.to)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${describeProcessAction(action)}" references unknown "to" state: "${action.to}"`);
 	}
 	return {
 		enable,
@@ -8241,8 +8254,11 @@ var KintoneNotificationConfigurator = class {
 				preview: true
 			});
 			const notifications = response.notifications.map(fromKintoneReminderNotification);
+			const rawTimezone = response.timezone ?? null;
+			if (rawTimezone !== null && typeof rawTimezone !== "string") throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected reminder timezone from kintone API: ${String(rawTimezone)}`);
+			const timezone = normalizeReminderTimezone(rawTimezone);
 			return {
-				timezone: response.timezone,
+				...timezone !== void 0 ? { timezone } : {},
 				notifications,
 				revision: response.revision
 			};
@@ -8254,9 +8270,9 @@ var KintoneNotificationConfigurator = class {
 		try {
 			const requestParams = {
 				app: this.appId,
-				timezone: params.timezone,
 				notifications: params.notifications.map(toKintoneReminderNotification)
 			};
+			if (params.timezone !== void 0) requestParams.timezone = params.timezone;
 			if (params.revision !== void 0) requestParams.revision = params.revision;
 			return { revision: (await this.client.app.updateReminderNotifications(requestParams)).revision };
 		} catch (error) {
@@ -9363,6 +9379,56 @@ function groupByKey(items, keyFn) {
 	return map;
 }
 //#endregion
+//#region src/lib/pairByKeyInOrder.ts
+/**
+* Pairs local and remote items by key. Items sharing a key are matched by
+* their order of appearance, so the n-th local item with a key pairs with the
+* n-th remote item with that key.
+*
+* Pairs are returned grouped by key: keys in local first-appearance order,
+* then remote-only keys in remote first-appearance order.
+*/
+function pairByKeyInOrder(local, remote, keyFn) {
+	const localGroups = groupByKey(local, keyFn);
+	const remoteGroups = groupByKey(remote, keyFn);
+	const pairs = [];
+	for (const [key, localItems] of localGroups) {
+		const remoteItems = remoteGroups.get(key) ?? [];
+		const length = Math.max(localItems.length, remoteItems.length);
+		for (let index = 0; index < length; index++) if (index >= remoteItems.length) pairs.push({
+			kind: "localOnly",
+			key,
+			index,
+			local: localItems[index]
+		});
+		else if (index >= localItems.length) pairs.push({
+			kind: "remoteOnly",
+			key,
+			index,
+			remote: remoteItems[index]
+		});
+		else pairs.push({
+			kind: "both",
+			key,
+			index,
+			local: localItems[index],
+			remote: remoteItems[index]
+		});
+	}
+	for (const [key, remoteItems] of remoteGroups) {
+		if (localGroups.has(key)) continue;
+		remoteItems.forEach((remoteItem, index) => {
+			pairs.push({
+				kind: "remoteOnly",
+				key,
+				index,
+				remote: remoteItem
+			});
+		});
+	}
+	return pairs;
+}
+//#endregion
 //#region src/core/domain/notification/services/diffDetector.ts
 function serializeEntity$1(entity) {
 	return `${entity.type}:${entity.code}`;
@@ -9416,14 +9482,6 @@ function compareGeneralSection(local, remote) {
 	});
 	return entries;
 }
-/**
-* Groups per-record notifications by filterCond. Multiple notifications can share
-* the same filterCond, so notifications within a group are compared by position
-* (index-based matching).
-*/
-function buildPerRecordMultiMap(notifications) {
-	return groupByKey(notifications, (n) => n.filterCond);
-}
 function perRecordLabel(notif) {
 	return notif.title || notif.filterCond || "(empty filter)";
 }
@@ -9445,43 +9503,30 @@ function describeReminderChanges(local, remote) {
 }
 function comparePerRecordSection(local, remote) {
 	const entries = [];
-	const localMulti = buildPerRecordMultiMap(local);
-	const remoteMulti = buildPerRecordMultiMap(remote);
-	for (const [key, localNotifs] of localMulti) {
-		const remoteNotifs = remoteMulti.get(key) ?? [];
-		const maxLen = Math.max(localNotifs.length, remoteNotifs.length);
-		for (let i = 0; i < maxLen; i++) {
-			const localNotif = localNotifs[i];
-			const remoteNotif = remoteNotifs[i];
-			if (localNotif && !remoteNotif) entries.push({
+	for (const pair of pairByKeyInOrder(local, remote, (n) => n.filterCond)) switch (pair.kind) {
+		case "localOnly":
+			entries.push({
 				type: "added",
 				section: "perRecord",
-				name: perRecordLabel(localNotif),
+				name: perRecordLabel(pair.local),
 				details: "new notification"
 			});
-			else if (!localNotif && remoteNotif) entries.push({
+			break;
+		case "remoteOnly":
+			entries.push({
 				type: "deleted",
 				section: "perRecord",
-				name: perRecordLabel(remoteNotif),
+				name: perRecordLabel(pair.remote),
 				details: "removed"
 			});
-			else if (localNotif && remoteNotif && !deepEqual(localNotif, remoteNotif)) {
-				const diffs = describePerRecordChanges(localNotif, remoteNotif);
-				entries.push({
-					type: "modified",
-					section: "perRecord",
-					name: perRecordLabel(localNotif),
-					details: diffs
-				});
-			}
-		}
+			break;
+		case "both": if (!deepEqual(pair.local, pair.remote)) entries.push({
+			type: "modified",
+			section: "perRecord",
+			name: perRecordLabel(pair.local),
+			details: describePerRecordChanges(pair.local, pair.remote)
+		});
 	}
-	for (const [key, remoteNotifs] of remoteMulti) if (!localMulti.has(key)) for (const remoteNotif of remoteNotifs) entries.push({
-		type: "deleted",
-		section: "perRecord",
-		name: perRecordLabel(remoteNotif),
-		details: "removed"
-	});
 	return entries;
 }
 function compareReminderSection(local, remote) {
@@ -9531,11 +9576,11 @@ const NotificationDiffDetector = { detect: (local, remote) => {
 	entries.push(...comparePerRecordSection(localPerRecord, remotePerRecord));
 	if (local.reminder && remote.reminder) {
 		entries.push(...compareReminderSection(local.reminder.notifications, remote.reminder.notifications));
-		if (local.reminder.timezone !== remote.reminder.timezone) entries.push({
+		if (local.reminder.timezone !== void 0 && local.reminder.timezone !== remote.reminder.timezone) entries.push({
 			type: "modified",
 			section: "reminder",
 			name: "timezone",
-			details: `${remote.reminder.timezone} -> ${local.reminder.timezone}`
+			details: `${remote.reminder.timezone ?? "(unset)"} -> ${local.reminder.timezone}`
 		});
 	} else if (local.reminder && !remote.reminder) entries.push({
 		type: "added",
@@ -9552,28 +9597,46 @@ const NotificationDiffDetector = { detect: (local, remote) => {
 	return buildDiffResult(entries);
 } };
 //#endregion
-//#region src/core/application/notification/detectNotificationDiff.ts
-async function detectNotificationDiff({ container }) {
-	const [storageResult, generalResult, perRecordResult, reminderResult] = await Promise.all([
-		container.notificationStorage.get(),
+//#region src/core/application/notification/loadNotificationRemote.ts
+/**
+* Fetches the three remote sub-configs (general / perRecord / reminder) and
+* bundles them into a single {@link NotificationRemote}.
+*
+* The three getters each carry the app (preview) revision; since the revision is
+* app-scoped and the three are fetched at (essentially) the same moment, the
+* general getter's revision is used as the observed remote revision for the
+* TOCTOU guard. kintone always returns all three sections, so the bundled config
+* always has `general` / `perRecord` / `reminder` defined (an unset reminder
+* timezone stays absent).
+*/
+async function loadNotificationRemote(container) {
+	const [general, perRecord, reminder] = await Promise.all([
 		container.notificationConfigurator.getGeneralNotifications(),
 		container.notificationConfigurator.getPerRecordNotifications(),
 		container.notificationConfigurator.getReminderNotifications()
 	]);
-	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Notification config file not found");
-	const localConfig = parseNotificationConfigText(container.configCodec, storageResult.content);
-	const remoteConfig = {
-		general: {
-			notifyToCommenter: generalResult.notifyToCommenter,
-			notifications: generalResult.notifications
+	return {
+		config: {
+			general: {
+				notifyToCommenter: general.notifyToCommenter,
+				notifications: general.notifications
+			},
+			perRecord: perRecord.notifications,
+			reminder: {
+				...reminder.timezone !== void 0 ? { timezone: reminder.timezone } : {},
+				notifications: reminder.notifications
+			}
 		},
-		perRecord: perRecordResult.notifications,
-		reminder: {
-			timezone: reminderResult.timezone,
-			notifications: reminderResult.notifications
-		}
+		revision: general.revision
 	};
-	return NotificationDiffDetector.detect(localConfig, remoteConfig);
+}
+//#endregion
+//#region src/core/application/notification/detectNotificationDiff.ts
+async function detectNotificationDiff({ container }) {
+	const [storageResult, remote] = await Promise.all([container.notificationStorage.get(), loadNotificationRemote(container)]);
+	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Notification config file not found");
+	const localConfig = parseNotificationConfigText(container.configCodec, storageResult.content);
+	return NotificationDiffDetector.detect(localConfig, remote.config);
 }
 //#endregion
 //#region src/core/domain/plugin/services/diffDetector.ts
@@ -9637,8 +9700,6 @@ function isExecutableUserEqual(a, b) {
 }
 function compareActions(localAction, remoteAction) {
 	const diffs = [];
-	if (localAction.from !== remoteAction.from) diffs.push(`from: ${remoteAction.from} -> ${localAction.from}`);
-	if (localAction.to !== remoteAction.to) diffs.push(`to: ${remoteAction.to} -> ${localAction.to}`);
 	if (localAction.filterCond !== remoteAction.filterCond) diffs.push(`filterCond: "${remoteAction.filterCond}" -> "${localAction.filterCond}"`);
 	if (localAction.type !== remoteAction.type) diffs.push(`type: ${remoteAction.type} -> ${localAction.type}`);
 	if (!isExecutableUserEqual(localAction.executableUser, remoteAction.executableUser)) diffs.push(`executableUser: ${formatValue(remoteAction.executableUser)} -> ${formatValue(localAction.executableUser)}`);
@@ -9674,33 +9735,52 @@ function compareStates(local, remote, entries) {
 		details: `assignee: ${remote.states[name].assignee.type}`
 	});
 }
+/**
+* Identifies an action by name + from + to. kintone allows same-named actions
+* both from different states and as conditional branches from one state.
+* Repeats of the whole triple are not rejected either, so actions sharing a
+* triple are told apart by their order of appearance.
+*/
+function transitionKey(action) {
+	return JSON.stringify([
+		action.name,
+		action.from,
+		action.to
+	]);
+}
+function actionLabel(action, index) {
+	const label = describeProcessAction(action);
+	return index === 0 ? label : `${label} #${index + 1}`;
+}
 function compareActionEntries(local, remote, entries) {
-	const localActionMap = new Map(local.actions.map((a) => [a.name, a]));
-	const remoteActionMap = new Map(remote.actions.map((a) => [a.name, a]));
-	for (const [name, localAction] of localActionMap) {
-		const remoteAction = remoteActionMap.get(name);
-		if (!remoteAction) entries.push({
-			type: "added",
-			category: "action",
-			name,
-			details: `${localAction.from} -> ${localAction.to}`
-		});
-		else {
-			const actionDiffs = compareActions(localAction, remoteAction);
+	for (const pair of pairByKeyInOrder(local.actions, remote.actions, transitionKey)) switch (pair.kind) {
+		case "localOnly":
+			entries.push({
+				type: "added",
+				category: "action",
+				name: actionLabel(pair.local, pair.index),
+				details: `filterCond: "${pair.local.filterCond}"`
+			});
+			break;
+		case "remoteOnly":
+			entries.push({
+				type: "deleted",
+				category: "action",
+				name: actionLabel(pair.remote, pair.index),
+				details: `filterCond: "${pair.remote.filterCond}"`
+			});
+			break;
+		case "both": {
+			const actionDiffs = compareActions(pair.local, pair.remote);
 			if (actionDiffs.length > 0) entries.push({
 				type: "modified",
 				category: "action",
-				name,
+				name: actionLabel(pair.local, pair.index),
 				details: actionDiffs.join("\n")
 			});
+			break;
 		}
 	}
-	for (const [name, remoteAction] of remoteActionMap) if (!localActionMap.has(name)) entries.push({
-		type: "deleted",
-		category: "action",
-		name,
-		details: `${remoteAction.from} -> ${remoteAction.to}`
-	});
 }
 function compareConfigs(local, remote) {
 	const entries = [];
@@ -9758,24 +9838,27 @@ function describeRight(right) {
 	});
 	return perEntity.length > 0 ? perEntity.join(", ") : "no entities";
 }
-function compareRightsForFilter(filterCond, localRights, remoteRights, entries) {
-	const maxLen = Math.max(localRights.length, remoteRights.length);
-	for (let i = 0; i < maxLen; i++) {
-		const localRight = localRights[i];
-		const remoteRight = remoteRights[i];
-		if (localRight && !remoteRight) entries.push({
-			type: "added",
-			filterCond,
-			details: describeRight(localRight)
-		});
-		else if (!localRight && remoteRight) entries.push({
-			type: "deleted",
-			filterCond,
-			details: describeRight(remoteRight)
-		});
-		else if (localRight && remoteRight) {
-			if (!isRightEqual(localRight, remoteRight)) {
-				const detail = localRight.entities.length !== remoteRight.entities.length ? `entities: ${remoteRight.entities.length} -> ${localRight.entities.length}` : `entities: ${describeRight(remoteRight)} -> ${describeRight(localRight)}`;
+const RecordPermissionDiffDetector = { detect: (local, remote) => {
+	const entries = [];
+	for (const pair of pairByKeyInOrder(local.rights, remote.rights, (r) => r.filterCond)) {
+		const filterCond = pair.key;
+		switch (pair.kind) {
+			case "localOnly":
+				entries.push({
+					type: "added",
+					filterCond,
+					details: describeRight(pair.local)
+				});
+				break;
+			case "remoteOnly":
+				entries.push({
+					type: "deleted",
+					filterCond,
+					details: describeRight(pair.remote)
+				});
+				break;
+			case "both": if (!isRightEqual(pair.local, pair.remote)) {
+				const detail = pair.local.entities.length !== pair.remote.entities.length ? `entities: ${pair.remote.entities.length} -> ${pair.local.entities.length}` : `entities: ${describeRight(pair.remote)} -> ${describeRight(pair.local)}`;
 				entries.push({
 					type: "modified",
 					filterCond,
@@ -9784,17 +9867,6 @@ function compareRightsForFilter(filterCond, localRights, remoteRights, entries)
 			}
 		}
 	}
-}
-const RecordPermissionDiffDetector = { detect: (local, remote) => {
-	const entries = [];
-	const localMulti = groupByKey(local.rights, (r) => r.filterCond);
-	const remoteMulti = groupByKey(remote.rights, (r) => r.filterCond);
-	for (const [filterCond, localRights] of localMulti) compareRightsForFilter(filterCond, localRights, remoteMulti.get(filterCond) ?? [], entries);
-	for (const [filterCond, remoteRights] of remoteMulti) if (!localMulti.has(filterCond)) for (const remoteRight of remoteRights) entries.push({
-		type: "deleted",
-		filterCond,
-		details: describeRight(remoteRight)
-	});
 	return buildDiffResult(entries);
 } };
 //#endregion
@@ -11167,7 +11239,7 @@ const NotificationConfigSerializer = { serialize: (config) => {
 	};
 	if (config.perRecord !== void 0) serialized.perRecord = config.perRecord.map(serializePerRecordNotification);
 	if (config.reminder !== void 0) serialized.reminder = {
-		timezone: config.reminder.timezone,
+		...config.reminder.timezone !== void 0 ? { timezone: config.reminder.timezone } : {},
 		notifications: config.reminder.notifications.map(serializeReminderNotification)
 	};
 	return serialized;
@@ -11175,22 +11247,7 @@ const NotificationConfigSerializer = { serialize: (config) => {
 //#endregion
 //#region src/core/application/notification/captureNotification.ts
 async function captureNotification({ container }) {
-	const [general, perRecord, reminder] = await Promise.all([
-		container.notificationConfigurator.getGeneralNotifications(),
-		container.notificationConfigurator.getPerRecordNotifications(),
-		container.notificationConfigurator.getReminderNotifications()
-	]);
-	const config = {
-		general: {
-			notifyToCommenter: general.notifyToCommenter,
-			notifications: general.notifications
-		},
-		perRecord: perRecord.notifications,
-		reminder: {
-			timezone: reminder.timezone,
-			notifications: reminder.notifications
-		}
-	};
+	const { config } = await loadNotificationRemote(container);
 	return {
 		configText: stringifyConfig(container.configCodec, NotificationConfigSerializer.serialize(config)),
 		hasExistingConfig: (await container.notificationStorage.get()).exists
@@ -13758,7 +13815,8 @@ var capture_default$8 = createCaptureCommand({
 * conflict-resolution namespace:
 *
 * - **reminder** = `code` stable key (`compareReminderSection`, diffDetector
-*   reminder map). Plus the `timezone` scalar as a single whole-entity 3-way.
+*   reminder map). Plus the `timezone` scalar as a single whole-entity 3-way
+*   when the local config manages it (sets a timezone).
 * - **perRecord** = group by `filterCond`, then within a group match by index
 *   (`filterCond#i` composite key — `comparePerRecordSection`). `perRecordLabel`
 *   is display-only and is NOT used as a match key.
@@ -13821,7 +13879,7 @@ function computeNotificationThreeWayMerge(base, local, remote) {
 	const perRecord = classifyThreeWay(buildPerRecordMap(base.perRecord), buildPerRecordMap(local.perRecord), buildPerRecordMap(remote.perRecord), isPerRecordEqual);
 	const reminder = classifyThreeWay(buildReminderMap(base.reminder), buildReminderMap(local.reminder), buildReminderMap(remote.reminder), isReminderEqual);
 	const generalScalar = computeSingleThreeWayMerge(base.general?.notifyToCommenter ?? false, local.general?.notifyToCommenter ?? false, remote.general?.notifyToCommenter ?? false, (a, b) => a === b);
-	const reminderTimezone = computeSingleThreeWayMerge(base.reminder?.timezone ?? "", local.reminder?.timezone ?? "", remote.reminder?.timezone ?? "", (a, b) => a === b);
+	const reminderTimezone = local.reminder?.timezone !== void 0 ? computeSingleThreeWayMerge(base.reminder?.timezone ?? null, local.reminder.timezone, remote.reminder?.timezone ?? null, (a, b) => a === b) : void 0;
 	const entries = [
 		...general.entries,
 		...perRecord.entries,
@@ -13832,12 +13890,12 @@ function computeNotificationThreeWayMerge(base, local, remote) {
 		...perRecord.conflicts.map((e) => ({ key: e.key })),
 		...reminder.conflicts.map((e) => ({ key: e.key })),
 		...scalarConflictKey(generalScalar, GENERAL_SCALAR_KEY),
-		...scalarConflictKey(reminderTimezone, REMINDER_TIMEZONE_KEY)
+		...reminderTimezone !== void 0 ? scalarConflictKey(reminderTimezone, REMINDER_TIMEZONE_KEY) : []
 	];
 	return {
 		entries,
 		generalScalar,
-		reminderTimezone,
+		...reminderTimezone !== void 0 ? { reminderTimezone } : {},
 		conflicts,
 		hasConflict: conflicts.length > 0
 	};
@@ -13887,7 +13945,7 @@ function collectReminderNotifications(entries, resolution) {
 */
 function resolveNotificationMerge(merge, resolution) {
 	const notifyToCommenter = resolveSingleMerge(merge.generalScalar, resolution.get(GENERAL_SCALAR_KEY), NotificationErrorCode.NtUnresolvedConflict);
-	const timezone = resolveSingleMerge(merge.reminderTimezone, resolution.get(REMINDER_TIMEZONE_KEY), NotificationErrorCode.NtUnresolvedConflict);
+	const timezone = merge.reminderTimezone !== void 0 ? resolveSingleMerge(merge.reminderTimezone, resolution.get(REMINDER_TIMEZONE_KEY), NotificationErrorCode.NtUnresolvedConflict) : null;
 	return {
 		general: {
 			notifyToCommenter,
@@ -13895,7 +13953,7 @@ function resolveNotificationMerge(merge, resolution) {
 		},
 		perRecord: collectPerRecordNotifications(merge.entries, resolution),
 		reminder: {
-			timezone,
+			...timezone !== null ? { timezone } : {},
 			notifications: collectReminderNotifications(merge.entries, resolution)
 		}
 	};
@@ -13914,37 +13972,6 @@ const NotificationStateParser = { parse: (parsed) => ({ config: NotificationConf
 //#endregion
 //#region src/core/application/notification/loadNotificationThreeWayInputs.ts
 /**
-* Fetches the three remote sub-configs (general / perRecord / reminder) and
-* bundles them into a single {@link NotificationRemote}.
-*
-* The three getters each carry the app (preview) revision; since the revision is
-* app-scoped and the three are fetched at (essentially) the same moment, the
-* general getter's revision is used as the observed remote revision for the
-* TOCTOU guard. kintone always returns all three sections, so the bundled config
-* always has `general` / `perRecord` / `reminder` defined.
-*/
-async function loadNotificationRemote(container) {
-	const [general, perRecord, reminder] = await Promise.all([
-		container.notificationConfigurator.getGeneralNotifications(),
-		container.notificationConfigurator.getPerRecordNotifications(),
-		container.notificationConfigurator.getReminderNotifications()
-	]);
-	return {
-		config: {
-			general: {
-				notifyToCommenter: general.notifyToCommenter,
-				notifications: general.notifications
-			},
-			perRecord: perRecord.notifications,
-			reminder: {
-				timezone: reminder.timezone,
-				notifications: reminder.notifications
-			}
-		},
-		revision: general.revision
-	};
-}
-/**
 * Loads the four inputs of a 3-way notification sync (base snapshot, base app
 * revision, local YAML, remote config + revision) via the generic
 * {@link loadThreeWayInputs}. Notification bundles three sub-configs into one
@@ -14047,7 +14074,7 @@ function buildThreeWay(merge) {
 		}
 	}
 	pushScalar(merge.generalScalar, "general:notifyToCommenter", "notifyToCommenter", localChanges, remoteDrift, conflicts, extras);
-	pushScalar(merge.reminderTimezone, "reminder:timezone", "timezone", localChanges, remoteDrift, conflicts, extras);
+	if (merge.reminderTimezone !== void 0) pushScalar(merge.reminderTimezone, "reminder:timezone", "timezone", localChanges, remoteDrift, conflicts, extras);
 	return {
 		mode: "three-way",
 		localChanges,
@@ -14270,7 +14297,7 @@ async function pushNotification({ container, input }) {
 			return false;
 		};
 		const isDriftKind = (kind) => kind === "remoteOnly" || kind === "conflict";
-		if (merge.entries.some((e) => isManaged(e.key) && isDriftKind(e.change.kind)) || local.general !== void 0 && isDriftKind(merge.generalScalar.change.kind) || local.reminder !== void 0 && isDriftKind(merge.reminderTimezone.change.kind)) throw buildDriftConflict(NOTIFICATION_PULL_COMMAND);
+		if (merge.entries.some((e) => isManaged(e.key) && isDriftKind(e.change.kind)) || local.general !== void 0 && isDriftKind(merge.generalScalar.change.kind) || merge.reminderTimezone !== void 0 && isDriftKind(merge.reminderTimezone.change.kind)) throw buildDriftConflict(NOTIFICATION_PULL_COMMAND);
 	}
 	const sendRevision = !(input.force || firstTime);
 	let revision = remote.revision;
@@ -14296,11 +14323,14 @@ async function pushNotification({ container, input }) {
 	}
 	if (local.reminder !== void 0) {
 		revision = (await container.notificationConfigurator.updateReminderNotifications({
-			timezone: local.reminder.timezone,
-			notifications: local.reminder.notifications,
+			...local.reminder,
 			...sendRevision ? { revision } : {}
 		})).revision;
-		newBase.reminder = local.reminder;
+		const timezone = local.reminder.timezone ?? remote.config.reminder?.timezone;
+		newBase.reminder = {
+			...timezone !== void 0 ? { timezone } : {},
+			notifications: local.reminder.notifications
+		};
 	}
 	await saveNotificationSnapshotAndRevision(container, newBase, revision);
 	return {