Merge branch 'jack/cloud2'

Author: hotlong

apps/server/.env.example

@@ -1,10 +1,15 @@
-# Turso Database Configuration (control-plane DB)
-# Required for Vercel deployment
-TURSO_DATABASE_URL=libsql://your-database.turso.io
-TURSO_AUTH_TOKEN=your-auth-token-here
+# Control-plane database (owns sys_*, projects, auth)
+#
+#   unset                → file:./.objectstack/data/control.db (local SQLite)
+#   file:<path>          → SQLite at that path
+#   libsql://host        → libSQL / Turso
+#   http(s)://host       → libSQL / sqld over HTTP
+#
+# OBJECTSTACK_DATABASE_URL=libsql://your-database.turso.io
+# OBJECTSTACK_DATABASE_AUTH_TOKEN=your-auth-token-here
 
-# Turso Platform API (environment provisioning)
-# When set, new environments are provisioned as real Turso cloud databases.
-# When unset, each environment gets a local SQLite file under .objectstack/data/environments/.
+# Turso Platform API (per-project database provisioning)
+# When set, new projects are provisioned as real Turso cloud databases.
+# When unset, each project gets a local SQLite file under .objectstack/data/environments/.
 TURSO_ORG_NAME=your-org-slug
 TURSO_API_TOKEN=your-platform-api-token

apps/server/Dockerfile

@@ -68,8 +68,8 @@ EXPOSE 3000
 VOLUME ["/data"]
 
 # The container talks to the control plane (local SQLite at /data or remote
-# Turso) via env. Override any of these in fly.toml / `docker run -e …`.
-ENV OBJECTSTACK_CONTROL_DB=/data/control.db
+# libSQL/Turso) via env. Override in fly.toml / `docker run -e …`.
+ENV OBJECTSTACK_DATABASE_URL=file:/data/control.db
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
     CMD wget -qO- "http://127.0.0.1:${PORT}/api/v1/health" >/dev/null 2>&1 || exit 1

apps/server/README.md

@@ -17,69 +17,42 @@ See [DEPLOYMENT.md](./DEPLOYMENT.md) for detailed deployment instructions.
 - **Zero-Code Backend**: No creating routes or controllers per object.
 - **Preview Mode**: Run in demo mode — bypass login, auto-simulate admin identity.
 - **Vercel Deployment**: Ready-to-deploy to Vercel with Hono adapter.
-- **Dual-mode bootstrap**: single self-hosted kernel *or* per-project kernels fronting a cloud control plane (see below).
+- **Control-plane + per-project kernels**: the control plane owns `sys_*` (projects, auth, members); each project gets its own kernel minted on demand by `KernelManager`.
 
-## Bootstrap shapes
+## Control-plane database
 
-A single `apps/server` process can run in three shapes, selected by env vars.
-See the [Cloud vs Self-Hosted guide](../../content/docs/guides/cloud-deployment.mdx) for the full walkthrough.
-
-### `single` (default)
-
-One `ObjectKernel`, one database, every plugin from `objectstack.config.ts`.
-No control plane, no per-project routing. Ideal for local development and
-single-project deployments.
-
-```bash
-OBJECTSTACK_DATABASE_URL=file:./local.db \
-AUTH_SECRET=$(openssl rand -hex 32) \
-pnpm dev
-# → http://localhost:3000
-```
-
-### `multi-project-local`
-
-Control-plane sys_* tables live in a local SQLite file. Projects are created
-via Studio / the `/api/v1/cloud/projects` REST endpoint; each project binds
-its own driver (sqlite / Turso / postgres). Hostname-based routing delivers
-each request to the matching project's kernel.
+One env var picks where `sys_*` lives. Everything else (per-project kernels,
+Studio routing, template seeding) is the same regardless of the choice.
 
 ```bash
-OBJECTSTACK_MULTI_PROJECT=true \
-OBJECTSTACK_CONTROL_DB=/data/control.db \
-AUTH_SECRET=$(openssl rand -hex 32) \
+# Default: unset → file:./.objectstack/data/control.db (local SQLite)
 pnpm dev
-# → http://localhost:3000, routes by Host header → sys_project.hostname
-```
 
-### `multi-project-remote`
-
-Same path as `multi-project-local` but the control-plane driver points at a
-remote Turso database. Used for SaaS deployments where many replicas share
-one sys_* schema.
-
-```bash
-OBJECTSTACK_CONTROL_PLANE_URL=https://control.example.com \
-TURSO_DATABASE_URL=libsql://control.turso.io \
-TURSO_AUTH_TOKEN=... \
+# Remote libSQL / Turso:
+OBJECTSTACK_DATABASE_URL=libsql://control.turso.io \
+OBJECTSTACK_DATABASE_AUTH_TOKEN=... \
 AUTH_SECRET=$(openssl rand -hex 32) \
 pnpm dev
 ```
 
