@lunora/cli 1.0.0-alpha.2 → 1.0.0-alpha.4

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { runCli } from './packem_shared/COMMANDS-1V_KEx35.mjs';
+import { runCli } from './packem_shared/COMMANDS-CHw4zOZ9.mjs';
 
 try {
   const code = await runCli();

package/dist/index.d.mts

@@ -572,14 +572,22 @@ interface InitCommandOptions {
   * and the auth-provider sub-select.
   */
   prompt?: Pick<OfferDeps, "multiSelect" | "select">;
+  /**
+  * Override the git ref (branch, tag, or commit) the default template source
+  * is fetched from. Takes precedence over the version-derived ref. Ignored
+  * when `source` or `from` is set.
+  */
+  ref?: string;
   /** Local registry root for the offer's `runAddCommand` (offline / tests). Mirrors `from` but for registry items. */
   registryFrom?: string;
   /** Override the remote registry source base for the offer (default `gh:anolilab/lunora/registry`). */
   registrySource?: string;
   /**
   * Override the remote source giget downloads from. Default:
-  * `gh:anolilab/lunora/templates/&lt;templateType>#v&lt;cliVersion>`. Tests
-  * typically use `from` instead to skip the network.
+  * `gh:anolilab/lunora/templates/&lt;templateType>#&lt;ref>`, where `&lt;ref>` is
+  * the `ref` option when set, else derived from the CLI version (pre-release
+  * channels → their branch, stable → `main`). Tests typically use `from`
+  * instead to skip the network.
   */
   source?: string;
   templateType?: Template;
@@ -707,6 +715,8 @@ interface AddCommandOptions {
   out?: string;
   /** Force-overwrite existing files (take the incoming copy) instead of skipping/conflicting. */
   overwrite?: boolean;
+  /** Override the git ref (branch, tag, or commit) items are fetched from (default: version-derived); appended to the `source` base when that is set. Ignored when `from` is set. */
+  ref?: string;
   /** Override the remote registry source base (default gh:anolilab/lunora/registry). */
   source?: string;
   /** Skip the package.json mutation confirmation prompt. */

package/dist/index.d.ts

@@ -572,14 +572,22 @@ interface InitCommandOptions {
   * and the auth-provider sub-select.
   */
   prompt?: Pick<OfferDeps, "multiSelect" | "select">;
+  /**
+  * Override the git ref (branch, tag, or commit) the default template source
+  * is fetched from. Takes precedence over the version-derived ref. Ignored
+  * when `source` or `from` is set.
+  */
+  ref?: string;
   /** Local registry root for the offer's `runAddCommand` (offline / tests). Mirrors `from` but for registry items. */
   registryFrom?: string;
   /** Override the remote registry source base for the offer (default `gh:anolilab/lunora/registry`). */
   registrySource?: string;
   /**
   * Override the remote source giget downloads from. Default:
-  * `gh:anolilab/lunora/templates/&lt;templateType>#v&lt;cliVersion>`. Tests
-  * typically use `from` instead to skip the network.
+  * `gh:anolilab/lunora/templates/&lt;templateType>#&lt;ref>`, where `&lt;ref>` is
+  * the `ref` option when set, else derived from the CLI version (pre-release
+  * channels → their branch, stable → `main`). Tests typically use `from`
+  * instead to skip the network.
   */
   source?: string;
   templateType?: Template;
@@ -707,6 +715,8 @@ interface AddCommandOptions {
   out?: string;
   /** Force-overwrite existing files (take the incoming copy) instead of skipping/conflicting. */
   overwrite?: boolean;
+  /** Override the git ref (branch, tag, or commit) items are fetched from (default: version-derived); appended to the `source` base when that is set. Ignored when `from` is set. */
+  ref?: string;
   /** Override the remote registry source base (default gh:anolilab/lunora/registry). */
   source?: string;
   /** Skip the package.json mutation confirmation prompt. */

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { COMMANDS, VERSION, runCli } from './packem_shared/COMMANDS-1V_KEx35.mjs';
+export { COMMANDS, VERSION, runCli } from './packem_shared/COMMANDS-CHw4zOZ9.mjs';
 export { runCodegenCommand } from './packem_chunks/runCodegenCommand.mjs';
 export { DEFAULT_IMPORT_BATCH_SIZE, runExportCommand, runImportCommand } from './packem_shared/DEFAULT_IMPORT_BATCH_SIZE-Ck-2bU08.mjs';
 export { runDeployCommand } from './packem_chunks/runDeployCommand.mjs';
@@ -16,4 +16,4 @@ export { createRecordingSpawner, defaultSpawner } from './packem_shared/defaultS
 export { default as parseManifest } from './packem_shared/parseManifest--vZf2FY1.mjs';
 export { REQUIRED_COMPATIBILITY_DATE, REQUIRED_FLAG, validateWranglerProject as validateWrangler, validateWranglerConfig } from '@lunora/config';
 export { buildRegistryIndex } from './packem_shared/buildRegistryIndex-BcYe607_.mjs';
-export { runAddCommand, runBuildIndexCommand, runRegistryViewCommand } from './packem_shared/runAddCommand-BZGkRnBs.mjs';
+export { r as runAddCommand, a as runBuildIndexCommand, b as runRegistryViewCommand } from './packem_shared/commands-SUPdjsu5.mjs';

package/dist/packem_chunks/handler.mjs

@@ -3,7 +3,7 @@ import { findWranglerFile, promptSelect } from '@lunora/config';
 import { join } from '@visulima/path';
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
 import { n as normalizeFeature, E as EMAIL_ITEM, D as DEFAULT_AUTH_ITEM, p as promptAuthProvider, A as AUTH_PROVIDER_OPTIONS } from '../packem_shared/features-ocSSpZtS.mjs';
-import { runAddCommand } from '../packem_shared/runAddCommand-BZGkRnBs.mjs';
+import { r as runAddCommand } from '../packem_shared/commands-SUPdjsu5.mjs';
 
 const providerToItem = (provider) => {
   const value = provider.trim().toLowerCase();
@@ -54,6 +54,7 @@ const runAddFeature = async (options) => {
     from: options.from,
     logger: options.logger,
     names: [...items],
+    ref: options.ref,
     source: options.source,
     yes: true
   });
@@ -67,6 +68,7 @@ const execute = defineHandler(async ({ argument, cwd, logger, options }) => {
     from: options.from,
     logger,
     provider: options.provider,
+    ref: options.ref,
     source: options.source,
     yes: options.yes === true
   });

package/dist/packem_chunks/handler16.mjs

@@ -1,5 +1,5 @@
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
-import { runAddCommand, runRegistryViewCommand, runBuildIndexCommand } from '../packem_shared/runAddCommand-BZGkRnBs.mjs';
+import { r as runAddCommand, b as runRegistryViewCommand, a as runBuildIndexCommand } from '../packem_shared/commands-SUPdjsu5.mjs';
 
 const execute = defineHandler(({ argument, cwd, logger, options }) => {
   const subcommand = argument[0];
@@ -15,12 +15,13 @@ const execute = defineHandler(({ argument, cwd, logger, options }) => {
       logger,
       names,
       overwrite: options.overwrite === true,
+      ref: options.ref,
       source: options.source,
       yes: options.yes === true
     });
   }
   if (subcommand === "list") {
-    return runAddCommand({ cwd, from: options.from, json: options.json === true, list: true, logger, names: [], source: options.source });
+    return runAddCommand({ cwd, from: options.from, json: options.json === true, list: true, logger, names: [], ref: options.ref, source: options.source });
   }
   if (subcommand === "view") {
     return runRegistryViewCommand({
@@ -28,6 +29,7 @@ const execute = defineHandler(({ argument, cwd, logger, options }) => {
       from: options.from,
       logger,
       names,
+      ref: options.ref,
       source: options.source
     });
   }

package/dist/packem_chunks/runInitCommand.mjs

@@ -1,16 +1,16 @@
 import { existsSync, mkdirSync, writeFileSync, readdirSync, mkdtempSync, rmSync, readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { fileURLToPath } from 'node:url';
 import { detectFramework as detectFramework$1, isInteractive, promptSelect, promptMultiSelect } from '@lunora/config';
 import { walkSync } from '@visulima/fs';
-import { resolve, join as join$1, relative, dirname as dirname$1 } from '@visulima/path';
+import { resolve, join as join$1, relative, dirname as dirname$1, basename } from '@visulima/path';
 import { downloadTemplate } from 'giget';
+import { modify, applyEdits } from 'jsonc-parser';
 import { join, dirname } from 'node:path';
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
 import MagicString from 'magic-string';
 import { Project, SyntaxKind } from 'ts-morph';
+import { c as resolveSourceRef, d as resolveDistTag, r as runAddCommand } from '../packem_shared/commands-SUPdjsu5.mjs';
 import { p as promptAuthProvider, E as EMAIL_ITEM } from '../packem_shared/features-ocSSpZtS.mjs';
-import { runAddCommand } from '../packem_shared/runAddCommand-BZGkRnBs.mjs';
 
 const GITHUB_CONTENT = `name: Deploy
 
@@ -20,6 +20,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+# Prerequisite: commit your pnpm-lock.yaml. \`pnpm install --frozen-lockfile\`
+# (below) and the pnpm cache both require it — run \`pnpm install\` locally and
+# commit the lockfile before pushing, or the first CI run fails.
+#
 # Set these repository secrets (Settings → Secrets and variables → Actions):
 #   CLOUDFLARE_API_TOKEN   — a Workers-scoped API token
 #   CLOUDFLARE_ACCOUNT_ID  — your Cloudflare account id
@@ -66,6 +70,10 @@ jobs:
 const GITLAB_CONTENT = `stages:
   - deploy
 
+# Prerequisite: commit your pnpm-lock.yaml. \`pnpm install --frozen-lockfile\`
+# (below) requires it — run \`pnpm install\` locally and commit the lockfile
+# before pushing, or the first pipeline fails.
+#
 # Set these as masked CI/CD variables (Settings → CI/CD → Variables):
 #   CLOUDFLARE_API_TOKEN   — a Workers-scoped API token
 #   CLOUDFLARE_ACCOUNT_ID  — your Cloudflare account id
@@ -127,6 +135,9 @@ const scaffoldCiWorkflow = (projectRoot, provider, logger, options = {}) => {
     } else {
       logger.success(`--ci ${provider}: wrote ${spec.file}`);
       logger.info(`--ci ${provider}: set CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID as ${spec.secretsHint} to enable deploys.`);
+      logger.info(
+        `--ci ${provider}: run \`pnpm install\` and commit pnpm-lock.yaml before pushing — the pipeline runs \`pnpm install --frozen-lockfile\`.`
+      );
     }
     return result;
   } catch (error) {
@@ -324,32 +335,6 @@ export const send = mutation
     });
 `;
 const DEFAULT_SOURCE_BASE = "gh:anolilab/lunora/templates";
-const DEFAULT_SOURCE_REF_FALLBACK = "alpha";
-const resolveCliVersion = () => {
-  try {
-    let directory = dirname$1(fileURLToPath(import.meta.url));
-    for (let index = 0; index < 5; index += 1) {
-      const candidate = join$1(directory, "package.json");
-      if (existsSync(candidate)) {
-        const parsed = JSON.parse(readFileSync(candidate, "utf8"));
-        if (parsed.name === "@lunora/cli" && typeof parsed.version === "string") {
-          return parsed.version;
-        }
-      }
-      const parent = dirname$1(directory);
-      if (parent === directory) {
-        break;
-      }
-      directory = parent;
-    }
-  } catch {
-  }
-  return "0.0.0";
-};
-const resolveDefaultSourceRef = () => {
-  const version = resolveCliVersion();
-  return version === "0.0.0" ? DEFAULT_SOURCE_REF_FALLBACK : `v${version}`;
-};
 const isTextFile = (filePath) => {
   const lastDot = filePath.lastIndexOf(".");
   if (lastDot === -1) {
@@ -358,6 +343,26 @@ const isTextFile = (filePath) => {
   return TEXT_EXTENSIONS.has(filePath.slice(lastDot));
 };
 const substitute = (content, name) => content.replaceAll("{{name}}", name);
+const isLunoraDep = (name) => name === "lunorash" || name.startsWith("@lunora/");
+const stampLunoraDeps = (packageJsonText, distTag) => {
+  let parsed;
+  try {
+    parsed = JSON.parse(packageJsonText);
+  } catch {
+    return packageJsonText;
+  }
+  let text = packageJsonText;
+  for (const section of ["dependencies", "devDependencies"]) {
+    for (const name of Object.keys(parsed[section] ?? {})) {
+      if (!isLunoraDep(name)) {
+        continue;
+      }
+      const edits = modify(text, [section, name], distTag, { formattingOptions: { insertSpaces: true, tabSize: 4 } });
+      text = applyEdits(text, edits);
+    }
+  }
+  return text;
+};
 const collectFiles = (directory) => {
   const out = [];
   for (const entry of walkSync(directory, { includeDirs: false, includeFiles: true })) {
@@ -368,12 +373,16 @@ const collectFiles = (directory) => {
 const copyTemplate = (sourceDirectory, target, name) => {
   const files = collectFiles(sourceDirectory);
   const written = [];
+  const distTag = resolveDistTag();
   for (const source of files) {
     const relativePath = relative(sourceDirectory, source);
     const destination = join$1(target, relativePath);
     mkdirSync(dirname$1(destination), { recursive: true });
     const raw = readFileSync(source);
-    const text = isTextFile(source) ? substitute(raw.toString("utf8"), name) : void 0;
+    let text = isTextFile(source) ? substitute(raw.toString("utf8"), name) : void 0;
+    if (text !== void 0 && basename(source) === "package.json") {
+      text = stampLunoraDeps(text, distTag);
+    }
     if (text === void 0) {
       writeFileSync(destination, raw);
     } else {
@@ -383,11 +392,11 @@ const copyTemplate = (sourceDirectory, target, name) => {
   }
   return written;
 };
-const resolveTemplateSource = (templateType, source) => {
+const resolveTemplateSource = (templateType, source, ref) => {
   if (source !== void 0 && source.length > 0) {
     return source;
   }
-  return `${DEFAULT_SOURCE_BASE}/${templateType}#${resolveDefaultSourceRef()}`;
+  return `${DEFAULT_SOURCE_BASE}/${templateType}#${resolveSourceRef(ref)}`;
 };
 const isSafeSource = (source) => {
   if (source.includes("..")) {
@@ -412,11 +421,12 @@ const scaffoldFromLocal = (fromRoot, templateType, target, name, logger) => {
   logScaffoldSuccess(logger, written, target, name);
   return { code: 0, files: written, target };
 };
-const scaffoldFromRemote = async (source, templateType, target, name, logger) => {
+const scaffoldFromRemote = async (options) => {
+  const { logger, name, ref, source, target, templateType } = options;
   const stagingRoot = mkdtempSync(join$1(tmpdir(), "lunora-init-fetch-"));
   const stagingDirectory = join$1(stagingRoot, "template");
   try {
-    const remote = resolveTemplateSource(templateType, source);
+    const remote = resolveTemplateSource(templateType, source, ref);
     logger.info(`fetching template from ${remote}`);
     const downloaded = await downloadTemplate(remote, {
       cwd: stagingRoot,
@@ -566,6 +576,7 @@ const maybeOfferExtras = async (options, projectDirectory) => {
       from: options.registryFrom,
       logger: options.logger,
       names: [...names],
+      ref: options.ref,
       source: options.registrySource,
       yes: true
     });
@@ -607,7 +618,7 @@ const scaffoldNewProject = async (options, cwd) => {
     );
     return { code: 1, files: [], target };
   }
-  return scaffoldFromRemote(options.source, templateType, target, name, options.logger);
+  return scaffoldFromRemote({ logger: options.logger, name, ref: options.ref, source: options.source, target, templateType });
 };
 const runInitCommand = async (options) => {
   const cwd = options.cwd ?? process.cwd();
@@ -643,10 +654,11 @@ const execute = defineHandler(({ argument, cwd, logger, options }) => {
     interactive: options.interactive === true ? true : void 0,
     logger,
     name: argument[0],
+    ref: options.ref,
     source: options.source,
     templateType: template,
     yes: options.yes === true
   });
 });
 
-export { execute, isTemplate, runInitCommand };
+export { execute, isTemplate, resolveTemplateSource, runInitCommand };

package/dist/packem_shared/{COMMANDS-1V_KEx35.mjs → COMMANDS-CHw4zOZ9.mjs}

@@ -15,7 +15,8 @@ const addCommand = {
     ["lunora add auth --provider clerk", "Add Clerk auth without prompting"],
     ["lunora add email", "Add transactional email (Cloudflare Email Workers + dev mail catcher)"],
     ["lunora add storage", "Add the R2 storage registry item"],
-    ["lunora add crons", "Add the scheduled-jobs registry item"]
+    ["lunora add crons", "Add the scheduled-jobs registry item"],
+    ["lunora add storage --ref alpha", "Add an item from the alpha branch's registry"]
   ],
   group: "Project",
   loader: () => import('../packem_chunks/handler.mjs').then((m) => {
@@ -27,6 +28,11 @@ const addCommand = {
     { description: "Skip the provider prompt and use the default (email & password)", name: "yes", type: Boolean },
     { description: "Local registry root (offline; expects <name>/ subdirs)", name: "from", type: String },
     { description: "Override the remote registry source base (e.g. gh:owner/repo/registry)", name: "source", type: String },
+    {
+      description: "Fetch items from a git ref (branch, tag, or commit), e.g. --ref alpha. Overrides the version-derived default",
+      name: "ref",
+      type: String
+    },
     { description: "Permit --source values outside gh:/github:/https://", name: "allow-unsafe-source", type: Boolean }
   ]
 };
@@ -342,6 +348,7 @@ const initCommand = {
     ["lunora init my-app", "Scaffold with the default (vite) template"],
     ["lunora init my-app -t tanstack-start-react", "Scaffold a TanStack Start (React) app"],
     ["lunora init my-app -t tanstack-start-solid", "Scaffold a TanStack Start (Solid) app"],
+    ["lunora init my-app --ref alpha", "Scaffold from the alpha branch's templates"],
     ["lunora init --here", "Add Lunora to the current project"],
     ["lunora init my-app --ci github", "Scaffold + add a GitHub Actions deploy pipeline"],
     ["lunora init my-app --ci gitlab", "Scaffold + add a GitLab CI deploy pipeline"]
@@ -369,6 +376,11 @@ const initCommand = {
       name: "source",
       type: String
     },
+    {
+      description: "Fetch templates from a git ref (branch, tag, or commit), e.g. --ref alpha. Overrides the version-derived default",
+      name: "ref",
+      type: String
+    },
     {
       description: "Permit --source values outside gh:/github:/https:// (e.g. local file://)",
       name: "allow-unsafe-source",
@@ -541,6 +553,11 @@ const registryCommand = {
     { description: "add: skip the package.json mutation confirmation prompt", name: "yes", type: Boolean },
     { description: "Local registry root (offline; expects <name>/ subdirs)", name: "from", type: String },
     { description: "Override the remote registry source base (e.g. gh:owner/repo/registry)", name: "source", type: String },
+    {
+      description: "Fetch items from a git ref (branch, tag, or commit), e.g. --ref alpha. Overrides the version-derived default",
+      name: "ref",
+      type: String
+    },
     { description: "Permit --source values outside gh:/github:/https://", name: "allow-unsafe-source", type: Boolean },
     { description: "Emit JSON output (add plan / list)", name: "json", type: Boolean },
     { description: "build: output path for the catalog (default <root>/index.json)", name: "out", type: String },

package/dist/packem_shared/{runAddCommand-BZGkRnBs.mjs → commands-SUPdjsu5.mjs}

@@ -1,7 +1,8 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync, mkdtempSync, rmSync } from 'node:fs';
-import { join, dirname } from '@visulima/path';
+import { dirname, join } from '@visulima/path';
 import { DEV_VARS_FILE, parseDevVariableEntries, promptYesNo } from '@lunora/config';
 import { modify, applyEdits, parse } from 'jsonc-parser';
+import { fileURLToPath } from 'node:url';
 import { collectCatalog, buildRegistryIndex } from './buildRegistryIndex-BcYe607_.mjs';
 import { insertSchemaExtension } from './insertSchemaExtension-BuzF6-t2.mjs';
 import { createHash } from 'node:crypto';
@@ -9,7 +10,87 @@ import { tmpdir } from 'node:os';
 import { downloadTemplate } from 'giget';
 import parseManifest from './parseManifest--vZf2FY1.mjs';
 
-const applyDeps = (deps, projectRoot, logger, section = "dependencies") => {
+const DEFAULT_SOURCE_REF_FALLBACK = "alpha";
+const STABLE_BRANCH = "main";
+const PRERELEASE_CHANNEL_BRANCHES = /* @__PURE__ */ new Set(["alpha", "beta", "next"]);
+const SAFE_REF = /^[\w./@-]+$/;
+const isSafeRef = (ref) => !ref.includes("..") && SAFE_REF.test(ref);
+const resolveCliVersion = () => {
+  try {
+    let directory = dirname(fileURLToPath(import.meta.url));
+    for (let index = 0; index < 6; index += 1) {
+      const candidate = join(directory, "package.json");
+      if (existsSync(candidate)) {
+        const parsed = JSON.parse(readFileSync(candidate, "utf8"));
+        if (parsed.name === "@lunora/cli" && typeof parsed.version === "string") {
+          return parsed.version;
+        }
+      }
+      const parent = dirname(directory);
+      if (parent === directory) {
+        break;
+      }
+      directory = parent;
+    }
+  } catch {
+  }
+  return "0.0.0";
+};
+const resolveVersionRef = (version) => {
+  if (version === "0.0.0") {
+    return DEFAULT_SOURCE_REF_FALLBACK;
+  }
+  const core = version.split("+")[0] ?? version;
+  const dashIndex = core.indexOf("-");
+  if (dashIndex !== -1) {
+    const [channel] = core.slice(dashIndex + 1).split(".");
+    if (channel !== void 0 && PRERELEASE_CHANNEL_BRANCHES.has(channel)) {
+      return channel;
+    }
+  }
+  return STABLE_BRANCH;
+};
+const resolveSourceRef = (ref) => {
+  if (ref !== void 0 && ref.length > 0) {
+    if (!isSafeRef(ref)) {
+      throw new Error(`invalid --ref "${ref}" — a ref may contain letters, digits, ".", "_", "-", "/", "@" and must not contain "..".`);
+    }
+    return ref;
+  }
+  return resolveVersionRef(resolveCliVersion());
+};
+const STABLE_DIST_TAG = "latest";
+const resolveDistTag = () => {
+  const ref = resolveVersionRef(resolveCliVersion());
+  return ref === STABLE_BRANCH ? STABLE_DIST_TAG : ref;
+};
+
+const resolveDepRange = (range) => {
+  if (!range.startsWith("workspace:")) {
+    return range;
+  }
+  const rest = range.slice("workspace:".length);
+  if (rest === "" || rest === "*" || rest === "^" || rest === "~") {
+    return resolveDistTag();
+  }
+  return rest;
+};
+const UMBRELLA_REEXPORTED_DEPS = /* @__PURE__ */ new Set(["@lunora/client", "@lunora/do", "@lunora/runtime", "@lunora/server", "@lunora/values"]);
+const UMBRELLA_IMPORT_RE = /(['"])@lunora\/(client|do|runtime|server|values)(\/[^'"]*)?\1/gu;
+const projectUsesUmbrella = (projectRoot) => {
+  const packageJsonPath = join(projectRoot, "package.json");
+  if (!existsSync(packageJsonPath)) {
+    return false;
+  }
+  try {
+    const parsed = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+    return parsed.dependencies?.lunorash !== void 0 || parsed.devDependencies?.lunorash !== void 0;
+  } catch {
+    return false;
+  }
+};
+const rewriteUmbrellaImports = (source) => source.replaceAll(UMBRELLA_IMPORT_RE, (_match, quote, base, subpath) => `${quote}lunorash/${base}${subpath ?? ""}${quote}`);
+const applyDeps = (deps, projectRoot, logger, section = "dependencies", useUmbrella = false) => {
   const entries = Object.entries(deps);
   if (entries.length === 0) {
     return [];
@@ -23,11 +104,15 @@ const applyDeps = (deps, projectRoot, logger, section = "dependencies") => {
   const parsed = JSON.parse(text);
   const added = [];
   for (const [name, range] of entries) {
+    if (useUmbrella && UMBRELLA_REEXPORTED_DEPS.has(name)) {
+      logger.info(`dep provided by the lunorash umbrella, skipping: ${name}`);
+      continue;
+    }
     if (parsed.dependencies?.[name] !== void 0 || parsed.devDependencies?.[name] !== void 0) {
       logger.info(`dep already present: ${name}`);
       continue;
     }
-    const edits = modify(text, [section, name], range, {
+    const edits = modify(text, [section, name], resolveDepRange(range), {
       formattingOptions: { insertSpaces: true, tabSize: 4 }
     });
     text = applyEdits(text, edits);
@@ -148,14 +233,14 @@ const applyBindings = (bindings, projectRoot, logger) => {
   }
   return applied;
 };
-const applyItemResources = (manifest, cwd, logger) => {
+const applyItemResources = (manifest, cwd, logger, useUmbrella = false) => {
   const deps = [];
   const bindings = [];
   if (manifest.deps) {
-    deps.push(...applyDeps(manifest.deps, cwd, logger));
+    deps.push(...applyDeps(manifest.deps, cwd, logger, "dependencies", useUmbrella));
   }
   if (manifest.devDependencies) {
-    deps.push(...applyDeps(manifest.devDependencies, cwd, logger, "devDependencies"));
+    deps.push(...applyDeps(manifest.devDependencies, cwd, logger, "devDependencies", useUmbrella));
   }
   if (manifest.bindings) {
     bindings.push(...applyBindings(manifest.bindings, cwd, logger));
@@ -267,7 +352,12 @@ const renderDiff = (oldText, newText) => {
   return out;
 };
 
-const reconcileSchemaExtension = (file, itemKey, itemDirectory, projectRoot, logger, diff) => {
+const CODE_FILE_RE = /\.[cm]?[jt]sx?$/u;
+const readItemFile = (itemDirectory, file, useUmbrella) => {
+  const source = readFileSync(join(itemDirectory, file.from), "utf8");
+  return useUmbrella && CODE_FILE_RE.test(file.to) ? rewriteUmbrellaImports(source) : source;
+};
+const reconcileSchemaExtension = (file, itemKey, itemDirectory, projectRoot, logger, diff, useUmbrella) => {
   const schemaPath = join(projectRoot, "lunora", "schema.ts");
   if (diff) {
     logger.info(`~ would merge .extend(${itemKey}.extension) into lunora/schema.ts (and create ${file.to} if absent)`);
@@ -276,9 +366,13 @@ const reconcileSchemaExtension = (file, itemKey, itemDirectory, projectRoot, log
   const destinationPath = join(projectRoot, file.to);
   if (!existsSync(destinationPath)) {
     mkdirSync(dirname(destinationPath), { recursive: true });
-    writeFileSync(destinationPath, readFileSync(join(itemDirectory, file.from), "utf8"), "utf8");
+    writeFileSync(destinationPath, readItemFile(itemDirectory, file, useUmbrella), "utf8");
   }
-  const existingSchema = existsSync(schemaPath) ? readFileSync(schemaPath, "utf8") : 'import { defineSchema } from "@lunora/server";\n\nexport const schema = defineSchema({});\n';
+  const baseModule = useUmbrella ? "lunorash/server" : "@lunora/server";
+  const existingSchema = existsSync(schemaPath) ? readFileSync(schemaPath, "utf8") : `import { defineSchema } from "${baseModule}";
+
+export const schema = defineSchema({});
+`;
   const result = insertSchemaExtension(existingSchema, itemKey);
   if (result.ok) {
     mkdirSync(dirname(schemaPath), { recursive: true });
@@ -308,9 +402,9 @@ const previewWholeFile = (file, current, incoming, exists, logger) => {
     logger.info(`    ${line}`);
   }
 };
-const reconcileWholeFile = (file, itemKey, itemDirectory, projectRoot, logger, lock, reconcileOptions) => {
+const reconcileWholeFile = (file, itemKey, itemDirectory, projectRoot, logger, lock, reconcileOptions, useUmbrella) => {
   const destinationPath = join(projectRoot, file.to);
-  const incoming = readFileSync(join(itemDirectory, file.from), "utf8");
+  const incoming = readItemFile(itemDirectory, file, useUmbrella);
   const exists = existsSync(destinationPath);
   const current = exists ? readFileSync(destinationPath, "utf8") : "";
   const write = (message) => {
@@ -348,11 +442,11 @@ const reconcileWholeFile = (file, itemKey, itemDirectory, projectRoot, logger, l
   logger.warn(`conflict: ${file.to} has local edits and an upstream update — wrote ${file.to}.new (use --overwrite to take theirs)`);
   return { kind: "skipped", path: destinationPath };
 };
-const reconcileFile = (file, itemKey, itemDirectory, projectRoot, logger, lock, reconcileOptions = {}) => {
+const reconcileFile = (file, itemKey, itemDirectory, projectRoot, logger, lock, reconcileOptions = {}, useUmbrella = false) => {
   if (file.merge === "schema-extension") {
-    return reconcileSchemaExtension(file, itemKey, itemDirectory, projectRoot, logger, reconcileOptions.diff === true);
+    return reconcileSchemaExtension(file, itemKey, itemDirectory, projectRoot, logger, reconcileOptions.diff === true, useUmbrella);
   }
-  return reconcileWholeFile(file, itemKey, itemDirectory, projectRoot, logger, lock, reconcileOptions);
+  return reconcileWholeFile(file, itemKey, itemDirectory, projectRoot, logger, lock, reconcileOptions, useUmbrella);
 };
 const reconcileItems = (items, cwd, logger, reconcileOptions = {}) => {
   const written = [];
@@ -360,15 +454,16 @@ const reconcileItems = (items, cwd, logger, reconcileOptions = {}) => {
   const depsAdded = [];
   const bindingsApplied = [];
   const lock = readLock(cwd);
+  const useUmbrella = projectUsesUmbrella(cwd);
   for (const { directory, manifest } of items) {
     for (const file of manifest.files) {
-      const outcome = reconcileFile(file, manifest.name, directory, cwd, logger, lock, reconcileOptions);
+      const outcome = reconcileFile(file, manifest.name, directory, cwd, logger, lock, reconcileOptions, useUmbrella);
       (outcome.kind === "written" ? written : skipped).push(outcome.path);
     }
     if (reconcileOptions.diff) {
       continue;
     }
-    const applied = applyItemResources(manifest, cwd, logger);
+    const applied = applyItemResources(manifest, cwd, logger, useUmbrella);
     depsAdded.push(...applied.deps);
     bindingsApplied.push(...applied.bindings);
   }
@@ -379,7 +474,6 @@ const reconcileItems = (items, cwd, logger, reconcileOptions = {}) => {
 };
 
 const DEFAULT_SOURCE_BASE = "gh:anolilab/lunora/registry";
-const DEFAULT_SOURCE_REF = "alpha";
 const VALID_ITEM_NAME = /^[A-Za-z0-9][\w-]*$/u;
 const assertSafeItemName = (name) => {
   if (!VALID_ITEM_NAME.test(name)) {
@@ -431,7 +525,7 @@ const resolveItemDirectory = async (name, options) => {
     }, directory };
   }
   const base = options.source ?? DEFAULT_SOURCE_BASE;
-  return fetchToStaging(`${base}/${name}#${DEFAULT_SOURCE_REF}`, "item", options.logger);
+  return fetchToStaging(`${base}/${name}#${resolveSourceRef(options.ref)}`, "item", options.logger);
 };
 const resolveRegistryRoot = async (options) => {
   if (options.from !== void 0) {
@@ -442,7 +536,7 @@ const resolveRegistryRoot = async (options) => {
     }, root: options.from };
   }
   const base = options.source ?? DEFAULT_SOURCE_BASE;
-  const { cleanup, directory } = await fetchToStaging(`${base}#${DEFAULT_SOURCE_REF}`, "registry", options.logger);
+  const { cleanup, directory } = await fetchToStaging(`${base}#${resolveSourceRef(options.ref)}`, "registry", options.logger);
   return { cleanup, root: directory };
 };
 const readManifest = (itemDirectory, name) => {
@@ -690,4 +784,4 @@ const runBuildIndexCommand = async (options) => {
   return empty;
 };
 
-export { runAddCommand, runBuildIndexCommand, runListCommand, runRegistryViewCommand };
+export { runBuildIndexCommand as a, runRegistryViewCommand as b, resolveSourceRef as c, resolveDistTag as d, runListCommand as e, runAddCommand as r };

package/dist/packem_shared/runAddCommand-Txwh1Xw1.mjs

@@ -0,0 +1,4 @@
+import 'node:fs';
+import '@visulima/path';
+export { r as runAddCommand, a as runBuildIndexCommand, e as runListCommand, b as runRegistryViewCommand } from './commands-SUPdjsu5.mjs';
+import './buildRegistryIndex-BcYe607_.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/cli",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "description": "The Lunora CLI: init, dev, deploy, codegen, run, reset, and migrate commands",
   "keywords": [
     "agent-skills",
@@ -53,12 +53,12 @@
   "dependencies": {
     "@bomb.sh/tab": "0.0.17",
     "@lunora/codegen": "1.0.0-alpha.2",
-    "@lunora/config": "1.0.0-alpha.2",
+    "@lunora/config": "1.0.0-alpha.3",
     "@lunora/container": "1.0.0-alpha.1",
-    "@lunora/d1": "1.0.0-alpha.2",
+    "@lunora/d1": "1.0.0-alpha.3",
     "@lunora/seed": "1.0.0-alpha.1",
     "@lunora/server": "1.0.0-alpha.1",
-    "@lunora/studio": "1.0.0-alpha.1",
+    "@lunora/studio": "1.0.0-alpha.2",
     "@lunora/values": "1.0.0-alpha.1",
     "@visulima/cerebro": "3.0.0-alpha.32",
     "@visulima/fs": "5.0.0-alpha.32",