@lumerahq/cli 0.24.3 → 0.24.5

package/dist/{chunk-KBNM6R5X.js → chunk-KC3VBP6R.js}

@@ -24,21 +24,14 @@ function formatTimestampVersion(date = /* @__PURE__ */ new Date()) {
     pad(date.getUTCSeconds())
   ].join("") + "Z";
 }
-function resolveVersion(cwd) {
+function resolveVersion(cwd, gitRelease = resolveGitReleaseState(cwd)) {
   const pkgPath = resolve(cwd, "package.json");
   try {
     const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
     if (pkg?.version && pkg.version !== "0.0.0") return String(pkg.version);
   } catch {
   }
-  try {
-    const sha = execSync("git rev-parse --short HEAD", {
-      cwd,
-      stdio: ["ignore", "pipe", "ignore"]
-    }).toString().trim();
-    if (sha) return sha;
-  } catch {
-  }
+  if (gitRelease.sha) return gitRelease.sha.slice(0, 7);
   return formatTimestampVersion();
 }
 function resolveUIVersion(cwd) {
@@ -59,14 +52,30 @@ function resolveUIVersion(cwd) {
     return "";
   }
 }
-function resolveGitSha(cwd) {
+function assertDeployableGitRelease(gitRelease) {
+  if (gitRelease.sha && gitRelease.dirty) {
+    throw new Error(
+      "Deploy requires a clean Git working tree so the published app matches its recorded commit. Commit or stash changes, then run lumera apply again."
+    );
+  }
+}
+function resolveGitReleaseState(cwd) {
   try {
-    return execSync("git rev-parse HEAD", {
-      cwd,
-      stdio: ["ignore", "pipe", "ignore"]
-    }).toString().trim();
+    const lines = execSync(
+      "git status --porcelain=v2 --branch --untracked-files=normal",
+      {
+        cwd,
+        stdio: ["ignore", "pipe", "ignore"]
+      }
+    ).toString().trim().split("\n");
+    const oidLine = lines.find((line) => line.startsWith("# branch.oid "));
+    const oid = oidLine?.slice("# branch.oid ".length).trim() ?? "";
+    return {
+      sha: oid === "(initial)" ? "" : oid,
+      dirty: lines.some((line) => line !== "" && !line.startsWith("# "))
+    };
   } catch {
-    return "";
+    return { sha: "", dirty: false };
   }
 }
 async function createTarball(distDir) {
@@ -114,19 +123,21 @@ async function deploy(options) {
   if (!existsSync(distDir)) {
     throw new Error(`dist directory not found: ${distDir}`);
   }
+  const projectDir = dirname(distDir);
+  const gitRelease = resolveGitReleaseState(projectDir);
+  assertDeployableGitRelease(gitRelease);
   console.log(pc.dim("Ensuring app record..."));
   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));
+  const version = options.version || process.env.LUMERA_APP_VERSION?.trim() || resolveVersion(projectDir, gitRelease);
   console.log(pc.dim(`Version: ${version}`));
   const tarball = await createTarball(distDir);
   console.log(pc.dim(`Package: ${(tarball.length / 1024).toFixed(1)} KB`));
   const formData = new FormData();
   formData.append("tarball", new Blob([new Uint8Array(tarball)]), "dist.tar.gz");
   formData.append("version", version);
-  const gitSha = resolveGitSha(dirname(distDir));
-  if (gitSha) formData.append("git_sha", gitSha);
-  const uiVersion = resolveUIVersion(dirname(distDir));
+  if (gitRelease.sha) formData.append("git_sha", gitRelease.sha);
+  const uiVersion = resolveUIVersion(projectDir);
   if (uiVersion) formData.append("ui_version", uiVersion);
   const res = await fetchWithRetry(`${apiUrl}/custom-apps/${appName}/deploy`, {
     method: "POST",

package/dist/{dev-N5CEEMFC.js → dev-OJEV76DA.js}

@@ -1,6 +1,6 @@
 import {
   dev
-} from "./chunk-KBNM6R5X.js";
+} from "./chunk-KC3VBP6R.js";
 import {
   syncDeps
 } from "./chunk-7ZTCXKII.js";

package/dist/index.js

@@ -227,29 +227,29 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-CCVVK3H2.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-CCVVK3H2.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-CCVVK3H2.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-CCVVK3H2.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-CCVVK3H2.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-CCVVK3H2.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-CCVVK3H2.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-XQHHIQYV.js").then((m) => m.diff(args.slice(1)));
         break;
       // Development
       case "dev":
-        await import("./dev-N5CEEMFC.js").then((m) => m.dev(args.slice(1)));
+        await import("./dev-OJEV76DA.js").then((m) => m.dev(args.slice(1)));
         break;
       case "run":
         await import("./run-WHVUVIYB.js").then((m) => m.run(args.slice(1)));

package/dist/{resources-CCVVK3H2.js → resources-XQHHIQYV.js}

@@ -1,6 +1,6 @@
 import {
   deploy
-} from "./chunk-KBNM6R5X.js";
+} from "./chunk-KC3VBP6R.js";
 import {
   syncDeps
 } from "./chunk-7ZTCXKII.js";
@@ -183,6 +183,11 @@ var collectionSchemaRule = {
           }
           if (!Array.isArray(index.fields) || !index.fields.every((field) => typeof field === "string" && field.trim() !== "")) {
             issues.push(error(target, `Index at index ${i} must include a non-empty string array "fields".`));
+          } else if (index.fields.length === 1 && index.fields[0].trim().toLowerCase() === "updated" && index.unique !== true) {
+            issues.push(error(
+              target,
+              `Index at index ${i} exactly duplicates Lumera's managed non-unique "updated" index. Remove the redundant declaration.`
+            ));
           }
         }
       }
