deepspace 0.21.0 → 0.22.0

package/dist/cli.js

@@ -8,8 +8,8 @@ import {
   renderUsage
 } from "citty";
 import { sync as spawnSync8 } from "cross-spawn";
-import { readFileSync as readFileSync28, existsSync as existsSync26 } from "fs";
-import { dirname as dirname12, join as join24 } from "path";
+import { readFileSync as readFileSync28, existsSync as existsSync27 } from "fs";
+import { dirname as dirname12, join as join25 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/cli/lib/spinner.ts
@@ -913,8 +913,6 @@ import { parse as parseToml } from "smol-toml";
 // src/server/utils/registry-client.ts
 var APP_ID_RE = /^app_[0-9A-HJKMNP-TV-Z]{26}$/;
 var STRICT_APP_ID_RE = APP_ID_RE;
-
-// src/cli/lib/app-identity.ts
 var CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
 function mintUlid(now = Date.now()) {
   let ts = "";
@@ -938,9 +936,8 @@ function mintUlid(now = Date.now()) {
   }
   return `${ts}${rs}`.slice(0, 26);
 }
-function mintAppId(now = Date.now()) {
-  return `app_${mintUlid(now)}`;
-}
+
+// src/cli/lib/app-identity.ts
 function readWranglerIdentityConfig(cwd) {
   const wranglerPath = join2(resolve2(cwd), "wrangler.toml");
   if (!existsSync3(wranglerPath)) return null;
@@ -996,6 +993,18 @@ ${line}
   }
   writeFileSync2(wranglerPath, src);
 }
+var APP_ID_PLACEHOLDER = "__APP_ID__";
+function stampAppIdInSources(cwd, appId, previousAppId) {
+  const constantsPath = join2(resolve2(cwd), "src", "constants.ts");
+  if (!existsSync3(constantsPath)) return false;
+  const needles = [APP_ID_PLACEHOLDER, ...previousAppId ? [previousAppId] : []];
+  const content = readFileSync5(constantsPath, "utf-8");
+  let next = content;
+  for (const needle of needles) next = next.replaceAll(needle, appId);
+  if (next === content) return false;
+  writeFileSync2(constantsPath, next);
+  return true;
+}
 
 // src/cli/commands/dev.ts
 import { resolve as resolve8, basename as basename2, join as join11 } from "path";
