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

package/dist/bin.mjs

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

package/dist/index.d.mts

@@ -532,7 +532,7 @@ interface OfferDeps {
 * maps to the `mail` item. Picked items are applied in selection order.
 * Non-interactive: prints how to add them later and changes nothing.
 */
-type Template = "astro" | "next" | "nuxt" | "standalone" | "sveltekit" | "tanstack-start-react" | "tanstack-start-solid" | "vite";
+type Template = "astro" | "next" | "nuxt" | "standalone" | "sveltekit" | "tanstack-start-react" | "tanstack-start-solid" | "vite-react";
 interface InitCommandOptions {
   /**
   * When true, accept `--source` values that don't start with `gh:` /
@@ -605,7 +605,7 @@ interface InitCommandResult {
 * scaffold's exit code.
 */
 declare const runInitCommand: (options: InitCommandOptions) => Promise<InitCommandResult>;
-/** Narrow a raw `--template` value to a known {@link Template} (defaults to vite). */
+/** Narrow a raw `--template` value to a known {@link Template} (defaults to vite-react). */
 interface MigrateGenerateCommandOptions {
   cwd?: string;
   logger: Logger;

package/dist/index.d.ts

@@ -532,7 +532,7 @@ interface OfferDeps {
 * maps to the `mail` item. Picked items are applied in selection order.
 * Non-interactive: prints how to add them later and changes nothing.
 */
-type Template = "astro" | "next" | "nuxt" | "standalone" | "sveltekit" | "tanstack-start-react" | "tanstack-start-solid" | "vite";
+type Template = "astro" | "next" | "nuxt" | "standalone" | "sveltekit" | "tanstack-start-react" | "tanstack-start-solid" | "vite-react";
 interface InitCommandOptions {
   /**
   * When true, accept `--source` values that don't start with `gh:` /
@@ -605,7 +605,7 @@ interface InitCommandResult {
 * scaffold's exit code.
 */
 declare const runInitCommand: (options: InitCommandOptions) => Promise<InitCommandResult>;
-/** Narrow a raw `--template` value to a known {@link Template} (defaults to vite). */
+/** Narrow a raw `--template` value to a known {@link Template} (defaults to vite-react). */
 interface MigrateGenerateCommandOptions {
   cwd?: string;
   logger: Logger;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { COMMANDS, VERSION, runCli } from './packem_shared/COMMANDS-CHw4zOZ9.mjs';
+export { COMMANDS, VERSION, runCli } from './packem_shared/COMMANDS-DXaq12xm.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 { 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-B9nASOYd.mjs';

package/dist/packem_chunks/handler.mjs

@@ -1,9 +1,10 @@
 import { existsSync } from 'node:fs';
-import { findWranglerFile, promptSelect } from '@lunora/config';
+import { findWranglerFile } from '@lunora/config';
 import { join } from '@visulima/path';
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
+import { t as tuiSelect } from '../packem_shared/tui-prompts-Bm15GPJA.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-B9nASOYd.mjs';
 
 const providerToItem = (provider) => {
   const value = provider.trim().toLowerCase();
@@ -24,7 +25,7 @@ const resolveAuthItem = async (options) => {
   if (options.yes === true) {
     return DEFAULT_AUTH_ITEM;
   }
-  const select = options.promptSelect ?? ((message, choices, settings) => promptSelect(message, choices, settings));
+  const select = options.promptSelect ?? ((message, choices, settings) => tuiSelect(message, choices, settings));
   return promptAuthProvider(select);
 };
 const resolveFeatureItems = async (feature, options) => {

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-B9nASOYd.mjs';
 
 const execute = defineHandler(({ argument, cwd, logger, options }) => {
   const subcommand = argument[0];

package/dist/packem_chunks/handler18.mjs

@@ -2,12 +2,12 @@ import { existsSync } from 'node:fs';
 import { mkdtemp, writeFile, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { discoverSchema, schemaFromIr } from '@lunora/codegen';
-import { promptYesNo } from '@lunora/config';
 import { seedPlan } from '@lunora/seed';
 import { join } from '@visulima/path';
 import { Project } from 'ts-morph';
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
 import { a as resolveProductionWorkerUrl } from '../packem_shared/resolve-target-qbsJ_5sF.mjs';
+import { a as tuiConfirm } from '../packem_shared/tui-prompts-Bm15GPJA.mjs';
 import { runImportCommand } from '../packem_shared/DEFAULT_IMPORT_BATCH_SIZE-Ck-2bU08.mjs';
 import { runResetCommand } from './runResetCommand.mjs';
 
@@ -88,10 +88,8 @@ const confirmRemoteSeedTarget = async (options, generated) => {
     options.logger.error("seed: refusing to insert into a non-local target without confirmation — re-run with --yes");
     return seedFailure(1);
   }
-  const confirmer = options.confirm ?? promptYesNo;
-  const confirmed = await confirmer(
-    `This will insert ${String(generated)} generated row(s) into ${options.url ?? "the production worker"}. Continue? [y/N] `
-  );
+  const confirmer = options.confirm ?? tuiConfirm;
+  const confirmed = await confirmer(`This will insert ${String(generated)} generated row(s) into ${options.url ?? "the production worker"}. Continue?`);
   if (!confirmed) {
     options.logger.info("seed: aborted");
     return seedFailure(1);

package/dist/packem_chunks/planDevCommand.mjs

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process';
-import { detectAgentRules, inferLunoraBindings, packageNamesFromBindings, ensureDevVarsExample, ensureDevVariables, createConfirm, isInteractive, DEV_VARS_FILE, DEV_VARS_EXAMPLE_FILE, claimAgentRulesHint, AGENT_RULES_HINT, materializeRemoteWranglerConfig, formatLunoraEvent, resolveRemoteEnabled, readProjectRemotePreference } from '@lunora/config';
+import { detectAgentRules, inferLunoraBindings, packageNamesFromBindings, ensureDevVarsExample, ensureDevVariables, isInteractive, DEV_VARS_FILE, DEV_VARS_EXAMPLE_FILE, claimAgentRulesHint, AGENT_RULES_HINT, materializeRemoteWranglerConfig, formatLunoraEvent, resolveRemoteEnabled, readProjectRemotePreference } from '@lunora/config';
 import { p as parseApiSpec } from '../packem_shared/api-spec-CtA6ilu4.mjs';
 import { existsSync, watch, readFileSync } from 'node:fs';
 import { join } from 'node:path';
@@ -9,6 +9,7 @@ import { dirname, join as join$1 } from '@visulima/path';
 import { createServer, request } from 'node:http';
 import { connect } from 'node:net';
 import { loadStudioAssets, studioAssetsStamp, renderStudioHtml, resolveAdminToken, SCHEMA_EDIT_ENDPOINT, POLICY_SCAFFOLD_ENDPOINT, SEED_ENDPOINT, serveJsonHandler, handleSchemaEditRequest, handlePolicyScaffoldRequest, handleSeedRequest } from '@lunora/config/studio-host';
+import { c as createTuiConfirm } from '../packem_shared/tui-prompts-Bm15GPJA.mjs';
 
 const DEFAULT_DEBOUNCE_MS = 100;
 const PATH_SEGMENT_SEPARATOR = /[/\\]/u;
@@ -441,7 +442,7 @@ const offerDevVariablesScaffold = async (options, cwd) => {
   } catch {
   }
   const result = await (options.ensureEnv ?? ensureDevVariables)({
-    confirm: createConfirm(),
+    confirm: createTuiConfirm(),
     cwd,
     info: (message) => {
       options.logger.info(message);

package/dist/packem_chunks/runInitCommand.mjs

@@ -1,14 +1,16 @@
 import { existsSync, mkdirSync, writeFileSync, readdirSync, mkdtempSync, rmSync, readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { detectFramework as detectFramework$1, isInteractive, promptSelect, promptMultiSelect } from '@lunora/config';
+import { detectFramework as detectFramework$1, isInteractive } 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-B9nASOYd.mjs';
+import { b as tuiIntro, d as tuiOutro, t as tuiSelect, e as tuiMultiSelect, w as withTuiSpinner } from '../packem_shared/tui-prompts-Bm15GPJA.mjs';
 import { p as promptAuthProvider, E as EMAIL_ITEM } from '../packem_shared/features-ocSSpZtS.mjs';
 
 const GITHUB_CONTENT = `name: Deploy
@@ -19,6 +21,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 +71,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 +136,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 +344,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 +374,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 {
@@ -534,31 +571,48 @@ const offerIsInteractive = (options) => options.yes !== true && (options.prompt
 const maybeOfferExtras = async (options, projectDirectory) => {
   const interactive = offerIsInteractive(options);
   const apply = async (names) => {
-    const result = await runAddCommand({
-      allowUnsafeSource: options.allowUnsafeSource,
-      cwd: projectDirectory,
-      from: options.registryFrom,
-      logger: options.logger,
-      names: [...names],
-      ref: options.ref,
-      source: options.registrySource,
-      yes: true
-    });
+    const applyLogger = isInteractive() ? {
+      error: (message) => {
+        options.logger.error(message);
+      },
+      info: () => {
+      },
+      success: () => {
+      },
+      warn: (message) => {
+        options.logger.warn(message);
+      }
+    } : options.logger;
+    const result = await withTuiSpinner(
+      `adding ${names.join(", ")}…`,
+      () => runAddCommand({
+        allowUnsafeSource: options.allowUnsafeSource,
+        cwd: projectDirectory,
+        from: options.registryFrom,
+        logger: applyLogger,
+        names: [...names],
+        ref: options.ref,
+        source: options.registrySource,
+        yes: true
+      })
+    );
     return result.code === 0;
   };
+  await tuiIntro("let's finish setting up your app");
   await offerRegistryExtras({
     apply,
     interactive,
     logger: options.logger,
-    multiSelect: options.prompt?.multiSelect ?? ((message, choices, settings) => promptMultiSelect(message, choices, settings)),
-    select: options.prompt?.select ?? ((message, choices, settings) => promptSelect(message, choices, settings))
+    multiSelect: options.prompt?.multiSelect ?? ((message, choices, settings) => tuiMultiSelect(message, choices, settings)),
+    select: options.prompt?.select ?? ((message, choices, settings) => tuiSelect(message, choices, settings))
   });
+  await tuiOutro("you're all set — run `pnpm dev` to start.");
 };
 const scaffoldNewProject = async (options, cwd) => {
   const name = options.name ?? "lunora-app";
-  const templateType = options.templateType ?? "vite";
+  const templateType = options.templateType ?? "vite-react";
   if (templateType === "next") {
-    options.logger.warn('template "next" is not yet available — re-run with `-t vite` or `-t standalone`.');
+    options.logger.warn('template "next" is not yet available — re-run with `-t vite-react` or `-t standalone`.');
     return { code: 1, files: [], target: "" };
   }
   if (name.includes("/") || name.includes("\\") || name === ".." || name === ".") {
@@ -595,7 +649,7 @@ const runInitCommand = async (options) => {
   }
   return result;
 };
-const isTemplate = (value) => value === "astro" || value === "next" || value === "nuxt" || value === "standalone" || value === "sveltekit" || value === "tanstack-start-react" || value === "tanstack-start-solid" || value === "vite";
+const isTemplate = (value) => value === "astro" || value === "next" || value === "nuxt" || value === "standalone" || value === "sveltekit" || value === "tanstack-start-react" || value === "tanstack-start-solid" || value === "vite-react";
 const resolveCiProvider = (raw, logger) => {
   if (raw === void 0) {
     return void 0;
@@ -607,8 +661,8 @@ const resolveCiProvider = (raw, logger) => {
   return void 0;
 };
 const execute = defineHandler(({ argument, cwd, logger, options }) => {
-  const templateRaw = options.template ?? "vite";
-  const template = isTemplate(templateRaw) ? templateRaw : "vite";
+  const templateRaw = options.template ?? "vite-react";
+  const template = isTemplate(templateRaw) ? templateRaw : "vite-react";
   return runInitCommand({
     allowUnsafeSource: options.allowUnsafeSource === true,
     cwd,

package/dist/packem_chunks/runResetCommand.mjs

@@ -1,7 +1,7 @@
 import { existsSync, rmSync } from 'node:fs';
-import { promptYesNo } from '@lunora/config';
 import { join } from '@visulima/path';
 import { d as defineHandler } from '../packem_shared/command-BDXcJCCJ.mjs';
+import { a as tuiConfirm } from '../packem_shared/tui-prompts-Bm15GPJA.mjs';
 
 const runResetCommand = async (options) => {
   const cwd = options.cwd ?? process.cwd();
@@ -15,8 +15,8 @@ const runResetCommand = async (options) => {
       options.logger.error("reset: stdin is not a TTY — re-run with --yes to confirm deleting .wrangler/state");
       return { code: 1, removed: [] };
     }
-    const confirmer = options.confirm ?? promptYesNo;
-    const confirmed = await confirmer("This will delete .wrangler/state. Continue? [y/N] ");
+    const confirmer = options.confirm ?? tuiConfirm;
+    const confirmed = await confirmer("This will delete .wrangler/state. Continue?");
     if (!confirmed) {
       options.logger.info("reset: aborted");
       return { code: 1, removed: [] };

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

@@ -361,8 +361,8 @@ const initCommand = {
   options: [
     {
       alias: "t",
-      defaultValue: "vite",
-      description: "Template to scaffold (vite | standalone | astro | nuxt | sveltekit | tanstack-start-react | tanstack-start-solid)",
+      defaultValue: "vite-react",
+      description: "Template to scaffold (vite-react | standalone | astro | nuxt | sveltekit | tanstack-start-react | tanstack-start-solid)",
       name: "template",
       type: String
     },

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

@@ -1,13 +1,14 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync, mkdtempSync, rmSync } from 'node:fs';
 import { dirname, join } from '@visulima/path';
-import { DEV_VARS_FILE, parseDevVariableEntries, promptYesNo } from '@lunora/config';
+import { DEV_VARS_FILE, parseDevVariableEntries } from '@lunora/config';
 import { modify, applyEdits, parse } from 'jsonc-parser';
+import { fileURLToPath } from 'node:url';
+import { a as tuiConfirm } from './tui-prompts-Bm15GPJA.mjs';
 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 +60,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 +105,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 +234,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));
@@ -238,8 +273,8 @@ const confirmDepMutation = async (items, options) => {
     options.logger.error(`add: stdin is not a TTY and the requested items ${reasonText} — re-run with --yes to confirm`);
     return false;
   }
-  const confirmer = options.confirm ?? promptYesNo;
-  const confirmed = await confirmer(`The requested items ${reasonText}. Continue? [y/N] `);
+  const confirmer = options.confirm ?? tuiConfirm;
+  const confirmed = await confirmer(`The requested items ${reasonText}. Continue?`);
   if (!confirmed) {
     options.logger.info("add: aborted");
   }
@@ -318,7 +353,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 +367,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 +403,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 +443,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 +455,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 +785,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-BF7XreDW.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-B9nASOYd.mjs';
+import './buildRegistryIndex-BcYe607_.mjs';

package/dist/packem_shared/tui-prompts-Bm15GPJA.mjs

@@ -0,0 +1,229 @@
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { isInteractive } from '@lunora/config';
+import { render } from '@visulima/tui';
+import { Box } from '@visulima/tui/components/box';
+import { CommandPalette } from '@visulima/tui/components/command-palette';
+import { ConfirmInput } from '@visulima/tui/components/confirm-input';
+import { MultiSelect } from '@visulima/tui/components/multi-select';
+import { SelectInput } from '@visulima/tui/components/select-input';
+import { Spinner } from '@visulima/tui/components/spinner';
+import { Text } from '@visulima/tui/components/text';
+import { useApp } from '@visulima/tui/hooks/use-app';
+import { useInput } from '@visulima/tui/hooks/use-input';
+import { useEffect } from 'react';
+
+const ACCENT = "#a855f7";
+const SCROLL_LIMIT = 10;
+const FILTER_THRESHOLD = 8;
+const PromptFrame = ({ children }) => jsx(Box, { borderColor: ACCENT, borderStyle: "round", flexDirection: "column", paddingX: 1, children });
+const runInkPrompt = async (build, fallback) => {
+  let result = fallback;
+  const instance = render(
+    build((value) => {
+      result = value;
+    }),
+    { exitOnCtrlC: true }
+  );
+  try {
+    await instance.waitUntilExit();
+  } catch {
+  } finally {
+    instance.unmount();
+  }
+  return result;
+};
+const itemLabel = (option) => option.description === void 0 ? option.label : `${option.label} — ${option.description}`;
+const useCommit = (finish) => {
+  const { exit } = useApp();
+  return (result) => {
+    finish(result);
+    exit();
+  };
+};
+const useEscapeToExit = () => {
+  const { exit } = useApp();
+  useInput((_input, key) => {
+    if (key.escape) {
+      exit();
+    }
+  });
+};
+const SelectView = ({ finish, initialIndex, message, options }) => {
+  const commit = useCommit(finish);
+  useEscapeToExit();
+  return jsxs(PromptFrame, { children: [
+    jsx(Text, { bold: true, children: message }),
+    jsx(
+      SelectInput,
+      {
+        accentColor: ACCENT,
+        initialIndex,
+        items: options.map((option) => {
+          return { key: option.value, label: itemLabel(option), value: option.value };
+        }),
+        limit: SCROLL_LIMIT,
+        onSelect: (item) => {
+          commit(item.value);
+        }
+      }
+    )
+  ] });
+};
+const PaletteView = ({ finish, message, options }) => {
+  const { exit } = useApp();
+  const commit = useCommit(finish);
+  return jsxs(Box, { flexDirection: "column", children: [
+    jsx(Text, { bold: true, children: message }),
+    jsx(
+      CommandPalette,
+      {
+        accentColor: ACCENT,
+        autoFocus: true,
+        commands: options.map((option) => {
+          return { description: option.description, id: option.value, label: option.label };
+        }),
+        limit: SCROLL_LIMIT,
+        onCancel: () => {
+          exit();
+        },
+        onSelect: (id) => {
+          commit(id);
+        },
+        placeholder: "Type to filter…"
+      }
+    )
+  ] });
+};
+const tuiSelect = async (message, options, settings) => {
+  if (!isInteractive() || options.length === 0) {
+    return settings?.default;
+  }
+  if (options.length > FILTER_THRESHOLD) {
+    return runInkPrompt((finish) => jsx(PaletteView, { finish, message, options }), settings?.default);
+  }
+  const defaultIndex = settings?.default === void 0 ? -1 : options.findIndex((option) => option.value === settings.default);
+  return runInkPrompt(
+    (finish) => jsx(SelectView, { finish, initialIndex: defaultIndex >= 0 ? defaultIndex : void 0, message, options }),
+    settings?.default
+  );
+};
+const MultiSelectView = ({ defaults, finish, message, options }) => {
+  const commit = useCommit(finish);
+  useEscapeToExit();
+  return jsxs(PromptFrame, { children: [
+    jsx(Text, { bold: true, children: message }),
+    jsx(Text, { dimColor: true, children: "space toggles · enter confirms · esc cancels" }),
+    jsx(
+      MultiSelect,
+      {
+        accentColor: ACCENT,
+        defaultValue: [...defaults],
+        limit: SCROLL_LIMIT,
+        onSubmit: (values) => {
+          const chosen = new Set(values);
+          commit(options.filter((option) => chosen.has(option.value)).map((option) => option.value));
+        },
+        options: options.map((option) => {
+          return { key: option.value, label: itemLabel(option), value: option.value };
+        })
+      }
+    )
+  ] });
+};
+const tuiMultiSelect = async (message, options, settings) => {
+  const defaults = settings?.defaults ?? [];
+  if (!isInteractive() || options.length === 0) {
+    return [...defaults];
+  }
+  return runInkPrompt((finish) => jsx(MultiSelectView, { defaults, finish, message, options }), [...defaults]);
+};
+const ConfirmView = ({ defaultYes, finish, message }) => {
+  const commit = useCommit(finish);
+  return jsx(PromptFrame, { children: jsxs(Box, { children: [
+    jsxs(Text, { bold: true, children: [
+      message,
+      " "
+    ] }),
+    jsx(
+      ConfirmInput,
+      {
+        defaultChoice: defaultYes ? "confirm" : "cancel",
+        onCancel: () => {
+          commit(false);
+        },
+        onConfirm: () => {
+          commit(true);
+        }
+      }
+    )
+  ] }) });
+};
+const tuiConfirm = async (message, options) => {
+  const defaultYes = options?.defaultYes === true;
+  if (!isInteractive()) {
+    return defaultYes;
+  }
+  return runInkPrompt((finish) => jsx(ConfirmView, { defaultYes, finish, message }), false);
+};
+const createTuiConfirm = () => isInteractive() ? (message) => tuiConfirm(message, { defaultYes: true }) : () => Promise.resolve(false);
+const SelfExit = ({ children }) => {
+  const { exit } = useApp();
+  useEffect(() => {
+    exit();
+  }, [exit]);
+  return children;
+};
+const printFrame = async (element) => {
+  const instance = render(jsx(SelfExit, { children: element }));
+  try {
+    await instance.waitUntilExit();
+  } catch {
+  } finally {
+    instance.unmount();
+  }
+};
+const tuiIntro = async (message) => {
+  if (!isInteractive()) {
+    return;
+  }
+  await printFrame(
+    jsxs(Box, { borderColor: ACCENT, borderStyle: "round", paddingX: 1, children: [
+      jsxs(Text, { bold: true, color: ACCENT, children: [
+        "◆ Lunora",
+        " "
+      ] }),
+      jsx(Text, { children: message })
+    ] })
+  );
+};
+const tuiOutro = async (message) => {
+  if (!isInteractive()) {
+    return;
+  }
+  await printFrame(
+    jsxs(Box, { paddingX: 1, children: [
+      jsx(Text, { color: "green", children: "✔ " }),
+      jsx(Text, { children: message })
+    ] })
+  );
+};
+const SpinnerView = ({ label }) => jsxs(Box, { children: [
+  jsx(Text, { color: ACCENT, children: jsx(Spinner, { type: "dots" }) }),
+  jsxs(Text, { children: [
+    " ",
+    label
+  ] })
+] });
+const withTuiSpinner = async (label, task) => {
+  if (!isInteractive()) {
+    return task();
+  }
+  const instance = render(jsx(SpinnerView, { label }));
+  try {
+    return await task();
+  } finally {
+    instance.unmount();
+  }
+};
+
+export { tuiConfirm as a, tuiIntro as b, createTuiConfirm as c, tuiOutro as d, tuiMultiSelect as e, tuiSelect as t, withTuiSpinner as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/cli",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "The Lunora CLI: init, dev, deploy, codegen, run, reset, and migrate commands",
   "keywords": [
     "agent-skills",
@@ -65,9 +65,12 @@
     "@visulima/pail": "4.0.0-alpha.22",
     "@visulima/path": "3.0.0-alpha.13",
     "@visulima/spinner": "1.0.0-alpha.4",
+    "@visulima/tui": "1.0.0-alpha.26",
     "giget": "3.3.0",
     "jsonc-parser": "^3.3.1",
     "magic-string": "^0.30.21",
+    "react": "^19.2.7",
+    "react-reconciler": "^0.33.0",
     "ts-morph": "^28.0.0"
   },
   "engines": {

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';