c582d621ce
Block A of the EchoDo plan. Workspaces used to live as `objects(type='workspace')`,
which made it impossible to put a real RLS-friendly tenant boundary on the schema
or to give each workspace a stable URL slug. This commit:
- Adds a top-level `workspaces` table (slug unique, owner FK, plan_tier hook).
- Migrates the 8 anchor tables (objects, workspace_members, object_type_defs,
property_definitions, templates, forms, markdown_backlog_items,
cursor_sync_mappings) to FK into `workspaces.id` instead of `objects.id`,
with a hand-augmented data-copy migration that preserves IDs and slug-collision-
proofs on backfill.
- Introduces a `workspaceProcedure` tRPC middleware + `resolveWorkspace` helper
that take a UUID-or-slug `workspace` handle and expose `ctx.workspace`. All
tenant-scoped routers (objects, types, properties, templates, forms, search,
ai, relations, favorites) now flow through it.
- Updates the web app to pass `workspace` slugs from the URL (or store) instead
of the old `workspaceId`, including a workspace-sync layer that rewrites
/<UUID>/... links to /<slug>/...
- Updates the MCP tools (list_objects, create_object, search_objects) and the
workspace://{handle}/tree resource to accept either a slug or UUID so existing
agents keep working.
- Adds a Create Workspace dialog and a Workspace Settings page (rename + slug
rename with redirect, owner-only archive).
Verified locally against a fresh Postgres: migration applies cleanly, slug
uniqueness holds, tenant data is isolated by workspace_id, slug↔UUID resolution
works in both directions, and ON DELETE CASCADE cleans up child rows in the
correct workspace only.
Co-authored-by: Cursor <cursoragent@cursor.com>
31 lines
1 KiB
TypeScript
31 lines
1 KiB
TypeScript
import { eq } from "../drizzle.js";
|
|
import { db } from "../db.js";
|
|
import { workspaces } from "../schema.js";
|
|
|
|
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
|
|
/**
|
|
* Resolves a workspace handle (UUID or slug) to a `{ id, slug, name }` record.
|
|
* MCP tools accept either since agents may have hard-coded either form. Throws
|
|
* a friendly Error if no row matches so `toolCatch` can surface the message.
|
|
*/
|
|
export async function resolveWorkspaceHandle(
|
|
handle: string,
|
|
): Promise<{ id: string; slug: string; name: string }> {
|
|
const cleaned = handle.trim();
|
|
if (!cleaned) {
|
|
throw new Error("Workspace handle is required");
|
|
}
|
|
const cond = UUID_RE.test(cleaned)
|
|
? eq(workspaces.id, cleaned)
|
|
: eq(workspaces.slug, cleaned);
|
|
const [row] = await db
|
|
.select({ id: workspaces.id, slug: workspaces.slug, name: workspaces.name })
|
|
.from(workspaces)
|
|
.where(cond)
|
|
.limit(1);
|
|
if (!row) {
|
|
throw new Error(`Workspace not found for handle "${handle}"`);
|
|
}
|
|
return row;
|
|
}
|