kintone-migrator 0.24.5 → 0.24.6

package/dist/index.mjs

@@ -333,7 +333,8 @@ const SystemErrorCode = {
 	NetworkError: "NETWORK_ERROR",
 	StorageError: "STORAGE_ERROR",
 	DocumentGenerationError: "DOCUMENT_GENERATION_ERROR",
-	ExternalApiError: "EXTERNAL_API_ERROR"
+	ExternalApiError: "EXTERNAL_API_ERROR",
+	ExecutionError: "EXECUTION_ERROR"
 };
 var SystemError = class extends ApplicationError {
 	name = "SystemError";
@@ -1017,7 +1018,7 @@ function hasControlChars(s) {
 	return false;
 }
 /** Replaces control characters (0x00–0x1f, 0x7f) with escaped `\\xNN` representation for safe display. */
-function sanitizeForDisplay(s) {
+function sanitizeForDisplay$1(s) {
 	let result = "";
 	for (let i = 0; i < s.length; i++) {
 		const ch = s.charCodeAt(i);
@@ -1039,7 +1040,7 @@ function hasInvalidFieldCodeChars(code) {
 }
 const FieldCode = { create: (code) => {
 	if (code.length === 0) throw new BusinessRuleError(FormSchemaErrorCode.FsEmptyFieldCode, "Field code cannot be empty");
-	if (hasInvalidFieldCodeChars(code)) throw new BusinessRuleError(FormSchemaErrorCode.FsInvalidFieldCode, `Field code "${sanitizeForDisplay(code)}" contains invalid characters`);
+	if (hasInvalidFieldCodeChars(code)) throw new BusinessRuleError(FormSchemaErrorCode.FsInvalidFieldCode, `Field code "${sanitizeForDisplay$1(code)}" contains invalid characters`);
 	return code;
 } };
 
@@ -1885,7 +1886,7 @@ function hasInvalidAppNameChars(name) {
 }
 const AppName = { create: (name) => {
 	if (name.length === 0) throw new BusinessRuleError(ProjectConfigErrorCode.PcEmptyAppName, "App name cannot be empty");
-	if (hasInvalidAppNameChars(name)) throw new BusinessRuleError(ProjectConfigErrorCode.PcInvalidAppName, `App name "${sanitizeForDisplay(name)}" contains invalid characters (path separators or control characters are not allowed)`);
+	if (hasInvalidAppNameChars(name)) throw new BusinessRuleError(ProjectConfigErrorCode.PcInvalidAppName, `App name "${sanitizeForDisplay$1(name)}" contains invalid characters (path separators or control characters are not allowed)`);
 	if (name === "." || name === "..") throw new BusinessRuleError(ProjectConfigErrorCode.PcInvalidAppName, `App name "${name}" is not allowed (reserved path component)`);
 	return name;
 } };
@@ -2091,14 +2092,17 @@ function buildAppFilePaths(appName, baseDir) {
 	};
 }
 
-//#endregion
-//#region src/core/application/formSchema/deployApp.ts
-async function deployApp({ container }) {
-	await container.appDeployer.deploy();
-}
-
 //#endregion
 //#region src/cli/handleError.ts
+/**
+* Log error details without terminating the process.
+* Use this in contexts where multiple errors may be reported (e.g. multi-app results).
+*
+* Note: This function intentionally does NOT show the "Set VERBOSE=1 ..." hint.
+* The hint is only shown by `handleCliError`, which is the top-level CLI handler.
+* `logError` is used for per-app error reporting within multi-app runs where the
+* hint would be noisy if repeated for each failure.
+*/
 function logError(error) {
 	if (isBusinessRuleError(error)) {
 		p.log.error(`[BusinessRuleError] ${error.code}: ${error.message}`);
@@ -2107,11 +2111,14 @@ function logError(error) {
 	}
 	if (isValidationError(error)) {
 		p.log.error(`[ValidationError] ${error.code}: ${error.message}`);
+		p.log.warn("Hint: Please check your input values and configuration.");
 		logErrorDetails(error);
 		return;
 	}
 	if (isSystemError(error)) {
 		p.log.error(`[SystemError] ${error.code}: ${error.message}`);
+		const hint = systemErrorHints[error.code];
+		if (hint) p.log.warn(`Hint: ${hint}`);
 		logErrorDetails(error);
 		return;
 	}
@@ -2151,42 +2158,83 @@ function logError(error) {
 	}
 	p.log.error(`[Error] Unexpected error occurred: ${String(error)}`);
 }
+/**
+* Log error details and terminate the process with exit code 1.
+* Use this as the top-level error handler in CLI command `run` functions.
+*/
 function handleCliError(error) {
 	logError(error);
+	if (!isVerbose()) p.log.info("Set VERBOSE=1 for full stack traces.");
 	p.outro("Failed.");
 	process.exit(1);
 }
 function formatErrorForDisplay(error) {
-	if (error instanceof Error) return error.message;
-	if (typeof error === "object" && error !== null) return JSON.stringify(error, null, 2);
-	return String(error);
+	if (error instanceof Error) return sanitizeString(error.message);
+	if (typeof error === "object" && error !== null) return JSON.stringify(sanitizeForDisplay(error), null, 2);
+	return sanitizeString(String(error));
+}
+const systemErrorHints = {
+	NETWORK_ERROR: "Please check your network connection and kintone domain.",
+	EXTERNAL_API_ERROR: "The kintone API returned an unexpected error. Please retry or check the API status.",
+	STORAGE_ERROR: "Failed to read/write a local file. Please check file permissions.",
+	EXECUTION_ERROR: "One or more apps failed during execution. Check the individual errors above."
+};
+const SENSITIVE_KEYS = /^(authorization|apitoken|api-token|api_token|apikey|api-key|api_key|password|secret|credentials|x-cybozu-authorization)$/i;
+const SENSITIVE_VALUE_PATTERNS = /(?<=(?:password|apiToken|api[_-]?token|api[_-]?key|secret|credentials)[=:]\s*)\S+/gi;
+const AUTHORIZATION_VALUE_PATTERN = /(?<=authorization[=:]\s*)\S+(?:\s+\S+)?/gi;
+function sanitizeString(value) {
+	return value.replace(AUTHORIZATION_VALUE_PATTERN, "[REDACTED]").replace(SENSITIVE_VALUE_PATTERNS, "[REDACTED]");
+}
+function sanitizeForDisplay(obj, seen = /* @__PURE__ */ new WeakSet()) {
+	if (typeof obj !== "object" || obj === null) return obj;
+	if (seen.has(obj)) return "[Circular]";
+	seen.add(obj);
+	if (Array.isArray(obj)) return obj.map((item) => sanitizeForDisplay(item, seen));
+	const result = {};
+	if (obj instanceof Error) {
+		result.message = sanitizeString(obj.message);
+		if (obj.stack) result.stack = sanitizeString(obj.stack);
+	}
+	for (const [key, value] of Object.entries(obj)) if (SENSITIVE_KEYS.test(key)) result[key] = "[REDACTED]";
+	else if (typeof value === "object" && value !== null) result[key] = sanitizeForDisplay(value, seen);
+	else if (typeof value === "string") result[key] = sanitizeString(value);
+	else result[key] = value;
+	return result;
+}
+function isVerbose() {
+	return process.env.VERBOSE === "1" || process.env.VERBOSE === "true" || process.env.VERBOSE === "yes";
 }
 function logErrorDetails(error) {
 	if (error.cause) {
+		const seen = /* @__PURE__ */ new WeakSet();
+		seen.add(error);
 		p.log.warn(`Cause: ${formatErrorForDisplay(error.cause)}`);
-		logNestedErrorProperties(error.cause);
+		logNestedErrorProperties(error.cause, seen);
 	}
-	if (error.stack) p.log.warn(`Stack: ${error.stack}`);
+	if (isVerbose() && error.stack) p.log.warn(`Stack: ${error.stack}`);
 }
-function logNestedErrorProperties(target) {
+function logNestedErrorProperties(target, seen = /* @__PURE__ */ new WeakSet()) {
 	if (typeof target !== "object" || target === null) return;
+	if (seen.has(target)) return;
+	seen.add(target);
 	const record = target;
 	if (record.error instanceof Error) {
-		p.log.warn(`  Error: ${record.error.message}`);
-		const innerRecord = record.error;
-		if (innerRecord.errors && typeof innerRecord.errors === "object") p.log.warn(`  Details: ${JSON.stringify(innerRecord.errors, null, 2)}`);
+		p.log.warn(`  Error: ${sanitizeString(record.error.message)}`);
+		if (hasObjectProperty(record.error, "errors")) p.log.warn(`  Details: ${JSON.stringify(sanitizeForDisplay(record.error.errors), null, 2)}`);
 	}
 	if (Array.isArray(record.errors)) for (const e of record.errors) if (e instanceof Error) {
-		p.log.warn(`  - ${e.message}`);
-		const inner = e;
-		if (inner.errors && typeof inner.errors === "object") p.log.warn(`    ${JSON.stringify(inner.errors, null, 2)}`);
-	} else p.log.warn(`  - ${JSON.stringify(e, null, 2)}`);
-	else if (record.errors && typeof record.errors === "object" && !("error" in record)) p.log.warn(`Details: ${JSON.stringify(record.errors, null, 2)}`);
+		p.log.warn(`  - ${sanitizeString(e.message)}`);
+		if (hasObjectProperty(e, "errors")) p.log.warn(`    ${JSON.stringify(sanitizeForDisplay(e.errors), null, 2)}`);
+	} else p.log.warn(`  - ${JSON.stringify(sanitizeForDisplay(e), null, 2)}`);
+	else if (record.errors && typeof record.errors === "object" && !(record.error instanceof Error)) p.log.warn(`Details: ${JSON.stringify(sanitizeForDisplay(record.errors), null, 2)}`);
 	if (target instanceof Error && target.cause) {
 		p.log.warn(`  Caused by: ${formatErrorForDisplay(target.cause)}`);
-		logNestedErrorProperties(target.cause);
+		logNestedErrorProperties(target.cause, seen);
 	}
 }
+function hasObjectProperty(obj, key) {
+	return key in obj && typeof obj[key] === "object" && obj[key] !== null;
+}
 function isApplicationError(error) {
 	return error instanceof ApplicationError;
 }
@@ -2299,40 +2347,30 @@ async function confirmAndDeploy(containers, skipConfirm, successMessage = "Deplo
 	if (!skipConfirm) {
 		const shouldDeploy = await p.confirm({ message: "Deploy to production?" });
 		if (p.isCancel(shouldDeploy) || !shouldDeploy) {
-			p.log.warn("Applied to preview, but not deployed to production.");
+			const appNames = containers.map((c) => c.appName).filter((n) => n != null);
+			if (appNames.length > 0) p.log.warn(`Applied to preview, but not deployed to production: ${appNames.join(", ")}`);
+			else p.log.warn("Applied to preview, but not deployed to production.");
 			return;
 		}
 	}
 	const ds = p.spinner();
 	ds.start("Deploying to production...");
+	const deployedNames = [];
 	try {
-		for (const container of containers) await container.appDeployer.deploy();
+		for (const container of containers) {
+			await container.appDeployer.deploy();
+			if (container.appName) deployedNames.push(container.appName);
+		}
 		ds.stop("Deployed to production.");
 	} catch (error) {
 		ds.stop("Deployment failed.");
+		if (deployedNames.length > 0) p.log.warn(`${deployedNames.length}/${containers.length} app(s) were deployed before the failure: ${deployedNames.join(", ")}`);
+		const notDeployed = containers.map((c) => c.appName).filter((n) => n != null).filter((n) => !deployedNames.includes(n));
+		if (notDeployed.length > 0) p.log.warn(`Not deployed: ${notDeployed.join(", ")}`);
 		throw error;
 	}
 	p.log.success(successMessage);
 }
-async function promptDeploy(container, skipConfirm) {
-	if (!skipConfirm) {
-		const shouldDeploy = await p.confirm({ message: "Deploy to production?" });
-		if (p.isCancel(shouldDeploy) || !shouldDeploy) {
-			p.log.warn("Applied to preview, but not deployed to production.");
-			return;
-		}
-	}
-	const ds = p.spinner();
-	ds.start("Deploying to production...");
-	try {
-		await deployApp({ container });
-		ds.stop("Deployment complete.");
-	} catch (error) {
-		ds.stop("Deployment failed.");
-		throw error;
-	}
-	p.log.success("Deployed to production.");
-}
 
 //#endregion
 //#region src/cli/projectConfig.ts
@@ -2438,10 +2476,30 @@ async function routeMultiApp(values, handlers) {
 	}
 	await handlers.multiApp(target.plan, target.config);
 }
+/**
+* High-level multi-app executor that prints app headers before each executor call.
+* Use this when the executor does not print its own headers (most apply commands).
+* Delegates to `runMultiAppWithFailCheck` for execution and failure handling.
+*/
+async function runMultiAppWithHeaders(plan, executor, successMessage) {
+	await runMultiAppWithFailCheck(plan, async (app) => {
+		printAppHeader(app.name, app.appId);
+		await executor(app);
+	}, successMessage);
+}
+/**
+* Low-level multi-app executor that runs apps, prints results, and throws on failure.
+* Use this directly when the executor needs full control over output (e.g. schema migrate
+* prints its own headers and performs per-app deploy inside the executor callback).
+*/
 async function runMultiAppWithFailCheck(plan, executor, successMessage) {
 	const multiResult = await executeMultiApp(plan, executor);
 	printMultiAppResult(multiResult);
-	if (multiResult.hasFailure) throw new SystemError(SystemErrorCode.ExternalApiError, "Execution stopped due to failure.");
+	if (multiResult.hasFailure) {
+		const succeededCount = multiResult.results.filter((r) => r.status === "succeeded").length;
+		if (succeededCount > 0) p.log.warn(`${succeededCount} app(s) were applied to preview but may not have been deployed. Check their status in kintone.`);
+		throw new SystemError(SystemErrorCode.ExecutionError, "Execution stopped due to failure.");
+	}
 	if (successMessage) p.log.success(successMessage);
 }
 async function configFileExists(configPath) {
@@ -2568,12 +2626,13 @@ var apply_default$12 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveActionAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runAction(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runAction(resolveActionAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -3110,12 +3169,13 @@ var apply_default$11 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveAdminNotesAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runAdminNotes(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runAdminNotes(resolveAdminNotesAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -3472,12 +3532,13 @@ var apply_default$10 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveAppAclAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runAppAcl(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runAppAcl(resolveAppAclAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -4099,12 +4160,13 @@ var apply_default$9 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveCustomizeAppConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await applyCustomizationForApp(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await applyCustomizationForApp(resolveCustomizeAppConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm, "Customization applied and deployed successfully.");
 				}
 			});
@@ -4458,12 +4520,13 @@ var apply_default$8 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveFieldAclAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runFieldAcl(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runFieldAcl(resolveFieldAclAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -6676,7 +6739,7 @@ var init_default = define({
 		try {
 			const values = ctx.values;
 			const spaceId = values["space-id"];
-			if (!/^\d+$/.test(spaceId)) throw new ValidationError(ValidationErrorCode.InvalidInput, `Invalid space ID: "${spaceId}" (must be a numeric value)`);
+			if (!/^[1-9]\d*$/.test(spaceId)) throw new ValidationError(ValidationErrorCode.InvalidInput, `Invalid space ID: "${spaceId}" (must be a positive integer, e.g. 1, 42, 100)`);
 			const kintoneDomain = values.domain ?? process.env.KINTONE_DOMAIN;
 			if (!kintoneDomain) throw new ValidationError(ValidationErrorCode.InvalidInput, "Missing required configuration:\n  KINTONE_DOMAIN is required");
 			const apiToken = values["api-token"] ?? process.env.KINTONE_API_TOKEN;
@@ -6979,12 +7042,13 @@ var apply_default$7 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveNotificationAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runNotification(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runNotification(resolveNotificationAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -7398,12 +7462,13 @@ var apply_default$6 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolvePluginAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runPlugin(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runPlugin(resolvePluginAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -7706,12 +7771,13 @@ var apply_default$5 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveProcessAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runProcessApply(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runProcessApply(resolveProcessAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -8029,12 +8095,13 @@ var apply_default$4 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveRecordAclAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runRecordAcl(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runRecordAcl(resolveRecordAclAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -8415,12 +8482,13 @@ var apply_default$3 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveReportAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runReport(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runReport(resolveReportAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -9205,7 +9273,7 @@ async function detectDiff({ container }) {
 //#region src/cli/commands/schema/diff.ts
 async function runDiff(container) {
 	const s = p.spinner();
-	s.start("Fetching form schema...");
+	s.start("Comparing schema...");
 	let result;
 	try {
 		result = await detectDiff({ container });
@@ -9213,7 +9281,7 @@ async function runDiff(container) {
 		s.stop("Comparison failed.");
 		throw error;
 	}
-	s.stop("Form schema fetched.");
+	s.stop("Comparison complete.");
 	printDiffResult(result);
 }
 var diff_default$2 = define({
@@ -9379,6 +9447,12 @@ var dump_default = define({
 	}
 });
 
+//#endregion
+//#region src/core/application/formSchema/deployApp.ts
+async function deployApp({ container }) {
+	await container.appDeployer.deploy();
+}
+
 //#endregion
 //#region src/core/domain/formSchema/services/subtableFieldSplitter.ts
 function splitSubtableInnerFields(desired, current) {
@@ -9618,7 +9692,7 @@ async function runSingleMigrate(container, skipConfirm) {
 	await executeMigration({ container });
 	ms.stop("Migration applied.");
 	p.log.success("Migration completed successfully.");
-	await promptDeploy(container, skipConfirm);
+	await confirmAndDeploy([container], skipConfirm);
 }
 var migrate_default = define({
 	name: "migrate",
@@ -9667,7 +9741,7 @@ var migrate_default = define({
 					}
 					await runMultiAppWithFailCheck(plan, async (app) => {
 						const entry = appContainers.find((a) => a.app.name === app.name);
-						if (!entry) return;
+						if (!entry) throw new SystemError(SystemErrorCode.InternalServerError, `App container not found for "${app.name}"`);
 						const { container, hasChanges } = entry;
 						printAppHeader(app.name, app.appId);
 						if (!hasChanges) {
@@ -9776,7 +9850,7 @@ async function runSingleOverride(container, skipConfirm) {
 	await forceOverrideForm({ container });
 	s.stop("Force override applied.");
 	p.log.success("Force override completed successfully.");
-	await promptDeploy(container, skipConfirm);
+	await confirmAndDeploy([container], skipConfirm);
 }
 async function runSingleReset(container, skipConfirm) {
 	p.log.warn(`${pc.bold(pc.red("WARNING:"))} This will delete ALL custom fields, resetting the form to empty.`);
@@ -9792,7 +9866,7 @@ async function runSingleReset(container, skipConfirm) {
 	await resetForm({ container });
 	s.stop("Form reset applied.");
 	p.log.success("Reset completed successfully.");
-	await promptDeploy(container, skipConfirm);
+	await confirmAndDeploy([container], skipConfirm);
 }
 var override_default = define({
 	name: "override",
@@ -10505,12 +10579,13 @@ var apply_default$1 = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveSettingsAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runSettings(config);
-						containers.push(container);
-					}, "All general settings applied successfully.");
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runSettings(resolveSettingsAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});
@@ -10792,12 +10867,13 @@ var apply_default = define({
 				},
 				multiApp: async (plan, projectConfig) => {
 					const containers = [];
-					await runMultiAppWithFailCheck(plan, async (app) => {
-						const config = resolveViewAppContainerConfig(app, projectConfig, values);
-						printAppHeader(app.name, app.appId);
-						const container = await runView(config);
-						containers.push(container);
-					}, void 0);
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const container = await runView(resolveViewAppContainerConfig(app, projectConfig, values));
+						containers.push({
+							appDeployer: container.appDeployer,
+							appName: app.name
+						});
+					});
 					await confirmAndDeploy(containers, skipConfirm);
 				}
 			});