restore workflows

Author: emily-shen

packages/config/src/bindings.ts

@@ -606,6 +606,8 @@ export interface WorkerLoaderBinding {
 }
 
 interface WorkflowBindingOptions {
+	/** The user-chosen name of the Workflow. */
+	name: string;
 	/** The name of the Worker that defines the Workflow. */
 	workerName: string;
 	/** The exported class name of the Workflow. */

packages/config/src/convert.ts

@@ -561,17 +561,18 @@ function convertBindingsAndAssets(
 				break;
 			}
 			// TODO: re-enable when workflow bindings return.
-			// case "workflow": {
-			// 	workflows.push(
-			// 		omitUndefined({
-			// 			binding: name,
-			// 			class_name: binding.exportName,
-			// 			script_name: binding.workerName,
-			// 			remote: binding.remote,
-			// 		})
-			// 	);
-			// 	break;
-			// }
+			case "workflow": {
+				workflows.push(
+					omitUndefined({
+						binding: name,
+						name: binding.name,
+						class_name: binding.exportName,
+						script_name: binding.workerName,
+						remote: binding.remote,
+					})
+				);
+				break;
+			}
 		}
 	}
 

packages/config/src/index.ts

@@ -23,6 +23,7 @@ export {
 	UnsafeBindingSchema,
 	WorkerBindingSchema,
 	WorkerEntrypointExportSchema,
+	WorkflowExportSchema,
 } from "./schema";
 export { generateTypes } from "./generate";
 export { convertToWranglerConfig } from "./convert";

packages/config/src/schema.ts

@@ -201,12 +201,14 @@ export const KnownBindingSchema = z.discriminatedUnion("type", [
 	WorkerBindingSchema,
 	z.strictObject({ type: z.literal("worker-loader") }),
 	// TODO: support Workflows
-	// z.strictObject({
-	// 	type: z.literal("workflow"),
-	// 	workerName: z.string(),
-	// 	exportName: z.string(),
-	// 	remote: z.boolean().optional(),
-	// }),
+	// (MAY HAVE TO REVERT PARTIALLY OR PRETEND IT IS A MINIFLARE ONLY BINDING)
+	z.strictObject({
+		type: z.literal("workflow"),
+		name: z.string(),
+		workerName: z.string(),
+		exportName: z.string(),
+		remote: z.boolean().optional(),
+	}),
 ]);
 
 export const UnsafeBindingSchema = z.looseObject({
@@ -340,6 +342,14 @@ export const WorkerEntrypointExportSchema = z.strictObject({
 	cache: z.strictObject({ enabled: z.boolean() }).optional(),
 });
 
+// Exported for Miniflare's `MiniflareExportSchema`. Not yet added to the shared
+// `ExportSchema` union / public `Export` type — see "TODO: support Workflows".
+export const WorkflowExportSchema = z.strictObject({
+	type: z.literal("workflow"),
+	name: z.string(),
+	limits: z.strictObject({ steps: z.number().optional() }).optional(),
+});
+
 export const ExportSchema = z.union([
 	DurableObjectCreatedExportSchema,
 	DurableObjectDeletedExportSchema,
@@ -348,11 +358,6 @@ export const ExportSchema = z.union([
 	DurableObjectExpectingTransferExportSchema,
 	WorkerEntrypointExportSchema,
 	// TODO: support Workflows
-	// z.strictObject({
-	// 	type: z.literal("workflow"),
-	// 	name: z.string(),
-	// 	limits: z.strictObject({ steps: z.number().optional() }).optional(),
-	// }),
 ]);
 
 const LimitsSchema = z.strictObject({

packages/miniflare/src/config/schema.ts

@@ -12,6 +12,7 @@ import {
 	UnsafeBindingSchema,
 	WorkerBindingSchema,
 	WorkerEntrypointExportSchema,
+	WorkflowExportSchema,
 	KVBindingSchema,
 	D1BindingSchema,
 	R2BindingSchema,
@@ -344,6 +345,7 @@ const MiniflareExportSchema = z.union([
 	DurableObjectTransferredExportSchema,
 	DurableObjectExpectingTransferExportSchema,
 	WorkerEntrypointExportSchema,
+	WorkflowExportSchema,
 ]);
 
 // ---------------------------------------------------------------------------

packages/miniflare/src/index.ts

@@ -44,6 +44,7 @@ import {
 	getExportsOfType,
 	getGlobalServices,
 	getPersistPath,
+	getRemoteProxyConnectionString,
 	getTriggersOfType,
 	HELLO_WORLD_PLUGIN_NAME,
 	HOST_CAPNP_CONNECT,
@@ -475,6 +476,21 @@ function getExternalServiceEntrypoints(allWorkerOpts: ParsedWorkerOptions[]) {
 				getEntrypoints(workerName).classNames.add(exportName);
 			}
 		}
+
+		// Cross-worker workflow bindings: when `workerName` refers to a worker
+		// outside this Miniflare instance (registered in the dev registry), record
+		// its entrypoint so the dev-registry proxy exposes it. The workflows plugin
+		// reroutes the engine's USER_WORKFLOW binding through the proxy itself; here
+		// we only register the external entrypoint. Mirrors the DO block above.
+		for (const [, binding] of getEnvBindingsOfType(config, "workflow")) {
+			const { workerName, exportName } = binding;
+			if (
+				getRemoteProxyConnectionString(binding, dev) === undefined &&
+				!allWorkerNames.includes(workerName)
+			) {
+				getEntrypoints(workerName).entrypoints.add(exportName);
+			}
+		}
 	}
 
 	return externalServices;

packages/miniflare/src/plugins/index.ts

@@ -60,7 +60,7 @@ export const PLUGINS = {
 	[HYPERDRIVE_PLUGIN_NAME]: HYPERDRIVE_PLUGIN,
 	[RATELIMIT_PLUGIN_NAME]: RATELIMIT_PLUGIN,
 	[ASSETS_PLUGIN_NAME]: ASSETS_PLUGIN,
-	// [WORKFLOWS_PLUGIN_NAME]: WORKFLOWS_PLUGIN,
+	[WORKFLOWS_PLUGIN_NAME]: WORKFLOWS_PLUGIN,
 	[PIPELINES_PLUGIN_NAME]: PIPELINE_PLUGIN,
 	[SECRET_STORE_PLUGIN_NAME]: SECRET_STORE_PLUGIN,
 	[EMAIL_PLUGIN_NAME]: EMAIL_PLUGIN,