@lunora/cli 1.0.0-alpha.70 → 1.0.0-alpha.71

package/dist/index.d.mts

@@ -452,15 +452,33 @@ interface StudioServerHandle {
   url: string;
 }
 /**
-* How the dev child runs. `wrangler` is the classic `lunora dev` stack
-* (wrangler worker + embedded studio + codegen watch). `vite` is a project on
-* `@lunora/vite`: the Vite plugin already runs the worker, studio, and codegen
-* inside the Vite dev server, so `lunora dev` runs the project's own dev
-* script and gets out of the way — that's what makes `--background` / `stop` /
-* `status` / `logs` work uniformly for Vite projects too.
+* How the dev child runs. `wrangler` is the classic `lunora dev` stack (wrangler
+* worker + embedded studio + codegen watch) for a standalone class-C project.
+* `vite` is a project on `@lunora/vite`: the plugin already runs the worker,
+* studio, and codegen inside the Vite dev server, so `lunora dev` runs the
+* project's own dev script and gets out of the way — this also covers class-B
+* frameworks whose own dev server runs the worker in `workerd` (Astro 6 +
+* `@astrojs/cloudflare`, which embeds `@cloudflare/vite-plugin` in `astro dev`:
+* SSR + `/_lunora/*` + `ShardDO` in one process, HMR intact). `framework-worker`
+* is a class-B framework whose dev server CANNOT host the `ShardDO` Durable
+* Object (SvelteKit / Nuxt: their adapters use wrangler's `getPlatformProxy()`,
+* which runs an empty-script Miniflare and does not emulate internal DOs); there
+* `lunora dev` runs the framework's own dev server (front door, HMR, and — via
+* its `@lunora/vite` plugin — studio + codegen) AND a second `wrangler dev`
+* sidecar that owns the real `ShardDO` in `workerd`, wired via the committed
+* `wrangler.dev.jsonc`.
+*/
+type DevFlavor = "framework-worker" | "vite" | "wrangler";
+/**
+* Detect the dev flavor.
+*
+* A SvelteKit / Nuxt project needs the two-process `framework-worker` stack even
+* though it also declares `@lunora/vite` (which its framework dev server uses for
+* codegen/studio) — so the framework check comes FIRST. Everything else on
+* `@lunora/vite` (class-A frameworks + Astro + standalone Vite) delegates to the
+* project's own dev server (`vite`); a project without `@lunora/vite` is the
+* classic standalone `wrangler` stack.
 */
