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

package/dist/index.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 { r as runAddCommand, a as runBuildIndexCommand, b as runRegistryViewCommand } from './packem_shared/commands-DIQ3nf0C.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 { r as runAddCommand } from '../packem_shared/commands-DIQ3nf0C.mjs';
+import { r as runAddCommand } from '../packem_shared/commands-SUPdjsu5.mjs';
 
 const providerToItem = (provider) => {
   const value = provider.trim().toLowerCase();

package/dist/packem_chunks/handler16.mjs

@@ -1,5 +1,5 @@
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
-import { r as runAddCommand, b as runRegistryViewCommand, a as runBuildIndexCommand } from '../packem_shared/commands-DIQ3nf0C.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];

package/dist/packem_chunks/runInitCommand.mjs

@@ -2,13 +2,14 @@ import { existsSync, mkdirSync, writeFileSync, readdirSync, mkdtempSync, rmSync,
 import { tmpdir } from 'node:os';
 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, r as runAddCommand } from '../packem_shared/commands-DIQ3nf0C.mjs';
+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';
 
 const GITHUB_CONTENT = `name: Deploy
@@ -19,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
@@ -65,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
@@ -126,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) {
@@ -331,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 })) {
@@ -341,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 {

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

@@ -2,12 +2,12 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync, mkdtempSync, rmSync
 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';
 import { tmpdir } from 'node:os';
 import { downloadTemplate } from 'giget';
-import { fileURLToPath } from 'node:url';
 import parseManifest from './parseManifest--vZf2FY1.mjs';
 
 const DEFAULT_SOURCE_REF_FALLBACK = "alpha";
@@ -59,8 +59,38 @@ const resolveSourceRef = (ref) => {
   }
   return resolveVersionRef(resolveCliVersion());
 };
+const STABLE_DIST_TAG = "latest";
+const resolveDistTag = () => {
+  const ref = resolveVersionRef(resolveCliVersion());
+  return ref === STABLE_BRANCH ? STABLE_DIST_TAG : ref;
+};
 
-const applyDeps = (deps, projectRoot, logger, section = "dependencies") => {
+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 [];
@@ -74,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);
@@ -199,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));
@@ -318,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)`);
@@ -327,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 });
@@ -359,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) => {
@@ -399,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 = [];
@@ -411,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);
   }
@@ -740,4 +784,4 @@ const runBuildIndexCommand = async (options) => {
   return empty;
 };
 
-export { runBuildIndexCommand as a, runRegistryViewCommand as b, resolveSourceRef as c, runListCommand as d, runAddCommand as r };
+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.3",
+  "version": "1.0.0-alpha.4",
   "description": "The Lunora CLI: init, dev, deploy, codegen, run, reset, and migrate commands",
   "keywords": [
     "agent-skills",

package/dist/packem_shared/runAddCommand-3I3JFZUG.mjs

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