@lumerahq/cli 0.30.0-dev.0 → 0.30.0

package/dist/index.js

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

package/dist/{resources-YEOQ7YN6.js → resources-5YWEX6DG.js}

@@ -2578,7 +2578,7 @@ function remoteSkillsByLocalSlug(remoteSkills, appName) {
 function projectSkillRefCandidates(refs, appName) {
   return [...new Set(refs.flatMap((ref) => appName && SKILL_SLUG_RE.test(ref) ? [scopedProjectSkillSlug(appName, ref), ref] : [ref]))];
 }
-async function resolveAgentSkillRefs(api, refs, projectId, appName, pendingLocalSkillSlugs = /* @__PURE__ */ new Set()) {
+async function resolveAgentSkillRefs(api, refs, projectId, appName, localSourceSkillSlugs = /* @__PURE__ */ new Set()) {
   const refToId = /* @__PURE__ */ new Map();
   const skillIdToSlug = /* @__PURE__ */ new Map();
   const blockedRefs = /* @__PURE__ */ new Set();
@@ -2605,7 +2605,7 @@ async function resolveAgentSkillRefs(api, refs, projectId, appName, pendingLocal
     let selected = byID.get(ref);
     if (!selected && SKILL_SLUG_RE.test(ref)) {
       selected = projectByLocalSlug.get(ref);
-      if (!selected && pendingLocalSkillSlugs.has(ref)) {
+      if (!selected && localSourceSkillSlugs.has(ref)) {
         continue;
       }
     }
@@ -2795,8 +2795,9 @@ function loadLocalAgents(platformDir, filterName, appName) {
   }
   return agents;
 }
-async function planAgents(api, localAgents, projectId, localSkillSlugs = /* @__PURE__ */ new Set(), appName) {
+async function planAgents(api, localAgents, projectId, localSourceSkillSlugs = /* @__PURE__ */ new Set(), pendingLocalSkillSlugs = /* @__PURE__ */ new Set(), appName) {
   const changes = [];
+  let validationErrors = 0;
   const remoteAgents = await api.listAgents(projectId ? { project_id: projectId } : void 0);
   const remoteByExternalId = new Map(
     remoteAgents.filter((a) => a.external_id && !a.managed).map((a) => [a.external_id, a])
@@ -2814,7 +2815,7 @@ async function planAgents(api, localAgents, projectId, localSkillSlugs = /* @__P
     outsideProjectRefs: /* @__PURE__ */ new Set()
   };
   try {
-    resolution = await resolveAgentSkillRefs(api, planRefs, projectId, appName, localSkillSlugs);
+    resolution = await resolveAgentSkillRefs(api, planRefs, projectId, appName, localSourceSkillSlugs);
   } catch (e) {
     console.log(pc2.yellow(`    \u26A0 Could not resolve skills for plan: ${e}`));
   }
@@ -2824,10 +2825,17 @@ async function planAgents(api, localAgents, projectId, localSkillSlugs = /* @__P
     for (const ref of agent.skills ?? []) {
       if (outsideProjectRefs.has(ref)) {
         console.log(pc2.red(`    \u2717 Skill "${ref}" belongs to another project \u2014 apply will fail for this agent`));
+        validationErrors++;
       } else if (blockedRefs.has(ref)) {
         console.log(pc2.red(`    \u2717 Skill "${ref}" is a Lumera platform skill, only available to Lumera-built agents \u2014 apply will fail for this agent`));
-      } else if (!refToId.has(ref) && !localSkillSlugs.has(ref)) {
-        console.log(pc2.red(`    \u2717 Skill "${ref}" not found \u2014 apply will fail for this agent`));
+        validationErrors++;
+      } else if (!refToId.has(ref) && !pendingLocalSkillSlugs.has(ref)) {
+        if (localSourceSkillSlugs.has(ref)) {
+          console.log(pc2.red(`    \u2717 Skill "${ref}" exists in project source but is not deployed \u2014 run 'lumera apply skills' first or use 'lumera apply'`));
+        } else {
+          console.log(pc2.red(`    \u2717 Skill "${ref}" not found \u2014 apply will fail for this agent`));
+        }
+        validationErrors++;
       }
     }
     if (!remote) {
@@ -2844,14 +2852,14 @@ async function planAgents(api, localAgents, projectId, localSkillSlugs = /* @__P
       if ((remote.policy_enabled || false) !== (agent.policy_enabled || false)) diffs.push("policy_enabled");
       if ((remote.policy_description || "") !== (agent.policy_description || "")) diffs.push("policy_description");
       const localSkillIds = (agent.skills || []).map((s) => refToId.get(s)).filter((id) => !!id).sort();
-      const pendingLocalSkillSlugs = (agent.skills || []).filter((ref) => localSkillSlugs.has(ref) && !refToId.has(ref));
+      const pendingSkillSlugs = (agent.skills || []).filter((ref) => pendingLocalSkillSlugs.has(ref) && !refToId.has(ref));
       const remoteSkillIds = [...remote.skill_ids || []].sort();
-      if (localSkillIds.join(",") !== remoteSkillIds.join(",") || pendingLocalSkillSlugs.length > 0) {
+      if (localSkillIds.join(",") !== remoteSkillIds.join(",") || pendingSkillSlugs.length > 0) {
         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 (pendingLocalSkillSlugs.length) parts.push(`+${pendingLocalSkillSlugs.join(", +")}`);
+        if (pendingSkillSlugs.length) parts.push(`+${pendingSkillSlugs.join(", +")}`);
         if (removedSlugs.length) parts.push(`-${removedSlugs.join(", -")}`);
         diffs.push(`skills (${parts.join(", ")})`);
       }
@@ -2867,14 +2875,14 @@ async function planAgents(api, localAgents, projectId, localSkillSlugs = /* @__P
       }
     }
   }
-  return changes;
+  return { changes, validationErrors };
 }
 var TAG_AVAILABLE_TO_CUSTOM_AGENTS = "available_to_custom_agents";
 function isAvailableToCustomAgents(skill) {
   if (!skill.managed) return true;
   return (skill.tags ?? []).includes(TAG_AVAILABLE_TO_CUSTOM_AGENTS);
 }
-async function applyAgents(api, localAgents, projectId, localSkillSlugs = /* @__PURE__ */ new Set(), appName) {
+async function applyAgents(api, localAgents, projectId, localSourceSkillSlugs = /* @__PURE__ */ new Set(), appName) {
   let errors = 0;
   const remoteAgents = await api.listAgents(projectId ? { project_id: projectId } : void 0);
   const remoteByExternalId = new Map(
@@ -2888,7 +2896,7 @@ async function applyAgents(api, localAgents, projectId, localSkillSlugs = /* @__
     outsideProjectRefs: /* @__PURE__ */ new Set()
   };
   try {
-    resolution = await resolveAgentSkillRefs(api, refs, projectId, appName, localSkillSlugs);
+    resolution = await resolveAgentSkillRefs(api, refs, projectId, appName, localSourceSkillSlugs);
   } catch (e) {
     console.log(pc2.yellow(`    \u26A0 Could not resolve skills: ${e}`));
   }
@@ -2898,6 +2906,7 @@ async function applyAgents(api, localAgents, projectId, localSkillSlugs = /* @__
     const skillIds = [];
     const outsideProjectForAgent = [];
     const blockedForAgent = [];
+    const undeployedLocalForAgent = [];
     const notFoundForAgent = [];
     if (agent.skills) {
       for (const ref of agent.skills) {
@@ -2908,12 +2917,14 @@ async function applyAgents(api, localAgents, projectId, localSkillSlugs = /* @__
           outsideProjectForAgent.push(ref);
         } else if (blockedRefs.has(ref)) {
           blockedForAgent.push(ref);
+        } else if (localSourceSkillSlugs.has(ref)) {
+          undeployedLocalForAgent.push(ref);
         } else {
           notFoundForAgent.push(ref);
         }
       }
     }
-    if (outsideProjectForAgent.length > 0 || blockedForAgent.length > 0 || notFoundForAgent.length > 0) {
+    if (outsideProjectForAgent.length > 0 || blockedForAgent.length > 0 || undeployedLocalForAgent.length > 0 || notFoundForAgent.length > 0) {
       console.log(pc2.red("  \u2717"), `${agent.name}:`);
       if (outsideProjectForAgent.length > 0) {
         console.log(pc2.red(`      skills outside the agent project: ${outsideProjectForAgent.join(", ")}`));
@@ -2921,10 +2932,14 @@ async function applyAgents(api, localAgents, projectId, localSkillSlugs = /* @__
       if (blockedForAgent.length > 0) {
         console.log(pc2.red(`      skills not available for custom agents: ${blockedForAgent.join(", ")}`));
       }
+      if (undeployedLocalForAgent.length > 0) {
+        console.log(pc2.red(`      locally authored skills not deployed: ${undeployedLocalForAgent.join(", ")}`));
+        console.log(pc2.dim(`      run 'lumera apply skills' first, or use 'lumera apply' to deploy skills and agents together`));
+      }
       if (notFoundForAgent.length > 0) {
         console.log(pc2.red(`      skills not found: ${notFoundForAgent.join(", ")}`));
+        console.log(pc2.dim(`      pick skills from GET /api/skills (tags includes "available_to_custom_agents")`));
       }
-      console.log(pc2.dim(`      pick skills from GET /api/skills (tags includes "available_to_custom_agents")`));
       errors++;
       continue;
     }
@@ -3720,6 +3735,7 @@ async function plan(args) {
   }
   await syncDeps(projectRoot, { ignorePermissionDenied: true });
   const allChanges = [];
+  let planValidationErrors = 0;
   let collections;
   try {
     const remoteCollections = await api.listCollections();
@@ -3750,15 +3766,18 @@ async function plan(args) {
     }
   }
   const localSkills = !type || type === "skills" ? loadLocalSkills(platformDir, name || void 0) : [];
-  const localSkillSlugs = new Set(!type || type === "skills" || type === "agents" ? (localSkills.length > 0 || type !== "agents" ? localSkills : loadLocalSkills(platformDir)).map((skill) => skill.slug) : []);
+  const sourceSkillsForAgentResolution = type === "agents" ? loadLocalSkills(platformDir) : localSkills;
+  const localSourceSkillSlugs = new Set(sourceSkillsForAgentResolution.map((skill) => skill.slug));
+  const pendingLocalSkillSlugs = new Set(localSkills.map((skill) => skill.slug));
   if (localSkills.length > 0) {
     allChanges.push(...await planSkills(api, localSkills, projectId, appName));
   }
   if (!type || type === "agents") {
     const localAgents = loadLocalAgents(platformDir, name || void 0, appName);
     if (localAgents.length > 0) {
-      const changes = await planAgents(api, localAgents, projectId, localSkillSlugs, appName);
-      allChanges.push(...changes);
+      const result = await planAgents(api, localAgents, projectId, localSourceSkillSlugs, pendingLocalSkillSlugs, appName);
+      allChanges.push(...result.changes);
+      planValidationErrors += result.validationErrors;
     }
   }
   if (!type || type === "mailboxes") {
@@ -3771,7 +3790,14 @@ async function plan(args) {
   const lintWarnings = await safeLint(projectRoot, localAutomations);
   if (allChanges.length === 0) {
     if (jsonOutput) {
-      console.log(JSON.stringify({ changes: [], warnings: [], lintWarnings: serializeLintWarnings(lintWarnings, projectRoot) }));
+      console.log(JSON.stringify({ changes: [], warnings: [], validationErrors: planValidationErrors, lintWarnings: serializeLintWarnings(lintWarnings, projectRoot) }));
+      if (planValidationErrors > 0) process.exitCode = 1;
+      return;
+    }
+    if (planValidationErrors > 0) {
+      console.log(pc2.red(`  \u2717 Plan has ${planValidationErrors} agent skill validation error${planValidationErrors === 1 ? "" : "s"}.`));
+      console.log();
+      process.exitCode = 1;
       return;
     }
     console.log(pc2.green("  \u2713 No changes detected"));
@@ -3789,7 +3815,8 @@ async function plan(args) {
         }
       }
     }
-    console.log(JSON.stringify({ changes: allChanges, warnings, lintWarnings: serializeLintWarnings(lintWarnings, projectRoot) }));
+    console.log(JSON.stringify({ changes: allChanges, warnings, validationErrors: planValidationErrors, lintWarnings: serializeLintWarnings(lintWarnings, projectRoot) }));
+    if (planValidationErrors > 0) process.exitCode = 1;
     return;
   }
   console.log(pc2.bold("  Changes:"));
@@ -3830,7 +3857,12 @@ async function plan(args) {
   }
   console.log();
   safePrintLint(lintWarnings, projectRoot);
-  console.log(pc2.dim(`  Run 'lumera apply' to apply these changes.`));
+  if (planValidationErrors > 0) {
+    console.log(pc2.red(`  \u2717 Fix ${planValidationErrors} agent skill validation error${planValidationErrors === 1 ? "" : "s"} before applying.`));
+    process.exitCode = 1;
+  } else {
+    console.log(pc2.dim(`  Run 'lumera apply' to apply these changes.`));
+  }
   console.log();
 }
 async function apply(args) {
@@ -3877,18 +3909,25 @@ async function apply(args) {
     collections = /* @__PURE__ */ new Map();
   }
   const allChanges = [];
+  let planValidationErrors = 0;
   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 localSkills = !type || type === "skills" ? loadLocalSkills(platformDir, name || void 0) : [];
-  const localSkillSlugs = new Set(!type || type === "skills" || type === "agents" ? (localSkills.length > 0 || type !== "agents" ? localSkills : loadLocalSkills(platformDir)).map((skill) => skill.slug) : []);
+  const sourceSkillsForAgentResolution = type === "agents" ? loadLocalSkills(platformDir) : localSkills;
+  const localSourceSkillSlugs = new Set(sourceSkillsForAgentResolution.map((skill) => skill.slug));
+  const pendingLocalSkillSlugs = new Set(localSkills.map((skill) => skill.slug));
   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, 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 (localSkills.length > 0) allChanges.push(...await planSkills(api, localSkills, projectId, appName));
-  if (localAgents.length > 0) allChanges.push(...await planAgents(api, localAgents, projectId, localSkillSlugs, appName));
+  if (localAgents.length > 0) {
+    const result = await planAgents(api, localAgents, projectId, localSourceSkillSlugs, pendingLocalSkillSlugs, appName);
+    allChanges.push(...result.changes);
+    planValidationErrors += result.validationErrors;
+  }
   if (localMailboxes.length > 0) allChanges.push(...await planMailboxes(api, localMailboxes));
   if (name) {
     const hasLocal = localCollections.length > 0 || localAutomations.length > 0 || localHooks.length > 0 || localSkills.length > 0 || localAgents.length > 0 || localMailboxes.length > 0;
@@ -3898,6 +3937,12 @@ async function apply(args) {
       process.exit(1);
     }
   }
+  if (planValidationErrors > 0) {
+    console.log();
+    console.log(pc2.red(`  \u2717 Apply aborted: fix ${planValidationErrors} agent skill validation error${planValidationErrors === 1 ? "" : "s"} first.`));
+    console.log();
+    process.exit(1);
+  }
   let willDeployApp = false;
   if (!type && !skipApp) {
     try {
@@ -3985,7 +4030,7 @@ async function apply(args) {
   }
   if (localAgents.length > 0) {
     console.log(pc2.bold("  Agents:"));
-    totalErrors += await applyAgents(api, localAgents, projectId, localSkillSlugs, appName);
+    totalErrors += await applyAgents(api, localAgents, projectId, localSourceSkillSlugs, appName);
     console.log();
   }
   if (localMailboxes.length > 0) {
@@ -4050,11 +4095,13 @@ async function pull(args) {
     if (!type || type === "agents") {
       const localAgents = loadLocalAgents(platformDir, name || void 0, appName);
       if (localAgents.length > 0) {
-        const changes = await planAgents(
+        const localSkillSlugs = new Set(loadLocalSkills(platformDir).map((skill) => skill.slug));
+        const { changes } = await planAgents(
           api,
           localAgents,
           projectId,
-          new Set(loadLocalSkills(platformDir).map((skill) => skill.slug)),
+          localSkillSlugs,
+          localSkillSlugs,
           appName
         );
         for (const c of changes) {
@@ -4482,6 +4529,7 @@ export {
   loadLocalSkills,
   localProjectSkillSlug,
   plan,
+  planAgents,
   planCollections,
   planSkills,
   projectSkillRefCandidates,

package/package.json

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