deepspace 0.23.1 → 0.23.2

package/dist/cli.js

@@ -3322,7 +3322,7 @@ var test_default = defineDeepspaceCommand({
     name: "test",
     description: "Run tests for your DeepSpace app"
   },
-  jsonDescription: "Stream test output; emit the final JSON result on the last line",
+  jsonDescription: "Stream test output on stderr; stdout is the single-line JSON result",
   args: {
     suite: {
       type: "positional",
@@ -3357,6 +3357,7 @@ var test_default = defineDeepspaceCommand({
     }
   },
   async run({ args }) {
+    suiteOutputToStderr = args.json === true;
     const say = (line) => {
       if (!args.json) console.log(line);
     };
@@ -3471,6 +3472,7 @@ Available: smoke, api, e2e, unit, all`,
     return { data: { suite, port, appDir, wranglerEnv: wranglerEnv ?? null, skippedSpecs } };
   }
 });
+var suiteOutputToStderr = false;
 function runSuite(appDir, argv, wranglerEnv, extraEnv = {}) {
   let wranglerConfig;
   try {
@@ -3482,7 +3484,9 @@ function runSuite(appDir, argv, wranglerEnv, extraEnv = {}) {
   try {
     const result = spawnSync4("npx", argv, {
       cwd: appDir,
-      stdio: "inherit",
+      // Under --json the child's stdout is routed to our stderr: the live
+      // suite output stays visible and stdout stays a single JSON line.
+      stdio: suiteOutputToStderr ? ["inherit", 2, 2] : "inherit",
       env: wranglerViteEnv(process.env, wranglerConfig, extraEnv)
     });
     return result.status ?? 1;
@@ -6000,6 +6004,12 @@ function detachedHeadRefusal() {
 }
 
 // src/cli/commands/deploy/request.ts
+function renameRefusalMessage(rename2) {
+  return `This deploy renames the app: ${rename2.fromHost} \u2192 ${rename2.toHost}. Confirmation needs an interactive terminal \u2014 re-run with --rename to approve the rename, or \`deepspace app init --new-id\` if you meant a separate app.`;
+}
+function renamePromptMessage(rename2) {
+  return `This deploy renames the app: ${rename2.fromHost} \u2192 ${rename2.toHost}. The URL changes and the old one stops serving right away; data, secrets, and collaborators travel with it \u2014 the display name in \`src/constants.ts\` (\`APP_NAME\`) does not, update it yourself. (Meant a separate app? Run \`deepspace app init --new-id\` instead.) Rename?`;
+}
 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 DEPLOY_SERVICE_LIMIT_HINT = "The DeepSpace deploy service hit a resource limit processing this deploy (the deploy worker was terminated before it could answer). This is a DeepSpace-side failure, not a Cloudflare incident \u2014 your app was not changed. Retry; if it keeps happening, report the app id and asset count.";
 var REQUIRED_ASSET_TRANSPORT = "content-addressed-v1";
@@ -6119,16 +6129,11 @@ async function deployBuiltBundle(options) {
   let body = await response.json().catch(() => ({}));
   if (response.status === 409 && body.code === "rename_required" && !confirmRename) {
     spinner2.stop("Rename confirmation needed");
+    const rename2 = { fromHost: body.fromHost ?? "", toHost: body.toHost ?? "" };
     if (output.nonInteractive) {
-      await bail(
-        `This deploy renames the app: ${body.fromHost} \u2192 ${body.toHost}. Confirmation needs an interactive terminal \u2014 re-run with --rename to approve the rename, or \`deepspace app init --new-id\` if you meant a separate app.`,
-        null,
-        "rename_required"
-      );
+      await bail(renameRefusalMessage(rename2), null, "rename_required");
     }
-    const confirmed = await p10.confirm({
-      message: `This deploy renames the app: ${body.fromHost} \u2192 ${body.toHost}. The URL changes and the old one stops serving right away; data, secrets, and collaborators travel with it. (Meant a separate app? Run \`deepspace app init --new-id\` instead.) Rename?`
-    });
+    const confirmed = await p10.confirm({ message: renamePromptMessage(rename2) });
     if (p10.isCancel(confirmed) || !confirmed) await bail("Deploy cancelled.", null);
     confirmRename = true;
     spinner2.start(`Deploying ${appName}...`);
@@ -6471,188 +6476,196 @@ var deploy_default = defineCommand3({
   },
   async run({ args }) {
     const output = createDeployOutput(args.json === true);
-    preflightNodeVersion("deploy");
-    const appDir = resolve14(args.dir ?? ".");
-    const selectorRefusal = blankSelectorRefusal(args);
-    if (selectorRefusal) output.die(selectorRefusal.error, selectorRefusal.code);
-    const envName = typeof args.env === "string" && args.env.trim() ? args.env.trim() : void 0;
-    if (!hasWranglerConfig(appDir)) {
-      output.die(noWranglerConfigMessage(join19(appDir, "wrangler.toml")), "not_in_app_repo");
-    }
     try {
-      ensureInstallReady(appDir);
+      await runDeploy(args, output);
     } catch (error) {
-      const refusal = error;
-      output.die(refusal.message ?? String(error), refusal.code ?? "deps_missing", {
-        action: refusal.action
-      });
+      if (error instanceof CliExit) throw error;
+      output.die(formatCliError(error), errorCode(error) ?? "deploy_failed");
     }
-    p12.intro("Deploying DeepSpace app");
-    output.showIntro();
-    const wranglerConfig = readWranglerConfig(appDir);
-    const nameResult = resolveAppNameForEnv(wranglerConfig, envName);
-    if (!nameResult.ok) return output.die(nameResult.reason, nameResult.code ?? "invalid_app_name");
-    const declaredName = envName ? wranglerConfig.env?.[envName]?.name : wranglerConfig.name;
-    if (declaredName !== nameResult.name) {
-      const location = envName ? `[env.${envName}].name` : "`name`";
-      output.die(
-        `wrangler.toml: ${location} "${declaredName}" is not in canonical form. Update it to "${nameResult.name}" and re-run.`,
-        "invalid_app_name"
-      );
+  }
+});
+async function runDeploy(args, output) {
+  preflightNodeVersion("deploy");
+  const appDir = resolve14(args.dir ?? ".");
+  const selectorRefusal = blankSelectorRefusal(args);
+  if (selectorRefusal) output.die(selectorRefusal.error, selectorRefusal.code);
+  const envName = typeof args.env === "string" && args.env.trim() ? args.env.trim() : void 0;
+  if (!hasWranglerConfig(appDir)) {
+    output.die(noWranglerConfigMessage(join19(appDir, "wrangler.toml")), "not_in_app_repo");
+  }
+  try {
+    ensureInstallReady(appDir);
+  } catch (error) {
+    const refusal = error;
+    output.die(refusal.message ?? String(error), refusal.code ?? "deps_missing", {
+      action: refusal.action
+    });
+  }
+  p12.intro("Deploying DeepSpace app");
+  output.showIntro();
+  const wranglerConfig = readWranglerConfig(appDir);
+  const nameResult = resolveAppNameForEnv(wranglerConfig, envName);
+  if (!nameResult.ok) return output.die(nameResult.reason, nameResult.code ?? "invalid_app_name");
+  const declaredName = envName ? wranglerConfig.env?.[envName]?.name : wranglerConfig.name;
+  if (declaredName !== nameResult.name) {
+    const location = envName ? `[env.${envName}].name` : "`name`";
+    output.die(
+      `wrangler.toml: ${location} "${declaredName}" is not in canonical form. Update it to "${nameResult.name}" and re-run.`,
+      "invalid_app_name"
+    );
+  }
+  const appName = nameResult.name;
+  const appId = readAppId(appDir, envName);
+  p12.log.info(envName ? `App: ${appName}  (env: ${envName})` : `App: ${appName}`);
+  const { token, ownerId } = await authenticate(appDir, output);
+  if (!appId) {
+    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",
+      {
+        action: {
+          cwd: appDir,
+          argv: ["deepspace", "app", "init", ...envName ? ["--env", envName] : []]
+        },
+        actionRequired: true
+      }
+    );
+  }
+  p12.log.info(`Id: ${appId}`);
+  const sourceState = await getAppSource(DEPLOY_URL3, token, appId);
+  if (!sourceState.registered) {
+    output.die(
+      `${appId} is not registered. If this repo's id came from an older SDK's scaffold, run \`deepspace app init --new-id\` to register it as a fresh app; a brand-new app dir registers with \`deepspace app init\`.`,
+      "app_not_registered"
+    );
+  }
+  const secretsCache = await loadDeploySecrets({
+    deployUrl: DEPLOY_URL3,
+    appDir,
+    appId,
+    envName,
+    ownerId,
+    token,
+    output
+  });
+  const ownerJwtRefusal = ownerJwtMissingRefusal(sourceState);
+  if (ownerJwtRefusal) output.die(ownerJwtRefusal.error, ownerJwtRefusal.code);
+  let confirmRename = args.rename === true;
+  const rename2 = pendingRename(sourceState.registeredHost, appName);
+  if (rename2 && !confirmRename) {
+    if (output.nonInteractive) {
+      output.die(renameRefusalMessage(rename2), "rename_required");
     }
-    const appName = nameResult.name;
-    const appId = readAppId(appDir, envName);
-    p12.log.info(envName ? `App: ${appName}  (env: ${envName})` : `App: ${appName}`);
-    const { token, ownerId } = await authenticate(appDir, output);
-    if (!appId) {
-      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",
-        {
-          action: {
-            cwd: appDir,
-            argv: ["deepspace", "app", "init", ...envName ? ["--env", envName] : []]
-          },
-          actionRequired: true
-        }
+    const confirmed = await p12.confirm({ message: renamePromptMessage(rename2) });
+    if (p12.isCancel(confirmed) || !confirmed) output.die("Deploy cancelled.", "rename_declined");
+    confirmRename = true;
+  }
+  const repositoryPreflight = preflightDeployRepository({
+    appDir,
+    push: args.push !== false,
+    source: sourceState.source
+  });
+  if (repositoryPreflight) {
+    output.die(repositoryPreflight.error, repositoryPreflight.code);
+  }
+  const spinner2 = createSpinner();
+  const bundle = await buildDeployBundle({
+    appDir,
+    appName,
+    appId,
+    envName,
+    output,
+    spinner: spinner2
+  });
+  const oversized = oversizedAssetRefusal(bundle.assets);
+  if (oversized) {
+    spinner2.stop("Deploy failed");
+    output.die(oversized, "assets_too_large");
+  }
+  const repository = await syncDeployRepository({
+    deployUrl: DEPLOY_URL3,
+    appDir,
+    appId,
+    token,
+    push: args.push !== false,
+    ignoreStale: Boolean(args["ignore-stale"]),
+    output,
+    sourceState
+  });
+  const secrets = prepareDeploySecrets({
+    cache: secretsCache,
+    customBindings: bundle.customBindings,
+    doManifest: bundle.doManifest,
+    output
+  });
+  const body = await deployBuiltBundle({
+    deployUrl: DEPLOY_URL3,
+    appDir,
+    appId,
+    appName,
+    token,
+    rename: confirmRename,
+    claimReleased: args["claim-released"] === true,
+    ignoreStale: Boolean(args["ignore-stale"]),
+    bundle,
+    secrets,
+    repository,
+    output,
+    spinner: spinner2
+  });
+  let serving = "unverifiable";
+  const edgeWaitStarted = Date.now();
+  if (body.url) {
+    spinner2.message("Waiting for the edge to serve this release...");
+    serving = await waitForLiveRelease(body.url, body.releaseStamp, 9e4);
+    if (serving !== "confirmed") {
+      spinner2.stop(
+        serving === "unconfirmed" ? "Deployed \u2014 the edge is still rolling this release out" : "Deployed \u2014 serving could not be verified from here"
       );
-    }
-    p12.log.info(`Id: ${appId}`);
-    const sourceState = await getAppSource(DEPLOY_URL3, token, appId);
-    if (!sourceState.registered) {
-      output.die(
-        `${appId} is not registered. If this repo's id came from an older SDK's scaffold, run \`deepspace app init --new-id\` to register it as a fresh app; a brand-new app dir registers with \`deepspace app init\`.`,
-        "app_not_registered"
+      p12.log.warn(
+        serving === "unconfirmed" ? "Some requests still get the previous release. Cloudflare rolls a version out per edge machine; it usually settles within a couple of minutes. Wait before asserting against it." : "This release carries no serving stamp (older platform, or a resumed deploy), so the CLI cannot tell which release the edge answers with."
       );
+      p12.log.info(`URL: ${body.url}`);
+      await syncCommerce(appDir, appId, token, output.nonInteractive);
+      if (output.json) {
+        return output.emitJson({
+          ok: true,
+          appId,
+          appName,
+          url: body.url,
+          releaseId: body.releaseId ?? null,
+          bundleRetained: body.bundleRetained ?? null,
+          serving,
+          recoverable: repository.recoverable,
+          ...staleBaseGuardFields(body)
+        });
+      }
+      p12.outro("Done");
+      return;
     }
-    const secretsCache = await loadDeploySecrets({
-      deployUrl: DEPLOY_URL3,
-      appDir,
-      appId,
-      envName,
-      ownerId,
-      token,
-      output
-    });
-    const ownerJwtRefusal = ownerJwtMissingRefusal(sourceState);
-    if (ownerJwtRefusal) output.die(ownerJwtRefusal.error, ownerJwtRefusal.code);
-    let confirmRename = args.rename === true;
-    const rename2 = pendingRename(sourceState.registeredHost, appName);
-    if (rename2 && !confirmRename) {
-      if (output.nonInteractive) {
-        output.die(renameRefusalMessage(rename2), "rename_required");
-      }
-      const confirmed = await p12.confirm({ message: renamePromptMessage(rename2) });
-      if (p12.isCancel(confirmed) || !confirmed) output.die("Deploy cancelled.", "rename_declined");
-      confirmRename = true;
-    }
-    const repositoryPreflight = preflightDeployRepository({
-      appDir,
-      push: args.push !== false,
-      source: sourceState.source
-    });
-    if (repositoryPreflight) {
-      output.die(repositoryPreflight.error, repositoryPreflight.code);
-    }
-    const spinner2 = createSpinner();
-    const bundle = await buildDeployBundle({
-      appDir,
-      appName,
-      appId,
-      envName,
-      output,
-      spinner: spinner2
-    });
-    const oversized = oversizedAssetRefusal(bundle.assets);
-    if (oversized) {
-      spinner2.stop("Deploy failed");
-      output.die(oversized, "assets_too_large");
-    }
-    const repository = await syncDeployRepository({
-      deployUrl: DEPLOY_URL3,
-      appDir,
-      appId,
-      token,
-      push: args.push !== false,
-      ignoreStale: Boolean(args["ignore-stale"]),
-      output,
-      sourceState
-    });
-    const secrets = prepareDeploySecrets({
-      cache: secretsCache,
-      customBindings: bundle.customBindings,
-      doManifest: bundle.doManifest,
-      output
-    });
-    const body = await deployBuiltBundle({
-      deployUrl: DEPLOY_URL3,
-      appDir,
+  }
+  spinner2.stop(
+    `Deployed! (edge confirmed in ${Math.round((Date.now() - edgeWaitStarted) / 1e3)}s)`
+  );
+  p12.log.success(`Live at: ${body.url}`);
+  await syncCommerce(appDir, appId, token, output.nonInteractive);
+  if (output.json) {
+    return output.emitJson({
+      ok: true,
       appId,
       appName,
-      token,
-      rename: confirmRename,
-      claimReleased: args["claim-released"] === true,
-      ignoreStale: Boolean(args["ignore-stale"]),
-      bundle,
-      secrets,
-      repository,
-      output,
-      spinner: spinner2
+      url: body.url ?? null,
+      // Always present, so a caller branches on one field instead of
+      // inferring success from an absent one.
+      serving,
+      releaseId: body.releaseId ?? null,
+      bundleRetained: body.bundleRetained ?? null,
+      recoverable: repository.recoverable,
+      ...staleBaseGuardFields(body)
     });
-    let serving = "unverifiable";
-    const edgeWaitStarted = Date.now();
-    if (body.url) {
-      spinner2.message("Waiting for the edge to serve this release...");
-      serving = await waitForLiveRelease(body.url, body.releaseStamp, 9e4);
-      if (serving !== "confirmed") {
-        spinner2.stop(
-          serving === "unconfirmed" ? "Deployed \u2014 the edge is still rolling this release out" : "Deployed \u2014 serving could not be verified from here"
-        );
-        p12.log.warn(
-          serving === "unconfirmed" ? "Some requests still get the previous release. Cloudflare rolls a version out per edge machine; it usually settles within a couple of minutes. Wait before asserting against it." : "This release carries no serving stamp (older platform, or a resumed deploy), so the CLI cannot tell which release the edge answers with."
-        );
-        p12.log.info(`URL: ${body.url}`);
-        await syncCommerce(appDir, appId, token, output.nonInteractive);
-        if (output.json) {
-          return output.emitJson({
-            ok: true,
-            appId,
-            appName,
-            url: body.url,
-            releaseId: body.releaseId ?? null,
-            bundleRetained: body.bundleRetained ?? null,
-            serving,
-            recoverable: repository.recoverable,
-            ...staleBaseGuardFields(body)
-          });
-        }
-        p12.outro("Done");
-        return;
-      }
-    }
-    spinner2.stop(
-      `Deployed! (edge confirmed in ${Math.round((Date.now() - edgeWaitStarted) / 1e3)}s)`
-    );
-    p12.log.success(`Live at: ${body.url}`);
-    await syncCommerce(appDir, appId, token, output.nonInteractive);
-    if (output.json) {
-      return output.emitJson({
-        ok: true,
-        appId,
-        appName,
-        url: body.url ?? null,
-        // Always present, so a caller branches on one field instead of
-        // inferring success from an absent one.
-        serving,
-        releaseId: body.releaseId ?? null,
-        bundleRetained: body.bundleRetained ?? null,
-        recoverable: repository.recoverable,
-        ...staleBaseGuardFields(body)
-      });
-    }
-    p12.outro("Done");
   }
-});
+  p12.outro("Done");
+}
 async function syncCommerce(appDir, appId, token, nonInteractive) {
   await syncSubscriptionPlans(appDir, appId, token, nonInteractive);
   await syncOneTimeProducts(appDir, appId, token);
@@ -6670,12 +6683,6 @@ function pendingRename(registeredHost, appName) {
   if (label === appName) return null;
   return { fromHost: registeredHost, toHost: [appName, ...domain].join(".") };
 }
-function renameRefusalMessage(rename2) {
-  return `This deploy renames the app: ${rename2.fromHost} \u2192 ${rename2.toHost}. Confirmation needs an interactive terminal \u2014 re-run with --rename to approve the rename, or \`deepspace app init --new-id\` if you meant a separate app.`;
-}
-function renamePromptMessage(rename2) {
-  return `This deploy renames the app: ${rename2.fromHost} \u2192 ${rename2.toHost}. The URL changes and the old one stops serving right away; data, secrets, and collaborators travel with it. (Meant a separate app? Run \`deepspace app init --new-id\` instead.) Rename?`;
-}
 function blankSelectorRefusal(args) {
   if (args.env !== void 0 && !String(args.env).trim()) {
     return {
@@ -6869,6 +6876,11 @@ var undeploy_default = defineDeepspaceCommand({
       type: "string",
       description: "wrangler.toml [env.<name>] block whose deployed app to remove (e.g. --env staging). Ignored if a positional name is given.",
       required: false
+    },
+    yes: {
+      type: "boolean",
+      description: "Skip the interactive confirmation. (Scripts and --json callers are never prompted; the command itself is their consent.)",
+      default: false
     }
   },
   async run({ args }) {
@@ -6894,7 +6906,18 @@ var undeploy_default = defineDeepspaceCommand({
         "not_in_app_repo"
       );
     }
-    if (!args.json) p13.intro(`Undeploying ${appId}`);
+    if (!args.json && !args.yes && process.stdin.isTTY) {
+      p13.intro(`Undeploying ${appId}`);
+      const confirmed = await p13.confirm({
+        message: `Take ${appId} offline now? Its URL stops serving immediately; data, secrets, and the registration stay (the name is reserved for you for 30 days).`,
+        initialValue: false
+      });
+      if (p13.isCancel(confirmed) || !confirmed) {
+        throw new Refusal("Undeploy cancelled.", "undeploy_declined");
+      }
+    } else if (!args.json) {
+      p13.intro(`Undeploying ${appId}`);
+    }
     const s = args.json ? null : createSpinner();
     s?.start("Removing...");
     const res = await fetch(`${DEPLOY_URL4}/api/deploy/${appId}`, {
@@ -8495,7 +8518,7 @@ function fmtDate(iso) {
   if (!iso) return "\u2014";
   return iso.slice(0, 10);
 }
-async function confirm5(message) {
+async function confirm6(message) {
   process.stdout.write(`${message} [y/N] `);
   const answer = await new Promise((resolve22) => {
     process.stdin.setEncoding("utf-8");
@@ -8574,7 +8597,7 @@ var buy = defineDeepspaceCommand({
           "confirmation_required"
         );
       }
-      const ok2 = await confirm5(
+      const ok2 = await confirm6(
         `Buy ${domain} for ${price}/yr (auto-renews; non-refundable), attach to ${appId}? Provisioning takes ${expectedTime}.`
       );
       if (!ok2) {
@@ -8744,7 +8767,7 @@ var detach = defineDeepspaceCommand({
           "confirmation_required"
         );
       }
-      const ok2 = await confirm5(
+      const ok2 = await confirm6(
         `Detach ${domain}? Routing will stop; the domain stays registered (auto-renew is unchanged).`
       );
       if (!ok2) {
@@ -10777,19 +10800,18 @@ var status_default = defineCommand11({
       "DEEPSPACE_API_URL",
       "DEEPSPACE_PLATFORM_URL"
     ].filter((k) => process.env[k]);
+    const urls = effectivePlatformUrls();
+    lines.push([
+      "Env",
+      [DEEPSPACE_ENV, ...urlOverrides.map((k) => `${k} set`)].join(" \xB7 ")
+    ]);
+    json.env = DEEPSPACE_ENV;
+    json.services = urls;
     if (DEEPSPACE_ENV !== "production" || urlOverrides.length > 0) {
-      const urls = effectivePlatformUrls();
-      const detail = [
-        DEEPSPACE_ENV !== "production" ? DEEPSPACE_ENV : null,
-        ...urlOverrides.map((k) => `${k} set`)
-      ].filter(Boolean).join(" \xB7 ");
-      lines.push(["Env", detail]);
       lines.push([
         "Services",
         `auth ${urls.auth} \xB7 api ${urls.api} \xB7 platform ${urls.platform} \xB7 deploy ${urls.deploy}`
       ]);
-      json.env = DEEPSPACE_ENV;
-      json.services = urls;
       if (urlOverrides.length > 0) json.urlOverrides = urlOverrides;
     }
     facts.loggedIn = existsSync23(SESSION_PATH);
@@ -11310,9 +11332,9 @@ var pull_default = defineDeepspaceCommand({
     const token = await ensureToken();
     const deployUrl = deployBaseUrl();
     const appId = await resolveAppTarget(deployUrl, token, appArg);
-    ensureSpaceRemote(appDir, appId);
     spinner2?.message(`Checking the cloud ${branch} ref\u2026`);
     const remote = await repoApi(deployUrl, token, appId).getRefs();
+    ensureSpaceRemote(appDir, appId);
     if (!remote) {
       spinner2?.stop("No cloud repo yet.");
       const pushCommand2 = targetedVcCommand("push", appId, branch);
@@ -14178,7 +14200,7 @@ import { join as join27, resolve as resolve21 } from "path";
 // package.json
 var package_default = {
   name: "deepspace",
-  version: "0.23.1",
+  version: "0.23.2",
   engines: {
     node: ">=22.15.0 <23 || >=24 <25 || >=26 <27"
   },