@@ -5618,7 +5627,7 @@ async function syncDeployRepository(options) {
       p9.log.info(`Workspace ${workspaceBranchId} is synced at ${tip.slice(0, 10)}.`);
     } else if (secretFiles.length > 0) {
       p9.log.warn(
-        `Skipping cloud-repo push \u2014 the branch tracks secret file(s): ${secretFiles.join(", ")}. Untrack with \`git rm --cached ${secretFiles[0]}\` (add to .gitignore), re-commit, then \`deepspace push\`. Deploy continues; this release's source isn't recoverable until then.`
+        `Skipping cloud-repo push \u2014 the branch tracks secret file(s): ${secretFiles.join(", ")}. Untrack with \`git rm --cached ${secretFiles[0]}\` (add to .gitignore), re-commit, then \`deepspace push\`. Without the push this deploy carries no source lineage: if the live release has one, the server refuses it as stale (--ignore-stale replaces it anyway), and this release's source isn't recoverable until the push works.`
       );
     } else {
       const pushResult = await pushWithTransientRetry(
@@ -6252,13 +6261,14 @@ var deploy_default = defineCommand3({
       );
     }
     const appName = nameResult.name;
-    let appId = readAppId(appDir, envName);
+    const appId = readAppId(appDir, envName);
     p12.log.info(envName ? `App: ${appName}  (env: ${envName})` : `App: ${appName}`);
     const { token, ownerId } = await authenticate(appDir, output);
     if (!appId) {
-      appId = mintAppId();
-      writeAppId(appDir, appId, { wranglerEnv: envName });
-      p12.log.info(`Minted app id ${appId} \u2014 commit wrangler.toml.`);
+      return output.die(
+        `No app id in wrangler.toml${envName ? ` for [env.${envName}]` : ""}. Run \`deepspace app init${envName ? ` --env ${envName}` : ""}\` to register this app, then re-deploy.`,
+        "app_not_initialized"
+      );
     }
     p12.log.info(`Id: ${appId}`);
     const secretsCache = await loadDeploySecrets({
@@ -10233,10 +10243,29 @@ var secrets_default = defineCommand10({
 });
 
 // src/cli/commands/init.ts
+import { existsSync as existsSync21 } from "fs";
+import { join as join20 } from "path";
+var DEPLOY_URL12 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
+function commitScaffoldIfUnborn(appDir, token) {
+  try {
+    if (!existsSync21(join20(appDir, ".git"))) return false;
+    if (runGit(appDir, ["rev-parse", "--verify", "HEAD"], { allowFail: true }).status === 0) {
+      return false;
+    }
+    ensureGitIdentity(appDir, token);
+    if (runGit(appDir, ["add", "-A"], { allowFail: true }).status !== 0) return false;
+    const commit = runGit(appDir, ["commit", "-m", "Initial DeepSpace scaffold", "--no-verify"], {
+      allowFail: true
+    });
+    return commit.status === 0;
+  } catch {
+    return false;
+  }
+}
 var init_default = defineDeepspaceCommand({
   meta: {
     name: "init",
-    description: "Mint this app\u2019s immutable DEEPSPACE_APP_ID into wrangler.toml"
+    description: "Register this app: mint its immutable DEEPSPACE_APP_ID into wrangler.toml"
   },
   args: {
     "new-id": {
@@ -10270,23 +10299,31 @@ var init_default = defineDeepspaceCommand({
         data: { status: "already_initialized", appId: existing, appDir, env: envName ?? null }
       };
     }
-    const appId = mintAppId();
+    const token = await ensureToken();
+    const { appId } = await apiFetch(DEPLOY_URL12, token, "/api/apps/mint", {
+      method: "POST"
+    });
     writeAppId(appDir, appId, { wranglerEnv: envName, force: Boolean(args["new-id"]) });
+    if (!envName) stampAppIdInSources(appDir, appId, existing);
+    const committedScaffold = commitScaffoldIfUnborn(appDir, token);
     if (!args.json) {
       if (existing) {
         console.log(`Forked: ${existing} \u2192 ${appId}${envName ? ` (env: ${envName})` : ""}`);
-        console.log("The next deploy registers this as a NEW app; the original is untouched.");
+        console.log("Registered as a NEW app under your account; the original is untouched.");
       } else {
-        console.log(`Minted ${appId}${envName ? ` (env: ${envName})` : ""} \u2014 commit wrangler.toml.`);
-        console.log("The first deploy registers it and claims the `name` subdomain.");
+        console.log(
+          `Registered ${appId}${envName ? ` (env: ${envName})` : ""} to your account` + (committedScaffold ? " \u2014 initial scaffold commit created." : " \u2014 commit wrangler.toml.")
+        );
+        console.log("The first deploy claims the `name` subdomain.");
       }
       console.log(`App dir: ${appDir}`);
     }
     return {
       data: {
-        status: existing ? "forked" : "minted",
+        status: existing ? "forked" : "registered",
         appId,
         ...existing ? { previousAppId: existing } : {},
+        committedScaffold,
         appDir,
         env: envName ?? null
       }
@@ -10297,7 +10334,7 @@ var init_default = defineDeepspaceCommand({
 // src/cli/commands/status.ts
 import { defineCommand as defineCommand11 } from "citty";
 import * as p17 from "@clack/prompts";
-import { existsSync as existsSync21, readFileSync as readFileSync24 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync24 } from "fs";
 function timeAgo(iso) {
   const ms = Date.now() - Date.parse(iso);
   if (!Number.isFinite(ms) || ms < 0) return iso;
@@ -10382,7 +10419,7 @@ var status_default = defineCommand11({
       json.services = urls;
       if (urlOverrides.length > 0) json.urlOverrides = urlOverrides;
     }
-    facts.loggedIn = existsSync21(SESSION_PATH);
+    facts.loggedIn = existsSync22(SESSION_PATH);
     let userId = null;
     if (!facts.loggedIn) {
       lines.push(["Session", "not logged in"]);
@@ -11071,18 +11108,18 @@ var pull_default = defineDeepspaceCommand({
 
 // src/cli/commands/clone.ts
 import * as p20 from "@clack/prompts";
-import { existsSync as existsSync22, readdirSync as readdirSync6, rmSync as rmSync5 } from "fs";
-import { resolve as resolve17, basename as basename5, join as join20 } from "path";
+import { existsSync as existsSync23, readdirSync as readdirSync6, rmSync as rmSync5 } from "fs";
+import { resolve as resolve17, basename as basename5, join as join21 } from "path";
 function cleanFailedCloneDir(dir) {
   let entries;
   try {
     entries = readdirSync6(dir);
   } catch {
-    return existsSync22(dir) ? ["<unreadable>"] : [];
+    return existsSync23(dir) ? ["<unreadable>"] : [];
   }
   if (entries.length === 1 && entries[0] === ".git") {
     try {
-      rmSync5(join20(dir, ".git"), { recursive: true, force: true });
+      rmSync5(join21(dir, ".git"), { recursive: true, force: true });
       return [];
     } catch {
       return entries;
@@ -11091,7 +11128,7 @@ function cleanFailedCloneDir(dir) {
   return entries;
 }
 function validateCloneTarget(dir) {
-  if (!existsSync22(dir)) return false;
+  if (!existsSync23(dir)) return false;
   let entries;
   try {
     entries = readdirSync6(dir);
@@ -11214,7 +11251,7 @@ async function actorLabels(token, appId) {
 }
 
 // src/cli/commands/releases.ts
-var DEPLOY_URL12 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
+var DEPLOY_URL13 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
 var releases_default = defineDeepspaceCommand({
   meta: {
     name: "releases",
@@ -11249,8 +11286,8 @@ var releases_default = defineDeepspaceCommand({
     const spinner2 = args.json ? null : createSpinner();
     spinner2?.start("Loading release history\u2026");
     const token = await ensureToken();
-    const appId = await resolveAppTarget(DEPLOY_URL12, token, appArg, { wranglerEnv: envArg });
-    const { releases } = await repoApi(DEPLOY_URL12, token, appId).listReleases(limit);
+    const appId = await resolveAppTarget(DEPLOY_URL13, token, appArg, { wranglerEnv: envArg });
+    const { releases } = await repoApi(DEPLOY_URL13, token, appId).listReleases(limit);
     spinner2?.stop(`Loaded ${releases.length} ${releases.length === 1 ? "release" : "releases"}.`);
     if (!args.json) {
       if (releases.length === 0) {
@@ -11283,7 +11320,7 @@ Retry in a moment, or re-run with --allow-do-deletion to accept the risk.`,
     "do_guard_unavailable"
   );
 }
-var DEPLOY_URL13 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
+var DEPLOY_URL14 = process.env.DEEPSPACE_DEPLOY_URL ?? PLATFORM_URLS.deploy;
 function pickPreviousRelease(releases) {
   if (releases.length === 0) {
     return { error: "No releases recorded yet \u2014 nothing to roll back to.", code: "no_releases" };
@@ -11345,8 +11382,8 @@ var rollback_default = defineDeepspaceCommand({
     const spinner2 = args.json ? null : createSpinner();
     spinner2?.start("Preparing rollback\u2026");
     const token = await ensureToken();
-    const appId = await resolveAppTarget(DEPLOY_URL13, token, appArg, { wranglerEnv: envArg });
-    const api4 = repoApi(DEPLOY_URL13, token, appId);
+    const appId = await resolveAppTarget(DEPLOY_URL14, token, appArg, { wranglerEnv: envArg });
+    const api4 = repoApi(DEPLOY_URL14, token, appId);
     let releaseId = args.release ? String(args.release).trim() : "";
     if (!releaseId) {
       const { releases } = await api4.listReleases(2);
@@ -11357,7 +11394,7 @@ var rollback_default = defineDeepspaceCommand({
     spinner2?.message(`Rolling back to ${releaseId}\u2026`);
     let result;
     try {
-      result = await apiFetch(DEPLOY_URL13, token, `/api/deploy/${appId}/rollback`, {
+      result = await apiFetch(DEPLOY_URL14, token, `/api/deploy/${appId}/rollback`, {
         method: "POST",
         body: JSON.stringify({
           releaseId,
@@ -11568,7 +11605,7 @@ function printOverlaps(overlaps, json) {
 // src/cli/commands/workspace/local.ts
 import * as p24 from "@clack/prompts";
 import {
-  existsSync as existsSync23,
+  existsSync as existsSync24,
   mkdirSync as mkdirSync7,
   readFileSync as readFileSync25,
   realpathSync as realpathSync6,
@@ -11576,7 +11613,7 @@ import {
   statSync as statSync3,
   writeFileSync as writeFileSync7
 } from "fs";
-import { dirname as dirname11, isAbsolute as isAbsolute5, join as join21, relative as relative2, sep as sep2 } from "path";
+import { dirname as dirname11, isAbsolute as isAbsolute5, join as join22, relative as relative2, sep as sep2 } from "path";
 var WORKSPACE_MARKER = "deepspace-workspace.json";
 function excludeWorktreeDir(appDir, dir) {
   try {
@@ -11597,7 +11634,7 @@ function worktreeMarkerPath(worktreeRoot) {
     const result = runGit(worktreeRoot, ["rev-parse", "--absolute-git-dir"], { allowFail: true });
     if (result.status !== 0) return null;
     const gitDir = result.stdout.toString("utf-8").trim();
-    return isAbsolute5(gitDir) ? join21(gitDir, WORKSPACE_MARKER) : null;
+    return isAbsolute5(gitDir) ? join22(gitDir, WORKSPACE_MARKER) : null;
   } catch {
     return null;
   }
@@ -11642,11 +11679,11 @@ function isManagedWorkspaceWorktree(worktreeRoot, workspaceId) {
 function defaultWorkspaceRoot(appDir, workspaceId) {
   const primary = listWorktrees(appDir)[0];
   if (!primary) throw new Error("Git did not report a primary worktree");
-  return join21(primary.path, ".deepspace", "ws", workspaceId.slice(3).toLowerCase());
+  return join22(primary.path, ".deepspace", "ws", workspaceId.slice(3).toLowerCase());
 }
 function appDirInWorktree(appDir, worktreeRoot) {
   const appRelative = relative2(realpathSync6(repoToplevel(appDir)), realpathSync6(appDir));
-  return appRelative ? join21(worktreeRoot, appRelative) : worktreeRoot;
+  return appRelative ? join22(worktreeRoot, appRelative) : worktreeRoot;
 }
 function primaryAppDir(appDir) {
   const primary = listWorktrees(appDir)[0];
@@ -11681,7 +11718,7 @@ function rematerializeWorkspaceWorktree(appDir, worktreeRoot, branch, workspaceI
 function inOwnLinkedWorktree(appDir, id) {
   if (workspaceIdFromBranch(currentBranch(appDir)) !== id) return false;
   try {
-    return statSync3(join21(repoToplevel(appDir), ".git")).isFile();
+    return statSync3(join22(repoToplevel(appDir), ".git")).isFile();
   } catch {
     return false;
   }
@@ -11806,7 +11843,7 @@ function cleanupWorkspaceLocal(appDir, id, trunkBranch, options = {}) {
         }
         runGit(mainDir, ["worktree", "prune"], { allowFail: true });
         out.worktreeDir = null;
-        const leftover = existsSync23(linked.path);
+        const leftover = existsSync24(linked.path);
         if (leftover) out.leftoverDir = linked.path;
         else out.worktreeRemoved = linked.path;
         deleteWsBranch(mainDir, branch, expectedBranchOid, out);
@@ -12104,7 +12141,7 @@ var newWorkspaceCommand = defineDeepspaceCommand({
 
 // src/cli/commands/workspace/attach.ts
 import * as p26 from "@clack/prompts";
-import { existsSync as existsSync24, readdirSync as readdirSync7, realpathSync as realpathSync7, rmSync as rmSync6 } from "fs";
+import { existsSync as existsSync25, readdirSync as readdirSync7, realpathSync as realpathSync7, rmSync as rmSync6 } from "fs";
 import { isAbsolute as isAbsolute7, resolve as resolve19 } from "path";
 function samePath(a, b) {
   const real = (p35) => {
@@ -12124,7 +12161,7 @@ function finishedWorkspaceMessage(id, view) {
   return `Workspace ${id} is ${workspace.status} \u2014 its ref is retained briefly (fetch ${workspace.ref} to inspect), but attach only works on active workspaces.`;
 }
 function cleanFailedFreshAttachDir(dir) {
-  if (!existsSync24(dir)) return [];
+  if (!existsSync25(dir)) return [];
   let entries;
   try {
     entries = readdirSync7(dir);
@@ -12206,7 +12243,7 @@ var attachWorkspaceCommand = defineDeepspaceCommand({
       const localTip = resolveCommit(appDir, `refs/heads/${branch}`);
       if (localTip) {
         let existing = resolveWorkspaceWorktree(listWorktrees(appDir), id);
-        if (existing && !existsSync24(existing)) {
+        if (existing && !existsSync25(existing)) {
           runGit(appDir, ["worktree", "prune"], { allowFail: true });
           existing = null;
         }
@@ -12324,7 +12361,7 @@ var attachWorkspaceCommand = defineDeepspaceCommand({
       process.cwd(),
       (typeof args.dir === "string" ? args.dir.trim() : "") || `ws-${id.slice(3).toLowerCase()}`
     );
-    if (existsSync24(dir)) {
+    if (existsSync25(dir)) {
       spinner2?.stop("Target exists.");
       throw new Refusal(`${dir} already exists \u2014 pass a different directory.`, "dir_exists");
     }
@@ -12662,12 +12699,12 @@ import * as p30 from "@clack/prompts";
 // src/cli/lib/validation.ts
 import { sync as spawnSync7 } from "cross-spawn";
 import { readFileSync as readFileSync26 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 var MAX_SUMMARY_CHARS = 4e3;
 var MAX_OUTPUT_BUFFER = 64 * 1024 * 1024;
 function configuredCommand(appDir) {
   try {
-    const pkg2 = JSON.parse(readFileSync26(join22(appDir, "package.json"), "utf-8"));
+    const pkg2 = JSON.parse(readFileSync26(join23(appDir, "package.json"), "utf-8"));
     if (pkg2.scripts?.validate) return `${detectPackageManager(appDir)} run --silent validate`;
   } catch {
   }
@@ -13743,13 +13780,13 @@ function sameRefs(left, right) {
 
 // src/cli/commands/update.ts
 import * as p34 from "@clack/prompts";
-import { existsSync as existsSync25, readFileSync as readFileSync27, writeFileSync as writeFileSync8 } from "fs";
-import { join as join23, resolve as resolve20 } from "path";
+import { existsSync as existsSync26, readFileSync as readFileSync27, writeFileSync as writeFileSync8 } from "fs";
+import { join as join24, resolve as resolve20 } from "path";
 
 // package.json
 var package_default = {
   name: "deepspace",
-  version: "0.21.0",
+  version: "0.22.0",
   engines: {
     node: ">=22.15.0 <23 || >=24 <25 || >=26 <27"
   },
@@ -13920,18 +13957,18 @@ function gapIsTooWide(from, to) {
   return from.major === 0 && from.minor < OLDEST_SUPPORTED_MINOR;
 }
 function readAppSdkVersion(appDir) {
-  const installed = join23(appDir, "node_modules", "deepspace", "package.json");
-  if (existsSync25(installed)) {
+  const installed = join24(appDir, "node_modules", "deepspace", "package.json");
+  if (existsSync26(installed)) {
     const parsed2 = JSON.parse(readFileSync27(installed, "utf8"));
     if (typeof parsed2.version === "string") return parsed2.version;
   }
-  const manifest = join23(appDir, "package.json");
-  if (!existsSync25(manifest)) return null;
+  const manifest = join24(appDir, "package.json");
+  if (!existsSync26(manifest)) return null;
   const parsed = JSON.parse(readFileSync27(manifest, "utf8"));
   return parsed.dependencies?.deepspace ?? null;
 }
 function pinSdkVersion(appDir, version) {
-  const path = join23(appDir, "package.json");
+  const path = join24(appDir, "package.json");
   const source = readFileSync27(path, "utf8");
   const manifest = JSON.parse(source);
   const dependencies = manifest.dependencies;
@@ -13958,16 +13995,16 @@ function buildPreviewSecretsUpgradeInstruction(appDir) {
     "vite.config.mts",
     "vite.config.js",
     "vite.config.mjs"
-  ].find((candidate) => existsSync25(join23(appDir, candidate)));
+  ].find((candidate) => existsSync26(join24(appDir, candidate)));
   if (!configName) return null;
-  const source = readFileSync27(join23(appDir, configName), "utf8");
+  const source = readFileSync27(join24(appDir, configName), "utf8");
   if (source.includes("deepspace-remove-build-preview-secrets")) return null;
   return `${configName}: add the build-preview secret cleanup from ${BUILD_PREVIEW_SECRETS_GUIDE}; app update left this app-owned file unchanged.`;
 }
 function usersSchemaVisibilityUpgradeInstruction(appDir) {
   const schemaName = "src/schemas/users-schema.ts";
-  const path = join23(appDir, schemaName);
-  if (!existsSync25(path)) return null;
+  const path = join24(appDir, schemaName);
+  if (!existsSync26(path)) return null;
   const source = readFileSync27(path, "utf8");
   if (!/\bmember\s*:\s*\{[^}]*\bread\s*:\s*true\b/s.test(source)) return null;
   return `${schemaName}: review the member user-row visibility change at ${USERS_SCHEMA_VISIBILITY_GUIDE}; app update left this app-owned schema unchanged.`;
@@ -14119,8 +14156,8 @@ var update_default = defineDeepspaceCommand({
 
 // src/cli/cli.ts
 var __dirname = dirname12(fileURLToPath3(import.meta.url));
-var pkg = JSON.parse(readFileSync28(join24(__dirname, "..", "package.json"), "utf-8"));
-if (process.platform === "linux" && !process.env.SSL_CERT_FILE && existsSync26("/etc/ssl/certs/ca-certificates.crt")) {
+var pkg = JSON.parse(readFileSync28(join25(__dirname, "..", "package.json"), "utf-8"));
+if (process.platform === "linux" && !process.env.SSL_CERT_FILE && existsSync27("/etc/ssl/certs/ca-certificates.crt")) {
   process.env.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
 }
 var create2 = defineCommand14({