@lumerahq/cli 0.14.0 → 0.15.0

package/dist/index.js

@@ -212,25 +212,25 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-QKEUX3C3.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-QKEUX3C3.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-QKEUX3C3.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-QKEUX3C3.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-QKEUX3C3.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-QKEUX3C3.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-QKEUX3C3.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-BFT7V6UR.js").then((m) => m.diff(args.slice(1)));
         break;
       // Development
       case "dev":

package/dist/{resources-QKEUX3C3.js → resources-BFT7V6UR.js}

@@ -125,12 +125,14 @@ ${pc.dim("Resources:")}
   app                 Deploy the frontend app
 
 ${pc.dim("Options:")}
+  --yes, -y           Skip confirmation prompt (for CI/CD)
   --skip-build        Skip build step when applying app
 
 ${pc.dim("Examples:")}
-  lumera apply                       # Apply everything
+  lumera apply                       # Apply everything (shows plan, asks to confirm)
   lumera apply collections           # Apply all collections
   lumera apply collections/users     # Apply single collection
+  lumera apply agents -y             # Apply agents without confirmation
   lumera apply app                   # Deploy frontend
   lumera apply app --skip-build      # Deploy without rebuilding
 `);
@@ -482,6 +484,30 @@ function mapFieldType(type) {
   };
   return typeMap[type] || type;
 }
+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 || {};
+  if (local.type === "select") {
+    const localValues = [...local.values || []].sort();
+    const remoteValues = [...opts.values || []].sort();
+    if (localValues.join(",") !== remoteValues.join(",")) return true;
+    const localMultiple = local.multiple || false;
+    const remoteMaxSelect = opts.maxSelect || 1;
+    if (localMultiple && remoteMaxSelect <= 1) return true;
+    if (!localMultiple && remoteMaxSelect > 1) return true;
+  }
+  if (local.type === "relation") {
+    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;
+    if (!localMultiple && remoteMaxSelect > 1) return true;
+  }
+  if (local.min !== void 0 && local.min !== opts.min) return true;
+  if (local.max !== void 0 && local.max !== opts.max) return true;
+  return false;
+}
 async function planCollections(api, localCollections) {
   const changes = [];
   const remoteCollections = await api.listCollections();
@@ -509,10 +535,20 @@ async function planCollections(api, localCollections) {
       const remoteFieldMap = new Map(remote.schema.map((f) => [f.name, f]));
       const added = [...localFieldNames].filter((n) => !remoteFieldNames.has(n));
       const removed = [...remoteFieldNames].filter((n) => !localFieldNames.has(n));
-      if (added.length > 0 || removed.length > 0) {
+      const modified = [];
+      for (const name of localFieldNames) {
+        if (!remoteFieldNames.has(name)) continue;
+        const localField = localFieldMap.get(name);
+        const remoteField = remoteFieldMap.get(name);
+        if (fieldsDiffer(localField, remoteField)) {
+          modified.push(name);
+        }
+      }
+      if (added.length > 0 || removed.length > 0 || modified.length > 0) {
         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(", ")})`);
         const fieldDetails = [];
         for (const name of added) {
           const f = localFieldMap.get(name);
@@ -967,6 +1003,17 @@ async function planAgents(api, localAgents) {
   const remoteByExternalId = new Map(
     remoteAgents.filter((a) => a.external_id && !a.managed).map((a) => [a.external_id, a])
   );
+  let skillSlugToId = /* @__PURE__ */ new Map();
+  let skillIdToSlug = /* @__PURE__ */ new Map();
+  const hasSkillRefs = localAgents.some((a) => a.agent.skills && a.agent.skills.length > 0) || remoteAgents.some((a) => a.skill_ids && a.skill_ids.length > 0);
+  if (hasSkillRefs) {
+    try {
+      const skills = await api.listAgentSkills();
+      skillSlugToId = new Map(skills.map((s) => [s.slug, s.id]));
+      skillIdToSlug = new Map(skills.map((s) => [s.id, s.slug]));
+    } catch {
+    }
+  }
   for (const { agent, systemPrompt, policyScript } of localAgents) {
     const remote = remoteByExternalId.get(agent.external_id);
     if (!remote) {
@@ -979,6 +1026,16 @@ async function planAgents(api, localAgents) {
       if ((remote.model || "") !== (agent.model || "")) diffs.push("model");
       if ((remote.policy_script || "").trim() !== (policyScript || "").trim()) diffs.push("policy_script");
       if ((remote.policy_enabled || false) !== (agent.policy_enabled || false)) diffs.push("policy_enabled");
+      const localSkillIds = (agent.skills || []).map((s) => skillSlugToId.get(s) || s).sort();
+      const remoteSkillIds = [...remote.skill_ids || []].sort();
+      if (localSkillIds.join(",") !== remoteSkillIds.join(",")) {
+        const addedSlugs = localSkillIds.filter((id) => !remoteSkillIds.includes(id)).map((id) => skillIdToSlug.get(id) || id);
+        const removedSlugs = remoteSkillIds.filter((id) => !localSkillIds.includes(id)).map((id) => skillIdToSlug.get(id) || id);
+        const parts = [];
+        if (addedSlugs.length) parts.push(`+${addedSlugs.join(", +")}`);
+        if (removedSlugs.length) parts.push(`-${removedSlugs.join(", -")}`);
+        diffs.push(`skills (${parts.join(", ")})`);
+      }
       if (diffs.length > 0) {
         const textDiffs = [];
         if (diffs.includes("system_prompt")) {
@@ -1739,11 +1796,12 @@ async function apply(args) {
   const platformDir = getPlatformDir();
   const api = createApiClient();
   const appName = getAppName(projectRoot);
-  const { type, name } = parseResource(args[0]);
-  console.log();
-  console.log(pc.cyan(pc.bold("  Apply")));
-  console.log();
+  const { type, name } = parseResource(args.filter((a) => a !== "--yes" && a !== "-y")[0]);
+  const autoConfirm = args.includes("--yes") || args.includes("-y") || !!process.env.CI;
   if (type === "app") {
+    console.log();
+    console.log(pc.cyan(pc.bold("  Apply")));
+    console.log();
     console.log(pc.bold("  App:"));
     await applyApp(args);
     console.log();
@@ -1752,77 +1810,131 @@ async function apply(args) {
     return;
   }
   let collections;
-  let totalErrors = 0;
-  if (!type || type === "collections") {
-    const localCollections = loadLocalCollections(platformDir, name || void 0);
-    if (localCollections.length > 0) {
-      console.log(pc.bold("  Collections:"));
-      totalErrors += await applyCollections(api, localCollections);
-      console.log();
-    } else if (name) {
-      console.log(pc.red(`  Collection "${name}" not found locally`));
-      process.exit(1);
-    }
-  }
   try {
     const remoteCollections = await api.listCollections();
     collections = new Map(remoteCollections.map((c) => [c.name, c.id]));
-    for (const c of remoteCollections) {
-      collections.set(c.id, c.id);
-    }
+    for (const c of remoteCollections) collections.set(c.id, c.id);
   } catch {
     collections = /* @__PURE__ */ new Map();
   }
-  if (!type || type === "automations") {
-    const localAutomations = loadLocalAutomations(platformDir, name || void 0, appName);
-    if (localAutomations.length > 0) {
-      console.log(pc.bold("  Automations:"));
-      totalErrors += await applyAutomations(api, localAutomations);
-      console.log();
-    } else if (name) {
-      console.log(pc.red(`  Automation "${name}" not found locally`));
-      process.exit(1);
-    }
-  }
-  if (!type || type === "hooks") {
-    const localHooks = loadLocalHooks(platformDir, name || void 0, appName);
-    if (localHooks.length > 0) {
-      console.log(pc.bold("  Hooks:"));
-      totalErrors += await applyHooks(api, localHooks, collections);
-      console.log();
-    } else if (name) {
-      console.log(pc.red(`  Hook "${name}" not found locally`));
-      process.exit(1);
-    }
-  }
-  if (!type || type === "agents") {
-    const localAgents = loadLocalAgents(platformDir, name || void 0, appName);
-    if (localAgents.length > 0) {
-      console.log(pc.bold("  Agents:"));
-      totalErrors += await applyAgents(api, localAgents);
+  const allChanges = [];
+  const localCollections = !type || type === "collections" ? loadLocalCollections(platformDir, name || void 0) : [];
+  const localAutomations = !type || type === "automations" ? loadLocalAutomations(platformDir, name || void 0, appName) : [];
+  const localHooks = !type || type === "hooks" ? loadLocalHooks(platformDir, name || void 0, appName) : [];
+  const localAgents = !type || type === "agents" ? loadLocalAgents(platformDir, name || void 0, appName) : [];
+  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections));
+  if (localAutomations.length > 0) allChanges.push(...await planAutomations(api, localAutomations));
+  if (localHooks.length > 0) allChanges.push(...await planHooks(api, localHooks, collections));
+  if (localAgents.length > 0) allChanges.push(...await planAgents(api, localAgents));
+  if (name) {
+    const hasLocal = localCollections.length > 0 || localAutomations.length > 0 || localHooks.length > 0 || localAgents.length > 0;
+    if (!hasLocal) {
       console.log();
-    } else if (name) {
-      console.log(pc.red(`  Agent "${name}" not found locally`));
+      console.log(pc.red(`  Resource "${name}" not found locally`));
       process.exit(1);
     }
   }
+  let willDeployApp = false;
   if (!type) {
     try {
-      const projectRoot2 = findProjectRoot();
-      if (existsSync(join(projectRoot2, "dist")) || existsSync(join(projectRoot2, "src"))) {
-        console.log(pc.bold("  App:"));
-        await applyApp(args);
-        console.log();
+      if (existsSync(join(projectRoot, "dist")) || existsSync(join(projectRoot, "src"))) {
+        willDeployApp = true;
       }
     } catch {
     }
   }
+  if (allChanges.length === 0 && !willDeployApp) {
+    console.log();
+    console.log(pc.green("  \u2713 Nothing to apply \u2014 local and remote are in sync."));
+    console.log();
+    return;
+  }
+  console.log();
+  console.log(pc.cyan(pc.bold("  Apply")));
+  console.log();
+  const creates = allChanges.filter((c) => c.type === "create");
+  const updates = allChanges.filter((c) => c.type === "update");
+  if (allChanges.length > 0) {
+    console.log(pc.bold("  Plan:"));
+    for (const change of allChanges) {
+      const icon = change.type === "create" ? "+" : "~";
+      const color = change.type === "create" ? pc.green : pc.yellow;
+      const details = change.details ? ` (${change.details})` : "";
+      console.log(`  ${color(icon)} ${change.resource}: ${change.name}${pc.dim(details)}`);
+    }
+    if (willDeployApp) console.log(`  ${pc.blue("\u25CF")} app: frontend build + deploy`);
+    console.log();
+    const parts = [];
+    if (creates.length > 0) parts.push(pc.green(`${creates.length} create`));
+    if (updates.length > 0) parts.push(pc.yellow(`${updates.length} update`));
+    if (willDeployApp) parts.push(pc.blue("1 app deploy"));
+    console.log(`  ${parts.join(", ")}`);
+    console.log();
+  } else if (willDeployApp) {
+    console.log(pc.dim("  No infrastructure changes \u2014 deploying app only."));
+    console.log();
+  }
+  if (!autoConfirm && allChanges.length > 0) {
+    const { confirm } = await prompts({
+      type: "confirm",
+      name: "confirm",
+      message: "  Proceed with apply?",
+      initial: true
+    });
+    if (!confirm) {
+      console.log(pc.dim("  Cancelled."));
+      console.log();
+      return;
+    }
+    console.log();
+  }
+  let totalErrors = 0;
+  let totalCreated = 0;
+  let totalUpdated = 0;
+  let totalSkipped = 0;
+  if (localCollections.length > 0) {
+    console.log(pc.bold("  Collections:"));
+    totalErrors += await applyCollections(api, localCollections);
+    console.log();
+  }
+  try {
+    const remoteCollections = await api.listCollections();
+    collections = new Map(remoteCollections.map((c) => [c.name, c.id]));
+    for (const c of remoteCollections) collections.set(c.id, c.id);
+  } catch {
+  }
+  if (localAutomations.length > 0) {
+    console.log(pc.bold("  Automations:"));
+    totalErrors += await applyAutomations(api, localAutomations);
+    console.log();
+  }
+  if (localHooks.length > 0) {
+    console.log(pc.bold("  Hooks:"));
+    totalErrors += await applyHooks(api, localHooks, collections);
+    console.log();
+  }
+  if (localAgents.length > 0) {
+    console.log(pc.bold("  Agents:"));
+    totalErrors += await applyAgents(api, localAgents);
+    console.log();
+  }
+  if (willDeployApp) {
+    console.log(pc.bold("  App:"));
+    await applyApp(args);
+    console.log();
+  }
+  totalCreated = creates.length;
+  totalUpdated = updates.length;
   if (totalErrors > 0) {
-    console.log(pc.red(`  Failed with ${totalErrors} error${totalErrors > 1 ? "s" : ""}.`));
+    console.log(pc.red(`  \u2717 ${totalErrors} error${totalErrors > 1 ? "s" : ""} during apply.`));
     console.log();
     process.exit(1);
   }
-  console.log(pc.green("  Done!"));
+  const summary = [];
+  if (totalCreated > 0) summary.push(pc.green(`${totalCreated} created`));
+  if (totalUpdated > 0) summary.push(pc.yellow(`${totalUpdated} updated`));
+  if (willDeployApp) summary.push(pc.blue("app deployed"));
+  console.log(pc.green("  \u2713 Done!") + (summary.length > 0 ? ` ${pc.dim("\u2014")} ${summary.join(", ")}` : ""));
   console.log();
 }
 async function pull(args) {

package/package.json

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