deepspace 0.2.7 → 0.3.2

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli/cli.ts
-import { defineCommand as defineCommand13, runMain } from "citty";
+import { defineCommand as defineCommand14, runMain } from "citty";
 import { execSync as execSync5 } from "child_process";
 import { readFileSync as readFileSync9, existsSync as existsSync11 } from "fs";
 import { dirname as dirname2, join as join12 } from "path";
@@ -75,12 +75,127 @@ async function mintAppOwnerJwt(authUrl, callerJwt, appName) {
   }
   return body.token;
 }
+var SDK_MANAGED_KEYS = /* @__PURE__ */ new Set([
+  "AUTH_JWT_PUBLIC_KEY",
+  "AUTH_JWT_ISSUER",
+  "AUTH_WORKER_URL",
+  "API_WORKER_URL",
+  "PLATFORM_WORKER_URL",
+  "OWNER_USER_ID",
+  "APP_OWNER_JWT",
+  "INTERNAL_STORAGE_HMAC_SECRET",
+  "ALLOW_DEBUG_ROUTES"
+]);
+var DEV_VARS_DIVIDER = "# --- not managed by the SDK; preserved across dev/test runs ---";
+function extractCustomDevVars(content) {
+  const lines = content.split("\n");
+  const out = [];
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line.trim() === DEV_VARS_DIVIDER.trim()) {
+      i++;
+      continue;
+    }
+    const eq = line.indexOf("=");
+    const keyMatch = eq >= 0 ? line.slice(0, eq).match(/^\s*([A-Za-z_][A-Za-z0-9_]*)\s*$/) : null;
+    if (!keyMatch) {
+      out.push(line);
+      i++;
+      continue;
+    }
+    const key = keyMatch[1];
+    const valStart = line.slice(eq + 1);
+    const block = [line];
+    if (valStart.startsWith('"') && !hasUnescapedQuote(valStart.slice(1))) {
+      i++;
+      while (i < lines.length) {
+        block.push(lines[i]);
+        const closed = hasUnescapedQuote(lines[i]);
+        i++;
+        if (closed) break;
+      }
+    } else {
+      i++;
+    }
+    if (!SDK_MANAGED_KEYS.has(key)) {
+      out.push(...block);
+    }
+  }
+  while (out.length && out[out.length - 1].trim() === "") out.pop();
+  return out.join("\n");
+}
+function hasUnescapedQuote(s) {
+  let escaped = false;
+  for (const ch of s) {
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (ch === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') return true;
+  }
+  return false;
+}
+function parseDevVars(content) {
+  const result = {};
+  const lines = content.split("\n");
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      i++;
+      continue;
+    }
+    const eq = line.indexOf("=");
+    if (eq < 0) {
+      i++;
+      continue;
+    }
+    const keyMatch = line.slice(0, eq).match(/^\s*([A-Za-z_][A-Za-z0-9_]*)\s*$/);
+    if (!keyMatch) {
+      i++;
+      continue;
+    }
+    const key = keyMatch[1];
+    let value = line.slice(eq + 1);
+    let closed = !value.startsWith('"') || hasUnescapedQuote(value.slice(1));
+    if (!closed) {
+      i++;
+      while (i < lines.length) {
+        value += "\n" + lines[i];
+        if (hasUnescapedQuote(lines[i])) {
+          closed = true;
+          i++;
+          break;
+        }
+        i++;
+      }
+    } else {
+      i++;
+    }
+    if (value.startsWith('"') && !closed) {
+      throw new Error(
+        `parseDevVars: unterminated quoted value for key "${key}" \u2014 check your .dev.vars file for a missing closing quote.`
+      );
+    }
+    if (value.startsWith('"') && value.endsWith('"') && value.length >= 2) {
+      value = value.slice(1, -1).replace(/\\"/g, '"');
+    }
+    result[key] = value;
+  }
+  return result;
+}
 async function writeDevVars(appDir, env, ownerId, callerJwt) {
   const urls = ENVS[env];
   const publicKey = await fetchPublicKey(urls.auth);
   const appName = readAppName(appDir);
   const appOwnerJwt = await mintAppOwnerJwt(urls.auth, callerJwt, appName);
-  const devVars = [
+  const sdkVars = [
     `AUTH_JWT_PUBLIC_KEY="${publicKey}"`,
     `AUTH_JWT_ISSUER=${urls.auth}/api/auth`,
     `AUTH_WORKER_URL=${urls.auth}`,
@@ -93,7 +208,16 @@ async function writeDevVars(appDir, env, ownerId, callerJwt) {
     // Production secrets never set this, so deployed apps 404 the route.
     `ALLOW_DEBUG_ROUTES=true`
   ].join("\n");
-  writeFileSync(join(appDir, ".dev.vars"), devVars + "\n");
+  const devVarsPath = join(appDir, ".dev.vars");
+  const existing = existsSync(devVarsPath) ? readFileSync(devVarsPath, "utf-8") : "";
+  const custom = extractCustomDevVars(existing);
+  const body = custom ? `${sdkVars}
+
+${DEV_VARS_DIVIDER}
+${custom}
+` : `${sdkVars}
+`;
+  writeFileSync(devVarsPath, body);
 }
 
 // src/cli/session.ts
@@ -392,13 +516,174 @@ function resolvePort(arg) {
   return n;
 }
 
-// src/cli/commands/test.ts
+// src/cli/commands/kill.ts
 import { defineCommand as defineCommand4 } from "citty";
+import { spawnSync } from "child_process";
+import { setTimeout as wait } from "timers/promises";
+var DEFAULT_PORT2 = 5173;
+var SIGTERM_GRACE_MS = 1500;
+var IS_WIN = process.platform === "win32";
+var kill_default = defineCommand4({
+  meta: {
+    name: "kill",
+    description: "Kill the local dev server and any orphaned workerd processes"
+  },
+  args: {
+    port: {
+      type: "string",
+      description: `Port the dev server is bound to (default ${DEFAULT_PORT2}, or $DEEPSPACE_PORT)`,
+      required: false
+    },
+    all: {
+      type: "boolean",
+      description: "Also kill stray workerd/wrangler processes across all ports",
+      default: false
+    }
+  },
+  async run({ args }) {
+    const port = resolvePort2(args.port);
+    const targets = /* @__PURE__ */ new Set();
+    for (const pid of listenerPids(port)) targets.add(pid);
+    for (const pid of [...targets]) {
+      for (const child of childPids(pid)) targets.add(child);
+    }
+    if (args.all) {
+      for (const pid of processPidsByName(["workerd", "wrangler", "vite"])) {
+        targets.add(pid);
+      }
+    }
+    if (targets.size === 0) {
+      console.log(
+        args.all ? `Nothing listening on :${port} and no stray workerd/wrangler/vite processes found.` : `Nothing listening on :${port}. (Pass --all to sweep stray workerd/wrangler.)`
+      );
+      return;
+    }
+    for (const pid of targets) {
+      if (sendSignal(pid, "SIGTERM")) {
+        console.log(`SIGTERM \u2192 pid ${pid}`);
+      }
+    }
+    await wait(SIGTERM_GRACE_MS);
+    const stillAlive = [];
+    for (const pid of targets) {
+      if (isAlive(pid)) stillAlive.push(pid);
+    }
+    for (const pid of stillAlive) {
+      if (sendSignal(pid, "SIGKILL")) {
+        console.log(`SIGKILL \u2192 pid ${pid} (did not exit on SIGTERM)`);
+      }
+    }
+    await wait(200);
+    const remaining = listenerPids(port);
+    if (remaining.length > 0) {
+      console.error(
+        `Port ${port} is still held by pid(s) ${remaining.join(", ")} \u2014 try \`deepspace kill --port ${port}\` again, or kill manually.`
+      );
+      process.exit(1);
+    }
+    console.log(`Port ${port} is free.`);
+  }
+});
+function resolvePort2(arg) {
+  const raw = arg ?? process.env.DEEPSPACE_PORT;
+  if (!raw) return DEFAULT_PORT2;
+  const n = Number(raw);
+  if (!Number.isInteger(n) || n < 1 || n > 65535) {
+    console.error(`Invalid port: ${raw}. Must be an integer between 1 and 65535.`);
+    process.exit(1);
+  }
+  return n;
+}
+function listenerPids(port) {
+  if (IS_WIN) {
+    return runPowershell(
+      `Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -ExpandProperty OwningProcess`
+    );
+  }
+  return run(["lsof", "-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"]);
+}
+function childPids(parentPid) {
+  if (IS_WIN) {
+    return runPowershell(
+      `Get-CimInstance Win32_Process -Filter "ParentProcessId=${parentPid}" | Select-Object -ExpandProperty ProcessId`
+    );
+  }
+  return run(["pgrep", "-P", String(parentPid)]);
+}
+function processPidsByName(names) {
+  const all = /* @__PURE__ */ new Set();
+  if (IS_WIN) {
+    const orClauses = names.map((n) => `($_.Name -like '*${n}*') -or ($_.CommandLine -like '*${n}*')`).join(" -or ");
+    const script = `Get-CimInstance Win32_Process | Where-Object { ${orClauses} } | Select-Object -ExpandProperty ProcessId`;
+    for (const pid of runPowershell(script)) {
+      if (pid !== process.pid) all.add(pid);
+    }
+    return [...all];
+  }
+  for (const name of names) {
+    for (const pid of run(["pgrep", "-f", name])) {
+      if (pid !== process.pid) all.add(pid);
+    }
+  }
+  return [...all];
+}
+function run(cmd) {
+  try {
+    const r = spawnSync(cmd[0], cmd.slice(1), { encoding: "utf-8" });
+    if (r.status !== 0) return [];
+    return parsePidLines(r.stdout);
+  } catch {
+    return [];
+  }
+}
+function runPowershell(script) {
+  const exe = pwshOrPowershell();
+  try {
+    const r = spawnSync(
+      exe,
+      ["-NoProfile", "-NonInteractive", "-Command", script],
+      { encoding: "utf-8" }
+    );
+    if (r.status !== 0) return [];
+    return parsePidLines(r.stdout);
+  } catch {
+    return [];
+  }
+}
+function pwshOrPowershell() {
+  const probe = spawnSync("pwsh", ["-NoProfile", "-Command", "$PSVersionTable.PSVersion.Major"], {
+    encoding: "utf-8"
+  });
+  if (probe.status === 0) return "pwsh";
+  return "powershell.exe";
+}
+function parsePidLines(stdout) {
+  return stdout.split(/\s+/).map((s) => Number.parseInt(s, 10)).filter((n) => Number.isFinite(n) && n > 0);
+}
+function sendSignal(pid, signal) {
+  try {
+    process.kill(pid, signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/cli/commands/test.ts
+import { defineCommand as defineCommand5 } from "citty";
 import { existsSync as existsSync5 } from "fs";
 import { join as join6, resolve as resolve2 } from "path";
-import { execSync, spawnSync } from "child_process";
-var DEFAULT_PORT2 = 5173;
-var test_default = defineCommand4({
+import { execSync, spawnSync as spawnSync2 } from "child_process";
+var DEFAULT_PORT3 = 5173;
+var test_default = defineCommand5({
   meta: {
     name: "test",
     description: "Run tests for your DeepSpace app"
@@ -411,14 +696,14 @@ var test_default = defineCommand4({
     },
     port: {
       type: "string",
-      description: `Port for vite/webServer (default ${DEFAULT_PORT2}, or $DEEPSPACE_PORT)`,
+      description: `Port for vite/webServer (default ${DEFAULT_PORT3}, or $DEEPSPACE_PORT)`,
       required: false
     }
   },
   async run({ args }) {
     const appDir = resolve2(".");
     const suite = args.suite ?? "default";
-    const port = resolvePort2(args.port);
+    const port = resolvePort3(args.port);
     if (!existsSync5(join6(appDir, "wrangler.toml"))) {
       console.error("No wrangler.toml found. Are you in a DeepSpace app directory?");
       process.exit(1);
@@ -471,7 +756,7 @@ var test_default = defineCommand4({
   }
 });
 function runPlaywright(appDir, testFiles, port) {
-  const result = spawnSync("npx", [
+  const result = spawnSync2("npx", [
     "playwright",
     "test",
     "--config",
@@ -486,7 +771,7 @@ function runPlaywright(appDir, testFiles, port) {
   return result.status ?? 1;
 }
 function runVitest(appDir) {
-  const result = spawnSync("npx", ["vitest", "run", "--passWithNoTests"], {
+  const result = spawnSync2("npx", ["vitest", "run", "--passWithNoTests"], {
     cwd: appDir,
     stdio: "inherit",
     shell: process.platform === "win32"
@@ -503,16 +788,16 @@ function ensurePlaywright(appDir) {
   const isLinux = process.platform === "linux";
   const isRoot = isLinux && typeof process.getuid === "function" && process.getuid() === 0;
   const args = isRoot ? ["install", "--with-deps", "chromium"] : ["install", "chromium"];
-  const result = spawnSync("npx", ["playwright", ...args], { cwd: appDir, stdio: "inherit" });
+  const result = spawnSync2("npx", ["playwright", ...args], { cwd: appDir, stdio: "inherit" });
   if (result.status !== 0) {
     console.error("\nPlaywright install failed. On Linux, system libs may be missing \u2014 try:");
     console.error("  sudo npx playwright install --with-deps chromium");
     process.exit(1);
   }
 }
-function resolvePort2(arg) {
+function resolvePort3(arg) {
   const raw = arg ?? process.env.DEEPSPACE_PORT;
-  if (!raw) return DEFAULT_PORT2;
+  if (!raw) return DEFAULT_PORT3;
   const n = Number(raw);
   if (!Number.isInteger(n) || n < 1 || n > 65535) {
     console.error(`Invalid port: ${raw}. Must be an integer between 1 and 65535.`);
@@ -522,7 +807,7 @@ function resolvePort2(arg) {
 }
 
 // src/cli/commands/test-accounts.ts
-import { defineCommand as defineCommand5 } from "citty";
+import { defineCommand as defineCommand6 } from "citty";
 import * as p2 from "@clack/prompts";
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, existsSync as existsSync6, mkdirSync as mkdirSync3 } from "fs";
 import { join as join7 } from "path";
@@ -567,7 +852,7 @@ async function deleteRemote(id) {
     throw new Error(data.error ?? `DELETE returned ${res.status}`);
   }
 }
-var create = defineCommand5({
+var create = defineCommand6({
   meta: {
     name: "create",
     description: "Create a test account"
@@ -637,7 +922,7 @@ var create = defineCommand5({
 Saved to ${ACCOUNTS_PATH}`);
   }
 });
-var list = defineCommand5({
+var list = defineCommand6({
   meta: {
     name: "list",
     description: "List your test accounts"
@@ -672,7 +957,7 @@ var list = defineCommand5({
     }
   }
 });
-var del = defineCommand5({
+var del = defineCommand6({
   meta: {
     name: "delete",
     description: "Delete a test account by --email or --id"
@@ -729,7 +1014,7 @@ var del = defineCommand5({
     console.log(`Test account deleted${targetEmail ? `: ${targetEmail}` : `: ${targetId}`}`);
   }
 });
-var clear = defineCommand5({
+var clear = defineCommand6({
   meta: {
     name: "clear",
     description: "Delete all your test accounts (or those matching --label)"
@@ -795,7 +1080,7 @@ Failed:`);
     }
   }
 });
-var test_accounts_default = defineCommand5({
+var test_accounts_default = defineCommand6({
   meta: {
     name: "test-accounts",
     description: "Manage test accounts for development"
@@ -809,14 +1094,272 @@ var test_accounts_default = defineCommand5({
 });
 
 // src/cli/commands/deploy.ts
-import { defineCommand as defineCommand6 } from "citty";
+import { defineCommand as defineCommand7 } from "citty";
 import { execSync as execSync2 } from "child_process";
 import { readFileSync as readFileSync5, readdirSync, existsSync as existsSync7 } from "fs";
 import { parse as parseToml2 } from "smol-toml";
 import { join as join8, resolve as resolve3, dirname } from "path";
 import * as p3 from "@clack/prompts";
+
+// src/server/rooms/binding-manifest.ts
+var AUTO_PROVISION_SENTINEL = "auto";
+var VECTORIZE_METRICS = /* @__PURE__ */ new Set(["cosine", "euclidean", "dot-product"]);
+var ALLOWED_BINDING_TYPES = /* @__PURE__ */ new Set([
+  "vectorize",
+  "ai",
+  "r2_bucket",
+  "kv_namespace",
+  "d1",
+  "queue",
+  "browser_rendering",
+  "analytics_engine",
+  "hyperdrive"
+]);
+var RESERVED_BINDING_NAMES = /* @__PURE__ */ new Set([
+  "ASSETS",
+  "PLATFORM_WORKER",
+  "API_WORKER",
+  "APP_NAME",
+  "OWNER_USER_ID",
+  "AUTH_JWT_PUBLIC_KEY",
+  "AUTH_JWT_ISSUER",
+  "AUTH_WORKER_URL",
+  "APP_IDENTITY_TOKEN",
+  "APP_OWNER_JWT",
+  "INTERNAL_STORAGE_HMAC_SECRET",
+  "USAGE_EVENTS"
+]);
+function validateBindingManifest(manifest) {
+  if (!Array.isArray(manifest)) {
+    return { valid: false, errors: [{ reason: "Manifest must be an array" }] };
+  }
+  const errors = [];
+  const seenNames = /* @__PURE__ */ new Set();
+  for (const entry of manifest) {
+    if (!entry || typeof entry !== "object") {
+      errors.push({ reason: `Entry must be an object (got ${entry === null ? "null" : typeof entry})` });
+      continue;
+    }
+    const e = entry;
+    const type = e.type;
+    const name = e.name;
+    if (typeof type !== "string" || !ALLOWED_BINDING_TYPES.has(type)) {
+      errors.push({
+        reason: `Disallowed binding type: ${typeof type === "string" ? type : `(${typeof type})`}. Allowed: ${[...ALLOWED_BINDING_TYPES].sort().join(", ")}`
+      });
+      continue;
+    }
+    if (typeof name !== "string" || !name) {
+      errors.push({ reason: `Binding of type "${type}" missing 'name' (string)` });
+      continue;
+    }
+    if (RESERVED_BINDING_NAMES.has(name)) {
+      errors.push({ reason: `Binding name "${name}" is reserved by the SDK` });
+      continue;
+    }
+    if (seenNames.has(name)) {
+      errors.push({ reason: `Duplicate binding name "${name}"` });
+      continue;
+    }
+    seenNames.add(name);
+    const binding = entry;
+    const fieldErr = requiredFieldError(binding);
+    if (fieldErr) errors.push({ binding, reason: fieldErr });
+  }
+  if (errors.length) return { valid: false, errors };
+  return { valid: true, bindings: manifest };
+}
+function requiredFieldError(b) {
+  switch (b.type) {
+    case "vectorize": {
+      if (!b.index_name) return `vectorize binding "${b.name}" missing index_name (or "auto")`;
+      if (b.index_name === AUTO_PROVISION_SENTINEL) {
+        if (typeof b.dimensions !== "number" || b.dimensions <= 0) {
+          return `vectorize binding "${b.name}" with index_name="auto" requires "dimensions" (positive number)`;
+        }
+        if (!b.metric || !VECTORIZE_METRICS.has(b.metric)) {
+          return `vectorize binding "${b.name}" with index_name="auto" requires "metric" (one of: ${[...VECTORIZE_METRICS].join(", ")})`;
+        }
+      }
+      return null;
+    }
+    case "r2_bucket":
+      return b.bucket_name ? null : `r2_bucket binding "${b.name}" missing bucket_name (or "auto")`;
+    case "kv_namespace": {
+      if (!b.namespace_id) return `kv_namespace binding "${b.name}" missing namespace_id (or "auto")`;
+      if (b.namespace_id === AUTO_PROVISION_SENTINEL && !b.title) {
+        return `kv_namespace binding "${b.name}" with namespace_id="auto" requires "title"`;
+      }
+      return null;
+    }
+    case "d1": {
+      if (!b.id) return `d1 binding "${b.name}" missing id (or "auto")`;
+      if (b.id === AUTO_PROVISION_SENTINEL && !b.database_name) {
+        return `d1 binding "${b.name}" with id="auto" requires "database_name"`;
+      }
+      return null;
+    }
+    case "queue":
+      return b.queue_name ? null : `queue binding "${b.name}" missing queue_name (or "auto")`;
+    case "hyperdrive":
+      if (!b.id) return `hyperdrive binding "${b.name}" missing id`;
+      if (b.id === AUTO_PROVISION_SENTINEL) {
+        return `hyperdrive binding "${b.name}": auto-provisioning not yet supported (provide a real id)`;
+      }
+      return null;
+    case "ai":
+    case "browser_rendering":
+    case "analytics_engine":
+      return null;
+    // no required fields beyond `name`
+    default: {
+      const _exhaustive = b;
+      void _exhaustive;
+      return null;
+    }
+  }
+}
+function bindingManifestFromOutputConfig(outputConfig) {
+  const out = [];
+  const aiBinding = pluckString(outputConfig.ai, "binding");
+  if (aiBinding) out.push({ type: "ai", name: aiBinding });
+  for (const v of asObjectArray(outputConfig.vectorize)) {
+    const name = pluckString(v, "binding");
+    const index_name = pluckString(v, "index_name");
+    if (!name || !index_name) continue;
+    const dimensions = pluckNumber(v, "dimensions");
+    const metric = pluckString(v, "metric");
+    out.push({
+      type: "vectorize",
+      name,
+      index_name,
+      ...dimensions != null && { dimensions },
+      ...metric && (metric === "cosine" || metric === "euclidean" || metric === "dot-product") && { metric }
+    });
+  }
+  for (const r of asObjectArray(outputConfig.r2_buckets)) {
+    const name = pluckString(r, "binding");
+    const bucket_name = pluckString(r, "bucket_name");
+    if (name && bucket_name) out.push({ type: "r2_bucket", name, bucket_name });
+  }
+  for (const k of asObjectArray(outputConfig.kv_namespaces)) {
+    const name = pluckString(k, "binding");
+    const namespace_id = pluckString(k, "id");
+    if (!name || !namespace_id) continue;
+    const title = pluckString(k, "title");
+    out.push({
+      type: "kv_namespace",
+      name,
+      namespace_id,
+      ...title && { title }
+    });
+  }
+  for (const d of asObjectArray(outputConfig.d1_databases)) {
+    const name = pluckString(d, "binding");
+    const id = pluckString(d, "database_id");
+    if (!name || !id) continue;
+    const database_name = pluckString(d, "database_name");
+    out.push({
+      type: "d1",
+      name,
+      id,
+      ...database_name && { database_name }
+    });
+  }
+  const queues = isObject(outputConfig.queues) ? outputConfig.queues : null;
+  for (const q of asObjectArray(queues?.producers)) {
+    const name = pluckString(q, "binding");
+    const queue_name = pluckString(q, "queue");
+    if (name && queue_name) out.push({ type: "queue", name, queue_name });
+  }
+  const browserBinding = pluckString(outputConfig.browser, "binding");
+  if (browserBinding) out.push({ type: "browser_rendering", name: browserBinding });
+  for (const a of asObjectArray(outputConfig.analytics_engine_datasets)) {
+    const name = pluckString(a, "binding");
+    const dataset = pluckString(a, "dataset");
+    if (name) out.push({ type: "analytics_engine", name, dataset: dataset ?? void 0 });
+  }
+  for (const h of asObjectArray(outputConfig.hyperdrive)) {
+    const name = pluckString(h, "binding");
+    const id = pluckString(h, "id");
+    if (name && id) out.push({ type: "hyperdrive", name, id });
+  }
+  return out;
+}
+function isObject(v) {
+  return v !== null && typeof v === "object" && !Array.isArray(v);
+}
+function pluckString(v, key) {
+  if (!isObject(v)) return null;
+  const val = v[key];
+  return typeof val === "string" && val.length > 0 ? val : null;
+}
+function pluckNumber(v, key) {
+  if (!isObject(v)) return null;
+  const val = v[key];
+  return typeof val === "number" && Number.isFinite(val) ? val : null;
+}
+function asObjectArray(v) {
+  if (!Array.isArray(v)) return [];
+  return v.filter(isObject);
+}
+
+// src/server/rooms/app-name.ts
+var APP_NAME_RULES = {
+  /** ^[a-z0-9](-?[a-z0-9])+$ — RFC 1035 host label, no consecutive dashes. */
+  pattern: /^[a-z0-9](?:-?[a-z0-9])+$/,
+  minLength: 2,
+  maxLength: 63
+};
+function validateAppName(raw) {
+  if (typeof raw !== "string") {
+    return { valid: false, reason: "App name must be a string" };
+  }
+  const name = raw.trim();
+  if (!name) {
+    return { valid: false, reason: "App name is required" };
+  }
+  if (name.length < APP_NAME_RULES.minLength) {
+    return { valid: false, reason: `App name "${name}" is too short (min ${APP_NAME_RULES.minLength} chars)` };
+  }
+  if (name.length > APP_NAME_RULES.maxLength) {
+    return { valid: false, reason: `App name "${name}" is too long (max ${APP_NAME_RULES.maxLength} chars)` };
+  }
+  if (!APP_NAME_RULES.pattern.test(name)) {
+    return {
+      valid: false,
+      reason: `App name "${name}" is invalid. Use lowercase letters, digits, and single hyphens only (must start + end with alphanumeric). Examples: my-app, search-v2, unison-search.`
+    };
+  }
+  return { valid: true, name };
+}
+function resolveAppName(raw) {
+  const strict = validateAppName(raw);
+  if (strict.valid) return { ok: true, name: strict.name };
+  if (typeof raw !== "string") return { ok: false, reason: strict.reason };
+  const trimmed = raw.trim();
+  if (!trimmed) return { ok: false, reason: "App name is required" };
+  const sanitized = sanitizeAppName(trimmed);
+  const sanitizedStrict = validateAppName(sanitized);
+  if (!sanitizedStrict.valid) {
+    return {
+      ok: false,
+      reason: `App name "${trimmed}" can't be sanitized into a valid name (${sanitizedStrict.reason}). Pick something matching: lowercase letters, digits, single hyphens, ${APP_NAME_RULES.minLength}-${APP_NAME_RULES.maxLength} chars.`
+    };
+  }
+  return {
+    ok: true,
+    name: sanitized,
+    warning: `App name "${trimmed}" doesn't conform to deploy rules \u2014 using "${sanitized}" instead. Update wrangler.toml's \`name\` to silence this warning.`
+  };
+}
+function sanitizeAppName(raw) {
+  return raw.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
+}
+
+// src/cli/commands/deploy.ts
 var DEPLOY_URL = process.env.DEEPSPACE_DEPLOY_URL ?? ENVS.prod.deploy;
-var deploy_default = defineCommand6({
+var deploy_default = defineCommand7({
   meta: {
     name: "deploy",
     description: "Build and deploy your DeepSpace app"
@@ -837,11 +1380,13 @@ var deploy_default = defineCommand6({
       process.exit(1);
     }
     const wranglerConfig = parseToml2(readFileSync5(wranglerPath, "utf-8"));
-    const appName = wranglerConfig.name;
-    if (!appName) {
-      p3.cancel("Could not find app name in wrangler.toml");
+    const nameRes = resolveAppName(wranglerConfig.name);
+    if (!nameRes.ok) {
+      p3.cancel(`wrangler.toml: ${nameRes.reason}`);
       process.exit(1);
     }
+    if (nameRes.warning) p3.log.warn(nameRes.warning);
+    const appName = nameRes.name;
     p3.log.info(`App: ${appName}`);
     let token;
     try {
@@ -899,6 +1444,55 @@ var deploy_default = defineCommand6({
     if (doManifest?.length) {
       p3.log.info(`DO manifest: ${doManifest.length} binding(s)`);
     }
+    const customBindings = bindingManifestFromOutputConfig(outputConfig);
+    const validation = validateBindingManifest(customBindings);
+    if (!validation.valid) {
+      p3.cancel(
+        `Invalid binding(s) in wrangler.toml:
+` + validation.errors.map((e) => `  \u2022 ${e.reason}`).join("\n")
+      );
+      process.exit(1);
+    }
+    if (customBindings.length) {
+      p3.log.info(
+        `Custom bindings: ${customBindings.map((b) => `${b.name} (${b.type})`).join(", ")}`
+      );
+    }
+    const devVarsPath = join8(appDir, ".dev.vars");
+    let userSecrets = {};
+    if (existsSync7(devVarsPath)) {
+      const customSection = extractCustomDevVars(readFileSync5(devVarsPath, "utf-8"));
+      if (customSection) {
+        try {
+          userSecrets = parseDevVars(customSection);
+        } catch (err) {
+          p3.cancel(`.dev.vars: ${err.message}`);
+          process.exit(1);
+        }
+      }
+    }
+    const userSecretNames = Object.keys(userSecrets);
+    const declaredBindingNames = /* @__PURE__ */ new Set([
+      ...customBindings.map((b) => b.name),
+      ...(doManifest ?? []).map((d) => d.binding)
+    ]);
+    for (const name of userSecretNames) {
+      if (RESERVED_BINDING_NAMES.has(name)) {
+        p3.cancel(
+          `.dev.vars: "${name}" is a reserved binding name and cannot be used as an app secret.`
+        );
+        process.exit(1);
+      }
+      if (declaredBindingNames.has(name)) {
+        p3.cancel(
+          `.dev.vars: "${name}" collides with a binding declared in wrangler.toml \u2014 rename one or the other.`
+        );
+        process.exit(1);
+      }
+    }
+    if (userSecretNames.length) {
+      p3.log.info(`App secrets (from .dev.vars): ${userSecretNames.join(", ")}`);
+    }
     s.start(`Deploying to ${appName}.app.space...`);
     const form = new FormData();
     form.append("worker", new Blob([workerJs], { type: "application/javascript" }), "worker.js");
@@ -906,6 +1500,12 @@ var deploy_default = defineCommand6({
     if (doManifest) {
       form.append("doManifest", JSON.stringify(doManifest));
     }
+    if (customBindings.length) {
+      form.append("bindingManifest", JSON.stringify(customBindings));
+    }
+    if (userSecretNames.length) {
+      form.append("userSecrets", JSON.stringify(userSecrets));
+    }
     const res = await fetch(`${DEPLOY_URL}/api/deploy/${appName}`, {
       method: "POST",
       headers: { Authorization: `Bearer ${token}` },
@@ -917,11 +1517,40 @@ var deploy_default = defineCommand6({
       p3.cancel(body.error ?? `Deployment error (${res.status})`);
       process.exit(1);
     }
+    if (body.url) {
+      s.message("Waiting for edge propagation...");
+      const ok = await waitForAssetsReady(body.url, 9e4);
+      if (!ok) {
+        s.stop("Deployed (edge propagation still in progress after 90s)");
+        p3.log.warn("First requests may briefly hit the assets transitional page; retry in a minute.");
+        p3.log.success(`Live at: ${body.url}`);
+        p3.outro("Done");
+        return;
+      }
+    }
     s.stop("Deployed!");
     p3.log.success(`Live at: ${body.url}`);
     p3.outro("Done");
   }
 });
+async function waitForAssetsReady(url, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  let attempt = 0;
+  while (Date.now() < deadline) {
+    attempt++;
+    try {
+      const res = await fetch(url, { redirect: "manual" });
+      const body = await res.text();
+      if (!body.includes("Assets have not yet deployed")) {
+        return true;
+      }
+    } catch {
+    }
+    const wait2 = Math.min(8e3, 1e3 * 2 ** (attempt - 1));
+    await new Promise((r) => setTimeout(r, wait2));
+  }
+  return false;
+}
 function collectAssets(dir) {
   const assets = [];
   function walk(d, prefix) {
@@ -944,13 +1573,13 @@ function collectAssets(dir) {
 }
 
 // src/cli/commands/undeploy.ts
-import { defineCommand as defineCommand7 } from "citty";
+import { defineCommand as defineCommand8 } from "citty";
 import { readFileSync as readFileSync6, existsSync as existsSync8 } from "fs";
 import { join as join9 } from "path";
 import { parse as parseToml3 } from "smol-toml";
 import * as p4 from "@clack/prompts";
 var DEPLOY_URL2 = process.env.DEEPSPACE_DEPLOY_URL ?? ENVS.prod.deploy;
-var undeploy_default = defineCommand7({
+var undeploy_default = defineCommand8({
   meta: {
     name: "undeploy",
     description: "Remove a deployed DeepSpace app"
@@ -1001,8 +1630,8 @@ var undeploy_default = defineCommand7({
 });
 
 // src/cli/commands/whoami.ts
-import { defineCommand as defineCommand8 } from "citty";
-var whoami_default = defineCommand8({
+import { defineCommand as defineCommand9 } from "citty";
+var whoami_default = defineCommand9({
   meta: {
     name: "whoami",
     description: "Show the currently logged-in user"
@@ -1056,7 +1685,7 @@ var whoami_default = defineCommand8({
 });
 
 // src/cli/commands/add.ts
-import { defineCommand as defineCommand9 } from "citty";
+import { defineCommand as defineCommand10 } from "citty";
 import { existsSync as existsSync9 } from "fs";
 import { resolve as resolve4, join as join10 } from "path";
 import { execSync as execSync3 } from "child_process";
@@ -1065,7 +1694,7 @@ function findScript(from) {
   if (existsSync9(candidate)) return candidate;
   return null;
 }
-var add_default = defineCommand9({
+var add_default = defineCommand10({
   meta: {
     name: "add",
     description: "Add a feature to your DeepSpace app"
@@ -1119,7 +1748,7 @@ var add_default = defineCommand9({
 });
 
 // src/cli/commands/domain.ts
-import { defineCommand as defineCommand10 } from "citty";
+import { defineCommand as defineCommand11 } from "citty";
 import { execSync as execSync4 } from "child_process";
 
 // src/cli/lib/app-context.ts
@@ -1188,7 +1817,7 @@ async function confirm2(message) {
     });
   });
 }
-var search = defineCommand10({
+var search = defineCommand11({
   meta: { name: "search", description: "Search for available domains" },
   args: {
     query: { type: "positional", description: "Domain or keyword", required: true },
@@ -1218,7 +1847,7 @@ var search = defineCommand10({
     }
   }
 });
-var buy = defineCommand10({
+var buy = defineCommand11({
   meta: { name: "buy", description: "Buy a domain and attach it to an app" },
   args: {
     domain: { type: "positional", description: "Domain to buy", required: true },
@@ -1307,7 +1936,7 @@ var buy = defineCommand10({
     process.exit(1);
   }
 });
-var list2 = defineCommand10({
+var list2 = defineCommand11({
   meta: { name: "list", description: "List your domains" },
   args: {
     json: { type: "boolean", description: "Emit JSON" }
@@ -1331,7 +1960,7 @@ var list2 = defineCommand10({
     }
   }
 });
-var status = defineCommand10({
+var status = defineCommand11({
   meta: { name: "status", description: "Show details for one domain" },
   args: {
     domain: { type: "positional", description: "Domain", required: true },
@@ -1359,7 +1988,7 @@ var status = defineCommand10({
     console.log(`Charged:       ${fmtCents(found.chargedCents)}/yr`);
   }
 });
-var attach = defineCommand10({
+var attach = defineCommand11({
   meta: { name: "attach", description: "Re-point a domain at a different app" },
   args: {
     domain: { type: "positional", description: "Domain to re-point", required: true },
@@ -1390,7 +2019,7 @@ var attach = defineCommand10({
     console.log(`\u2713 ${args.domain} now points at ${targetApp}`);
   }
 });
-var detach = defineCommand10({
+var detach = defineCommand11({
   meta: {
     name: "detach",
     description: "Stop routing the domain (keeps the registration; auto-renew unchanged)"
@@ -1420,7 +2049,7 @@ var detach = defineCommand10({
     console.log(`\u2713 ${args.domain} detached. Use \`deepspace domain attach\` to re-route, or \`renew --auto off\` to stop auto-renewal.`);
   }
 });
-var renew = defineCommand10({
+var renew = defineCommand11({
   meta: { name: "renew", description: "Toggle auto-renewal at the registrar" },
   args: {
     domain: { type: "positional", description: "Domain", required: true },
@@ -1454,13 +2083,13 @@ function openBrowser2(url) {
   } catch {
   }
 }
-var domain_default = defineCommand10({
+var domain_default = defineCommand11({
   meta: { name: "domain", description: "Buy and manage custom domains" },
   subCommands: { search, buy, list: list2, status, attach, detach, renew }
 });
 
 // src/cli/commands/integrations.ts
-import { defineCommand as defineCommand11 } from "citty";
+import { defineCommand as defineCommand12 } from "citty";
 
 // src/cli/commands/_invoke-impl.ts
 import { readFileSync as readFileSync8 } from "fs";
@@ -1634,7 +2263,7 @@ async function runInvoke(args) {
 }
 
 // src/cli/commands/integrations.ts
-var list3 = defineCommand11({
+var list3 = defineCommand12({
   meta: {
     name: "list",
     description: "List all available integrations"
@@ -1655,7 +2284,7 @@ var list3 = defineCommand11({
     }
   }
 });
-var info = defineCommand11({
+var info = defineCommand12({
   meta: {
     name: "info",
     description: "Print schema + example body for an integration endpoint"
@@ -1681,7 +2310,7 @@ var info = defineCommand11({
     }
   }
 });
-var invoke = defineCommand11({
+var invoke = defineCommand12({
   meta: {
     name: "invoke",
     description: "Invoke a platform integration as the logged-in user"
@@ -1734,7 +2363,7 @@ var invoke = defineCommand11({
     }
   }
 });
-var integrations_default = defineCommand11({
+var integrations_default = defineCommand12({
   meta: {
     name: "integrations",
     description: "List, inspect, and invoke platform integrations"
@@ -1747,8 +2376,8 @@ var integrations_default = defineCommand11({
 });
 
 // src/cli/commands/invoke.ts
-import { defineCommand as defineCommand12 } from "citty";
-var invoke_default = defineCommand12({
+import { defineCommand as defineCommand13 } from "citty";
+var invoke_default = defineCommand13({
   meta: {
     name: "invoke",
     description: "Invoke a platform integration as the logged-in user"
@@ -1826,7 +2455,7 @@ var pkg = JSON.parse(readFileSync9(join12(__dirname, "..", "package.json"), "utf
 if (process.platform === "linux" && !process.env.SSL_CERT_FILE && existsSync11("/etc/ssl/certs/ca-certificates.crt")) {
   process.env.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
 }
-var create2 = defineCommand13({
+var create2 = defineCommand14({
   meta: {
     name: "create",
     description: "Create a new DeepSpace app"
@@ -1845,7 +2474,7 @@ var create2 = defineCommand13({
     execSync5(`npm create deepspace@latest${name}`, { stdio: "inherit" });
   }
 });
-var main = defineCommand13({
+var main = defineCommand14({
   meta: {
     name: "deepspace",
     version: pkg.version,
@@ -1857,6 +2486,7 @@ var main = defineCommand13({
     logout: logout_default,
     whoami: whoami_default,
     dev: dev_default,
+    kill: kill_default,
     test: test_default,
     "test-accounts": test_accounts_default,
     add: add_default,