devflare 1.0.0-next.1 → 1.0.0-next.10

package/dist/{dev-qnxet3j9.js → dev-rk8p6pse.js}

@@ -1,22 +1,40 @@
+import {
+  detectViteProject,
+  stopSpawnedProcessTree,
+  waitForViteReady
+} from "./index-y1d8za14.js";
+import {
+  prepareComposedWorkerEntrypoint
+} from "./index-ws68xvq2.js";
+import {
+  discoverRoutes,
+  getRouteDirectoryCandidate
+} from "./index-1p814k7s.js";
+import {
+  findDurableObjectClasses,
+  transformDurableObject
+} from "./index-9wt9x09k.js";
 import {
   findFiles
 } from "./index-rbht7m9r.js";
 import {
-  findDurableObjectClasses
-} from "./index-gz1gndna.js";
+  clearLocalSendEmailBindings,
+  setLocalSendEmailBindings
+} from "./index-fef08w43.js";
 import {
-  loadConfig
-} from "./index-hcex3rgh.js";
+  loadConfig,
+  resolveConfigPath
+} from "./index-1phx14av.js";
 import {
   __require
 } from "./index-37x76zdn.js";
 
 // src/cli/commands/dev.ts
 import { createConsola } from "consola";
-import { resolve as resolve3 } from "pathe";
+import { relative as relative2, resolve as resolve3 } from "pathe";
 
 // src/dev-server/server.ts
-import { resolve as resolve2 } from "pathe";
+import { dirname as dirname2, resolve as resolve2 } from "pathe";
 
 // src/bundler/do-bundler.ts
 import { resolve, dirname, relative } from "pathe";
@@ -55,13 +73,141 @@ function stripDecoratorSyntax(code) {
   });
   return result;
 }
