@lumerahq/cli 0.24.4 → 0.24.6

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-2PAJHJO7.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-R53XKJL2.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-2PAJHJO7.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-R53XKJL2.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-2PAJHJO7.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-R53XKJL2.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-2PAJHJO7.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-R53XKJL2.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-2PAJHJO7.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-R53XKJL2.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-2PAJHJO7.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-R53XKJL2.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-2PAJHJO7.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-R53XKJL2.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-2PAJHJO7.js → resources-R53XKJL2.js}

@@ -1,6 +1,6 @@
 import {
   deploy
-} from "./chunk-KBNM6R5X.js";
+} from "./chunk-KC3VBP6R.js";
 import {
   syncDeps
 } from "./chunk-7ZTCXKII.js";
@@ -1667,10 +1667,12 @@ function normalizeCollectionSearch(search) {
     } : {}
   });
 }
-async function planCollections(api, localCollections, appName) {
+async function planCollections(api, localCollections, appName, projectId) {
   const changes = [];
   const remoteCollections = await api.listCollections();
-  const remoteById = new Map(remoteCollections.map((c) => [c.id, c]));
+  const remoteById = new Map(
+    remoteCollections.filter((collection) => !projectId || !collection.project_id || collection.project_id === projectId).map((collection) => [collection.id, collection])
+  );
   for (const local of localCollections) {
     let remote = remoteById.get(local.id);
     if (!remote) {
@@ -1684,7 +1686,7 @@ async function planCollections(api, localCollections, appName) {
             break;
           }
         } catch (error3) {
-          if (!isApiErrorStatus(error3, 404)) throw error3;
+          if (!isApiErrorStatus(error3, 404) && !isApiErrorStatus(error3, 403)) throw error3;
         }
       }
     }
@@ -3281,7 +3283,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, appName, projectId);
       allChanges.push(...changes);
     }
   }
@@ -3428,7 +3430,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, appName, projectId));
   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));

package/package.json

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