@lumerahq/cli 0.23.0-dev.2 → 0.23.0

package/dist/{chunk-WV5HOQNX.js → chunk-I7QEYKS7.js}

@@ -41,6 +41,24 @@ function resolveVersion(cwd) {
   }
   return formatTimestampVersion();
 }
+function resolveUIVersion(cwd) {
+  try {
+    const installed = JSON.parse(
+      readFileSync(resolve(cwd, "node_modules/@lumerahq/ui/package.json"), "utf-8")
+    );
+    if (installed?.version) return String(installed.version);
+  } catch {
+  }
+  try {
+    const pkg = JSON.parse(readFileSync(resolve(cwd, "package.json"), "utf-8"));
+    const spec = pkg?.dependencies?.["@lumerahq/ui"] ?? pkg?.devDependencies?.["@lumerahq/ui"];
+    if (!spec) return "none";
+    const cleaned = String(spec).replace(/^[\^~>=<\s]+/, "");
+    return /^\d+\.\d+/.test(cleaned) ? cleaned : "";
+  } catch {
+    return "";
+  }
+}
 function resolveGitSha(cwd) {
   try {
     return execSync("git rev-parse HEAD", {
@@ -62,11 +80,14 @@ async function createTarball(distDir) {
     archive.finalize();
   });
 }
-async function ensureAppRecord(apiBase, token, appName, appTitle) {
+async function ensureAppRecord(apiBase, token, appName, appTitle, accessLevel) {
   const appData = {
     name: appTitle,
     hosting_type: "s3"
   };
+  if (accessLevel) {
+    appData.access_level = accessLevel;
+  }
   const res = await fetchWithRetry(`${apiBase}/custom-apps/${encodeURIComponent(appName)}/registration`, {
     method: "PUT",
     headers: {
@@ -87,13 +108,14 @@ async function deploy(options) {
     appName,
     appTitle,
     distDir,
-    apiUrl
+    apiUrl,
+    accessLevel
   } = options;
   if (!existsSync(distDir)) {
     throw new Error(`dist directory not found: ${distDir}`);
   }
   console.log(pc.dim("Ensuring app record..."));
-  await ensureAppRecord(apiUrl, token, appName, appTitle);
+  await ensureAppRecord(apiUrl, token, appName, appTitle, accessLevel);
   console.log(pc.cyan(`Deploying ${appTitle}...`));
   const version = options.version || process.env.LUMERA_APP_VERSION?.trim() || resolveVersion(dirname(distDir));
   console.log(pc.dim(`Version: ${version}`));
@@ -104,6 +126,8 @@ async function deploy(options) {
   formData.append("version", version);
   const gitSha = resolveGitSha(dirname(distDir));
   if (gitSha) formData.append("git_sha", gitSha);
+  const uiVersion = resolveUIVersion(dirname(distDir));
+  if (uiVersion) formData.append("ui_version", uiVersion);
   const res = await fetchWithRetry(`${apiUrl}/custom-apps/${appName}/deploy`, {
     method: "POST",
     headers: {
@@ -118,9 +142,13 @@ async function deploy(options) {
   }
   const result = await res.json();
   const launchUrl = result.launch_url;
+  const appUrl = result.app_url;
   console.log(pc.green(`
 Deployed! ${launchUrl}`));
-  return { launchUrl, version };
+  if (appUrl) {
+    console.log(pc.green(`App URL:  ${appUrl}`));
+  }
+  return { launchUrl, appUrl, version };
 }
 async function registerDevApp(apiBase, token, appName, appTitle, appUrl) {
   const appData = {

package/dist/{dev-UTPD4MN5.js → dev-VWHFYKGC.js}

@@ -1,6 +1,6 @@
 import {
   dev
-} from "./chunk-WV5HOQNX.js";
+} from "./chunk-I7QEYKS7.js";
 import {
   syncDeps
 } from "./chunk-3ESHIPZH.js";

package/dist/index.js

@@ -226,29 +226,29 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-7243WXIF.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-7243WXIF.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-7243WXIF.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-7243WXIF.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-7243WXIF.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-7243WXIF.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-7243WXIF.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-AMXL4A64.js").then((m) => m.diff(args.slice(1)));
         break;
       // Development
       case "dev":
-        await import("./dev-UTPD4MN5.js").then((m) => m.dev(args.slice(1)));
+        await import("./dev-VWHFYKGC.js").then((m) => m.dev(args.slice(1)));
         break;
       case "run":
         await import("./run-DJXAXDD2.js").then((m) => m.run(args.slice(1)));

package/dist/{resources-7243WXIF.js → resources-AMXL4A64.js}

@@ -1,6 +1,6 @@
 import {
   deploy
-} from "./chunk-WV5HOQNX.js";
+} from "./chunk-I7QEYKS7.js";
 import {
   syncDeps
 } from "./chunk-3ESHIPZH.js";
@@ -31,7 +31,7 @@ import pc2 from "picocolors";
 import prompts from "prompts";
 import { execFileSync, execSync } from "child_process";
 import { existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync } from "fs";
-import { join as join2, basename as basename2, resolve } from "path";
+import { join as join2, resolve } from "path";
 
 // src/lib/lint/index.ts
 import { existsSync, readFileSync, readdirSync } from "fs";
@@ -124,7 +124,6 @@ var collectionSchemaRule = {
     const id = parsed.id;
     const name = parsed.name;
     const fields = parsed.fields;
-    const audit = parsed.audit;
     const indexes = parsed.indexes;
     const search = parsed.search;
     const localFieldTypes = /* @__PURE__ */ new Map();
@@ -164,20 +163,8 @@ var collectionSchemaRule = {
         if (typeof field.type !== "string" || field.type.trim() === "") {
           issues.push(error(target, `Field ${typeof field.name === "string" ? `"${field.name}"` : `at index ${i}`} is missing required string field "type".`));
         }
-        const fieldLabel = typeof field.name === "string" ? `"${field.name}"` : `at index ${i}`;
-        if (field.type === "select") {
-          if (field.options !== void 0) {
-            issues.push(error(target, `Select field ${fieldLabel} must define choices with top-level "values", not "options.values".`));
-          }
-          if (!Array.isArray(field.values) || field.values.length === 0 || !field.values.every((value) => typeof value === "string" && value.trim() !== "")) {
-            issues.push(error(target, `Select field ${fieldLabel} must include a non-empty string array "values".`));
-          }
-        }
       }
     }
-    if (audit !== void 0 && typeof audit !== "boolean") {
-      issues.push(error(target, 'Optional field "audit" must be a boolean when present.'));
-    }
     if (indexes !== void 0) {
       if (!Array.isArray(indexes)) {
         issues.push(error(target, 'Optional field "indexes" must be an array when present.'));
@@ -906,11 +893,6 @@ function stripNamespacePrefix(name, appName) {
   }
   return name;
 }
-function namespacedCollectionID(id, appName) {
-  if (!appName) return id;
-  const prefix = sanitizeSlugForCollectionName(appName) + NAMESPACE_SEPARATOR;
-  return id.startsWith(prefix) ? id : prefix + id;
-}
 var AGENT_IDLE_REAP_TIMEOUT_MIN_SECONDS = 10;
 var AGENT_IDLE_REAP_TIMEOUT_MAX_SECONDS = 900;
 function buildCollectionIdMap(collections, appName) {
@@ -922,7 +904,6 @@ function buildCollectionIdMap(collections, appName) {
   for (const collection of collections) {
     add(collection.id, collection.id);
     add(collection.name, collection.id);
-    add(stripNamespacePrefix(collection.id, appName), collection.id);
     const stripped = stripNamespacePrefix(collection.name, appName);
     add(stripped, collection.id);
     if (collection.name.includes(NAMESPACE_SEPARATOR)) {
@@ -1385,10 +1366,6 @@ function loadLocalCollections(platformDir, filterName) {
         errors.push(`${file}: missing fields array`);
         continue;
       }
-      if (collection.audit !== void 0 && typeof collection.audit !== "boolean") {
-        errors.push(`${file}: audit must be a boolean when present`);
-        continue;
-      }
       for (let i = 0; i < collection.fields.length; i++) {
         const field = collection.fields[i];
         if (!field || typeof field !== "object") {
@@ -1565,22 +1542,15 @@ function convertCollectionToApiFormat(local) {
     const indexName = `idx_${local.id}_${idx.fields.join("_")}`;
     return `CREATE ${unique}INDEX ${indexName} ON ${local.name} (${fields})`;
   });
-  return {
-    id: local.id,
-    name: local.name,
-    schema,
-    indexes,
-    ...local.audit !== void 0 ? { audit: local.audit } : {},
-    search: local.search ?? null
-  };
+  return { id: local.id, name: local.name, schema, indexes, search: local.search ?? null };
 }
 function mapFieldType(type) {
   const typeMap = {
     text: "text",
     number: "number",
     bool: "bool",
-    email: "email",
-    url: "url",
+    email: "text",
+    url: "text",
     date: "date",
     select: "select",
     relation: "relation",
@@ -1601,7 +1571,7 @@ function normalizeConstraintValue(fieldType, value) {
   }
   return value;
 }
-function fieldsDiffer(local, remote, appName) {
+function fieldsDiffer(local, remote) {
   if (mapFieldType(local.type) !== remote.type) return true;
   if ((local.required || false) !== (remote.required || false)) return true;
   const opts = remote.options || {};
@@ -1615,8 +1585,7 @@ function fieldsDiffer(local, remote, appName) {
     if (!localMultiple && remoteMaxSelect > 1) return true;
   }
   if (local.type === "relation") {
-    const remoteCollection = stripNamespacePrefix(opts.collectionId || "", appName);
-    if (local.collection && local.collection !== remoteCollection) return true;
+    if (local.collection && local.collection !== opts.collectionId) return true;
     const localMultiple = local.multiple || false;
     const remoteMaxSelect = opts.maxSelect || 1;
     if (localMultiple && remoteMaxSelect <= 1) return true;
@@ -1683,22 +1652,19 @@ function normalizeCollectionSearch(search) {
     } : {}
   });
 }
-async function planCollections(api, localCollections, appName) {
+async function planCollections(api, localCollections) {
   const changes = [];
   const remoteCollections = await api.listCollections();
   const remoteById = new Map(remoteCollections.map((c) => [c.id, c]));
-  const remoteByLocalName = new Map(remoteCollections.map((c) => [stripNamespacePrefix(c.name, appName), c]));
   for (const local of localCollections) {
-    const remote = remoteByLocalName.get(local.name) ?? remoteById.get(namespacedCollectionID(local.id, appName)) ?? (!appName ? remoteById.get(local.id) : void 0);
+    const remote = remoteById.get(local.id);
     if (!remote) {
-      const details = [`${local.fields.length} fields`];
-      if (local.audit) details.push("record audit enabled");
       changes.push({
         type: "create",
         resource: "collection",
         id: local.id,
         name: local.name,
-        details: details.join(", "),
+        details: `${local.fields.length} fields`,
         fieldDetails: local.fields.map((f) => ({
           action: "+",
           name: f.name,
@@ -1718,21 +1684,19 @@ async function planCollections(api, localCollections, appName) {
         if (!remoteFieldNames.has(name)) continue;
         const localField = localFieldMap.get(name);
         const remoteField = remoteFieldMap.get(name);
-        if (fieldsDiffer(localField, remoteField, appName)) {
+        if (fieldsDiffer(localField, remoteField)) {
           modified.push(name);
         }
       }
       const indexesChanged = indexesDiffer(local, remote.indexes || []);
       const searchChanged = normalizeCollectionSearch(local.search) !== normalizeCollectionSearch(remote.search);
-      const auditChanged = local.audit !== void 0 && local.audit !== remote.audit;
-      if (added.length > 0 || removed.length > 0 || modified.length > 0 || indexesChanged || searchChanged || auditChanged) {
+      if (added.length > 0 || removed.length > 0 || modified.length > 0 || indexesChanged || searchChanged) {
         const details = [];
         if (added.length > 0) details.push(`+${added.length} field${added.length > 1 ? "s" : ""}`);
         if (removed.length > 0) details.push(`-${removed.length} field${removed.length > 1 ? "s" : ""}`);
         if (modified.length > 0) details.push(`~${modified.length} field${modified.length > 1 ? "s" : ""} (${modified.join(", ")})`);
         if (indexesChanged) details.push("indexes changed");
         if (searchChanged) details.push("search changed");
-        if (auditChanged) details.push(local.audit ? "record audit enabled" : "record audit disabled");
         const fieldDetails = [];
         for (const name of added) {
           const f = localFieldMap.get(name);
@@ -2200,23 +2164,25 @@ async function applyApp(args) {
     }
   }
   const distDir = resolve(projectRoot, "dist");
-  await deploy({ token, appName, appTitle, distDir, apiUrl });
+  const accessLevel = getFlagValue(args, "access-level");
+  const validAccessLevels = [
+    "org_members_with_permission",
+    "org_members",
+    "invited",
+    "signed_in",
+    "public"
+  ];
+  if (accessLevel && !validAccessLevels.includes(accessLevel)) {
+    throw new Error(
+      `Invalid --access-level "${accessLevel}". Valid values: ${validAccessLevels.join(", ")}`
+    );
+  }
+  await deploy({ token, appName, appTitle, distDir, apiUrl, accessLevel });
 }
 async function pullCollections(api, platformDir, filterName, appName) {
   const collectionsDir = join2(platformDir, "collections");
   mkdirSync(collectionsDir, { recursive: true });
   const collections = await api.listCollections();
-  const existingFiles = /* @__PURE__ */ new Map();
-  for (const file of readdirSync2(collectionsDir)) {
-    if (!file.endsWith(".json")) continue;
-    const filePath = join2(collectionsDir, file);
-    try {
-      const existing = JSON.parse(readFileSync2(filePath, "utf-8"));
-      if (typeof existing.id === "string") existingFiles.set(existing.id, filePath);
-      if (typeof existing.name === "string") existingFiles.set(existing.name, filePath);
-    } catch {
-    }
-  }
   for (const collection of collections) {
     if (collection.system || collection.managed) continue;
     if (appName && collection.name.includes(NAMESPACE_SEPARATOR)) {
@@ -2224,14 +2190,12 @@ async function pullCollections(api, platformDir, filterName, appName) {
       if (prefix !== sanitizeSlugForCollectionName(appName)) continue;
     }
     const localName = stripNamespacePrefix(collection.name, appName);
-    const localID = stripNamespacePrefix(collection.id, appName);
-    if (filterName && localName !== filterName && localID !== filterName && collection.name !== filterName && collection.id !== filterName) {
+    if (filterName && localName !== filterName && collection.name !== filterName && collection.id !== filterName) {
       continue;
     }
     const localFormat = {
-      id: localID,
+      id: collection.id,
       name: localName,
-      audit: collection.audit,
       fields: collection.schema.map((field) => {
         const localField = {
           name: field.name,
@@ -2240,9 +2204,7 @@ async function pullCollections(api, platformDir, filterName, appName) {
         };
         if (field.options) {
           if (field.options.values) localField.values = field.options.values;
-          if (field.options.collectionId) {
-            localField.collection = stripNamespacePrefix(field.options.collectionId, appName);
-          }
+          if (field.options.collectionId) localField.collection = field.options.collectionId;
           if (field.options.maxSelect && field.options.maxSelect > 1) localField.multiple = true;
           if (field.options.defaultCurrency) {
             localField.defaultCurrency = field.options.defaultCurrency;
@@ -2262,10 +2224,10 @@ async function pullCollections(api, platformDir, filterName, appName) {
       }).filter((idx) => idx !== null),
       search: collection.search
     };
-    const fileName = `${toSafeFilename(localName)}.json`;
-    const filePath = existingFiles.get(localFormat.id) || existingFiles.get(localFormat.name) || join2(collectionsDir, fileName);
+    const fileName = toSafeFilename(localName);
+    const filePath = join2(collectionsDir, `${fileName}.json`);
     writeFileSync(filePath, JSON.stringify(localFormat, null, 2) + "\n");
-    console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${basename2(filePath)}`);
+    console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${fileName}.json`);
   }
 }
 async function pullAutomations(api, platformDir, filterName, projectId) {
@@ -2850,10 +2812,9 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
   if (!resourceType || resourceType === "collections") {
     const localCollections = loadLocalCollections(platformDir, resourceName || void 0);
     const remoteCollections = await api.listCollections();
-    const remoteById = new Map(remoteCollections.map((c) => [c.id, c]));
-    const remoteByLocalName = new Map(remoteCollections.map((c) => [stripNamespacePrefix(c.name, appName), c]));
+    const remoteByName = new Map(remoteCollections.map((c) => [c.name, c]));
     for (const local of localCollections) {
-      const remote = remoteByLocalName.get(local.name) ?? remoteById.get(namespacedCollectionID(local.id, appName)) ?? (!appName ? remoteById.get(local.id) : void 0);
+      const remote = remoteByName.get(local.name);
       if (remote) {
         toDelete.push({ type: "collection", id: local.id, name: local.name, remoteId: remote.id });
       }
@@ -3056,9 +3017,7 @@ async function showResource(api, platformDir, resourceType, resourceName, appNam
     const localCollections = loadLocalCollections(platformDir, resourceName);
     const remoteCollections = await api.listCollections();
     const local = localCollections[0];
-    const remote = remoteCollections.find(
-      (collection) => stripNamespacePrefix(collection.name, appName) === resourceName || stripNamespacePrefix(collection.id, appName) === resourceName
-    );
+    const remote = remoteCollections.find((c) => c.name === resourceName || c.id === resourceName);
     if (!local && !remote) {
       console.log(pc2.red(`  Collection "${resourceName}" not found`));
       process.exit(1);
@@ -3289,7 +3248,7 @@ async function plan(args) {
   if (!type || type === "collections") {
     const localCollections = loadLocalCollections(platformDir, name || void 0);
     if (localCollections.length > 0) {
-      const changes = await planCollections(api, localCollections, appName);
+      const changes = await planCollections(api, localCollections);
       allChanges.push(...changes);
     }
   }
@@ -3436,7 +3395,7 @@ async function apply(args) {
   const localHooks = !type || type === "hooks" ? loadLocalHooks(platformDir, name || void 0, appName) : [];
   const localAgents = !type || type === "agents" ? loadLocalAgents(platformDir, name || void 0, appName) : [];
   const localMailboxes = !type || type === "mailboxes" ? loadLocalMailboxes(platformDir, name || void 0) : [];
-  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections, appName));
+  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections));
   if (localAutomations.length > 0) allChanges.push(...await planAutomations(api, localAutomations, projectId));
   if (localHooks.length > 0) allChanges.push(...await planHooks(api, localHooks, collections, projectId));
   if (localAgents.length > 0) allChanges.push(...await planAgents(api, localAgents, projectId));
@@ -3958,15 +3917,10 @@ async function diff(args) {
 }
 export {
   apply,
-  applyCollections,
-  convertCollectionToApiFormat,
   destroy,
-  destroyResources,
   diff,
   list,
   plan,
-  planCollections,
   pull,
-  pullCollections,
   show
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumerahq/cli",
-  "version": "0.23.0-dev.2",
+  "version": "0.23.0",
   "description": "CLI for building and deploying Lumera apps",
   "type": "module",
   "engines": {

package/templates/default/src/main.tsx

@@ -1,4 +1,10 @@
-import { type HostPayload, isEmbedded, onInitMessage, postReadyMessage } from '@lumerahq/ui/lib';
+import {
+  type HostPayload,
+  isEmbedded,
+  onInitMessage,
+  postReadyMessage,
+  redirectToLogin,
+} from '@lumerahq/ui/lib';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { createHashHistory, createRouter, RouterProvider } from '@tanstack/react-router';
 import { StrictMode, useEffect, useRef, useState } from 'react';
@@ -60,24 +66,27 @@ function RouteRestorer() {
 
 const App = () => {
   const [hostContext, setHostContext] = useState<AuthContextValue | null>(null);
-  const [status, setStatus] = useState<'pending' | 'ready' | 'denied'>('pending');
+  const [status, setStatus] = useState<'pending' | 'ready' | 'unauthenticated'>('pending');
 
   useEffect(() => {
     if (typeof window === 'undefined') return;
 
-    const standaloneDevMode =
-      import.meta.env.DEV && !isEmbedded() && !!import.meta.env.VITE_DEV_API_BASE_URL;
-
-    if (!isEmbedded() && !standaloneDevMode) {
-      setStatus('denied');
-      return;
-    }
-
+    // The bridge picks the transport automatically: postMessage when embedded
+    // in the Lumera shell, same-origin /api with the app-session cookie when
+    // served standalone on the app's own hostname, and direct dev fetch when
+    // VITE_DEV_API_BASE_URL is set.
     const cleanup = onInitMessage((payload?: HostPayload) => {
+      if (!payload) {
+        // No identity and no app context: authentication is required
+        // (payload.user alone being undefined means an anonymous visitor on
+        // a public app — that still counts as ready).
+        setStatus('unauthenticated');
+        return;
+      }
       setHostContext({
-        company: payload?.company,
-        user: payload?.user,
-        sessionToken: payload?.session?.token,
+        company: payload.company,
+        user: payload.user,
+        sessionToken: payload.session?.token,
       });
       setStatus('ready');
     });
@@ -99,16 +108,23 @@ const App = () => {
     );
   }
 
-  if (status === 'denied' || !hostContext) {
+  if (status === 'unauthenticated' || !hostContext) {
     return (
       <main className="flex min-h-screen items-center justify-center bg-background">
         <div className="text-center space-y-3">
           <div className="inline-flex size-12 rounded-xl bg-muted items-center justify-center mb-2">
-            <span className="text-2xl font-semibold text-muted-foreground">403</span>
+            <span className="text-2xl font-semibold text-muted-foreground">401</span>
           </div>
-          <p className="text-sm text-muted-foreground">
-            Access denied, this app can only be accessed from within Lumera.
-          </p>
+          <p className="text-sm text-muted-foreground">Sign in to access this app.</p>
+          {!isEmbedded() && (
+            <button
+              type="button"
+              className="text-sm font-medium text-primary underline underline-offset-4"
+              onClick={() => redirectToLogin()}
+            >
+              Sign in with Lumera
+            </button>
+          )}
         </div>
       </main>
     );

package/templates/default/vite.config.ts

@@ -20,6 +20,8 @@ export default defineConfig({
     dedupe: ['react', 'react-dom'],
   },
   server: {
-    allowedHosts: ['mac.lumerahq.com'],
+    // Local platform host plus standalone app hostnames
+    // (<project>--<company>.<env-suffix> on lumerahq.app).
+    allowedHosts: ['mac.lumerahq.com', '.lumerahq.app'],
   },
 });