-async function bundleDOFile(sourcePath, className, outDir, cwd) {
+function toArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+function matchesExternalPattern(pattern, id) {
+  if (pattern instanceof RegExp) {
+    pattern.lastIndex = 0;
+    return pattern.test(id);
+  }
+  return pattern === id;
+}
+function matchesExternalOption(option, id, parentId, isResolved) {
+  if (!option) {
+    return false;
+  }
+  if (typeof option === "function") {
+    return option(id, parentId, isResolved) ?? false;
+  }
+  return toArray(option).some((pattern) => matchesExternalPattern(pattern, id));
+}
+function mergeExternalOptions(base, user) {
+  if (!base) {
+    return user;
+  }
+  if (!user) {
+    return base;
+  }
+  if (typeof base !== "function" && typeof user !== "function") {
+    return [...toArray(base), ...toArray(user)];
+  }
+  return (id, parentId, isResolved) => {
+    return matchesExternalOption(base, id, parentId, isResolved) || matchesExternalOption(user, id, parentId, isResolved) || false;
+  };
+}
+function mergePluginOptions(base, user) {
+  if (!base) {
+    return user;
+  }
+  if (!user) {
+    return base;
+  }
+  return [base, user];
+}
+function mergeResolveOptions(base, user) {
+  if (!base) {
+    return user;
+  }
+  if (!user) {
+    return base;
+  }
+  return {
+    ...user,
+    ...base,
+    alias: {
+      ...user.alias ?? {},
+      ...base.alias ?? {}
+    }
+  };
+}
+function resolveDOBundleRolldownConfig(options) {
+  const {
+    output: userOutputOptions,
+    input: _ignoredInput,
+    cwd: _ignoredCwd,
+    platform: _ignoredPlatform,
+    watch: _ignoredWatch,
+    external: userExternal,
+    plugins: userPlugins,
+    resolve: userResolve,
+    tsconfig: userTsconfig,
+    ...userInputOptions
+  } = options.rolldownOptions ?? {};
+  const {
+    codeSplitting: _ignoredCodeSplitting,
+    dir: _ignoredDir,
+    file: _ignoredFile,
+    format: _ignoredFormat,
+    inlineDynamicImports: _ignoredInlineDynamicImports,
+    ...safeUserOutputOptions
+  } = userOutputOptions ?? {};
+  const defaultExternalModules = [
+    /^cloudflare:/,
+    /^node:/,
+    "buffer",
+    "crypto",
+    "events",
+    "http",
+    "https",
+    "net",
+    "os",
+    "path",
+    "stream",
+    "tls",
+    "url",
+    "util",
+    "zlib",
+    "fs",
+    "child_process",
+    "async_hooks",
+    "querystring",
+    "string_decoder",
+    "assert",
+    "dns"
+  ];
+  return {
+    inputOptions: {
+      ...userInputOptions,
+      input: options.inputFile,
+      cwd: options.cwd,
+      platform: "neutral",
+      tsconfig: userTsconfig ?? resolve(options.cwd, "tsconfig.json"),
+      external: mergeExternalOptions(defaultExternalModules, userExternal),
+      plugins: mergePluginOptions(undefined, userPlugins),
+      resolve: mergeResolveOptions({
+        alias: {
+          debug: options.debugShimPath
+        }
+      }, userResolve)
+    },
+    outputOptions: {
+      ...safeUserOutputOptions,
+      file: options.outFile,
+      format: "esm",
+      sourcemap: safeUserOutputOptions.sourcemap ?? options.sourcemap ?? false,
+      minify: safeUserOutputOptions.minify ?? options.minify,
+      codeSplitting: false
+    }
+  };
+}
+async function bundleDOFile(sourcePath, className, outDir, cwd, bundleOptions) {
   const { rolldown } = await import("rolldown");
   const fs = await import("node:fs/promises");
   await fs.mkdir(outDir, { recursive: true });
   const sourceCode = await fs.readFile(sourcePath, "utf-8");
-  const cleanedCode = stripDecoratorSyntax(sourceCode);
-  const entryCode = `${cleanedCode}
+  const transformedCode = (await transformDurableObject(sourceCode, sourcePath))?.code ?? stripDecoratorSyntax(sourceCode);
+  const entryCode = `${transformedCode}
 
 // Default export for worker (required by Miniflare)
 export default {
@@ -70,7 +216,7 @@ export default {
 	}
 };
 `;
-  const tempFilePath = resolve(outDir, `_temp_${className}.ts`);
+  const tempFilePath = resolve(dirname(sourcePath), `.devflare-temp-${className}.ts`);
   await fs.writeFile(tempFilePath, entryCode, "utf-8");
   const classOutDir = resolve(outDir, className);
   try {
@@ -94,54 +240,25 @@ export default createDebug
 `;
   const debugShimPath = resolve(outDir, "_debug_shim.js");
   await fs.writeFile(debugShimPath, debugShimCode, "utf-8");
-  const bundle = await rolldown({
-    input: tempFilePath,
-    platform: "neutral",
-    tsconfig: resolve(cwd, "tsconfig.json"),
-    external: [
-      /^cloudflare:/,
-      /^node:/,
-      "buffer",
-      "crypto",
-      "events",
-      "http",
-      "https",
-      "net",
-      "os",
-      "path",
-      "stream",
-      "tls",
-      "url",
-      "util",
-      "zlib",
-      "fs",
-      "child_process",
-      "async_hooks",
-      "querystring",
-      "string_decoder",
-      "assert",
-      "dns"
-    ],
-    resolve: {
-      alias: {
-        debug: debugShimPath
-      }
-    }
-  });
   const outFile = resolve(classOutDir, "index.js");
-  await bundle.write({
-    file: outFile,
-    format: "esm",
-    sourcemap: false,
-    inlineDynamicImports: true
+  const { inputOptions, outputOptions } = resolveDOBundleRolldownConfig({
+    cwd,
+    inputFile: tempFilePath,
+    outFile,
+    debugShimPath,
+    rolldownOptions: bundleOptions?.rolldownOptions,
+    sourcemap: bundleOptions?.sourcemap,
+    minify: bundleOptions?.minify
   });
+  const bundle = await rolldown(inputOptions);
+  await bundle.write(outputOptions);
   await bundle.close();
   try {
     await fs.unlink(tempFilePath);
   } catch {}
   return resolve(classOutDir, "index.js");
 }
-async function bundleAllDOs(discovered, outDir, cwd, logger) {
+async function bundleAllDOs(discovered, outDir, cwd, logger, bundleOptions) {
   const fs = await import("node:fs/promises");
   const bundles = new Map;
   const classes = new Map;
@@ -155,7 +272,7 @@ async function bundleAllDOs(discovered, outDir, cwd, logger) {
   for (const do_ of discovered) {
     try {
       logger?.debug(`Bundling ${do_.className} from ${do_.filePath}`);
-      const outFile = await bundleDOFile(do_.filePath, do_.className, outDir, cwd);
+      const outFile = await bundleDOFile(do_.filePath, do_.className, outDir, cwd, bundleOptions);
       bundles.set(do_.bindingName, outFile);
       classes.set(do_.bindingName, do_.className);
       logger?.debug(`  → ${outFile}`);
@@ -168,7 +285,7 @@ async function bundleAllDOs(discovered, outDir, cwd, logger) {
   return { bundles, classes, sourceFiles, errors };
 }
 function createDOBundler(options) {
-  const { cwd, pattern, outDir, logger, onRebuild } = options;
+  const { cwd, pattern, outDir, logger, onRebuild, rolldownOptions, sourcemap, minify } = options;
   let result = {
     bundles: new Map,
     classes: new Map,
@@ -187,7 +304,11 @@ function createDOBundler(options) {
     for (const do_ of discovered) {
       logger?.info(`  • ${do_.className} → ${do_.bindingName}`);
     }
-    result = await bundleAllDOs(discovered, outDir, cwd, logger);
+    result = await bundleAllDOs(discovered, outDir, cwd, logger, {
+      rolldownOptions,
+      sourcemap,
+      minify
+    });
     if (result.errors.length === 0) {
       logger?.success(`Bundled ${result.bundles.size} DO(s) to ${outDir}`);
     }
@@ -1087,9 +1208,173 @@ async function checkRemoteBindingRequirements(config) {
   };
 }
 
+// src/dev-server/miniflare-log.ts
+var ANSI_ESCAPE_REGEX = /\u001B\[[0-9;]*m/g;
+var COMPATIBILITY_DATE_FALLBACK_REGEX = /^The latest compatibility date supported by the installed Cloudflare Workers Runtime is "([^"]+)", but you've requested "([^"]+)"\. Falling back to "([^"]+)"\.\.\.$/;
+function normalizeMiniflareMessage(message) {
+  return message.replace(ANSI_ESCAPE_REGEX, "").replace(/\s+/g, " ").trim();
+}
+function formatCompatibilityDateFallbackNotice(message) {
+  const normalizedMessage = normalizeMiniflareMessage(message);
+  const match = COMPATIBILITY_DATE_FALLBACK_REGEX.exec(normalizedMessage);
+  if (!match) {
+    return null;
+  }
+  const [, _supportedDate, requestedDate, fallbackDate] = match;
+  return `Using latest supported Cloudflare Workers Runtime compatibility date ${fallbackDate} (requested ${requestedDate})`;
+}
+function createCompatibilityAwareMiniflareLog(BaseLog, level, logger) {
+  const log = new BaseLog(level);
+  const originalWarn = log.warn.bind(log);
+  const originalInfo = log.info.bind(log);
+  log.warn = (message) => {
+    const notice = formatCompatibilityDateFallbackNotice(message);
+    if (!notice) {
+      originalWarn(message);
+      return;
+    }
+    if (logger) {
+      logger.info(notice);
+      return;
+    }
+    originalInfo(notice);
+  };
+  return log;
+}
+
+// src/dev-server/runtime-stdio.ts
+import { createInterface } from "node:readline";
+function writeStdout(logger, message) {
+  if (typeof logger?.log === "function") {
+    logger.log(message);
+    return;
+  }
+  if (typeof logger?.info === "function") {
+    logger.info(message);
+    return;
+  }
+  console.log(message);
+}
+function writeStderr(logger, message) {
+  if (typeof logger?.error === "function") {
+    logger.error(message);
+    return;
+  }
+  console.error(message);
+}
+function createRuntimeStdioForwarder(logger) {
+  return (stdout, stderr) => {
+    createInterface({ input: stdout }).on("line", (data) => {
+      writeStdout(logger, data);
+    });
+    createInterface({ input: stderr }).on("line", (data) => {
+      writeStderr(logger, data);
+    });
+  };
+}
+
 // src/dev-server/server.ts
-function getGatewayScript(wsRoutes = [], debug = false) {
+var DEFAULT_FETCH_ENTRY_FILES = [
+  "src/fetch.ts",
+  "src/fetch.js",
+  "src/fetch.mts",
+  "src/fetch.mjs"
+];
+var DEFAULT_QUEUE_ENTRY_FILES = [
+  "src/queue.ts",
+  "src/queue.js",
+  "src/queue.mts",
+  "src/queue.mjs"
+];
+var DEFAULT_SCHEDULED_ENTRY_FILES = [
+  "src/scheduled.ts",
+  "src/scheduled.js",
+  "src/scheduled.mts",
+  "src/scheduled.mjs"
+];
+var DEFAULT_EMAIL_ENTRY_FILES = [
+  "src/email.ts",
+  "src/email.js",
+  "src/email.mts",
+  "src/email.mjs"
+];
+var INTERNAL_APP_SERVICE_BINDING = "__DEVFLARE_APP";
+function formatErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+async function resolveWorkerHandlerPath(cwd, configuredPath, defaultEntries) {
+  if (configuredPath === false) {
+    return null;
+  }
+  const fs = await import("node:fs/promises");
+  const candidates = new Set;
+  if (typeof configuredPath === "string" && configuredPath) {
+    candidates.add(configuredPath);
+  }
+  for (const defaultEntry of defaultEntries) {
+    candidates.add(defaultEntry);
+  }
+  for (const candidate of candidates) {
+    const absolutePath = resolve2(cwd, candidate);
+    try {
+      await fs.access(absolutePath);
+      return absolutePath;
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
+async function resolveMainWorkerSurfacePaths(cwd, config) {
+  return {
+    fetch: await resolveWorkerHandlerPath(cwd, config.files?.fetch, DEFAULT_FETCH_ENTRY_FILES),
+    queue: await resolveWorkerHandlerPath(cwd, config.files?.queue, DEFAULT_QUEUE_ENTRY_FILES),
+    scheduled: await resolveWorkerHandlerPath(cwd, config.files?.scheduled, DEFAULT_SCHEDULED_ENTRY_FILES),
+    email: await resolveWorkerHandlerPath(cwd, config.files?.email, DEFAULT_EMAIL_ENTRY_FILES)
+  };
+}
+function hasWorkerSurfacePaths(surfacePaths) {
+  return Object.values(surfacePaths).some((surfacePath) => typeof surfacePath === "string" && surfacePath.length > 0);
+}
+function addWorkerWatchRoots(roots, cwd, configuredPath, defaultEntries) {
+  if (configuredPath === false) {
+    return;
+  }
+  if (typeof configuredPath === "string" && configuredPath) {
+    roots.add(dirname2(resolve2(cwd, configuredPath)));
+    return;
+  }
+  for (const defaultEntry of defaultEntries) {
+    roots.add(dirname2(resolve2(cwd, defaultEntry)));
+  }
+}
+function collectWorkerWatchRoots(cwd, config, mainWorkerSurfacePaths) {
+  const roots = new Set;
+  const addFileParent = (filePath) => {
+    if (typeof filePath !== "string" || !filePath) {
+      return;
+    }
+    roots.add(dirname2(resolve2(cwd, filePath)));
+  };
+  for (const surfacePath of Object.values(mainWorkerSurfacePaths)) {
+    if (surfacePath) {
+      roots.add(dirname2(surfacePath));
+    }
+  }
+  addWorkerWatchRoots(roots, cwd, config.files?.fetch, DEFAULT_FETCH_ENTRY_FILES);
+  addWorkerWatchRoots(roots, cwd, config.files?.queue, DEFAULT_QUEUE_ENTRY_FILES);
+  addWorkerWatchRoots(roots, cwd, config.files?.scheduled, DEFAULT_SCHEDULED_ENTRY_FILES);
+  addWorkerWatchRoots(roots, cwd, config.files?.email, DEFAULT_EMAIL_ENTRY_FILES);
+  addFileParent(config.files?.transport);
+  const routeDirectory = getRouteDirectoryCandidate(cwd, config);
+  if (routeDirectory) {
+    roots.add(routeDirectory.absoluteDir);
+  }
+  return [...roots];
+}
+function getGatewayScript(wsRoutes = [], debug = false, appServiceBindingName = null) {
   const wsRoutesJson = JSON.stringify(wsRoutes);
+  const appServiceBindingJson = JSON.stringify(appServiceBindingName);
   return `
 // Bridge Gateway Worker — RPC Handler
 // Handles all binding operations via WebSocket RPC
@@ -1104,6 +1389,7 @@ const incomingStreams = new Map()
 
 // WebSocket routes configuration (injected at build time)
 const WS_ROUTES = ${wsRoutesJson}
+const APP_SERVICE_BINDING = ${appServiceBindingJson}
 
 export default {
 	async fetch(request, env, ctx) {
@@ -1144,6 +1430,13 @@ export default {
 			}), { headers: { 'Content-Type': 'application/json' } })
 		}
 
+		if (APP_SERVICE_BINDING) {
+			const appWorker = env[APP_SERVICE_BINDING]
+			if (appWorker && typeof appWorker.fetch === 'function') {
+				return appWorker.fetch(request)
+			}
+		}
+
 		return new Response('Devflare Bridge Gateway', { status: 200 })
 	}
 }
@@ -1198,69 +1491,27 @@ async function handleEmailIncoming(request, env, ctx, url) {
 		const rawBody = await request.text()
 		
 		log('Email incoming:', { from, to, bodyLength: rawBody.length })
-		
-		// Parse headers from raw email for the Headers object
-		const headerLines = []
-		const lines = rawBody.split(/\\r?\\n/)
-		let bodyStart = 0
-		for (let i = 0; i < lines.length; i++) {
-			if (lines[i].trim() === '') {
-				bodyStart = i + 1
-				break
-			}
-			headerLines.push(lines[i])
-		}
-		
-		const headers = new Headers()
-		for (const line of headerLines) {
-			const colonIdx = line.indexOf(':')
-			if (colonIdx > 0) {
-				const key = line.slice(0, colonIdx).trim()
-				const value = line.slice(colonIdx + 1).trim()
-				headers.append(key, value)
-			}
-		}
-		
-		// Create ReadableStream from raw email
-		const rawStream = new ReadableStream({
-			start(controller) {
-				controller.enqueue(new TextEncoder().encode(rawBody))
-				controller.close()
-			}
-		})
-		
-		// Create ForwardableEmailMessage-like object
-		const emailMessage = {
-			from,
-			to,
-			headers,
-			raw: rawStream,
-			rawSize: rawBody.length,
-			
-			setReject(reason) {
-				log('Email rejected:', reason)
-			},
-			
-			async forward(rcptTo, extraHeaders) {
-				log('Email forwarded to:', rcptTo)
-				return Promise.resolve()
-			},
-			
-			async reply(message) {
-				log('Email reply sent to:', message.from)
-				return Promise.resolve()
+
+		if (APP_SERVICE_BINDING) {
+			const appWorker = env[APP_SERVICE_BINDING]
+			if (appWorker && typeof appWorker.fetch === 'function') {
+				const response = await appWorker.fetch(new Request('http://devflare.internal/_devflare/internal/email', {
+					method: 'POST',
+					headers: {
+						'x-devflare-event': 'email',
+						'x-devflare-email-from': from,
+						'x-devflare-email-to': to,
+						'content-type': request.headers.get('content-type') || 'text/plain'
+					},
+					body: rawBody
+				}))
+
+				if (!response.ok) {
+					return response
+				}
 			}
 		}
 		
-		// Look for email handler in the worker module
-		// For now, we call via a special RPC method that DO workers can implement
-		// The email binding should be configured in the worker
-		
-		// Check if there's an EMAIL_HANDLER binding (special DO for email handling)
-		if (env.__emailHandler && typeof env.__emailHandler.email === 'function') {
-			await env.__emailHandler.email(emailMessage, env, ctx)
-		}
-		
 		return new Response(JSON.stringify({ ok: true, from, to }), {
 			headers: { 'Content-Type': 'application/json' }
 		})
@@ -1373,6 +1624,7 @@ async function executeRpcMethod(method, params, env, ctx) {
 	const bindingName = parts[0]
 	const operation = parts.slice(1).join('.')
 	const binding = env[bindingName]
+	const RAW_EMAIL = 'EmailMessage::raw'
 
 	if (!binding) throw new Error('Binding not found: ' + bindingName)
 
@@ -1507,10 +1759,17 @@ async function executeRpcMethod(method, params, env, ctx) {
 
 	// Email send operations (send_email binding)
 	if (operation === 'email.send') {
-		log('Email send:', { from: params[0]?.from, to: params[0]?.to })
-		// In local dev, we just log the email - Miniflare handles writing to file
+		const message = params[0]
+		log('Email send:', { from: message?.from, to: message?.to })
 		if (binding && typeof binding.send === 'function') {
-			return binding.send(params[0])
+			if (message && typeof message === 'object' && 'from' in message && 'to' in message && 'raw' in message) {
+				return binding.send({
+					from: message.from,
+					to: message.to,
+					[RAW_EMAIL]: createEmailMessageRaw(message.raw)
+				})
+			}
+			return binding.send(message)
 		}
 		// Return success even if no real binding (simulated)
 		return { ok: true, simulated: true }
@@ -1519,6 +1778,16 @@ async function executeRpcMethod(method, params, env, ctx) {
 	throw new Error('Unknown operation: ' + method)
 }
 
+function createEmailMessageRaw(raw) {
+	if (typeof raw === 'string' || raw instanceof ReadableStream) {
+		return raw
+	}
+	if (raw instanceof ArrayBuffer || raw instanceof Uint8Array) {
+		return new Response(raw).body
+	}
+	throw new Error('Unsupported EmailMessage raw payload')
+}
+
 async function handleWsOpen(msg, ws, env) {
 	try {
 		const binding = env[msg.target.binding]
@@ -1663,6 +1932,7 @@ function createDevServer(options) {
     configPath,
     vitePort = 5173,
     miniflarePort = 8787,
+    enableVite = true,
     persist = true,
     logger,
     verbose = false,
@@ -1670,15 +1940,90 @@ function createDevServer(options) {
   } = options;
   let miniflare = null;
   let doBundler = null;
+  let workerSourceWatcher = null;
+  let workerWatchTargets = [];
   let viteProcess = null;
   let config = null;
   let browserShim = null;
   let browserShimPort = 8788;
+  let mainWorkerSurfacePaths = {
+    fetch: null,
+    queue: null,
+    scheduled: null,
+    email: null
+  };
+  let resolvedWorkerConfigPath = null;
+  let mainWorkerScriptPath = null;
+  let bundledMainWorkerScriptPath = null;
+  let currentDoResult = null;
+  let mainWorkerRoutes = null;
+  let reloadChain = Promise.resolve();
+  async function bundleMainWorker() {
+    if (!mainWorkerScriptPath) {
+      bundledMainWorkerScriptPath = null;
+      return;
+    }
+    if (typeof Bun === "undefined" || typeof Bun.build !== "function") {
+      throw new Error("Worker-only dev mode requires the Bun runtime for main worker bundling");
+    }
+    const fs = await import("node:fs/promises");
+    const outDir = resolve2(cwd, ".devflare", "worker-bundles");
+    await fs.rm(outDir, { recursive: true, force: true });
+    await fs.mkdir(outDir, { recursive: true });
+    const result = await Bun.build({
+      entrypoints: [mainWorkerScriptPath],
+      outdir: outDir,
+      target: "browser",
+      conditions: ["browser"],
+      format: "esm",
+      minify: false,
+      splitting: false,
+      external: ["cloudflare:workers", "cloudflare:*", "node:*"]
+    });
+    if (!result.success || result.outputs.length === 0) {
+      const logs = result.logs.map((log) => ("message" in log) ? log.message : String(log)).join(`
+`);
+      throw new Error(`Failed to bundle main worker:
+${logs}`);
+    }
+    bundledMainWorkerScriptPath = result.outputs[0].path;
+    logger?.debug(`Bundled main worker → ${bundledMainWorkerScriptPath}`);
+  }
   function buildMiniflareConfig(doResult) {
     if (!config)
       throw new Error("Config not loaded");
-    const bindings = config.bindings ?? {};
+    const loadedConfig = config;
+    const bindings = loadedConfig.bindings ?? {};
     const persistPath = resolve2(cwd, ".devflare/data");
+    const appWorkerName = loadedConfig.name;
+    const shouldRunMainWorker = !enableVite && (hasWorkerSurfacePaths(mainWorkerSurfacePaths) || Boolean(mainWorkerRoutes?.routes.length));
+    const queueProducers = (() => {
+      if (!bindings.queues?.producers) {
+        return;
+      }
+      const producers = {};
+      for (const [bindingName, queueName] of Object.entries(bindings.queues.producers)) {
+        producers[bindingName] = { queueName };
+      }
+      return producers;
+    })();
+    const queueConsumers = (() => {
+      if (!bindings.queues?.consumers || bindings.queues.consumers.length === 0) {
+        return;
+      }
+      const consumers = {};
+      for (const consumer of bindings.queues.consumers) {
+        consumers[consumer.queue] = {
+          ...consumer.maxBatchSize !== undefined && { maxBatchSize: consumer.maxBatchSize },
+          ...consumer.maxBatchTimeout !== undefined && { maxBatchTimeout: consumer.maxBatchTimeout },
+          ...consumer.maxRetries !== undefined && { maxRetries: consumer.maxRetries },
+          ...consumer.deadLetterQueue && { deadLetterQueue: consumer.deadLetterQueue },
+          ...consumer.maxConcurrency !== undefined && { maxConcurrency: consumer.maxConcurrency },
+          ...consumer.retryDelay !== undefined && { retryDelay: consumer.retryDelay }
+        };
+      }
+      return consumers;
+    })();
     const sharedOptions = {
       port: miniflarePort,
       host: "127.0.0.1",
@@ -1687,19 +2032,85 @@ function createDevServer(options) {
       d1Persist: persist ? `${persistPath}/d1` : undefined,
       durableObjectsPersist: persist ? `${persistPath}/do` : undefined
     };
-    const gatewayWorker = {
-      name: "gateway",
-      modules: true,
-      script: getGatewayScript(config.wsRoutes, debug),
-      compatibilityDate: config.compatibilityDate,
-      compatibilityFlags: config.compatibilityFlags ?? [],
-      routes: ["*"],
-      kvNamespaces: bindings.kv ? bindings.kv : undefined,
-      r2Buckets: bindings.r2 ? bindings.r2 : undefined,
-      d1Databases: bindings.d1 ? bindings.d1 : undefined,
-      bindings: config.vars
+    const createServiceBindings = (extraBindings = {}) => {
+      const serviceBindings = {};
+      if (bindings.services) {
+        for (const [bindingName, serviceConfig] of Object.entries(bindings.services)) {
+          serviceBindings[bindingName] = {
+            name: serviceConfig.service,
+            ...serviceConfig.entrypoint && { entrypoint: serviceConfig.entrypoint }
+          };
+        }
+      }
+      for (const [bindingName, target] of Object.entries(extraBindings)) {
+        serviceBindings[bindingName] = target;
+      }
+      return Object.keys(serviceBindings).length > 0 ? serviceBindings : undefined;
     };
-    if (!doResult || doResult.bundles.size === 0) {
+    const sendEmailConfig = bindings.sendEmail ? {
+      send_email: Object.entries(bindings.sendEmail).map(([name, binding]) => ({
+        name,
+        ...binding.destinationAddress && {
+          destination_address: binding.destinationAddress
+        },
+        ...binding.allowedDestinationAddresses && {
+          allowed_destination_addresses: binding.allowedDestinationAddresses
+        },
+        ...binding.allowedSenderAddresses && {
+          allowed_sender_addresses: binding.allowedSenderAddresses
+        }
+      }))
+    } : undefined;
+    const createWorkerConfig = (options2) => {
+      const baseFlags = loadedConfig.compatibilityFlags ?? [];
+      const compatFlags = baseFlags.includes("nodejs_compat") ? baseFlags : [...baseFlags, "nodejs_compat"];
+      const workerBindings = loadedConfig.vars ?? {};
+      const workerConfig = {
+        name: options2.name,
+        modules: true,
+        compatibilityDate: loadedConfig.compatibilityDate,
+        compatibilityFlags: compatFlags,
+        ...bindings.kv && { kvNamespaces: bindings.kv },
+        ...bindings.r2 && { r2Buckets: bindings.r2 },
+        ...bindings.d1 && { d1Databases: bindings.d1 },
+        ...Object.keys(workerBindings).length > 0 && { bindings: workerBindings },
+        ...sendEmailConfig && { email: sendEmailConfig },
+        ...queueProducers && { queueProducers },
+        ...options2.queueConsumers && { queueConsumers: options2.queueConsumers },
+        ...options2.triggers && { triggers: options2.triggers }
+      };
+      if (options2.scriptPath) {
+        workerConfig.scriptPath = options2.scriptPath;
+        workerConfig.modulesRoot = cwd;
+        workerConfig.modulesRules = [
+          { type: "ESModule", include: ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.mjs"] },
+          { type: "CommonJS", include: ["**/*.js", "**/*.cjs"] },
+          { type: "ESModule", include: ["**/*.jsx"] }
+        ];
+      }
+      if (options2.script) {
+        workerConfig.script = options2.script;
+      }
+      if (options2.durableObjects && Object.keys(options2.durableObjects).length > 0) {
+        workerConfig.durableObjects = options2.durableObjects;
+      }
+      if (options2.serviceBindings && Object.keys(options2.serviceBindings).length > 0) {
+        workerConfig.serviceBindings = options2.serviceBindings;
+      }
+      return workerConfig;
+    };
+    const gatewayWorker = createWorkerConfig({
+      name: "gateway",
+      script: getGatewayScript(loadedConfig.wsRoutes, debug, shouldRunMainWorker ? INTERNAL_APP_SERVICE_BINDING : null),
+      serviceBindings: shouldRunMainWorker ? createServiceBindings({
+        [INTERNAL_APP_SERVICE_BINDING]: { name: appWorkerName }
+      }) : createServiceBindings()
+    });
+    gatewayWorker.routes = ["*"];
+    const hasDurableObjectBundles = !!doResult && doResult.bundles.size > 0;
+    const browserBindingName = bindings.browser?.binding;
+    const needsBrowserWorker = Boolean(browserBindingName && (hasDurableObjectBundles || shouldRunMainWorker));
+    if (!shouldRunMainWorker && !hasDurableObjectBundles && !needsBrowserWorker) {
       return {
         ...sharedOptions,
         ...gatewayWorker
@@ -1708,56 +2119,64 @@ function createDevServer(options) {
     const workers = [];
     const durableObjects = {};
     const browserShimUrl = `http://127.0.0.1:${browserShimPort}`;
-    const browserBindingName = bindings.browser?.binding;
     const browserWorkerName = "browser-binding";
-    for (const [bindingName, bundlePath] of doResult.bundles) {
-      const className = doResult.classes.get(bindingName);
-      if (!className)
-        continue;
-      const workerName = `do-${bindingName.toLowerCase()}`;
-      const baseFlags = config.compatibilityFlags ?? [];
-      const compatFlags = baseFlags.includes("nodejs_compat") ? baseFlags : [...baseFlags, "nodejs_compat"];
-      const workerConfig = {
-        name: workerName,
-        modules: true,
-        modulesRoot: cwd,
-        modulesRules: [
-          { type: "CommonJS", include: ["**/*.js", "**/*.cjs"] },
-          { type: "ESModule", include: ["**/*.mjs"] }
-        ],
-        scriptPath: bundlePath,
-        compatibilityDate: config.compatibilityDate,
-        compatibilityFlags: compatFlags,
-        durableObjects: {
-          [bindingName]: className
+    if (shouldRunMainWorker && mainWorkerScriptPath) {
+      const mainWorkerServiceBindings = createServiceBindings(browserBindingName ? {
+        [browserBindingName]: { name: browserWorkerName }
+      } : {});
+      const mainWorkerConfig = createWorkerConfig({
+        name: appWorkerName,
+        scriptPath: bundledMainWorkerScriptPath ?? mainWorkerScriptPath,
+        serviceBindings: mainWorkerServiceBindings,
+        queueConsumers,
+        triggers: loadedConfig.triggers?.crons?.length ? { crons: loadedConfig.triggers.crons } : undefined
+      });
+      workers.push(mainWorkerConfig);
+    }
+    if (doResult) {
+      for (const [bindingName, bundlePath] of doResult.bundles) {
+        const className = doResult.classes.get(bindingName);
+        if (!className)
+          continue;
+        const workerName = `do-${bindingName.toLowerCase()}`;
+        const workerConfig = createWorkerConfig({
+          name: workerName,
+          scriptPath: bundlePath,
+          durableObjects: {
+            [bindingName]: className
+          },
+          serviceBindings: createServiceBindings(browserBindingName ? {
+            [browserBindingName]: { name: browserWorkerName }
+          } : {})
+        });
+        if (browserBindingName) {
+          logger?.debug(`DO ${workerName} has browser service binding: ${browserBindingName} → ${browserWorkerName}`);
         }
-      };
-      if (browserBindingName) {
-        workerConfig.serviceBindings = {
-          ...workerConfig.serviceBindings,
-          [browserBindingName]: browserWorkerName
+        logger?.debug(`DO ${workerName} config:`, JSON.stringify(workerConfig, null, 2));
+        workers.push(workerConfig);
+        durableObjects[bindingName] = {
+          className,
+          scriptName: workerName
         };
-        logger?.debug(`DO ${workerName} has browser service binding: ${browserBindingName} → ${browserWorkerName}`);
       }
-      logger?.debug(`DO ${workerName} config:`, JSON.stringify(workerConfig, null, 2));
-      workers.push(workerConfig);
-      durableObjects[bindingName] = {
-        className,
-        scriptName: workerName
-      };
     }
-    if (browserBindingName) {
-      const browserWorker = {
+    if (needsBrowserWorker) {
+      const browserWorker = createWorkerConfig({
         name: browserWorkerName,
-        modules: true,
-        script: getBrowserBindingScript(browserShimUrl, debug),
-        compatibilityDate: config.compatibilityDate,
-        compatibilityFlags: config.compatibilityFlags ?? []
-      };
+        script: getBrowserBindingScript(browserShimUrl, debug)
+      });
       workers.push(browserWorker);
       logger?.info(`Browser binding worker configured: ${browserBindingName} → ${browserShimUrl}`);
     }
-    gatewayWorker.durableObjects = durableObjects;
+    if (Object.keys(durableObjects).length > 0) {
+      gatewayWorker.durableObjects = durableObjects;
+      if (shouldRunMainWorker) {
+        const mainWorker = workers.find((worker) => worker.name === appWorkerName);
+        if (mainWorker) {
+          mainWorker.durableObjects = durableObjects;
+        }
+      }
+    }
     return {
       ...sharedOptions,
       workers: [gatewayWorker, ...workers]
@@ -1766,59 +2185,223 @@ function createDevServer(options) {
   async function startMiniflare(doResult) {
     const { Miniflare, Log, LogLevel } = await import("miniflare");
     const mfConfig = buildMiniflareConfig(doResult);
-    mfConfig.log = new Log(LogLevel.DEBUG);
-    logger?.info("=== MINIFLARE CONFIG DEBUG ===");
-    logger?.info("Full config:", JSON.stringify(mfConfig, (key, value) => {
-      if (key === "script" && typeof value === "string" && value.length > 200) {
-        return value.substring(0, 200) + "...[truncated]";
-      }
-      return value;
-    }, 2));
-    if (mfConfig.workers) {
-      logger?.info("Workers order:");
-      for (const w of mfConfig.workers) {
-        logger?.info(`  → ${w.name}:`);
-        logger?.info(`      script: ${w.script ? "inline" : w.scriptPath}`);
-        logger?.info(`      browserRendering: ${JSON.stringify(w.browserRendering)}`);
-        logger?.info(`      durableObjects: ${JSON.stringify(w.durableObjects)}`);
+    mfConfig.log = createCompatibilityAwareMiniflareLog(Log, LogLevel.DEBUG, logger);
+    mfConfig.handleRuntimeStdio = createRuntimeStdioForwarder(logger);
+    const shouldLogMiniflareDiagnostics = verbose || debug;
+    if (shouldLogMiniflareDiagnostics) {
+      logger?.info("=== MINIFLARE CONFIG DEBUG ===");
+      logger?.info("Full config:", JSON.stringify(mfConfig, (key, value) => {
+        if (key === "script" && typeof value === "string" && value.length > 200) {
+          return value.substring(0, 200) + "...[truncated]";
+        }
+        return value;
+      }, 2));
+      if (mfConfig.workers) {
+        logger?.info("Workers order:");
+        for (const w of mfConfig.workers) {
+          logger?.info(`  → ${w.name}:`);
+          logger?.info(`      script: ${w.script ? "inline" : w.scriptPath}`);
+          logger?.info(`      browserRendering: ${JSON.stringify(w.browserRendering)}`);
+          logger?.info(`      durableObjects: ${JSON.stringify(w.durableObjects)}`);
+        }
       }
     }
     miniflare = new Miniflare(mfConfig);
     await miniflare.ready;
     logger?.success(`Miniflare ready on http://localhost:${miniflarePort}`);
-    try {
-      const gatewayBindings = await miniflare.getBindings("gateway");
-      logger?.info("Gateway worker bindings:", Object.keys(gatewayBindings));
-      if (mfConfig.workers) {
-        for (const w of mfConfig.workers) {
-          if (w.name !== "gateway") {
-            try {
-              const doBindings = await miniflare.getBindings(w.name);
-              logger?.info(`${w.name} worker bindings:`, Object.keys(doBindings));
-              if ("BROWSER" in doBindings) {
-                logger?.success(`${w.name} has BROWSER binding!`);
-              } else {
-                logger?.warn(`${w.name} is MISSING BROWSER binding`);
+    if (shouldLogMiniflareDiagnostics) {
+      try {
+        const gatewayBindings = await miniflare.getBindings("gateway");
+        logger?.info("Gateway worker bindings:", Object.keys(gatewayBindings));
+        if (mfConfig.workers) {
+          for (const w of mfConfig.workers) {
+            if (w.name !== "gateway") {
+              try {
+                const doBindings = await miniflare.getBindings(w.name);
+                logger?.info(`${w.name} worker bindings:`, Object.keys(doBindings));
+                if ("BROWSER" in doBindings) {
+                  logger?.success(`${w.name} has BROWSER binding!`);
+                } else {
+                  logger?.warn(`${w.name} is MISSING BROWSER binding`);
+                }
+              } catch (error) {
+                logger?.debug(`Skipping binding diagnostics for ${w.name}: ${formatErrorMessage(error)}`);
               }
-            } catch (e) {
-              logger?.warn(`Could not get bindings for ${w.name}:`, e);
             }
           }
         }
+      } catch (error) {
+        logger?.debug(`Skipping Miniflare binding diagnostics: ${formatErrorMessage(error)}`);
       }
-    } catch (e) {
-      logger?.warn("Error getting bindings:", e);
     }
   }
   async function reloadMiniflare(doResult) {
-    if (!miniflare)
+    currentDoResult = doResult;
+    const queuedReload = reloadChain.then(async () => {
+      if (!miniflare)
+        return;
+      const { Log, LogLevel } = await import("miniflare");
+      const mfConfig = buildMiniflareConfig(currentDoResult);
+      mfConfig.log = createCompatibilityAwareMiniflareLog(Log, LogLevel.DEBUG, logger);
+      mfConfig.handleRuntimeStdio = createRuntimeStdioForwarder(logger);
+      logger?.info("Reloading Miniflare...");
+      await miniflare.setOptions(mfConfig);
+      logger?.success("Miniflare reloaded");
+    });
+    reloadChain = queuedReload.catch(() => {});
+    await queuedReload;
+  }
+  async function resolveWorkerConfigWatchPath() {
+    if (configPath) {
+      const explicitPath = resolve2(cwd, configPath);
+      const fs = await import("node:fs/promises");
+      try {
+        await fs.access(explicitPath);
+        return explicitPath;
+      } catch {}
+    }
+    return await resolveConfigPath(cwd) ?? null;
+  }
+  async function refreshWorkerOnlySurfaceState() {
+    if (!config) {
       return;
-    const { Log, LogLevel } = await import("miniflare");
-    const mfConfig = buildMiniflareConfig(doResult);
-    mfConfig.log = new Log(LogLevel.DEBUG);
-    logger?.info("Reloading Miniflare with updated DOs...");
-    await miniflare.setOptions(mfConfig);
-    logger?.success("Miniflare reloaded");
+    }
+    mainWorkerSurfacePaths = await resolveMainWorkerSurfacePaths(cwd, config);
+    mainWorkerRoutes = await discoverRoutes(cwd, config);
+    const composedMainEntry = await prepareComposedWorkerEntrypoint(cwd, config, undefined, {
+      devInternalEmail: true
+    });
+    mainWorkerScriptPath = composedMainEntry ? resolve2(cwd, composedMainEntry) : null;
+    if (mainWorkerScriptPath) {
+      await bundleMainWorker();
+    } else {
+      bundledMainWorkerScriptPath = null;
+    }
+    await syncWorkerWatchTargets();
+  }
+  function getWorkerWatchTargets() {
+    if (enableVite || !config) {
+      return [];
+    }
+    const targets = collectWorkerWatchRoots(cwd, config, mainWorkerSurfacePaths);
+    if (resolvedWorkerConfigPath) {
+      targets.push(resolvedWorkerConfigPath);
+    }
+    return [...new Set(targets)];
+  }
+  async function syncWorkerWatchTargets() {
+    if (!workerSourceWatcher) {
+      return;
+    }
+    const nextWatchTargets = getWorkerWatchTargets();
+    const nextWatchTargetSet = new Set(nextWatchTargets);
+    const targetsToRemove = workerWatchTargets.filter((target) => !nextWatchTargetSet.has(target));
+    const targetsToAdd = nextWatchTargets.filter((target) => !workerWatchTargets.includes(target));
+    if (targetsToRemove.length > 0) {
+      await workerSourceWatcher.unwatch(targetsToRemove);
+    }
+    if (targetsToAdd.length > 0) {
+      workerSourceWatcher.add(targetsToAdd);
+    }
+    workerWatchTargets = nextWatchTargets;
+  }
+  async function reloadWorkerOnlyConfig() {
+    config = await loadConfig({ cwd, configFile: configPath });
+    setLocalSendEmailBindings(config.bindings?.sendEmail ?? {});
+    resolvedWorkerConfigPath = await resolveWorkerConfigWatchPath();
+    await refreshWorkerOnlySurfaceState();
+    await reloadMiniflare(currentDoResult);
+  }
+  async function startWorkerSourceWatcher() {
+    if (enableVite || !config) {
+      return;
+    }
+    const watchTargets = getWorkerWatchTargets();
+    if (watchTargets.length === 0) {
+      return;
+    }
+    const chokidar = await import("chokidar");
+    const isWindows = process.platform === "win32";
+    const ignoredSegments = ["/node_modules/", "/.git/", "/.devflare/", "/dist/"];
+    const normalizePath = (filePath) => filePath.replace(/\\/g, "/");
+    const isIgnoredPath = (filePath) => {
+      const normalizedPath = normalizePath(filePath);
+      return ignoredSegments.some((segment) => normalizedPath.includes(segment));
+    };
+    let reloadTimeout = null;
+    let reloadInProgress = false;
+    let pendingReloadPath = null;
+    const triggerReload = async (filePath) => {
+      if (reloadInProgress) {
+        pendingReloadPath = filePath;
+        return;
+      }
+      reloadInProgress = true;
+      try {
+        const normalizedConfigPath = resolvedWorkerConfigPath ? normalizePath(resolvedWorkerConfigPath) : null;
+        if (normalizedConfigPath && normalizePath(filePath) === normalizedConfigPath) {
+          logger?.info(`Devflare config changed: ${filePath}`);
+          await reloadWorkerOnlyConfig();
+          return;
+        }
+        logger?.info(`Worker source changed: ${filePath}`);
+        await refreshWorkerOnlySurfaceState();
+        await reloadMiniflare(currentDoResult);
+      } catch (error) {
+        logger?.error("Worker source reload failed:", error);
+      } finally {
+        reloadInProgress = false;
+        if (pendingReloadPath) {
+          const nextPath = pendingReloadPath;
+          pendingReloadPath = null;
+          await triggerReload(nextPath);
+        }
+      }
+    };
+    const scheduleReload = (filePath) => {
+      if (reloadTimeout) {
+        clearTimeout(reloadTimeout);
+      }
+      reloadTimeout = setTimeout(() => {
+        triggerReload(filePath);
+      }, 150);
+    };
+    workerWatchTargets = watchTargets;
+    workerSourceWatcher = chokidar.watch(watchTargets, {
+      ignoreInitial: true,
+      usePolling: isWindows,
+      interval: isWindows ? 300 : undefined,
+      awaitWriteFinish: {
+        stabilityThreshold: 100,
+        pollInterval: 50
+      },
+      ignored: (filePath) => isIgnoredPath(filePath)
+    });
+    const onFileEvent = (filePath) => {
+      if (isIgnoredPath(filePath)) {
+        return;
+      }
+      scheduleReload(filePath);
+    };
+    workerSourceWatcher.on("change", onFileEvent);
+    workerSourceWatcher.on("add", onFileEvent);
+    workerSourceWatcher.on("unlink", onFileEvent);
+    workerSourceWatcher.on("error", (error) => {
+      logger?.error("Worker source watcher error:", error);
+    });
+    await new Promise((resolvePromise, rejectPromise) => {
+      const handleReady = () => {
+        workerSourceWatcher?.off("error", handleInitialError);
+        logger?.info(`Worker source watcher ready (${watchTargets.length} target(s))`);
+        resolvePromise();
+      };
+      const handleInitialError = (error) => {
+        workerSourceWatcher?.off("ready", handleReady);
+        rejectPromise(error instanceof Error ? error : new Error(String(error)));
+      };
+      workerSourceWatcher?.once("ready", handleReady);
+      workerSourceWatcher?.once("error", handleInitialError);
+    });
   }
   async function runD1Migrations() {
     if (!miniflare || !config?.bindings?.d1)
@@ -1878,7 +2461,8 @@ function createDevServer(options) {
     const args = ["vite", "dev", "--port", String(vitePort)];
     viteProcess = spawn("bunx", args, {
       cwd,
-      stdio: "inherit",
+      stdio: ["inherit", "pipe", "pipe"],
+      windowsHide: true,
       env: {
         ...process.env,
         DEVFLARE_DEV: "true",
@@ -1886,12 +2470,34 @@ function createDevServer(options) {
         FORCE_COLOR: "1"
       }
     });
-    logger?.success(`Vite dev server started on http://localhost:${vitePort}`);
+    const readyUrl = await waitForViteReady(viteProcess, {
+      onStdout(chunk) {
+        process.stdout.write(chunk);
+      },
+      onStderr(chunk) {
+        process.stderr.write(chunk);
+      }
+    });
+    if (readyUrl) {
+      logger?.success(`Vite dev server started on ${readyUrl}`);
+      return;
+    }
+    logger?.warn("Vite process started, but the final local URL could not be confirmed yet");
   }
   async function start() {
     logger?.info("Starting unified dev server...");
     config = await loadConfig({ cwd, configFile: configPath });
+    setLocalSendEmailBindings(config.bindings?.sendEmail ?? {});
+    resolvedWorkerConfigPath = await resolveWorkerConfigWatchPath();
     logger?.debug("Loaded config:", config.name);
+    await refreshWorkerOnlySurfaceState();
+    if (!enableVite && (hasWorkerSurfacePaths(mainWorkerSurfacePaths) || Boolean(mainWorkerRoutes?.routes.length))) {
+      const detectedWorkerHandlers = Object.entries(mainWorkerSurfacePaths).filter(([, surfacePath]) => !!surfacePath).map(([surfaceName, surfacePath]) => `${surfaceName}=${surfacePath}`);
+      const detectedRouteHandlers = mainWorkerRoutes?.routes.map((route) => `route=${route.filePath}`) ?? [];
+      logger?.info(`Worker handlers detected: ${[...detectedWorkerHandlers, ...detectedRouteHandlers].join(", ")}`);
+    } else if (!enableVite) {
+      logger?.warn("No local worker handler entry was found for worker-only mode");
+    }
     const remoteCheck = await checkRemoteBindingRequirements(config);
     if (remoteCheck.hasRemoteBindings) {
       logger?.info("");
@@ -1936,43 +2542,51 @@ function createDevServer(options) {
         cwd,
         pattern: doPattern,
         outDir,
+        rolldownOptions: config.rolldown?.options,
+        sourcemap: config.rolldown?.sourcemap,
+        minify: config.rolldown?.minify,
         logger,
         onRebuild: async (result) => {
           await reloadMiniflare(result);
         }
       });
       doResult = await doBundler.build();
+      currentDoResult = doResult;
       await doBundler.watch();
     }
+    currentDoResult = doResult;
     await startMiniflare(doResult);
-    await startVite();
+    await startWorkerSourceWatcher();
+    if (enableVite) {
+      await startVite();
+    } else {
+      logger?.info("Vite startup skipped (no local vite.config.* found for this package)");
+    }
     await new Promise((r) => setTimeout(r, 1000));
     await runD1Migrations();
-    const cleanup = async () => {
-      logger?.info("Shutting down...");
-      await stop();
-      process.exit(0);
-    };
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
   }
   async function stop() {
     if (doBundler) {
       await doBundler.close();
       doBundler = null;
     }
+    if (workerSourceWatcher) {
+      await workerSourceWatcher.close();
+      workerSourceWatcher = null;
+    }
     if (miniflare) {
       await miniflare.dispose();
       miniflare = null;
     }
     if (viteProcess) {
-      viteProcess.kill("SIGTERM");
+      await stopSpawnedProcessTree(viteProcess);
       viteProcess = null;
     }
     if (browserShim) {
       await browserShim.stop();
       browserShim = null;
     }
+    clearLocalSendEmailBindings();
   }
   function getMiniflare() {
     return miniflare;
@@ -2000,6 +2614,7 @@ async function createLogWriter(cwd, options) {
   const fileStream = fs.createWriteStream(logPath, { flags: "w" });
   const ansiRegex = /\x1b\[[0-9;]*m/g;
   return {
+    path: logPath,
     write(data, source) {
       const str = typeof data === "string" ? data : data.toString();
       if (!str.trim())
@@ -2025,12 +2640,13 @@ async function runDevCommand(parsed, logger, options) {
   const persistEnabled = parsed.options.persist === true;
   const debugEnabled = parsed.options.debug === true || process.env.DEVFLARE_DEBUG === "true";
   const verbose = parsed.options.verbose === true || debugEnabled;
+  const viteProject = await detectViteProject(cwd);
   const logWriter = await createLogWriter(cwd, {
     log: logEnabled,
     logTemp: logTempEnabled
   });
   if (logWriter) {
-    const logFile = logTempEnabled ? ".log" : `.log-{datetime}`;
+    const logFile = relative2(cwd, logWriter.path) || ".log";
     logger.info(`\uD83D\uDCDD Logging enabled → ${logFile}`);
   }
   const devLogger = createConsola({
@@ -2044,6 +2660,7 @@ async function runDevCommand(parsed, logger, options) {
         logWriter.write(formatted);
       };
     };
+    Object.assign(devLogger.log, wrapLog(devLogger.log.bind(devLogger)));
     Object.assign(devLogger.info, wrapLog(devLogger.info.bind(devLogger)));
     Object.assign(devLogger.error, wrapLog(devLogger.error.bind(devLogger), "[ERROR]"));
     Object.assign(devLogger.warn, wrapLog(devLogger.warn.bind(devLogger), "[WARN]"));
@@ -2052,42 +2669,91 @@ async function runDevCommand(parsed, logger, options) {
   }
   try {
     logger.info("");
-    logger.info("\uD83D\uDE80 Devflare Unified Dev Server");
-    logger.info("   ├─ Vite: Full HMR for frontend");
-    logger.info("   ├─ Miniflare: All Cloudflare bindings");
-    logger.info("   ├─ Rolldown: Fast DO bundling with watch");
-    logger.info("   └─ Bridge: WebSocket RPC connection");
+    if (viteProject.shouldStartVite) {
+      logger.info("\uD83D\uDE80 Devflare Unified Dev Server");
+      logger.info("   ├─ Vite: Full HMR for frontend");
+      logger.info("   ├─ Miniflare: All Cloudflare bindings");
+      logger.info("   ├─ Rolldown: Fast DO bundling with watch");
+      logger.info("   └─ Bridge: WebSocket RPC connection");
+    } else {
+      logger.info("\uD83D\uDE80 Devflare Worker Dev Server");
+      logger.info("   ├─ Miniflare: All Cloudflare bindings");
+      logger.info("   ├─ Rolldown: Fast DO bundling with watch");
+      logger.info("   └─ Vite: Disabled (no local vite.config.* found)");
+      if (viteProject.wantsViteIntegration) {
+        logger.warn("Vite-related dependencies were found, but no local vite.config.* was detected");
+        logger.warn("Skipping Vite startup and running in worker-only mode");
+      }
+    }
     logger.info("");
     const devServer = createDevServer({
       cwd,
       configPath,
       vitePort: port ? parseInt(port, 10) : 5173,
       miniflarePort: 8787,
+      enableVite: viteProject.shouldStartVite,
       persist: persistEnabled,
       logger: devLogger,
       verbose,
       debug: debugEnabled
     });
-    const cleanup = async () => {
+    let isCleaningUp = false;
+    const cleanupHandlers = new Map;
+    const removeCleanupHandlers = () => {
+      for (const [event, handler] of cleanupHandlers) {
+        process.off(event, handler);
+      }
+      cleanupHandlers.clear();
+    };
+    const cleanup = async (exitCode, reason) => {
+      if (isCleaningUp) {
+        return;
+      }
+      isCleaningUp = true;
+      removeCleanupHandlers();
+      if (reason) {
+        const message = reason instanceof Error ? reason.stack ?? reason.message : String(reason);
+        logger.error(message);
+      }
       logger.info("");
       logger.info("Shutting down...");
-      await devServer.stop();
-      logWriter?.close();
-      process.exit(0);
+      try {
+        await devServer.stop();
+      } finally {
+        logWriter?.close();
+        process.exit(exitCode);
+      }
     };
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
+    const registerCleanupHandler = (event, handler) => {
+      cleanupHandlers.set(event, handler);
+      process.on(event, handler);
+    };
+    registerCleanupHandler("SIGINT", () => {
+      cleanup(0);
+    });
+    registerCleanupHandler("SIGTERM", () => {
+      cleanup(0);
+    });
+    registerCleanupHandler("SIGHUP", () => {
+      cleanup(0);
+    });
+    registerCleanupHandler("uncaughtException", (error) => {
+      cleanup(1, error);
+    });
+    registerCleanupHandler("unhandledRejection", (reason) => {
+      cleanup(1, reason);
+    });
     await devServer.start();
     await new Promise(() => {});
     return { exitCode: 0 };
   } catch (error) {
+    logWriter?.close();
     if (error instanceof Error) {
       logger.error("Dev server failed:", error.message);
       if (verbose) {
         logger.error(error.stack);
       }
     }
-    logWriter?.close();
     return { exitCode: 1 };
   }
 }