deepspace 0.5.7 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # deepspace
 
+## 0.6.0
+
+### Minor Changes
+
+- `deepspace collaborators add <email>` can now invite someone who isn't a DeepSpace user yet: it sends them an email invitation (billed to the app owner) and they become a collaborator when they sign in and accept it. The new `deepspace collaborators cancel <email>` rescinds a pending invite, and `collaborators list` now shows outstanding invites alongside active collaborators.
+
+### Patch Changes
+
+- `deepspace deploy` on a repo without `DEEPSPACE_APP_ID` no longer silently mints a fresh id destined for a route-claim collision when the name belongs to an existing app. Adoption now also recognizes legacy name-as-id apps the caller deploys on-behalf (collaborator or admin): adopting an app you own stays automatic; adopting one you _don't_ own asks for confirmation (or `--adopt` for non-interactive runs); a name owned by an app you can't deploy fails up front with the real reason.
+
 ## 0.5.7
 
 ### Patch Changes

package/dist/cli.js

@@ -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");
@@ -2893,6 +2904,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,11 +2948,32 @@ 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}`);
@@ -4131,30 +4168,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 +4211,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;
+    }
+    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 ${collaborator.emailDisplay} can now deploy ${app}`);
+    console.log(`\u2713 ${res.collaborator.emailDisplay} can now deploy ${app}`);
   }
 });
 var remove = defineCommand14({
@@ -4213,9 +4268,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 +4391,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 +4405,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