deepspace 0.26.0 → 0.26.1

package/dist/cli.js

@@ -46,8 +46,12 @@ function displayLines(value) {
 
 // src/cli/lib/spinner.ts
 var activeSpinner = null;
+var plainProgress = false;
+function setPlainProgress(enabled) {
+  plainProgress = enabled;
+}
 function createSpinner() {
-  const impl = process.stdout.isTTY ? p.spinner() : {
+  const impl = !plainProgress && process.stdout.isTTY ? p.spinner() : {
     start: (msg) => {
       if (msg) console.log(msg);
     },
@@ -3605,8 +3609,33 @@ function formatSchemaLintFindings(findings) {
 }
 
 // src/cli/lib/port.ts
-import { createServer, Socket } from "net";
+import { Socket } from "net";
 var DEFAULT_PORT = 5173;
+async function ensurePortFree(port, host, waitMs = 15e3) {
+  if (!await isPortListening(port, host)) return;
+  if (!await isHttpResponding(port)) {
+    const deadline = Date.now() + waitMs;
+    while (Date.now() < deadline) {
+      await new Promise((resolve23) => setTimeout(resolve23, 500));
+      if (!await isPortListening(port, host)) return;
+    }
+  }
+  const killArgv = port === DEFAULT_PORT ? ["deepspace", "dev", "kill"] : ["deepspace", "dev", "kill", "--port", String(port)];
+  throw new Refusal(
+    `Port ${port} is already in use.
+Free it with \`${killArgv.join(" ")}\`, or use another port: \`--port <other>\`.`,
+    "port_in_use",
+    { extra: { port } }
+  );
+}
+async function isHttpResponding(port, timeoutMs = 2e3) {
+  try {
+    await fetch(`http://127.0.0.1:${port}/`, { signal: AbortSignal.timeout(timeoutMs) });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function isPortListening(port, host, timeoutMs = 500) {
   const target2 = host === "0.0.0.0" || host === "::" ? "127.0.0.1" : host;
   return new Promise((resolve23) => {
@@ -3630,28 +3659,6 @@ async function waitForPortListening(port, host, timeoutMs, signal) {
   }
   return false;
 }
-async function assertReusableDevServer(port, waitMs = 15e3) {
-  if (!await isPortListening(port, "127.0.0.1")) return;
-  if (await isHttpResponding(port)) return;
-  const deadline = Date.now() + waitMs;
-  while (Date.now() < deadline) {
-    if (!await isPortListening(port, "127.0.0.1")) return;
-    await new Promise((resolve23) => setTimeout(resolve23, 500));
-  }
-  throw new Refusal(
-    `Port ${port} is held by a server that no longer answers HTTP \u2014 likely a previous run's dev server still shutting down. Waited ${Math.round(waitMs / 1e3)}s for it to exit. Stop it (\`deepspace dev kill\`) or pass --port <other>, then re-run.`,
-    "port_in_use",
-    { extra: { port } }
-  );
-}
-async function isHttpResponding(port, timeoutMs = 2e3) {
-  try {
-    await fetch(`http://127.0.0.1:${port}/`, { signal: AbortSignal.timeout(timeoutMs) });
-    return true;
-  } catch {
-    return false;
-  }
-}
 function resolvePort(arg) {
   const raw = arg ?? process.env.DEEPSPACE_PORT;
   if (!raw) return DEFAULT_PORT;
@@ -3806,16 +3813,11 @@ var dev_default = defineDeepspaceCommand({
     });
     const wranglerConfig = prepareWranglerEnvConfig(appDir, wranglerEnv);
     preflightWindowsWorkerd(appDir);
-    if (await isPortListening(port, host)) {
-      const killArgv = port === DEFAULT_PORT ? ["deepspace", "dev", "kill"] : ["deepspace", "dev", "kill", "--port", String(port)];
-      const killCmd = killArgv.join(" ");
+    try {
+      await ensurePortFree(port, host);
+    } catch (err) {
       wranglerConfig.cleanup();
-      throw new Refusal(
-        `Port ${port} is already in use.
-Free it with \`${killCmd}\`, or start on another port: \`deepspace dev start --port <other>\`.`,
-        "port_in_use",
-        { extra: { port } }
-      );
+      throw err;
     }
     const url = `http://${host === DEFAULT_DEV_HOST ? "localhost" : host}:${port}`;
     say("Starting dev server...\n");
@@ -4478,6 +4480,7 @@ var test_default = defineDeepspaceCommand({
     const configuredPort = Boolean(args.port) || Boolean(process.env.DEEPSPACE_PORT);
     const worktreePort = configuredPort ? null : resolveWorktreePort(appDir);
     const port = worktreePort ?? resolvePort(args.port);
+    if (suite !== "unit") await ensurePortFree(port, "0.0.0.0");
     let token;
     let ownerId;
     try {
@@ -4530,7 +4533,6 @@ var test_default = defineDeepspaceCommand({
     if (suite !== "unit") {
       preflightWindowsWorkerd(appDir);
       ensurePlaywright(appDir);
-      await assertReusableDevServer(port);
     }
     let exitCode = 0;
     let skippedSpecs = [];
@@ -4546,7 +4548,9 @@ var test_default = defineDeepspaceCommand({
         break;
       case "unit":
         if (forwarded.grep || forwarded.project || forwarded.headed) {
-          console.error("note: --grep/--project/--headed apply to Playwright suites and are ignored by `unit`");
+          console.error(
+            "note: --grep/--project/--headed apply to Playwright suites and are ignored by `unit`"
+          );
         }
         exitCode = runVitest(appDir, wranglerEnv);
         break;
@@ -4616,6 +4620,18 @@ function runVitest(appDir, wranglerEnv) {
 // src/cli/commands/screenshot.ts
 import { sync as spawnSync6 } from "cross-spawn";
 import { resolve as resolve11 } from "path";
+var DEFAULT_SCREENSHOT_WAIT_MS = 1e3;
+function normalizeWaitTimeout(value) {
+  if (value === void 0) return DEFAULT_SCREENSHOT_WAIT_MS;
+  const text2 = String(value).trim();
+  if (!/^\d+$/.test(text2) || !Number.isSafeInteger(Number(text2))) {
+    throw new Refusal(
+      "Screenshot wait timeout must be a non-negative whole number of milliseconds.",
+      "invalid_wait_timeout"
+    );
+  }
+  return Number(text2);
+}
 function normalizeViewportSize(value) {
   if (value === void 0) return void 0;
   const match = /^(\d+)\s*[x,]\s*(\d+)$/i.exec(String(value).trim());
@@ -4657,25 +4673,32 @@ var screenshot_default = defineDeepspaceCommand({
     },
     "wait-for-timeout": {
       type: "string",
-      description: "Milliseconds to wait before capture",
+      description: `Milliseconds to settle before capture (default ${DEFAULT_SCREENSHOT_WAIT_MS}, 0 disables)`,
+      required: false
+    },
+    "wait-for-selector": {
+      type: "string",
+      description: "Visible selector to await before capture (off by default)",
       required: false
     }
   },
   async run({ args }) {
+    routeChildStdoutToStderr(args.json === true);
     const viewport = normalizeViewportSize(args.viewport);
+    const waitForTimeout = normalizeWaitTimeout(args["wait-for-timeout"]);
     const appDir = resolve11(".");
     ensurePlaywright(appDir);
     const url = String(args.url);
     const output = String(args.output);
     const playwrightArgs = ["playwright", "screenshot", url, output];
+    const waitForSelector = args["wait-for-selector"] === void 0 ? "" : String(args["wait-for-selector"]);
     if (args["full-page"]) playwrightArgs.push("--full-page");
     if (viewport) playwrightArgs.push("--viewport-size", viewport);
-    if (args["wait-for-timeout"] !== void 0) {
-      playwrightArgs.push("--wait-for-timeout", String(args["wait-for-timeout"]));
-    }
+    if (waitForSelector) playwrightArgs.push("--wait-for-selector", waitForSelector);
+    if (waitForTimeout !== 0) playwrightArgs.push("--wait-for-timeout", String(waitForTimeout));
     const result = spawnSync6("npx", playwrightArgs, {
       cwd: appDir,
-      stdio: "inherit"
+      stdio: childStdio()
     });
     if (result.status !== 0) {
       throw new Refusal(
@@ -4684,7 +4707,14 @@ var screenshot_default = defineDeepspaceCommand({
       );
     }
     return {
-      data: { url, output, fullPage: Boolean(args["full-page"]), viewport: viewport ?? null }
+      data: {
+        url,
+        output,
+        fullPage: Boolean(args["full-page"]),
+        viewport: viewport ?? null,
+        waitForSelector: waitForSelector || null,
+        waitForTimeout
+      }
     };
   }
 });
@@ -7299,6 +7329,7 @@ var deploy_default = defineCommand3({
   },
   async run({ args }) {
     const output = createDeployOutput(args.json === true);
+    setPlainProgress(output.json);
     try {
       await runDeploy(args, output);
     } catch (error) {
@@ -8169,6 +8200,8 @@ function formatDate(iso) {
 function renderSummary(summary) {
   const { credits, usageByIntegration } = summary;
   const lines = [];
+  lines.push("Account usage (all apps)");
+  lines.push("");
   const renews = credits.subscription.renewsAt ? ` \xB7 renews ${formatDate(credits.subscription.renewsAt)}` : "";
   lines.push(`Plan:     ${credits.subscription.tier}${renews}`);
   lines.push(
@@ -8197,7 +8230,9 @@ function renderSummary(summary) {
     const nameWidth = Math.max(11, ...usageByIntegration.map((u) => u.name.length));
     lines.push(`${"INTEGRATION".padEnd(nameWidth)}  CALLS  COST`);
     for (const u of usageByIntegration) {
-      lines.push(`${u.name.padEnd(nameWidth)}  ${String(u.count).padEnd(5)}  ${formatUsd(u.totalCost)}`);
+      lines.push(
+        `${u.name.padEnd(nameWidth)}  ${String(u.count).padEnd(5)}  ${formatUsd(u.totalCost)}`
+      );
     }
   }
   lines.push("");
@@ -8207,13 +8242,13 @@ function renderSummary(summary) {
 var usage_default = defineDeepspaceCommand({
   meta: {
     name: "usage",
-    description: "Show credit balance, quota headroom, and per-integration spend"
+    description: "Show account-wide credits and integration spend (all apps)"
   },
   async run({ args }) {
     const token = await ensureToken();
     const summary = await apiFetch(API_URL3, token, "/api/usage/summary");
     if (!args.json) console.log(renderSummary(summary));
-    return { data: { ...summary } };
+    return { data: { scope: "account", ...summary } };
   }
 });
 
@@ -15070,7 +15105,7 @@ import { join as join28, resolve as resolve22 } from "path";
 // package.json
 var package_default = {
   name: "deepspace",
-  version: "0.26.0",
+  version: "0.26.1",
   engines: {
     node: ">=22.15.0 <23 || >=24 <25 || >=26 <27"
   },