@void/deploy-cloudflare 0.25.0 → 0.26.1

package/README.md

@@ -1,5 +1,11 @@
 # @void/deploy-cloudflare
 
-Cloudflare deployment primitives used by the Void CLI. Provides Worker configuration reads, uploads, activation, and deployment verification.
+Cloudflare deployment primitives used by the [Void CLI](https://void.cloud/reference/cli). Provides Worker configuration reads, uploads, activation, and deployment verification for runtime and adapter authors.
 
-Applications normally deploy with `void deploy --platform cloudflare`. See the [Cloudflare guide](https://void.cloud/integrations/cloudflare) for configuration and credentials, or [Platform Development](https://void.cloud/guide/platform-development) for runtime and adapter work.
+To deploy an application to your Cloudflare account, run `void deploy --platform cloudflare`.
+
+## Documentation
+
+See the [Cloudflare guide](https://void.cloud/integrations/cloudflare) for configuration and credentials, or [Platform Development](https://void.cloud/guide/platform-development) for building a runtime or adapter.
+
+Read the [Void documentation](https://void.cloud) online or use the Markdown guides and references in `node_modules/void/docs/`, included with the `void` package.

package/dist/index.d.mts

@@ -147,6 +147,12 @@ type ApprovedCloudflareKvBinding = Readonly<{
   binding: string;
   id: string;
 }>;
+type ExistingCloudflareWorkerOptions = {
+  runWrangler: CloudflareCommandRunner;
+  configPath: string;
+  workerName: string;
+  versionId?: string;
+};
 /** A failed remote read, distinct from an invalid or changing Worker configuration. */
 export declare class CloudflareWorkerInspectionError extends Error {
   override name: string;
@@ -158,12 +164,7 @@ type CloudflareWorkerMigrationTagOptions = {
   workerName: string;
 };
 /** Read the deployed version, not the most recently uploaded candidate. */
-export declare function readExistingCloudflareWorker(options: {
-  runWrangler: CloudflareCommandRunner;
-  configPath: string;
-  workerName: string;
-  versionId?: string;
-}): Promise<ExistingCloudflareWorker>;
+export declare function readExistingCloudflareWorker(options: ExistingCloudflareWorkerOptions): Promise<ExistingCloudflareWorker>;
 /** Parse legacy version-detail shapes; this is not authoritative Worker migration state. */
 export declare function readCloudflareVersionMigrationTag(version: unknown): string | null;
 /** Read the authoritative migration tag from Worker script metadata. */

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { isDeepStrictEqual, stripVTControlCharacters } from "node:util";
+import { isRecord } from "@void/deploy-core";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { SyntaxKind, applyEdits, createScanner, modify, parse, parseTree } from "jsonc-parser";
-import { isRecord } from "@void/deploy-core";
 import nodePath from "node:path";
 import { createHash } from "node:crypto";
 import { tmpdir } from "node:os";
@@ -22,34 +22,26 @@ function parseRootWranglerConfig(configPath) {
 	return parsed;
 }
 function readWranglerTopLevelString(config, field) {
-	const value = config[field];
-	return typeof value === "string" && value.length > 0 ? value : void 0;
+	return readConfigEntryString(config, field);
 }
-function readStoredResourceName(config, field, binding, nameField) {
+/** The first entry of `config[field]` whose `binding` matches. */
+function findBindingEntry(config, field, binding) {
 	const list = config[field];
 	if (!Array.isArray(list)) return;
-	for (const entry of list) if (entry && typeof entry === "object" && entry.binding === binding) {
-		const name = entry[nameField];
-		return typeof name === "string" && name.length > 0 ? name : void 0;
-	}
+	return list.find((entry) => entry && typeof entry === "object" && entry.binding === binding);
+}
+function readStoredResourceName(config, field, binding, nameField) {
+	return readConfigEntryString(findBindingEntry(config, field, binding), nameField);
 }
 function readBindingFieldPresence(config, field, binding, key) {
-	const list = config[field];
-	if (!Array.isArray(list)) return {
-		present: false,
-		value: void 0
-	};
-	for (const entry of list) if (entry && typeof entry === "object" && entry.binding === binding) return Object.hasOwn(entry, key) ? {
+	const entry = findBindingEntry(config, field, binding);
+	return entry && Object.hasOwn(entry, key) ? {
 		present: true,
 		value: entry[key]
 	} : {
 		present: false,
 		value: void 0
 	};
-	return {
-		present: false,
-		value: void 0
-	};
 }
 function readConfigEntryString(entry, field) {
 	if (!entry || typeof entry !== "object") return;
@@ -82,6 +74,36 @@ function resolveD1MigrateTarget(config, binding) {
 	};
 }
 //#endregion
+//#region src/execute.ts
+/** Upload the already-verified Worker artifact without Wrangler autoconfiguration. */
+async function executeCloudflareDeploy(options) {
+	if (!options.verifyUploader()) return {
+		ok: false,
+		reason: "uploader-changed"
+	};
+	const result = await options.runWrangler({
+		type: "worker.deploy",
+		...options.configPath ? { configPath: options.configPath } : {}
+	}, { capture: false });
+	if (!isCleanCommandExit(result)) return {
+		ok: false,
+		reason: "deploy-failed",
+		status: result.status
+	};
+	return { ok: true };
+}
+/** The command ran to completion, whatever its exit status. */
+function isCompletedCommand(result) {
+	return Number.isSafeInteger(result.status) && result.status >= 0 && result.signal == null && (result.error == null || result.error === "");
+}
+function isCleanCommandExit(result) {
+	return result.status === 0 && isCompletedCommand(result);
+}
+/** Cloudflare reported that the Worker or its deployment does not exist (code 10007). */
+function isWorkerNotFound(result) {
+	return isCompletedCommand(result) && (result.failure === "not-found" || result.errorCode === 10007);
+}
+//#endregion
 //#region src/secret-draft.ts
 /**
 * `wrangler secret put` creates a fetch-only draft before attaching a first secret to a Worker.
@@ -156,14 +178,11 @@ async function readCloudflareWorker(options, allowMissing, proveSecretDraft = fa
 	};
 	const read = async (operation, missingIsNull = false) => {
 		const result = await options.runWrangler(operation, { capture: true });
-		if (result.status !== 0 || result.signal || result.error) {
-			if (missingIsNull && Number.isSafeInteger(result.status) && result.status >= 0 && result.signal == null && (result.error == null || result.error === "") && (result.failure === "not-found" || result.errorCode === 10007)) return null;
+		if (!isCleanCommandExit(result)) {
+			if (missingIsNull && isWorkerNotFound(result)) return null;
 			throw new CloudflareWorkerInspectionError(`Could not verify existing Cloudflare Worker "${options.workerName}". Check the account, Worker name, and Cloudflare permissions before retrying.`);
 		}
-		try {
-			const value = result.data;
-			if (record$1(value)) return value;
-		} catch {}
+		if (isRecord(result.data)) return result.data;
 		throw new Error("Cloudflare returned an invalid existing Worker response.");
 	};
 	const deployment = options.versionId ? { versions: [{
@@ -176,7 +195,7 @@ async function readCloudflareWorker(options, allowMissing, proveSecretDraft = fa
 	if (deployment === null) return null;
 	const versions = deployment.versions;
 	if (allowMissing && Array.isArray(versions) && versions.length === 0) return null;
-	if (!Array.isArray(versions) || versions.length !== 1 || !record$1(versions[0]) || versions[0].percentage !== 100 || typeof versions[0].version_id !== "string") throw new Error("The existing Worker must have one deployed version receiving all traffic. Finish any gradual rollout before linking.");
+	if (!Array.isArray(versions) || versions.length !== 1 || !isRecord(versions[0]) || versions[0].percentage !== 100 || typeof versions[0].version_id !== "string") throw new Error("The existing Worker must have one deployed version receiving all traffic. Finish any gradual rollout before linking.");
 	const versionId = versions[0].version_id;
 	const version = await read({
 		type: "versions.view",
@@ -185,9 +204,9 @@ async function readCloudflareWorker(options, allowMissing, proveSecretDraft = fa
 	});
 	if (version === null) throw new Error("Cloudflare did not return the existing Worker configuration.");
 	const resources = version.resources;
-	if (version.id !== versionId || !record$1(resources) || !Array.isArray(resources.bindings) || !resources.bindings.every(record$1) || !record$1(resources.script_runtime) || !record$1(resources.script)) throw new Error("Cloudflare did not return the existing Worker configuration.");
+	if (version.id !== versionId || !isRecord(resources) || !Array.isArray(resources.bindings) || !resources.bindings.every(isRecord) || !isRecord(resources.script_runtime) || !isRecord(resources.script)) throw new Error("Cloudflare did not return the existing Worker configuration.");
 	let isSecretOnlyDraft = isWranglerSecretOnlyDraft(version);
-	if (proveSecretDraft && !isSecretOnlyDraft && record$1(version.annotations) && Object.keys(version.annotations).length === 1 && version.annotations["workers/triggered_by"] === "secret") {
+	if (proveSecretDraft && !isSecretOnlyDraft && isRecord(version.annotations) && Object.keys(version.annotations).length === 1 && version.annotations["workers/triggered_by"] === "secret") {
 		const source = await read({
 			type: "versions.view",
 			versionId,
@@ -213,12 +232,12 @@ async function readCloudflareWorker(options, allowMissing, proveSecretDraft = fa
 }
 /** Parse legacy version-detail shapes; this is not authoritative Worker migration state. */
 function readCloudflareVersionMigrationTag(version) {
-	if (!record$1(version)) return null;
-	const resources = record$1(version.resources) ? version.resources : void 0;
+	if (!isRecord(version)) return null;
+	const resources = isRecord(version.resources) ? version.resources : void 0;
 	const tag = [
-		resources && record$1(resources.script_runtime) ? resources.script_runtime.migration_tag : null,
-		resources && record$1(resources.script) ? resources.script.migration_tag : null,
-		record$1(version.script) ? version.script.migration_tag : null,
+		resources && isRecord(resources.script_runtime) ? resources.script_runtime.migration_tag : null,
+		resources && isRecord(resources.script) ? resources.script.migration_tag : null,
+		isRecord(version.script) ? version.script.migration_tag : null,
 		version.migration_tag
 	].find((candidate) => typeof candidate === "string");
 	return typeof tag === "string" && tag.length > 0 ? tag : null;
@@ -243,23 +262,18 @@ async function readCloudflareWorkerMigrationTag(options) {
 	} catch {
 		throw new Error(`Cloudflare returned an invalid Durable Object migration response for Worker "${options.workerName}".`);
 	}
-	if (!response.ok || !record$1(body) || body.success !== true || !Array.isArray(body.result)) throw new Error(`Could not verify Durable Object migration state for Cloudflare Worker "${options.workerName}".`);
-	const worker = body.result.find((candidate) => record$1(candidate) && candidate.id === options.workerName);
-	if (!record$1(worker)) throw new Error(`Cloudflare did not return migration state for Worker "${options.workerName}".`);
+	if (!response.ok || !isRecord(body) || body.success !== true || !Array.isArray(body.result)) throw new Error(`Could not verify Durable Object migration state for Cloudflare Worker "${options.workerName}".`);
+	const worker = body.result.find((candidate) => isRecord(candidate) && candidate.id === options.workerName);
+	if (!isRecord(worker)) throw new Error(`Cloudflare did not return migration state for Worker "${options.workerName}".`);
 	if (worker.migration_tag === void 0 || worker.migration_tag === null) return null;
 	if (typeof worker.migration_tag !== "string" || worker.migration_tag.length === 0) throw new Error(`Cloudflare returned an invalid Durable Object migration response for Worker "${options.workerName}".`);
 	return worker.migration_tag;
 }
 async function readCloudflareApiAuthentication(runWrangler) {
 	const result = await runWrangler({ type: "auth.token" }, { capture: true });
-	if (result.status !== 0 || result.signal || result.error) throw new Error("Could not read the authenticated Cloudflare session.");
-	let value;
-	try {
-		value = result.data;
-	} catch {
-		throw new Error("Cloudflare returned an invalid authentication response.");
-	}
-	if (!record$1(value)) throw new Error("Cloudflare returned an invalid authentication response.");
+	if (!isCleanCommandExit(result)) throw new Error("Could not read the authenticated Cloudflare session.");
+	const value = result.data;
+	if (!isRecord(value)) throw new Error("Cloudflare returned an invalid authentication response.");
 	if ((value.type === "oauth" || value.type === "api_token") && typeof value.token === "string" && value.token.length > 0) return { Authorization: `Bearer ${value.token}` };
 	if (value.type === "api_key" && typeof value.key === "string" && value.key.length > 0 && typeof value.email === "string" && value.email.length > 0) return {
 		"X-Auth-Key": value.key,
@@ -306,7 +320,7 @@ function parseDurableObjectMigrations(value) {
 	if (value === void 0) return [];
 	if (!Array.isArray(value)) throw new Error("deploy: generated Cloudflare config has a malformed migrations field.");
 	return value.map((migration) => {
-		if (!record$1(migration) || typeof migration.tag !== "string") throw new Error("deploy: generated Cloudflare config has a malformed class migration.");
+		if (!isRecord(migration) || typeof migration.tag !== "string") throw new Error("deploy: generated Cloudflare config has a malformed class migration.");
 		const fields = [
 			migration.new_classes,
 			migration.new_sqlite_classes,
@@ -323,7 +337,7 @@ function parseDurableObjectMigrations(value) {
 }
 /** Cloudflare's declarative exports replace the legacy migration tag after an atomic publish. */
 function declarativeClassesMatch(migrations, actualValue) {
-	if (!record$1(actualValue)) return false;
+	if (!isRecord(actualValue)) return false;
 	const desired = /* @__PURE__ */ new Map();
 	for (const { step } of migrations) {
 		for (const [field, storage] of [["new_classes", "legacy-kv"], ["new_sqlite_classes", "sqlite"]]) for (const name of step[field] ?? []) {
@@ -331,7 +345,7 @@ function declarativeClassesMatch(migrations, actualValue) {
 			desired.set(name, storage);
 		}
 		for (const item of step.renamed_classes ?? []) {
-			if (!record$1(item) || typeof item.from !== "string" || typeof item.to !== "string") return false;
+			if (!isRecord(item) || typeof item.from !== "string" || typeof item.to !== "string") return false;
 			const storage = desired.get(item.from);
 			if (storage !== "sqlite" && storage !== "legacy-kv") return false;
 			desired.set(item.from, "deleted");
@@ -345,8 +359,8 @@ function declarativeClassesMatch(migrations, actualValue) {
 	if (desired.size === 0) return false;
 	return [...desired].every(([name, storage]) => {
 		const current = actualValue[name];
-		if (storage === "deleted") return current === void 0 || record$1(current) && current.state === "deleted";
-		return record$1(current) && current.type === "durable-object" && current.storage === storage;
+		if (storage === "deleted") return current === void 0 || isRecord(current) && current.state === "deleted";
+		return isRecord(current) && current.type === "durable-object" && current.storage === storage;
 	});
 }
 function assertCloudflareBindingsPreserved(before, after, approvedKv = [], options = {}) {
@@ -373,7 +387,7 @@ function assertCloudflareBindingsPreserved(before, after, approvedKv = [], optio
 }
 function isAssetsOnlyWorker(worker) {
 	const handlers = worker.script.handlers;
-	return record$1(worker.runtime.assets) && (handlers === null || Array.isArray(handlers) && handlers.length === 0);
+	return isRecord(worker.runtime.assets) && (handlers === null || Array.isArray(handlers) && handlers.length === 0);
 }
 function existingWorkerHandlers(worker) {
 	return isAssetsOnlyWorker(worker) ? [] : worker.script.handlers;
@@ -384,12 +398,12 @@ function assertExistingCloudflareConfig(existing, config, built = false, approve
 	if (additions.length > 0) {
 		const entries = config.kv_namespaces;
 		for (const addition of additions) {
-			const matches = Array.isArray(entries) ? entries.filter((entry) => record$1(entry) && entry.binding === addition.binding) : [];
+			const matches = Array.isArray(entries) ? entries.filter((entry) => isRecord(entry) && entry.binding === addition.binding) : [];
 			if ((built || matches.length > 0) && (matches.length !== 1 || matches[0].id !== addition.id)) throw new Error(`Binding ${addition.binding} must reference its approved KV namespace when linking.`);
 		}
 		if (Array.isArray(entries)) config = {
 			...config,
-			kv_namespaces: entries.filter((entry) => !record$1(entry) || !additions.some((addition) => addition.binding === entry.binding))
+			kv_namespaces: entries.filter((entry) => !isRecord(entry) || !additions.some((addition) => addition.binding === entry.binding))
 		};
 	}
 	const handlers = existingWorkerHandlers(existing);
@@ -406,7 +420,7 @@ function assertExistingCloudflareConfig(existing, config, built = false, approve
 		const value = config[field];
 		if (hasContent(value)) throw new Error(`The existing Worker handoff cannot change ${field}. Keep this deployment limited to the existing site.`);
 	}
-	if (record$1(existing.runtime.exports) && Object.values(existing.runtime.exports).some((value) => record$1(value) && value.type !== "worker")) throw new Error("The existing Worker exports stateful classes. Migrate those classes separately before linking.");
+	if (isRecord(existing.runtime.exports) && Object.values(existing.runtime.exports).some((value) => isRecord(value) && value.type !== "worker")) throw new Error("The existing Worker exports stateful classes. Migrate those classes separately before linking.");
 	for (const field of [
 		"compatibility_date",
 		"compatibility_flags",
@@ -417,9 +431,9 @@ function assertExistingCloudflareConfig(existing, config, built = false, approve
 		const equal = field === "compatibility_flags" ? stringSetEqual(actual, expected) : isDeepStrictEqual(actual, expected);
 		if ((built || config[field] !== void 0) && !equal) throw new Error(`Keep the existing Worker's ${field} when linking. Update it in a later deployment.`);
 	}
-	const vars = record$1(config.vars) ? config.vars : {};
+	const vars = isRecord(config.vars) ? config.vars : {};
 	const metadataBindings = existing.bindings.filter((binding) => binding.type === "version_metadata");
-	const metadata = record$1(config.version_metadata) ? config.version_metadata : void 0;
+	const metadata = isRecord(config.version_metadata) ? config.version_metadata : void 0;
 	if (metadataBindings.length > 1 || metadataBindings.length === 1 && metadata?.binding !== metadataBindings[0].name || metadataBindings.length === 0 && config.version_metadata !== void 0) throw new Error("Keep the existing Worker version_metadata binding when linking; linking cannot add or replace it.");
 	const remote = new Map(existing.bindings.map((binding) => [binding.name, binding]));
 	for (const [name, value] of Object.entries(vars)) {
@@ -465,21 +479,21 @@ function assertExistingCloudflareConfig(existing, config, built = false, approve
 		].includes(String(binding.type))) continue;
 		if (binding.type === "version_metadata") continue;
 		if (binding.type === "assets") {
-			if (built && (!record$1(config.assets) || config.assets.binding !== binding.name)) throw new Error(`Keep the existing assets binding ${binding.name} when linking.`);
+			if (built && (!isRecord(config.assets) || config.assets.binding !== binding.name)) throw new Error(`Keep the existing assets binding ${binding.name} when linking.`);
 			continue;
 		}
 		const mapping = supported[String(binding.type)];
 		if (!mapping) throw new Error(`The existing binding ${binding.name} (${String(binding.type)}) is not yet supported when linking.`);
 		const [field, localId, remoteId] = mapping;
 		const entries = config[field];
-		const matches = Array.isArray(entries) ? entries.filter((entry) => record$1(entry) && entry.binding === binding.name) : [];
+		const matches = Array.isArray(entries) ? entries.filter((entry) => isRecord(entry) && entry.binding === binding.name) : [];
 		const entry = matches[0];
-		if (matches.length !== 1 || !record$1(entry) || typeof binding[remoteId] !== "string" || entry[localId] !== binding[remoteId] || binding.type === "service" && ((entry.environment ?? "production") !== (binding.environment ?? "production") || entry.entrypoint !== binding.entrypoint) || binding.type === "r2_bucket" && (entry.jurisdiction ?? "default") !== (binding.jurisdiction ?? "default")) throw new Error(`Binding ${binding.name} must reference the existing Cloudflare resource when linking.`);
+		if (matches.length !== 1 || !isRecord(entry) || typeof binding[remoteId] !== "string" || entry[localId] !== binding[remoteId] || binding.type === "service" && ((entry.environment ?? "production") !== (binding.environment ?? "production") || entry.entrypoint !== binding.entrypoint) || binding.type === "r2_bucket" && (entry.jurisdiction ?? "default") !== (binding.jurisdiction ?? "default")) throw new Error(`Binding ${binding.name} must reference the existing Cloudflare resource when linking.`);
 		found.add(binding.name);
 	}
 	for (const [field] of Object.values(supported)) {
 		const entries = config[field];
-		if (Array.isArray(entries) && entries.some((entry) => !record$1(entry) || !found.has(String(entry.binding)))) throw new Error(`Linking cannot add or replace ${field}. Use the existing resource bindings.`);
+		if (Array.isArray(entries) && entries.some((entry) => !isRecord(entry) || !found.has(String(entry.binding)))) throw new Error(`Linking cannot add or replace ${field}. Use the existing resource bindings.`);
 	}
 }
 function newApprovedKvBindings(existing, approved) {
@@ -502,38 +516,13 @@ function stringSetEqual(left, right) {
 	if (!Array.isArray(left) || !left.every((value) => typeof value === "string") || !Array.isArray(right) || !right.every((value) => typeof value === "string")) return false;
 	return isDeepStrictEqual([...new Set(left)].sort(), [...new Set(right)].sort());
 }
-function record$1(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function hasContent(value) {
 	if (value === void 0 || value === null) return false;
 	if (Array.isArray(value)) return value.length > 0;
-	if (record$1(value)) return Object.values(value).some(hasContent);
+	if (isRecord(value)) return Object.values(value).some(hasContent);
 	return true;
 }
 //#endregion
-//#region src/execute.ts
-/** Upload the already-verified Worker artifact without Wrangler autoconfiguration. */
-async function executeCloudflareDeploy(options) {
-	if (!options.verifyUploader()) return {
-		ok: false,
-		reason: "uploader-changed"
-	};
-	const result = await Promise.resolve(options.runWrangler({
-		type: "worker.deploy",
-		...options.configPath ? { configPath: options.configPath } : {}
-	}, { capture: false }));
-	if (!isCleanCommandExit$1(result)) return {
-		ok: false,
-		reason: "deploy-failed",
-		status: result.status
-	};
-	return { ok: true };
-}
-function isCleanCommandExit$1(result) {
-	return result.status === 0 && result.signal == null && (result.error == null || result.error === "");
-}
-//#endregion
 //#region ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
 const BACKSLASH_RE = /\\/g;
 const isWindows = process.platform === "win32";
@@ -989,6 +978,10 @@ async function stabilizeCloudflareVersionTriggers(options) {
 		reason: "status-failed"
 	};
 }
+function triggerRepairOutcome(result) {
+	if (result.ok) return "succeeded";
+	return result.reason === "metadata-unavailable" ? "unavailable" : "failed";
+}
 function mergeTriggerCleanupBaselines(...configs) {
 	const present = configs.filter((config) => config !== void 0);
 	const unique = (values) => {
@@ -1088,6 +1081,11 @@ function triggerConfigFromWrangler(config) {
 		...addresses === void 0 ? {} : { addresses }
 	};
 }
+/** Trigger state recorded by a schema-2 version message, otherwise read from local config. */
+function desiredTriggerConfigFor(metadata, configPath) {
+	if (metadata?.schema === 2) return metadata.triggerConfig;
+	return configPath ? readCloudflareTriggerConfig(configPath) : triggerConfigFromWrangler({});
+}
 /** A well-formed `addresses` array, or `undefined` when the field is absent or malformed. */
 function readEmailAddresses(value) {
 	return Array.isArray(value) && value.every((entry) => typeof entry === "string") ? value : void 0;
@@ -1271,7 +1269,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		inheritanceBaseline = recent;
 	}
 	const desiredMetadata = parseCloudflareVersionMessage(options.message);
-	let desiredTriggerConfig = desiredMetadata?.schema === 2 ? desiredMetadata.triggerConfig : options.configPath ? readCloudflareTriggerConfig(options.configPath) : triggerConfigFromWrangler({});
+	let desiredTriggerConfig = desiredTriggerConfigFor(desiredMetadata, options.configPath);
 	let previousVersion = previousVersionId && desiredMetadata?.schema === 2 ? await readCloudflareVersionInspection(options, configPath, previousVersionId, inheritanceBaseline?.map((version) => version.inspection)) : null;
 	async function previousIsSecretOnlyDraft() {
 		if (!previousVersionId) return false;
@@ -1409,7 +1407,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		};
 	}
 	options.onProgress?.("Uploading the Worker and assets...");
-	const upload = await Promise.resolve(options.runWrangler({
+	const upload = await options.runWrangler({
 		type: "versions.upload",
 		configPath,
 		workerName: options.workerName,
@@ -1417,7 +1415,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		secretsFilePath: options.candidateSecretsFilePath,
 		assetsDirectory: options.assetsDirectoryOverride,
 		previewAlias: alias
-	}, { capture: true }));
+	}, { capture: true });
 	if (!isCleanCommandExit(upload)) {
 		const cloudflareErrorCode = upload.errorCode;
 		const isBootstrapError = isCompletedCommand(upload) && (upload.failure === "durable-migration" || upload.failure === "not-found" || cloudflareErrorCode === DURABLE_MIGRATION_VERSION_ERROR || cloudflareErrorCode === 10007);
@@ -1495,64 +1493,23 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		};
 		const fallbackSubdomain = extractWorkersDevSubdomain(readinessUrl);
 		if (fallbackSubdomain && fallbackSubdomain === options.readinessHeadersWorkersDevSubdomain) authenticatedWorkersDevSubdomain = fallbackSubdomain;
-		if (!options.verifyUploader()) return {
-			ok: false,
-			reason: "uploader-changed",
-			versionId,
-			previousVersionId: previous.versionId,
-			rollback: "not-needed"
-		};
-		const stagingOwnerFailure = await verifyReadinessStagingOwner(options, configPath, previous.versionId, versionId);
-		if (stagingOwnerFailure) return stagingOwnerFailure;
-		const staged = await deployVersionPercentages(options, configPath, [`${previous.versionId}@100`, `${versionId}@0`], message);
-		if (!isCleanCommandExit(staged)) {
-			const cloudflareErrorCode = staged.errorCode;
-			return {
-				ok: false,
-				reason: "readiness-staging-failed",
-				status: staged.status,
-				...commandDiagnosticFields(staged),
-				...cloudflareErrorCode === void 0 ? {} : { cloudflareErrorCode },
-				versionId,
-				previousVersionId: previous.versionId,
-				rollback: "not-needed"
-			};
-		}
+		const stagingFailure = await stageCandidateForReadiness(options, configPath, previous.versionId, versionId, message);
+		if (stagingFailure) return stagingFailure;
 		stagedVersionOverride = true;
 	}
+	const probe = (url) => probeReadiness(`${url.replace(/\/$/, "")}/__void/ready`, options.workerName, readinessUsesCustomRoute ? void 0 : options.readinessHeaders, authenticatedWorkersDevSubdomain, stagedVersionOverride ? versionId : void 0, options.fetch ?? globalThis.fetch, options.sleep ?? defaultSleep, options.readinessAttempts ?? 6, Number.POSITIVE_INFINITY, options.requireVersionMetadata ? versionId : void 0);
 	options.onProgress?.("Waiting for the Worker to become ready...");
-	let ready = await probeReadiness(`${readinessUrl.replace(/\/$/, "")}/__void/ready`, options.workerName, readinessUsesCustomRoute ? void 0 : options.readinessHeaders, authenticatedWorkersDevSubdomain, stagedVersionOverride ? versionId : void 0, options.fetch ?? globalThis.fetch, options.sleep ?? defaultSleep, options.readinessAttempts ?? 6, Number.POSITIVE_INFINITY, options.requireVersionMetadata ? versionId : void 0);
+	let ready = await probe(readinessUrl);
 	if (ready === "access-denied" && !stagedVersionOverride && previous.versionId !== null && !options.requirePreviewForReadiness) {
 		const stableReadinessUrl = desiredTriggerConfig.workers_dev ? workersDevReadinessUrl(options.workerName, extractWorkersDevSubdomain(readinessUrl) ?? options.workersDevSubdomain) : customRouteReadinessUrl(desiredTriggerConfig.routes);
 		if (stableReadinessUrl && stableReadinessUrl !== readinessUrl) {
-			if (!options.verifyUploader()) return {
-				ok: false,
-				reason: "uploader-changed",
-				versionId,
-				previousVersionId: previous.versionId,
-				rollback: "not-needed"
-			};
-			const stagingOwnerFailure = await verifyReadinessStagingOwner(options, configPath, previous.versionId, versionId);
-			if (stagingOwnerFailure) return stagingOwnerFailure;
-			const staged = await deployVersionPercentages(options, configPath, [`${previous.versionId}@100`, `${versionId}@0`], message);
-			if (!isCleanCommandExit(staged)) {
-				const cloudflareErrorCode = staged.errorCode;
-				return {
-					ok: false,
-					reason: "readiness-staging-failed",
-					status: staged.status,
-					...commandDiagnosticFields(staged),
-					...cloudflareErrorCode === void 0 ? {} : { cloudflareErrorCode },
-					versionId,
-					previousVersionId: previous.versionId,
-					rollback: "not-needed"
-				};
-			}
+			const stagingFailure = await stageCandidateForReadiness(options, configPath, previous.versionId, versionId, message);
+			if (stagingFailure) return stagingFailure;
 			readinessUrl = stableReadinessUrl;
 			authenticatedWorkersDevSubdomain = extractWorkersDevSubdomain(stableReadinessUrl);
 			readinessUsesCustomRoute = !desiredTriggerConfig.workers_dev;
 			stagedVersionOverride = true;
-			ready = await probeReadiness(`${readinessUrl.replace(/\/$/, "")}/__void/ready`, options.workerName, readinessUsesCustomRoute ? void 0 : options.readinessHeaders, authenticatedWorkersDevSubdomain, versionId, options.fetch ?? globalThis.fetch, options.sleep ?? defaultSleep, options.readinessAttempts ?? 6, Number.POSITIVE_INFINITY, options.requireVersionMetadata ? versionId : void 0);
+			ready = await probe(readinessUrl);
 		}
 	}
 	if (ready !== "ready") return {
@@ -1658,7 +1615,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 			previousVersionId: previous.versionId,
 			activeVersionId: triggers.activeVersionId,
 			rollback: "not-needed",
-			triggerRepair: triggers.reason === "metadata-unavailable" ? "unavailable" : "failed"
+			triggerRepair: triggerRepairOutcome(triggers)
 		};
 		if (!triggers.activeVersionId) return {
 			ok: false,
@@ -1697,7 +1654,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 				previousVersionId: previous.versionId,
 				activeVersionId: repair.activeVersionId ?? ownerBeforeCompensation.versionId,
 				rollback: "not-needed",
-				triggerRepair: repair.ok ? "succeeded" : repair.reason === "metadata-unavailable" ? "unavailable" : "failed"
+				triggerRepair: triggerRepairOutcome(repair)
 			};
 		}
 		const rollback = await restorePreviousVersionAndTriggers(options, configPath, previous.versionId, "trigger activation failed", desiredTriggerConfig, versionId, versionedPreviousTriggerConfigWithTraffic);
@@ -1783,13 +1740,13 @@ async function readCloudflareVersionInspection(options, configPath, versionId, k
 			const message = annotations?.["workers/message"];
 			let draft = entry;
 			if (annotations?.["workers/triggered_by"] === "secret" && Object.keys(annotations).length === 1 && !isWranglerSecretOnlyDraft(entry)) {
-				const inspection = await Promise.resolve(options.runWrangler({
+				const inspection = await options.runWrangler({
 					type: "versions.view",
 					versionId,
 					configPath,
 					workerName: options.workerName,
 					includeSource: true
-				}, { capture: true }));
+				}, { capture: true });
 				if (isCleanCommandExit(inspection)) {
 					const inspected = inspection.data;
 					if (isRecord(inspected) && inspected.id === versionId) draft = inspected;
@@ -1809,26 +1766,22 @@ async function readCloudflareVersionInspection(options, configPath, versionId, k
 	return null;
 }
 async function readRecentCloudflareVersionIds(options, configPath) {
-	const result = await Promise.resolve(options.runWrangler({
+	const result = await options.runWrangler({
 		type: "versions.list",
 		configPath,
 		workerName: options.workerName
-	}, { capture: true }));
+	}, { capture: true });
 	if (!isCleanCommandExit(result)) {
-		if (isCompletedCommand(result) && (result.failure === "not-found" || result.errorCode === 10007)) return [];
-		return null;
-	}
-	try {
-		const versions = result.data;
-		if (!Array.isArray(versions) || !versions.every((version) => isRecord(version) && typeof version.id === "string" && typeof version.number === "number" && Number.isSafeInteger(version.number))) return null;
-		return versions.map((version) => ({
-			id: version.id,
-			number: version.number,
-			inspection: version
-		}));
-	} catch {
+		if (isWorkerNotFound(result)) return [];
 		return null;
 	}
+	const versions = result.data;
+	if (!Array.isArray(versions) || !versions.every((version) => isRecord(version) && typeof version.id === "string" && typeof version.number === "number" && Number.isSafeInteger(version.number))) return null;
+	return versions.map((version) => ({
+		id: version.id,
+		number: version.number,
+		inspection: version
+	}));
 }
 function arraysEqual(left, right) {
 	return left.length === right.length && left.every((value, index) => value === right[index]);
@@ -1844,31 +1797,27 @@ async function candidateReplacesAllRemoteSecrets(options, configPath, activeVers
 	return secretBindings.every((bindings) => bindings.every((binding) => binding.type === "secret_text" && Object.hasOwn(options.candidateSecrets ?? {}, binding.name)));
 }
 async function readCloudflareVersionSecretBindings(options, configPath, versionId) {
-	const result = await Promise.resolve(options.runWrangler({
+	const result = await options.runWrangler({
 		type: "versions.view",
 		versionId,
 		configPath,
 		workerName: options.workerName
-	}, { capture: true }));
+	}, { capture: true });
 	if (!isCleanCommandExit(result)) return null;
-	try {
-		const version = result.data;
-		if (!isRecord(version) || version.id !== versionId || !isRecord(version.resources)) return null;
-		const bindings = version.resources.bindings;
-		if (!Array.isArray(bindings) || !bindings.every(isRecord)) return null;
-		const secrets = [];
-		for (const binding of bindings) {
-			if (binding.type !== "secret_text" && binding.type !== "secret_key") continue;
-			if (typeof binding.name !== "string") return null;
-			secrets.push({
-				name: binding.name,
-				type: binding.type
-			});
-		}
-		return secrets;
-	} catch {
-		return null;
+	const version = result.data;
+	if (!isRecord(version) || version.id !== versionId || !isRecord(version.resources)) return null;
+	const bindings = version.resources.bindings;
+	if (!Array.isArray(bindings) || !bindings.every(isRecord)) return null;
+	const secrets = [];
+	for (const binding of bindings) {
+		if (binding.type !== "secret_text" && binding.type !== "secret_key") continue;
+		if (typeof binding.name !== "string") return null;
+		secrets.push({
+			name: binding.name,
+			type: binding.type
+		});
 	}
+	return secrets;
 }
 /**
 * The Versions API cannot create a Worker or its initial Durable Object migration history, and
@@ -1899,14 +1848,14 @@ async function bootstrapFirstDeployment(options, configPath, previousVersionId,
 		};
 	}
 	options.onProgress?.(atomic ? "Publishing the Worker atomically..." : "Publishing the first Worker deployment...");
-	const bootstrap = await Promise.resolve(options.runWrangler({
+	const bootstrap = await options.runWrangler({
 		type: "worker.deploy",
 		configPath,
 		workerName: options.workerName,
 		message: options.message,
 		secretsFilePath: options.candidateSecretsFilePath,
 		assetsDirectory: options.assetsDirectoryOverride
-	}, { capture: true }));
+	}, { capture: true });
 	if (!isCleanCommandExit(bootstrap)) {
 		const cloudflareErrorCode = bootstrap.errorCode;
 		return {
@@ -1920,8 +1869,7 @@ async function bootstrapFirstDeployment(options, configPath, previousVersionId,
 	}
 	const published = readUploadResult(bootstrap);
 	const versionId = published?.versionId;
-	const desiredMetadata = parseCloudflareVersionMessage(options.message);
-	const desiredTriggerConfig = desiredMetadata?.schema === 2 ? desiredMetadata.triggerConfig : options.configPath ? readCloudflareTriggerConfig(options.configPath) : triggerConfigFromWrangler({});
+	const desiredTriggerConfig = desiredTriggerConfigFor(parseCloudflareVersionMessage(options.message), options.configPath);
 	const reportedOrConfiguredUrl = published?.previewUrl ?? published?.workersDevUrl ?? (desiredTriggerConfig.workers_dev ? workersDevReadinessUrl(options.workerName, options.workersDevSubdomain) : customRouteReadinessUrl(desiredTriggerConfig.routes));
 	if (!versionId || !reportedOrConfiguredUrl) return {
 		ok: false,
@@ -2020,7 +1968,7 @@ async function bootstrapFirstDeployment(options, configPath, previousVersionId,
 			previousVersionId,
 			activeVersionId: triggers.activeVersionId,
 			rollback: superseded ? "not-needed" : triggers.activeVersionId ? "unavailable" : "unsafe",
-			...superseded ? { triggerRepair: triggers.ok ? "succeeded" : triggers.reason === "metadata-unavailable" ? "unavailable" : "failed" } : {}
+			...superseded ? { triggerRepair: triggerRepairOutcome(triggers) } : {}
 		};
 	}
 	const previewUrl = publishedCloudflareUrl(options.workerName, desiredTriggerConfig, reportedOrConfiguredUrl);
@@ -2062,7 +2010,7 @@ async function bootstrapFirstDeployment(options, configPath, previousVersionId,
 			previousVersionId,
 			activeVersionId: repair.activeVersionId,
 			rollback: "not-needed",
-			triggerRepair: repair.ok ? "succeeded" : repair.reason === "metadata-unavailable" ? "unavailable" : "failed"
+			triggerRepair: triggerRepairOutcome(repair)
 		};
 	}
 	return {
@@ -2101,13 +2049,13 @@ function isContainersUnavailable(result) {
 	return result.failure === "containers-unavailable" || (result.errors?.some(({ message }) => /Cloudflare Containers[^\n]*(?:Workers Paid|not (?:enabled|available)|subscription)/i.test(message) || /\/containers\/me(?:\b|\?)/i.test(message) && /\b403\b/.test(message)) ?? false);
 }
 async function readCurrentProductionVersion(options, configPath) {
-	const result = await Promise.resolve(options.runWrangler({
+	const result = await options.runWrangler({
 		type: "deployments.status",
 		configPath,
 		workerName: options.workerName
-	}, { capture: true }));
+	}, { capture: true });
 	if (!isCleanCommandExit(result)) {
-		if (isCompletedCommand(result) && (result.failure === "not-found" || result.errorCode === 10007)) return {
+		if (isWorkerNotFound(result)) return {
 			kind: "ok",
 			versionId: null,
 			versions: []
@@ -2152,6 +2100,33 @@ function stagedVersionPercentages(previousVersionId, versionId) {
 		percentage: 0
 	}] : [];
 }
+/** Stage the candidate at 0% beside the unchanged previous version so readiness can select it. */
+async function stageCandidateForReadiness(options, configPath, previousVersionId, versionId, message) {
+	if (!options.verifyUploader()) return {
+		ok: false,
+		reason: "uploader-changed",
+		versionId,
+		previousVersionId,
+		rollback: "not-needed"
+	};
+	const ownerFailure = await verifyReadinessStagingOwner(options, configPath, previousVersionId, versionId);
+	if (ownerFailure) return ownerFailure;
+	const staged = await deployVersionPercentages(options, configPath, [`${previousVersionId}@100`, `${versionId}@0`], message);
+	if (!isCleanCommandExit(staged)) {
+		const cloudflareErrorCode = staged.errorCode;
+		return {
+			ok: false,
+			reason: "readiness-staging-failed",
+			status: staged.status,
+			...commandDiagnosticFields(staged),
+			...cloudflareErrorCode === void 0 ? {} : { cloudflareErrorCode },
+			versionId,
+			previousVersionId,
+			rollback: "not-needed"
+		};
+	}
+	return null;
+}
 async function verifyReadinessStagingOwner(options, configPath, previousVersionId, versionId) {
 	const owner = await readCurrentProductionVersion(options, configPath);
 	if (owner.kind === "failed") return {
@@ -2315,12 +2290,6 @@ function workersDevSubdomainResult(url) {
 	const workersDevSubdomain = extractWorkersDevSubdomain(url);
 	return workersDevSubdomain ? { workersDevSubdomain } : {};
 }
-function isCompletedCommand(result) {
-	return Number.isSafeInteger(result.status) && result.status >= 0 && result.signal == null && (result.error == null || result.error === "");
-}
-function isCleanCommandExit(result) {
-	return result.status === 0 && isCompletedCommand(result);
-}
 function defaultSleep(milliseconds) {
 	return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
@@ -2372,7 +2341,7 @@ function createCloudflareMetadataRunner(options) {
 				if (response.status === 401 || response.status === 403) tokenPromise = void 0;
 				if (response.ok) {
 					const body = await response.json();
-					if (record(body) && body.success === true && record(body.result)) {
+					if (isRecord(body) && body.success === true && isRecord(body.result)) {
 						const result = body.result;
 						if (kind === "deployment" && Array.isArray(result.deployments)) {
 							const latest = result.deployments[0];
@@ -2382,7 +2351,7 @@ function createCloudflareMetadataRunner(options) {
 								stderr: `The Worker ${options.workerName} has no deployments.`,
 								errorCode: 10007
 							};
-							if (record(latest) && Array.isArray(latest.versions)) return {
+							if (isRecord(latest) && Array.isArray(latest.versions)) return {
 								status: 0,
 								stdout: "",
 								data: latest,
@@ -2397,7 +2366,7 @@ function createCloudflareMetadataRunner(options) {
 						};
 						if (kind === "versions" && Array.isArray(result.items)) {
 							const items = result.items;
-							if (items.every((item) => record(item) && record(item.metadata) && typeof item.metadata.created_on === "string")) return {
+							if (items.every((item) => isRecord(item) && isRecord(item.metadata) && typeof item.metadata.created_on === "string")) return {
 								status: 0,
 								stdout: "",
 								data: items.sort((a, b) => a.metadata.created_on.localeCompare(b.metadata.created_on)).slice(-10),
@@ -2415,8 +2384,5 @@ function createCloudflareMetadataRunner(options) {
 		return fallback(operation, runOptions);
 	};
 }
-function record(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 //#endregion
 export { CloudflareWorkerInspectionError, VOID_SECRET_DRAFT_SOURCE, activateCloudflareVersion, assertCloudflareBindingsPreserved, assertCloudflareDurableObjectLifecycleSupported, assertExistingCloudflareConfig, createCloudflareMetadataRunner, deployCloudflareVersionTraffic, deployCloudflareVersionTriggers, encodeCloudflareVersionMessage, executeCloudflareDeploy, extractWorkersDevSubdomain, normalizeWorkersDevSubdomain, parseCloudflareVersionMessage, parseRootWranglerConfig, readBindingFieldPresence, readCloudflareTriggerConfig, readCloudflareVersionMigrationTag, readCloudflareWorkerMigrationTag, readConfigEntryString, readExistingCloudflareWorker, readStoredResourceName, readWranglerTopLevelString, renderCloudflareStaticEntry, resolveD1MigrateTarget, stabilizeCloudflareVersionTriggers, stageCloudflareStaticAssets, writeCloudflareFrameworkDeployConfig, writeCloudflareStaticDeployConfig };

package/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@void/deploy-cloudflare",
-  "version": "0.25.0",
+  "version": "0.26.1",
+  "description": "Cloudflare deployment primitives for Void runtimes and deployment adapters.",
+  "homepage": "https://void.cloud",
+  "bugs": {
+    "url": "https://github.com/voidzero-dev/void/issues"
+  },
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -20,15 +26,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@void/deploy-core": "0.25.0",
-    "jsonc-parser": "3.3.1"
+    "@void/deploy-core": "0.26.1",
+    "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20260702.1",
+    "@cloudflare/workers-types": "^5.20261009.1",
     "@types/node": "^26.6.4",
     "pathslash": "^0.1.0",
     "typescript": "7.0.2",
-    "vite-plus": "1.0.0"
+    "vite-plus": "1.1.0"
   },
   "scripts": {
     "build": "vp pack",