@concavejs/cli 0.0.1-alpha.5 → 0.0.1-alpha.6

package/dist/cli.js

@@ -19,7 +19,7 @@ var __toESM = (mod, isNodeMode, target) => {
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/lib/error.js
+// ../../node_modules/commander/lib/error.js
 var require_error = __commonJS((exports) => {
   class CommanderError extends Error {
     constructor(exitCode, code, message) {
@@ -43,7 +43,7 @@ var require_error = __commonJS((exports) => {
   exports.InvalidArgumentError = InvalidArgumentError;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/lib/argument.js
+// ../../node_modules/commander/lib/argument.js
 var require_argument = __commonJS((exports) => {
   var { InvalidArgumentError } = require_error();
 
@@ -123,7 +123,7 @@ var require_argument = __commonJS((exports) => {
   exports.humanReadableArgName = humanReadableArgName;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/lib/help.js
+// ../../node_modules/commander/lib/help.js
 var require_help = __commonJS((exports) => {
   var { humanReadableArgName } = require_argument();
 
@@ -480,7 +480,7 @@ ${itemIndentStr}`);
   exports.stripColor = stripColor;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/lib/option.js
+// ../../node_modules/commander/lib/option.js
 var require_option = __commonJS((exports) => {
   var { InvalidArgumentError } = require_error();
 
@@ -664,7 +664,7 @@ var require_option = __commonJS((exports) => {
   exports.DualOptions = DualOptions;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/lib/suggestSimilar.js
+// ../../node_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS((exports) => {
   var maxDistance = 3;
   function editDistance(a, b) {
@@ -737,7 +737,7 @@ var require_suggestSimilar = __commonJS((exports) => {
   exports.suggestSimilar = suggestSimilar;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/lib/command.js
+// ../../node_modules/commander/lib/command.js
 var require_command = __commonJS((exports) => {
   var EventEmitter = __require("node:events").EventEmitter;
   var childProcess = __require("node:child_process");
@@ -1596,7 +1596,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         return arg.length > 1 && arg[0] === "-";
       }
       const negativeNumberArg = (arg) => {
-        if (!/^-\d*\.?\d+(e[+-]?\d+)?$/.test(arg))
+        if (!/^-(\d+|\d*\.\d+)(e[+-]?\d+)?$/.test(arg))
           return false;
         return !this._getCommandAndAncestors().some((cmd) => cmd.options.map((opt) => opt.short).some((short) => /^-\d$/.test(short)));
       };
@@ -2092,7 +2092,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.useColor = useColor;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/index.js
+// ../../node_modules/commander/index.js
 var require_commander = __commonJS((exports) => {
   var { Argument } = require_argument();
   var { Command } = require_command();
@@ -2112,7 +2112,7 @@ var require_commander = __commonJS((exports) => {
   exports.InvalidOptionArgumentError = InvalidArgumentError;
 });
 
-// ../../node_modules/.bun/picocolors@1.1.1/node_modules/picocolors/picocolors.js
+// ../../node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS((exports, module) => {
   var p = process || {};
   var argv = p.argv || [];
@@ -4544,7 +4544,7 @@ error: ${text}`);
   var node_default = node_exports;
 });
 
-// ../../node_modules/.bun/commander@14.0.1/node_modules/commander/esm.mjs
+// ../../node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
   program,
@@ -4938,6 +4938,11 @@ async function generateWorkerEntry(projectRoot, options = {}) {
       dashboardWorkerLine = "";
     }
   }
+  const docstoreScheme = options.docstore || "do";
+  const blobstoreScheme = options.blobstore;
+  const { imports: docstoreImports, code: docstoreCode } = getDocstoreSnippet(docstoreScheme);
+  const { imports: blobstoreImports, code: blobstoreCode } = getBlobstoreSnippet(blobstoreScheme);
+  const adapterImports = [...new Set([...docstoreImports, ...blobstoreImports])];
   const runtimeOptions = `{
 	worker: {
 		bindings: {
@@ -4955,12 +4960,8 @@ async function generateWorkerEntry(projectRoot, options = {}) {
 		moduleLoader: createModuleLoaderFromGlob(moduleLoaders, { trimPrefix: ${JSON.stringify(functionsImportPrefix)} }),${dashboardWorkerLine}
 	},
 	durableObject: {
-		docstore: ({ state }) => new DODocStore(state),
-		blobstore: ({ env }) => {
-			const bucket = env.STORAGE_BUCKET;
-			if (!bucket) return undefined;
-			return new R2BlobStore(bucket, env.R2_PUBLIC_URL);
-		},
+		docstore: ${docstoreCode},
+		blobstore: ${blobstoreCode},
 		udfExecutor: ({ env, instance, docstore, blobstore }) => {
 			const disableIsolated = env.DISABLE_ISOLATED_EXECUTION === "true" || env.DISABLE_ISOLATED_EXECUTION === true;
 			if (env.UDF_WORKER && !disableIsolated) {
@@ -4984,8 +4985,8 @@ import {
 	setConcaveModuleLoader,
 	resolveNamespaceBinding,
 	createScopedNamespace,
-	DODocStore,
-	R2BlobStore,
+${adapterImports.map((i) => `	${i},`).join(`
+`)}
 	UdfExecInline,
 	UdfExecIsolated,
 } from "./runtime.bundle.js";
@@ -5295,6 +5296,50 @@ process.on("SIGTERM", shutdown);
     outDir
   };
 }
+function getDocstoreSnippet(scheme) {
+  switch (scheme) {
+    case "d1":
+      return {
+        imports: ["D1DocStore"],
+        code: `({ env }) => new D1DocStore(env.DB)`
+      };
+    case "hyperdrive":
+      return {
+        imports: ["HyperdriveDocStore"],
+        code: `({ env }) => new HyperdriveDocStore(env.HYPERDRIVE)`
+      };
+    case "do":
+    default:
+      return {
+        imports: ["DODocStore"],
+        code: `({ state }) => new DODocStore(state)`
+      };
+  }
+}
+function getBlobstoreSnippet(scheme) {
+  if (!scheme) {
+    return {
+      imports: [],
+      code: `() => undefined`
+    };
+  }
+  switch (scheme) {
+    case "r2":
+      return {
+        imports: ["R2BlobStore"],
+        code: `({ env }) => {
+			const bucket = env.STORAGE_BUCKET;
+			if (!bucket) return undefined;
+			return new R2BlobStore(bucket, env.R2_PUBLIC_URL);
+		}`
+      };
+    default:
+      return {
+        imports: [],
+        code: `() => undefined`
+      };
+  }
+}
 
 // src/cli/config.ts
 import path5 from "node:path";
@@ -5382,6 +5427,8 @@ function createCloudflareState(accountId, workerName, workerUrl, options = {}) {
       accountId,
       workerName,
       workerUrl,
+      docstoreUri: options.docstoreUri,
+      blobstoreUri: options.blobstoreUri,
       d1DatabaseId: options.d1DatabaseId,
       d1DatabaseName: options.d1DatabaseName,
       r2BucketName: options.r2BucketName,
@@ -6089,6 +6136,35 @@ function printDryRunAction(action) {
   console.log(`  ${import_picocolors.default.dim("Would:")} ${action}`);
 }
 
+// src/cli/deploy/backend-uri.ts
+var VALID_SCHEMES = ["do", "d1", "hyperdrive", "r2"];
+function parseBackendUri(uri) {
+  const match = uri.match(/^([a-z0-9-]+):\/\/(.*)$/);
+  if (!match) {
+    throw new Error(`Invalid backend URI: "${uri}". Expected format: <scheme>://[resource] (e.g. "do://", "d1://my-db", "r2://my-bucket")`);
+  }
+  const scheme = match[1];
+  const resource = match[2] || undefined;
+  if (!VALID_SCHEMES.includes(scheme)) {
+    throw new Error(`Unknown backend scheme: "${scheme}". Valid schemes: ${VALID_SCHEMES.join(", ")}`);
+  }
+  return { scheme, resource };
+}
+function resolveBackendResource(parsed, workerName, type) {
+  if (parsed.resource)
+    return parsed.resource;
+  switch (parsed.scheme) {
+    case "do":
+      return;
+    case "d1":
+      return `${workerName}-db`;
+    case "hyperdrive":
+      throw new Error("hyperdrive:// requires a config ID (e.g. hyperdrive://my-config-id)");
+    case "r2":
+      return `${workerName}-storage`;
+  }
+}
+
 // src/cli/deploy/cloudflare.ts
 async function deployToCloudflare(projectRoot, options = {}) {
   const startTime = Date.now();
@@ -6148,10 +6224,18 @@ async function runFirstTimeSetup(projectRoot, _existingState, options) {
   const workerName = options.name || (options.yes ? defaultName : await askWorkerName(defaultName));
   console.log();
   printHeader(`Setting up resources for "${workerName}"`);
+  const config = await loadConfig(projectRoot);
+  const docstoreUri = options.docstore || config.docstore || "do://";
+  const blobstoreUri = options.blobstore || config.blobstore || undefined;
+  const docstoreParsed = parseBackendUri(docstoreUri);
+  const blobstoreParsed = blobstoreUri ? parseBackendUri(blobstoreUri) : undefined;
+  const docstoreResource = resolveBackendResource(docstoreParsed, workerName, "docstore");
+  const blobstoreResource = blobstoreParsed ? resolveBackendResource(blobstoreParsed, workerName, "blobstore") : undefined;
   let d1DatabaseId;
   let d1DatabaseName;
-  if (!options.noDb) {
-    const dbName = `${workerName}-db`;
+  let r2BucketName;
+  if (docstoreParsed.scheme === "d1") {
+    const dbName = docstoreResource;
     const dbSpinner = createSpinner(`Creating D1 database: ${dbName}`);
     if (options.dryRun) {
       dbSpinner.stop();
@@ -6189,9 +6273,8 @@ async function runFirstTimeSetup(projectRoot, _existingState, options) {
       }
     }
   }
-  let r2BucketName;
-  if (!options.noStorage) {
-    const bucketName = `${workerName}-storage`;
+  if (blobstoreParsed?.scheme === "r2") {
+    const bucketName = blobstoreResource;
     const bucketSpinner = createSpinner(`Creating R2 bucket: ${bucketName}`);
     if (options.dryRun) {
       bucketSpinner.stop();
@@ -6208,7 +6291,7 @@ async function runFirstTimeSetup(projectRoot, _existingState, options) {
           console.error(import_picocolors2.default.dim(`
   R2 is not enabled on this Cloudflare account.`));
           console.error(import_picocolors2.default.dim("  Enable R2 at: https://dash.cloudflare.com/?to=/:account/r2"));
-          console.error(import_picocolors2.default.dim(`  Or use --no-storage to skip R2 bucket creation.
+          console.error(import_picocolors2.default.dim(`  Or remove --blobstore to skip R2 bucket creation.
 `));
         } else {
           console.error(import_picocolors2.default.dim(`
@@ -6224,6 +6307,8 @@ async function runFirstTimeSetup(projectRoot, _existingState, options) {
   console.log();
   printHeader("Building worker");
   await buildAndDeploy(projectRoot, workerName, {
+    docstoreScheme: docstoreParsed.scheme,
+    blobstoreScheme: blobstoreParsed?.scheme,
     d1DatabaseId,
     d1DatabaseName,
     r2BucketName,
@@ -6234,6 +6319,8 @@ async function runFirstTimeSetup(projectRoot, _existingState, options) {
   const workerUrl = getWorkerUrl(workerName);
   if (!options.dryRun) {
     const newState = createCloudflareState(accountId || "", workerName, workerUrl, {
+      docstoreUri,
+      blobstoreUri,
       d1DatabaseId,
       d1DatabaseName,
       r2BucketName
@@ -6257,7 +6344,11 @@ async function runRedeploy(projectRoot, state, options, startTime) {
 `));
     await wranglerLogin();
   }
+  const docstoreParsed = cfState.docstoreUri ? parseBackendUri(cfState.docstoreUri) : undefined;
+  const blobstoreParsed = cfState.blobstoreUri ? parseBackendUri(cfState.blobstoreUri) : undefined;
   await buildAndDeploy(projectRoot, workerName, {
+    docstoreScheme: docstoreParsed?.scheme,
+    blobstoreScheme: blobstoreParsed?.scheme,
     d1DatabaseId: cfState.d1DatabaseId,
     d1DatabaseName: cfState.d1DatabaseName,
     r2BucketName: cfState.r2BucketName,
@@ -6277,7 +6368,12 @@ async function buildAndDeploy(projectRoot, workerName, config) {
   try {
     const artifacts = await ensureProjectArtifacts(projectRoot);
     const runtimeBundlePath = await ensureRuntimeBundleAccessible(artifacts, projectRoot);
-    const result = await generateWorkerEntry(projectRoot, { runtimeBundlePath, dashboardHtmlPath: artifacts.dashboardHtmlPath });
+    const result = await generateWorkerEntry(projectRoot, {
+      runtimeBundlePath,
+      dashboardHtmlPath: artifacts.dashboardHtmlPath,
+      docstore: config.docstoreScheme,
+      blobstore: config.blobstoreScheme
+    });
     buildSpinner.succeed(`Bundled ${result.moduleCount} function${result.moduleCount === 1 ? "" : "s"}`);
     const configSpinner = createSpinner("Generating wrangler config...");
     const configPath = await generateWranglerConfig(projectRoot, workerName, config);
@@ -6304,7 +6400,6 @@ async function generateWranglerConfig(projectRoot, workerName, config) {
     compatibility_date: "2024-12-01",
     compatibility_flags: ["nodejs_compat"],
     assets: {
-      binding: "DASHBOARD_ASSETS",
       directory: "./static"
     },
     durable_objects: {
@@ -6320,7 +6415,7 @@ async function generateWranglerConfig(projectRoot, workerName, config) {
       }
     ]
   };
-  if (config.d1DatabaseId && config.d1DatabaseName) {
+  if (config.docstoreScheme === "d1" && config.d1DatabaseId && config.d1DatabaseName) {
     wranglerConfig.d1_databases = [
       {
         binding: "DB",
@@ -6329,7 +6424,15 @@ async function generateWranglerConfig(projectRoot, workerName, config) {
       }
     ];
   }
-  if (config.r2BucketName) {
+  if (config.docstoreScheme === "hyperdrive") {
+    wranglerConfig.hyperdrive = [
+      {
+        binding: "HYPERDRIVE",
+        id: config.d1DatabaseId
+      }
+    ];
+  }
+  if (config.blobstoreScheme === "r2" && config.r2BucketName) {
     wranglerConfig.r2_buckets = [
       {
         binding: "STORAGE_BUCKET",
@@ -6599,7 +6702,7 @@ async function verifyBundle(bundle) {
 
 // src/cli/deploy/index.ts
 function registerDeployCommand(program2) {
-  program2.command("deploy").description("Deploy your Convex functions to production").option("--target <target>", "Deployment target (cloudflare/cf, cloud)").option("--env <name>", "Environment name (production, staging, preview)", "production").option("--name <name>", "Override worker/project name").option("--account <id>", "Cloudflare account ID (for users with multiple accounts)").option("--dry-run", "Show what would happen without executing").option("-y, --yes", "Skip confirmation prompts").option("--verbose", "Show detailed output").option("--no-db", "Skip D1 database creation (use DO SQLite only)").option("--no-storage", "Skip R2 bucket creation").option("--force", "Recreate all resources").option("--reset", "Clear saved deployment config and start fresh").option("--cloud-url <url>", "Concave cloud URL", process.env.CONCAVE_CLOUD_URL || "https://cloud.smolbase.com").option("--project-id <id>", "Project ID for cloud deployment").option("--project-slug <slug>", "Project slug for cloud deployment").addHelpText("after", `
+  program2.command("deploy").description("Deploy your Convex functions to production").option("--target <target>", "Deployment target (cloudflare/cf, cloud)").option("--env <name>", "Environment name (production, staging, preview)", "production").option("--name <name>", "Override worker/project name").option("--account <id>", "Cloudflare account ID (for users with multiple accounts)").option("--dry-run", "Show what would happen without executing").option("-y, --yes", "Skip confirmation prompts").option("--verbose", "Show detailed output").option("--docstore <uri>", "DocStore backend (do://, d1://name, hyperdrive://id)").option("--blobstore <uri>", "BlobStore backend (r2://bucket)").option("--force", "Recreate all resources").option("--reset", "Clear saved deployment config and start fresh").option("--cloud-url <url>", "Concave cloud URL", process.env.CONCAVE_CLOUD_URL || "https://cloud.smolbase.com").option("--project-id <id>", "Project ID for cloud deployment").option("--project-slug <slug>", "Project slug for cloud deployment").addHelpText("after", `
 Examples:
   $ concave deploy                      Deploy with interactive setup (first time)
   $ concave deploy                      Redeploy to configured target
@@ -6671,8 +6774,8 @@ async function runDeploy(projectRoot, options) {
     dryRun: options.dryRun,
     yes: options.yes,
     verbose: options.verbose,
-    noDb: options.db === false,
-    noStorage: options.storage === false,
+    docstore: options.docstore,
+    blobstore: options.blobstore,
     force: options.force,
     reset: options.reset
   });
@@ -6682,27 +6785,220 @@ async function runDeploy(projectRoot, options) {
 var import_picocolors5 = __toESM(require_picocolors(), 1);
 
 // src/cli/url-utils.ts
-function detectBaseUrl(options) {
+import { existsSync, readFileSync } from "node:fs";
+import path11 from "node:path";
+var URL_ENV_KEYS = [
+  "CONCAVE_URL",
+  "CONVEX_URL",
+  "NEXT_PUBLIC_CONCAVE_URL",
+  "NEXT_PUBLIC_CONVEX_URL",
+  "CONCAVE_SITE_URL",
+  "CONVEX_SITE_URL",
+  "NEXT_PUBLIC_CONCAVE_SITE_URL",
+  "NEXT_PUBLIC_CONVEX_SITE_URL",
+  "NEXT_PUBLIC_SITE_URL",
+  "SITE_URL"
+];
+var NETWORK_ERROR_CODES = new Set([
+  "ECONNREFUSED",
+  "ConnectionRefused",
+  "ENOTFOUND",
+  "EAI_AGAIN",
+  "ETIMEDOUT",
+  "EHOSTUNREACH",
+  "ECONNRESET",
+  "UND_ERR_CONNECT_TIMEOUT",
+  "UND_ERR_SOCKET",
+  "UND_ERR_HEADERS_TIMEOUT"
+]);
+function resolveBaseUrl(options, cwd = process.cwd()) {
   if (options.url) {
-    return normalizeUrl(options.url);
+    return {
+      baseUrl: normalizeUrl(options.url),
+      source: "url-option",
+      sourceDetail: "--url"
+    };
   }
-  if (process.env.CONCAVE_URL) {
-    return normalizeUrl(process.env.CONCAVE_URL);
+  for (const key of URL_ENV_KEYS) {
+    const value = process.env[key];
+    if (value) {
+      return {
+        baseUrl: normalizeUrl(value),
+        source: "environment",
+        sourceDetail: key
+      };
+    }
   }
-  if (process.env.CONVEX_URL) {
-    return normalizeUrl(process.env.CONVEX_URL);
+  const fromFiles = getUrlFromEnvFiles(cwd);
+  if (fromFiles) {
+    return {
+      baseUrl: normalizeUrl(fromFiles.value),
+      source: "environment-file",
+      sourceDetail: `${fromFiles.key} from ${path11.relative(cwd, fromFiles.filePath) || path11.basename(fromFiles.filePath)}`
+    };
   }
   const port = options.port || "3000";
-  return `http://localhost:${port}`;
+  return {
+    baseUrl: `http://localhost:${port}`,
+    source: "default-port",
+    sourceDetail: `localhost:${port}${options.port ? "" : " (default)"}`
+  };
+}
+function formatBaseUrlSource(resolution) {
+  switch (resolution.source) {
+    case "url-option":
+      return "the --url flag";
+    case "environment":
+      return `environment variable ${resolution.sourceDetail}`;
+    case "environment-file":
+      return resolution.sourceDetail;
+    case "default-port":
+      return `default local fallback (${resolution.sourceDetail})`;
+  }
+}
+function describeConnectionFailure(error, resolution, executeUrl) {
+  const code = extractErrorCode(error);
+  const message = extractErrorMessage(error);
+  const lower = message.toLowerCase();
+  const isNetworkFailure = !!code && NETWORK_ERROR_CODES.has(code) || lower.includes("fetch failed") || lower.includes("networkerror") || lower.includes("unable to connect") || lower.includes("could not connect") || lower.includes("connection refused") || lower.includes("timed out");
+  if (!isNetworkFailure) {
+    return null;
+  }
+  const details = [`Attempted endpoint: ${executeUrl}`, `URL resolved from: ${formatBaseUrlSource(resolution)}`];
+  if (code) {
+    details.push(`Network error code: ${code}`);
+  }
+  if (message && message.toLowerCase() !== "fetch failed") {
+    details.push(`Network error: ${message}`);
+  }
+  details.push("Set the target explicitly with --url <url> or --port <n>.");
+  details.push("Or set CONCAVE_URL / CONVEX_URL in your shell or .env.local.");
+  details.push("Start a local server with: concave dev");
+  return {
+    summary: `✗ Could not connect to a Concave instance at ${resolution.baseUrl}`,
+    details
+  };
 }
 function normalizeUrl(url) {
   let normalized = url.trim();
   if (!normalized.startsWith("http://") && !normalized.startsWith("https://")) {
-    normalized = `https://${normalized}`;
+    const host = normalized.split("/")[0].split(":")[0];
+    if (host === "localhost" || host === "127.0.0.1" || host === "[::1]") {
+      normalized = `http://${normalized}`;
+    } else {
+      normalized = `https://${normalized}`;
+    }
   }
   normalized = normalized.replace(/\/+$/, "");
   return normalized;
 }
+function getUrlFromEnvFiles(cwd) {
+  const envFiles = getEnvFileCandidates(cwd);
+  const merged = new Map;
+  for (const filePath of envFiles) {
+    if (!existsSync(filePath)) {
+      continue;
+    }
+    const parsed = parseDotEnv(readFileSync(filePath, "utf8"));
+    for (const [key, value] of Object.entries(parsed)) {
+      if (!merged.has(key)) {
+        merged.set(key, { value, filePath });
+      }
+    }
+  }
+  for (const key of URL_ENV_KEYS) {
+    const entry = merged.get(key);
+    if (entry?.value) {
+      return {
+        key,
+        value: entry.value,
+        filePath: entry.filePath
+      };
+    }
+  }
+  return null;
+}
+function getEnvFileCandidates(cwd) {
+  const convexRoot = detectConvexRoot(cwd);
+  const candidates = [
+    path11.join(convexRoot, ".env.local"),
+    path11.join(convexRoot, ".env"),
+    path11.join(cwd, ".env.local"),
+    path11.join(cwd, ".env")
+  ];
+  return [...new Set(candidates)];
+}
+function detectConvexRoot(cwd) {
+  const convexJsonPath = path11.join(cwd, "convex.json");
+  const fallback = path11.join(cwd, "convex");
+  if (!existsSync(convexJsonPath)) {
+    return fallback;
+  }
+  try {
+    const raw = JSON.parse(readFileSync(convexJsonPath, "utf8"));
+    if (typeof raw?.functions !== "string") {
+      return fallback;
+    }
+    const normalized = raw.functions.replace(/\\/g, "/").replace(/\/+$/, "").trim();
+    if (!normalized) {
+      return fallback;
+    }
+    const root = normalized.includes("/") ? path11.posix.dirname(normalized) : normalized;
+    if (!root || root === ".") {
+      return fallback;
+    }
+    return path11.resolve(cwd, root);
+  } catch {
+    return fallback;
+  }
+}
+function parseDotEnv(content) {
+  const result = {};
+  const lines = content.split(`
+`);
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
+    }
+    const match = trimmed.match(/^(?:export\s+)?([^=]+)=(.*)$/);
+    if (!match) {
+      continue;
+    }
+    const key = match[1].trim();
+    let value = match[2].trim();
+    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1);
+    }
+    value = value.replace(/\\n/g, `
+`).replace(/\\r/g, "\r").replace(/\\t/g, "\t");
+    result[key] = value;
+  }
+  return result;
+}
+function extractErrorCode(error) {
+  let cursor = error;
+  for (let i = 0;i < 5 && cursor; i++) {
+    if (typeof cursor.code === "string" && cursor.code.length > 0) {
+      return cursor.code;
+    }
+    cursor = cursor.cause;
+  }
+  return;
+}
+function extractErrorMessage(error) {
+  if (error instanceof Error) {
+    return error.message || String(error);
+  }
+  if (typeof error === "string") {
+    return error;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return String(error);
+  }
+}
 
 // src/cli/run.ts
 function isErrorResponse(response) {
@@ -6719,9 +7015,8 @@ async function runFunction(functionName, argsJson, options) {
       process.exit(1);
     }
   }
-  const baseUrl = detectBaseUrl(options);
-  const executeUrl = `${baseUrl}/api/execute`;
-  const normalizedPath = functionName.replace(/:/g, "/");
+  const baseUrlResolution = resolveBaseUrl(options);
+  const executeUrl = `${baseUrlResolution.baseUrl}/api/execute`;
   console.log(import_picocolors5.default.cyan(`\uD83D\uDE80 Running ${import_picocolors5.default.bold(functionName)}`));
   if (options.component) {
     console.log(import_picocolors5.default.dim(`   Component: ${options.component}`));
@@ -6738,7 +7033,7 @@ async function runFunction(functionName, argsJson, options) {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
-        path: normalizedPath,
+        path: functionName,
         args,
         format: "json",
         componentPath: options.component
@@ -6779,12 +7074,15 @@ async function runFunction(functionName, argsJson, options) {
       console.log(formatResult(result));
     }
   } catch (error) {
-    if (error.code === "ECONNREFUSED") {
-      console.error(import_picocolors5.default.red("✗ Could not connect to dev server"));
-      console.log(import_picocolors5.default.dim(`   Make sure the dev server is running on ${baseUrl}`));
-      console.log(import_picocolors5.default.dim(`   Run: npx concave dev`));
+    const connectionFailure = describeConnectionFailure(error, baseUrlResolution, executeUrl);
+    if (connectionFailure) {
+      console.error(import_picocolors5.default.red(connectionFailure.summary));
+      for (const line of connectionFailure.details) {
+        console.error(import_picocolors5.default.dim(`   ${line}`));
+      }
     } else {
-      console.error(import_picocolors5.default.red("✗ Request failed:"), error.message);
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(import_picocolors5.default.red("✗ Request failed:"), message);
     }
     process.exit(1);
   }
@@ -6820,17 +7118,17 @@ function isErrorResponse2(response) {
   return response.status === "error";
 }
 async function browseData(tableName, options) {
-  const baseUrl = detectBaseUrl(options);
-  const executeUrl = `${baseUrl}/api/execute`;
+  const baseUrlResolution = resolveBaseUrl(options);
+  const executeUrl = `${baseUrlResolution.baseUrl}/api/execute`;
   const componentPath = options.component;
   if (!tableName) {
-    await listTables(executeUrl, componentPath);
+    await listTables(executeUrl, baseUrlResolution, componentPath);
   } else {
     const limit = options.limit ? parseInt(options.limit, 10) : 10;
-    await showTableData(executeUrl, tableName, limit, componentPath);
+    await showTableData(executeUrl, baseUrlResolution, tableName, limit, componentPath);
   }
 }
-async function listTables(executeUrl, componentPath) {
+async function listTables(executeUrl, baseUrlResolution, componentPath) {
   const header = componentPath ? import_picocolors6.default.cyan(`\uD83D\uDCCA Tables in Component: ${import_picocolors6.default.bold(componentPath)}
 `) : import_picocolors6.default.cyan(`\uD83D\uDCCA Database Tables
 `);
@@ -6842,8 +7140,9 @@ async function listTables(executeUrl, componentPath) {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
-        path: "_system/systemListTables",
+        path: "_system:systemListTables",
         args: componentPath ? { componentPath } : {},
+        type: "query",
         format: "json"
       })
     });
@@ -6865,17 +7164,20 @@ async function listTables(executeUrl, componentPath) {
     console.log(import_picocolors6.default.dim(`
    Use ${import_picocolors6.default.bold(`concave data <table>${componentHint}`)} to view table contents`));
   } catch (error) {
-    if (error.code === "ECONNREFUSED") {
-      console.error(import_picocolors6.default.red("✗ Could not connect to dev server"));
-      console.log(import_picocolors6.default.dim(`   Make sure the dev server is running`));
-      console.log(import_picocolors6.default.dim(`   Run: npx concave dev`));
+    const connectionFailure = describeConnectionFailure(error, baseUrlResolution, executeUrl);
+    if (connectionFailure) {
+      console.error(import_picocolors6.default.red(connectionFailure.summary));
+      for (const line of connectionFailure.details) {
+        console.error(import_picocolors6.default.dim(`   ${line}`));
+      }
     } else {
-      console.error(import_picocolors6.default.red("✗ Failed to list tables:"), error.message);
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(import_picocolors6.default.red("✗ Failed to list tables:"), message);
     }
     process.exit(1);
   }
 }
-async function showTableData(executeUrl, tableName, limit, componentPath) {
+async function showTableData(executeUrl, baseUrlResolution, tableName, limit, componentPath) {
   const header = componentPath ? import_picocolors6.default.cyan(`\uD83D\uDCCA Table: ${import_picocolors6.default.bold(tableName)} (Component: ${componentPath})
 `) : import_picocolors6.default.cyan(`\uD83D\uDCCA Table: ${import_picocolors6.default.bold(tableName)}
 `);
@@ -6887,13 +7189,14 @@ async function showTableData(executeUrl, tableName, limit, componentPath) {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
-        path: "_system/systemGetTableData",
+        path: "_system:systemGetTableData",
         args: {
           tableName,
           componentPath,
           page: 1,
           pageSize: limit
         },
+        type: "query",
         format: "json"
       })
     });
@@ -6940,12 +7243,15 @@ async function showTableData(executeUrl, tableName, limit, componentPath) {
    Showing first ${limit} documents. Use --limit to see more.`));
     }
   } catch (error) {
-    if (error.code === "ECONNREFUSED") {
-      console.error(import_picocolors6.default.red("✗ Could not connect to dev server"));
-      console.log(import_picocolors6.default.dim(`   Make sure the dev server is running`));
-      console.log(import_picocolors6.default.dim(`   Run: npx concave dev`));
+    const connectionFailure = describeConnectionFailure(error, baseUrlResolution, executeUrl);
+    if (connectionFailure) {
+      console.error(import_picocolors6.default.red(connectionFailure.summary));
+      for (const line of connectionFailure.details) {
+        console.error(import_picocolors6.default.dim(`   ${line}`));
+      }
     } else {
-      console.error(import_picocolors6.default.red("✗ Failed to query table:"), error.message);
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(import_picocolors6.default.red("✗ Failed to query table:"), message);
     }
     process.exit(1);
   }
@@ -6994,11 +7300,11 @@ function formatValue(value) {
 // src/cli/type-codegen.ts
 var import_picocolors7 = __toESM(require_picocolors(), 1);
 import { promises as fs9 } from "node:fs";
-import path11 from "node:path";
+import path12 from "node:path";
 async function generateTypes(projectRoot, options = {}) {
   const layout = await resolveProjectLayout(projectRoot);
   const convexDir = layout.functionsDir;
-  const generatedDir = path11.join(convexDir, "_generated");
+  const generatedDir = path12.join(convexDir, "_generated");
   try {
     await fs9.access(convexDir);
   } catch {
@@ -7027,7 +7333,7 @@ async function discoverModules(convexDir) {
       if (entry.name.startsWith(".") || entry.name === "_generated" || entry.name === "node_modules") {
         continue;
       }
-      const fullPath = path11.join(dir, entry.name);
+      const fullPath = path12.join(dir, entry.name);
       const entryRelativePath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
         await walk(fullPath, entryRelativePath);
@@ -7200,7 +7506,7 @@ export type DatabaseReader = GenericDatabaseReader<DataModel>;
  */
 export type DatabaseWriter = GenericDatabaseWriter<DataModel>;
 `;
-  await fs9.writeFile(path11.join(generatedDir, "server.d.ts"), content, "utf8");
+  await fs9.writeFile(path12.join(generatedDir, "server.d.ts"), content, "utf8");
 }
 async function generateServerJs(generatedDir) {
   const content = `/* eslint-disable */
@@ -7293,7 +7599,7 @@ export const internalAction = internalActionGeneric;
  */
 export const httpAction = httpActionGeneric;
 `;
-  await fs9.writeFile(path11.join(generatedDir, "server.js"), content, "utf8");
+  await fs9.writeFile(path12.join(generatedDir, "server.js"), content, "utf8");
 }
 async function generateDataModelTypes(generatedDir, hasSchema) {
   const content = `/* eslint-disable */
@@ -7357,7 +7663,7 @@ export type Id<TableName extends TableNames | SystemTableNames> =
  */
 ${hasSchema ? "export type DataModel = DataModelFromSchemaDefinition<typeof schema>;" : "export type DataModel = any;"}
 `;
-  await fs9.writeFile(path11.join(generatedDir, "dataModel.d.ts"), content, "utf8");
+  await fs9.writeFile(path12.join(generatedDir, "dataModel.d.ts"), content, "utf8");
 }
 async function generateApiTypes(generatedDir, modules, _hasSchema) {
   const apiModules = modules.filter((m) => m.name !== "schema" && !m.name.startsWith("_") && m.name !== "http");
@@ -7415,7 +7721,7 @@ export declare const internal: FilterApi<
 
 export declare const components: AnyComponents;
 `;
-  await fs9.writeFile(path11.join(generatedDir, "api.d.ts"), content, "utf8");
+  await fs9.writeFile(path12.join(generatedDir, "api.d.ts"), content, "utf8");
 }
 async function generateApiJs(generatedDir) {
   const content = `/* eslint-disable */
@@ -7443,13 +7749,13 @@ export const api = anyApi;
 export const internal = anyApi;
 export const components = componentsGeneric();
 `;
-  await fs9.writeFile(path11.join(generatedDir, "api.js"), content, "utf8");
+  await fs9.writeFile(path12.join(generatedDir, "api.js"), content, "utf8");
 }
 
 // src/cli/type-codegen-runtime.ts
 var import_picocolors8 = __toESM(require_picocolors(), 1);
 import { promises as fs10 } from "node:fs";
-import path12 from "node:path";
+import path13 from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 
 // src/cli/validator-to-typescript.ts
@@ -7520,10 +7826,8 @@ function convertValidator(validator, options) {
       return `{ ${fields.join("; ")} }`;
     }
     case "record": {
-      const keys = validator.keys;
-      const values = validator.values;
-      const keyType = convertValidator(keys, options);
-      const valueType = convertValidator(values, options);
+      const keyType = convertValidator(validator.keys, options);
+      const valueType = convertValidator(validator.values.fieldType, options);
       return `Record<${keyType}, ${valueType}>`;
     }
     case "set": {
@@ -7568,7 +7872,7 @@ function returnsValidatorToTypeScript(returns, options = {}) {
 async function generateTypesWithRuntime(projectRoot, options = {}) {
   const layout = await resolveProjectLayout(projectRoot);
   const convexDir = layout.functionsDir;
-  const generatedDir = path12.join(convexDir, "_generated");
+  const generatedDir = path13.join(convexDir, "_generated");
   console.log(import_picocolors8.default.cyan("\uD83D\uDD27 Generating TypeScript types (runtime analysis)"));
   console.log(import_picocolors8.default.dim(`   Output: ${generatedDir}
 `));
@@ -7641,7 +7945,7 @@ async function discoverAndAnalyzeModules(convexDir, options) {
   const failed = [];
   const moduleFiles = await collectConvexModules2(convexDir);
   for (const filePath of moduleFiles) {
-    const relativePath = path12.relative(convexDir, filePath);
+    const relativePath = path13.relative(convexDir, filePath);
     const moduleName = relativePath.replace(/\.(ts|tsx|js|jsx|mjs|cjs)$/, "").replace(/\\/g, "/");
     if (moduleName === "schema" || moduleName === "http" || moduleName === "crons") {
       continue;
@@ -7771,7 +8075,7 @@ async function collectConvexModules2(convexDir) {
       if (entry.name.startsWith(".") || entry.name === "_generated" || entry.name === "node_modules") {
         continue;
       }
-      const fullPath = path12.join(dir, entry.name);
+      const fullPath = path13.join(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(fullPath);
       } else if (isConvexSourceFile3(entry.name)) {
@@ -7952,7 +8256,7 @@ export declare const internal: FilterApi<
 
 export declare const components: AnyComponents;
 `;
-  await fs10.writeFile(path12.join(generatedDir, "api.d.ts"), content, "utf8");
+  await fs10.writeFile(path13.join(generatedDir, "api.d.ts"), content, "utf8");
 }
 async function generatePackageJson(generatedDir) {
   const content = {
@@ -7966,7 +8270,7 @@ async function generatePackageJson(generatedDir) {
       "./dataModel.d.ts": "./dataModel.d.ts"
     }
   };
-  await fs10.writeFile(path12.join(generatedDir, "package.json"), JSON.stringify(content, null, 2), "utf8");
+  await fs10.writeFile(path13.join(generatedDir, "package.json"), JSON.stringify(content, null, 2), "utf8");
 }
 async function generateServerTypes2(generatedDir, _hasSchema) {
   const content = `/* eslint-disable */
@@ -8006,7 +8310,7 @@ export type ActionCtx = GenericActionCtx<DataModel>;
 export type DatabaseReader = GenericDatabaseReader<DataModel>;
 export type DatabaseWriter = GenericDatabaseWriter<DataModel>;
 `;
-  await fs10.writeFile(path12.join(generatedDir, "server.d.ts"), content, "utf8");
+  await fs10.writeFile(path13.join(generatedDir, "server.d.ts"), content, "utf8");
 }
 async function generateServerJs2(generatedDir) {
   const content = `/* eslint-disable */
@@ -8037,7 +8341,7 @@ export const action = actionGeneric;
 export const internalAction = internalActionGeneric;
 export const httpAction = httpActionGeneric;
 `;
-  await fs10.writeFile(path12.join(generatedDir, "server.js"), content, "utf8");
+  await fs10.writeFile(path13.join(generatedDir, "server.js"), content, "utf8");
 }
 async function generateDataModelTypes2(generatedDir, hasSchema) {
   const content = `/* eslint-disable */
@@ -8065,7 +8369,7 @@ export type Id<TableName extends TableNames | SystemTableNames> = GenericId<Tabl
 
 ${hasSchema ? "export type DataModel = DataModelFromSchemaDefinition<typeof schema>;" : "export type DataModel = any;"}
 `;
-  await fs10.writeFile(path12.join(generatedDir, "dataModel.d.ts"), content, "utf8");
+  await fs10.writeFile(path13.join(generatedDir, "dataModel.d.ts"), content, "utf8");
 }
 async function generateApiJs2(generatedDir) {
   const content = `/* eslint-disable */
@@ -8092,16 +8396,16 @@ export const api = anyApi;
 export const internal = anyApi;
 export const components = componentsGeneric();
 `;
-  await fs10.writeFile(path12.join(generatedDir, "api.js"), content, "utf8");
+  await fs10.writeFile(path13.join(generatedDir, "api.js"), content, "utf8");
 }
 
-// ../../node_modules/.bun/chokidar@4.0.3/node_modules/chokidar/esm/index.js
+// ../../node_modules/chokidar/esm/index.js
 import { stat as statcb } from "fs";
 import { stat as stat4, readdir as readdir2 } from "fs/promises";
 import { EventEmitter } from "events";
 import * as sysPath2 from "path";
 
-// ../../node_modules/.bun/readdirp@4.1.2/node_modules/readdirp/esm/index.js
+// ../../node_modules/readdirp/esm/index.js
 import { stat as stat2, lstat, readdir, realpath } from "node:fs/promises";
 import { Readable } from "node:stream";
 import { resolve as presolve, relative as prelative, join as pjoin, sep as psep } from "node:path";
@@ -8172,7 +8476,7 @@ class ReaddirpStream extends Readable {
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
     const statMethod = opts.lstat ? lstat : stat2;
     if (wantBigintFsStats) {
-      this._stat = (path13) => statMethod(path13, { bigint: true });
+      this._stat = (path14) => statMethod(path14, { bigint: true });
     } else {
       this._stat = statMethod;
     }
@@ -8197,8 +8501,8 @@ class ReaddirpStream extends Readable {
         const par = this.parent;
         const fil = par && par.files;
         if (fil && fil.length > 0) {
-          const { path: path13, depth } = par;
-          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path13));
+          const { path: path14, depth } = par;
+          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path14));
           const awaited = await Promise.all(slice);
           for (const entry of awaited) {
             if (!entry)
@@ -8238,20 +8542,20 @@ class ReaddirpStream extends Readable {
       this.reading = false;
     }
   }
-  async _exploreDir(path13, depth) {
+  async _exploreDir(path14, depth) {
     let files;
     try {
-      files = await readdir(path13, this._rdOptions);
+      files = await readdir(path14, this._rdOptions);
     } catch (error) {
       this._onError(error);
     }
-    return { files, depth, path: path13 };
+    return { files, depth, path: path14 };
   }
-  async _formatEntry(dirent, path13) {
+  async _formatEntry(dirent, path14) {
     let entry;
     const basename = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path13, basename));
+      const fullPath = presolve(pjoin(path14, basename));
       entry = { path: prelative(this._root, fullPath), fullPath, basename };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
@@ -8321,7 +8625,7 @@ function readdirp(root, options = {}) {
   return new ReaddirpStream(options);
 }
 
-// ../../node_modules/.bun/chokidar@4.0.3/node_modules/chokidar/esm/handler.js
+// ../../node_modules/chokidar/esm/handler.js
 import { watchFile, unwatchFile, watch as fs_watch } from "fs";
 import { open, stat as stat3, lstat as lstat2, realpath as fsrealpath } from "fs/promises";
 import * as sysPath from "path";
@@ -8650,16 +8954,16 @@ var delFromSet = (main, prop, item) => {
 };
 var isEmptySet = (val) => val instanceof Set ? val.size === 0 : !val;
 var FsWatchInstances = new Map;
-function createFsWatchInstance(path13, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path14, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path13);
-    emitRaw(rawEvent, evPath, { watchedPath: path13 });
-    if (evPath && path13 !== evPath) {
-      fsWatchBroadcast(sysPath.resolve(path13, evPath), KEY_LISTENERS, sysPath.join(path13, evPath));
+    listener(path14);
+    emitRaw(rawEvent, evPath, { watchedPath: path14 });
+    if (evPath && path14 !== evPath) {
+      fsWatchBroadcast(sysPath.resolve(path14, evPath), KEY_LISTENERS, sysPath.join(path14, evPath));
     }
   };
   try {
-    return fs_watch(path13, {
+    return fs_watch(path14, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error) {
@@ -8675,12 +8979,12 @@ var fsWatchBroadcast = (fullPath, listenerType, val1, val2, val3) => {
     listener(val1, val2, val3);
   });
 };
-var setFsWatchListener = (path13, fullPath, options, handlers) => {
+var setFsWatchListener = (path14, fullPath, options, handlers) => {
   const { listener, errHandler, rawEmitter } = handlers;
   let cont = FsWatchInstances.get(fullPath);
   let watcher;
   if (!options.persistent) {
-    watcher = createFsWatchInstance(path13, options, listener, errHandler, rawEmitter);
+    watcher = createFsWatchInstance(path14, options, listener, errHandler, rawEmitter);
     if (!watcher)
       return;
     return watcher.close.bind(watcher);
@@ -8690,7 +8994,7 @@ var setFsWatchListener = (path13, fullPath, options, handlers) => {
     addAndConvert(cont, KEY_ERR, errHandler);
     addAndConvert(cont, KEY_RAW, rawEmitter);
   } else {
-    watcher = createFsWatchInstance(path13, options, fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS), errHandler, fsWatchBroadcast.bind(null, fullPath, KEY_RAW));
+    watcher = createFsWatchInstance(path14, options, fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS), errHandler, fsWatchBroadcast.bind(null, fullPath, KEY_RAW));
     if (!watcher)
       return;
     watcher.on(EV.ERROR, async (error) => {
@@ -8699,7 +9003,7 @@ var setFsWatchListener = (path13, fullPath, options, handlers) => {
         cont.watcherUnusable = true;
       if (isWindows && error.code === "EPERM") {
         try {
-          const fd = await open(path13, "r");
+          const fd = await open(path14, "r");
           await fd.close();
           broadcastErr(error);
         } catch (err) {}
@@ -8729,7 +9033,7 @@ var setFsWatchListener = (path13, fullPath, options, handlers) => {
   };
 };
 var FsWatchFileInstances = new Map;
-var setFsWatchFileListener = (path13, fullPath, options, handlers) => {
+var setFsWatchFileListener = (path14, fullPath, options, handlers) => {
   const { listener, rawEmitter } = handlers;
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
@@ -8751,7 +9055,7 @@ var setFsWatchFileListener = (path13, fullPath, options, handlers) => {
         });
         const currmtime = curr.mtimeMs;
         if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-          foreach(cont.listeners, (listener2) => listener2(path13, curr));
+          foreach(cont.listeners, (listener2) => listener2(path14, curr));
         }
       })
     };
@@ -8774,13 +9078,13 @@ class NodeFsHandler {
     this.fsw = fsW;
     this._boundHandleError = (error) => fsW._handleError(error);
   }
-  _watchWithNodeFs(path13, listener) {
+  _watchWithNodeFs(path14, listener) {
     const opts = this.fsw.options;
-    const directory = sysPath.dirname(path13);
-    const basename2 = sysPath.basename(path13);
+    const directory = sysPath.dirname(path14);
+    const basename2 = sysPath.basename(path14);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename2);
-    const absolutePath = sysPath.resolve(path13);
+    const absolutePath = sysPath.resolve(path14);
     const options = {
       persistent: opts.persistent
     };
@@ -8790,12 +9094,12 @@ class NodeFsHandler {
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
       options.interval = enableBin && isBinaryPath(basename2) ? opts.binaryInterval : opts.interval;
-      closer = setFsWatchFileListener(path13, absolutePath, options, {
+      closer = setFsWatchFileListener(path14, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
       });
     } else {
-      closer = setFsWatchListener(path13, absolutePath, options, {
+      closer = setFsWatchListener(path14, absolutePath, options, {
         listener,
         errHandler: this._boundHandleError,
         rawEmitter: this.fsw._emitRaw
@@ -8813,7 +9117,7 @@ class NodeFsHandler {
     let prevStats = stats;
     if (parent.has(basename2))
       return;
-    const listener = async (path13, newStats) => {
+    const listener = async (path14, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
         return;
       if (!newStats || newStats.mtimeMs === 0) {
@@ -8827,11 +9131,11 @@ class NodeFsHandler {
             this.fsw._emit(EV.CHANGE, file, newStats2);
           }
           if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-            this.fsw._closeFile(path13);
+            this.fsw._closeFile(path14);
             prevStats = newStats2;
             const closer2 = this._watchWithNodeFs(file, listener);
             if (closer2)
-              this.fsw._addPathCloser(path13, closer2);
+              this.fsw._addPathCloser(path14, closer2);
           } else {
             prevStats = newStats2;
           }
@@ -8855,7 +9159,7 @@ class NodeFsHandler {
     }
     return closer;
   }
-  async _handleSymlink(entry, directory, path13, item) {
+  async _handleSymlink(entry, directory, path14, item) {
     if (this.fsw.closed) {
       return;
     }
@@ -8865,7 +9169,7 @@ class NodeFsHandler {
       this.fsw._incrReadyCount();
       let linkPath;
       try {
-        linkPath = await fsrealpath(path13);
+        linkPath = await fsrealpath(path14);
       } catch (e) {
         this.fsw._emitReady();
         return true;
@@ -8875,12 +9179,12 @@ class NodeFsHandler {
       if (dir.has(item)) {
         if (this.fsw._symlinkPaths.get(full) !== linkPath) {
           this.fsw._symlinkPaths.set(full, linkPath);
-          this.fsw._emit(EV.CHANGE, path13, entry.stats);
+          this.fsw._emit(EV.CHANGE, path14, entry.stats);
         }
       } else {
         dir.add(item);
         this.fsw._symlinkPaths.set(full, linkPath);
-        this.fsw._emit(EV.ADD, path13, entry.stats);
+        this.fsw._emit(EV.ADD, path14, entry.stats);
       }
       this.fsw._emitReady();
       return true;
@@ -8909,9 +9213,9 @@ class NodeFsHandler {
         return;
       }
       const item = entry.path;
-      let path13 = sysPath.join(directory, item);
+      let path14 = sysPath.join(directory, item);
       current.add(item);
-      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path13, item)) {
+      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path14, item)) {
         return;
       }
       if (this.fsw.closed) {
@@ -8920,8 +9224,8 @@ class NodeFsHandler {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path13 = sysPath.join(dir, sysPath.relative(dir, path13));
-        this._addToNodeFs(path13, initialAdd, wh, depth + 1);
+        path14 = sysPath.join(dir, sysPath.relative(dir, path14));
+        this._addToNodeFs(path14, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
     return new Promise((resolve2, reject) => {
@@ -8970,13 +9274,13 @@ class NodeFsHandler {
     }
     return closer;
   }
-  async _addToNodeFs(path13, initialAdd, priorWh, depth, target) {
+  async _addToNodeFs(path14, initialAdd, priorWh, depth, target) {
     const ready = this.fsw._emitReady;
-    if (this.fsw._isIgnored(path13) || this.fsw.closed) {
+    if (this.fsw._isIgnored(path14) || this.fsw.closed) {
       ready();
       return false;
     }
-    const wh = this.fsw._getWatchHelpers(path13);
+    const wh = this.fsw._getWatchHelpers(path14);
     if (priorWh) {
       wh.filterPath = (entry) => priorWh.filterPath(entry);
       wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -8992,8 +9296,8 @@ class NodeFsHandler {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sysPath.resolve(path13);
-        const targetPath = follow ? await fsrealpath(path13) : path13;
+        const absPath = sysPath.resolve(path14);
+        const targetPath = follow ? await fsrealpath(path14) : path14;
         if (this.fsw.closed)
           return;
         closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -9003,35 +9307,35 @@ class NodeFsHandler {
           this.fsw._symlinkPaths.set(absPath, targetPath);
         }
       } else if (stats.isSymbolicLink()) {
-        const targetPath = follow ? await fsrealpath(path13) : path13;
+        const targetPath = follow ? await fsrealpath(path14) : path14;
         if (this.fsw.closed)
           return;
         const parent = sysPath.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
-        closer = await this._handleDir(parent, stats, initialAdd, depth, path13, wh, targetPath);
+        closer = await this._handleDir(parent, stats, initialAdd, depth, path14, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== undefined) {
-          this.fsw._symlinkPaths.set(sysPath.resolve(path13), targetPath);
+          this.fsw._symlinkPaths.set(sysPath.resolve(path14), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
       }
       ready();
       if (closer)
-        this.fsw._addPathCloser(path13, closer);
+        this.fsw._addPathCloser(path14, closer);
       return false;
     } catch (error) {
       if (this.fsw._handleError(error)) {
         ready();
-        return path13;
+        return path14;
       }
     }
   }
 }
 
-// ../../node_modules/.bun/chokidar@4.0.3/node_modules/chokidar/esm/index.js
+// ../../node_modules/chokidar/esm/index.js
 /*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) */
 var SLASH = "/";
 var SLASH_SLASH = "//";
@@ -9069,26 +9373,26 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path13) {
-  if (typeof path13 !== "string")
+function normalizePath(path14) {
+  if (typeof path14 !== "string")
     throw new Error("string expected");
-  path13 = sysPath2.normalize(path13);
-  path13 = path13.replace(/\\/g, "/");
+  path14 = sysPath2.normalize(path14);
+  path14 = path14.replace(/\\/g, "/");
   let prepend = false;
-  if (path13.startsWith("//"))
+  if (path14.startsWith("//"))
     prepend = true;
   const DOUBLE_SLASH_RE2 = /\/\//;
-  while (path13.match(DOUBLE_SLASH_RE2))
-    path13 = path13.replace(DOUBLE_SLASH_RE2, "/");
+  while (path14.match(DOUBLE_SLASH_RE2))
+    path14 = path14.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
-    path13 = "/" + path13;
-  return path13;
+    path14 = "/" + path14;
+  return path14;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path13 = normalizePath(testString);
+  const path14 = normalizePath(testString);
   for (let index = 0;index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path13, stats)) {
+    if (pattern(path14, stats)) {
       return true;
     }
   }
@@ -9128,19 +9432,19 @@ var toUnix = (string) => {
   }
   return str;
 };
-var normalizePathToUnix = (path13) => toUnix(sysPath2.normalize(toUnix(path13)));
-var normalizeIgnored = (cwd = "") => (path13) => {
-  if (typeof path13 === "string") {
-    return normalizePathToUnix(sysPath2.isAbsolute(path13) ? path13 : sysPath2.join(cwd, path13));
+var normalizePathToUnix = (path14) => toUnix(sysPath2.normalize(toUnix(path14)));
+var normalizeIgnored = (cwd = "") => (path14) => {
+  if (typeof path14 === "string") {
+    return normalizePathToUnix(sysPath2.isAbsolute(path14) ? path14 : sysPath2.join(cwd, path14));
   } else {
-    return path13;
+    return path14;
   }
 };
-var getAbsolutePath = (path13, cwd) => {
-  if (sysPath2.isAbsolute(path13)) {
-    return path13;
+var getAbsolutePath = (path14, cwd) => {
+  if (sysPath2.isAbsolute(path14)) {
+    return path14;
   }
-  return sysPath2.join(cwd, path13);
+  return sysPath2.join(cwd, path14);
 };
 var EMPTY_SET = Object.freeze(new Set);
 
@@ -9197,10 +9501,10 @@ var STAT_METHOD_F = "stat";
 var STAT_METHOD_L = "lstat";
 
 class WatchHelper {
-  constructor(path13, follow, fsw) {
+  constructor(path14, follow, fsw) {
     this.fsw = fsw;
-    const watchPath = path13;
-    this.path = path13 = path13.replace(REPLACER_RE, "");
+    const watchPath = path14;
+    this.path = path14 = path14.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
     this.fullWatchPath = sysPath2.resolve(watchPath);
     this.dirParts = [];
@@ -9313,20 +9617,20 @@ class FSWatcher extends EventEmitter {
     this._closePromise = undefined;
     let paths = unifyPaths(paths_);
     if (cwd) {
-      paths = paths.map((path13) => {
-        const absPath = getAbsolutePath(path13, cwd);
+      paths = paths.map((path14) => {
+        const absPath = getAbsolutePath(path14, cwd);
         return absPath;
       });
     }
-    paths.forEach((path13) => {
-      this._removeIgnoredPath(path13);
+    paths.forEach((path14) => {
+      this._removeIgnoredPath(path14);
     });
     this._userIgnored = undefined;
     if (!this._readyCount)
       this._readyCount = 0;
     this._readyCount += paths.length;
-    Promise.all(paths.map(async (path13) => {
-      const res = await this._nodeFsHandler._addToNodeFs(path13, !_internal, undefined, 0, _origAdd);
+    Promise.all(paths.map(async (path14) => {
+      const res = await this._nodeFsHandler._addToNodeFs(path14, !_internal, undefined, 0, _origAdd);
       if (res)
         this._emitReady();
       return res;
@@ -9345,17 +9649,17 @@ class FSWatcher extends EventEmitter {
       return this;
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
-    paths.forEach((path13) => {
-      if (!sysPath2.isAbsolute(path13) && !this._closers.has(path13)) {
+    paths.forEach((path14) => {
+      if (!sysPath2.isAbsolute(path14) && !this._closers.has(path14)) {
         if (cwd)
-          path13 = sysPath2.join(cwd, path13);
-        path13 = sysPath2.resolve(path13);
+          path14 = sysPath2.join(cwd, path14);
+        path14 = sysPath2.resolve(path14);
       }
-      this._closePath(path13);
-      this._addIgnoredPath(path13);
-      if (this._watched.has(path13)) {
+      this._closePath(path14);
+      this._addIgnoredPath(path14);
+      if (this._watched.has(path14)) {
         this._addIgnoredPath({
-          path: path13,
+          path: path14,
           recursive: true
         });
       }
@@ -9404,38 +9708,38 @@ class FSWatcher extends EventEmitter {
     if (event !== EVENTS.ERROR)
       this.emit(EVENTS.ALL, event, ...args);
   }
-  async _emit(event, path13, stats) {
+  async _emit(event, path14, stats) {
     if (this.closed)
       return;
     const opts = this.options;
     if (isWindows)
-      path13 = sysPath2.normalize(path13);
+      path14 = sysPath2.normalize(path14);
     if (opts.cwd)
-      path13 = sysPath2.relative(opts.cwd, path13);
-    const args = [path13];
+      path14 = sysPath2.relative(opts.cwd, path14);
+    const args = [path14];
     if (stats != null)
       args.push(stats);
     const awf = opts.awaitWriteFinish;
     let pw;
-    if (awf && (pw = this._pendingWrites.get(path13))) {
+    if (awf && (pw = this._pendingWrites.get(path14))) {
       pw.lastChange = new Date;
       return this;
     }
     if (opts.atomic) {
       if (event === EVENTS.UNLINK) {
-        this._pendingUnlinks.set(path13, [event, ...args]);
+        this._pendingUnlinks.set(path14, [event, ...args]);
         setTimeout(() => {
-          this._pendingUnlinks.forEach((entry, path14) => {
+          this._pendingUnlinks.forEach((entry, path15) => {
             this.emit(...entry);
             this.emit(EVENTS.ALL, ...entry);
-            this._pendingUnlinks.delete(path14);
+            this._pendingUnlinks.delete(path15);
           });
         }, typeof opts.atomic === "number" ? opts.atomic : 100);
         return this;
       }
-      if (event === EVENTS.ADD && this._pendingUnlinks.has(path13)) {
+      if (event === EVENTS.ADD && this._pendingUnlinks.has(path14)) {
         event = EVENTS.CHANGE;
-        this._pendingUnlinks.delete(path13);
+        this._pendingUnlinks.delete(path14);
       }
     }
     if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -9453,16 +9757,16 @@ class FSWatcher extends EventEmitter {
           this.emitWithAll(event, args);
         }
       };
-      this._awaitWriteFinish(path13, awf.stabilityThreshold, event, awfEmit);
+      this._awaitWriteFinish(path14, awf.stabilityThreshold, event, awfEmit);
       return this;
     }
     if (event === EVENTS.CHANGE) {
-      const isThrottled = !this._throttle(EVENTS.CHANGE, path13, 50);
+      const isThrottled = !this._throttle(EVENTS.CHANGE, path14, 50);
       if (isThrottled)
         return this;
     }
     if (opts.alwaysStat && stats === undefined && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path13) : path13;
+      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path14) : path14;
       let stats2;
       try {
         stats2 = await stat4(fullPath);
@@ -9481,23 +9785,23 @@ class FSWatcher extends EventEmitter {
     }
     return error || this.closed;
   }
-  _throttle(actionType, path13, timeout) {
+  _throttle(actionType, path14, timeout) {
     if (!this._throttled.has(actionType)) {
       this._throttled.set(actionType, new Map);
     }
     const action = this._throttled.get(actionType);
     if (!action)
       throw new Error("invalid throttle");
-    const actionPath = action.get(path13);
+    const actionPath = action.get(path14);
     if (actionPath) {
       actionPath.count++;
       return false;
     }
     let timeoutObject;
     const clear = () => {
-      const item = action.get(path13);
+      const item = action.get(path14);
       const count = item ? item.count : 0;
-      action.delete(path13);
+      action.delete(path14);
       clearTimeout(timeoutObject);
       if (item)
         clearTimeout(item.timeoutObject);
@@ -9505,50 +9809,50 @@ class FSWatcher extends EventEmitter {
     };
     timeoutObject = setTimeout(clear, timeout);
     const thr = { timeoutObject, clear, count: 0 };
-    action.set(path13, thr);
+    action.set(path14, thr);
     return thr;
   }
   _incrReadyCount() {
     return this._readyCount++;
   }
-  _awaitWriteFinish(path13, threshold, event, awfEmit) {
+  _awaitWriteFinish(path14, threshold, event, awfEmit) {
     const awf = this.options.awaitWriteFinish;
     if (typeof awf !== "object")
       return;
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
-    let fullPath = path13;
-    if (this.options.cwd && !sysPath2.isAbsolute(path13)) {
-      fullPath = sysPath2.join(this.options.cwd, path13);
+    let fullPath = path14;
+    if (this.options.cwd && !sysPath2.isAbsolute(path14)) {
+      fullPath = sysPath2.join(this.options.cwd, path14);
     }
     const now = new Date;
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
       statcb(fullPath, (err, curStat) => {
-        if (err || !writes.has(path13)) {
+        if (err || !writes.has(path14)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
           return;
         }
         const now2 = Number(new Date);
         if (prevStat && curStat.size !== prevStat.size) {
-          writes.get(path13).lastChange = now2;
+          writes.get(path14).lastChange = now2;
         }
-        const pw = writes.get(path13);
+        const pw = writes.get(path14);
         const df = now2 - pw.lastChange;
         if (df >= threshold) {
-          writes.delete(path13);
+          writes.delete(path14);
           awfEmit(undefined, curStat);
         } else {
           timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
         }
       });
     }
-    if (!writes.has(path13)) {
-      writes.set(path13, {
+    if (!writes.has(path14)) {
+      writes.set(path14, {
         lastChange: now,
         cancelWait: () => {
-          writes.delete(path13);
+          writes.delete(path14);
           clearTimeout(timeoutHandler);
           return event;
         }
@@ -9556,8 +9860,8 @@ class FSWatcher extends EventEmitter {
       timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval);
     }
   }
-  _isIgnored(path13, stats) {
-    if (this.options.atomic && DOT_RE.test(path13))
+  _isIgnored(path14, stats) {
+    if (this.options.atomic && DOT_RE.test(path14))
       return true;
     if (!this._userIgnored) {
       const { cwd } = this.options;
@@ -9567,13 +9871,13 @@ class FSWatcher extends EventEmitter {
       const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
       this._userIgnored = anymatch(list, undefined);
     }
-    return this._userIgnored(path13, stats);
+    return this._userIgnored(path14, stats);
   }
-  _isntIgnored(path13, stat5) {
-    return !this._isIgnored(path13, stat5);
+  _isntIgnored(path14, stat5) {
+    return !this._isIgnored(path14, stat5);
   }
-  _getWatchHelpers(path13) {
-    return new WatchHelper(path13, this.options.followSymlinks, this);
+  _getWatchHelpers(path14) {
+    return new WatchHelper(path14, this.options.followSymlinks, this);
   }
   _getWatchedDir(directory) {
     const dir = sysPath2.resolve(directory);
@@ -9587,57 +9891,57 @@ class FSWatcher extends EventEmitter {
     return Boolean(Number(stats.mode) & 256);
   }
   _remove(directory, item, isDirectory) {
-    const path13 = sysPath2.join(directory, item);
-    const fullPath = sysPath2.resolve(path13);
-    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path13) || this._watched.has(fullPath);
-    if (!this._throttle("remove", path13, 100))
+    const path14 = sysPath2.join(directory, item);
+    const fullPath = sysPath2.resolve(path14);
+    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path14) || this._watched.has(fullPath);
+    if (!this._throttle("remove", path14, 100))
       return;
     if (!isDirectory && this._watched.size === 1) {
       this.add(directory, item, true);
     }
-    const wp = this._getWatchedDir(path13);
+    const wp = this._getWatchedDir(path14);
     const nestedDirectoryChildren = wp.getChildren();
-    nestedDirectoryChildren.forEach((nested) => this._remove(path13, nested));
+    nestedDirectoryChildren.forEach((nested) => this._remove(path14, nested));
     const parent = this._getWatchedDir(directory);
     const wasTracked = parent.has(item);
     parent.remove(item);
     if (this._symlinkPaths.has(fullPath)) {
       this._symlinkPaths.delete(fullPath);
     }
-    let relPath = path13;
+    let relPath = path14;
     if (this.options.cwd)
-      relPath = sysPath2.relative(this.options.cwd, path13);
+      relPath = sysPath2.relative(this.options.cwd, path14);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
         return;
     }
-    this._watched.delete(path13);
+    this._watched.delete(path14);
     this._watched.delete(fullPath);
     const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-    if (wasTracked && !this._isIgnored(path13))
-      this._emit(eventName, path13);
-    this._closePath(path13);
+    if (wasTracked && !this._isIgnored(path14))
+      this._emit(eventName, path14);
+    this._closePath(path14);
   }
-  _closePath(path13) {
-    this._closeFile(path13);
-    const dir = sysPath2.dirname(path13);
-    this._getWatchedDir(dir).remove(sysPath2.basename(path13));
+  _closePath(path14) {
+    this._closeFile(path14);
+    const dir = sysPath2.dirname(path14);
+    this._getWatchedDir(dir).remove(sysPath2.basename(path14));
   }
-  _closeFile(path13) {
-    const closers = this._closers.get(path13);
+  _closeFile(path14) {
+    const closers = this._closers.get(path14);
     if (!closers)
       return;
     closers.forEach((closer) => closer());
-    this._closers.delete(path13);
+    this._closers.delete(path14);
   }
-  _addPathCloser(path13, closer) {
+  _addPathCloser(path14, closer) {
     if (!closer)
       return;
-    let list = this._closers.get(path13);
+    let list = this._closers.get(path14);
     if (!list) {
       list = [];
-      this._closers.set(path13, list);
+      this._closers.set(path14, list);
     }
     list.push(closer);
   }
@@ -9668,8 +9972,8 @@ var esm_default = { watch, FSWatcher };
 
 // src/cli/cli.ts
 var import_picocolors9 = __toESM(require_picocolors(), 1);
-import path14 from "node:path";
-import { promises as fs12, existsSync } from "node:fs";
+import path15 from "node:path";
+import { promises as fs12, existsSync as existsSync2 } from "node:fs";
 import { spawn as spawn2, spawnSync } from "node:child_process";
 import { pathToFileURL as pathToFileURL4 } from "node:url";
 import { createRequire as createRequire3 } from "node:module";
@@ -9677,7 +9981,7 @@ import { createRequire as createRequire3 } from "node:module";
 // src/cli/auth-keys.ts
 import * as crypto2 from "crypto";
 import * as fs11 from "fs/promises";
-import * as path13 from "path";
+import * as path14 from "path";
 var AUTH_KEYS_FILENAME = "auth-keys.json";
 async function generateAuthKeys() {
   return new Promise((resolve3, reject) => {
@@ -9724,7 +10028,7 @@ function createJwksFromPublicKey(publicKeyPem, kid) {
   };
 }
 async function loadOrGenerateAuthKeys(dataDir) {
-  const keysPath = path13.join(dataDir, AUTH_KEYS_FILENAME);
+  const keysPath = path14.join(dataDir, AUTH_KEYS_FILENAME);
   try {
     const data = await fs11.readFile(keysPath, "utf-8");
     const stored = JSON.parse(data);
@@ -9751,7 +10055,7 @@ async function loadOrGenerateAuthKeys(dataDir) {
   }
 }
 async function detectAuthProjectFlavor(projectRoot) {
-  const packageJsonPath = path13.join(projectRoot, "package.json");
+  const packageJsonPath = path14.join(projectRoot, "package.json");
   try {
     const raw = await fs11.readFile(packageJsonPath, "utf-8");
     const parsed = JSON.parse(raw);
@@ -9793,7 +10097,7 @@ function setupAuthEnvironment(keys, siteUrl, options = {}) {
   setEnv("AUTH_SKIP_VERIFICATION", "true");
 }
 // package.json
-var version = "0.0.1-alpha.5";
+var version = "0.0.1-alpha.6";
 
 // src/cli/cli.ts
 var WATCH_IGNORE_PATTERNS = [
@@ -9801,6 +10105,7 @@ var WATCH_IGNORE_PATTERNS = [
   /(^|[/\\])\.git([/\\]|$)/,
   /(^|[/\\])_generated([/\\]|$)/
 ];
+var DEFAULT_CONVEX_VERSION_RANGE = "^1.27.3";
 var program2 = new Command;
 program2.name("concave").description("Concave development tools for Cloudflare Workers").version(version);
 function detectHostRuntime() {
@@ -9831,6 +10136,171 @@ function detectPreferredRuntime() {
     return "bun";
   return "node";
 }
+function detectPackageManager(projectRoot) {
+  if (existsSync2(path15.join(projectRoot, "bun.lock")) || existsSync2(path15.join(projectRoot, "bun.lockb"))) {
+    return "bun";
+  }
+  if (existsSync2(path15.join(projectRoot, "pnpm-lock.yaml"))) {
+    return "pnpm";
+  }
+  if (existsSync2(path15.join(projectRoot, "yarn.lock"))) {
+    return "yarn";
+  }
+  if (existsSync2(path15.join(projectRoot, "package-lock.json")) || existsSync2(path15.join(projectRoot, "npm-shrinkwrap.json"))) {
+    return "npm";
+  }
+  return isBunAvailable() ? "bun" : "npm";
+}
+function getAddConvexCommand(packageManager) {
+  switch (packageManager) {
+    case "bun":
+      return { cmd: "bun", args: ["add", "convex"], display: "bun add convex" };
+    case "pnpm":
+      return { cmd: "pnpm", args: ["add", "convex"], display: "pnpm add convex" };
+    case "yarn":
+      return { cmd: "yarn", args: ["add", "convex"], display: "yarn add convex" };
+    default:
+      return { cmd: "npm", args: ["install", "convex"], display: "npm install convex" };
+  }
+}
+function getInstallCommand(packageManager) {
+  switch (packageManager) {
+    case "bun":
+      return { cmd: "bun", args: ["install"], display: "bun install" };
+    case "pnpm":
+      return { cmd: "pnpm", args: ["install"], display: "pnpm install" };
+    case "yarn":
+      return { cmd: "yarn", args: ["install"], display: "yarn install" };
+    default:
+      return { cmd: "npm", args: ["install"], display: "npm install" };
+  }
+}
+function isObjectRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function sanitizePackageName(input) {
+  const normalized = input.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+  return normalized.length > 0 ? normalized : "concave-app";
+}
+function formatPathForDisplay(fromDir, targetPath) {
+  const relative3 = path15.relative(fromDir, targetPath);
+  if (!relative3 || relative3 === ".") {
+    return ".";
+  }
+  if (!relative3.startsWith("..") && !path15.isAbsolute(relative3)) {
+    return relative3;
+  }
+  return targetPath;
+}
+function hasConvexDependency(packageJson) {
+  return !!(packageJson.dependencies?.convex || packageJson.devDependencies?.convex || packageJson.optionalDependencies?.convex || packageJson.peerDependencies?.convex);
+}
+function createDefaultPackageJson(projectRoot) {
+  return {
+    name: sanitizePackageName(path15.basename(projectRoot)),
+    private: true,
+    type: "module"
+  };
+}
+async function readPackageJson(packageJsonPath) {
+  if (!existsSync2(packageJsonPath)) {
+    return null;
+  }
+  let parsed;
+  try {
+    const raw = await fs12.readFile(packageJsonPath, "utf8");
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      throw new Error(`Invalid JSON in ${packageJsonPath}: ${error.message}`);
+    }
+    throw new Error(`Failed to read ${packageJsonPath}: ${error?.message ?? String(error)}`);
+  }
+  if (!isObjectRecord(parsed)) {
+    throw new Error(`Invalid ${packageJsonPath}: expected a JSON object`);
+  }
+  return parsed;
+}
+async function writePackageJson(packageJsonPath, packageJson) {
+  await fs12.writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}
+`, "utf8");
+}
+async function ensurePackageJsonWithConvexDependency(projectRoot) {
+  const packageJsonPath = path15.join(projectRoot, "package.json");
+  const existing = await readPackageJson(packageJsonPath);
+  const packageJson = existing ?? createDefaultPackageJson(projectRoot);
+  const createdPackageJson = existing === null;
+  let addedConvexDependency = false;
+  if (!hasConvexDependency(packageJson)) {
+    packageJson.dependencies = {
+      ...packageJson.dependencies ?? {},
+      convex: DEFAULT_CONVEX_VERSION_RANGE
+    };
+    addedConvexDependency = true;
+  }
+  if (createdPackageJson || addedConvexDependency) {
+    await writePackageJson(packageJsonPath, packageJson);
+  }
+  return {
+    packageJsonPath,
+    createdPackageJson,
+    addedConvexDependency
+  };
+}
+async function canResolveConvexRuntime(projectRoot) {
+  const nodeModulesConvex = path15.join(projectRoot, "node_modules", "convex", "package.json");
+  if (existsSync2(nodeModulesConvex)) {
+    return true;
+  }
+  const hasYarnPnp = existsSync2(path15.join(projectRoot, ".pnp.cjs")) || existsSync2(path15.join(projectRoot, ".pnp.js"));
+  if (!hasYarnPnp) {
+    return false;
+  }
+  const requireFromProject = createRequire3(path15.join(projectRoot, "__concave__.js"));
+  try {
+    requireFromProject.resolve("convex/values");
+    requireFromProject.resolve("convex/server");
+    return true;
+  } catch {
+    return false;
+  }
+}
+function runInstallCommand(projectRoot, command) {
+  const result = spawnSync(command.cmd, command.args, {
+    cwd: projectRoot,
+    stdio: "inherit"
+  });
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    throw new Error(`"${command.display}" exited with code ${result.status ?? "unknown"}`);
+  }
+}
+async function ensureConvexDependencyReady(projectRoot, commandName) {
+  const packageManager = detectPackageManager(projectRoot);
+  const addCommand = getAddConvexCommand(packageManager);
+  const installCommand = getInstallCommand(packageManager);
+  const packageJsonPath = path15.join(projectRoot, "package.json");
+  const packageJson = await readPackageJson(packageJsonPath);
+  if (!packageJson) {
+    console.error(import_picocolors9.default.red("✗ Missing package.json"));
+    console.error(import_picocolors9.default.dim(`   \`concave ${commandName}\` requires the \`convex\` npm package.`));
+    console.error(import_picocolors9.default.dim(`   Run: ${addCommand.display}`));
+    process.exit(1);
+  }
+  if (!hasConvexDependency(packageJson)) {
+    console.error(import_picocolors9.default.red("✗ Missing dependency: convex"));
+    console.error(import_picocolors9.default.dim("   Concave function files import `convex/values` and generated files import `convex/server`."));
+    console.error(import_picocolors9.default.dim(`   Run: ${addCommand.display}`));
+    process.exit(1);
+  }
+  if (!await canResolveConvexRuntime(projectRoot)) {
+    console.error(import_picocolors9.default.red("✗ Could not resolve installed package: convex"));
+    console.error(import_picocolors9.default.dim(`   Run: ${installCommand.display}`));
+    process.exit(1);
+  }
+}
 async function prepareLocalDataPaths(cwd) {
   const resolved = await resolveLocalDataPaths(cwd);
   return {
@@ -9839,7 +10309,7 @@ async function prepareLocalDataPaths(cwd) {
     storagePath: resolved.storagePath
   };
 }
-function parseDotEnv(content) {
+function parseDotEnv2(content) {
   const result = {};
   const lines = content.split(`
 `);
@@ -9865,37 +10335,44 @@ function parseDotEnv(content) {
 }
 async function loadDevEnvironment(cwd, layout) {
   const candidates = [
-    path14.join(layout.convexRootDir, ".env.local"),
-    path14.join(layout.convexRootDir, ".env"),
-    path14.join(cwd, ".env.local"),
-    path14.join(cwd, ".env")
+    path15.join(layout.convexRootDir, ".env.local"),
+    path15.join(layout.convexRootDir, ".env"),
+    path15.join(cwd, ".env.local"),
+    path15.join(cwd, ".env")
   ];
   const loaded = [];
   for (const filePath of candidates) {
-    if (!existsSync(filePath)) {
+    if (!existsSync2(filePath)) {
       continue;
     }
     const content = await fs12.readFile(filePath, "utf8");
-    const parsed = parseDotEnv(content);
+    const parsed = parseDotEnv2(content);
     for (const [key, value] of Object.entries(parsed)) {
       if (process.env[key] === undefined) {
         process.env[key] = value;
       }
     }
-    loaded.push(path14.relative(cwd, filePath));
+    loaded.push(path15.relative(cwd, filePath));
   }
   return loaded;
 }
-program2.command("init").option("--force", "Overwrite starter files if they already exist").description("Initialize a Concave project (create convex/ and a starter function)").addHelpText("after", `
+program2.command("init [dir]").option("--force", "Overwrite starter files if they already exist").option("--install", "Install dependencies after scaffolding (default)").option("--no-install", "Skip installing dependencies after scaffolding").description("Initialize a Concave project (create starter files and setup dependencies)").addHelpText("after", `
 Examples:
-  $ concave init          Create convex/ and a starter function
-  $ concave init --force  Overwrite starter files
-`).action(async (opts) => {
+  $ concave init                Initialize in current directory
+  $ concave init my-app         Initialize in ./my-app
+  $ concave init --install      Explicitly install dependencies
+  $ concave init --no-install   Scaffold without running package install
+  $ concave init my-app --force Overwrite starter files
+`).action(async (dir, opts) => {
   const cwd = process.cwd();
-  const convexDir = path14.join(cwd, "convex");
-  const starterPath = path14.join(convexDir, "messages.ts");
+  const projectRoot = path15.resolve(cwd, dir ?? ".");
+  const displayRoot = formatPathForDisplay(cwd, projectRoot);
+  const layout = await resolveProjectLayout(projectRoot);
+  const convexDir = layout.functionsDir;
+  const starterPath = path15.join(convexDir, "messages.ts");
+  await fs12.mkdir(projectRoot, { recursive: true });
   await fs12.mkdir(convexDir, { recursive: true });
-  const starterExists = existsSync(starterPath);
+  const starterExists = existsSync2(starterPath);
   if (!starterExists || opts.force) {
     const content = `import { query, mutation } from "./_generated/server";
 import { v } from "convex/values";
@@ -9916,12 +10393,40 @@ export const create = mutation({
 });
 `;
     await fs12.writeFile(starterPath, content, "utf8");
-    console.log(import_picocolors9.default.green(`✓ Created ${path14.relative(cwd, starterPath)}`));
+    console.log(import_picocolors9.default.green(`✓ Created ${formatPathForDisplay(cwd, starterPath)}`));
   } else {
-    console.log(import_picocolors9.default.yellow(`⚠️  ${path14.relative(cwd, starterPath)} already exists (use --force to overwrite)`));
+    console.log(import_picocolors9.default.yellow(`⚠️  ${formatPathForDisplay(cwd, starterPath)} already exists (use --force to overwrite)`));
+  }
+  const packageSetup = await ensurePackageJsonWithConvexDependency(projectRoot);
+  if (packageSetup.createdPackageJson) {
+    console.log(import_picocolors9.default.green(`✓ Created ${formatPathForDisplay(cwd, packageSetup.packageJsonPath)}`));
+  }
+  if (packageSetup.addedConvexDependency) {
+    console.log(import_picocolors9.default.green(`✓ Added dependency: convex@${DEFAULT_CONVEX_VERSION_RANGE}`));
+  }
+  const packageManager = detectPackageManager(projectRoot);
+  const installCommand = getInstallCommand(packageManager);
+  const needsInstall = packageSetup.createdPackageJson || packageSetup.addedConvexDependency || !await canResolveConvexRuntime(projectRoot);
+  if (opts.install !== false && needsInstall) {
+    console.log(import_picocolors9.default.dim(`
+Installing dependencies with ${installCommand.display}...`));
+    try {
+      runInstallCommand(projectRoot, installCommand);
+      console.log(import_picocolors9.default.green(`✓ Installed dependencies (${installCommand.display})`));
+    } catch (error) {
+      console.error(import_picocolors9.default.red(`✗ Failed to install dependencies: ${error?.message ?? String(error)}`));
+      console.log(import_picocolors9.default.dim(`   Run manually: ${installCommand.display}`));
+      process.exit(1);
+    }
+  } else if (opts.install === false && needsInstall) {
+    console.log(import_picocolors9.default.yellow(`⚠️  Dependencies not installed (--no-install)`));
+    console.log(import_picocolors9.default.dim(`   Run: ${installCommand.display}`));
   }
   console.log(import_picocolors9.default.dim(`
 Next steps:`));
+  if (displayRoot !== ".") {
+    console.log(import_picocolors9.default.dim(`  cd ${displayRoot}`));
+  }
   console.log(import_picocolors9.default.dim("  concave dev"));
   console.log(import_picocolors9.default.dim("  concave run messages:list"));
 });
@@ -9932,6 +10437,7 @@ Examples:
   $ concave dev --port 8080  Start dev server on port 8080
 `).action(async (opts) => {
   const cwd = process.cwd();
+  await ensureConvexDependencyReady(cwd, "dev");
   const projectLayout = await resolveProjectLayout(cwd);
   try {
     const loadedEnvFiles = await loadDevEnvironment(cwd, projectLayout);
@@ -9981,11 +10487,14 @@ Examples:
   }
   let wranglerProcess;
   try {
-    const result = await generateWorkerEntry(cwd, { runtimeBundlePath, dashboardHtmlPath: artifacts.dashboardHtmlPath });
+    const result = await generateWorkerEntry(cwd, {
+      runtimeBundlePath,
+      dashboardHtmlPath: artifacts.dashboardHtmlPath
+    });
     console.log(import_picocolors9.default.green(`✓ Generated worker entry (${result.moduleCount} module${result.moduleCount === 1 ? "" : "s"})`));
     const configPath = await ensureWranglerConfig(cwd);
-    console.log(import_picocolors9.default.green(`✓ Using config: ${path14.basename(configPath)}`));
-    const relativeConfigPath = path14.relative(cwd, configPath);
+    console.log(import_picocolors9.default.green(`✓ Using config: ${path15.basename(configPath)}`));
+    const relativeConfigPath = path15.relative(cwd, configPath);
     const wranglerArgs = ["wrangler", "dev", "--config", relativeConfigPath];
     if (opts.port) {
       wranglerArgs.push("--port", opts.port);
@@ -10016,7 +10525,7 @@ Examples:
           try {
             await generateTypes(cwd, { silent: true });
           } catch {}
-          const relPath = path14.relative(cwd, filePath);
+          const relPath = path15.relative(cwd, filePath);
           console.log(import_picocolors9.default.dim(`   Updated worker entry (${event}: ${relPath || "convex/"}, ${regenResult.moduleCount} module${regenResult.moduleCount === 1 ? "" : "s"})`));
         } catch (error) {
           console.error(import_picocolors9.default.red("✗ Failed to update worker entry:"), error.message ?? error);
@@ -10104,6 +10613,24 @@ Examples:
     process.exit(1);
   }
 });
+program2.command("function-spec").option("--port <n>", "Port for the dev server", "3000").option("--url <url>", "Full URL to the dev server (overrides --port)").option("--component <path>", "Component path to inspect").option("--file", "Output as JSON to a file (function-spec.json)").description("List argument and return value specs for your Convex functions").addHelpText("after", `
+Examples:
+  $ concave function-spec                  List all functions
+  $ concave function-spec --file           Output to function-spec.json
+  $ concave function-spec --component presence  List functions in a component
+`).action(async (opts) => {
+  try {
+    await listFunctionSpecs({
+      port: opts.port,
+      url: opts.url,
+      component: opts.component,
+      file: opts.file
+    });
+  } catch (error) {
+    console.error(import_picocolors9.default.red("✗ Failed to list functions:"), error.message);
+    process.exit(1);
+  }
+});
 program2.command("codegen").option("--static", "Use static file scanning instead of runtime analysis").option("--verbose", "Show verbose output").description("Generate TypeScript type definitions for your Convex functions").addHelpText("after", `
 Examples:
   $ concave codegen            Generate types using runtime analysis (default, more precise)
@@ -10111,6 +10638,7 @@ Examples:
   $ concave codegen --verbose  Show detailed output
 `).action(async (opts) => {
   const cwd = process.cwd();
+  await ensureConvexDependencyReady(cwd, "codegen");
   try {
     if (opts.static) {
       await generateTypes(cwd, { silent: false });
@@ -10161,7 +10689,7 @@ Examples:
   }
   try {
     const layout = await resolveProjectLayout(cwd);
-    if (!existsSync(layout.functionsDir)) {
+    if (!existsSync2(layout.functionsDir)) {
       console.error(import_picocolors9.default.red("✗ No Convex functions directory found"));
       console.log(import_picocolors9.default.dim(`   Expected: ${layout.functionsDir}`));
       process.exit(1);
@@ -10179,10 +10707,10 @@ Examples:
     console.log(import_picocolors9.default.green(`✓ Generated standalone entry (${result.moduleCount} module${result.moduleCount === 1 ? "" : "s"})`));
     if (opts.verbose) {
       for (const file of result.sourceFiles) {
-        console.log(import_picocolors9.default.dim(`   ${path14.relative(cwd, file)}`));
+        console.log(import_picocolors9.default.dim(`   ${path15.relative(cwd, file)}`));
       }
     }
-    const outfile = path14.resolve(cwd, opts.outfile);
+    const outfile = path15.resolve(cwd, opts.outfile);
     const buildArgs = ["build", "--compile", result.entryFile, "--outfile", outfile];
     if (opts.target) {
       buildArgs.push("--target", `bun-${opts.target}`);
@@ -10212,13 +10740,13 @@ Examples:
       sizeStr = ` (${sizeMB} MB)`;
     } catch {}
     console.log(import_picocolors9.default.green(`
-✓ Built: ${path14.relative(cwd, outfile)}${sizeStr}`));
+✓ Built: ${path15.relative(cwd, outfile)}${sizeStr}`));
     if (opts.target) {
       console.log(import_picocolors9.default.dim(`   Target: bun-${opts.target}`));
     }
     console.log(import_picocolors9.default.dim(`
    Run it:`));
-    console.log(import_picocolors9.default.dim(`   ./${path14.relative(cwd, outfile)} --port 3000`));
+    console.log(import_picocolors9.default.dim(`   ./${path15.relative(cwd, outfile)} --port 3000`));
   } catch (error) {
     console.error(import_picocolors9.default.red("✗ Build failed:"), error.message);
     if (opts.verbose && error.stack) {
@@ -10229,8 +10757,8 @@ Examples:
 });
 program2.parse();
 async function listComponents(options) {
-  const baseUrl = detectBaseUrl(options);
-  const executeUrl = `${baseUrl}/api/execute`;
+  const baseUrlResolution = resolveBaseUrl(options);
+  const executeUrl = `${baseUrlResolution.baseUrl}/api/execute`;
   console.log(import_picocolors9.default.cyan(`\uD83D\uDCE6 Installed Components
 `));
   try {
@@ -10240,8 +10768,9 @@ async function listComponents(options) {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
-        path: "_system/systemListComponents",
+        path: "_system:systemListComponents",
         args: {},
+        type: "query",
         format: "json"
       })
     });
@@ -10264,12 +10793,87 @@ async function listComponents(options) {
     console.log(import_picocolors9.default.dim(`   Use ${import_picocolors9.default.bold("concave data --component <path>")} to view component tables`));
     console.log(import_picocolors9.default.dim(`   Use ${import_picocolors9.default.bold("concave run --component <path> <func>")} to run component functions`));
   } catch (error) {
-    if (error.code === "ECONNREFUSED") {
-      console.error(import_picocolors9.default.red("✗ Could not connect to dev server"));
-      console.log(import_picocolors9.default.dim(`   Make sure the dev server is running`));
-      console.log(import_picocolors9.default.dim(`   Run: npx concave dev`));
+    const connectionFailure = describeConnectionFailure(error, baseUrlResolution, executeUrl);
+    if (connectionFailure) {
+      console.error(import_picocolors9.default.red(connectionFailure.summary));
+      for (const line of connectionFailure.details) {
+        console.error(import_picocolors9.default.dim(`   ${line}`));
+      }
+    } else {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(import_picocolors9.default.red("✗ Failed to list components:"), message);
+    }
+    process.exit(1);
+  }
+}
+async function listFunctionSpecs(options) {
+  const baseUrlResolution = resolveBaseUrl(options);
+  const executeUrl = `${baseUrlResolution.baseUrl}/api/execute`;
+  try {
+    const response = await fetch(executeUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        path: "_system:systemListFunctions",
+        args: options.component ? { componentPath: options.component } : {},
+        type: "query",
+        format: "json"
+      })
+    });
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
+    const result = await response.json();
+    const functions = result.value || result.result || [];
+    if (options.file) {
+      const outPath = path15.resolve("function-spec.json");
+      await fs12.writeFile(outPath, JSON.stringify(functions, null, 2) + `
+`);
+      console.log(import_picocolors9.default.green(`✓ Wrote ${functions.length} function specs to ${outPath}`));
+      return;
+    }
+    if (functions.length === 0) {
+      console.log(import_picocolors9.default.dim("   No functions found"));
+      return;
+    }
+    const header = options.component ? import_picocolors9.default.cyan(`\uD83D\uDCCB Functions in Component: ${import_picocolors9.default.bold(options.component)}
+`) : import_picocolors9.default.cyan(`\uD83D\uDCCB Functions
+`);
+    console.log(header);
+    const byModule = new Map;
+    for (const fn of functions) {
+      const mod = fn.module || fn.path?.split(":")[0] || "(unknown)";
+      if (!byModule.has(mod))
+        byModule.set(mod, []);
+      byModule.get(mod).push(fn);
+    }
+    for (const [mod, fns] of byModule) {
+      console.log(import_picocolors9.default.bold(`   ${mod}`));
+      for (const fn of fns) {
+        const typeTag = fn.type === "query" ? import_picocolors9.default.blue("query") : fn.type === "mutation" ? import_picocolors9.default.yellow("mutation") : fn.type === "action" ? import_picocolors9.default.magenta("action") : import_picocolors9.default.dim(fn.type || "?");
+        const vis = fn.visibility === "internal" ? import_picocolors9.default.dim(" (internal)") : "";
+        console.log(`     ${import_picocolors9.default.green(fn.name)} ${typeTag}${vis}`);
+        if (fn.args) {
+          console.log(import_picocolors9.default.dim(`       args: ${JSON.stringify(fn.args)}`));
+        }
+        if (fn.returns) {
+          console.log(import_picocolors9.default.dim(`       returns: ${JSON.stringify(fn.returns)}`));
+        }
+      }
+      console.log();
+    }
+  } catch (error) {
+    const connectionFailure = describeConnectionFailure(error, baseUrlResolution, executeUrl);
+    if (connectionFailure) {
+      console.error(import_picocolors9.default.red(connectionFailure.summary));
+      for (const line of connectionFailure.details) {
+        console.error(import_picocolors9.default.dim(`   ${line}`));
+      }
     } else {
-      console.error(import_picocolors9.default.red("✗ Failed to list components:"), error.message);
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(import_picocolors9.default.red("✗ Failed to list functions:"), message);
     }
     process.exit(1);
   }
@@ -10297,7 +10901,7 @@ async function runBunDevServer(cwd, opts, artifacts, layout) {
     const functionsDir = resolvedLayout.functionsDir;
     const watchDir = resolvedLayout.convexRootDir;
     const port = opts.port ? parseInt(opts.port, 10) : config.port ?? 3000;
-    if (!existsSync(functionsDir)) {
+    if (!existsSync2(functionsDir)) {
       console.error(import_picocolors9.default.red("✗ No Convex functions directory found"));
       console.log(import_picocolors9.default.dim("   Create a Convex functions directory with your UDF files"));
       console.log(import_picocolors9.default.dim(`   Expected location: ${functionsDir}`));
@@ -10337,7 +10941,7 @@ async function runBunDevServer(cwd, opts, artifacts, layout) {
         console.log(import_picocolors9.default.cyan(`
 \uD83D\uDE80 Server ready at ${import_picocolors9.default.bold(displayUrl)}`));
         console.log(import_picocolors9.default.dim(`   Dashboard:  ${displayUrl}/_dashboard`));
-        console.log(import_picocolors9.default.dim(`   Functions:  ${path14.relative(cwd, functionsDir)}/`));
+        console.log(import_picocolors9.default.dim(`   Functions:  ${path15.relative(cwd, functionsDir)}/`));
         console.log(import_picocolors9.default.dim(`
    Press Ctrl+C to stop
 `));
@@ -10374,13 +10978,13 @@ async function runBunDevServer(cwd, opts, artifacts, layout) {
       persistent: true
     });
     let reloadTimer;
-    const scheduleReload = (event, filePath) => {
+    const scheduleReload = (_event, filePath) => {
       if (reloadTimer) {
         clearTimeout(reloadTimer);
       }
       reloadTimer = setTimeout(async () => {
         reloadTimer = undefined;
-        const relPath = path14.relative(cwd, filePath);
+        const relPath = path15.relative(cwd, filePath);
         try {
           await generateTypes(cwd, { silent: true });
         } catch {}
@@ -10428,7 +11032,7 @@ async function runBunDevServerForked(cwd, opts, artifacts, layout) {
   const functionsDir = layout.functionsDir;
   const convexDir = layout.convexRootDir;
   const port = opts.port ? parseInt(opts.port, 10) : config.port ?? 3000;
-  if (!existsSync(functionsDir)) {
+  if (!existsSync2(functionsDir)) {
     console.error(import_picocolors9.default.red("✗ No Convex functions directory found"));
     console.log(import_picocolors9.default.dim("   Create a Convex functions directory with your UDF files"));
     console.log(import_picocolors9.default.dim(`   Expected location: ${functionsDir}`));
@@ -10448,7 +11052,7 @@ async function runBunDevServerForked(cwd, opts, artifacts, layout) {
   } catch (error) {
     console.warn(import_picocolors9.default.yellow(`⚠️  Auth keys setup failed: ${error.message}`));
   }
-  const tempScriptPath = path14.join(localData.dataDir, ".bun-dev-server.js");
+  const tempScriptPath = path15.join(localData.dataDir, ".bun-dev-server.js");
   const dashboardModulePath = artifacts.dashboardHtmlPath.replace(/\\/g, "/");
   const scriptContent = `import { BunServer } from "${artifacts.bunRuntime.serverEntryPath.replace(/\\/g, "/")}";
 import { DASHBOARD_HTML } from ${JSON.stringify(dashboardModulePath)};
@@ -10465,7 +11069,7 @@ const displayUrl = server.url.replace(/127\\.0\\.0\\.1|0\\.0\\.0\\.0/, "localhos
 
 console.log("\\n\uD83D\uDE80 Server ready at " + displayUrl);
 console.log("   Dashboard:  " + displayUrl + "/_dashboard");
-console.log("   Functions:  ${path14.relative(cwd, functionsDir).replace(/\\/g, "/")}/");
+console.log("   Functions:  ${path15.relative(cwd, functionsDir).replace(/\\/g, "/")}/");
 console.log("\\n   Press Ctrl+C to stop\\n");
 
 // Handle graceful shutdown
@@ -10539,7 +11143,7 @@ function hasTsxLoader() {
     const arg = argv[i];
     if (arg === "--import") {
       const next = argv[i + 1];
-      if (next && next.includes("tsx")) {
+      if (next?.includes("tsx")) {
         return true;
       }
       i++;
@@ -10556,7 +11160,7 @@ function resolveTsxLoaderPath() {
   let tsxLoaderPath = "tsx";
   try {
     const tsxPackagePath = require2.resolve("tsx/package.json");
-    tsxLoaderPath = path14.join(path14.dirname(tsxPackagePath), "dist/loader.mjs");
+    tsxLoaderPath = path15.join(path15.dirname(tsxPackagePath), "dist/loader.mjs");
   } catch {
     tsxLoaderPath = "tsx";
   }
@@ -10604,7 +11208,7 @@ async function runNodeDevServer(cwd, opts, artifacts, layout) {
     const functionsDir = resolvedLayout.functionsDir;
     const watchDir = resolvedLayout.convexRootDir;
     const port = opts.port ? parseInt(opts.port, 10) : config.port ?? 3000;
-    if (!existsSync(functionsDir)) {
+    if (!existsSync2(functionsDir)) {
       console.error(import_picocolors9.default.red("✗ No Convex functions directory found"));
       console.log(import_picocolors9.default.dim("   Create a Convex functions directory with your UDF files"));
       console.log(import_picocolors9.default.dim(`   Expected location: ${functionsDir}`));
@@ -10644,7 +11248,7 @@ async function runNodeDevServer(cwd, opts, artifacts, layout) {
         console.log(import_picocolors9.default.cyan(`
 \uD83D\uDE80 Server ready at ${import_picocolors9.default.bold(displayUrl)}`));
         console.log(import_picocolors9.default.dim(`   Dashboard:  ${displayUrl}/_dashboard`));
-        console.log(import_picocolors9.default.dim(`   Functions:  ${path14.relative(cwd, functionsDir)}/`));
+        console.log(import_picocolors9.default.dim(`   Functions:  ${path15.relative(cwd, functionsDir)}/`));
         console.log(import_picocolors9.default.dim(`
    Press Ctrl+C to stop
 `));
@@ -10681,13 +11285,13 @@ async function runNodeDevServer(cwd, opts, artifacts, layout) {
       persistent: true
     });
     let reloadTimer;
-    const scheduleReload = (event, filePath) => {
+    const scheduleReload = (_event, filePath) => {
       if (reloadTimer) {
         clearTimeout(reloadTimer);
       }
       reloadTimer = setTimeout(async () => {
         reloadTimer = undefined;
-        const relPath = path14.relative(cwd, filePath);
+        const relPath = path15.relative(cwd, filePath);
         try {
           await generateTypes(cwd, { silent: true });
         } catch {}
@@ -10735,7 +11339,7 @@ async function runNodeDevServerForked(cwd, opts, artifacts, layout) {
   const convexDir = layout.convexRootDir;
   const functionsDir = layout.functionsDir;
   const port = opts.port ? parseInt(opts.port, 10) : config.port ?? 3000;
-  if (!existsSync(functionsDir)) {
+  if (!existsSync2(functionsDir)) {
     console.error(import_picocolors9.default.red("✗ No Convex functions directory found"));
     console.log(import_picocolors9.default.dim("   Create a Convex functions directory with your UDF files"));
     console.log(import_picocolors9.default.dim(`   Expected location: ${functionsDir}`));
@@ -10759,11 +11363,11 @@ async function runNodeDevServerForked(cwd, opts, artifacts, layout) {
   let tsxLoaderPath;
   try {
     const tsxPackagePath = require2.resolve("tsx/package.json");
-    tsxLoaderPath = path14.join(path14.dirname(tsxPackagePath), "dist/loader.mjs");
+    tsxLoaderPath = path15.join(path15.dirname(tsxPackagePath), "dist/loader.mjs");
   } catch {
     tsxLoaderPath = "tsx";
   }
-  const tempScriptPath = path14.join(localData.dataDir, ".node-dev-server.mjs");
+  const tempScriptPath = path15.join(localData.dataDir, ".node-dev-server.mjs");
   const nodeDashboardModulePath = artifacts.dashboardHtmlPath.replace(/\\/g, "/");
   const scriptContent = `import { NodeServer } from "${artifacts.nodeRuntime.serverEntryPath.replace(/\\/g, "/")}";
 import { DASHBOARD_HTML } from ${JSON.stringify(nodeDashboardModulePath)};
@@ -10780,7 +11384,7 @@ const displayUrl = server.url.replace(/127\\.0\\.0\\.1|0\\.0\\.0\\.0/, "localhos
 
 console.log("\\n\uD83D\uDE80 Server ready at " + displayUrl);
 console.log("   Dashboard:  " + displayUrl + "/_dashboard");
-console.log("   Functions:  ${path14.relative(cwd, functionsDir).replace(/\\/g, "/")}/");
+console.log("   Functions:  ${path15.relative(cwd, functionsDir).replace(/\\/g, "/")}/");
 console.log("\\n   Press Ctrl+C to stop\\n");
 
 // Handle graceful shutdown
@@ -10805,12 +11409,7 @@ process.on("SIGTERM", async () => {
 });
 `;
   await fs12.writeFile(tempScriptPath, scriptContent, "utf8");
-  const nodeArgs = [
-    "--experimental-sqlite",
-    "--import",
-    tsxLoaderPath,
-    tempScriptPath
-  ];
+  const nodeArgs = ["--experimental-sqlite", "--import", tsxLoaderPath, tempScriptPath];
   const executable = detectHostRuntime() === "node" ? process.execPath : "node";
   const nodeProcess = spawn2(executable, nodeArgs, {
     cwd,
@@ -10829,9 +11428,9 @@ process.on("SIGTERM", async () => {
 }
 async function ensureWranglerConfig(cwd) {
   const userConfigs = [
-    path14.join(cwd, "wrangler.jsonc"),
-    path14.join(cwd, "wrangler.json"),
-    path14.join(cwd, "wrangler.toml")
+    path15.join(cwd, "wrangler.jsonc"),
+    path15.join(cwd, "wrangler.json"),
+    path15.join(cwd, "wrangler.toml")
   ];
   for (const configPath of userConfigs) {
     try {
@@ -10840,8 +11439,8 @@ async function ensureWranglerConfig(cwd) {
     } catch {}
   }
   const concavePaths = getConcaveProjectPaths(cwd);
-  const generatedConfigPath = path14.join(concavePaths.concaveDir, "wrangler.jsonc");
-  const assetsDirectory = path14.join(concavePaths.concaveDir, "static");
+  const generatedConfigPath = path15.join(concavePaths.concaveDir, "wrangler.jsonc");
+  const assetsDirectory = path15.join(concavePaths.concaveDir, "static");
   await fs12.mkdir(assetsDirectory, { recursive: true });
   const config = {
     name: "concave-app",
@@ -10849,7 +11448,6 @@ async function ensureWranglerConfig(cwd) {
     compatibility_date: "2025-10-01",
     compatibility_flags: ["enable_ctx_exports", "nodejs_compat", "nodejs_als"],
     assets: {
-      binding: "DASHBOARD_ASSETS",
       directory: "./static"
     },
     durable_objects: {
@@ -10863,22 +11461,9 @@ async function ensureWranglerConfig(cwd) {
         tag: "concave-v1",
         new_sqlite_classes: ["ConcaveDO", "SyncDO"]
       }
-    ],
-    d1_databases: [
-      {
-        binding: "DB",
-        database_name: "concave-db",
-        database_id: "REPLACE_ME"
-      }
-    ],
-    r2_buckets: [
-      {
-        binding: "STORAGE_BUCKET",
-        bucket_name: "concave-storage"
-      }
     ]
   };
-  await fs12.mkdir(path14.dirname(generatedConfigPath), { recursive: true });
+  await fs12.mkdir(path15.dirname(generatedConfigPath), { recursive: true });
   await fs12.writeFile(generatedConfigPath, JSON.stringify(config, null, 2), "utf8");
   return generatedConfigPath;
 }