@lunora/vite 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/index.d.mts

@@ -198,7 +198,7 @@ declare const isAutoComposable: (context: LunoraPluginContext) => boolean;
 * virtual module id. Absolute paths are resolved correctly in all environments
 * (Vite 8 + rolldown 1.x confirmed).
 */
-declare const buildWorkerEntrySource: (framework: DetectedFramework, generatedImportBase: string, hasContainers?: boolean) => string;
+declare const buildWorkerEntrySource: (framework: DetectedFramework, generatedImportBase: string, hasContainers?: boolean, useUmbrella?: boolean) => string;
 /**
 * Vite plugin that auto-composes a detected class-A meta-framework's SSR
 * handler with Lunora into one Cloudflare Worker (PLAN4 §2.4 / §3 class-A row).

package/dist/index.d.ts

@@ -198,7 +198,7 @@ declare const isAutoComposable: (context: LunoraPluginContext) => boolean;
 * virtual module id. Absolute paths are resolved correctly in all environments
 * (Vite 8 + rolldown 1.x confirmed).
 */
-declare const buildWorkerEntrySource: (framework: DetectedFramework, generatedImportBase: string, hasContainers?: boolean) => string;
+declare const buildWorkerEntrySource: (framework: DetectedFramework, generatedImportBase: string, hasContainers?: boolean, useUmbrella?: boolean) => string;
 /**
 * Vite plugin that auto-composes a detected class-A meta-framework's SSR
 * handler with Lunora into one Cloudflare Worker (PLAN4 §2.4 / §3 class-A row).

package/dist/index.mjs

@@ -2,19 +2,20 @@ import { cloudflare } from '@cloudflare/vite-plugin';
 import errorOverlayPlugin from '@visulima/vite-overlay';
 import { detectAgentRules, claimAgentRulesHint, AGENT_RULES_HINT, detectFramework } from '@lunora/config';
 export { detectFramework } from '@lunora/config';
-import codegenPlugin from './packem_shared/codegenPlugin-BAyt6iWS.mjs';
-import devVariablesPlugin from './packem_shared/devVariablesPlugin-BRWbWHhq.mjs';
+import { l as lunoraLine } from './packem_shared/log-Bgkv6QhO.mjs';
+import codegenPlugin from './packem_shared/codegenPlugin-CHzvXqK6.mjs';
+import devVariablesPlugin from './packem_shared/devVariablesPlugin-DbDf7tmi.mjs';
 import { createCommandProbe, withDevWorkerEnv } from './packem_shared/DEV_WORKER_ENV_VALUE-Coo6bgVz.mjs';
 export { DEV_WORKER_ENV_VALUE, DEV_WORKER_ENV_VAR } from './packem_shared/DEV_WORKER_ENV_VALUE-Coo6bgVz.mjs';
-import { frameworkComposePlugin } from './packem_shared/CLASS_A_WIRING-Cja0SF6x.mjs';
-export { CLASS_A_WIRING, LUNORA_WORKER_VIRTUAL_ID, buildWorkerEntrySource, isAutoComposable } from './packem_shared/CLASS_A_WIRING-Cja0SF6x.mjs';
+import { frameworkComposePlugin } from './packem_shared/CLASS_A_WIRING-CZVcjgKo.mjs';
+export { CLASS_A_WIRING, LUNORA_WORKER_VIRTUAL_ID, buildWorkerEntrySource, isAutoComposable } from './packem_shared/CLASS_A_WIRING-CZVcjgKo.mjs';
 import logStreamPlugin from './packem_shared/logStreamPlugin-CqvZ17kd.mjs';
 import { planViteRemoteBindings, remoteBindingsCleanupPlugin, withRemoteBindings } from './packem_shared/planViteRemoteBindings-QN5ncUS1.mjs';
 import { studioPlugin } from './packem_shared/STUDIO_PATH-5ppCdBHa.mjs';
 export { STUDIO_PATH, buildStudioUrl } from './packem_shared/STUDIO_PATH-5ppCdBHa.mjs';
 import { withWorkerStartupHint } from './packem_shared/WORKER_STARTUP_HINT-DhsXUW8k.mjs';
 export { WORKER_STARTUP_HINT, augmentWorkerStartupError, isWorkerEntryEvalError } from './packem_shared/WORKER_STARTUP_HINT-DhsXUW8k.mjs';
-import { wranglerValidatorPlugin } from './packem_shared/wranglerValidatorPlugin-Cf0nLP7-.mjs';
+import { wranglerValidatorPlugin } from './packem_shared/wranglerValidatorPlugin-DggqUjxL.mjs';
 export { reconcileWranglerCrons } from './packem_shared/reconcileWranglerCrons-PxGwfCp_.mjs';
 
 const agentRulesHintPlugin = (options) => {
@@ -26,7 +27,7 @@ const agentRulesHintPlugin = (options) => {
           return;
         }
         server.config.logger.warn(`
-  [lunora] ${AGENT_RULES_HINT}
+${lunoraLine(AGENT_RULES_HINT)}
 `);
       };
     },
@@ -50,12 +51,12 @@ const FRAMEWORK_LABELS = {
 const formatFrameworkDetection = (detection) => {
   const label = FRAMEWORK_LABELS[detection.framework];
   if (detection.framework === "none") {
-    return "[lunora] no meta-framework detected — running standalone (class C).";
+    return lunoraLine("no meta-framework detected — running standalone.");
   }
   if (detection.class === "B") {
-    return `[lunora] detected ${label} (class B) — hook-injection composition is handled by the framework adapter (not yet wired here).`;
+    return lunoraLine(`detected ${label} — composition is handled by the framework adapter.`);
   }
-  return `[lunora] detected ${label} (class ${detection.class}) — composing the Lunora worker into one Cloudflare Worker.`;
+  return lunoraLine(`detected ${label} — composing the Lunora worker into one Cloudflare Worker.`);
 };
 const frameworkDetectPlugin = (options, context) => {
   let logged = false;

package/dist/packem_shared/{CLASS_A_WIRING-Cja0SF6x.mjs → CLASS_A_WIRING-CZVcjgKo.mjs}

@@ -1,4 +1,4 @@
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { resolve, join } from 'node:path';
 
 const LUNORA_WORKER_VIRTUAL_ID = "virtual:lunora/worker";
@@ -36,18 +36,27 @@ const isAutoComposable = (context) => {
   return detected?.class === "A" && CLASS_A_WIRING[detected.framework] !== void 0;
 };
 const isWorkerVirtualActive = (context) => isAutoComposable(context);
-const buildWorkerEntrySource = (framework, generatedImportBase, hasContainers = false) => {
+const projectUsesUmbrella = (projectRoot) => {
+  try {
+    const pkg = JSON.parse(readFileSync(join(projectRoot, "package.json"), "utf8"));
+    return ["dependencies", "devDependencies", "peerDependencies"].some((field) => pkg[field]?.["lunorash"] !== void 0);
+  } catch {
+    return false;
+  }
+};
+const buildWorkerEntrySource = (framework, generatedImportBase, hasContainers = false, useUmbrella = false) => {
   const wiring = CLASS_A_WIRING[framework];
   if (wiring === void 0) {
     throw new Error(`[lunora] no class-A worker wiring for framework "${framework}"`);
   }
+  const runtimeModule = useUmbrella ? "lunorash/runtime" : "@lunora/runtime";
   const containersReexport = hasContainers ? `
 export * from "${generatedImportBase}/containers";
 ` : "";
   return `// Generated by @lunora/vite — class-A worker composition (PLAN4 M2).
 // Do not edit: emitted from the detected framework (${framework}). Point your
 // wrangler \`main\` here (or re-export it) instead of hand-wiring createWorker.
-import { composeWorker } from "@lunora/runtime";
+import { composeWorker } from "${runtimeModule}";
 ${wiring.imports}
 import { LUNORA_FUNCTIONS } from "${generatedImportBase}/functions";
 import { openApiSpec } from "${generatedImportBase}/openapi";
@@ -75,11 +84,12 @@ export default {
 };
 const frameworkComposePlugin = (options, context) => {
   const generatedImportBase = resolve(options.projectRoot, options.generatedDir.replace(TRAILING_SLASH, ""));
+  const useUmbrella = projectUsesUmbrella(options.projectRoot);
   return {
     load(id) {
       if (id === RESOLVED_LUNORA_WORKER_ID && isWorkerVirtualActive(context) && context.framework !== void 0) {
         const hasContainers = existsSync(join(generatedImportBase, "containers.ts"));
-        return buildWorkerEntrySource(context.framework.framework, generatedImportBase, hasContainers);
+        return buildWorkerEntrySource(context.framework.framework, generatedImportBase, hasContainers, useUmbrella);
       }
       return void 0;
     },

package/dist/packem_shared/{codegenPlugin-BAyt6iWS.mjs → codegenPlugin-CHzvXqK6.mjs}

@@ -3,6 +3,7 @@ import { resolve, sep, join } from 'node:path';
 import { createCodegenProject, refreshCodegenProject, runCodegen, CodegenDiagnosticError } from '@lunora/codegen';
 import { inferLunoraBindings, reconcileWranglerBindings } from '@lunora/config';
 import { reconcileWranglerCrons } from './reconcileWranglerCrons-PxGwfCp_.mjs';
+import { L as LUNORA_TAG } from './log-Bgkv6QhO.mjs';
 
 const DEBOUNCE_MS = 100;
 const TSCONFIG_VARIANT_RE = /[/\\]tsconfig\..+\.json$/u;
@@ -22,23 +23,23 @@ const reconcileBindingsSafely = async (options, logger, onExportGaps) => {
     const inferred = await inferLunoraBindings({ projectRoot: options.projectRoot, schemaDir: options.schemaDir });
     const reconciled = reconcileWranglerBindings(options.projectRoot, inferred);
     if (reconciled.changed) {
-      logger.info?.(`[lunora] inferred bindings → ${reconciled.added.join(", ")} (written to ${reconciled.wranglerPath ?? "wrangler.jsonc"})`);
+      logger.info?.(`${LUNORA_TAG} inferred bindings → ${reconciled.added.join(", ")} (written to ${reconciled.wranglerPath ?? "wrangler.jsonc"})`);
     }
     for (const warning of reconciled.warnings) {
-      logger.warn(`[lunora] ${warning}`);
+      logger.warn(`${LUNORA_TAG} ${warning}`);
     }
     if (reconciled.exportGaps.length > 0) {
       onExportGaps?.(reconciled.exportGaps);
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    logger.warn(`[lunora] binding inference skipped: ${message}`);
+    logger.warn(`${LUNORA_TAG} binding inference skipped: ${message}`);
   }
 };
 const runCodegenSafely = (options, logger, overlay, project) => {
   const schemaPath = join(options.projectRoot, options.schemaDir, "schema.ts");
   if (!existsSync(schemaPath)) {
-    logger.warn(`[lunora] schema.ts not found at ${schemaPath} — codegen skipped`);
+    logger.warn(`${LUNORA_TAG} schema.ts not found at ${schemaPath} — codegen skipped`);
     return void 0;
   }
   try {
@@ -46,19 +47,21 @@ const runCodegenSafely = (options, logger, overlay, project) => {
     try {
       const reconciled = reconcileWranglerCrons(options.projectRoot, result.cronTriggers);
       if (reconciled.changed) {
-        logger.info?.(`[lunora] synced ${result.cronTriggers.length.toFixed(0)} cron trigger(s) into ${reconciled.wranglerPath ?? "wrangler.jsonc"}`);
+        logger.info?.(
+          `${LUNORA_TAG} synced ${result.cronTriggers.length.toFixed(0)} cron trigger(s) into ${reconciled.wranglerPath ?? "wrangler.jsonc"}`
+        );
       }
     } catch (cronError) {
       const message = cronError instanceof Error ? cronError.message : String(cronError);
-      logger.warn(`[lunora] cron trigger sync skipped: ${message}`);
+      logger.warn(`${LUNORA_TAG} cron trigger sync skipped: ${message}`);
     }
     for (const advisory of result.advisories) {
-      logger.warn(`[lunora] schema advisory [${advisory.level}] ${advisory.name}: ${advisory.detail} — ${advisory.remediation}`);
+      logger.warn(`${LUNORA_TAG} schema advisory [${advisory.level}] ${advisory.name}: ${advisory.detail} — ${advisory.remediation}`);
     }
     return resolve(result.outputDirectory);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    logger.error(`[lunora] codegen failed: ${message}`);
+    logger.error(`${LUNORA_TAG} codegen failed: ${message}`);
     overlay?.onError(error, message);
     return void 0;
   }

package/dist/packem_shared/{devVariablesPlugin-BRWbWHhq.mjs → devVariablesPlugin-DbDf7tmi.mjs}

@@ -1,4 +1,5 @@
 import { ensureDevVariables, createConfirm } from '@lunora/config';
+import { l as lunoraLine } from './log-Bgkv6QhO.mjs';
 
 const devVariablesPlugin = (options) => {
   return {
@@ -8,7 +9,7 @@ const devVariablesPlugin = (options) => {
         confirm: createConfirm("[lunora] "),
         cwd: options.projectRoot,
         info: (message) => {
-          console.info(`[lunora] ${message}`);
+          console.info(lunoraLine(message));
         }
       });
     },

package/dist/packem_shared/log-Bgkv6QhO.mjs

@@ -0,0 +1,6 @@
+import { paintBadge, BADGES } from '@lunora/config';
+
+const LUNORA_TAG = paintBadge(BADGES.lunora);
+const lunoraLine = (message) => `${LUNORA_TAG} ${message}`;
+
+export { LUNORA_TAG as L, lunoraLine as l };

package/dist/packem_shared/{wranglerValidatorPlugin-Cf0nLP7-.mjs → wranglerValidatorPlugin-DggqUjxL.mjs}

@@ -1,5 +1,6 @@
 import { spawnSync } from 'node:child_process';
 import { validateWranglerProject, readWranglerJsonc } from '@lunora/config';
+import { l as lunoraLine } from './log-Bgkv6QhO.mjs';
 
 const isLocalImagePath = (image) => image.startsWith("./") || image.startsWith("../") || image.startsWith("/") || image.includes("Dockerfile");
 const probeDocker = () => {
@@ -16,7 +17,9 @@ const warnWhenDockerMissing = (wranglerPath, dockerAvailable = probeDocker) => {
     return;
   }
   console.warn(
-    "[lunora] wrangler.jsonc declares containers built from a local Dockerfile, but no Docker-compatible engine is running. Start Docker (or Colima) before `vite dev`, or the container instances will fail to start."
+    lunoraLine(
+      "wrangler.jsonc declares containers built from a local Dockerfile, but no Docker-compatible engine is running. Start Docker (or Colima) before `vite dev`, or the container instances will fail to start."
+    )
   );
 };
 const formatError = (wranglerPath, problems) => {
@@ -48,7 +51,7 @@ const wranglerValidatorPlugin = (options) => {
       }
       if (result.report.warnings.length > 0) {
         for (const warning of result.report.warnings) {
-          console.warn(`[lunora] wrangler validator: ${warning}`);
+          console.warn(lunoraLine(`wrangler validator: ${warning}`));
         }
       }
       if (result.problems.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/vite",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "The Lunora Vite plugin: codegen, type sync, wrangler validation, and an error overlay over @cloudflare/vite-plugin",
   "keywords": [
     "cloudflare",
@@ -47,7 +47,7 @@
   "dependencies": {
     "@cloudflare/vite-plugin": "1.42.0",
     "@lunora/codegen": "1.0.0-alpha.3",
-    "@lunora/config": "1.0.0-alpha.4",
+    "@lunora/config": "1.0.0-alpha.5",
     "@visulima/vite-overlay": "2.0.0-alpha.35",
     "jsonc-parser": "^3.3.1",
     "ts-morph": "^28.0.0"