-| Env var                           | Purpose                                                                  |
-| --------------------------------- | ------------------------------------------------------------------------ |
-| `OBJECTSTACK_MULTI_PROJECT`       | Set to `true` to enable local multi-project mode.                        |
-| `OBJECTSTACK_CONTROL_DB`          | Path to the local SQLite control DB (default `./.objectstack/data/control.db`). |
-| `OBJECTSTACK_CONTROL_PLANE_URL`   | Set to enable remote multi-project mode (value identifies the control plane). |
-| `TURSO_DATABASE_URL`              | Turso URL for the control DB (required with `OBJECTSTACK_CONTROL_PLANE_URL`). |
-| `TURSO_AUTH_TOKEN`                | Auth token for the control DB.                                           |
-| `OBJECTSTACK_KERNEL_CACHE_SIZE`   | LRU size for per-project kernels (default 32).                           |
-| `OBJECTSTACK_KERNEL_TTL_MS`       | Idle eviction TTL in ms (default 900000).                                |
-| `AUTH_SECRET`                     | Better Auth session secret (≥ 32 chars).                                 |
-
-In both multi-project shapes, `OBJECTSTACK_DATABASE_URL` is **not** read on
-the data plane — project database URLs and credentials come from sys_project
-rows.
+| `OBJECTSTACK_DATABASE_URL` value | Resolved driver |
+|:---|:---|
+| unset | `file:./.objectstack/data/control.db` (SQLite) |
+| `file:<path>` / `file:///<path>` / bare path | SQLite at that path |
+| `libsql://host` | libSQL / Turso |
+| `http(s)://host` | libSQL / sqld over HTTP |
+
+| Env var | Purpose |
+|:---|:---|
+| `OBJECTSTACK_DATABASE_URL` | Control-plane DB URL. Default: local SQLite. |
+| `OBJECTSTACK_DATABASE_AUTH_TOKEN` | Auth token forwarded to libSQL/Turso. Optional. |
+| `OBJECTSTACK_KERNEL_CACHE_SIZE` | LRU size for per-project kernels (default 32). |
+| `OBJECTSTACK_KERNEL_TTL_MS` | Idle eviction TTL in ms (default 900000). |
+| `AUTH_SECRET` | Better Auth session secret (≥ 32 chars). |
+
+`OBJECTSTACK_DATABASE_URL` only configures the control plane — per-project
+database URLs and credentials come from `sys_project` rows and are chosen
+by the user when they provision a project via Studio / the REST API.
 
 ## Setup
 

apps/server/fly.toml

@@ -1,4 +1,4 @@
-# fly.toml — ObjectStack Server (multi-project shape)
+# fly.toml — ObjectStack Server
 #
 # Deploy from the repo root so the monorepo Dockerfile can see the full
 # workspace:
@@ -14,7 +14,8 @@
 # Secrets (never commit — use `fly secrets set …`):
 #   AUTH_SECRET, OBJECTSTACK_COOKIE_DOMAIN,
 #   TURSO_ORG_NAME, TURSO_API_TOKEN,
-#   (optional) TURSO_DATABASE_URL + TURSO_AUTH_TOKEN for multi-project-remote
+#   (optional) OBJECTSTACK_DATABASE_URL + OBJECTSTACK_DATABASE_AUTH_TOKEN
+#     — override the default local-SQLite control DB with a remote libSQL.
 
 app = "objectstack-server"
 primary_region = "iad"
@@ -55,11 +56,10 @@ kill_timeout = "30s"
   destination = "/data"
 
 [env]
-  # Enable multi-project-local mode by default — control plane lives in the
-  # SQLite file on the attached volume. Override to multi-project-remote by
-  # setting OBJECTSTACK_CONTROL_PLANE_URL + TURSO_DATABASE_URL via secrets.
-  OBJECTSTACK_MULTI_PROJECT = "true"
-  OBJECTSTACK_CONTROL_DB = "/data/control.db"
+  # Control plane lives in the SQLite file on the attached volume. Override
+  # with a remote libSQL/Turso by setting `OBJECTSTACK_DATABASE_URL` (and
+  # optionally `OBJECTSTACK_DATABASE_AUTH_TOKEN`) via `fly secrets set`.
+  OBJECTSTACK_DATABASE_URL = "file:/data/control.db"
   OBJECTSTACK_KERNEL_CACHE_SIZE = "50"
   OBJECTSTACK_KERNEL_TTL_MS = "1800000"
   OBJECTSTACK_ENV_CACHE_TTL_MS = "300000"