deepspace 0.5.2 → 0.5.4

package/dist/cli.js

@@ -13,7 +13,7 @@ var API_ERROR_HINTS = {
   app_not_found: "App not found. Check the app name (wrangler.toml `name`) and that it has been deployed.",
   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. New users must sign in and use DeepSpace once (e.g. run `deepspace whoami`) 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."
 };
 function formatCliError(err) {
   const message = err instanceof Error ? err.message : String(err);
@@ -277,7 +277,7 @@ async function refreshSecretsCache(deployUrl, token, appId, wranglerEnv) {
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { join, resolve } from "path";
 import { parse as parseToml } from "smol-toml";
-var APP_ID_RE = /^app_[0-9A-HJKMNP-TV-Z]{26}$/;
+var APP_ID_RE = /^(app_[0-9A-HJKMNP-TV-Z]{26}|[a-z0-9][a-z0-9_-]{0,63})$/;
 var CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
 function mintAppId(now = Date.now()) {
   let ts = "";
@@ -301,6 +301,19 @@ function mintAppId(now = Date.now()) {
   }
   return `app_${ts}${rs}`.slice(0, 30);
 }
+async function resolveOwnedAppId(deployUrl, token, appName) {
+  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;
+  } catch {
+    return null;
+  }
+}
 function readAppId(cwd = process.cwd(), wranglerEnv) {
   const wranglerPath = join(resolve(cwd), "wrangler.toml");
   if (!existsSync(wranglerPath)) return null;
@@ -862,6 +875,7 @@ function openBrowser(url) {
 
 // src/cli/commands/login.ts
 var AUTH_URL = process.env.DEEPSPACE_AUTH_URL ?? PLATFORM_URLS.auth;
+var API_URL = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
 var login_default = defineCommand({
   meta: {
     name: "login",
@@ -920,6 +934,7 @@ var login_default = defineCommand({
       process.exit(1);
     }
     storeCredentials(result.sessionToken, result.jwt);
+    await provisionProfile(result.jwt);
     s.stop("Authenticated");
     p2.log.success(`Logged in as ${result.name ?? result.email}`);
     p2.note(
@@ -963,6 +978,12 @@ function storeCredentials(sessionToken, jwt) {
   writeFileSync5(join3(dir, "session"), sessionToken, { mode: 384 });
   writeFileSync5(join3(dir, "token"), jwt, { mode: 384 });
 }
+async function provisionProfile(jwt) {
+  try {
+    await fetch(`${API_URL}/api/users/me`, { headers: { Authorization: `Bearer ${jwt}` } });
+  } catch {
+  }
+}
 function sleep(ms) {
   return new Promise((resolve10) => setTimeout(resolve10, ms));
 }
@@ -991,6 +1012,7 @@ async function doEmailLogin(email, password) {
     throw new Error("JWT issuance failed");
   }
   storeCredentials(sessionToken, jwt);
+  await provisionProfile(jwt);
 }
 
 // src/cli/commands/logout.ts
@@ -2412,7 +2434,7 @@ function asObjectArray(v) {
 
 // src/cli/commands/deploy.ts
 var DEPLOY_URL3 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
-var API_URL = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
+var API_URL2 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
 var CLOUDFLARE_DEPLOY_ERROR_HINT = "Deployment reached the DeepSpace deploy worker, but Cloudflare's deployment control-plane API failed. This is often caused by a Cloudflare Dashboard/API incident or Workers for Platforms entitlement outage. Already deployed apps should keep serving; wait for Cloudflare to recover and retry.";
 var RESERVED_RUN_WORKER_FIRST = /* @__PURE__ */ new Set([
   "/api/*",
@@ -2562,13 +2584,7 @@ var deploy_default = defineCommand8({
     }
     const appName = nameRes.name;
     let appId = readAppId(appDir, envName);
-    if (!appId) {
-      appId = mintAppId();
-      writeAppId(appDir, appId, { wranglerEnv: envName });
-      p4.log.info(`Minted app id ${appId} \u2014 commit wrangler.toml.`);
-    }
     p4.log.info(envName ? `App: ${appName}  (env: ${envName})` : `App: ${appName}`);
-    p4.log.info(`Id: ${appId}`);
     let token;
     let ownerId;
     try {
@@ -2578,6 +2594,15 @@ var deploy_default = defineCommand8({
       p4.cancel(errMessage(err));
       process.exit(1);
     }
+    if (!appId) {
+      const adopted = await resolveOwnedAppId(DEPLOY_URL3, token, appName);
+      appId = adopted ?? 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.`
+      );
+    }
+    p4.log.info(`Id: ${appId}`);
     let linkedSecrets = null;
     try {
       const refreshed = await refreshSecretsCache(DEPLOY_URL3, token, appId, envName);
@@ -2935,7 +2960,7 @@ async function syncSubscriptionPlans(appDir, appName, token) {
   s.start("Syncing subscription plans...");
   let res;
   try {
-    res = await fetch(`${API_URL}/api/subscriptions/sync`, {
+    res = await fetch(`${API_URL2}/api/subscriptions/sync`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -3009,7 +3034,7 @@ current billing period? (Skip to leave them grandfathered.)`
     let stopped = false;
     try {
       while (iteration < MAX_ITERATIONS) {
-        const res = await fetch(`${API_URL}/api/subscriptions/admin-cancel`, {
+        const res = await fetch(`${API_URL2}/api/subscriptions/admin-cancel`, {
           method: "POST",
           headers: {
             Authorization: `Bearer ${token}`,
@@ -3083,7 +3108,7 @@ async function syncOneTimeProducts(appDir, appName, token) {
   s?.start("Syncing one-time products...");
   let res;
   try {
-    res = await fetch(`${API_URL}/api/charges/products/sync`, {
+    res = await fetch(`${API_URL2}/api/charges/products/sync`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -3449,8 +3474,8 @@ async function apiFetch(baseUrl, token, path, init) {
 }
 
 // src/cli/commands/domain.ts
-var API_URL2 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
-var api = (token, path, init) => apiFetch(API_URL2, token, path, init);
+var API_URL3 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
+var api = (token, path, init) => apiFetch(API_URL3, token, path, init);
 function scrubInternal(value) {
   if (Array.isArray(value)) return value.map(scrubInternal);
   if (value && typeof value === "object") {
@@ -3784,9 +3809,9 @@ function isTestAccountEmail(email) {
 }
 
 // src/cli/commands/collaborators.ts
-var API_URL3 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
+var API_URL4 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
 function api2(token, path, init) {
-  return apiFetch(API_URL3, token, path, init);
+  return apiFetch(API_URL4, token, path, init);
 }
 var list3 = defineCommand14({
   meta: { name: "list", description: "List collaborators on your app" },
@@ -3885,7 +3910,7 @@ var collaborators_default = defineCommand14({
 
 // src/cli/commands/transfer.ts
 import { defineCommand as defineCommand15 } from "citty";
-var API_URL4 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
+var API_URL5 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
 var DEPLOY_URL5 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
 var offer = defineCommand15({
   meta: { name: "offer", description: "Offer this app to another DeepSpace user" },
@@ -3897,7 +3922,7 @@ var offer = defineCommand15({
     const token = await ensureToken();
     const app = requireAppIdArg(args.app);
     const { expiresAt } = await apiFetch(
-      API_URL4,
+      API_URL5,
       token,
       `/api/app-transfers/${encodeURIComponent(app)}`,
       { method: "POST", body: JSON.stringify({ email: args.email }) }
@@ -3916,7 +3941,7 @@ var status2 = defineCommand15({
   async run({ args }) {
     const token = await ensureToken();
     const app = requireAppIdArg(args.app);
-    const { transfer } = await apiFetch(API_URL4, token, `/api/app-transfers/${encodeURIComponent(app)}`);
+    const { transfer } = await apiFetch(API_URL5, token, `/api/app-transfers/${encodeURIComponent(app)}`);
     if (!transfer) {
       console.log(`No pending transfer for ${app}.`);
       return;
@@ -3948,7 +3973,7 @@ var cancel4 = defineCommand15({
   async run({ args }) {
     const token = await ensureToken();
     const app = requireAppIdArg(args.app);
-    await apiFetch(API_URL4, token, `/api/app-transfers/${encodeURIComponent(app)}`, { method: "DELETE" });
+    await apiFetch(API_URL5, token, `/api/app-transfers/${encodeURIComponent(app)}`, { method: "DELETE" });
     console.log(`\u2713 Transfer offer for ${app} cancelled.`);
   }
 });
@@ -3962,7 +3987,7 @@ import { defineCommand as defineCommand16 } from "citty";
 
 // src/cli/commands/_invoke-impl.ts
 import { readFileSync as readFileSync10 } from "fs";
-var API_URL5 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
+var API_URL6 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
 var DEFAULT_TIMEOUT_MS = 12e4;
 function parseTarget(target) {
   if (!target || typeof target !== "string") {
@@ -4004,7 +4029,7 @@ function flushAndExit(code) {
   });
 }
 async function fetchCatalog(opts = {}) {
-  const url = opts.summary ? `${API_URL5}/api/integrations?summary=1` : `${API_URL5}/api/integrations`;
+  const url = opts.summary ? `${API_URL6}/api/integrations?summary=1` : `${API_URL6}/api/integrations`;
   const res = await fetch(url);
   if (!res.ok) {
     throw new Error(`Failed to fetch integration catalog (${res.status})`);
@@ -4092,7 +4117,7 @@ async function runInvoke(args) {
   const startedAt = Date.now();
   let res;
   try {
-    res = await fetch(`${API_URL5}/api/integrations/${integration}/${endpoint}`, {
+    res = await fetch(`${API_URL6}/api/integrations/${integration}/${endpoint}`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -4552,7 +4577,7 @@ import { existsSync as existsSync13, readFileSync as readFileSync12 } from "fs";
 import { dirname as dirname3, join as join15 } from "path";
 import { fileURLToPath } from "url";
 import { release } from "os";
-var API_URL6 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
+var API_URL7 = process.env.DEEPSPACE_API_URL ?? PLATFORM_URLS.api;
 var TYPES = ["bug", "feature", "other"];
 var TYPE_LABELS = {
   bug: "Bug report",
@@ -4562,7 +4587,7 @@ var TYPE_LABELS = {
 var MAX_TITLE_LEN = 200;
 var MAX_BODY_LEN = 1e4;
 var MAX_CONTEXT_LEN = 200;
-var api3 = (token, path, init) => apiFetch(API_URL6, token, path, init);
+var api3 = (token, path, init) => apiFetch(API_URL7, token, path, init);
 function normalizeType(raw) {
   const value = (raw ?? "bug").toLowerCase();
   if (TYPES.includes(value)) return value;