kintone-migrator 0.35.3 → 0.35.5

package/dist/index.mjs

@@ -795,7 +795,7 @@ function compareActions$1(local, remote) {
 	const diffs = [];
 	if (local.index !== remote.index) diffs.push(`index: ${remote.index} -> ${local.index}`);
 	if (!deepEqual(local.destApp, remote.destApp)) diffs.push(`destApp: ${formatValue(remote.destApp)} -> ${formatValue(local.destApp)}`);
-	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: "${remote.filterCond}" -> "${local.filterCond}"`);
+	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: ${formatValue(remote.filterCond)} -> ${formatValue(local.filterCond)}`);
 	if (!deepEqual(local.mappings, remote.mappings)) diffs.push(`mappings: ${formatValue(remote.mappings)} -> ${formatValue(local.mappings)}`);
 	if (!deepEqual(local.entities, remote.entities)) diffs.push(`entities: ${formatValue(remote.entities)} -> ${formatValue(local.entities)}`);
 	return diffs;
@@ -1354,6 +1354,17 @@ const SKIP_REVISION_CHECK = Symbol("skip-revision-check");
 /** The generation read when a caller does not specify a target. */
 const DEFAULT_FORM_READ_TARGET = "preview";
 //#endregion
+//#region src/core/domain/formSchema/services/lookupListDecoder.ts
+/**
+* Reads a lookup list (`fieldMappings`, `lookupPickerFields`) from an external
+* value. kintone represents an unset list as `""`, which reads as the empty
+* list. Returns `undefined` when the value is not a list.
+*/
+function decodeLookupList(value) {
+	if (value === "") return [];
+	return Array.isArray(value) ? value : void 0;
+}
+//#endregion
 //#region src/lib/charValidation.ts
 /** Returns true if the string contains any control characters (0x00–0x1f or 0x7f). */
 function hasControlChars(s) {
@@ -1375,6 +1386,16 @@ function sanitizeForDisplay$1(s) {
 }
 //#endregion
 //#region src/core/domain/formSchema/valueObject.ts
+const LookupRelatedApp = { 
+/**
+* kintone returns `code: ""` for a related app without an app code, while a
+* schema leaves `code` out for the same app. Both build a related app
+* without `code`, so only a non-empty `code` is kept.
+*/
+create: (app, code) => code === void 0 || code === "" ? { app } : {
+	app,
+	code
+} };
 function hasInvalidFieldCodeChars(code) {
 	if (hasControlChars(code)) return true;
 	for (let i = 0; i < code.length; i++) {
@@ -1468,6 +1489,42 @@ function normalizeDefaultValue(type, rest) {
 		if (rest.defaultValue !== void 0 && typeof rest.defaultValue === "string") rest.defaultValue = rest.defaultValue === "" ? [] : [rest.defaultValue];
 	}
 }
+function readKintoneLookupList(value, fieldPath) {
+	const list = decodeLookupList(value);
+	if (list === void 0) throw new SystemError(SystemErrorCode.ExternalApiError, `Expected array at ${fieldPath}, got ${typeof value}`);
+	return list;
+}
+function fromKintoneLookup(value, fieldPath) {
+	assertRecord(value, fieldPath);
+	assertRecord(value.relatedApp, `${fieldPath}.relatedApp`);
+	const { app, code } = value.relatedApp;
+	assertString(app, `${fieldPath}.relatedApp.app`);
+	if (code !== void 0) assertString(code, `${fieldPath}.relatedApp.code`);
+	assertString(value.relatedKeyField, `${fieldPath}.relatedKeyField`);
+	const fieldMappings = readKintoneLookupList(value.fieldMappings, `${fieldPath}.fieldMappings`).map((mapping, i) => {
+		const mappingPath = `${fieldPath}.fieldMappings[${i}]`;
+		assertRecord(mapping, mappingPath);
+		assertString(mapping.field, `${mappingPath}.field`);
+		assertString(mapping.relatedField, `${mappingPath}.relatedField`);
+		return {
+			field: mapping.field,
+			relatedField: mapping.relatedField
+		};
+	});
+	const lookupPickerFields = readKintoneLookupList(value.lookupPickerFields, `${fieldPath}.lookupPickerFields`);
+	assertStringArray(lookupPickerFields, `${fieldPath}.lookupPickerFields`);
+	const { filterCond, sort } = value;
+	if (filterCond !== void 0) assertString(filterCond, `${fieldPath}.filterCond`);
+	if (sort !== void 0) assertString(sort, `${fieldPath}.sort`);
+	return {
+		relatedApp: LookupRelatedApp.create(app, code),
+		relatedKeyField: value.relatedKeyField,
+		fieldMappings,
+		lookupPickerFields,
+		...filterCond !== void 0 ? { filterCond } : {},
+		...sort !== void 0 ? { sort } : {}
+	};
+}
 function fromKintoneProperty(prop) {
 	const { type, code, label, noLabel, ...rest } = prop;
 	const base = {
@@ -1518,10 +1575,15 @@ function fromKintoneProperty(prop) {
 	}
 	if (!KNOWN_FIELD_TYPES.has(type)) throw new SystemError(SystemErrorCode.ExternalApiError, `Unknown field type: ${type}`);
 	normalizeDefaultValue(type, rest);
+	const { lookup, ...others } = rest;
+	const properties = lookup === void 0 ? others : {
+		...others,
+		lookup: fromKintoneLookup(lookup, `${type} "${code}".lookup`)
+	};
 	return {
 		...base,
 		type,
-		properties: rest
+		properties
 	};
 }
 function toKintoneProperty(field) {
@@ -4217,16 +4279,17 @@ async function applyAdminNotes({ container }) {
 //#endregion
 //#region src/core/domain/adminNotes/services/diffDetector.ts
 const CONTENT_TRUNCATE_LENGTH = 30;
-function truncate(text, maxLength) {
-	if (text.length <= maxLength) return text;
-	return `${text.slice(0, maxLength)}...`;
+function formatContentPreview(text, maxLength) {
+	const codePoints = Array.from(text);
+	if (codePoints.length <= maxLength) return formatValue(text);
+	return `${formatValue(codePoints.slice(0, maxLength).join(""))}...`;
 }
 function compareConfigs$2(local, remote) {
 	const entries = [];
 	if (local.content !== remote.content) entries.push({
 		type: "modified",
 		field: "content",
-		details: `"${truncate(remote.content, CONTENT_TRUNCATE_LENGTH)}" -> "${truncate(local.content, CONTENT_TRUNCATE_LENGTH)}"`
+		details: `${formatContentPreview(remote.content, CONTENT_TRUNCATE_LENGTH)} -> ${formatContentPreview(local.content, CONTENT_TRUNCATE_LENGTH)}`
 	});
 	if (local.includeInTemplateAndDuplicates !== remote.includeInTemplateAndDuplicates) entries.push({
 		type: "modified",
@@ -5923,6 +5986,9 @@ function validateLookupStructure(field) {
 	const issues = [];
 	if (lookup.relatedApp.app.trim().length === 0) issues.push(issue("error", field.code, field.type, "INVALID_LOOKUP", `Field "${field.code}" lookup must have a non-empty "relatedApp.app"`));
 	if (lookup.relatedKeyField.trim().length === 0) issues.push(issue("error", field.code, field.type, "INVALID_LOOKUP", `Field "${field.code}" lookup must have a non-empty "relatedKeyField"`));
+	lookup.fieldMappings.forEach((mapping, i) => {
+		for (const key of ["field", "relatedField"]) if (mapping[key].trim().length === 0) issues.push(issue("error", field.code, field.type, "INVALID_LOOKUP", `Field "${field.code}" lookup must have a non-empty "fieldMappings[${i}].${key}"`));
+	});
 	return issues;
 }
 function validateReferenceTableRelatedApp(field) {
@@ -6205,6 +6271,42 @@ function buildFieldDefinition(base, fieldType, properties) {
 		};
 	}
 }
+function invalidLookup(code, detail) {
+	return new BusinessRuleError(FormSchemaErrorCode.FsInvalidSchemaStructure, `Field "${code}" lookup ${detail}`);
+}
+function optionalString(value) {
+	return value === void 0 || value === null ? void 0 : String(value);
+}
+/** Reads a lookup list; an omitted or valueless list is the empty list. */
+function optionalLookupList(code, key, value) {
+	if (value === void 0 || value === null) return [];
+	const list = decodeLookupList(value);
+	if (list === void 0) throw invalidLookup(code, `must have a "${key}" array`);
+	return list;
+}
+function parseLookup(code, raw) {
+	if (!isRecord(raw)) throw invalidLookup(code, "must be an object");
+	if (!isRecord(raw.relatedApp)) throw invalidLookup(code, "must have a \"relatedApp\" object");
+	const rawFieldMappings = optionalLookupList(code, "fieldMappings", raw.fieldMappings);
+	const lookupPickerFields = optionalLookupList(code, "lookupPickerFields", raw.lookupPickerFields).map((f) => String(f));
+	const fieldMappings = rawFieldMappings.map((mapping) => {
+		if (!isRecord(mapping)) throw invalidLookup(code, "must have objects in \"fieldMappings\"");
+		return {
+			field: String(mapping.field ?? ""),
+			relatedField: String(mapping.relatedField ?? "")
+		};
+	});
+	const filterCond = optionalString(raw.filterCond);
+	const sort = optionalString(raw.sort);
+	return {
+		relatedApp: LookupRelatedApp.create(String(raw.relatedApp.app ?? ""), optionalString(raw.relatedApp.code)),
+		relatedKeyField: String(raw.relatedKeyField ?? ""),
+		fieldMappings,
+		lookupPickerFields,
+		...filterCond !== void 0 ? { filterCond } : {},
+		...sort !== void 0 ? { sort } : {}
+	};
+}
 function parseReferenceTableField(raw, code, base) {
 	if (!isRecord(raw.referenceTable)) throw new BusinessRuleError(FormSchemaErrorCode.FsInvalidSchemaStructure, `Field "${code}" of type REFERENCE_TABLE must have a "referenceTable" property`);
 	const refTable = raw.referenceTable;
@@ -6259,7 +6361,11 @@ function parseFieldDefinitionFromFlat(raw) {
 		};
 	}
 	if (fieldType === "REFERENCE_TABLE") return parseReferenceTableField(raw, code, base);
-	const properties = extractProperties(raw);
+	const { lookup, ...others } = extractProperties(raw);
+	const properties = lookup === void 0 ? others : {
+		...others,
+		lookup: parseLookup(code, lookup)
+	};
 	validateFieldProperties(code, fieldType, properties);
 	return buildFieldDefinition(base, fieldType, properties);
 }
@@ -6599,6 +6705,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;
@@ -6694,10 +6807,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");
@@ -6746,8 +6862,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
 		});
 	}
@@ -8245,8 +8360,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
 			};
@@ -8258,9 +8376,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) {
@@ -9294,7 +9412,7 @@ function compareConfigs$1(local, remote) {
 		if (lv !== rv) entries.push({
 			type: "modified",
 			field,
-			details: suppressValues ? `${field} changed` : `"${rv}" -> "${lv}"`
+			details: suppressValues ? `${field} changed` : `${formatValue(rv)} -> ${formatValue(lv)}`
 		});
 	}
 	function compareBoolean(field, l, r, defaultValue) {
@@ -9475,17 +9593,17 @@ function perRecordLabel(notif) {
 }
 function describePerRecordChanges(local, remote) {
 	const diffs = [];
-	if (local.title !== remote.title) diffs.push(`title: "${remote.title}" -> "${local.title}"`);
+	if (local.title !== remote.title) diffs.push(`title: ${formatValue(remote.title)} -> ${formatValue(local.title)}`);
 	if (!deepEqual(local.targets, remote.targets)) diffs.push(`targets: ${formatValue(remote.targets)} -> ${formatValue(local.targets)}`);
 	return diffs.length > 0 ? diffs.join("\n") : "changed";
 }
 function describeReminderChanges(local, remote) {
 	const diffs = [];
-	if (local.title !== remote.title) diffs.push(`title: "${remote.title}" -> "${local.title}"`);
+	if (local.title !== remote.title) diffs.push(`title: ${formatValue(remote.title)} -> ${formatValue(local.title)}`);
 	if (local.daysLater !== remote.daysLater) diffs.push(`daysLater: ${remote.daysLater} -> ${local.daysLater}`);
 	if ((local.hoursLater ?? 0) !== (remote.hoursLater ?? 0)) diffs.push(`hoursLater: ${remote.hoursLater ?? 0} -> ${local.hoursLater ?? 0}`);
-	if ((local.time ?? "") !== (remote.time ?? "")) diffs.push(`time: "${remote.time ?? ""}" -> "${local.time ?? ""}"`);
-	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: "${remote.filterCond}" -> "${local.filterCond}"`);
+	if ((local.time ?? "") !== (remote.time ?? "")) diffs.push(`time: ${formatValue(remote.time ?? "")} -> ${formatValue(local.time ?? "")}`);
+	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: ${formatValue(remote.filterCond)} -> ${formatValue(local.filterCond)}`);
 	if (!deepEqual(local.targets, remote.targets)) diffs.push(`targets: ${formatValue(remote.targets)} -> ${formatValue(local.targets)}`);
 	return diffs.length > 0 ? diffs.join("\n") : "changed";
 }
@@ -9527,7 +9645,7 @@ function compareReminderSection(local, remote) {
 			type: "added",
 			section: "reminder",
 			name: code,
-			details: `"${localNotif.title}"`
+			details: formatValue(localNotif.title)
 		});
 		else if (!deepEqual(localNotif, remoteNotif)) entries.push({
 			type: "modified",
@@ -9564,11 +9682,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",
@@ -9585,28 +9703,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
@@ -9619,11 +9755,11 @@ const PluginDiffDetector = { detect: (local, remote) => {
 		if (!remotePlugin) entries.push({
 			type: "added",
 			pluginId: id,
-			details: `"${localPlugin.name}"`
+			details: formatValue(localPlugin.name)
 		});
 		else {
 			const diffs = [];
-			if (localPlugin.name !== remotePlugin.name) diffs.push(`name: "${remotePlugin.name}" -> "${localPlugin.name}"`);
+			if (localPlugin.name !== remotePlugin.name) diffs.push(`name: ${formatValue(remotePlugin.name)} -> ${formatValue(localPlugin.name)}`);
 			if (localPlugin.enabled !== remotePlugin.enabled) diffs.push(`enabled: ${String(remotePlugin.enabled)} -> ${String(localPlugin.enabled)}`);
 			if (diffs.length > 0) entries.push({
 				type: "modified",
@@ -9635,7 +9771,7 @@ const PluginDiffDetector = { detect: (local, remote) => {
 	for (const [id, remotePlugin] of remoteMap) if (!localMap.has(id)) entries.push({
 		type: "deleted",
 		pluginId: id,
-		details: `"${remotePlugin.name}"`
+		details: formatValue(remotePlugin.name)
 	});
 	return buildDiffResult(entries);
 } };
@@ -9670,7 +9806,7 @@ function isExecutableUserEqual(a, b) {
 }
 function compareActions(localAction, remoteAction) {
 	const diffs = [];
-	if (localAction.filterCond !== remoteAction.filterCond) diffs.push(`filterCond: "${remoteAction.filterCond}" -> "${localAction.filterCond}"`);
+	if (localAction.filterCond !== remoteAction.filterCond) diffs.push(`filterCond: ${formatValue(remoteAction.filterCond)} -> ${formatValue(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)}`);
 	return diffs;
@@ -9729,7 +9865,7 @@ function compareActionEntries(local, remote, entries) {
 				type: "added",
 				category: "action",
 				name: actionLabel(pair.local, pair.index),
-				details: `filterCond: "${pair.local.filterCond}"`
+				details: `filterCond: ${formatValue(pair.local.filterCond)}`
 			});
 			break;
 		case "remoteOnly":
@@ -9737,7 +9873,7 @@ function compareActionEntries(local, remote, entries) {
 				type: "deleted",
 				category: "action",
 				name: actionLabel(pair.remote, pair.index),
-				details: `filterCond: "${pair.remote.filterCond}"`
+				details: `filterCond: ${formatValue(pair.remote.filterCond)}`
 			});
 			break;
 		case "both": {
@@ -9854,11 +9990,11 @@ async function detectRecordPermissionDiff({ container }) {
 //#region src/core/domain/report/services/diffDetector.ts
 function compareReports(local, remote) {
 	const diffs = [];
-	if (local.name !== remote.name) diffs.push(`name: "${remote.name}" -> "${local.name}"`);
+	if (local.name !== remote.name) diffs.push(`name: ${formatValue(remote.name)} -> ${formatValue(local.name)}`);
 	if (local.chartType !== remote.chartType) diffs.push(`chartType: ${remote.chartType} -> ${local.chartType}`);
 	if ((local.chartMode ?? "") !== (remote.chartMode ?? "")) diffs.push(`chartMode: ${remote.chartMode ?? "(unset)"} -> ${local.chartMode ?? "(unset)"}`);
 	if (local.index !== remote.index) diffs.push(`index: ${remote.index} -> ${local.index}`);
-	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: "${remote.filterCond}" -> "${local.filterCond}"`);
+	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: ${formatValue(remote.filterCond)} -> ${formatValue(local.filterCond)}`);
 	if (!deepEqual(local.groups, remote.groups)) diffs.push(`groups: ${formatValue(remote.groups)} -> ${formatValue(local.groups)}`);
 	if (!deepEqual(local.aggregations, remote.aggregations)) diffs.push(`aggregations: ${formatValue(remote.aggregations)} -> ${formatValue(local.aggregations)}`);
 	if (!deepEqual(local.sorts, remote.sorts)) diffs.push(`sorts: ${formatValue(remote.sorts)} -> ${formatValue(local.sorts)}`);
@@ -9901,7 +10037,7 @@ async function detectReportDiff({ container }) {
 //#endregion
 //#region src/core/domain/view/services/diffDetector.ts
 function checkOptionalStringChange(changes, field, localVal, remoteVal) {
-	if ((localVal ?? "") !== (remoteVal ?? "")) changes.push(`${field}: "${remoteVal ?? ""}" -> "${localVal ?? ""}"`);
+	if ((localVal ?? "") !== (remoteVal ?? "")) changes.push(`${field}: ${formatValue(remoteVal ?? "")} -> ${formatValue(localVal ?? "")}`);
 }
 function describeChanges(local, remote) {
 	const changes = [];
@@ -11209,7 +11345,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;
@@ -11217,22 +11353,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
@@ -13800,7 +13921,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.
@@ -13863,7 +13985,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,
@@ -13874,12 +13996,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
 	};
@@ -13929,7 +14051,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,
@@ -13937,7 +14059,7 @@ function resolveNotificationMerge(merge, resolution) {
 		},
 		perRecord: collectPerRecordNotifications(merge.entries, resolution),
 		reminder: {
-			timezone,
+			...timezone !== null ? { timezone } : {},
 			notifications: collectReminderNotifications(merge.entries, resolution)
 		}
 	};
@@ -13956,37 +14078,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
@@ -14089,7 +14180,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,
@@ -14312,7 +14403,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;
@@ -14338,11 +14429,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 {