-type DevFlavor = "vite" | "wrangler";
-/** Detect the dev flavor: a declared `@lunora/vite` dependency means Vite owns the dev server. */
 /** A running worker child the orchestrator controls: send signals, await its exit. */
 interface WorkerProcess {
   /** Resolves with the worker's exit code (1 if it failed to start). */
@@ -543,11 +561,22 @@ interface DevCommandPlan {
   ipv4LoopbackForced: boolean;
   /** The remote-binding decision: which D1/KV/R2 bindings hit the deployed worker. */
   remote: DevRemotePlan;
+  /**
+  * The `wrangler dev` sidecar for the `framework-worker` flavor (SvelteKit /
+  * Nuxt): a second child that owns the real `ShardDO` in `workerd`, wired via
+  * the committed `wrangler.dev.jsonc`. `undefined` for every other flavor —
+  * only the two-process class-B stack has a sidecar. When present, `wrangler`
+  * (above) is the framework's own dev server (the front door / HMR) and this
+  * is the Lunora realtime plane.
+  */
+  sidecar?: SpawnDescriptor & {
+    tag: string;
+  };
   studioEnabled: boolean;
   studioPort: number;
   workerOrigin: string;
   workerPort: number;
-  /** The single child process `lunora dev` spawns: `wrangler dev` (or `vite dev` for the vite flavor). */
+  /** The primary child `lunora dev` spawns: `wrangler dev` (wrangler flavor) or the framework/`vite dev` server (vite / framework-worker). */
   wrangler: SpawnDescriptor & {
     tag: string;
   };

package/dist/index.d.ts

@@ -452,15 +452,33 @@ interface StudioServerHandle {
   url: string;
 }
 /**
-* How the dev child runs. `wrangler` is the classic `lunora dev` stack
-* (wrangler worker + embedded studio + codegen watch). `vite` is a project on
-* `@lunora/vite`: the Vite plugin already runs the worker, studio, and codegen
-* inside the Vite dev server, so `lunora dev` runs the project's own dev
-* script and gets out of the way — that's what makes `--background` / `stop` /
-* `status` / `logs` work uniformly for Vite projects too.
+* How the dev child runs. `wrangler` is the classic `lunora dev` stack (wrangler
+* worker + embedded studio + codegen watch) for a standalone class-C project.
+* `vite` is a project on `@lunora/vite`: the plugin already runs the worker,
+* studio, and codegen inside the Vite dev server, so `lunora dev` runs the
+* project's own dev script and gets out of the way — this also covers class-B
+* frameworks whose own dev server runs the worker in `workerd` (Astro 6 +
+* `@astrojs/cloudflare`, which embeds `@cloudflare/vite-plugin` in `astro dev`:
+* SSR + `/_lunora/*` + `ShardDO` in one process, HMR intact). `framework-worker`
+* is a class-B framework whose dev server CANNOT host the `ShardDO` Durable
+* Object (SvelteKit / Nuxt: their adapters use wrangler's `getPlatformProxy()`,
+* which runs an empty-script Miniflare and does not emulate internal DOs); there
+* `lunora dev` runs the framework's own dev server (front door, HMR, and — via
+* its `@lunora/vite` plugin — studio + codegen) AND a second `wrangler dev`
+* sidecar that owns the real `ShardDO` in `workerd`, wired via the committed
+* `wrangler.dev.jsonc`.
+*/
+type DevFlavor = "framework-worker" | "vite" | "wrangler";
+/**
+* Detect the dev flavor.
+*
+* A SvelteKit / Nuxt project needs the two-process `framework-worker` stack even
+* though it also declares `@lunora/vite` (which its framework dev server uses for
+* codegen/studio) — so the framework check comes FIRST. Everything else on
+* `@lunora/vite` (class-A frameworks + Astro + standalone Vite) delegates to the
+* project's own dev server (`vite`); a project without `@lunora/vite` is the
+* classic standalone `wrangler` stack.
 */
-type DevFlavor = "vite" | "wrangler";
-/** Detect the dev flavor: a declared `@lunora/vite` dependency means Vite owns the dev server. */
 /** A running worker child the orchestrator controls: send signals, await its exit. */
 interface WorkerProcess {
   /** Resolves with the worker's exit code (1 if it failed to start). */
@@ -543,11 +561,22 @@ interface DevCommandPlan {
   ipv4LoopbackForced: boolean;
   /** The remote-binding decision: which D1/KV/R2 bindings hit the deployed worker. */
   remote: DevRemotePlan;
+  /**
+  * The `wrangler dev` sidecar for the `framework-worker` flavor (SvelteKit /
+  * Nuxt): a second child that owns the real `ShardDO` in `workerd`, wired via
+  * the committed `wrangler.dev.jsonc`. `undefined` for every other flavor —
+  * only the two-process class-B stack has a sidecar. When present, `wrangler`
+  * (above) is the framework's own dev server (the front door / HMR) and this
+  * is the Lunora realtime plane.
+  */
+  sidecar?: SpawnDescriptor & {
+    tag: string;
+  };
   studioEnabled: boolean;
   studioPort: number;
   workerOrigin: string;
   workerPort: number;
-  /** The single child process `lunora dev` spawns: `wrangler dev` (or `vite dev` for the vite flavor). */
+  /** The primary child `lunora dev` spawns: `wrangler dev` (wrangler flavor) or the framework/`vite dev` server (vite / framework-worker). */
   wrangler: SpawnDescriptor & {
     tag: string;
   };

package/dist/packem_chunks/planDevCommand.mjs

@@ -1,9 +1,9 @@
 import { spawnSync, spawn } from 'node:child_process';
-import { detectAgentRules, claimDevServerState, clearDevServerState, readDevServerState, readLiveDevServerState, readProjectDependencyNames, DEV_HANDOFF_ENV, isRecordedProcessCurrent, DEV_LOG_FILE, DEV_LOG_FILE_ENV, DEV_DAEMON_ENV, updateDevServerState, detectAiAgent, resolveRemoteEnabled, readProjectRemotePreference, inferLunoraBindings, packageNamesFromBindings, ensureDevVarsExample, ensureDevVariables, isInteractive, DEV_VARS_FILE, DEV_VARS_EXAMPLE_FILE, fillDevSecrets, claimAgentRulesHint, AGENT_RULES_HINT, findWranglerFile, readWranglerJsonc, detectFramework, discoverContainerInfo, streamContainerLogs, materializeRemoteWranglerConfig, formatLunoraEvent } from '@lunora/config';
+import { runCodegen } from '@lunora/codegen';
+import { detectAgentRules, claimDevServerState, clearDevServerState, readDevServerState, readLiveDevServerState, detectFramework, readProjectDependencyNames, DEV_HANDOFF_ENV, isRecordedProcessCurrent, DEV_LOG_FILE, DEV_LOG_FILE_ENV, DEV_DAEMON_ENV, updateDevServerState, detectAiAgent, resolveRemoteEnabled, readProjectRemotePreference, inferLunoraBindings, packageNamesFromBindings, ensureDevVarsExample, ensureDevVariables, isInteractive, DEV_VARS_FILE, DEV_VARS_EXAMPLE_FILE, fillDevSecrets, claimAgentRulesHint, AGENT_RULES_HINT, findWranglerFile, readWranglerJsonc, discoverContainerInfo, streamContainerLogs, materializeRemoteWranglerConfig, formatLunoraEvent } from '@lunora/config';
 import { p as parseApiSpec } from '../packem_shared/api-spec-Bx0iKbxA.mjs';
 import { existsSync, watch, readFileSync, statSync, openSync, readSync, closeSync, mkdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { runCodegen } from '@lunora/codegen';
 import { r as renderCodegenFailure } from '../packem_shared/codegen-error-DJG-ghs_.mjs';
 import { d as defineHandler } from '../packem_shared/command-lYnl4QyF.mjs';
 import { d as detectPackageManager, e as execArgsFor, r as runScriptCommand } from '../packem_shared/detect-package-manager-DvEthdCw.mjs';
@@ -307,7 +307,13 @@ const DEFAULT_LOG_LINES = 100;
 const FAILURE_LOG_TAIL_LINES = 40;
 const LOG_TAIL_MAX_BYTES = 256 * 1024;
 const READY_TIMEOUT_ENV = "LUNORA_DEV_READY_TIMEOUT_MS";
-const detectDevFlavor = (cwd) => readProjectDependencyNames(cwd).has("@lunora/vite") ? "vite" : "wrangler";
+const SIDECAR_FRAMEWORKS = /* @__PURE__ */ new Set(["nuxt", "sveltekit"]);
+const detectDevFlavor = (cwd) => {
+  if (SIDECAR_FRAMEWORKS.has(detectFramework(cwd).framework)) {
+    return "framework-worker";
+  }
+  return readProjectDependencyNames(cwd).has("@lunora/vite") ? "vite" : "wrangler";
+};
 const viteDevCommand = (cwd) => {
   const manager = detectPackageManager(cwd);
   let script;
@@ -505,7 +511,7 @@ const startBackground = async (context) => {
   const { cwd, jsonLogs, logger, options, remote } = context;
   const run = context.run ?? runDevBackground;
   const flavor = detectDevFlavor(cwd);
-  const url = flavor === "vite" ? "http://localhost:5173" : `http://localhost:${String(options.workerPort ?? 8787)}`;
+  const url = flavor === "wrangler" ? `http://localhost:${String(options.workerPort ?? 8787)}` : "http://localhost:5173";
   const claim = claimDevServerState(cwd, {
     background: true,
     mode: "cli",
@@ -700,6 +706,7 @@ const runLifecycleSubcommand = (parameters) => {
   return void 0;
 };
 
+const DEV_WRANGLER_CONFIG = "wrangler.dev.jsonc";
 const DEFAULT_STUDIO_PORT = 6173;
 const DEFAULT_WORKER_PORT = 8787;
 const DEFAULT_VITE_PORT = 5173;
@@ -746,14 +753,21 @@ const planDevCommand = (options) => {
   const cwd = options.cwd ?? process.cwd();
   const manager = detectPackageManager(cwd);
   const flavor = options.flavor ?? detectDevFlavor(cwd);
-  if (flavor === "vite") {
+  if (flavor === "vite" || flavor === "framework-worker") {
     const exec2 = viteDevCommand(cwd);
+    let sidecar;
+    if (flavor === "framework-worker") {
+      const loopbackArgs2 = resolveLoopbackArgs(cwd, options.hasIpv6Loopback ?? hasIpv6Loopback);
+      const sidecarExec = execArgsFor(manager, "wrangler", ["dev", "--config", DEV_WRANGLER_CONFIG, ...loopbackArgs2, "--var", "WORKER_ENV:development"]);
+      sidecar = { args: sidecarExec.args, command: sidecarExec.command, cwd, tag: "worker" };
+    }
     return {
       codegenEnabled: false,
       flavor,
       ipv4LoopbackForced: false,
       remote: { bindings: [], cleanup: () => {
       }, enabled: options.remote === true },
+      ...sidecar ? { sidecar } : {},
       studioEnabled: false,
       studioPort: options.port ?? DEFAULT_STUDIO_PORT,
       workerOrigin: `http://localhost:${String(DEFAULT_VITE_PORT)}`,
@@ -981,14 +995,99 @@ const buildDevPlan = async (options) => {
   const workerPort = flavor === "wrangler" ? await resolveWorkerPort(options, cwd) : options.workerPort;
   return planDevCommand({ ...options, cwd, flavor, workerPort });
 };
+const superviseWorkers = async (worker, sidecar, logger) => {
+  let sigintCount = 0;
+  let escalationTimer;
+  const killChildren = (signal) => {
+    worker.kill(signal);
+    sidecar?.kill(signal);
+  };
+  const onSigint = () => {
+    sigintCount += 1;
+    if (sigintCount === 1) {
+      logger.info("received SIGINT — shutting down (press Ctrl-C again to force-kill)");
+      killChildren("SIGTERM");
+      escalationTimer = setTimeout(() => {
+        killChildren("SIGKILL");
+      }, SIGINT_GRACE_MS);
+      escalationTimer.unref();
+    } else {
+      killChildren("SIGKILL");
+    }
+  };
+  const onSigterm = () => {
+    killChildren("SIGTERM");
+  };
+  process.on("SIGINT", onSigint);
+  process.on("SIGTERM", onSigterm);
+  const exits = [
+    worker.exited.then((code) => {
+      return { code, who: "worker" };
+    })
+  ];
+  if (sidecar !== void 0) {
+    exits.push(
+      sidecar.exited.then((code) => {
+        return { code, who: "sidecar" };
+      })
+    );
+  }
+  const first = await Promise.race(exits);
+  if (sidecar !== void 0) {
+    if (first.who === "sidecar") {
+      logger.warn("[worker] the Lunora sidecar (wrangler dev) exited — shutting down the framework dev server");
+      worker.kill("SIGTERM");
+    } else {
+      sidecar.kill("SIGTERM");
+    }
+    await Promise.allSettled([worker.exited, sidecar.exited]);
+  }
+  if (escalationTimer) {
+    clearTimeout(escalationTimer);
+  }
+  process.off("SIGINT", onSigint);
+  process.off("SIGTERM", onSigterm);
+  return first.code;
+};
+const startStudioBestEffort = async (options, plan, cwd, logger) => {
+  if (!plan.studioEnabled) {
+    return void 0;
+  }
+  try {
+    return await (options.startStudio ?? startStudioServer)({
+      cwd,
+      logger: {
+        warnOnce: (message) => {
+          logger.warn(message);
+        }
+      },
+      port: plan.studioPort,
+      workerOrigin: plan.workerOrigin
+    });
+  } catch (error) {
+    logger.warn(`studio server failed to start (${error instanceof Error ? error.message : String(error)}) — continuing without it`);
+    return void 0;
+  }
+};
+const ensureSidecarGenerated = (plan, options, cwd, logger) => {
+  if (plan.sidecar === void 0) {
+    return;
+  }
+  try {
+    runCodegen({ apiSpec: options.apiSpec, lunoraDirectory: "lunora", projectRoot: cwd });
+  } catch (error) {
+    logger.warn(`codegen (pre-sidecar) failed: ${error instanceof Error ? error.message : String(error)} — the framework dev server will retry`);
+  }
+};
 const runDevCommand = async (options) => {
   const plan = await buildDevPlan(options);
   const { logger } = options;
   const cwd = plan.wrangler.cwd ?? process.cwd();
   const handles = { remoteCleanup: plan.remote.cleanup };
   try {
+    const handoffPid = Number(process.env[DEV_HANDOFF_ENV]);
     const existing = readLiveDevServerState(cwd);
-    if (existing !== void 0 && existing.pid !== process.pid) {
+    if (existing !== void 0 && existing.pid !== process.pid && existing.pid !== handoffPid) {
       reportExistingServer(logger, existing);
       return { code: 0, plan };
     }
@@ -997,7 +1096,7 @@ const runDevCommand = async (options) => {
       reportExistingServer(logger, incumbent);
       return { code: 0, plan };
     }
-    if (plan.flavor === "vite") {
+    if (plan.flavor === "vite" || plan.flavor === "framework-worker") {
       plan.wrangler.env = { ...plan.wrangler.env, [DEV_HANDOFF_ENV]: String(process.pid) };
     }
     await offerDevVariablesScaffold(options, cwd);
@@ -1012,56 +1111,18 @@ const runDevCommand = async (options) => {
     if (plan.codegenEnabled) {
       handles.codegen = (options.startCodegen ?? startCodegenWatch)({ apiSpec: options.apiSpec, logger, projectRoot: cwd });
     }
-    let studioUrl;
-    if (plan.studioEnabled) {
-      try {
-        handles.studio = await (options.startStudio ?? startStudioServer)({
-          cwd,
-          logger: {
-            warnOnce: (message) => {
-              logger.warn(message);
-            }
-          },
-          port: plan.studioPort,
-          workerOrigin: plan.workerOrigin
-        });
-        studioUrl = handles.studio.url;
-      } catch (error) {
-        logger.warn(`studio server failed to start (${error instanceof Error ? error.message : String(error)}) — continuing without it`);
-      }
-    }
+    handles.studio = await startStudioBestEffort(options, plan, cwd, logger);
+    const studioUrl = handles.studio?.url;
     if (plan.frameworkHint !== void 0) {
       logger.warn(plan.frameworkHint);
     }
-    const worker = (options.startWorker ?? defaultWorkerSpawner)(plan.wrangler, logger);
+    ensureSidecarGenerated(plan, options, cwd, logger);
+    const spawn = options.startWorker ?? defaultWorkerSpawner;
+    const worker = spawn(plan.wrangler, logger);
+    const sidecar = plan.sidecar === void 0 ? void 0 : spawn(plan.sidecar, logger);
     handles.containerLogs = afterWorkerSpawn(plan, cwd, logger, studioUrl);
     printAgentRulesHint(logger, cwd);
-    let sigintCount = 0;
-    let escalationTimer;
-    const onSigint = () => {
-      sigintCount += 1;
-      if (sigintCount === 1) {
-        logger.info("received SIGINT — shutting down (press Ctrl-C again to force-kill)");
-        worker.kill("SIGTERM");
-        escalationTimer = setTimeout(() => {
-          worker.kill("SIGKILL");
-        }, SIGINT_GRACE_MS);
-        escalationTimer.unref();
-      } else {
-        worker.kill("SIGKILL");
-      }
-    };
-    const onSigterm = () => {
-      worker.kill("SIGTERM");
-    };
-    process.on("SIGINT", onSigint);
-    process.on("SIGTERM", onSigterm);
-    const code = await worker.exited;
-    if (escalationTimer) {
-      clearTimeout(escalationTimer);
-    }
-    process.off("SIGINT", onSigint);
-    process.off("SIGTERM", onSigterm);
+    const code = await superviseWorkers(worker, sidecar, logger);
     return { code, plan };
   } finally {
     clearDevServerState(cwd, process.pid);

package/dist/packem_chunks/runInitCommand.mjs

@@ -1825,13 +1825,16 @@ const PNPM_BUILT_DEPENDENCIES = [
   "unrs-resolver",
   "workerd"
 ];
+const PNPM_DENIED_BUILD_DEPENDENCIES = ["cpu-features", "protobufjs", "ssh2"];
 const PNPM_WORKSPACE_FILENAME = "pnpm-workspace.yaml";
 const pnpmWorkspaceYaml = () => [
   "# pnpm reads its settings from here (the package.json `pnpm` field is no longer read).",
   "# Pre-approve the toolchain's native build scripts so `pnpm install` runs them",
-  "# without the interactive `pnpm approve-builds` step.",
+  "# without the interactive `pnpm approve-builds` step; deny the optional native",
+  "# builds a scaffold doesn't need (so no C/C++ toolchain is required).",
   "allowBuilds:",
   ...PNPM_BUILT_DEPENDENCIES.map((name) => `    ${name}: true`),
+  ...PNPM_DENIED_BUILD_DEPENDENCIES.map((name) => `    ${name}: false`),
   ""
 ].join("\n");
 const collectFiles = (directory) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/cli",
-  "version": "1.0.0-alpha.70",
+  "version": "1.0.0-alpha.71",
   "description": "The Lunora CLI: init, dev, deploy, codegen, run, reset, and migrate commands",
   "keywords": [
     "agent-skills",