void 0.27.0 → 0.28.0

package/dist/{email-_lGAHOhp.mjs → email-DIwaQU4P.mjs}

@@ -1,18 +1,21 @@
-import { a as join } from "./dist-BVqXeR_h.mjs";
-import { n as readProjectPaths } from "./project-paths-GgcMozYz.mjs";
-import { m as readConfig } from "./config-DiowPT80.mjs";
-import { a as scanEmailHandlersSync } from "./email-d_Aux1vM.mjs";
-import { A as createDeployWranglerRunner, H as loadProvisionModule, L as resolveDeployTransport, M as isWranglerNonInteractiveOrCI, N as runWranglerAuthToken, O as discoverRootWranglerConfig, V as deriveWorkerName, d as applyEmailSetup, f as createNodeEmailDns, g as renderEmailChecklist, h as renderAddressMap, m as preflightEmail, p as findEmailConfigConflicts } from "./deploy-Bqe1PYBw.mjs";
-import { r as readProjectConfig } from "./project-BAm2aB6Q.mjs";
-import { j as writeProvisionedWranglerConfig } from "./wrangler-D9KTuqnv.mjs";
-import { c as getToken, u as openBrowser } from "./auth-Dn2vw-SG.mjs";
+import { a as join } from "./dist-ipQi0Q8y.mjs";
+import { n as readProjectPaths } from "./project-paths-DMvEeSau.mjs";
+import { d as readConfig } from "./config-Bx_1SpnO.mjs";
+import { i as scanEmailHandlersSync } from "./email-BcjSyAL0.mjs";
+import { j as writeProvisionedWranglerConfig } from "./wrangler-BYs07Rxy.mjs";
+import { c as getToken, u as openBrowser } from "./auth-B6iOCjKI.mjs";
 import { A as confirm, L as log, U as password, tt as isCancel } from "./dist-D3m88sjf.mjs";
