@lumerahq/cli 0.19.3 → 0.19.5

package/dist/{chunk-AUYOTENF.js → chunk-HU7RYLUF.js}

@@ -31,7 +31,7 @@ async function fetchSkillsList() {
   if (!listRes.ok) {
     throw new Error(`Failed to fetch skills list: ${listRes.status}`);
   }
-  return listRes.json();
+  return await listRes.json();
 }
 async function fetchSkillContent(slug) {
   const baseUrl = getBaseUrl();

package/dist/{chunk-P5HFNAVN.js → chunk-RUJRTLHA.js}

@@ -2,8 +2,9 @@ import {
   loadEnv
 } from "./chunk-2CR762KB.js";
 import {
-  createApiClient
-} from "./chunk-JKXLKK5I.js";
+  createApiClient,
+  isApiErrorStatus
+} from "./chunk-WY6UMJNI.js";
 import {
   findProjectRoot,
   getAppName
@@ -86,6 +87,10 @@ async function syncResourceShareDeps(projectRoot, api, projectExternalId, opts)
   try {
     shares = await listIncomingCollectionShares(api, projectExternalId);
   } catch (e) {
+    if (opts.ignorePermissionDenied && isApiErrorStatus(e, 403)) {
+      console.log(pc.yellow("  \u26A0"), "Skipping resource-share sync \u2014 current token cannot list project shares (403).");
+      return true;
+    }
     if (!opts.quiet) {
       console.log(pc.red("  \u2717"), `Failed to list incoming resource shares \u2014 ${e}`);
     }
@@ -170,7 +175,11 @@ async function syncDeps(projectRoot, options = {}) {
   const quiet = options.quiet === true;
   const write = options.write === true;
   if (flagOn) {
-    return syncResourceShareDeps(root, api, appName, { write, quiet });
+    return syncResourceShareDeps(root, api, appName, {
+      write,
+      quiet,
+      ignorePermissionDenied: options.ignorePermissionDenied === true
+    });
   }
   if (options.legacyWhenDisabled === false) {
     return true;

package/dist/{chunk-JKXLKK5I.js → chunk-WY6UMJNI.js}

@@ -25,6 +25,19 @@ while (__pkgDir !== "/") {
 }
 var pkg = JSON.parse(readFileSync(resolve(__pkgDir, "package.json"), "utf-8"));
 var CLI_USER_AGENT = `lumera-cli/${pkg.version}`;
+var ApiError = class extends Error {
+  status;
+  body;
+  constructor(status, body) {
+    super(`API request failed: ${status} ${body}`);
+    this.name = "ApiError";
+    this.status = status;
+    this.body = body;
+  }
+};
+function isApiErrorStatus(error, status) {
+  return error instanceof ApiError && error.status === status;
+}
 var ApiClient = class {
   baseUrl;
   token;
@@ -66,12 +79,12 @@ var ApiClient = class {
     });
     if (!response.ok) {
       const text = await response.text();
-      throw new Error(`API request failed: ${response.status} ${text}`);
+      throw new ApiError(response.status, text);
     }
     if (response.status === 204) {
       return {};
     }
-    return response.json();
+    return await response.json();
   }
   // Collections
   async getMe() {
@@ -104,6 +117,7 @@ var ApiClient = class {
     const qs = new URLSearchParams();
     if (params?.external_id) qs.set("external_id", params.external_id);
     if (params?.include_code) qs.set("include_code", "true");
+    if (params?.project_id) qs.set("project_id", params.project_id);
     qs.set("limit", "100");
     const all = [];
     let offset = 0;
@@ -166,6 +180,7 @@ var ApiClient = class {
     const query = new URLSearchParams();
     if (params?.collection_id) query.set("collection_id", params.collection_id);
     if (params?.external_id) query.set("external_id", params.external_id);
+    if (params?.project_id) query.set("project_id", params.project_id);
     const queryString = query.toString();
     const path = queryString ? `/api/pb/hooks?${queryString}` : "/api/pb/hooks";
     const result = await this.request(path);
@@ -325,5 +340,6 @@ function createApiClient(token, baseUrl, projectExternalId) {
 }
 
 export {
+  isApiErrorStatus,
   createApiClient
 };

package/dist/{deps-EC3VRNN7.js → deps-73XZXRYP.js}

@@ -2,9 +2,9 @@ import {
   deps,
   projectResourceDepsEnabled,
   syncDeps
-} from "./chunk-P5HFNAVN.js";
+} from "./chunk-RUJRTLHA.js";
 import "./chunk-2CR762KB.js";
-import "./chunk-JKXLKK5I.js";
+import "./chunk-WY6UMJNI.js";
 import "./chunk-ZH3NVYEQ.js";
 import "./chunk-FJFIWC7G.js";
 import "./chunk-PNKVD2UK.js";

package/dist/{dev-R43VQCZD.js → dev-LDLUZ2VO.js}

@@ -4,13 +4,13 @@ import {
 import {
   projectResourceDepsEnabled,
   syncDeps
-} from "./chunk-P5HFNAVN.js";
+} from "./chunk-RUJRTLHA.js";
 import {
   loadEnv
 } from "./chunk-2CR762KB.js";
 import {
   createApiClient
-} from "./chunk-JKXLKK5I.js";
+} from "./chunk-WY6UMJNI.js";
 import {
   findProjectRoot,
   getApiUrl,
@@ -126,7 +126,12 @@ async function dev2(args) {
   const appTitle = getAppTitle(projectRoot);
   const apiUrl = getApiUrl();
   if (await projectResourceDepsEnabled(projectRoot)) {
-    await syncDeps(projectRoot, { write: true, quiet: true, legacyWhenDisabled: false });
+    await syncDeps(projectRoot, {
+      write: true,
+      quiet: true,
+      legacyWhenDisabled: false,
+      ignorePermissionDenied: true
+    });
   }
   if (!flags["skip-setup"]) {
     const fresh = await isFreshProject(projectRoot);

package/dist/index.js

@@ -219,39 +219,39 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-OP7EECKZ.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-OP7EECKZ.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-OP7EECKZ.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-OP7EECKZ.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-OP7EECKZ.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-OP7EECKZ.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-OP7EECKZ.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-UMGSN6QA.js").then((m) => m.diff(args.slice(1)));
         break;
       // Development
       case "dev":
-        await import("./dev-R43VQCZD.js").then((m) => m.dev(args.slice(1)));
+        await import("./dev-LDLUZ2VO.js").then((m) => m.dev(args.slice(1)));
         break;
       case "run":
-        await import("./run-EJP5WCQU.js").then((m) => m.run(args.slice(1)));
+        await import("./run-C23KZI4Z.js").then((m) => m.run(args.slice(1)));
         break;
       // Project
       case "init":
-        await import("./init-TDIQAOG4.js").then((m) => m.init(args.slice(1)));
+        await import("./init-7YWMMTBF.js").then((m) => m.init(args.slice(1)));
         break;
       case "register":
-        await import("./register-JFJADKAJ.js").then((m) => m.register(args.slice(1)));
+        await import("./register-KJMSMMD6.js").then((m) => m.register(args.slice(1)));
         break;
       case "templates":
         await import("./templates-LNUOTNLN.js").then((m) => m.templates(subcommand, args.slice(2)));
@@ -264,11 +264,11 @@ async function main() {
         break;
       // Skills
       case "skills":
-        await import("./skills-TNJHMV4F.js").then((m) => m.skills(subcommand, args.slice(2)));
+        await import("./skills-REOKLNEF.js").then((m) => m.skills(subcommand, args.slice(2)));
         break;
       // Dependencies
       case "deps":
-        await import("./deps-EC3VRNN7.js").then((m) => m.deps(args.slice(1)));
+        await import("./deps-73XZXRYP.js").then((m) => m.deps(args.slice(1)));
         break;
       // Auth
       case "login":

package/dist/{init-TDIQAOG4.js → init-7YWMMTBF.js}

@@ -1,13 +1,13 @@
 import {
   installAllSkills,
   syncClaudeMd
-} from "./chunk-AUYOTENF.js";
+} from "./chunk-HU7RYLUF.js";
 import {
   spinner
 } from "./chunk-BHYDYR75.js";
 import {
   createApiClient
-} from "./chunk-JKXLKK5I.js";
+} from "./chunk-WY6UMJNI.js";
 import {
   getToken,
   init_auth,
@@ -287,19 +287,24 @@ async function init(args) {
     }
     projectName = response.projectName;
   }
-  if (!/^[a-z0-9-]+$/.test(projectName)) {
+  if (!projectName) {
+    console.log(pc.red("  Error: Project name is required"));
+    process.exit(1);
+  }
+  const finalProjectName = projectName;
+  if (!/^[a-z0-9-]+$/.test(finalProjectName)) {
     console.log(pc.red("  Error: Project name must use lowercase letters, numbers, and hyphens only"));
     process.exit(1);
   }
   if (!directory) {
     if (nonInteractive) {
-      directory = projectName;
+      directory = finalProjectName;
     } else {
       const response = await prompts({
         type: "text",
         name: "directory",
         message: "Where should we create the project?",
-        initial: projectName
+        initial: finalProjectName
       });
       if (!response.directory) {
         console.log(pc.red("Cancelled"));
@@ -308,14 +313,19 @@ async function init(args) {
       directory = response.directory;
     }
   }
-  const projectTitle = toTitleCase(projectName);
-  const targetDir = resolve(process.cwd(), directory);
+  if (!directory) {
+    console.log(pc.red("  Error: Directory is required"));
+    process.exit(1);
+  }
+  const finalDirectory = directory;
+  const projectTitle = toTitleCase(finalProjectName);
+  const targetDir = resolve(process.cwd(), finalDirectory);
   if (existsSync(targetDir)) {
     if (nonInteractive) {
       if (opts.force) {
         rmSync(targetDir, { recursive: true });
       } else {
-        console.log(pc.red(`  Error: Directory ${directory} already exists`));
+        console.log(pc.red(`  Error: Directory ${finalDirectory} already exists`));
         console.log(pc.dim("  Use --force (-f) to overwrite"));
         process.exit(1);
       }
@@ -323,7 +333,7 @@ async function init(args) {
       const { overwrite } = await prompts({
         type: "confirm",
         name: "overwrite",
-        message: `Directory ${directory} already exists. Overwrite?`,
+        message: `Directory ${finalDirectory} already exists. Overwrite?`,
         initial: false
       });
       if (!overwrite) {
@@ -336,9 +346,9 @@ async function init(args) {
   mkdirSync(targetDir, { recursive: true });
   console.log();
   if (templateName !== "default") {
-    console.log(pc.dim(`  Creating ${projectName} from template ${pc.cyan(templateName)}...`));
+    console.log(pc.dim(`  Creating ${finalProjectName} from template ${pc.cyan(templateName)}...`));
   } else {
-    console.log(pc.dim(`  Creating ${projectName}...`));
+    console.log(pc.dim(`  Creating ${finalProjectName}...`));
   }
   console.log();
   const templatePkgPath = join(templateDir, "package.json");
@@ -346,9 +356,9 @@ async function init(args) {
   const sourceName = templatePkg.name || "my-lumera-app";
   const sourceTitle = templatePkg.lumera?.name || toTitleCase(sourceName);
   const replacements = [
-    ["{{projectName}}", projectName],
+    ["{{projectName}}", finalProjectName],
     ["{{projectTitle}}", projectTitle],
-    [sourceName, projectName],
+    [sourceName, finalProjectName],
     [sourceTitle, projectTitle]
   ];
   copyDir(templateDir, targetDir, replacements);
@@ -366,7 +376,7 @@ async function init(args) {
   listFiles(targetDir);
   if (isGitInstalled()) {
     const stopGit = spinner("Initializing git repository...");
-    if (initGitRepo(targetDir, projectName)) {
+    if (initGitRepo(targetDir, finalProjectName)) {
       stopGit(pc.green("\u2713") + pc.dim(" Git repository initialized with initial commit"));
     } else {
       stopGit(pc.yellow("\u26A0") + pc.dim(" Failed to initialize git repository"));
@@ -428,7 +438,7 @@ async function init(args) {
     const api = createApiClient(token);
     const stopRegister = spinner("Registering project on Lumera...");
     try {
-      const project = await api.registerProject(projectName);
+      const project = await api.registerProject(finalProjectName);
       setProjectId(targetDir, project.id);
       stopRegister(pc.green("\u2713") + pc.dim(` Project registered (${project.id})`));
       registered = true;
@@ -441,7 +451,7 @@ async function init(args) {
   console.log();
   console.log(pc.green(pc.bold("  Done!")), "Next steps:");
   console.log();
-  console.log(pc.cyan(`  cd ${directory}`));
+  console.log(pc.cyan(`  cd ${finalDirectory}`));
   if (!opts.install) {
     console.log(pc.cyan("  pnpm install"));
   }

package/dist/{register-JFJADKAJ.js → register-KJMSMMD6.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-BHYDYR75.js";
 import {
   createApiClient
-} from "./chunk-JKXLKK5I.js";
+} from "./chunk-WY6UMJNI.js";
 import {
   findProjectRoot,
   getAppName,

package/dist/{resources-OP7EECKZ.js → resources-UMGSN6QA.js}

@@ -4,13 +4,13 @@ import {
 import {
   projectResourceDepsEnabled,
   syncDeps
-} from "./chunk-P5HFNAVN.js";
+} from "./chunk-RUJRTLHA.js";
 import {
   loadEnv
 } from "./chunk-2CR762KB.js";
 import {
   createApiClient
-} from "./chunk-JKXLKK5I.js";
+} from "./chunk-WY6UMJNI.js";
 import {
   findProjectRoot,
   getApiUrl,
@@ -29,8 +29,95 @@ import "./chunk-PNKVD2UK.js";
 import pc2 from "picocolors";
 import prompts from "prompts";
 import { execFileSync, execSync } from "child_process";
-import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from "fs";
-import { join, resolve } from "path";
+import { existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync } from "fs";
+import { join as join2, resolve } from "path";
+
+// src/lib/lint/index.ts
+import { existsSync, readFileSync, readdirSync } from "fs";
+import { basename, join } from "path";
+
+// src/lib/lint/rules/collection-schema.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function error(target, message, snippet) {
+  return {
+    ruleId: "collection-schema",
+    target,
+    severity: "error",
+    message,
+    snippet
+  };
+}
+var collectionSchemaRule = {
+  id: "collection-schema",
+  description: "Validates local collection JSON files before planning or applying resources.",
+  appliesTo: ["collection"],
+  check(target) {
+    let parsed;
+    try {
+      parsed = JSON.parse(target.source);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      return [error(target, `Invalid JSON: ${message}`)];
+    }
+    if (!isRecord(parsed)) {
+      return [error(target, "Collection file must contain a JSON object.")];
+    }
+    const issues = [];
+    const id = parsed.id;
+    const name = parsed.name;
+    const fields = parsed.fields;
+    const indexes = parsed.indexes;
+    if (typeof id !== "string" || id.trim() === "") {
+      issues.push(error(target, 'Missing required string field "id".'));
+    }
+    if (typeof name !== "string" || name.trim() === "") {
+      issues.push(error(target, 'Missing required string field "name".'));
+    } else {
+      if (/\s/.test(name)) {
+        issues.push(error(target, `Collection name "${name}" contains spaces; use underscores instead.`));
+      }
+      if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)) {
+        issues.push(error(target, `Collection name "${name}" contains invalid characters.`));
+      }
+    }
+    if (!Array.isArray(fields)) {
+      issues.push(error(target, 'Missing required array field "fields".'));
+    } else {
+      for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
+        if (!isRecord(field)) {
+          issues.push(error(target, `Field at index ${i} must be an object.`));
+          continue;
+        }
+        if (typeof field.name !== "string" || field.name.trim() === "") {
+          issues.push(error(target, `Field at index ${i} is missing required string field "name".`));
+        }
+        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".`));
+        }
+      }
+    }
+    if (indexes !== void 0) {
+      if (!Array.isArray(indexes)) {
+        issues.push(error(target, 'Optional field "indexes" must be an array when present.'));
+      } else {
+        for (let i = 0; i < indexes.length; i++) {
+          const index = indexes[i];
+          if (!isRecord(index)) {
+            issues.push(error(target, `Index at index ${i} must be an object.`));
+            continue;
+          }
+          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".`));
+          }
+        }
+      }
+    }
+    return issues;
+  }
+};
 
 // src/lib/lint/rules/llm-import.ts
 var FROM_LUMERA_IMPORT_LLM = /^\s*from\s+lumera\s+import\s+\(?\s*(?:[\w\s,]*?\b)?llm\b/;
@@ -75,25 +162,37 @@ var llmImportRule = {
 };
 
 // src/lib/lint/registry.ts
-var ALL_RULES = [llmImportRule];
+var ALL_RULES = [collectionSchemaRule, llmImportRule];
 
 // src/lib/lint/format.ts
 import { relative } from "path";
 import pc from "picocolors";
 function printLintWarnings(warnings, projectRoot) {
   if (warnings.length === 0) return;
+  const errors = warnings.filter((w) => w.severity === "error");
+  const advisory = warnings.filter((w) => w.severity !== "error");
   console.log();
-  console.log(pc.bold("  Warnings:"));
+  console.log(pc.bold(errors.length > 0 ? "  Lint issues:" : "  Warnings:"));
   for (const w of warnings) {
     const rel = relative(projectRoot, w.target.filePath);
     const loc = w.line ? `${rel}:${w.line}` : rel;
-    console.log(`    ${pc.yellow("\u26A0")} ${loc}  ${pc.dim(`[${w.ruleId}]`)}`);
+    const isError = w.severity === "error";
+    const icon = isError ? pc.red("\u2717") : pc.yellow("\u26A0");
+    console.log(`    ${icon} ${loc}  ${pc.dim(`[${w.ruleId}]`)}`);
     console.log(`        ${w.message}`);
     if (w.snippet) console.log(pc.dim(`        > ${w.snippet}`));
   }
   console.log();
-  const n = warnings.length;
-  console.log(pc.dim(`  ${n} warning${n === 1 ? "" : "s"} \u2014 advisory, will not block apply.`));
+  if (errors.length > 0) {
+    const n = errors.length;
+    console.log(pc.red(`  ${n} error${n === 1 ? "" : "s"} \u2014 fix these before continuing.`));
+    if (advisory.length > 0) {
+      console.log(pc.dim(`  ${advisory.length} warning${advisory.length === 1 ? "" : "s"} \u2014 advisory.`));
+    }
+  } else {
+    const n = advisory.length;
+    console.log(pc.dim(`  ${n} warning${n === 1 ? "" : "s"} \u2014 advisory, will not block apply.`));
+  }
   console.log();
 }
 function serializeLintWarnings(warnings, projectRoot) {
@@ -101,6 +200,7 @@ function serializeLintWarnings(warnings, projectRoot) {
     ruleId: w.ruleId,
     target: { kind: w.target.kind, name: w.target.name, filePath: relative(projectRoot, w.target.filePath) },
     message: w.message,
+    severity: w.severity ?? "warning",
     line: w.line,
     snippet: w.snippet
   }));
@@ -131,6 +231,22 @@ function buildAutomationTargets(localAutomations) {
     source: a.code
   }));
 }
+function buildCollectionTargets(platformDir, _filterName) {
+  const collectionsDir = join(platformDir, "collections");
+  if (!existsSync(collectionsDir)) return [];
+  const targets = [];
+  for (const entry of readdirSync(collectionsDir, { withFileTypes: true })) {
+    if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
+    const filePath = join(collectionsDir, entry.name);
+    targets.push({
+      kind: "collection",
+      name: basename(entry.name, ".json"),
+      filePath,
+      source: readFileSync(filePath, "utf-8")
+    });
+  }
+  return targets;
+}
 
 // src/commands/resources.ts
 init_auth();
@@ -149,6 +265,13 @@ function safePrintLint(warnings, projectRoot) {
     if (process.env.LUMERA_DEBUG) console.error("[lint] print failed:", err);
   }
 }
+function lintCollectionFiles(projectRoot, platformDir, filterName) {
+  const issues = runLint({ projectRoot, targets: buildCollectionTargets(platformDir, filterName) });
+  const errors = issues.filter((issue) => issue.severity === "error");
+  if (errors.length === 0) return;
+  printLintWarnings(issues, projectRoot);
+  throw new Error(`Found ${errors.length} collection lint error(s)`);
+}
 function detectPackageManager() {
   for (const pm of ["bun", "pnpm", "yarn", "npm"]) {
     try {
@@ -171,6 +294,23 @@ function stripNamespacePrefix(name, appName) {
   }
   return name;
 }
+function buildCollectionIdMap(collections, appName) {
+  const result = /* @__PURE__ */ new Map();
+  const add = (key, id) => {
+    const trimmed = (key || "").trim();
+    if (trimmed) result.set(trimmed, id);
+  };
+  for (const collection of collections) {
+    add(collection.id, collection.id);
+    add(collection.name, collection.id);
+    const stripped = stripNamespacePrefix(collection.name, appName);
+    add(stripped, collection.id);
+    if (collection.name.includes(NAMESPACE_SEPARATOR)) {
+      add(collection.name.split(NAMESPACE_SEPARATOR).slice(1).join(NAMESPACE_SEPARATOR), collection.id);
+    }
+  }
+  return result;
+}
 function computeLineDiff(oldText, newText) {
   const oldLines = (oldText || "").trimEnd().split("\n");
   const newLines = (newText || "").trimEnd().split("\n");
@@ -568,29 +708,29 @@ function parseResource(resourcePath) {
   return { type, name };
 }
 function getPlatformDir() {
-  if (existsSync(join(process.cwd(), "platform"))) {
-    return join(process.cwd(), "platform");
+  if (existsSync2(join2(process.cwd(), "platform"))) {
+    return join2(process.cwd(), "platform");
   }
-  if (existsSync(join(process.cwd(), "lumera_platform"))) {
-    return join(process.cwd(), "lumera_platform");
+  if (existsSync2(join2(process.cwd(), "lumera_platform"))) {
+    return join2(process.cwd(), "lumera_platform");
   }
-  return join(process.cwd(), "platform");
+  return join2(process.cwd(), "platform");
 }
 function toSafeFilename(name) {
   return name.replace(/\s+/g, "_").replace(/[^a-zA-Z0-9_-]/g, "").toLowerCase();
 }
 function loadLocalCollections(platformDir, filterName) {
-  const collectionsDir = join(platformDir, "collections");
-  if (!existsSync(collectionsDir)) {
+  const collectionsDir = join2(platformDir, "collections");
+  if (!existsSync2(collectionsDir)) {
     return [];
   }
   const collections = [];
   const errors = [];
-  for (const file of readdirSync(collectionsDir)) {
+  for (const file of readdirSync2(collectionsDir)) {
     if (!file.endsWith(".json")) continue;
-    const filePath = join(collectionsDir, file);
+    const filePath = join2(collectionsDir, file);
     try {
-      const content = readFileSync(filePath, "utf-8");
+      const content = readFileSync2(filePath, "utf-8");
       const collection = JSON.parse(content);
       if (filterName && collection.name !== filterName && collection.id !== filterName) {
         continue;
@@ -611,6 +751,27 @@ function loadLocalCollections(platformDir, filterName) {
         errors.push(`${file}: collection name "${collection.name}" contains invalid characters`);
         continue;
       }
+      if (!Array.isArray(collection.fields)) {
+        errors.push(`${file}: missing fields array`);
+        continue;
+      }
+      for (let i = 0; i < collection.fields.length; i++) {
+        const field = collection.fields[i];
+        if (!field || typeof field !== "object") {
+          errors.push(`${file}: field at index ${i} must be an object`);
+          continue;
+        }
+        if (typeof field.name !== "string" || field.name.trim() === "") {
+          errors.push(`${file}: field at index ${i} is missing name`);
+        }
+        if (typeof field.type !== "string" || field.type.trim() === "") {
+          errors.push(`${file}: field ${typeof field.name === "string" ? `"${field.name}"` : `at index ${i}`} is missing type`);
+        }
+      }
+      if (collection.indexes !== void 0 && !Array.isArray(collection.indexes)) {
+        errors.push(`${file}: indexes must be an array when present`);
+        continue;
+      }
       const existingById = collections.find((c) => c.id === collection.id);
       if (existingById) {
         errors.push(`${file}: duplicate collection id "${collection.id}" (also defined in another file)`);
@@ -636,27 +797,27 @@ function loadLocalCollections(platformDir, filterName) {
   return collections;
 }
 function loadLocalAutomations(platformDir, filterName, appName) {
-  const automationsDir = join(platformDir, "automations");
-  if (!existsSync(automationsDir)) {
+  const automationsDir = join2(platformDir, "automations");
+  if (!existsSync2(automationsDir)) {
     return [];
   }
   const automations = [];
   const errors = [];
-  for (const entry of readdirSync(automationsDir, { withFileTypes: true })) {
+  for (const entry of readdirSync2(automationsDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const automationDir = join(automationsDir, entry.name);
-    const configPath = join(automationDir, "config.json");
-    const mainPath = join(automationDir, "main.py");
-    if (!existsSync(configPath)) {
+    const automationDir = join2(automationsDir, entry.name);
+    const configPath = join2(automationDir, "config.json");
+    const mainPath = join2(automationDir, "main.py");
+    if (!existsSync2(configPath)) {
       errors.push(`${entry.name}: missing config.json`);
       continue;
     }
-    if (!existsSync(mainPath)) {
+    if (!existsSync2(mainPath)) {
       errors.push(`${entry.name}: missing main.py`);
       continue;
     }
     try {
-      const configContent = readFileSync(configPath, "utf-8");
+      const configContent = readFileSync2(configPath, "utf-8");
       const rawConfig = JSON.parse(configContent);
       if (filterName && rawConfig.external_id !== filterName && rawConfig.name !== filterName && entry.name !== filterName) {
         continue;
@@ -683,7 +844,7 @@ function loadLocalAutomations(platformDir, filterName, appName) {
         errors.push(`${entry.name}: duplicate external_id "${config.external_id}" (also defined in ${existingByExtId.automation.name})`);
         continue;
       }
-      let code = readFileSync(mainPath, "utf-8");
+      let code = readFileSync2(mainPath, "utf-8");
       if (appName) {
         code = code.replaceAll("{{app}}", appName);
       }
@@ -702,15 +863,15 @@ function loadLocalAutomations(platformDir, filterName, appName) {
   return automations;
 }
 function loadLocalHooks(platformDir, filterName, appName) {
-  const hooksDir = join(platformDir, "hooks");
-  if (!existsSync(hooksDir)) {
+  const hooksDir = join2(platformDir, "hooks");
+  if (!existsSync2(hooksDir)) {
     return [];
   }
   const hooks = [];
-  for (const file of readdirSync(hooksDir)) {
+  for (const file of readdirSync2(hooksDir)) {
     if (!file.endsWith(".js") && !file.endsWith(".ts")) continue;
-    const filePath = join(hooksDir, file);
-    const content = readFileSync(filePath, "utf-8");
+    const filePath = join2(hooksDir, file);
+    const content = readFileSync2(filePath, "utf-8");
     const config = parseHookConfig(content);
     if (!config) {
       console.log(pc2.yellow(`  \u26A0 Skipping ${file}: could not parse config export`));
@@ -830,6 +991,16 @@ function mapFieldType(type) {
   };
   return typeMap[type] || type;
 }
+function normalizeConstraintValue(fieldType, value) {
+  if (value === void 0 || value === null) return void 0;
+  if (["text", "email", "url", "editor"].includes(fieldType) && value === 0) {
+    return void 0;
+  }
+  if (fieldType === "date" && value === "") {
+    return void 0;
+  }
+  return value;
+}
 function fieldsDiffer(local, remote) {
   if (mapFieldType(local.type) !== remote.type) return true;
   if ((local.required || false) !== (remote.required || false)) return true;
@@ -858,11 +1029,11 @@ function fieldsDiffer(local, remote) {
     const remoteDecimalPrecision = opts.decimalPrecision !== void 0 ? opts.decimalPrecision : 2;
     if (localDecimalPrecision !== remoteDecimalPrecision) return true;
   }
-  const localMin = local.min !== void 0 ? local.min : void 0;
-  const remoteMin = opts.min !== void 0 ? opts.min : void 0;
+  const localMin = normalizeConstraintValue(local.type, local.min);
+  const remoteMin = normalizeConstraintValue(local.type, opts.min);
   if (localMin !== remoteMin) return true;
-  const localMax = local.max !== void 0 ? local.max : void 0;
-  const remoteMax = opts.max !== void 0 ? opts.max : void 0;
+  const localMax = normalizeConstraintValue(local.type, local.max);
+  const remoteMax = normalizeConstraintValue(local.type, opts.max);
   if (localMax !== remoteMax) return true;
   return false;
 }
@@ -956,9 +1127,12 @@ async function planCollections(api, localCollections) {
   }
   return changes;
 }
-async function planAutomations(api, localAutomations) {
+async function planAutomations(api, localAutomations, projectId) {
   const changes = [];
-  const remoteAutomations = await api.listAutomations({ include_code: true });
+  const remoteAutomations = await api.listAutomations({
+    include_code: true,
+    ...projectId ? { project_id: projectId } : {}
+  });
   const remoteByExternalId = new Map(remoteAutomations.filter((a) => a.external_id).map((a) => [a.external_id, a]));
   const remotePresetCache = /* @__PURE__ */ new Map();
   const getRemotePresets = (automationId) => {
@@ -1026,12 +1200,12 @@ async function planAutomations(api, localAutomations) {
   return changes;
 }
 function loadLocalMailboxes(platformDir, filterName) {
-  const mailboxesDir = join(platformDir, "mailboxes");
-  if (!existsSync(mailboxesDir)) {
+  const mailboxesDir = join2(platformDir, "mailboxes");
+  if (!existsSync2(mailboxesDir)) {
     return [];
   }
   const mailboxes = [];
-  for (const file of readdirSync(mailboxesDir)) {
+  for (const file of readdirSync2(mailboxesDir)) {
     if (!file.endsWith(".json")) continue;
     const slug = file.replace(/\.json$/, "").trim();
     if (!slug) {
@@ -1041,10 +1215,10 @@ function loadLocalMailboxes(platformDir, filterName) {
     if (filterName && slug !== filterName) {
       continue;
     }
-    const filePath = join(mailboxesDir, file);
+    const filePath = join2(mailboxesDir, file);
     let raw;
     try {
-      raw = JSON.parse(readFileSync(filePath, "utf-8"));
+      raw = JSON.parse(readFileSync2(filePath, "utf-8"));
     } catch (e) {
       console.log(pc2.yellow(`  \u26A0 Skipping ${file}: invalid JSON (${e.message})`));
       continue;
@@ -1123,8 +1297,8 @@ async function pullMailboxes(api, platformDir, filterName) {
     console.log(pc2.dim("  (no mailboxes)"));
     return;
   }
-  const outDir = join(platformDir, "mailboxes");
-  if (!existsSync(outDir)) {
+  const outDir = join2(platformDir, "mailboxes");
+  if (!existsSync2(outDir)) {
     mkdirSync(outDir, { recursive: true });
   }
   let count = 0;
@@ -1132,7 +1306,7 @@ async function pullMailboxes(api, platformDir, filterName) {
     if (filterName && mb.slug !== filterName) continue;
     const body = {};
     if (mb.description) body.description = mb.description;
-    const file = join(outDir, `${toSafeFilename(mb.slug)}.json`);
+    const file = join2(outDir, `${toSafeFilename(mb.slug)}.json`);
     writeFileSync(file, JSON.stringify(body, null, 2) + "\n");
     console.log(pc2.green("  \u2713"), `pulled mailbox ${mb.slug} ${pc2.dim(`\u2192 ${file}`)}`);
     count++;
@@ -1141,9 +1315,9 @@ async function pullMailboxes(api, platformDir, filterName) {
     console.log(pc2.yellow(`  \u26A0 mailbox '${filterName}' not found on remote`));
   }
 }
-async function planHooks(api, localHooks, collections) {
+async function planHooks(api, localHooks, collections, projectId) {
   const changes = [];
-  const remoteHooks = await api.listHooks();
+  const remoteHooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
   const remoteByExternalId = new Map(remoteHooks.filter((h) => h.external_id).map((h) => [h.external_id, h]));
   for (const { hook, script, fileName } of localHooks) {
     const remote = remoteByExternalId.get(hook.external_id);
@@ -1231,7 +1405,7 @@ async function applyCollections(api, localCollections) {
 }
 async function applyAutomations(api, localAutomations, projectId) {
   let errors = 0;
-  const remoteAutomations = await api.listAutomations();
+  const remoteAutomations = await api.listAutomations(projectId ? { project_id: projectId } : void 0);
   const remoteByExternalId = new Map(remoteAutomations.filter((a) => a.external_id).map((a) => [a.external_id, a]));
   for (const { automation, code } of localAutomations) {
     const remote = remoteByExternalId.get(automation.external_id);
@@ -1343,7 +1517,7 @@ async function setSchedule(api, automationId, schedule, localPresets) {
 }
 async function applyHooks(api, localHooks, collections, projectId) {
   let errors = 0;
-  const remoteHooks = await api.listHooks();
+  const remoteHooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
   const remoteByExternalId = new Map(remoteHooks.filter((h) => h.external_id).map((h) => [h.external_id, h]));
   for (const { hook, script, fileName } of localHooks) {
     const remote = remoteByExternalId.get(hook.external_id);
@@ -1401,7 +1575,7 @@ async function applyApp(args) {
   await deploy({ token, appName, appTitle, distDir, apiUrl });
 }
 async function pullCollections(api, platformDir, filterName, appName) {
-  const collectionsDir = join(platformDir, "collections");
+  const collectionsDir = join2(platformDir, "collections");
   mkdirSync(collectionsDir, { recursive: true });
   const collections = await api.listCollections();
   for (const collection of collections) {
@@ -1445,15 +1619,18 @@ async function pullCollections(api, platformDir, filterName, appName) {
       }).filter((idx) => idx !== null)
     };
     const fileName = toSafeFilename(localName);
-    const filePath = join(collectionsDir, `${fileName}.json`);
+    const filePath = join2(collectionsDir, `${fileName}.json`);
     writeFileSync(filePath, JSON.stringify(localFormat, null, 2) + "\n");
     console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${fileName}.json`);
   }
 }
 async function pullAutomations(api, platformDir, filterName, projectId) {
-  const automationsDir = join(platformDir, "automations");
+  const automationsDir = join2(platformDir, "automations");
   mkdirSync(automationsDir, { recursive: true });
-  const automations = await api.listAutomations({ include_code: true });
+  const automations = await api.listAutomations({
+    include_code: true,
+    ...projectId ? { project_id: projectId } : {}
+  });
   for (const automation of automations) {
     if (!automation.external_id || automation.managed) continue;
     if (projectId && automation.project_id && automation.project_id !== projectId) continue;
@@ -1462,7 +1639,7 @@ async function pullAutomations(api, platformDir, filterName, projectId) {
       continue;
     }
     const dirName = automation.external_id.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const automationDir = join(automationsDir, dirName);
+    const automationDir = join2(automationsDir, dirName);
     mkdirSync(automationDir, { recursive: true });
     const config = {
       external_id: automation.external_id,
@@ -1495,15 +1672,15 @@ async function pullAutomations(api, platformDir, filterName, projectId) {
       }
     } catch {
     }
-    writeFileSync(join(automationDir, "config.json"), JSON.stringify(config, null, 2) + "\n");
-    writeFileSync(join(automationDir, "main.py"), automation.code || "");
+    writeFileSync(join2(automationDir, "config.json"), JSON.stringify(config, null, 2) + "\n");
+    writeFileSync(join2(automationDir, "main.py"), automation.code || "");
     console.log(pc2.green("  \u2713"), `${automation.name} \u2192 automations/${dirName}/`);
   }
 }
 async function pullHooks(api, platformDir, filterName, appName, projectId) {
-  const hooksDir = join(platformDir, "hooks");
+  const hooksDir = join2(platformDir, "hooks");
   mkdirSync(hooksDir, { recursive: true });
-  const hooks = await api.listHooks();
+  const hooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
   for (const hook of hooks) {
     if (!hook.external_id) continue;
     if (projectId && hook.project_id && hook.project_id !== projectId) continue;
@@ -1523,31 +1700,31 @@ export default async function handler({ record, app, http }) {
 ${hook.script.split("\n").map((line) => "  " + line).join("\n")}
 }
 `;
-    writeFileSync(join(hooksDir, fileName), content);
+    writeFileSync(join2(hooksDir, fileName), content);
     console.log(pc2.green("  \u2713"), `${hook.name} \u2192 hooks/${fileName}`);
   }
 }
 function loadLocalAgents(platformDir, filterName, appName) {
-  const agentsDir = join(platformDir, "agents");
-  if (!existsSync(agentsDir)) return [];
+  const agentsDir = join2(platformDir, "agents");
+  if (!existsSync2(agentsDir)) return [];
   const agents = [];
   const errors = [];
-  for (const entry of readdirSync(agentsDir, { withFileTypes: true })) {
+  for (const entry of readdirSync2(agentsDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const agentDir = join(agentsDir, entry.name);
-    const configPath = join(agentDir, "config.json");
-    const promptPath = join(agentDir, "system_prompt.md");
-    const policyPath = join(agentDir, "policy.js");
-    if (!existsSync(configPath)) {
+    const agentDir = join2(agentsDir, entry.name);
+    const configPath = join2(agentDir, "config.json");
+    const promptPath = join2(agentDir, "system_prompt.md");
+    const policyPath = join2(agentDir, "policy.js");
+    if (!existsSync2(configPath)) {
       errors.push(`${entry.name}: missing config.json`);
       continue;
     }
-    if (!existsSync(promptPath)) {
+    if (!existsSync2(promptPath)) {
       errors.push(`${entry.name}: missing system_prompt.md`);
       continue;
     }
     try {
-      const config = JSON.parse(readFileSync(configPath, "utf-8"));
+      const config = JSON.parse(readFileSync2(configPath, "utf-8"));
       if (filterName && config.external_id !== filterName && config.name !== filterName && entry.name !== filterName) {
         continue;
       }
@@ -1570,8 +1747,8 @@ function loadLocalAgents(platformDir, filterName, appName) {
         errors.push(`${entry.name}: missing name in config.json`);
         continue;
       }
-      let systemPrompt = readFileSync(promptPath, "utf-8");
-      let policyScript = existsSync(policyPath) ? readFileSync(policyPath, "utf-8") : "";
+      let systemPrompt = readFileSync2(promptPath, "utf-8");
+      let policyScript = existsSync2(policyPath) ? readFileSync2(policyPath, "utf-8") : "";
       if (appName) {
         systemPrompt = systemPrompt.replaceAll("{{app}}", appName);
         policyScript = policyScript.replaceAll("{{app}}", appName);
@@ -1701,7 +1878,7 @@ async function applyAgents(api, localAgents, projectId) {
   return errors;
 }
 async function pullAgents(api, platformDir, filterName, projectId) {
-  const agentsDir = join(platformDir, "agents");
+  const agentsDir = join2(platformDir, "agents");
   mkdirSync(agentsDir, { recursive: true });
   const agents = await api.listAgents(projectId ? { project_id: projectId } : void 0);
   let skillIdToSlug = /* @__PURE__ */ new Map();
@@ -1716,7 +1893,7 @@ async function pullAgents(api, platformDir, filterName, projectId) {
       continue;
     }
     const dirName = agent.external_id.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const agentDir = join(agentsDir, dirName);
+    const agentDir = join2(agentsDir, dirName);
     mkdirSync(agentDir, { recursive: true });
     const skillSlugs = [];
     if (agent.skill_ids) {
@@ -1733,10 +1910,10 @@ async function pullAgents(api, platformDir, filterName, projectId) {
     if (agent.model) config.model = agent.model;
     if (skillSlugs.length > 0) config.skills = skillSlugs;
     if (agent.policy_enabled) config.policy_enabled = true;
-    writeFileSync(join(agentDir, "config.json"), JSON.stringify(config, null, 2) + "\n");
-    writeFileSync(join(agentDir, "system_prompt.md"), agent.system_prompt || "");
+    writeFileSync(join2(agentDir, "config.json"), JSON.stringify(config, null, 2) + "\n");
+    writeFileSync(join2(agentDir, "system_prompt.md"), agent.system_prompt || "");
     if (agent.policy_script) {
-      writeFileSync(join(agentDir, "policy.js"), agent.policy_script);
+      writeFileSync(join2(agentDir, "policy.js"), agent.policy_script);
     }
     console.log(pc2.green("  \u2713"), `${agent.name} \u2192 agents/${dirName}/`);
   }
@@ -1781,7 +1958,10 @@ async function listResources(api, platformDir, filterType, appName, projectId) {
   }
   if (!filterType || filterType === "automations") {
     const localAutomations = loadLocalAutomations(platformDir, void 0, appName);
-    const remoteAutomations = await api.listAutomations({ include_code: true });
+    const remoteAutomations = await api.listAutomations({
+      include_code: true,
+      ...projectId ? { project_id: projectId } : {}
+    });
     const remoteByExternalId = new Map(remoteAutomations.filter((a) => a.external_id && !a.managed).map((a) => [a.external_id, a]));
     const localIds = new Set(localAutomations.map((a) => a.automation.external_id));
     for (const { automation, code } of localAutomations) {
@@ -1807,7 +1987,7 @@ async function listResources(api, platformDir, filterType, appName, projectId) {
   }
   if (!filterType || filterType === "hooks") {
     const localHooks = loadLocalHooks(platformDir, void 0, appName);
-    const remoteHooks = await api.listHooks();
+    const remoteHooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
     const remoteByExternalId = new Map(remoteHooks.filter((h) => h.external_id).map((h) => [h.external_id, h]));
     const localIds = new Set(localHooks.map((h) => h.hook.external_id));
     for (const { hook, script } of localHooks) {
@@ -1967,7 +2147,7 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
   if (!resourceType || resourceType === "automations") {
     try {
       const localAutomations = loadLocalAutomations(platformDir, resourceName || void 0, appName);
-      const remoteAutomations = await api.listAutomations();
+      const remoteAutomations = await api.listAutomations(projectId ? { project_id: projectId } : void 0);
       const remoteByExternalId = new Map(remoteAutomations.filter((a) => a.external_id).map((a) => [a.external_id, a]));
       for (const { automation } of localAutomations) {
         const remote = remoteByExternalId.get(automation.external_id);
@@ -1980,7 +2160,7 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
   }
   if (!resourceType || resourceType === "hooks") {
     const localHooks = loadLocalHooks(platformDir, resourceName || void 0, appName);
-    const remoteHooks = await api.listHooks();
+    const remoteHooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
     const remoteByExternalId = new Map(remoteHooks.filter((h) => h.external_id).map((h) => [h.external_id, h]));
     for (const { hook } of localHooks) {
       const remote = remoteByExternalId.get(hook.external_id);
@@ -2221,7 +2401,7 @@ async function showResource(api, platformDir, resourceType, resourceName, appNam
     console.log();
   } else if (resourceType === "automations") {
     const localAutomations = loadLocalAutomations(platformDir, resourceName, appName);
-    const remoteAutomations = await api.listAutomations();
+    const remoteAutomations = await api.listAutomations(projectId ? { project_id: projectId } : void 0);
     const local = localAutomations[0];
     const remote = remoteAutomations.find((a) => a.external_id === resourceName || a.name === resourceName);
     if (!local && !remote) {
@@ -2244,7 +2424,7 @@ async function showResource(api, platformDir, resourceType, resourceName, appNam
     console.log();
   } else if (resourceType === "hooks") {
     const localHooks = loadLocalHooks(platformDir, resourceName, appName);
-    const remoteHooks = await api.listHooks();
+    const remoteHooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
     const local = localHooks[0];
     const remote = remoteHooks.find((h) => h.external_id === resourceName);
     if (!local && !remote) {
@@ -2374,12 +2554,15 @@ async function plan(args) {
   console.log(pc2.cyan(pc2.bold("  Plan")));
   console.log(pc2.dim("  Comparing local files to remote state..."));
   console.log();
-  await syncDeps(projectRoot);
+  if (!type || type === "collections") {
+    lintCollectionFiles(projectRoot, platformDir, name || void 0);
+  }
+  await syncDeps(projectRoot, { ignorePermissionDenied: true });
   const allChanges = [];
   let collections;
   try {
     const remoteCollections = await api.listCollections();
-    collections = new Map(remoteCollections.map((c) => [c.name, c.id]));
+    collections = buildCollectionIdMap(remoteCollections, appName);
   } catch {
     collections = /* @__PURE__ */ new Map();
   }
@@ -2394,14 +2577,14 @@ async function plan(args) {
   if (!type || type === "automations") {
     localAutomations = loadLocalAutomations(platformDir, name || void 0, appName);
     if (localAutomations.length > 0) {
-      const changes = await planAutomations(api, localAutomations);
+      const changes = await planAutomations(api, localAutomations, projectId);
       allChanges.push(...changes);
     }
   }
   if (!type || type === "hooks") {
     const localHooks = loadLocalHooks(platformDir, name || void 0, appName);
     if (localHooks.length > 0) {
-      const changes = await planHooks(api, localHooks, collections);
+      const changes = await planHooks(api, localHooks, collections, projectId);
       allChanges.push(...changes);
     }
   }
@@ -2509,12 +2692,14 @@ async function apply(args) {
     console.log();
     return;
   }
-  await syncDeps(projectRoot);
+  if (!type || type === "collections") {
+    lintCollectionFiles(projectRoot, platformDir, name || void 0);
+  }
+  await syncDeps(projectRoot, { ignorePermissionDenied: true });
   let collections;
   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);
+    collections = buildCollectionIdMap(remoteCollections, appName);
   } catch {
     collections = /* @__PURE__ */ new Map();
   }
@@ -2525,8 +2710,8 @@ async function apply(args) {
   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 (localAutomations.length > 0) allChanges.push(...await planAutomations(api, localAutomations));
-  if (localHooks.length > 0) allChanges.push(...await planHooks(api, localHooks, collections));
+  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));
   if (localMailboxes.length > 0) allChanges.push(...await planMailboxes(api, localMailboxes));
   if (name) {
@@ -2540,7 +2725,7 @@ async function apply(args) {
   let willDeployApp = false;
   if (!type) {
     try {
-      if (existsSync(join(projectRoot, "dist")) || existsSync(join(projectRoot, "src"))) {
+      if (existsSync2(join2(projectRoot, "dist")) || existsSync2(join2(projectRoot, "src"))) {
         willDeployApp = true;
       }
     } catch {
@@ -2604,8 +2789,7 @@ async function apply(args) {
   }
   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);
+    collections = buildCollectionIdMap(remoteCollections, appName);
   } catch {
   }
   if (localAutomations.length > 0) {
@@ -2666,7 +2850,7 @@ async function pull(args) {
     let collections;
     try {
       const remoteCollections = await api.listCollections();
-      collections = new Map(remoteCollections.map((c) => [c.name, c.id]));
+      collections = buildCollectionIdMap(remoteCollections, appName);
     } catch {
       collections = /* @__PURE__ */ new Map();
     }
@@ -2682,7 +2866,7 @@ async function pull(args) {
     if (!type || type === "automations") {
       const localAutomations = loadLocalAutomations(platformDir, name || void 0, appName);
       if (localAutomations.length > 0) {
-        const changes = await planAutomations(api, localAutomations);
+        const changes = await planAutomations(api, localAutomations, projectId);
         for (const c of changes) {
           if (c.type === "update") conflicts.push(`automations/${c.name}`);
         }
@@ -2691,7 +2875,7 @@ async function pull(args) {
     if (!type || type === "hooks") {
       const localHooks = loadLocalHooks(platformDir, name || void 0, appName);
       if (localHooks.length > 0) {
-        const changes = await planHooks(api, localHooks, collections);
+        const changes = await planHooks(api, localHooks, collections, projectId);
         for (const c of changes) {
           if (c.type === "update") conflicts.push(`hooks/${c.name}`);
         }
@@ -2720,7 +2904,7 @@ async function pull(args) {
     console.log();
     if (!name && await projectResourceDepsEnabled(projectRoot)) {
       console.log(pc2.bold("  Resource shares:"));
-      await syncDeps(projectRoot, { write: true, legacyWhenDisabled: false });
+      await syncDeps(projectRoot, { write: true, legacyWhenDisabled: false, ignorePermissionDenied: true });
       console.log();
     }
   }
@@ -2970,7 +3154,10 @@ async function diff(args) {
     }
   } else if (type === "automations") {
     const localAutomations = loadLocalAutomations(platformDir, name, appName);
-    const remoteAutomations = await api.listAutomations({ include_code: true });
+    const remoteAutomations = await api.listAutomations({
+      include_code: true,
+      ...projectId ? { project_id: projectId } : {}
+    });
     const local = localAutomations[0];
     const localExtId = local?.automation.external_id;
     const remote = remoteAutomations.find(
@@ -3000,7 +3187,7 @@ async function diff(args) {
     }
   } else if (type === "hooks") {
     const localHooks = loadLocalHooks(platformDir, name, appName);
-    const remoteHooks = await api.listHooks();
+    const remoteHooks = await api.listHooks(projectId ? { project_id: projectId } : void 0);
     const local = localHooks[0];
     const localExtId = local?.hook.external_id;
     const remote = remoteHooks.find(

package/dist/{run-EJP5WCQU.js → run-C23KZI4Z.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2CR762KB.js";
 import {
   createApiClient
-} from "./chunk-JKXLKK5I.js";
+} from "./chunk-WY6UMJNI.js";
 import {
   findProjectRoot,
   getApiUrl,

package/dist/{skills-TNJHMV4F.js → skills-REOKLNEF.js}

@@ -8,7 +8,7 @@ import {
   slugToDirName,
   slugToFilename,
   syncClaudeMd
-} from "./chunk-AUYOTENF.js";
+} from "./chunk-HU7RYLUF.js";
 import "./chunk-ZH3NVYEQ.js";
 import "./chunk-FJFIWC7G.js";
 import "./chunk-PNKVD2UK.js";

package/package.json

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