deepspace 0.5.7 → 0.6.1

package/dist/cli.js

@@ -3,8 +3,8 @@
 // src/cli/cli.ts
 import { defineCommand as defineCommand22, runMain } from "citty";
 import { spawnSync as spawnSync6 } from "child_process";
-import { readFileSync as readFileSync17, existsSync as existsSync14 } from "fs";
-import { dirname as dirname5, join as join15 } from "path";
+import { readFileSync as readFileSync17, existsSync as existsSync15 } from "fs";
+import { dirname as dirname5, join as join16 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/cli/lib/cli-errors.ts
@@ -13,7 +13,9 @@ var API_ERROR_HINTS = {
   app_not_found: "App not found. Check the app id \u2014 the DEEPSPACE_APP_ID value in wrangler.toml, usually `app_\u2026` (a legacy app's id is its name). List your apps with `deepspace apps`. (`domain` commands take the deployed app *name* instead.)",
   not_app_owner_or_collaborator: "You must be the app owner or a collaborator to do this.",
   test_account_cannot_be_collaborator: "Test accounts cannot be added as collaborators. Use a real DeepSpace account.",
-  user_not_found: "No DeepSpace user with that email. They need to log in to DeepSpace at least once (`deepspace login`, or sign in to any app) before they can be referenced by email."
+  user_not_found: "No DeepSpace user with that email. They need to log in to DeepSpace at least once (`deepspace login`, or sign in to any app) before they can be referenced by email.",
+  insufficient_credits: "Out of credits. Inviting a new collaborator by email sends them a transactional email billed to your account \u2014 top up your credits and try again.",
+  invite_email_failed: "The invite email could not be sent. You were not charged \u2014 please try again in a moment."
 };
 function formatCliError(err) {
   const message = err instanceof Error ? err.message : String(err);
@@ -555,18 +557,27 @@ function mintAppId(now = Date.now()) {
   }
   return `app_${ts}${rs}`.slice(0, 30);
 }
-async function resolveOwnedAppId(deployUrl, token, appName) {
+async function resolveExistingAppId(deployUrl, token, appName) {
+  const headers = { Authorization: `Bearer ${token}` };
   try {
-    const res = await fetch(`${deployUrl}/api/apps`, {
-      headers: { Authorization: `Bearer ${token}` }
-    });
-    if (!res.ok) return null;
-    const body = await res.json();
-    const match = body.apps?.find((a) => a.name === appName);
-    return match?.appId ?? null;
+    const res = await fetch(`${deployUrl}/api/apps`, { headers });
+    if (res.ok) {
+      const body = await res.json();
+      const match = body.apps?.find((a) => a.name === appName);
+      if (match?.appId) return { kind: "adopted", appId: match.appId, owned: true };
+    }
+  } catch {
+  }
+  try {
+    const res = await fetch(
+      `${deployUrl}/api/apps/${encodeURIComponent(appName)}/analytics?period=1h`,
+      { headers }
+    );
+    if (res.ok) return { kind: "adopted", appId: appName, owned: false };
+    if (res.status === 403) return { kind: "taken" };
   } catch {
-    return null;
   }
+  return { kind: "none" };
 }
 function readAppId(cwd = process.cwd(), wranglerEnv) {
   const wranglerPath = join(resolve(cwd), "wrangler.toml");
@@ -1331,7 +1342,7 @@ var logout_default = defineCommand2({
 
 // src/cli/commands/dev.ts
 import { defineCommand as defineCommand3 } from "citty";
-import { resolve as resolve4, basename as basename2, join as join9 } from "path";
+import { resolve as resolve4, basename as basename2, join as join10 } from "path";
 import spawn from "cross-spawn";
 
 // src/cli/auth.ts
@@ -1777,6 +1788,112 @@ function removeMacosJunk(dir) {
   return removed;
 }
 
+// src/cli/lib/schema-lint.ts
+import { existsSync as existsSync9 } from "fs";
+import { join as join9 } from "path";
+import { pathToFileURL } from "url";
+
+// src/server/schemas/registry.ts
+var USERS_COLUMNS = [
+  { name: "email", storage: "text", interpretation: "plain" },
+  { name: "name", storage: "text", interpretation: "plain" },
+  { name: "imageUrl", storage: "text", interpretation: "plain" },
+  { name: "role", storage: "text", interpretation: "plain" },
+  { name: "createdAt", storage: "text", interpretation: { kind: "datetime" } },
+  { name: "lastSeenAt", storage: "text", interpretation: { kind: "datetime" } }
+];
+var BASE_USERS_SCHEMA = {
+  name: "users",
+  columns: [...USERS_COLUMNS],
+  permissions: {
+    "*": { read: "own", create: false, update: false, delete: false },
+    admin: { read: true, create: false, update: true, delete: true }
+  }
+};
+function lintSchema(schema) {
+  const warnings = [];
+  const VISIBILITY_AWARE = ["published", "shared"];
+  if (schema.visibilityField) {
+    const offendingRoles = Object.entries(schema.permissions).filter(([, perms]) => perms.read === true).map(([role]) => role);
+    if (offendingRoles.length > 0) {
+      const usesAware = Object.values(schema.permissions).some(
+        (p10) => typeof p10.read === "string" && VISIBILITY_AWARE.includes(p10.read)
+      );
+      if (!usesAware) {
+        warnings.push(
+          `[${schema.name}] visibilityField is declared but no role uses read: 'published' or 'shared'. Roles with read: true (${offendingRoles.join(", ")}) will see every row regardless of visibility. Change those to read: 'published' (owner OR public) or 'shared' (owner OR collaborator OR public) to actually enforce the filter, or remove visibilityField if you don't intend to gate reads by it.`
+        );
+      }
+    }
+  }
+  if (schema.ownerField) {
+    const col = schema.columns.find((c) => c.name === schema.ownerField);
+    if (col && !col.userBound) {
+      warnings.push(
+        `[${schema.name}] ownerField is '${schema.ownerField}' but that column is not marked userBound: true. A client can create a row with someone else's id in this field, bypassing 'own' permission checks. Add userBound: true (and ideally immutable: true) to the column.`
+      );
+    }
+  }
+  for (const col of schema.columns) {
+    if (col.userBound && col.storage !== "text") {
+      warnings.push(
+        `[${schema.name}] column '${col.name}' is userBound but storage is '${col.storage}'. userBound stamps the user id (a string); use storage: 'text'.`
+      );
+    }
+  }
+  return warnings;
+}
+
+// src/cli/lib/schema-lint.ts
+async function lintProjectSchemas(appDir) {
+  const schemasPath = join9(appDir, "src", "schemas.ts");
+  if (!existsSync9(schemasPath)) return null;
+  let schemas;
+  try {
+    const esbuild = await import("esbuild");
+    const outFile = join9(appDir, ".wrangler", "deploy", "schemas.lint.bundle.mjs");
+    await esbuild.build({
+      entryPoints: [schemasPath],
+      bundle: true,
+      format: "esm",
+      platform: "node",
+      target: "node18",
+      outfile: outFile,
+      logLevel: "silent",
+      write: true
+    });
+    const mod = await import(`${pathToFileURL(outFile).href}?t=${Date.now()}`);
+    schemas = mod.schemas;
+  } catch {
+    console.warn(
+      "Schema lint skipped: could not bundle src/schemas.ts (the worker still lints at runtime)."
+    );
+    return null;
+  }
+  if (!Array.isArray(schemas)) return null;
+  const findings = [];
+  for (const schema of schemas) {
+    if (!schema || typeof schema !== "object") continue;
+    try {
+      findings.push(...lintSchema(schema));
+    } catch {
+    }
+  }
+  return findings;
+}
+var MAX_PRINTED_FINDINGS = 5;
+function formatSchemaLintFindings(findings) {
+  if (findings.length === 0) return [];
+  const n = findings.length;
+  const shown = findings.slice(0, MAX_PRINTED_FINDINGS);
+  const hidden = n - shown.length;
+  return [
+    `Schema lint: ${n} warning${n === 1 ? "" : "s"} in src/schemas.ts \u2014 ${n === 1 ? "this ships" : "these ship"} as permission/privacy bugs:`,
+    ...shown.map((f) => `  \u2022 ${f}`),
+    ...hidden > 0 ? [`  \u2026and ${hidden} more \u2014 fix the above and re-run to see the rest.`] : []
+  ];
+}
+
 // src/cli/lib/port.ts
 import { createServer } from "net";
 var DEFAULT_PORT = 5173;
@@ -1863,7 +1980,7 @@ var dev_default = defineCommand3({
         );
       } else {
         console.warn(
-          `Warning: could not update ${join9(worktree.mainRepoRoot, ".claude", "launch.json")} (malformed or unwritable) \u2014 the Claude preview tool may serve the main repo's code instead of this worktree.`
+          `Warning: could not update ${join10(worktree.mainRepoRoot, ".claude", "launch.json")} (malformed or unwritable) \u2014 the Claude preview tool may serve the main repo's code instead of this worktree.`
         );
       }
       if (!explicitPort && process.env.DEEPSPACE_PORT) {
@@ -1876,6 +1993,10 @@ var dev_default = defineCommand3({
       updatePort: explicitPort
     });
     ensureInstallReady(appDir);
+    const lintFindings = await lintProjectSchemas(appDir);
+    if (lintFindings && lintFindings.length > 0) {
+      for (const line of formatSchemaLintFindings(lintFindings)) console.warn(line);
+    }
     let token;
     try {
       token = await ensureToken();
@@ -2463,15 +2584,15 @@ var screenshot_default = defineCommand6({
 // src/cli/commands/test-accounts.ts
 import { defineCommand as defineCommand7 } from "citty";
 import * as p3 from "@clack/prompts";
-import { readFileSync as readFileSync10, writeFileSync as writeFileSync8, existsSync as existsSync9, mkdirSync as mkdirSync4 } from "fs";
-import { join as join10 } from "path";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync8, existsSync as existsSync10, mkdirSync as mkdirSync4 } from "fs";
+import { join as join11 } from "path";
 import { homedir as homedir4 } from "os";
 var SESSION_COOKIE2 = "__Secure-better-auth.session_token";
 var AUTH_URL4 = process.env.DEEPSPACE_AUTH_URL ?? PLATFORM_URLS.auth;
-var DIR3 = join10(homedir4(), ".deepspace");
-var ACCOUNTS_PATH = join10(DIR3, "test-accounts.json");
+var DIR3 = join11(homedir4(), ".deepspace");
+var ACCOUNTS_PATH = join11(DIR3, "test-accounts.json");
 function loadAccounts() {
-  if (!existsSync9(ACCOUNTS_PATH)) return [];
+  if (!existsSync10(ACCOUNTS_PATH)) return [];
   try {
     return JSON.parse(readFileSync10(ACCOUNTS_PATH, "utf-8"));
   } catch {
@@ -2753,9 +2874,9 @@ var test_accounts_default = defineCommand7({
 import { defineCommand as defineCommand8 } from "citty";
 import { execSync as execSync2 } from "child_process";
 import { randomUUID } from "crypto";
-import { readFileSync as readFileSync11, readdirSync as readdirSync4, existsSync as existsSync10 } from "fs";
-import { join as join11, resolve as resolve7, dirname as dirname2 } from "path";
-import { pathToFileURL } from "url";
+import { readFileSync as readFileSync11, readdirSync as readdirSync4, existsSync as existsSync11 } from "fs";
+import { join as join12, resolve as resolve7, dirname as dirname2 } from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
 import * as p4 from "@clack/prompts";
 var DEPLOY_URL3 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
 var API_URL2 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
@@ -2893,6 +3014,11 @@ var deploy_default = defineCommand8({
       type: "boolean",
       description: "Deploy even though hand-edited .dev.vars secrets are absent from the store (they will NOT be deployed, and any a previous deploy set are dropped).",
       default: false
+    },
+    adopt: {
+      type: "boolean",
+      description: "Confirm adopting an existing app you can deploy but do not own (collaborator/admin on-behalf) when wrangler.toml has no DEEPSPACE_APP_ID. Without this flag an interactive prompt asks.",
+      default: false
     }
   },
   async run({ args }) {
@@ -2932,16 +3058,37 @@ var deploy_default = defineCommand8({
       process.exit(1);
     }
     if (!appId) {
-      const adopted = await resolveOwnedAppId(DEPLOY_URL3, token, appName);
-      appId = adopted ?? mintAppId();
+      const existing = await resolveExistingAppId(DEPLOY_URL3, token, appName);
+      if (existing.kind === "taken") {
+        p4.cancel(
+          `"${appName}" is taken by an app you don't have deploy access to. Ask the owner to add you as a collaborator (\`deepspace collaborators add\`), or pick a different \`name\` in wrangler.toml.`
+        );
+        process.exit(1);
+      }
+      if (existing.kind === "adopted" && !existing.owned && !args.adopt) {
+        if (!process.stdin.isTTY) {
+          p4.cancel(
+            `"${appName}" is an existing app owned by another account that you can deploy on-behalf (collaborator/admin). Confirmation needs an interactive terminal \u2014 re-run with --adopt to deploy it, or pick a different \`name\` in wrangler.toml if you meant a new app.`
+          );
+          process.exit(1);
+        }
+        const yes = await p4.confirm({
+          message: `"${appName}" is an existing app owned by another account that you can deploy on-behalf (you are a collaborator or admin). Deploy it? (Meant a new app? Pick a different \`name\` in wrangler.toml.)`
+        });
+        if (p4.isCancel(yes) || !yes) {
+          p4.cancel("Deploy cancelled.");
+          process.exit(1);
+        }
+      }
+      appId = existing.kind === "adopted" ? existing.appId : mintAppId();
       writeAppId(appDir, appId, { wranglerEnv: envName });
       p4.log.info(
-        adopted ? `Adopted existing app id ${appId} for ${appName} \u2014 commit wrangler.toml.` : `Minted app id ${appId} \u2014 commit wrangler.toml.`
+        existing.kind === "adopted" ? `Adopted existing app id ${appId} for ${appName} \u2014 commit wrangler.toml.` : `Minted app id ${appId} \u2014 commit wrangler.toml.`
       );
     }
     p4.log.info(`Id: ${appId}`);
     const readCustomDevVarsAt = (path) => {
-      if (!existsSync10(path)) return {};
+      if (!existsSync11(path)) return {};
       const section = extractCustomDevVars(stripGeneratedSecretsCache(readFileSync11(path, "utf-8")));
       if (!section) return {};
       try {
@@ -2980,6 +3127,10 @@ var deploy_default = defineCommand8({
     }
     const junk = removeMacosJunk(appDir);
     if (junk > 0) p4.log.info(`Removed ${junk} macOS metadata file(s) (._*, .DS_Store)`);
+    const lintFindings = await lintProjectSchemas(appDir);
+    if (lintFindings && lintFindings.length > 0) {
+      p4.log.warn(formatSchemaLintFindings(lintFindings).join("\n"));
+    }
     const s = createSpinner();
     s.start("Building...");
     let preparedWranglerConfig;
@@ -3002,14 +3153,14 @@ var deploy_default = defineCommand8({
       preparedWranglerConfig?.cleanup();
     }
     s.stop("Built");
-    const deployConfigPath = join11(appDir, ".wrangler", "deploy", "config.json");
-    if (!existsSync10(deployConfigPath)) {
+    const deployConfigPath = join12(appDir, ".wrangler", "deploy", "config.json");
+    if (!existsSync11(deployConfigPath)) {
       p4.cancel("Build output config not found at .wrangler/deploy/config.json");
       process.exit(1);
     }
     const deployConfig = JSON.parse(readFileSync11(deployConfigPath, "utf-8"));
     const outputWranglerPath = resolve7(dirname2(deployConfigPath), deployConfig.configPath);
-    if (!existsSync10(outputWranglerPath)) {
+    if (!existsSync11(outputWranglerPath)) {
       p4.cancel(`Output wrangler.json not found at ${outputWranglerPath}`);
       process.exit(1);
     }
@@ -3022,13 +3173,13 @@ var deploy_default = defineCommand8({
       process.exit(1);
     }
     const workerDir = dirname2(outputWranglerPath);
-    const workerBundlePath = join11(workerDir, outputConfig.main);
+    const workerBundlePath = join12(workerDir, outputConfig.main);
     const clientDir = outputConfig.assets?.directory ? resolve7(workerDir, outputConfig.assets.directory) : null;
-    if (!existsSync10(workerBundlePath)) {
+    if (!existsSync11(workerBundlePath)) {
       p4.cancel(`Worker bundle not found at ${workerBundlePath}`);
       process.exit(1);
     }
-    if (!clientDir || !existsSync10(clientDir)) {
+    if (!clientDir || !existsSync11(clientDir)) {
       p4.cancel(`Client assets not found at ${clientDir}`);
       process.exit(1);
     }
@@ -3263,13 +3414,13 @@ then redeploy. (Pass --allow-missing-secrets to deploy without them.)`
   }
 });
 async function syncSubscriptionPlans(appDir, appName, token) {
-  const subsPath = join11(appDir, "src", "subscriptions.ts");
-  if (!existsSync10(subsPath)) return;
+  const subsPath = join12(appDir, "src", "subscriptions.ts");
+  if (!existsSync11(subsPath)) return;
   let plans;
   try {
     const esbuild = await import("esbuild");
-    const outDir = join11(appDir, ".wrangler", "deploy");
-    const outFile = join11(outDir, "subscriptions.bundle.mjs");
+    const outDir = join12(appDir, ".wrangler", "deploy");
+    const outFile = join12(outDir, "subscriptions.bundle.mjs");
     await esbuild.build({
       entryPoints: [subsPath],
       bundle: true,
@@ -3280,7 +3431,7 @@ async function syncSubscriptionPlans(appDir, appName, token) {
       logLevel: "silent",
       write: true
     });
-    const mod = await import(`${pathToFileURL(outFile).href}?t=${Date.now()}`);
+    const mod = await import(`${pathToFileURL2(outFile).href}?t=${Date.now()}`);
     plans = mod.subscriptionPlans;
   } catch (err) {
     p4.log.warn(`Could not load src/subscriptions.ts: ${errMessage(err)}`);
@@ -3411,13 +3562,13 @@ current billing period? (Skip to leave them grandfathered.)`
   }
 }
 async function syncOneTimeProducts(appDir, appName, token) {
-  const productsPath = join11(appDir, "src", "products.ts");
-  if (!existsSync10(productsPath)) return;
+  const productsPath = join12(appDir, "src", "products.ts");
+  if (!existsSync11(productsPath)) return;
   let products;
   try {
     const esbuild = await import("esbuild");
-    const outDir = join11(appDir, ".wrangler", "deploy");
-    const outFile = join11(outDir, "products.bundle.mjs");
+    const outDir = join12(appDir, ".wrangler", "deploy");
+    const outFile = join12(outDir, "products.bundle.mjs");
     await esbuild.build({
       entryPoints: [productsPath],
       bundle: true,
@@ -3428,7 +3579,7 @@ async function syncOneTimeProducts(appDir, appName, token) {
       logLevel: "silent",
       write: true
     });
-    const mod = await import(`${pathToFileURL(outFile).href}?t=${Date.now()}`);
+    const mod = await import(`${pathToFileURL2(outFile).href}?t=${Date.now()}`);
     products = mod.oneTimeProducts;
   } catch (err) {
     p4.log.warn(`Could not load src/products.ts: ${errMessage(err)}`);
@@ -3492,7 +3643,7 @@ function collectAssets(dir) {
   function walk(d, prefix) {
     for (const entry of readdirSync4(d, { withFileTypes: true })) {
       if (entry.name === ".assetsignore") continue;
-      const full = join11(d, entry.name);
+      const full = join12(d, entry.name);
       const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
         walk(full, rel);
@@ -3673,26 +3824,26 @@ var apps_default = defineCommand11({
 
 // src/cli/commands/add.ts
 import { defineCommand as defineCommand12 } from "citty";
-import { existsSync as existsSync11, readFileSync as readFileSync12 } from "fs";
-import { resolve as resolve8, join as join12, dirname as dirname3 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync12 } from "fs";
+import { resolve as resolve8, join as join13, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 import { spawnSync as spawnSync5 } from "child_process";
 function findScript(from) {
-  const inNodeModules = join12(from, "node_modules", "deepspace", "scripts", "add-feature.cjs");
-  if (existsSync11(inNodeModules)) return inNodeModules;
-  const inDotDeepspace = join12(from, ".deepspace", "scripts", "add-feature.cjs");
-  if (existsSync11(inDotDeepspace)) return inDotDeepspace;
+  const inNodeModules = join13(from, "node_modules", "deepspace", "scripts", "add-feature.cjs");
+  if (existsSync12(inNodeModules)) return inNodeModules;
+  const inDotDeepspace = join13(from, ".deepspace", "scripts", "add-feature.cjs");
+  if (existsSync12(inDotDeepspace)) return inDotDeepspace;
   return null;
 }
 function runningScript() {
   const here = dirname3(fileURLToPath(import.meta.url));
-  const script = join12(here, "..", "scripts", "add-feature.cjs");
-  return existsSync11(script) ? script : null;
+  const script = join13(here, "..", "scripts", "add-feature.cjs");
+  return existsSync12(script) ? script : null;
 }
 function isDeepSpaceApp(dir) {
-  if (existsSync11(join12(dir, "wrangler.toml"))) return true;
-  const pkgPath = join12(dir, "package.json");
-  if (!existsSync11(pkgPath)) return false;
+  if (existsSync12(join13(dir, "wrangler.toml"))) return true;
+  const pkgPath = join13(dir, "package.json");
+  if (!existsSync12(pkgPath)) return false;
   try {
     const pkg2 = JSON.parse(readFileSync12(pkgPath, "utf-8"));
     return Boolean(pkg2.dependencies?.deepspace || pkg2.devDependencies?.deepspace);
@@ -3753,7 +3904,7 @@ var add_default = defineCommand12({
       const passArgs2 = args.list ? ["--list"] : args.info ? ["--info", String(args.info)] : ["--help"];
       runInstaller(script2, passArgs2, process.cwd());
     }
-    if (!existsSync11(appDir)) {
+    if (!existsSync12(appDir)) {
       console.error(`Target directory not found: ${appDir}`);
       console.error("Create a new app first: deepspace create <name>");
       process.exit(1);
@@ -3769,8 +3920,8 @@ var add_default = defineCommand12({
     if (!script) {
       console.error("Could not find the deepspace feature installer.");
       console.error("Looked in:");
-      console.error(`  ${join12(appDir, "node_modules", "deepspace", "scripts", "add-feature.cjs")}`);
-      console.error(`  ${join12(appDir, ".deepspace", "scripts", "add-feature.cjs")}`);
+      console.error(`  ${join13(appDir, "node_modules", "deepspace", "scripts", "add-feature.cjs")}`);
+      console.error(`  ${join13(appDir, ".deepspace", "scripts", "add-feature.cjs")}`);
       console.error("Are you in a DeepSpace app directory? Try `npm install` first.");
       process.exit(1);
     }
@@ -4131,30 +4282,35 @@ var list3 = defineCommand14({
   async run({ args }) {
     const token = await ensureToken();
     const app = await resolveAppTarget(DEPLOY_URL6, token, args.app);
-    const { collaborators } = await api2(
-      token,
-      `/api/app-collaborators/${encodeURIComponent(app)}`
-    );
+    const { collaborators, pending = [] } = await api2(token, `/api/app-collaborators/${encodeURIComponent(app)}`);
     if (args.json) {
-      process.stdout.write(JSON.stringify(collaborators, null, 2) + "\n");
+      process.stdout.write(JSON.stringify({ collaborators, pending }, null, 2) + "\n");
       return;
     }
-    if (!collaborators.length) {
+    if (!collaborators.length && !pending.length) {
       console.log(`No collaborators on ${app}. Add one with \`deepspace collaborators add <email>\`.`);
       return;
     }
-    console.log(`COLLABORATORS ON ${app}`);
-    for (const c of collaborators) {
-      console.log(`  ${c.emailDisplay}`);
+    if (collaborators.length) {
+      console.log(`COLLABORATORS ON ${app}`);
+      for (const c of collaborators) {
+        console.log(`  ${c.emailDisplay}`);
+      }
+    }
+    if (pending.length) {
+      console.log(`PENDING INVITES ON ${app}`);
+      for (const p10 of pending) {
+        console.log(`  ${p10.email} (expires ${new Date(p10.expiresAt).toLocaleDateString()})`);
+      }
     }
   }
 });
 var add = defineCommand14({
-  meta: { name: "add", description: "Authorize a DeepSpace user to deploy your app" },
+  meta: { name: "add", description: "Authorize someone to deploy your app" },
   args: {
     email: {
       type: "positional",
-      description: "Collaborator email (must already be a DeepSpace user)",
+      description: "Collaborator email",
       required: true
     },
     app: { type: "string", alias: "a", description: "App id or name (defaults to ./wrangler.toml)" },
@@ -4169,16 +4325,29 @@ var add = defineCommand14({
       );
       process.exit(1);
     }
-    const { collaborator } = await api2(
+    const res = await api2(
       token,
       `/api/app-collaborators/${encodeURIComponent(app)}`,
       { method: "POST", body: JSON.stringify({ email: args.email }) }
     );
     if (args.json) {
-      process.stdout.write(JSON.stringify(collaborator, null, 2) + "\n");
+      process.stdout.write(JSON.stringify(res, null, 2) + "\n");
       return;
     }
-    console.log(`\u2713 ${collaborator.emailDisplay} can now deploy ${app}`);
+    if (res.status === "invited" || res.status === "already_invited") {
+      const expires = new Date(res.expiresAt).toLocaleDateString();
+      if (res.status === "already_invited") {
+        console.log(
+          `\u2022 ${res.email} already has a pending invite (expires ${expires}). No new email was sent. Cancel it with \`deepspace collaborators cancel ${res.email}\` to reset.`
+        );
+        return;
+      }
+      console.log(
+        `\u2713 Invite sent to ${res.email} (expires ${expires}). They become a collaborator when they sign in.`
+      );
+      return;
+    }
+    console.log(`\u2713 ${res.collaborator.emailDisplay} can now deploy ${app}`);
   }
 });
 var remove = defineCommand14({
@@ -4213,9 +4382,41 @@ var remove = defineCommand14({
     console.log(`\u2713 ${found.emailDisplay} can no longer deploy ${app}`);
   }
 });
+var cancel4 = defineCommand14({
+  meta: { name: "cancel", description: "Cancel a pending (un-accepted) email invite" },
+  args: {
+    email: { type: "positional", description: "Invited email", required: true },
+    app: { type: "string", alias: "a", description: "App id or name (defaults to ./wrangler.toml)" },
+    json: { type: "boolean", description: "Emit JSON" }
+  },
+  async run({ args }) {
+    const token = await ensureToken();
+    const app = await resolveAppTarget(DEPLOY_URL6, token, args.app);
+    const { pending = [] } = await api2(
+      token,
+      `/api/app-collaborators/${encodeURIComponent(app)}`
+    );
+    const target = args.email.trim().toLowerCase();
+    const found = pending.find((p10) => p10.email.toLowerCase() === target);
+    if (!found) {
+      console.error(`${args.email} has no pending invite on ${app}`);
+      process.exit(1);
+    }
+    await api2(
+      token,
+      `/api/app-collaborators/${encodeURIComponent(app)}/pending/${encodeURIComponent(found.email)}`,
+      { method: "DELETE" }
+    );
+    if (args.json) {
+      process.stdout.write(JSON.stringify({ cancelled: found }, null, 2) + "\n");
+      return;
+    }
+    console.log(`\u2713 Cancelled the pending invite to ${found.email} on ${app}`);
+  }
+});
 var collaborators_default = defineCommand14({
   meta: { name: "collaborators", description: "Manage who can deploy your app" },
-  subCommands: { list: list3, add, remove }
+  subCommands: { list: list3, add, remove, cancel: cancel4 }
 });
 
 // src/cli/commands/transfer.ts
@@ -4304,7 +4505,7 @@ var accept = defineCommand15({
     );
   }
 });
-var cancel4 = defineCommand15({
+var cancel5 = defineCommand15({
   meta: { name: "cancel", description: "Cancel/decline the pending offer (either party)" },
   args: {
     app: { type: "string", alias: "a", description: "App id or name (defaults to ./wrangler.toml)" }
@@ -4318,7 +4519,7 @@ var cancel4 = defineCommand15({
 });
 var transfer_default = defineCommand15({
   meta: { name: "transfer", description: "Transfer app ownership to another user" },
-  subCommands: { offer, status: status2, accept, cancel: cancel4 }
+  subCommands: { offer, status: status2, accept, cancel: cancel5 }
 });
 
 // src/cli/commands/integrations.ts
@@ -4746,8 +4947,8 @@ var invoke_default = defineCommand17({
 
 // src/cli/commands/library.ts
 import { defineCommand as defineCommand18 } from "citty";
-import { existsSync as existsSync12, readFileSync as readFileSync14 } from "fs";
-import { join as join13, resolve as resolve9 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync14 } from "fs";
+import { join as join14, resolve as resolve9 } from "path";
 import { parse as parseToml4 } from "smol-toml";
 import * as p8 from "@clack/prompts";
 var DEFAULT_LIBRARY_APP = "deepdotspace-site";
@@ -4825,8 +5026,8 @@ var publish = defineCommand18({
     let appName = typeof args.app === "string" && args.app.trim() ? args.app.trim() : void 0;
     if (!appName) {
       const appDir = resolve9(typeof args.dir === "string" && args.dir ? args.dir : ".");
-      const wranglerPath = join13(appDir, "wrangler.toml");
-      if (!existsSync12(wranglerPath)) {
+      const wranglerPath = join14(appDir, "wrangler.toml");
+      if (!existsSync13(wranglerPath)) {
         return die("No --app provided and no wrangler.toml found. Either pass --app <name> or run from your app's directory.");
       }
       const cfg = parseToml4(readFileSync14(wranglerPath, "utf-8"));
@@ -4963,8 +5164,8 @@ var library_default = defineCommand18({
 // src/cli/commands/feedback.ts
 import { defineCommand as defineCommand19 } from "citty";
 import * as p9 from "@clack/prompts";
-import { existsSync as existsSync13, readFileSync as readFileSync15 } from "fs";
-import { dirname as dirname4, join as join14 } from "path";
+import { existsSync as existsSync14, readFileSync as readFileSync15 } from "fs";
+import { dirname as dirname4, join as join15 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { release } from "os";
 var API_URL7 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
@@ -4987,11 +5188,11 @@ function readCliVersion() {
   try {
     const here = dirname4(fileURLToPath2(import.meta.url));
     const candidates = [
-      join14(here, "..", "package.json"),
-      join14(here, "..", "..", "..", "package.json")
+      join15(here, "..", "package.json"),
+      join15(here, "..", "..", "..", "package.json")
     ];
     for (const path of candidates) {
-      if (!existsSync13(path)) continue;
+      if (!existsSync14(path)) continue;
       const pkg2 = JSON.parse(readFileSync15(path, "utf-8"));
       if (pkg2.name === "deepspace" && pkg2.version) return pkg2.version;
     }
@@ -5609,8 +5810,8 @@ var init_default = defineCommand21({
 
 // src/cli/cli.ts
 var __dirname = dirname5(fileURLToPath3(import.meta.url));
-var pkg = JSON.parse(readFileSync17(join15(__dirname, "..", "package.json"), "utf-8"));
-if (process.platform === "linux" && !process.env.SSL_CERT_FILE && existsSync14("/etc/ssl/certs/ca-certificates.crt")) {
+var pkg = JSON.parse(readFileSync17(join16(__dirname, "..", "package.json"), "utf-8"));
+if (process.platform === "linux" && !process.env.SSL_CERT_FILE && existsSync15("/etc/ssl/certs/ca-certificates.crt")) {
   process.env.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
 }
 var create2 = defineCommand22({