@@ -898,6 +903,14 @@ function stripNamespacePrefix(name, appName) {
   }
   return name;
 }
+function buildIndexSql(local, idx, appName) {
+  const fields = idx.fields.join(", ");
+  const unique = idx.unique ? "UNIQUE " : "";
+  const physicalId = appName ? sanitizeSlugForCollectionName(appName) + NAMESPACE_SEPARATOR + local.id : local.id;
+  const indexTypeTag = idx.unique ? "u" : "n";
+  const indexName = `idx_${physicalId}_${indexTypeTag}_${idx.fields.join("_")}`;
+  return `CREATE ${unique}INDEX ${indexName} ON ${local.name} (${fields})`;
+}
 var AGENT_IDLE_REAP_TIMEOUT_MIN_SECONDS = 10;
 var AGENT_IDLE_REAP_TIMEOUT_MAX_SECONDS = 900;
 function buildCollectionIdMap(collections, appName) {
@@ -1516,7 +1529,7 @@ function loadLocalHooks(platformDir, filterName, appName) {
   }
   return hooks;
 }
-function convertCollectionToApiFormat(local) {
+function convertCollectionToApiFormat(local, appName) {
   const schema = local.fields.map((field) => {
     const apiField = {
       name: field.name,
@@ -1545,12 +1558,7 @@ function convertCollectionToApiFormat(local) {
     }
     return apiField;
   });
-  const indexes = local.indexes?.map((idx) => {
-    const fields = idx.fields.join(", ");
-    const unique = idx.unique ? "UNIQUE " : "";
-    const indexName = `idx_${local.id}_${idx.fields.join("_")}`;
-    return `CREATE ${unique}INDEX ${indexName} ON ${local.name} (${fields})`;
-  });
+  const indexes = local.indexes?.map((idx) => buildIndexSql(local, idx, appName));
   return {
     id: local.id,
     name: local.name,
@@ -1623,24 +1631,15 @@ function fieldsDiffer(local, remote) {
   if (localMax !== remoteMax) return true;
   return false;
 }
-function localIndexesToSql(local) {
+function localIndexesToSql(local, appName) {
   if (!local.indexes || local.indexes.length === 0) return [];
-  return local.indexes.map((idx) => {
-    const fields = idx.fields.join(", ");
-    const unique = idx.unique ? "UNIQUE " : "";
-    const indexName = `idx_${local.id}_${idx.fields.join("_")}`;
-    return `CREATE ${unique}INDEX ${indexName} ON ${local.name} (${fields})`;
-  }).sort();
+  return local.indexes.map((idx) => buildIndexSql(local, idx, appName)).sort();
 }
 function normalizeRemoteIndexes(remoteIndexes) {
-  return remoteIndexes.filter((idx) => {
-    const lower = idx.toLowerCase();
-    if (lower.includes("external_id") || lower.includes("updated")) return false;
-    return true;
-  }).sort();
+  return [...remoteIndexes].sort();
 }
-function indexesDiffer(local, remoteIndexes) {
-  const localSql = localIndexesToSql(local);
+function indexesDiffer(local, remoteIndexes, appName) {
+  const localSql = localIndexesToSql(local, appName);
   const remoteSql = normalizeRemoteIndexes(remoteIndexes);
   if (localSql.length !== remoteSql.length) return true;
   for (let i = 0; i < localSql.length; i++) {
@@ -1668,7 +1667,7 @@ function normalizeCollectionSearch(search) {
     } : {}
   });
 }
-async function planCollections(api, localCollections) {
+async function planCollections(api, localCollections, appName) {
   const changes = [];
   const remoteCollections = await api.listCollections();
   const remoteById = new Map(remoteCollections.map((c) => [c.id, c]));
@@ -1722,7 +1721,7 @@ async function planCollections(api, localCollections) {
           modified.push(name);
         }
       }
-      const indexesChanged = indexesDiffer(local, remote.indexes || []);
+      const indexesChanged = indexesDiffer(local, remote.indexes || [], appName);
       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) {
@@ -1992,7 +1991,7 @@ async function planHooks(api, localHooks, collections, projectId) {
   }
   return changes;
 }
-async function applyCollections(api, localCollections) {
+async function applyCollections(api, localCollections, appName) {
   let errors = 0;
   const hasRelations = localCollections.some((c) => c.fields.some((f) => f.type === "relation"));
   if (hasRelations) {
@@ -2009,7 +2008,7 @@ async function applyCollections(api, localCollections) {
     }
     for (const local of localCollections) {
       if (pass1Failed.has(local.name)) continue;
-      const apiFormat = convertCollectionToApiFormat(local);
+      const apiFormat = convertCollectionToApiFormat(local, appName);
       try {
         await api.ensureCollection(local.name, apiFormat);
         console.log(pc2.green("  \u2713"), `${local.name} (schema)`);
@@ -2020,7 +2019,7 @@ async function applyCollections(api, localCollections) {
     }
   } else {
     for (const local of localCollections) {
-      const apiFormat = convertCollectionToApiFormat(local);
+      const apiFormat = convertCollectionToApiFormat(local, appName);
       try {
         await api.ensureCollection(local.name, apiFormat);
         console.log(pc2.green("  \u2713"), `${local.name}`);
@@ -3282,7 +3281,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);
+      const changes = await planCollections(api, localCollections, appName);
       allChanges.push(...changes);
     }
   }
@@ -3429,7 +3428,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));
+  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections, appName));
   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));
@@ -3504,7 +3503,7 @@ async function apply(args) {
   let totalSkipped = 0;
   if (localCollections.length > 0) {
     console.log(pc2.bold("  Collections:"));
-    totalErrors += await applyCollections(api, localCollections);
+    totalErrors += await applyCollections(api, localCollections, appName);
     console.log();
   }
   try {

package/package.json

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