-import { d as printSuccess, l as import_picocolors, r as createSpinner, u as note } from "./output-C50ag2r3.mjs";
-import { n as PlatformApiError, r as PlatformClient } from "./client-DlDJuY0s.mjs";
+import { f as import_picocolors, l as formatUrl, m as printSuccess, p as note, r as createSpinner } from "./output-FNHKw5Ac.mjs";
+import { a as emailConfigInputs, c as renderAddressMap, i as createNodeEmailDns, l as renderEmailChecklist, o as preflightEmail, r as applyEmailSetup, s as probeMx } from "./email-cloudflare-CH053RxK.mjs";
+import { n as PlatformApiError, r as PlatformClient } from "./client-DM9Kcf4e.mjs";
+import { i as resolveCommandProjectId } from "./resolve-project-C_Cu7E8a.mjs";
+import { o as resolveDeployTransport } from "./deploy-transport-BiicfoQW.mjs";
+import { a as discoverRootWranglerConfig, c as runWranglerAuthToken, l as deriveWorkerName, o as createDeployWranglerRunner, s as isWranglerNonInteractiveOrCI } from "./deploy-B06EQq4t.mjs";
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { execSync } from "node:child_process";
 import { parseRootWranglerConfig, readWranglerTopLevelString } from "@void/deploy-cloudflare";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 //#region src/cli/email.ts
 async function runEmailCommand(root, args) {
 	if (args.platform === "cloudflare") return runEmailCloudflareCommand(root, args);
@@ -30,23 +33,7 @@ async function runEmailCommand(root, args) {
 		process.exit(1);
 	}
 	const client = new PlatformClient(token, { root });
-	const requestedSlug = args.projectSlug ?? process.env.VOID_PROJECT?.trim();
-	let projectId;
-	if (requestedSlug) {
-		const project = (await client.listProjects()).find((p) => p.slug === requestedSlug);
-		if (!project) {
-			log.error(`project: No project found with slug '${requestedSlug}'.`);
-			process.exit(1);
-		}
-		projectId = project.id;
-	} else {
-		const config = readProjectConfig(root);
-		if (!config) {
-			log.error("No linked project. Run `void project link` or pass --project <name>.");
-			process.exit(1);
-		}
-		projectId = config.projectId;
-	}
+	const projectId = await resolveCommandProjectId(client, root, args.projectSlug);
 	switch (args.subcommand) {
 		case "usage": return emailUsage(client, projectId);
 		case "logs": return emailLogs(client, projectId, args.limit);
@@ -118,10 +105,8 @@ async function emailLogs(client, projectId, limit) {
 	note(lines.join("\n"), "Email Logs");
 }
 /**
-* The dashboard template link's permission groups (contract 8). Every key
-* rides every link — there is no apex-only key, because `Zone Settings Edit`
-* gates the routing POST on both paths; `zone: read` is what the zone lookup
-* needs. URL-encoded by `URL.searchParams`.
+* Permission groups prefilled in the dashboard token link. `zone_settings: edit` gates
+* the routing POST; `zone: read` serves the zone lookup.
 */
 const CF_TOKEN_TEMPLATE_PERMISSION_GROUPS = [
 	{
@@ -145,7 +130,7 @@ const CF_TOKEN_TEMPLATE_PERMISSION_GROUPS = [
 		type: "edit"
 	}
 ];
-/** The three-click template link — the scoped token path (0078, "Creating the token in three clicks"). */
+/** Dashboard link that prefills the scoped API token form. */
 function buildCfApiTokenTemplateUrl(domain) {
 	const url = new URL("https://dash.cloudflare.com/profile/api-tokens");
 	url.searchParams.set("permissionGroupKeys", JSON.stringify(CF_TOKEN_TEMPLATE_PERMISSION_GROUPS));
@@ -211,10 +196,8 @@ function clearClipboard() {
 	} catch {}
 }
 /**
-* The CLI-side active check from 0078's clipboard sequence. 'unknown' means
-* the check could not run (no network, a CF error) — the caller proceeds and
-* lets the platform verify authoritatively, never treating a network blip as
-* a bad token. The token itself is never logged.
+* Local active check. 'unknown' means the check could not run (network or CF error); the
+* caller proceeds and the platform verifies authoritatively. The token is never logged.
 */
 async function verifyCfApiToken(token) {
 	let res;
@@ -244,42 +227,8 @@ function isValidEmailDomainInput(domain) {
 	return /^(?!-)[a-z0-9-]{1,63}(?<!-)(\.(?!-)[a-z0-9-]{1,63}(?<!-))+$/.test(domain);
 }
 /**
-* Where `--subdomain` lands: a bare label nests under the positional domain
-* (`mx` → `mx.acme.com`), a full host is taken as-is but must stay under it.
-* Throws on anything else — the user named a domain this add cannot register.
-*/
-function resolveEmailDomainTarget(domain, subdomain) {
-	if (subdomain === void 0) return {
-		emailDomain: domain,
-		forced: false
-	};
-	const candidate = subdomain.trim().toLowerCase().replace(/\.$/, "");
-	const resolved = candidate.includes(".") ? candidate : `${candidate}.${domain}`;
-	if (!isValidEmailDomainInput(resolved)) throw new Error(`email: invalid --subdomain value '${subdomain}'.`);
-	if (resolved === domain || !resolved.endsWith(`.${domain}`)) throw new Error(`email: --subdomain must name a subdomain of ${domain} (got '${subdomain}').`);
-	return {
-		emailDomain: resolved,
-		forced: true
-	};
-}
-/**
-* Local public-DNS MX read. [] = no records, null = could not read. The
-* local answer only steers the default and the render — the platform
-* re-checks over public DNS and its answer is authoritative, so a
-* split-horizon resolver never blocks a valid setup here.
-*/
-async function lookupMxForRender(dns, name) {
-	try {
-		return (await dns.resolveMx(name)).slice().sort((a, b) => a.priority - b.priority).map((r) => r.exchange.replace(/\.$/, "").toLowerCase());
-	} catch (err) {
-		const code = err?.code;
-		return code === "ENODATA" || code === "ENOTFOUND" ? [] : null;
-	}
-}
-/**
-* The "Enter switches paths" race from 0078's flow. The default reads one
-* cooked-mode line from stdin; `stop` removes the listener so a losing race
-* cannot eat the first keystroke of a later prompt.
+* Resolves when Enter is pressed during the clipboard watch. `stop` removes the listener so
+* a losing race cannot eat the first keystroke of a later prompt.
 */
 function createEnterRace(waitForEnter) {
 	if (waitForEnter) return {
@@ -308,15 +257,42 @@ async function defaultPasteToken() {
 	return result;
 }
 /**
-* Lost-answer reconcile bounds for `domain add`: attempt-count bounded (not
-* wall clock) so the worst case is finite and tests are deterministic. The
-* API's pre-insert phase is DB-only but takes tens of ms to seconds of
-* Hyperdrive RTTs, and a lost answer does not stop the API worker — a single
-* immediate status read can 404 while the POST is still committing.
+* Lost-answer reconcile bounds: attempt-count bounded so the worst case is finite. A lost
+* answer does not stop the API worker, so one immediate status read can 404 while the
+* request is still committing.
+*/
+const RECONCILE_ATTEMPTS = 15;
+const RECONCILE_INTERVAL_MS = 1e3;
+/**
+* After an add or rotate request fails without a definitive refusal, poll its operation by
+* attempt id and print it. Returns undefined when the operation never appears.
 */
-const ADD_RECONCILE_ATTEMPTS = 15;
-const ADD_RECONCILE_INTERVAL_MS = 1e3;
-async function emailDomainAdd(client, projectId, rawDomain, subdomain, deps = {}) {
+async function reconcileEmailOperation(error, client, projectId, attemptId, title, sleep = setTimeout$1) {
+	if (error instanceof PlatformApiError && [
+		400,
+		403,
+		404,
+		409
+	].includes(error.status)) throw error;
+	for (let attempt = 0; attempt < RECONCILE_ATTEMPTS; attempt++) {
+		if (attempt > 0) await sleep(RECONCILE_INTERVAL_MS);
+		let operation;
+		try {
+			operation = await client.getEmailOperation(projectId, attemptId);
+		} catch {
+			continue;
+		}
+		note([
+			`Operation:   ${operation.operationId}`,
+			`Status:      ${operation.status}`,
+			`Inbound:     ${operation.readiness.inbound.status}`,
+			`Outbound:    ${operation.readiness.outbound.status}`,
+			`Credential:  ${operation.readiness.management.status}`
+		].join("\n"), title);
+		return operation;
+	}
+}
+async function emailDomainAdd(client, projectId, rawDomain, deps = {}, subdomain) {
 	const exit = deps.exit ?? ((code) => process.exit(code));
 	const fail = (message) => {
 		log.error(message);
@@ -325,56 +301,42 @@ async function emailDomainAdd(client, projectId, rawDomain, subdomain, deps = {}
 	const domain = normalizeEmailDomainInput(rawDomain);
 	if (!isValidEmailDomainInput(domain)) return fail(`email: invalid domain '${rawDomain}'.`);
 	if (subdomain !== void 0) return fail("email: Platform-managed custom email requires a Cloudflare zone apex because inbound email uses its catch-all. Omit --subdomain, choose an unused zone apex, or use the platform shared mail address.");
-	let target;
-	try {
-		target = resolveEmailDomainTarget(domain, subdomain);
-	} catch (err) {
-		return fail(err instanceof Error ? err.message : String(err));
-	}
 	const dns = deps.dns ?? await createNodeEmailDns();
-	const decideTarget = async () => {
-		const mx = await lookupMxForRender(dns, domain);
-		if (mx === null) log.info(`MX        could not read ${domain}'s MX from here — the platform decides over public DNS.`);
-		else if (mx.some((exchange) => !/\.mx\.cloudflare\.net$/i.test(exchange))) fail(`email: ${domain} already receives mail from another provider. Platform custom inbound email requires an unused Cloudflare zone apex; choose another apex or use the platform shared mail address.`);
+	const checkApexMx = async () => {
+		const mx = await probeMx(dns, domain);
+		if (mx.state === "unknown") log.info(`MX        could not read ${domain}'s MX from here — the platform decides over public DNS.`);
+		else if (mx.state === "foreign") fail(`email: ${domain} already receives mail from another provider. Platform custom inbound email requires an unused Cloudflare zone apex; choose another apex or use the platform shared mail address.`);
 		else log.info(`MX        using the requested apex ${domain}`);
 	};
-	let renewal;
+	let renewal = false;
 	const settings = await client.getEmailSettings(projectId);
 	if (settings.domains.management === "admin") {
-		const rows = await client.listEmailDomains(projectId);
-		const existing = [target.emailDomain].map((candidate) => rows.find((row) => row.domain === candidate && row.managed_by !== "admin")).find((row) => row !== void 0);
-		if (!existing) {
-			await decideTarget();
+		renewal = (await client.listEmailDomains(projectId)).some((row) => row.domain === domain && row.managed_by !== "admin");
+		if (!renewal) {
+			await checkApexMx();
 			const project = settings.domains.projectSlug ?? projectId;
 			log.info([
 				"Email domains on this platform are managed by its administrator.",
 				"Ask them to run:",
 				"",
-				`  void platform email domain-add ${target.emailDomain} --project ${project}`,
+				`  void platform email domain-add ${domain} --project ${project}`,
 				"",
 				"`void email domain list` and `void email domain status` keep working here."
 			].join("\n"));
 			return exit(0);
 		}
-		renewal = existing.domain;
-		target = {
-			emailDomain: existing.domain,
-			forced: true
-		};
 	}
-	if (renewal !== void 0) log.info(`Updating ${renewal} with a scoped credential; the platform will reconcile setup.`);
-	else await decideTarget();
+	if (renewal) log.info(`Updating ${domain} with a scoped credential; the platform will reconcile setup.`);
+	else await checkApexMx();
 	if (!(deps.isInteractive ?? !isWranglerNonInteractiveOrCI())) return fail("email: `void email domain add` needs an interactive terminal to create or paste a scoped Cloudflare API token. Run it locally.");
 	let credential;
 	{
-		log.info(`Create a Cloudflare API token restricted to the account and DNS zone containing ${target.emailDomain}. In the resource selectors, replace All accounts and All zones with those exact resources. Workers Scripts Write still applies to every Worker in the selected account.`);
-		const url = buildCfApiTokenTemplateUrl(target.emailDomain);
+		log.info(`Create a Cloudflare API token restricted to the account and DNS zone containing ${domain}. In the resource selectors, replace All accounts and All zones with those exact resources. Workers Scripts Write still applies to every Worker in the selected account.`);
+		const url = buildCfApiTokenTemplateUrl(domain);
 		const readClip = deps.readClipboard ?? readClipboard;
 		const clearClip = deps.clearClipboard ?? clearClipboard;
 		const verify = deps.verifyToken ?? verifyCfApiToken;
-		const openUrl = deps.openUrl ?? ((u) => {
-			import("node:child_process").then(({ execFile }) => openBrowser(u, execFile));
-		});
+		const openUrl = deps.openUrl ?? openBrowser;
 		const snapshot = readClip();
 		if (snapshot === null) log.info("No clipboard tool found here — paste the token instead.");
 		openUrl(url);
@@ -387,7 +349,7 @@ async function emailDomainAdd(client, projectId, rawDomain, subdomain, deps = {}
 				"Create the token in three clicks: Continue to summary → Create Token → Copy.",
 				"Watching the clipboard for it — nothing is read until you copy, and it is cleared afterwards.",
 				"(Enter pastes it yourself instead.)",
-				`If the browser didn't open, visit:\n${import_picocolors.default.blue(url)}`
+				`If the browser didn't open, visit:\n${import_picocolors.default.blue(formatUrl(url))}`
 			].join("\n"));
 			const spinner = watchSpinner;
 			const deadline = Date.now() + (deps.watchTimeoutMs ?? 6e5);
@@ -451,54 +413,32 @@ async function emailDomainAdd(client, projectId, rawDomain, subdomain, deps = {}
 			};
 		}
 	}
-	if (!await (deps.confirmScope ?? (async (domain) => {
+	if (!await (deps.confirmScope ?? (async (name) => {
 		const answer = await confirm({
-			message: `Is this token restricted to the Cloudflare account and DNS zone containing ${domain}?`,
+			message: `Is this token restricted to the Cloudflare account and DNS zone containing ${name}?`,
 			initialValue: false
 		});
 		return !isCancel(answer) && answer === true;
-	}))(target.emailDomain)) return fail("email: restrict the token to the selected account and zone before adding the domain. Nothing was submitted to the platform.");
+	}))(domain)) return fail("email: restrict the token to the selected account and zone before adding the domain. Nothing was submitted to the platform.");
 	const attemptId = crypto.randomUUID();
 	log.info(`Setup operation: ${attemptId}`);
 	let row;
 	try {
 		row = await client.addEmailDomain(projectId, {
-			domain: target.emailDomain,
+			domain,
 			apiToken: credential.apiToken,
 			attemptId
 		});
 	} catch (error) {
-		if (error instanceof PlatformApiError && [
-			400,
-			403,
-			404,
-			409
-		].includes(error.status)) throw error;
-		const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
-		for (let attempt = 0; attempt < ADD_RECONCILE_ATTEMPTS; attempt++) {
-			if (attempt > 0) await sleep(ADD_RECONCILE_INTERVAL_MS);
-			let operation;
-			try {
-				operation = await client.getEmailOperation(projectId, attemptId);
-			} catch {
-				continue;
-			}
-			note([
-				`Operation:   ${operation.operationId}`,
-				`Status:      ${operation.status}`,
-				`Inbound:     ${operation.readiness.inbound.status}`,
-				`Outbound:    ${operation.readiness.outbound.status}`,
-				`Credential:  ${operation.readiness.management.status}`
-			].join("\n"), "Email Setup");
-			if (operation.error) log.error(operation.error);
-			log.info(`Run \`void email domain status ${target.emailDomain}\` to inspect setup.`);
-			if (operation.status === "completed") {
-				printSuccess(`Email domain ${target.emailDomain} configured.`);
-				return;
-			}
-			return fail(`email: setup is ${operation.status}; operation ${operation.operationId} retains its confirmed progress on the platform.`);
+		const operation = await reconcileEmailOperation(error, client, projectId, attemptId, "Email Setup", deps.sleep);
+		if (!operation) return fail(`email: setup outcome is unknown (operation ${attemptId}). Nothing was revoked. Check \`void email domain status ${domain}\` before starting another setup.`);
+		if (operation.error) log.error(operation.error);
+		log.info(`Run \`void email domain status ${domain}\` to inspect setup.`);
+		if (operation.status === "completed") {
+			printSuccess(`Email domain ${domain} configured.`);
+			return;
 		}
-		return fail(`email: setup outcome is unknown (operation ${attemptId}). Nothing was revoked. Check \`void email domain status ${target.emailDomain}\` before starting another setup.`);
+		return fail(`email: setup is ${operation.status}; operation ${operation.operationId} retains its confirmed progress on the platform.`);
 	}
 	log.info("Token stored encrypted on the platform for this zone connection — nothing is kept on this machine.");
 	printEmailDomainOutcome(row);
@@ -556,33 +496,11 @@ async function emailDomainRotateSecret(client, projectId, rawDomain, deps = {})
 	try {
 		row = await client.rotateEmailDomainSecret(projectId, domain, attemptId);
 	} catch (error) {
-		if (error instanceof PlatformApiError && [
-			400,
-			403,
-			404,
-			409
-		].includes(error.status)) throw error;
-		const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
-		for (let attempt = 0; attempt < ADD_RECONCILE_ATTEMPTS; attempt++) {
-			if (attempt > 0) await sleep(ADD_RECONCILE_INTERVAL_MS);
-			let operation;
-			try {
-				operation = await client.getEmailOperation(projectId, attemptId);
-			} catch {
-				continue;
-			}
-			note([
-				`Operation:   ${operation.operationId}`,
-				`Status:      ${operation.status}`,
-				`Inbound:     ${operation.readiness.inbound.status}`,
-				`Outbound:    ${operation.readiness.outbound.status}`,
-				`Credential:  ${operation.readiness.management.status}`
-			].join("\n"), "Email Secret Rotation");
-			if (operation.status !== "completed") throw new Error(`email: secret rotation ${operation.status}; inspect operation ${operation.operationId}`);
-			printSuccess("Zone ingress secret rotated and verified on the deployed Worker.");
-			return;
-		}
-		throw new Error(`email: secret rotation outcome is unknown (operation key ${attemptId}); inspect \`void email domain status ${domain}\` before starting another rotation.`);
+		const operation = await reconcileEmailOperation(error, client, projectId, attemptId, "Email Secret Rotation", deps.sleep);
+		if (!operation) throw new Error(`email: secret rotation outcome is unknown (operation key ${attemptId}); inspect \`void email domain status ${domain}\` before starting another rotation.`);
+		if (operation.status !== "completed") throw new Error(`email: secret rotation ${operation.status}; inspect operation ${operation.operationId}`);
+		printSuccess("Zone ingress secret rotated and verified on the deployed Worker.");
+		return;
 	}
 	printEmailDomainOutcome(row);
 	if (row.operationStatus !== "completed") throw new Error(`email: secret rotation ${row.operationStatus ?? "pending"}; inspect operation ${row.operationId ?? row.domain}`);
@@ -601,7 +519,7 @@ async function emailDomainRemove(client, projectId, rawDomain, options = {}) {
 }
 async function runEmailDomainCommand(client, projectId, args) {
 	switch (args.domainVerb) {
-		case "add": return emailDomainAdd(client, projectId, args.domain, args.subdomain);
+		case "add": return emailDomainAdd(client, projectId, args.domain, {}, args.subdomain);
 		case "status": return emailDomainStatus(client, projectId, args.domain);
 		case "list": return emailDomainList(client, projectId);
 		case "sync": return emailDomainSync(client, projectId, args.domain);
@@ -610,10 +528,8 @@ async function runEmailDomainCommand(client, projectId, args) {
 	}
 }
 /**
-* Wrangler discovers config files by walking parent directories. A standalone email command in
-* an app with no root config must still run in an explicit empty config context, otherwise an
-* unrelated ancestor config can select the wrong account. The real project path remains separate:
-* setup writes there only after it succeeds, while status leaves the project untouched.
+* Wrangler finds config by walking parent directories, so an app with no root config runs in
+* an empty temporary one; otherwise an unrelated ancestor config could select the wrong account.
 */
 function createEmailWranglerConfigContext(configPath) {
 	if (existsSync(configPath)) return {
@@ -644,18 +560,15 @@ function createEmailWranglerConfigContext(configPath) {
 	};
 }
 /**
-* `void email setup --platform cloudflare` and `void email status --platform cloudflare`.
+* `void email setup|status --platform cloudflare`.
 *
-* `setup` is the deploy's step 3b-ii on its own: preflight → checklist → the one Enter →
-* apply → write the root wrangler.jsonc. It exists for CI: a non-interactive deploy that
-* finds email not ready prints the checklist and says to run this once, commit
-* wrangler.jsonc, and redeploy. Rules and the catch-all stay wrangler's job — the next
-* `void deploy --platform cloudflare` applies the plan from the written `addresses`. It
-* is also the ONLY place a sending onboarding the committed binding remembers as refused
-* (Workers Free) is retried — on its own prompt, after a Workers Paid upgrade; the deploy
-* reads that row as settled and never retries it.
+* `setup` runs the deploy's email step on its own: preflight, checklist, one confirmation,
+* apply, then a write of the generated Cloudflare config and void.lock.json. A CI deploy that
+* finds email not ready says to run it once locally, commit void.lock.json, and redeploy; the
+* next deploy creates the routing rules from `addresses`. It is also the only place that
+* retries a sending onboarding the committed binding records as refused (Workers Free).
 *
-* `status` is the preflight alone, printed, exit 1 when not ready.
+* `status` prints the preflight and exits 1 when email is not ready.
 */
 async function runEmailCloudflareCommand(root, args, deps = {}) {
 	const rawExit = deps.exit ?? ((code) => process.exit(code));
@@ -692,7 +605,6 @@ async function runEmailCloudflareCommandInConfig(root, args, project, configPath
 	};
 	const { from, handlers } = project;
 	const rootConfig = parseRootWranglerConfig(configPath);
-	await loadProvisionModule();
 	let apiBaseUrl;
 	try {
 		apiBaseUrl = resolveDeployTransport(root, rootConfig);
@@ -708,16 +620,12 @@ async function runEmailCloudflareCommandInConfig(root, args, project, configPath
 	const workerName = readWranglerTopLevelString(rootConfig, "name") ?? deriveWorkerName(root);
 	const runWrangler = deps.runWrangler ?? createDeployWranglerRunner(root, accountId, apiBaseUrl);
 	const getSessionBearer = deps.getSessionBearer ?? (() => runWranglerAuthToken(runWrangler, wranglerConfigPath));
-	const sendEmail = rootConfig.send_email;
 	const inputs = {
 		handlers,
 		from,
 		workerName,
 		accountId,
-		existingSendEmail: Array.isArray(sendEmail) ? sendEmail : null,
-		existingAddresses: rootConfig.addresses,
-		existingVars: rootConfig.vars && typeof rootConfig.vars === "object" && !Array.isArray(rootConfig.vars) ? rootConfig.vars : null,
-		configConflicts: findEmailConfigConflicts(rootConfig),
+		...emailConfigInputs(rootConfig),
 		configPath: wranglerConfigPath,
 		apiBaseUrl,
 		runWrangler,