latticesql 1.16.2 → 1.16.4

package/dist/cli.js

@@ -7,8 +7,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/cli.ts
-import { resolve as resolve9, dirname as dirname9 } from "path";
-import { readFileSync as readFileSync14 } from "fs";
+import { resolve as resolve10, dirname as dirname12 } from "path";
+import { readFileSync as readFileSync15 } from "fs";
 import { execSync } from "child_process";
 import { parse as parse2 } from "yaml";
 
@@ -3640,7 +3640,7 @@ ${body}`;
 
 // src/framework/workspace.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync8, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
-import { join as join11 } from "path";
+import { dirname as dirname6, join as join11, resolve as resolve4 } from "path";
 import { v4 as uuidv4 } from "uuid";
 var EMPTY_REGISTRY = {
   version: 1,
@@ -3737,6 +3737,15 @@ function setActiveWorkspace(root, id) {
   writeRegistry(root, reg);
 }
 function resolveWorkspacePaths(root, ws) {
+  if (ws.configPath) {
+    const dir = dirname6(ws.configPath);
+    return {
+      dir,
+      configPath: ws.configPath,
+      dataDir: join11(dir, "Data"),
+      contextDir: ws.contextDir ?? resolve4(dir, "context")
+    };
+  }
   return {
     dir: workspaceDir(root, ws.dir),
     configPath: workspaceConfigPath(root, ws.dir),
@@ -3744,6 +3753,13 @@ function resolveWorkspacePaths(root, ws) {
     contextDir: workspaceContextDir(root, ws.dir)
   };
 }
+function effectiveConfigPath(root, ws) {
+  return ws.configPath ?? workspaceConfigPath(root, ws.dir);
+}
+function findWorkspaceByConfigPath(root, configPath) {
+  const target = resolve4(configPath);
+  return listWorkspaces(root).find((w) => resolve4(effectiveConfigPath(root, w)) === target) ?? null;
+}
 function isCloudDb(db) {
   const trimmed = db.trim();
   return /^postgres(ql)?:\/\//i.test(trimmed) || trimmed.startsWith("${LATTICE_DB:");
@@ -3786,6 +3802,79 @@ function addWorkspace(root, opts) {
   writeRegistry(root, reg);
   return record;
 }
+function addAdoptedWorkspace(root, opts) {
+  if (!existsSync11(rootConfigDir(root))) {
+    mkdirSync6(rootConfigDir(root), { recursive: true });
+  }
+  const existing = findWorkspaceByConfigPath(root, opts.configPath);
+  if (existing) {
+    if (opts.makeActive) setActiveWorkspace(root, existing.id);
+    return existing;
+  }
+  const reg = readRegistry(root);
+  const existingDirs = new Set(reg.workspaces.map((w) => w.dir));
+  const record = {
+    id: uuidv4(),
+    displayName: opts.displayName,
+    dir: uniqueDirName(opts.displayName, existingDirs),
+    db: opts.db,
+    kind: isCloudDb(opts.db) ? "cloud" : "local",
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    configPath: resolve4(opts.configPath),
+    contextDir: resolve4(opts.contextDir)
+  };
+  reg.workspaces.push(record);
+  const makeActive = opts.makeActive ?? reg.activeWorkspaceId === null;
+  if (makeActive) reg.activeWorkspaceId = record.id;
+  writeRegistry(root, reg);
+  return record;
+}
+function registerOrUpdateCloudWorkspace(root, opts) {
+  const existing = findWorkspaceByConfigPath(root, opts.configPath);
+  if (existing) {
+    const reg = readRegistry(root);
+    const rec = reg.workspaces.find((w) => w.id === existing.id);
+    if (rec) {
+      rec.db = opts.db;
+      rec.kind = "cloud";
+      if (opts.makeActive) reg.activeWorkspaceId = rec.id;
+      writeRegistry(root, reg);
+      return rec;
+    }
+  }
+  return addAdoptedWorkspace(root, {
+    displayName: opts.displayName,
+    db: opts.db,
+    configPath: opts.configPath,
+    contextDir: opts.contextDir,
+    makeActive: opts.makeActive ?? false
+  });
+}
+function removeWorkspace(root, id) {
+  const reg = readRegistry(root);
+  const idx = reg.workspaces.findIndex((w) => w.id === id);
+  if (idx < 0) return null;
+  const [removed] = reg.workspaces.splice(idx, 1);
+  if (reg.activeWorkspaceId === id) {
+    reg.activeWorkspaceId = reg.workspaces[0]?.id ?? null;
+  }
+  writeRegistry(root, reg);
+  return removed ?? null;
+}
+function removeWorkspaceByConfigPath(root, configPath) {
+  const match = findWorkspaceByConfigPath(root, configPath);
+  return match ? removeWorkspace(root, match.id) : null;
+}
+function renameWorkspaceByConfigPath(root, configPath, displayName) {
+  const match = findWorkspaceByConfigPath(root, configPath);
+  if (!match) return;
+  const reg = readRegistry(root);
+  const rec = reg.workspaces.find((w) => w.id === match.id);
+  if (rec) {
+    rec.displayName = displayName;
+    writeRegistry(root, reg);
+  }
+}
 
 // src/framework/canonical-context.ts
 function deriveCanonicalContexts(tables) {
@@ -5891,14 +5980,15 @@ async function checkForUpdate(pkgName, currentVersion) {
 import { createServer } from "http";
 import { spawn as spawn2 } from "child_process";
 import {
-  existsSync as existsSync18,
-  mkdirSync as mkdirSync8,
-  readFileSync as readFileSync13,
-  readdirSync as readdirSync7,
+  existsSync as existsSync20,
+  mkdirSync as mkdirSync9,
+  readFileSync as readFileSync14,
+  readdirSync as readdirSync8,
+  rmSync as rmSync2,
   unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync8
 } from "fs";
-import { basename as basename6, dirname as dirname8, join as join16, resolve as resolve6, sep as sep4 } from "path";
+import { basename as basename7, dirname as dirname11, join as join18, resolve as resolve8, sep as sep4 } from "path";
 import { parseDocument as parseDocument2 } from "yaml";
 
 // src/gui/http.ts
@@ -5912,7 +6002,7 @@ function sendJson(res, body, status = 200) {
 var DEFAULT_BODY_MAX_BYTES = 1e6;
 function readJson(req, opts = {}) {
   const maxBytes = opts.maxBytes ?? DEFAULT_BODY_MAX_BYTES;
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     let raw = "";
     req.setEncoding("utf8");
     req.on("data", (chunk) => {
@@ -5921,7 +6011,7 @@ function readJson(req, opts = {}) {
     });
     req.on("end", () => {
       try {
-        resolve10(raw ? JSON.parse(raw) : {});
+        resolve11(raw ? JSON.parse(raw) : {});
       } catch {
         reject(new Error("Invalid JSON body"));
       }
@@ -5939,7 +6029,7 @@ async function tryHandler(res, fn) {
 
 // src/gui/data.ts
 import { existsSync as existsSync14, readFileSync as readFileSync10 } from "fs";
-import { basename as basename3, join as join13, relative, resolve as resolve4, sep as sep2 } from "path";
+import { basename as basename3, join as join13, relative, resolve as resolve5, sep as sep2 } from "path";
 function tableToSummary(name, definition) {
   return {
     name,
@@ -5951,8 +6041,8 @@ function tableToSummary(name, definition) {
   };
 }
 function safeResolveInside(baseDir, requestedPath) {
-  const resolvedBase = resolve4(baseDir);
-  const resolved = resolve4(baseDir, requestedPath);
+  const resolvedBase = resolve5(baseDir);
+  const resolved = resolve5(baseDir, requestedPath);
   if (resolved !== resolvedBase && !resolved.startsWith(resolvedBase + sep2)) {
     throw new Error(`Path escapes output directory: ${requestedPath}`);
   }
@@ -6001,8 +6091,8 @@ function loadGuiData(configPath, outputDir) {
     tables,
     entities,
     project: {
-      configPath: resolve4(configPath),
-      outputDir: resolve4(outputDir),
+      configPath: resolve5(configPath),
+      outputDir: resolve5(outputDir),
       dbName: basename3(parsed.dbPath),
       tableCount: tables.length,
       entityContextCount: parsed.entityContexts.length,
@@ -6168,7 +6258,7 @@ function buildGuiGraph(configPath, outputDir, options = {}) {
         let relTarget;
         try {
           relTarget = relative(
-            resolve4(outputDir),
+            resolve5(outputDir),
             safeResolveInside(outputDir, join13(fileDir, href))
           ).split(sep2).join("/");
         } catch {
@@ -6643,6 +6733,10 @@ var css = `
     .dm-graph .gnode-label { fill: var(--text); font-size: 12px; font-weight: 500; }
     .dm-graph .gnode-icon { dominant-baseline: middle; }
     .dm-graph .gnode:hover .gnode-dot { stroke: var(--text-muted); }
+    /* Share-status stroke (cloud workspaces only): yellow = shared, red = private. */
+    .dm-graph .gnode-shared .gnode-dot { stroke: #eab308; stroke-width: 2; }
+    .dm-graph .gnode-private .gnode-dot { stroke: #ef4444; stroke-width: 2; }
+    /* Selected (green) wins over share status \u2014 higher specificity (.gnode.active). */
     .dm-graph .gnode.active .gnode-dot { stroke: var(--accent); stroke-width: 2; }
     .dm-graph .gnode.active .gnode-glow { opacity: 0.18; }
     .dm-graph .gnode.active .gnode-label { fill: var(--accent); }
@@ -6656,6 +6750,11 @@ var css = `
     .dm-legend span { display: inline-flex; align-items: center; gap: 6px; }
     .dm-legend i { width: 16px; height: 0; border-top: 2px solid currentColor; display: inline-block; }
     .dm-legend i.dash { border-top-style: dashed; }
+    /* Share-status swatches: filled dots rather than the relationship line. */
+    .dm-legend i.sw { width: 10px; height: 10px; border-top: 0; border-radius: 50%; }
+    .dm-legend i.sw-shared { background: #eab308; }
+    .dm-legend i.sw-private { background: #ef4444; }
+    .dm-legend i.sw-selected { background: var(--accent); }
     #dm-panel {
       background: var(--surface); border: 1px solid var(--border);
       border-radius: 10px; padding: 20px;
@@ -6954,6 +7053,17 @@ var css = `
     }
     .shared-row:hover, .member-row:hover { background: var(--row-hover); }
     .shared-row .table-name { font-family: ui-monospace, monospace; }
+    /* Role/status pills inside the settings-drawer member list, which is not
+       under .team-card \u2014 so the .team-card-scoped .role-tag rules don't reach
+       it. Covers creator / member / and the pending-invitee invited/expired. */
+    .members-list .role-tag {
+      display: inline-block; padding: 2px 8px; border-radius: 4px;
+      font-size: 11px; font-weight: 600; text-transform: uppercase;
+      background: var(--accent-soft); color: var(--accent);
+    }
+    .members-list .role-tag.role-member { background: #eef0f3; color: var(--text-muted); }
+    .members-list .role-tag.role-expired { background: #fde2e1; color: #b91c1c; }
+    .member-row-pending { opacity: 0.85; }
     .teams-empty {
       padding: 32px; text-align: center; color: var(--text-muted);
       border: 1px dashed var(--border-strong); border-radius: 8px;
@@ -7089,6 +7199,8 @@ var css = `
     .fs-context-doc .md-body a { color: var(--accent); }
     .fs-field { padding: 12px 0; border-bottom: 1px solid var(--border); }
     .fs-field:last-child { border-bottom: none; }
+    /* Inline create-view action row (Save / Cancel). */
+    .fs-create-actions { display: flex; gap: 8px; justify-content: flex-end; max-width: 900px; margin-top: 16px; }
     .fs-field-label {
       font-size: 11px; color: var(--text-muted); text-transform: uppercase;
       letter-spacing: 0.04em; margin-bottom: 4px;
@@ -7330,7 +7442,6 @@ var appJs = `
       Promise.all([
         fetchJson('/api/entities'),
         fetchJson('/api/gui-meta').catch(function () { return {}; }),
-        fetchJson('/api/databases').catch(function () { return null; }),
         fetchJson('/api/gui-meta/columns').catch(function () { return {}; }),
         fetchJson('/api/system-tables').catch(function () { return { tables: [] }; }),
         fetchJson('/api/userconfig/preferences').catch(function () { return { show_system_tables: false, analytics: true }; }),
@@ -7338,15 +7449,14 @@ var appJs = `
       ]).then(function (results) {
         state.entities = results[0];
         state.iconOverrides = results[1] || {};
-        state.columnMeta = results[3] || {};
-        state.systemTables = (results[4] && results[4].tables) || [];
-        state.preferences = results[5] || { show_system_tables: false, analytics: true };
+        state.columnMeta = results[2] || {};
+        state.systemTables = (results[3] && results[3].tables) || [];
+        state.preferences = results[4] || { show_system_tables: false, analytics: true };
         document.body.classList.toggle('advanced-mode', advancedMode());
         var advToggle = document.getElementById('advanced-toggle');
         if (advToggle) advToggle.checked = advancedMode();
         wireSettingsDrawer();
-        renderDbSwitcher(results[2]);
-        renderWsSwitcher(results[6]);
+        renderWsSwitcher(results[5]);
         renderSidebar();
         wireHistoryControls();
         refreshHistoryState();
@@ -7649,9 +7759,8 @@ var appJs = `
       cloudMode = mode === 'cloud';
       cloudConnected = cloudMode && state === 'connected';
       if (cloudConnected && !wasConnected) drainQueue();
-      // Update both the database-switcher dot and the workspace-switcher dot so
-      // whichever switcher is visible reflects the live realtime status.
-      ['db-status', 'ws-status'].forEach(function (id) {
+      // Update the single workspace-switcher status dot to reflect live realtime.
+      ['ws-status'].forEach(function (id) {
         var el = document.getElementById(id);
         if (!el) return;
         el.classList.remove('is-cloud-connected', 'is-cloud-disconnected', 'is-cloud-connecting');
@@ -7943,17 +8052,15 @@ var appJs = `
       return Promise.all([
         fetchJson('/api/entities'),
         fetchJson('/api/gui-meta').catch(function () { return {}; }),
-        fetchJson('/api/databases').catch(function () { return null; }),
         fetchJson('/api/gui-meta/columns').catch(function () { return {}; }),
         fetchJson('/api/system-tables').catch(function () { return { tables: [] }; }),
         fetchJson('/api/workspaces').catch(function () { return null; }),
       ]).then(function (results) {
         state.entities = results[0];
         state.iconOverrides = results[1] || {};
-        state.columnMeta = results[3] || {};
-        state.systemTables = (results[4] && results[4].tables) || [];
-        renderDbSwitcher(results[2]);
-        renderWsSwitcher(results[5]);
+        state.columnMeta = results[2] || {};
+        state.systemTables = (results[3] && results[3].tables) || [];
+        renderWsSwitcher(results[4]);
         renderSidebar();
         if (location.hash !== '#/') location.hash = '#/';
         else renderRoute();
@@ -7968,44 +8075,44 @@ var appJs = `
       var btn = document.getElementById('ws-button');
       var menu = document.getElementById('ws-menu');
       var nameEl = document.getElementById('ws-name');
-      var dbHost = document.getElementById('db-switcher-host');
       if (!wrap || !btn || !menu || !nameEl) return;
-      var list = (data && data.workspaces) || [];
-      // In workspace mode (a .lattice root with \u22651 workspace) the Workspaces
-      // switcher is the SINGLE switcher \u2014 the per-config database switcher is
-      // redundant there, so hide it. Without a root there are no workspaces, so
-      // the database switcher remains the fallback.
-      if (list.length < 1) {
-        wrap.hidden = true;
-        if (dbHost) dbHost.hidden = false;
-        return;
-      }
+      // The workspace switcher is the SINGLE switcher: every database \u2014 local or
+      // cloud, created or joined \u2014 is a workspace under the .lattice root, and
+      // the GUI always has a root (see ensureRootForGui). No database mode.
       wrap.hidden = false;
-      if (dbHost) dbHost.hidden = true;
+      var list = (data && data.workspaces) || [];
       var current = list.filter(function (w) { return w.id === (data && data.current); })[0];
       nameEl.textContent = (current && current.label) || 'workspace';
       var curKind = (current && current.kind) || 'local';
       setStatusPill(curKind, curKind === 'cloud' ? 'connecting' : 'local');
 
       function buildMenu() {
+        var currentId = data && data.current;
         var items = list.map(function (w) {
-          var isCurrent = w.id === (data && data.current);
+          var isCurrent = w.id === currentId;
+          var isCloud = w.kind === 'cloud';
+          var dotClass = isCloud ? 'is-cloud-connected' : '';
+          var chipText = isCloud ? 'Cloud' : 'Local';
+          var chipBg = isCloud ? 'var(--accent-soft)' : 'rgba(255,255,255,0.06)';
+          var chipColor = isCloud ? 'var(--accent)' : 'var(--text-muted)';
           return '<button class="db-item' + (isCurrent ? ' active' : '') +
             '" data-id="' + escapeHtml(w.id) + '">' +
+            '<span class="db-item-status db-status ' + dotClass + '" style="display:inline-block;width:8px;height:8px;border-radius:50%;background:' +
+              (isCloud ? 'var(--accent)' : 'var(--warn)') +
+            ';flex-shrink:0"></span>' +
             '<span style="flex:1;text-align:left">' + escapeHtml(w.label) + '</span>' +
-            '<span style="font-size:10px;padding:1px 6px;border-radius:8px;background:rgba(255,255,255,0.06);color:var(--text-muted);text-transform:uppercase;letter-spacing:0.04em">' + escapeHtml(w.kind) + '</span>' +
+            '<span style="font-size:10px;padding:1px 6px;border-radius:8px;background:' + chipBg + ';color:' + chipColor + ';text-transform:uppercase;letter-spacing:0.04em">' + chipText + '</span>' +
             '</button>';
         }).join('');
         menu.innerHTML =
           '<div class="db-section">Workspaces</div>' + items +
-          '<div class="db-section">New workspace</div>' +
           '<div class="db-create">' +
             '<button class="btn primary" id="ws-create-btn" style="width:100%;">+ New workspace\u2026</button>' +
           '</div>';
         menu.querySelectorAll('button.db-item').forEach(function (b) {
           b.addEventListener('click', function () {
             var id = b.getAttribute('data-id');
-            if (id === (data && data.current)) { menu.hidden = true; return; }
+            if (id === currentId) { menu.hidden = true; return; }
             withBusy(b, function () {
               return fetchJson('/api/workspaces/switch', {
                 method: 'POST',
@@ -8020,13 +8127,11 @@ var appJs = `
             });
           });
         });
-        document.getElementById('ws-create-btn').addEventListener('click', function (e) {
-          // Stop propagation: showCreateWorkspaceInput replaces .db-create's
-          // innerHTML, detaching THIS button. Without this, the click then
-          // bubbles to the document outside-click closer, whose
-          // menu.contains(e.target) is now false (target detached) \u2192 it would
-          // close the menu, so the create input never appears.
-          e.stopPropagation(); showCreateWorkspaceInput(menu);
+        // Create + Join both live in the 3-step wizard (local / cloud / join) \u2014
+        // the single entry point for adding any workspace.
+        document.getElementById('ws-create-btn').addEventListener('click', function () {
+          menu.hidden = true;
+          showCreateDatabaseWizard();
         });
       }
 
@@ -8051,125 +8156,6 @@ var appJs = `
       }
     }
 
-    // Inline "new workspace" name entry, shown inside the Workspaces menu.
-    function showCreateWorkspaceInput(menu) {
-      var host = menu.querySelector('.db-create');
-      if (!host) return;
-      host.innerHTML =
-        '<input id="ws-new-name" type="text" placeholder="Workspace name" autocomplete="off" ' +
-          'style="width:100%;box-sizing:border-box;padding:7px 10px;margin-bottom:6px;' +
-          'background:var(--surface-2);border:1px solid var(--border);border-radius:6px;color:var(--text);font-size:13px" />' +
-        '<button class="btn primary" id="ws-new-create" style="width:100%;">Create</button>';
-      var input = document.getElementById('ws-new-name');
-      var create = document.getElementById('ws-new-create');
-      input.focus();
-      function submit() {
-        var name = (input.value || '').trim();
-        if (!name) { input.focus(); return; }
-        withBusy(create, function () {
-          return fetchJson('/api/workspaces/create', {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ name: name }),
-          }).then(function () {
-            menu.hidden = true;
-            return reloadEverything();
-          }).then(function () {
-            showToast('Created workspace', {});
-          }).catch(function (err) { showToast('Create failed: ' + err.message, {}); });
-        });
-      }
-      create.addEventListener('click', submit);
-      input.addEventListener('click', function (e) { e.stopPropagation(); });
-      input.addEventListener('keydown', function (e) {
-        if (e.key === 'Enter') { e.preventDefault(); submit(); }
-        else if (e.key === 'Escape') { menu.hidden = true; }
-      });
-    }
-
-    function renderDbSwitcher(data) {
-      var btn = document.getElementById('db-button');
-      var menu = document.getElementById('db-menu');
-      var nameEl = document.getElementById('db-name');
-      if (!data) {
-        nameEl.textContent = '(no databases endpoint)';
-        return;
-      }
-      // Friendly DB name: prefer current.label (cloud team_name or YAML name:),
-      // fall back to the db file basename.
-      nameEl.textContent = (data.current && data.current.label) || data.current.dbFile || '';
-      // Initial status pill \u2014 overridden when the realtime SSE 'state'
-      // event arrives, but avoids a yellow flash before SSE connects.
-      var initialKind = (data.current && data.current.kind) || 'local';
-      setStatusPill(initialKind, initialKind === 'cloud' ? 'connecting' : 'local');
-
-      function buildMenu() {
-        var currentPath = data.current && data.current.path;
-        var currentKind = (data.current && data.current.kind) || 'local';
-        var items = data.configs.map(function (c) {
-          // Per-row kind comes from the server now (each config resolves
-          // its db: line to postgres \u2192 cloud, else local), so inactive
-          // cloud rows tag Cloud/green just like the selected one \u2014 no
-          // more defaulting every non-active row to Local/yellow.
-          var kind = c.kind || (c.path === currentPath ? currentKind : 'local');
-          var isCloud = kind === 'cloud';
-          var dotClass = isCloud ? 'is-cloud-connected' : '';
-          var chipText = isCloud ? 'Cloud' : 'Local';
-          var chipBg = isCloud ? 'var(--accent-soft)' : 'rgba(255,255,255,0.06)';
-          var chipColor = isCloud ? 'var(--accent)' : 'var(--text-muted)';
-          return '<button class="db-item' + (c.active ? ' active' : '') +
-            '" data-path="' + escapeHtml(c.path) + '">' +
-            '<span class="db-item-status db-status ' + dotClass + '" style="display:inline-block;width:8px;height:8px;border-radius:50%;background:' +
-              (isCloud ? 'var(--accent)' : 'var(--warn)') +
-            ';flex-shrink:0"></span>' +
-            '<span style="flex:1;text-align:left">' + escapeHtml(c.label || c.name) + '</span>' +
-            '<span style="font-size:10px;padding:1px 6px;border-radius:8px;background:' + chipBg + ';color:' + chipColor + ';text-transform:uppercase;letter-spacing:0.04em">' + chipText + '</span>' +
-            '</button>';
-        }).join('');
-        menu.innerHTML =
-          '<div class="db-section">Available databases</div>' +
-          items +
-          '<div class="db-section">New database</div>' +
-          '<div class="db-create">' +
-            '<button class="btn primary" id="db-create-btn" style="width:100%;">+ New database\u2026</button>' +
-          '</div>';
-        menu.querySelectorAll('button.db-item').forEach(function (b) {
-          b.addEventListener('click', function () {
-            var path = b.getAttribute('data-path');
-            if (path === currentPath) { menu.hidden = true; return; }
-            withBusy(b, function () {
-              return fetchJson('/api/databases/switch', {
-                method: 'POST',
-                headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({ path: path }),
-              }).then(function () {
-                menu.hidden = true;
-                return reloadEverything();
-              }).then(function () {
-                showToast('Switched database', {});
-              }).catch(function (err) { showToast('Switch failed: ' + err.message, {}); });
-            });
-          });
-        });
-        document.getElementById('db-create-btn').addEventListener('click', function () {
-          menu.hidden = true;
-          showCreateDatabaseWizard();
-        });
-      }
-
-      btn.onclick = function (e) {
-        e.stopPropagation();
-        if (menu.hidden) buildMenu();
-        menu.hidden = !menu.hidden;
-      };
-      document.addEventListener('click', function (e) {
-        if (menu.hidden) return;
-        if (!menu.contains(e.target) && e.target !== btn && !btn.contains(e.target)) {
-          menu.hidden = true;
-        }
-      });
-    }
-
     /** Reload icon overrides after a save, then re-render the current view. */
     function refreshIcons() {
       return fetchJson('/api/gui-meta').then(function (data) {
@@ -8239,7 +8225,10 @@ var appJs = `
       // Even segment count \u2192 item view; odd \u2192 folder/collection view.
       var fsegs = fsParse(hash);
       if (fsegs) {
-        if (fsegs.length % 2 === 1) renderFsCollection(content, fsegs);
+        // #/fs/<table>/new \u2192 inline create view (must precede the even/odd
+        // item-vs-collection heuristic, since [table,'new'] is even-length).
+        if (fsegs[fsegs.length - 1] === 'new') renderFsCreate(content, fsegs);
+        else if (fsegs.length % 2 === 1) renderFsCollection(content, fsegs);
         else renderFsItem(content, fsegs);
         return;
       }
@@ -8300,10 +8289,14 @@ var appJs = `
         return dashboardPreferenceRank(a.name) - dashboardPreferenceRank(b.name);
       });
       if (ents.length === 0) {
+        // Generic, role-agnostic empty state \u2014 the old copy told everyone to
+        // "edit lattice.config.yml / db.define()", which a joined cloud member
+        // cannot act on (they just have nothing shared with them yet).
         content.innerHTML =
           '<div class="placeholder">' +
-            '<h2>No entities yet</h2>' +
-            '<p>Define entities in your <code>lattice.config.yml</code> or register them via <code>db.define()</code>, then reload.</p>' +
+            '<h2>This workspace is empty</h2>' +
+            '<p>There are no tables to show yet. Create one in the Data Model editor, ' +
+            'or \u2014 on a cloud workspace \u2014 ask the owner to share a table with you.</p>' +
           '</div>';
         return;
       }
@@ -8479,8 +8472,13 @@ var appJs = `
         return '<input type="password" name="' + escapeHtml(col) + '" value="' +
           escapeHtml(value || '') + '" autocomplete="off" />';
       }
-      // Multiline for known long-form fields.
-      if (col === 'transcript' || col === 'summary' || col === 'body') {
+      // Multiline for ALL long-form fields (matches FS_LONGFORM, the same set
+      // fsValInner renders as markdown) AND any value that already contains a
+      // newline. A single-line <input> normalizes/strips newlines, so a
+      // multi-line markdown value put in one would be silently corrupted on the
+      // next blur (a spurious PATCH) and then re-rendered as mangled markdown
+      // ("huge text"). A <textarea> round-trips the exact text.
+      if (FS_LONGFORM.indexOf(col) >= 0 || (value != null && String(value).indexOf('\\n') >= 0)) {
         return '<textarea name="' + escapeHtml(col) + '">' + escapeHtml(value || '') + '</textarea>';
       }
       return '<input type="text" name="' + escapeHtml(col) + '" value="' + escapeHtml(value || '') + '" />';
@@ -9214,7 +9212,7 @@ var appJs = `
           // opens a create form. Related-row folders aren't a place to mint a
           // brand-new object, so the tile is top-level only.
           var createTile = topLevel
-            ? '<a class="fs-tile fs-tile-create" href="#" data-fs-create="1" title="Create a new ' + escapeHtml(d.label) + '">' +
+            ? '<a class="fs-tile fs-tile-create" href="' + fsHref([table, 'new']) + '" title="Create a new ' + escapeHtml(d.label) + '">' +
                 '<div class="fs-tile-icon">\u2795</div>' +
                 '<div class="fs-tile-label">New ' + escapeHtml(d.label) + '</div>' +
               '</a>'
@@ -9236,11 +9234,6 @@ var appJs = `
               '<span class="count">' + rows.length + ' item' + (rows.length === 1 ? '' : 's') + '</span>' +
             '</div>' +
             '<div class="fs-grid">' + createTile + rowTiles + '</div>';
-          var ctile = content.querySelector('[data-fs-create]');
-          if (ctile) ctile.addEventListener('click', function (e) {
-            e.preventDefault();
-            openFsCreateModal(content, table, segs);
-          });
         });
       }).catch(function (err) {
         content.innerHTML = '<div class="placeholder"><h2>Failed</h2>' + escapeHtml(err.message) + '</div>';
@@ -9251,11 +9244,17 @@ var appJs = `
     // page with blank fields + a Save button, plus a select-menu + "+" for each
     // many-to-many link. Reuses fieldFor() (intrinsic + belongsTo) and the
     // existing row-create + junction-row endpoints (no new backend).
-    function openFsCreateModal(content, table, segs) {
+    // Inline create view (#/fs/<table>/new) \u2014 mirrors renderFsItem's formatted
+    // layout (.fs-doc/.fs-field) with blank fields + Save/Cancel, instead of a
+    // modal. Reuses fieldFor() + the row-create + junction /link endpoints.
+    function renderFsCreate(content, segs) {
+      var table = segs[0];
       var t = tableByName(table);
-      if (!t) return;
+      if (!t) { content.innerHTML = '<div class="placeholder">Unknown entity: ' + escapeHtml(table) + '</div>'; return; }
+      var d = displayFor(table);
       var bt = belongsToColumns(t);
       var juncs = junctionsFor(table);
+      var collectionHref = fsHref([table]);
       // Preload FK + junction-remote target rows so the <select> menus populate.
       var needed = bt.map(function (b) { return b.rel.table; })
         .concat(juncs.map(function (j) { return j.remoteRel.table; }));
@@ -9282,62 +9281,73 @@ var appJs = `
               '<button type="button" class="btn fs-link-add">+ Add another</button>' +
             '</div></div>';
         });
-        showModal('New ' + displayFor(table).label, '<div class="fs-doc fs-create-form">' + fieldsHtml + '</div>', {
-          primaryLabel: 'Save',
-          onBody: function (backdrop) {
-            backdrop.querySelectorAll('.fs-link-add').forEach(function (addBtn) {
-              addBtn.addEventListener('click', function () {
-                var stage = addBtn.previousElementSibling; // the .fs-link-stage
-                var firstSel = stage && stage.querySelector('.fs-link-select');
-                if (!firstSel) return;
-                var clone = firstSel.cloneNode(true);
-                clone.value = '';
-                stage.appendChild(clone);
-              });
-            });
-          },
-          onSubmit: function (scope) {
-            // Intrinsic + belongsTo values (the [name] inputs/selects).
-            var values = {};
-            scope.querySelectorAll('.fs-create-form [name]').forEach(function (el) {
-              var v = el.value;
-              if (v !== '' && v != null) values[el.getAttribute('name')] = v;
-            });
-            // Staged many-to-many links \u2014 one junction row per chosen target.
-            var links = [];
-            scope.querySelectorAll('.fs-link-stage').forEach(function (stage) {
-              var junction = stage.getAttribute('data-junction');
-              var localFk = stage.getAttribute('data-local-fk');
-              var remoteFk = stage.getAttribute('data-remote-fk');
-              stage.querySelectorAll('.fs-link-select').forEach(function (sel) {
-                if (sel.value) links.push({ junction: junction, localFk: localFk, remoteFk: remoteFk, remoteId: sel.value });
-              });
+        content.innerHTML =
+          '<nav class="fs-crumbs"><a href="#/">Home</a><span class="fs-sep">\u25B8</span>' +
+            '<a href="' + collectionHref + '">' + escapeHtml(d.label) + '</a><span class="fs-sep">\u25B8</span>' +
+            '<span>New</span></nav>' +
+          '<div class="view-header">' +
+            '<span class="entity-icon">' + d.icon + '</span>' +
+            '<h1>New ' + escapeHtml(d.label) + '</h1>' +
+          '</div>' +
+          '<div class="fs-doc fs-create-form">' + fieldsHtml + '</div>' +
+          '<div class="fs-create-actions">' +
+            '<button class="btn" id="fs-create-cancel">Cancel</button>' +
+            '<button class="btn primary" id="fs-create-save">Save</button>' +
+          '</div>';
+        content.querySelectorAll('.fs-link-add').forEach(function (addBtn) {
+          addBtn.addEventListener('click', function () {
+            var stage = addBtn.previousElementSibling; // the .fs-link-stage
+            var firstSel = stage && stage.querySelector('.fs-link-select');
+            if (!firstSel) return;
+            var clone = firstSel.cloneNode(true);
+            clone.value = '';
+            stage.appendChild(clone);
+          });
+        });
+        content.querySelector('#fs-create-cancel').addEventListener('click', function () {
+          location.hash = collectionHref;
+        });
+        var saveBtn = content.querySelector('#fs-create-save');
+        saveBtn.addEventListener('click', function () {
+          var values = {};
+          content.querySelectorAll('.fs-create-form [name]').forEach(function (el) {
+            var v = el.value;
+            if (v !== '' && v != null) values[el.getAttribute('name')] = v;
+          });
+          var links = [];
+          content.querySelectorAll('.fs-link-stage').forEach(function (stage) {
+            var junction = stage.getAttribute('data-junction');
+            var localFk = stage.getAttribute('data-local-fk');
+            var remoteFk = stage.getAttribute('data-remote-fk');
+            stage.querySelectorAll('.fs-link-select').forEach(function (sel) {
+              if (sel.value) links.push({ junction: junction, localFk: localFk, remoteFk: remoteFk, remoteId: sel.value });
             });
+          });
+          withBusy(saveBtn, function () {
             return rowWrite('POST', '/api/tables/' + encodeURIComponent(table) + '/rows', values).then(function (res) {
               var newId = res && (res.id || (res.row && res.row.id));
               var chain = Promise.resolve();
               links.forEach(function (lk) {
                 chain = chain.then(function () {
-                  // Use the junction's /link endpoint (INSERT OR IGNORE on the
-                  // two FK columns) \u2014 works for junctions with no own pk and is
-                  // idempotent, unlike a raw row insert.
+                  // Junction /link endpoint (INSERT OR IGNORE on the two FKs) \u2014
+                  // works for pk-less junctions + is idempotent.
                   var jrow = {};
                   jrow[lk.localFk] = newId;
                   jrow[lk.remoteFk] = lk.remoteId;
                   return rowWrite('POST', '/api/tables/' + encodeURIComponent(lk.junction) + '/link', jrow);
                 });
               });
-              return chain;
-            }).then(function () {
+              return chain.then(function () { return newId; });
+            }).then(function (newId) {
               invalidate(table);
-              return refreshEntities();
-            }).then(function () {
-              showToast('Created', {});
-              renderFsCollection(content, segs);
-            });
-          },
+              return refreshEntities().then(function () {
+                showToast('Created', {});
+                location.hash = newId ? fsHref([table, String(newId)]) : collectionHref;
+              });
+            }).catch(function (err) { showToast('Create failed: ' + err.message, {}); });
+          });
         });
-      }).catch(function (err) { showToast('Create failed: ' + err.message, {}); });
+      }).catch(function (err) { content.innerHTML = '<div class="placeholder"><h2>Failed</h2>' + escapeHtml(err.message) + '</div>'; });
     }
 
     // Item view \u2014 one row as a document (click-to-edit) + its relationship folders.
@@ -9871,6 +9881,11 @@ var appJs = `
           rowCount: rc,
           cols: (meta.columns || []).length,
           r: Math.max(11, Math.min(26, 11 + Math.sqrt(rc))),
+          // Share status (cloud workspaces only). ownedByMe is set by the
+          // server solely on cloud workspaces, so its presence flags a cloud
+          // DB; on local DBs share status is N/A (no coloring).
+          shared: meta.shared === true,
+          cloudWorkspace: meta.ownedByMe !== undefined,
           x: 0, y: 0, vx: 0, vy: 0,
         });
       });
@@ -9961,7 +9976,11 @@ var appJs = `
           dash + markStart + markEnd + ' opacity="0.7"><title>' + escapeHtml(title) + '</title></line>';
       }).join('');
       var nodeSvg = nodes.map(function (nd) {
-        return '<g class="gnode" data-table="' + escapeHtml(nd.name) + '" transform="translate(' +
+        // Share-status coloring applies only on cloud workspaces (G). On a
+        // local DB share status is N/A, so no extra class \u2192 neutral stroke.
+        var shareCls = nd.cloudWorkspace ? (nd.shared ? ' gnode-shared' : ' gnode-private') : '';
+        var shareTitle = nd.cloudWorkspace ? ' \xB7 ' + (nd.shared ? 'shared' : 'private') : '';
+        return '<g class="gnode' + shareCls + '" data-table="' + escapeHtml(nd.name) + '" transform="translate(' +
           nd.x.toFixed(1) + ',' + nd.y.toFixed(1) + ')">' +
           '<circle class="gnode-glow" r="' + (nd.r + 8).toFixed(1) + '"/>' +
           '<circle class="gnode-dot" r="' + nd.r.toFixed(1) + '"/>' +
@@ -9969,13 +9988,22 @@ var appJs = `
             (nd.r * 0.95).toFixed(1) + '">' + nd.icon + '</text>' +
           '<text class="gnode-label" y="' + (nd.r + 15).toFixed(1) + '" text-anchor="middle">' +
             escapeHtml(nd.label) + '</text>' +
-          '<title>' + escapeHtml(nd.label + ' \xB7 ' + nd.rowCount + ' rows \xB7 ' + nd.cols + ' columns') + '</title>' +
+          '<title>' + escapeHtml(nd.label + ' \xB7 ' + nd.rowCount + ' rows \xB7 ' + nd.cols + ' columns' + shareTitle) + '</title>' +
           '</g>';
       }).join('');
+      // Share legend entries only make sense on a cloud workspace (where nodes
+      // carry share status). Local DBs show just the relationship key.
+      var anyCloud = nodes.some(function (nd) { return nd.cloudWorkspace; });
+      var shareLegend = anyCloud
+        ? '<span><i class="sw sw-shared"></i><span style="color:var(--text-muted)">shared</span></span>' +
+          '<span><i class="sw sw-private"></i><span style="color:var(--text-muted)">private</span></span>' +
+          '<span><i class="sw sw-selected"></i><span style="color:var(--text-muted)">selected</span></span>'
+        : '';
       var legend =
         '<div class="dm-legend">' +
           '<span style="color:' + DM_FK_COLOR + '"><i></i><span style="color:var(--text-muted)">foreign key</span></span>' +
           '<span style="color:' + DM_M2M_COLOR + '"><i class="dash"></i><span style="color:var(--text-muted)">many-to-many</span></span>' +
+          shareLegend +
         '</div>';
       return '<svg class="dm-graph" viewBox="' + vb.join(' ') + '" preserveAspectRatio="xMidYMid meet">' +
         defs + '<g class="dm-stage">' + edgeSvg + nodeSvg + '</g></svg>' + legend;
@@ -10124,7 +10152,7 @@ var appJs = `
           '</div>' +
           '<div class="muted" style="margin-top:14px;font-size:12px;">' +
             'New entities get id (uuid PK), name, and deleted_at columns. ' +
-            'Add more columns once the entity exists. On a team cloud the ' +
+            'Add more columns once the entity exists. On a cloud workspace the ' +
             'entity is private to you until you share it.' +
           '</div>';
         wireEmojiPicker(panel, 'dm-create-icon');
@@ -10269,20 +10297,20 @@ var appJs = `
           '</div>'
         : '<span class="muted" style="font-size:12px">No other entities to link to.</span>';
 
-      // Team-cloud sharing row \u2014 only the owner of a table may toggle
-      // its team visibility (t.ownedByMe is set by the server only for
-      // team clouds). Tables shared to me by others, and all non-team
+      // Cloud sharing row \u2014 only the owner of a table may toggle its
+      // visibility (t.ownedByMe is set by the server only for cloud
+      // workspaces). Tables shared to me by others, and all local-DB
       // tables, show no sharing control.
       var canShare = !!(t && t.ownedByMe === true);
       var isShared = !!(t && t.shared);
       var shareRow = canShare
-        ? '<label>Team sharing</label>' +
+        ? '<label>Cloud sharing</label>' +
           '<div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap">' +
             '<button class="btn' + (isShared ? '' : ' primary') + '" id="dm-share-btn">' +
-              (isShared ? 'Unshare from team' : 'Share with team') +
+              (isShared ? 'Make private' : 'Share with workspace') +
             '</button>' +
             '<span style="font-size:12px;color:var(--text-muted)">' +
-              (isShared ? 'Visible to every team member.' : 'Private to you. Share to make it visible to the team.') +
+              (isShared ? 'Visible to everyone on this cloud workspace.' : 'Private to you. Share to make it visible to everyone on this cloud workspace.') +
             '</span>' +
           '</div>'
         : '';
@@ -10347,7 +10375,7 @@ var appJs = `
             // so a light in-place refresh reflects it without a full reload.
             return dmRefreshPanel(tableName, false);
           }).then(function () {
-            showToast(isShared ? 'Unshared "' + tableName + '" from team' : 'Shared "' + tableName + '" with team', {});
+            showToast(isShared ? 'Unshared "' + tableName + '" from workspace' : 'Shared "' + tableName + '" with workspace', {});
           }).catch(function (e) { showToast('Share update failed: ' + e.message, {}); });
         });
       });
@@ -10739,7 +10767,7 @@ var appJs = `
         backdrop.className = 'modal-backdrop';
         backdrop.innerHTML =
           '<div class="modal" style="min-width:560px;max-width:640px">' +
-            '<div class="modal-head" id="wiz-head">New database \u2014 step 1 of 3</div>' +
+            '<div class="modal-head" id="wiz-head">New workspace \u2014 step 1 of 3</div>' +
             '<div class="modal-body" id="wiz-body"></div>' +
             '<div class="modal-foot">' +
               '<button class="btn" data-act="cancel">Cancel</button>' +
@@ -10760,7 +10788,7 @@ var appJs = `
           var body = backdrop.querySelector('#wiz-body');
           var nextBtn = backdrop.querySelector('[data-act="next"]');
           var backBtn = backdrop.querySelector('[data-act="back"]');
-          head.textContent = 'New database \u2014 step ' + wizState.step + ' of 3';
+          head.textContent = 'New workspace \u2014 step ' + wizState.step + ' of 3';
           backBtn.style.display = wizState.step === 1 ? 'none' : '';
           nextBtn.textContent = wizState.step === 3 ? 'Create' : 'Next';
           if (wizState.step === 1) body.innerHTML = renderStep1();
@@ -10774,7 +10802,7 @@ var appJs = `
           // Join uses the existing invite-redeem modal (opened on Next), so no
           // name/entities steps \u2014 the DB name comes from the team you join.
           var nameField = kind === 'join' ? '' :
-            '<div class="field"><label>Database name</label>' +
+            '<div class="field"><label>Workspace name</label>' +
               '<input id="wiz-name" type="text" value="' + escapeHtml(wizState.name) +
               '" placeholder="e.g. my-research, design-system" maxlength="200" />' +
             '</div>';
@@ -10806,11 +10834,11 @@ var appJs = `
                   '<input type="radio" name="wiz-kind" value="cloud"' + (kind === 'cloud' ? ' checked' : '') + ' /> New cloud (Postgres)' +
                 '</label>' +
                 '<label style="display:flex;align-items:center;gap:6px;font-weight:400;text-transform:none;letter-spacing:0">' +
-                  '<input type="radio" name="wiz-kind" value="join"' + (kind === 'join' ? ' checked' : '') + ' /> Join existing cloud (invite)' +
+                  '<input type="radio" name="wiz-kind" value="join"' + (kind === 'join' ? ' checked' : '') + ' /> Join a team (invite)' +
                 '</label>' +
               '</div>' +
               '<p style="font-size:11px;color:var(--text-muted);margin:6px 0 0">' +
-                'Local databases are single-user SQLite files on your machine. Cloud databases are Postgres, can be shared with invited team members, and stream realtime updates. Joining connects to a cloud DB you were invited to.' +
+                'Local workspaces are single-user SQLite files on your machine. Cloud workspaces are Postgres, can be shared with invited members, and stream realtime updates. Join a team you were invited to with an invite token.' +
               '</p>' +
             '</div>' +
             cloudBlock;
@@ -10838,7 +10866,7 @@ var appJs = `
             '<button class="btn" id="wiz-add-entity" style="margin-top:10px">+ Add entity</button>' +
             (wizState.kind === 'cloud'
               ? '<p style="font-size:11px;color:var(--text-muted);margin:10px 0 0">' +
-                'Entities with \u201CShare with cloud\u201D checked are visible to every team member. Unchecked entities live on the cloud DB but stay scoped to your own row links.' +
+                'Entities with \u201CShare with cloud\u201D checked are visible to everyone on the cloud workspace. Unchecked entities live on the cloud DB but stay scoped to your own row links.' +
                 '</p>'
               : '');
         }
@@ -10915,17 +10943,17 @@ var appJs = `
 
         function goNext() {
           if (wizState.step === 1) {
-            // Join existing cloud: hand off to the invite-redeem modal, which
-            // collects the cloud URL + invite token and connects.
+            // Join a team: hand off to the invite-redeem modal, which collects
+            // the cloud URL + invite token and joins as a member.
             if (wizState.kind === 'join') { close(); showJoinTeamModal('project'); return; }
-            if (!wizState.name.trim()) { alert('Database name is required'); return; }
+            if (!wizState.name.trim()) { alert('Workspace name is required'); return; }
             if (!/^[a-zA-Z0-9][a-zA-Z0-9 ._-]{0,199}$/.test(wizState.name.trim())) {
-              alert('Database name must start with a letter or digit and contain only letters, digits, spaces, dots, underscores, or hyphens'); return;
+              alert('Workspace name must start with a letter or digit and contain only letters, digits, spaces, dots, underscores, or hyphens'); return;
             }
             if (wizState.kind === 'cloud') {
               if (!/^postgres(ql)?:\\/\\//i.test(wizState.cloudUrl.trim())) { alert('Cloud URL must start with postgres://'); return; }
-              if (!wizState.email.trim()) { alert('Email is required for cloud databases'); return; }
-              if (!wizState.displayName.trim()) { alert('Display name is required for cloud databases'); return; }
+              if (!wizState.email.trim()) { alert('Email is required for cloud workspaces'); return; }
+              if (!wizState.displayName.trim()) { alert('Display name is required for cloud workspaces'); return; }
             }
             wizState.step = 2;
             render();
@@ -10954,7 +10982,7 @@ var appJs = `
             close();
             return reloadEverything();
           }).then(function () {
-            showToast('Database "' + wizState.name + '" created', {});
+            showToast('Workspace "' + wizState.name + '" created', {});
           }).catch(function (err) {
             nextBtn.removeAttribute('disabled');
             nextBtn.textContent = 'Create';
@@ -10963,29 +10991,19 @@ var appJs = `
         }
 
         function submitLocal() {
-          // Slug the name for the YAML filename; the friendly name goes
-          // into the new config's name: key via /api/dbconfig/rename
-          // after the create succeeds.
-          var slug = wizState.name.trim().toLowerCase().replace(/[^a-z0-9_-]+/g, '-').replace(/^-+|-+$/g, '');
-          return fetchJson('/api/databases/create', {
+          // Create + activate a new local workspace in the registry (the single
+          // source of truth). The friendly name is the workspace display name \u2014
+          // no separate slug/config-file/rename dance.
+          return fetchJson('/api/workspaces/create', {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ name: slug }),
-          }).then(function () {
-            // After the create, the active DB is the new one. Set the
-            // friendly name + add starter entities.
-            return fetchJson('/api/dbconfig/rename', {
-              method: 'POST',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify({ name: wizState.name.trim() }),
-            });
+            body: JSON.stringify({ name: wizState.name.trim() }),
           }).then(function () {
             return createStarterEntities(wizState.entities);
           });
         }
 
         function submitCloud() {
-          var createdTeamId = null;
           return fetchJson('/api/teams-gui/connections/register-and-create', {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
@@ -10996,8 +11014,20 @@ var appJs = `
               team_name: wizState.name.trim(),
             }),
           }).then(function (result) {
-            createdTeamId = result && result.team && result.team.id;
-            return createStarterEntities(wizState.entities, createdTeamId);
+            var createdTeamId = result && result.team && result.team.id;
+            var wsId = result && result.workspace_id;
+            // Switch INTO the new cloud workspace so starter entities are
+            // created there (not in the previously-active local workspace).
+            var switched = wsId
+              ? fetchJson('/api/workspaces/switch', {
+                  method: 'POST',
+                  headers: { 'content-type': 'application/json' },
+                  body: JSON.stringify({ id: wsId }),
+                })
+              : Promise.resolve();
+            return switched.then(function () {
+              return createStarterEntities(wizState.entities, createdTeamId);
+            });
           });
         }
 
@@ -11073,7 +11103,7 @@ var appJs = `
           '<p style="font-size:12px;color:var(--text-muted);margin:0">' +
           'Use the same Postgres URL the inviter used (postgres://\u2026). Your email + display name come from User Settings \u2014 change them there. The email must match the address the invitation was addressed to.' +
           '</p>';
-        showModal('Join team', bodyHtml, {
+        showModal('Join workspace', bodyHtml, {
           primaryLabel: 'Join',
           onSubmit: function (scope) {
             var data = collectFormValues(scope);
@@ -11082,18 +11112,20 @@ var appJs = `
               headers: { 'content-type': 'application/json' },
               body: JSON.stringify(data),
             }).then(function (res) {
-              // Auto-switch to the joined cloud DB so it shows in the
-              // header dropdown and becomes active immediately \u2014 no
-              // manual page refresh needed.
-              var path = res && res.config_path;
-              if (!path) { refreshSettingsRoute(kind); return; }
-              return fetchJson('/api/databases/switch', {
+              // Auto-switch to the joined cloud workspace so it shows in the
+              // header switcher and becomes active immediately \u2014 no manual
+              // refresh. The join response carries the new workspace id.
+              var wsId = res && res.workspace_id;
+              if (!wsId) {
+                return reloadEverything().then(function () { refreshSettingsRoute(kind); });
+              }
+              return fetchJson('/api/workspaces/switch', {
                 method: 'POST',
                 headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({ path: path }),
+                body: JSON.stringify({ id: wsId }),
               })
                 .then(function () { return reloadEverything(); })
-                .then(function () { showToast('Joined "' + (res.team && res.team.name || 'team') + '" \u2014 switched to it', {}); });
+                .then(function () { showToast('Joined "' + (res.team && res.team.name || 'workspace') + '" \u2014 switched to it', {}); });
             });
           },
         });
@@ -11156,7 +11188,7 @@ var appJs = `
         host.innerHTML =
           '<div class="dbconfig-panel" style="margin-bottom:18px;padding:14px;border:1px solid var(--border);border-radius:8px;background:var(--surface)">' +
             '<h3 style="margin:0 0 10px">Identity</h3>' +
-            '<p class="lead" style="margin:0 0 10px">Display name + email used when creating or joining teams. Saved to ~/.lattice/identity.json and mirrored into the active Lattice.</p>' +
+            '<p class="lead" style="margin:0 0 10px">Display name + email used when creating or joining cloud workspaces. Saved to ~/.lattice/identity.json and mirrored into the active Lattice.</p>' +
             '<div style="display:grid;grid-template-columns:repeat(2,1fr);gap:8px">' +
               '<div><label class="field-label">Display name</label><input id="id-display-name" type="text" value="' + escapeHtml(id.display_name || '') + '" style="width:100%"></div>' +
               '<div><label class="field-label">Email</label><input id="id-email" type="email" value="' + escapeHtml(id.email || '') + '" style="width:100%"></div>' +
@@ -11183,65 +11215,6 @@ var appJs = `
       });
     }
 
-    function renderDatabasesPanel(host) {
-      fetchJson('/api/userconfig/databases').then(function (cat) {
-        var localRows = (cat.local || []).map(function (d) {
-          var stateBadge = '<span style="font-family:JetBrains Mono,monospace;font-size:10px;color:var(--text-muted)">' + escapeHtml((d.state || 'local').toUpperCase()) + '</span>';
-          return '<tr' + (d.active ? '' : ' class="db-row" data-switch-path="' + escapeHtml(d.configPath) + '"') + '>' +
-            '<td>' + escapeHtml(d.label) + (d.active ? ' <span class="role-tag">active</span>' : '') + '</td>' +
-            '<td>SQLite</td>' +
-            '<td>' + stateBadge + '</td>' +
-            '<td><code>' + escapeHtml(d.dbFile) + '</code></td>' +
-            '<td>\u2014</td>' +
-          '</tr>';
-        }).join('');
-        var cloudRows = (cat.cloud || []).map(function (d) {
-          var stateBadge = '<span style="font-family:JetBrains Mono,monospace;font-size:10px;color:var(--text-muted)">' + escapeHtml((d.state || 'unknown').toUpperCase()) + '</span>';
-          return '<tr><td>' + escapeHtml(d.label) + '</td><td>Postgres</td><td>' + stateBadge + '</td><td>(encrypted)</td><td>\u2014</td></tr>';
-        }).join('');
-        host.innerHTML =
-          '<div class="dbconfig-panel" style="margin-bottom:18px;padding:14px;border:1px solid var(--border);border-radius:8px;background:var(--surface)">' +
-            '<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:10px">' +
-              '<h3 style="margin:0">Databases</h3>' +
-              '<button class="btn primary" id="action-add-cloud-db">Add a cloud DB \u2192</button>' +
-            '</div>' +
-            '<table style="width:100%;border-collapse:collapse">' +
-              '<thead><tr style="text-align:left"><th>Label</th><th>Type</th><th>State</th><th>File / source</th><th>Action</th></tr></thead>' +
-              '<tbody>' + (localRows + cloudRows || '<tr><td colspan="5" style="padding:8px;color:var(--text-muted)">No databases configured.</td></tr>') + '</tbody>' +
-            '</table>' +
-          '</div>';
-        host.querySelectorAll('tr.db-row[data-switch-path]').forEach(function (row) {
-          row.addEventListener('click', function () {
-            var configPath = row.getAttribute('data-switch-path');
-            fetch('/api/databases/switch', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ path: configPath }) })
-              .then(function (r) { return r.json(); })
-              .then(function () { renderUserConfig(document.getElementById('content')); });
-          });
-        });
-        var addCloudBtn = document.getElementById('action-add-cloud-db');
-        if (addCloudBtn) addCloudBtn.addEventListener('click', function () {
-          // Create a fresh project then immediately open the Connect-
-          // existing wizard against it. The backend's /api/databases/create
-          // makes a starter YAML + swaps the active Lattice to it; the
-          // wizard then rewrites that project's db: line.
-          var name = prompt('Project name for the new cloud-connected project:');
-          if (!name) return;
-          fetch('/api/databases/create', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ name: name }) })
-            .then(function (r) { return r.json(); })
-            .then(function (d) {
-              if (d.error) { alert('Failed: ' + d.error); return; }
-              // Active swapped to the new project \u2014 open Connect-existing.
-              showConnectExistingModal(function () {
-                renderUserConfig(document.getElementById('content'));
-              });
-            })
-            .catch(function (e) { alert('Failed: ' + e.message); });
-        });
-      }).catch(function (err) {
-        host.innerHTML = '<div class="placeholder">Failed to load databases: ' + escapeHtml(err.message) + '</div>';
-      });
-    }
-
     function renderProjectConfig(content) {
       // Legacy entry \u2014 Track 4e renames this view to "Database Settings"
       // and adds an editable name header. The new alias is renderDatabaseSettings.
@@ -11258,8 +11231,8 @@ var appJs = `
       // Database panel below.
       content.innerHTML =
         '<div class="teams-page">' +
-          '<h2>Database Settings</h2>' +
-          '<div id="db-name-host"><div class="placeholder" style="padding:14px">Loading database name\u2026</div></div>' +
+          '<h2>Workspace Settings</h2>' +
+          '<div id="db-name-host"><div class="placeholder" style="padding:14px">Loading workspace name\u2026</div></div>' +
           '<div id="dbconfig-host"><div class="placeholder" style="padding:18px">Loading database configuration\u2026</div></div>' +
           '<div id="data-model-host"><div class="placeholder" style="padding:18px">Loading data model\u2026</div></div>' +
           '<div id="db-danger-host"></div>' +
@@ -11273,17 +11246,17 @@ var appJs = `
     // Confirmation modal for the irreversible delete. Gated on typing the exact
     // database name; the OK button is solid red (destructive) and disabled until
     // the name matches. onDone(result) runs after a successful delete.
-    function confirmDeleteDatabase(path, label, onDone) {
-      var safeLabel = (label || '').trim() || 'this database';
+    function confirmDeleteDatabase(id, label, onDone) {
+      var safeLabel = (label || '').trim() || 'this workspace';
       var body =
         '<p style="margin:0 0 10px">Permanently delete <strong>' + escapeHtml(safeLabel) + '</strong>? ' +
-        'This removes its configuration and, for a local database, deletes the underlying SQLite file. ' +
-        'For a cloud database only the local connection is forgotten \u2014 the remote data is left untouched. ' +
+        'This removes it from this lattice and, for a local workspace, deletes the underlying SQLite file. ' +
+        'For a cloud workspace only the local connection is forgotten \u2014 the remote data is left untouched. ' +
         '<strong style="color:var(--danger)">This cannot be undone.</strong></p>' +
         '<p style="margin:0 0 6px;font-size:12px;color:var(--text-muted)">Type <strong>' + escapeHtml(safeLabel) + '</strong> to confirm:</p>' +
         '<input id="confirm-db-name" type="text" autocomplete="off" style="width:100%" />';
-      showModal('Delete database', body, {
-        primaryLabel: 'Delete database',
+      showModal('Delete workspace', body, {
+        primaryLabel: 'Delete workspace',
         primaryClass: 'destructive',
         onBody: function (backdrop) {
           var input = backdrop.querySelector('#confirm-db-name');
@@ -11296,11 +11269,11 @@ var appJs = `
         },
         onSubmit: function (backdrop) {
           var v = (backdrop.querySelector('#confirm-db-name').value || '').trim();
-          if (v !== safeLabel) return Promise.reject(new Error('Type the database name exactly to confirm.'));
-          return fetch('/api/databases/delete', {
+          if (v !== safeLabel) return Promise.reject(new Error('Type the workspace name exactly to confirm.'));
+          return fetch('/api/workspaces/delete', {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ path: path }),
+            body: JSON.stringify({ id: id }),
           })
             .then(function (r) { return r.json().then(function (d) { return { status: r.status, d: d }; }); })
             .then(function (res) {
@@ -11314,25 +11287,26 @@ var appJs = `
     function renderDatabaseDangerZone(host) {
       if (!host) return;
       Promise.all([
-        fetchJson('/api/databases'),
+        fetchJson('/api/workspaces'),
         fetchJson('/api/dbconfig').catch(function () { return {}; }),
       ]).then(function (results) {
         var data = results[0];
         var cfg = results[1] || {};
-        var current = (data && data.current) || {};
-        var label = current.label || current.dbFile || '';
-        var path = current.path || '';
-        if (!path) { host.innerHTML = ''; return; }
-
-        // After tearing down / leaving the active DB, switch to another the
-        // operator still has and navigate off the (now-gone) page.
+        var currentId = (data && data.current) || null;
+        var workspaces = (data && data.workspaces) || [];
+        var current = workspaces.filter(function (w) { return w.id === currentId; })[0] || {};
+        var label = current.label || '';
+        var id = current.id || '';
+        if (!id) { host.innerHTML = ''; return; }
+
+        // After tearing down / leaving the active workspace, switch to another
+        // the operator still has and navigate off the (now-gone) page.
         var switchAway = function () {
-          var cur = (data && data.current && data.current.path) || null;
-          var target = ((data && data.configs) || []).filter(function (c) { return c.path !== cur; })[0];
+          var target = workspaces.filter(function (w) { return w.id !== currentId; })[0];
           var p = target
-            ? fetchJson('/api/databases/switch', {
+            ? fetchJson('/api/workspaces/switch', {
                 method: 'POST', headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({ path: target.path }),
+                body: JSON.stringify({ id: target.id }),
               }).then(function () { return reloadEverything(); })
             : reloadEverything();
           return p.then(function () { location.hash = '#/'; renderRoute(); });
@@ -11344,7 +11318,7 @@ var appJs = `
             '<div class="danger-zone">' +
               '<h3>Danger zone</h3>' +
               '<p style="font-size:12px;color:var(--text-muted);margin:0 0 10px">' +
-                'Disconnect this database from the cloud. This removes the team and <strong>kicks all members</strong>. This cannot be undone.' +
+                'Disconnect this database from the cloud. This dissolves the cloud workspace and <strong>kicks all members</strong>. This cannot be undone.' +
               '</p>' +
               '<button class="btn destructive" id="db-disconnect-btn">Disconnect from cloud</button>' +
             '</div>';
@@ -11365,35 +11339,41 @@ var appJs = `
             '<div class="danger-zone">' +
               '<h3>Danger zone</h3>' +
               '<p style="font-size:12px;color:var(--text-muted);margin:0 0 10px">' +
-                'Leave this team. The cloud database keeps running for everyone else; you simply stop being a member.' +
+                'Leave this cloud workspace. It keeps running for everyone else; you simply stop being a member.' +
               '</p>' +
-              '<button class="btn destructive" id="db-leave-btn">Leave team</button>' +
+              '<button class="btn destructive" id="db-leave-btn">Leave workspace</button>' +
             '</div>';
           host.querySelector('#db-leave-btn').addEventListener('click', function () {
             if (!confirm('Leave "' + (cfg.teamName || label || 'this team') + '"?')) return;
             var lbtn = host.querySelector('#db-leave-btn');
             withBusy(lbtn, function () {
               return fetchJson('/api/teams-gui/teams/' + cfg.teamId + '/members/' + encodeURIComponent(cfg.myUserId), { method: 'DELETE' })
-                .then(function () { showToast('Left the team', {}); return switchAway(); })
+                .then(function () { showToast('Left the workspace', {}); return switchAway(); })
                 .catch(function (e) { alert('Leave failed: ' + e.message); });
             });
           });
           return;
         }
-        // Local / non-team cloud database: delete it.
+        // Local / non-team cloud workspace: delete it.
         host.innerHTML =
           '<div class="danger-zone">' +
             '<h3>Danger zone</h3>' +
             '<p style="font-size:12px;color:var(--text-muted);margin:0 0 10px">' +
-              'Permanently delete this database. The configuration is removed and, for a local database, the underlying SQLite file is deleted. This cannot be undone.' +
+              'Permanently delete this workspace. It is removed from this lattice and, for a local workspace, the underlying SQLite file is deleted. This cannot be undone.' +
             '</p>' +
-            '<button class="btn destructive" id="db-delete-btn">Delete database</button>' +
+            '<button class="btn destructive" id="db-delete-btn">Delete workspace</button>' +
           '</div>';
         host.querySelector('#db-delete-btn').addEventListener('click', function () {
-          confirmDeleteDatabase(path, label, function () {
-            // We just deleted the active DB; the server switched to a fallback.
+          confirmDeleteDatabase(id, label, function () {
+            // We just deleted the active workspace; the server switched to a
+            // fallback. Re-render the drawer's Workspace-settings tab so it
+            // reflects the NEW active workspace \u2014 previously this rendered into
+            // #content behind the open drawer, leaving the user stuck on the
+            // deleted workspace's settings.
             return reloadEverything().then(function () {
-              renderDatabaseSettings(document.getElementById('content'));
+              var drawer = document.getElementById('settings-drawer');
+              if (drawer && !drawer.hidden) selectDrawerTab('database');
+              else closeSettingsDrawer();
             });
           });
         });
@@ -11401,16 +11381,17 @@ var appJs = `
     }
 
     function renderDatabaseNamePanel(host) {
-      // Pull the friendly name from /api/databases and the team role from
+      // Pull the friendly name from /api/workspaces and the team role from
       // /api/dbconfig (isCreator) so a non-owner member sees the name
       // read-only \u2014 renaming a team cloud broadcasts to every member, so
       // only the owner may do it.
-      Promise.all([fetchJson('/api/databases'), fetchJson('/api/dbconfig').catch(function () { return {}; })])
+      Promise.all([fetchJson('/api/workspaces'), fetchJson('/api/dbconfig').catch(function () { return {}; })])
         .then(function (results) {
         var data = results[0];
         var cfg = results[1] || {};
-        var current = (data && data.current) || {};
-        var name = current.label || current.dbFile || '';
+        var currentId = (data && data.current) || null;
+        var current = ((data && data.workspaces) || []).filter(function (w) { return w.id === currentId; })[0] || {};
+        var name = current.label || '';
         var isCloud = current.kind === 'cloud';
         var kind = isCloud ? 'Cloud' : 'Local';
         // Members (cloud, non-creator) can't rename. Locals + creators can.
@@ -11428,11 +11409,11 @@ var appJs = `
             '</div>' +
             '<p style="font-size:11px;color:var(--text-muted);margin:6px 0 0">' +
               (canRename
-                ? ('Friendly database name shown in the topbar and the dropdown. ' +
+                ? ('Friendly workspace name shown in the topbar and the dropdown. ' +
                   (isCloud
-                    ? 'For cloud databases, the rename is broadcast to every team member in realtime.'
-                    : 'Saved to the YAML config\\'s name: key.'))
-                : 'Only the team owner can rename this cloud database.') +
+                    ? 'For cloud workspaces, the rename is broadcast to every member in realtime.'
+                    : 'Saved to the workspace registry (and the config name: key).'))
+                : 'Only the workspace owner can rename this cloud workspace.') +
             '</p>' +
             '<div id="db-name-msg" style="margin-top:6px;font-size:12px;color:var(--text-muted)"></div>' +
           '</div>';
@@ -11452,14 +11433,14 @@ var appJs = `
               .then(function (d) {
                 if (d.error) { msg.textContent = 'Failed: ' + d.error; return; }
                 msg.textContent = 'Saved.';
-                // Refresh the topbar dropdown so the new name shows.
-                return fetchJson('/api/databases').then(renderDbSwitcher);
+                // Refresh the topbar switcher so the new name shows.
+                return fetchJson('/api/workspaces').then(renderWsSwitcher);
               })
               .catch(function (e) { msg.textContent = 'Failed: ' + e.message; });
           });
         });
       }).catch(function (err) {
-        host.innerHTML = '<div class="placeholder">Failed to load database name: ' + escapeHtml(err.message) + '</div>';
+        host.innerHTML = '<div class="placeholder">Failed to load workspace name: ' + escapeHtml(err.message) + '</div>';
       });
     }
 
@@ -11467,25 +11448,22 @@ var appJs = `
       content.innerHTML =
         '<div class="teams-page">' +
           '<h2>Lattice Settings</h2>' +
-          '<p class="lead">Every database this lattice can switch to. This is the same list as the header dropdown.</p>' +
-          '<div id="lattice-dbs-host"><div class="placeholder" style="padding:18px">Loading databases\u2026</div></div>' +
+          '<p class="lead">Every workspace this lattice can switch to. This is the same list as the header dropdown.</p>' +
+          '<div id="lattice-dbs-host"><div class="placeholder" style="padding:18px">Loading workspaces\u2026</div></div>' +
         '</div>';
       var host = document.getElementById('lattice-dbs-host');
-      // Source the SAME list the header dropdown uses (/api/databases) so the
-      // two are always 1:1, listed by readable label rather than the raw file.
-      fetchJson('/api/databases').then(function (data) {
-        var current = data.current || {};
-        var rows = (data.configs || []).map(function (c) {
-          var kind = c.active
-            ? (current.kind === 'cloud' ? 'Cloud (Postgres)' : 'Local (SQLite)')
-            : '\u2014';
-          var rowLabel = c.label || c.name;
-          var del = '<button class="btn danger" data-delete-path="' + escapeHtml(c.path) + '" data-delete-label="' + escapeHtml(rowLabel) + '">Delete</button>';
-          return '<tr' + (c.active ? '' : ' class="ws-row" data-switch-path="' + escapeHtml(c.path) + '"') + '>' +
-            '<td>' + escapeHtml(rowLabel) + (c.active ? ' <span class="role-tag">active</span>' : '') + '</td>' +
+      // Single source of truth: the workspace registry (same as the header switcher).
+      fetchJson('/api/workspaces').then(function (data) {
+        var currentId = (data && data.current) || null;
+        var workspaces = (data && data.workspaces) || [];
+        var rows = workspaces.map(function (w) {
+          var isActive = w.id === currentId;
+          var kind = w.kind === 'cloud' ? 'Cloud (Postgres)' : 'Local (SQLite)';
+          // Rows are click-to-switch; deletion lives in Workspace Settings \u2192 Danger Zone.
+          return '<tr' + (isActive ? '' : ' class="ws-row" data-switch-id="' + escapeHtml(w.id) + '"') + '>' +
+            '<td>' + escapeHtml(w.label) + (isActive ? ' <span class="role-tag">active</span>' : '') + '</td>' +
             '<td>' + kind + '</td>' +
-            '<td><code>' + escapeHtml(c.dbFile || '') + '</code></td>' +
-            '<td>' + del + '</td>' +
+            '<td><code>' + escapeHtml(w.dir || '') + '</code></td>' +
           '</tr>';
         }).join('');
         host.innerHTML =
@@ -11495,38 +11473,22 @@ var appJs = `
               '<button class="btn primary" id="action-add-db">+ Add new workspace</button>' +
             '</div>' +
             '<table style="width:100%;border-collapse:collapse">' +
-              '<thead><tr style="text-align:left"><th>Name</th><th>Kind</th><th>File / source</th><th>Action</th></tr></thead>' +
-              '<tbody>' + (rows || '<tr><td colspan="4" style="padding:8px;color:var(--text-muted)">No workspaces configured.</td></tr>') + '</tbody>' +
+              '<thead><tr style="text-align:left"><th>Name</th><th>Kind</th><th>Location</th></tr></thead>' +
+              '<tbody>' + (rows || '<tr><td colspan="3" style="padding:8px;color:var(--text-muted)">No workspaces configured.</td></tr>') + '</tbody>' +
             '</table>' +
           '</div>';
-        host.querySelectorAll('tr.ws-row[data-switch-path]').forEach(function (row) {
+        host.querySelectorAll('tr.ws-row[data-switch-id]').forEach(function (row) {
           row.addEventListener('click', function () {
-            var configPath = row.getAttribute('data-switch-path');
-            fetch('/api/databases/switch', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ path: configPath }) })
+            var id = row.getAttribute('data-switch-id');
+            fetch('/api/workspaces/switch', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id: id }) })
               .then(function (r) { return r.json(); })
               .then(function () { return reloadEverything(); })
               .then(function () { renderLatticeSettings(document.getElementById('content')); });
           });
         });
-        host.querySelectorAll('[data-delete-path]').forEach(function (btn) {
-          btn.addEventListener('click', function (e) {
-            e.stopPropagation(); // don't trigger the row's switch handler
-            confirmDeleteDatabase(
-              btn.getAttribute('data-delete-path'),
-              btn.getAttribute('data-delete-label'),
-              function () {
-                // Deleting any row may have switched the active DB (if it was
-                // the active one); refetch everything, then re-render the list.
-                return reloadEverything().then(function () {
-                  renderLatticeSettings(document.getElementById('content'));
-                });
-              },
-            );
-          });
-        });
         host.querySelector('#action-add-db').addEventListener('click', showCreateDatabaseWizard);
       }).catch(function (err) {
-        host.innerHTML = '<div class="placeholder">Failed to load databases: ' + escapeHtml(err.message) + '</div>';
+        host.innerHTML = '<div class="placeholder">Failed to load workspaces: ' + escapeHtml(err.message) + '</div>';
       });
     }
 
@@ -11542,7 +11504,7 @@ var appJs = `
         host.innerHTML =
           '<div class="dbconfig-panel" style="margin-bottom:18px;padding:14px;border:1px solid var(--border);border-radius:8px;background:var(--surface)">' +
             '<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:12px">' +
-              '<h3 style="margin:0">Database</h3>' +
+              '<h3 style="margin:0">Database connection</h3>' +
               badge +
             '</div>' +
             body +
@@ -11562,20 +11524,16 @@ var appJs = `
           label = 'LOCAL';
           color = 'var(--text-muted)';
           break;
-        case 'cloud-connected':
-          label = 'CLOUD \xB7 CONNECTED';
-          color = 'var(--accent)';
-          break;
         case 'team-cloud-creator':
-          label = '\u{1F451} TEAM CLOUD \xB7 CREATOR';
+          label = '\u{1F451} CLOUD \xB7 OWNER';
           color = 'var(--accent)';
           break;
         case 'team-cloud-member':
-          label = 'TEAM CLOUD \xB7 MEMBER';
+          label = 'CLOUD \xB7 MEMBER';
           color = 'var(--accent)';
           break;
         case 'team-cloud-needs-invite':
-          label = 'TEAM CLOUD \xB7 NEEDS INVITE';
+          label = 'CLOUD \xB7 NEEDS INVITE';
           color = 'var(--warn)';
           break;
         default:
@@ -11590,31 +11548,23 @@ var appJs = `
           '<p style="margin:0 0 12px;color:var(--text-muted);font-size:13px">' +
             'SQLite DB: <code>' + escapeHtml(info.dbFile || '(unknown)') + '</code>. ' +
             'Push this workspace to a cloud Postgres to collaborate. ' +
-            '(To join an existing cloud, create a new workspace and choose \u201Cjoin via cloud invite\u201D.)' +
+            '(To join a team, create a new workspace and choose \u201CJoin a team (invite)\u201D.)' +
           '</p>' +
           '<div class="team-actions">' +
             '<button class="btn primary" data-act="open-migrate">Migrate to cloud \u2192</button>' +
           '</div>'
         );
       }
-      if (info.state === 'cloud-connected') {
-        return (
-          renderConnectionSummary(info) +
-          '<div class="team-actions" style="margin-top:10px">' +
-            '<button class="btn primary" data-act="open-upgrade">Upgrade to team cloud \u2192</button>' +
-          '</div>'
-        );
-      }
       if (info.state === 'team-cloud-creator' || info.state === 'team-cloud-member') {
-        var isCreator = info.state === 'team-cloud-creator';
+        var isOwner = info.state === 'team-cloud-creator';
         return (
           renderConnectionSummary(info) +
           '<div style="margin-top:10px;font-size:13px">' +
-            '<strong>Team:</strong> ' + escapeHtml(info.teamName || '(unnamed)') +
-            (isCreator ? ' \xB7 <span style="color:var(--accent)">you are the creator</span>' : ' \xB7 <span style="color:var(--text-muted)">member</span>') +
+            '<strong>Cloud workspace:</strong> ' + escapeHtml(info.teamName || '(unnamed)') +
+            (isOwner ? ' \xB7 <span style="color:var(--accent)">you are the owner</span>' : ' \xB7 <span style="color:var(--text-muted)">member</span>') +
           '</div>' +
           '<div class="team-actions" style="margin-top:10px">' +
-            (isCreator ? '<button class="btn primary" data-act="open-invite">Invite member</button>' : '') +
+            (isOwner ? '<button class="btn primary" data-act="open-invite">Invite member</button>' : '') +
           '</div>' +
           // Exit actions (Disconnect for the owner / Leave for a member) live
           // in the Danger Zone below \u2014 not on a member row.
@@ -11625,14 +11575,14 @@ var appJs = `
         return (
           renderConnectionSummary(info) +
           '<p style="margin-top:10px;color:var(--warn);font-size:13px">' +
-            'This cloud DB is a team \u2014 paste your invite token to join.' +
+            'Not a member of this cloud workspace yet \u2014 paste your invite token to join.' +
           '</p>' +
           '<div style="display:grid;grid-template-columns:1fr;gap:8px;margin-top:6px">' +
             '<div><label class="field-label">Invite token</label>' +
             '<textarea id="db-rejoin-token" placeholder="latinv_..." style="width:100%;height:54px;font-family:JetBrains Mono,monospace"></textarea></div>' +
           '</div>' +
           '<div class="team-actions" style="margin-top:10px">' +
-            '<button class="btn primary" data-act="rejoin-with-token">Join team \u2192</button>' +
+            '<button class="btn primary" data-act="rejoin-with-token">Join workspace \u2192</button>' +
           '</div>'
         );
       }
@@ -11662,11 +11612,6 @@ var appJs = `
         showMigrateToCloudModal(rerender);
       });
 
-      var upgradeBtn = host.querySelector('[data-act="open-upgrade"]');
-      if (upgradeBtn) upgradeBtn.addEventListener('click', function () {
-        showUpgradeToTeamModal(rerender);
-      });
-
       // team_id / my_user_id / isCreator come from /api/dbconfig (info),
       // resolved against the ACTIVE cloud DB \u2014 not a local connection row
       // (which doesn't exist when the team cloud itself is active). This
@@ -11687,15 +11632,21 @@ var appJs = `
       // rows carry Kick, shown only to the creator.
       var membersHost = host.querySelector('#db-members-host');
       if (membersHost && teamId && (info.state === 'team-cloud-creator' || info.state === 'team-cloud-member')) {
-        fetchJson('/api/teams-gui/teams/' + teamId + '/members').then(function (res) {
-          var members = res.members || [];
-          membersHost.innerHTML = renderMembersList(members, myUserId, isCreator);
+        Promise.all([
+          fetchJson('/api/teams-gui/teams/' + teamId + '/members'),
+          // Pending invitees (I). Resilient: an older cloud without the GET
+          // invitations route shouldn't blank the whole member list.
+          fetchJson('/api/teams-gui/teams/' + teamId + '/invitations').catch(function () { return { invitations: [] }; }),
+        ]).then(function (results) {
+          var members = (results[0] && results[0].members) || [];
+          var invitations = (results[1] && results[1].invitations) || [];
+          membersHost.innerHTML = renderMembersList(members, myUserId, isCreator, invitations);
           // Kick another member (creator only).
           membersHost.querySelectorAll('[data-act="kick"]').forEach(function (btn) {
             var row = btn.closest('[data-user-id]');
             var userId = row && row.getAttribute('data-user-id');
             btn.addEventListener('click', function () {
-              if (!confirm('Remove this member from the team?')) return;
+              if (!confirm('Remove this member from the workspace?')) return;
               withBusy(btn, function () {
                 return fetchJson('/api/teams-gui/teams/' + teamId + '/members/' + encodeURIComponent(userId), { method: 'DELETE' })
                   .then(function () { rerender(); })
@@ -11714,7 +11665,7 @@ var appJs = `
         // call the connect-existing endpoint with just the invite
         // token. The handler reads credentials from db-credentials.enc
         // via the active configPath's label.
-        setMsg('Joining team\u2026');
+        setMsg('Joining workspace\u2026');
         fetch('/api/dbconfig/connect-existing', {
           method: 'POST', headers: { 'content-type': 'application/json' },
           body: JSON.stringify({
@@ -11877,7 +11828,7 @@ var appJs = `
         '<div style="margin-top:14px;padding:10px;border:1px solid var(--border);border-radius:6px;background:rgba(255,255,255,0.02)">' +
           '<div style="font-size:12px;color:var(--text);text-transform:uppercase;letter-spacing:0.04em;font-weight:500;margin-bottom:6px">Share with cloud</div>' +
           '<p style="margin:0 0 8px;font-size:12px;color:var(--text-muted)">' +
-            'Checked tables become visible to every team member you invite. Uncheck any you want to keep ' +
+            'Checked tables become visible to every member you invite. Uncheck any you want to keep ' +
             'cloud-stored but unshared. You can change this later from Data Model.' +
           '</p>' +
           shareRows +
@@ -11900,7 +11851,7 @@ var appJs = `
           return probeBeforeCredentialSave(body, msg).then(function (probe) {
             if (probe.teamEnabled) {
               throw new Error(
-                'Target is already a cloud DB with a team' +
+                'Target is already a cloud workspace' +
                 (probe.teamName ? ' (' + probe.teamName + ')' : '') +
                 '. Migrate-to-cloud only works against fresh empty targets.'
               );
@@ -11951,100 +11902,11 @@ var appJs = `
       });
     }
 
-    function showConnectExistingModal(onClose) {
-      var bodyHtml =
-        '<p style="margin:0 0 12px;font-size:13px;color:var(--text-muted)">' +
-          'Switch this project to an <strong>existing</strong> cloud Postgres. ' +
-          'Your local SQLite file is preserved \u2014 only this project\\'s active ' +
-          'connection changes. Switch back any time by editing ' +
-          '<code>lattice.config.yml</code>\\'s <code>db:</code> line or via the ' +
-          'Databases catalog under User Config. If you want to <em>push</em> ' +
-          'your local rows into the target instead, use Migrate to cloud. If ' +
-          'the target is a teams DB you\\'ll be asked for an invite token ' +
-          'after the probe.' +
-        '</p>' +
-        postgresFormHtml({}) +
-        '<div id="w-team-zone" style="margin-top:10px"></div>' +
-        '<div id="w-msg" style="margin-top:10px;font-size:12px;color:var(--text-muted)"></div>';
-      var teamZoneShown = false;
-      showModal('Connect to existing cloud', bodyHtml, {
-        primaryLabel: 'Connect \u2192',
-        onSubmit: function () {
-          var body = readPostgresWizardForm();
-          var msg = document.getElementById('w-msg');
-          // probeBeforeCredentialSave validates Supabase form patterns
-          // before sending the probe; surfaces inline warnings (with
-          // hints) when the user clearly has e.g. the wrong port or
-          // missing tenant prefix in the pooler user.
-          return probeBeforeCredentialSave(body, msg)
-            .then(function (probe) {
-              if (probe.teamEnabled && !teamZoneShown) {
-                var zone = document.getElementById('w-team-zone');
-                zone.innerHTML =
-                  '<div style="padding:10px;background:rgba(251,146,60,0.08);border:1px solid var(--warn);border-radius:6px">' +
-                    '<p style="margin:0 0 8px;font-size:13px;color:var(--warn)">Target is a teams DB' +
-                    (probe.teamName ? ' (<strong>' + escapeHtml(probe.teamName) + '</strong>)' : '') +
-                    '. Paste your invite token to join:</p>' +
-                    '<textarea id="w-invite-token" placeholder="latinv_..." style="width:100%;height:54px;font-family:JetBrains Mono,monospace"></textarea>' +
-                  '</div>';
-                teamZoneShown = true;
-                msg.textContent = 'Enter invite token, then click Connect again.';
-                throw new Error('__PROBE_REQUIRES_TOKEN__');
-              }
-              // Either non-team, or we already showed the token zone.
-              var tokenEl = document.getElementById('w-invite-token');
-              var payload = Object.assign({}, body);
-              if (tokenEl && tokenEl.value.trim()) payload.invite_token = tokenEl.value.trim();
-              msg.textContent = 'Connecting\u2026';
-              return fetch('/api/dbconfig/connect-existing', {
-                method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(payload),
-              })
-                .then(function (r) { return r.json().then(function (d) { return { status: r.status, body: d }; }); })
-                .then(function (r) {
-                  if (!r.body.ok) throw new Error(r.body.error || ('HTTP ' + r.status));
-                  if (onClose) onClose();
-                });
-            })
-            .catch(function (e) {
-              if (e.message === '__PROBE_REQUIRES_TOKEN__') {
-                // Suppress error \u2014 token zone is now visible.
-                throw new Error(' '); // forces modal to stay open with a no-op message
-              }
-              throw e;
-            });
-        },
-      });
-    }
-
-    function showUpgradeToTeamModal(onClose) {
-      var bodyHtml =
-        '<p style="margin:0 0 12px;font-size:13px;color:var(--text-muted)">' +
-          'Upgrade this cloud DB to a team DB by registering as the founding member. ' +
-          'Your display name + email from <strong>User Config \u2192 Identity</strong> are used.' +
-        '</p>' +
-        '<div><label class="field-label">Team name</label>' +
-          '<input type="text" id="w-team-name" placeholder="Atlas" style="width:100%"></div>' +
-        '<div id="w-msg" style="margin-top:10px;font-size:12px;color:var(--text-muted)"></div>';
-      showModal('Upgrade to team cloud', bodyHtml, {
-        primaryLabel: 'Upgrade \u2192',
-        onSubmit: function () {
-          var teamName = (document.getElementById('w-team-name').value || '').trim();
-          if (!teamName) throw new Error('Team name is required.');
-          var msg = document.getElementById('w-msg');
-          msg.textContent = 'Upgrading\u2026';
-          return fetch('/api/dbconfig/upgrade-to-team', {
-            method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ team_name: teamName }),
-          })
-            .then(function (r) { return r.json().then(function (d) { return { status: r.status, body: d }; }); })
-            .then(function (r) {
-              if (!r.body.ok) throw new Error(r.body.error || ('HTTP ' + r.status));
-              if (onClose) onClose();
-            });
-        },
-      });
-    }
+    // (Removed in 1.16.3) The standalone upgrade-to-cloud-sharing modal is
+    // gone; cloud workspaces initialize their member/share machinery
+    // automatically (see TeamsClient.ensureCloudWorkspaceIdentity).
 
-    function renderMembersList(members, myUserId, isCreator) {
+    function renderMembersList(members, myUserId, isCreator, invitations) {
       var rows = members.map(function (m) {
         var label = m.name || m.email || '(unknown)';
         var isSelf = m.user_id === myUserId;
@@ -12064,30 +11926,89 @@ var appJs = `
           btn +
         '</div>';
       }).join('');
-      return '<div class="members-list"><h4>Members</h4>' + rows + '</div>';
+      // Pending (unredeemed) invitations \u2014 shown below active members so the
+      // owner can see who's been invited but hasn't joined yet (I).
+      var pending = (invitations || []).filter(function (iv) { return iv && iv.invitee_email; });
+      var pendingHtml = pending.length
+        ? '<h4 style="margin-top:14px">Pending invitations</h4>' +
+            pending.map(function (iv) {
+              return '<div class="member-row member-row-pending">' +
+                '<span style="color:var(--text-muted)">' + escapeHtml(iv.invitee_email) +
+                  ' <span class="role-tag' + (iv.expired ? ' role-expired' : ' role-member') + '">' +
+                    (iv.expired ? 'expired' : 'invited') +
+                  '</span>' +
+                '</span>' +
+              '</div>';
+            }).join('')
+        : '';
+      return '<div class="members-list"><h4>Members</h4>' + rows + pendingHtml + '</div>';
     }
 
     function showInviteByEmailModal(teamId, info) {
+      // Owner-facing: list the workspace's shareable tables, ALL CHECKED by
+      // default, so inviting a member shares those tables with them in one step.
+      // Uncheck any you want to keep private. Re-sharing an already-shared table
+      // is idempotent, so it's safe to leave them checked.
+      var shareable = ((state.entities && state.entities.tables) || [])
+        .filter(function (t) { return t.name.charAt(0) !== '_' && !isJunction(t); })
+        .map(function (t) { return t.name; });
+      var shareRows = shareable.length === 0
+        ? '<p style="margin:0;color:var(--text-muted);font-size:12px">No tables to share yet.</p>'
+        : shareable.map(function (t) {
+            return '<label style="display:flex;align-items:center;gap:8px;padding:4px 0;font-weight:400;text-transform:none;letter-spacing:0">' +
+              '<input type="checkbox" class="invite-share" data-table="' + escapeHtml(t) + '" checked />' +
+              '<span style="font-family:ui-monospace,monospace;font-size:12.5px">' + escapeHtml(t) + '</span>' +
+            '</label>';
+          }).join('');
       var bodyHtml =
         '<div class="field"><label>Invitee email</label>' +
         '<input name="invitee_email" type="email" placeholder="bob@example.com" /></div>' +
-        '<p style="font-size:12px;color:var(--text-muted);margin:0">' +
+        '<p style="font-size:12px;color:var(--text-muted);margin:0 0 10px">' +
         'Invitations are bound to this email \u2014 only the recipient can redeem.' +
-        '</p>';
+        '</p>' +
+        (shareable.length > 0
+          ? '<div style="margin-top:4px;padding:10px;border:1px solid var(--border);border-radius:6px;background:rgba(255,255,255,0.02)">' +
+              '<div style="font-size:11px;color:var(--text-muted);text-transform:uppercase;letter-spacing:0.04em;margin-bottom:6px">Share tables with this member</div>' +
+              '<p style="margin:0 0 8px;font-size:12px;color:var(--text-muted)">All tables are shared by default \u2014 uncheck any you want to keep private.</p>' +
+              shareRows +
+            '</div>'
+          : '');
       showModal('Invite member', bodyHtml, {
         primaryLabel: 'Generate invite',
         onSubmit: function (scope) {
           var data = collectFormValues(scope);
           if (!data.invitee_email) throw new Error('invitee_email is required');
+          var tablesToShare = [];
+          scope.querySelectorAll('input.invite-share:checked').forEach(function (cb) {
+            tablesToShare.push(cb.getAttribute('data-table'));
+          });
           return fetchJson('/api/teams-gui/teams/' + teamId + '/invitations', {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
             body: JSON.stringify({ invitee_email: data.invitee_email }),
-          }).then(function (inv) { showInviteTokenModal(inv, info); });
+          }).then(function (inv) {
+            // Share the checked tables, then show the invite token.
+            return shareTablesForTeam(teamId, tablesToShare).then(function () {
+              showInviteTokenModal(inv, info);
+            });
+          });
         },
       });
     }
 
+    /** Share each table with the team sequentially (idempotent; per-table errors toast, don't abort). */
+    function shareTablesForTeam(teamId, tables) {
+      return (tables || []).reduce(function (chain, table) {
+        return chain.then(function () {
+          return fetchJson('/api/teams-gui/teams/' + encodeURIComponent(teamId) + '/shared', {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ table: table }),
+          }).catch(function (err) { showToast('Share "' + table + '" failed: ' + err.message, {}); });
+        });
+      }, Promise.resolve());
+    }
+
     function showInviteTokenModal(inv, info) {
       info = info || {};
       // The invitee needs the cloud connection string AND the token. Show the
@@ -12165,16 +12086,7 @@ var guiAppHtml = `<!doctype html>
         <circle cx="18" cy="18" r="1.5" fill="#bef264"/>
       </svg>
     </a>
-    <div class="db-switcher" id="db-switcher-host">
-      <button class="db-button" id="db-button" title="Switch database">
-        <span class="db-status" id="db-status" title="Local"></span>
-        <span class="db-icon">\u{1F4BE}</span>
-        <span class="db-name" id="db-name">loading\u2026</span>
-        <span class="db-caret">\u25BE</span>
-      </button>
-      <div class="db-menu" id="db-menu" hidden></div>
-    </div>
-    <div class="db-switcher" id="ws-switcher" hidden>
+    <div class="db-switcher" id="ws-switcher">
       <button class="db-button" id="ws-button" title="Switch workspace">
         <span class="db-status" id="ws-status" title="Workspace"></span>
         <span class="db-icon">\u{1F4C2}</span>
@@ -12225,7 +12137,7 @@ var guiAppHtml = `<!doctype html>
       <button class="drawer-close" id="drawer-close" title="Close" aria-label="Close settings">\u2715</button>
     </div>
     <div class="drawer-tabs" id="drawer-tabs">
-      <button class="drawer-tab" data-tab="database">Database</button>
+      <button class="drawer-tab" data-tab="database">Workspace</button>
       <button class="drawer-tab" data-tab="lattice">Lattice</button>
       <button class="drawer-tab" data-tab="user">User</button>
     </div>
@@ -12803,11 +12715,15 @@ async function applySchemaSpec(db, table, spec) {
   } catch {
     cols = [];
   }
+  const def = deserializeSchema(spec, db.getDialect());
   if (cols.length === 0) {
-    const def = deserializeSchema(spec, db.getDialect());
     await db.defineLate(table, def);
     return true;
   }
+  const alreadyRegistered = db.getRegisteredColumns(table) !== null;
+  if (!alreadyRegistered) {
+    await db.defineLate(table, def);
+  }
   const pk = db.getPrimaryKey(table);
   const { addColumns } = diffSchemaForAdditive(table, spec, cols, pk);
   for (const colName of addColumns) {
@@ -12816,7 +12732,7 @@ async function applySchemaSpec(db, table, spec) {
     const sqlType = renderAddColumnType(colSpec, db.getDialect());
     await db.addColumn(table, colName, sqlType);
   }
-  return addColumns.length > 0;
+  return !alreadyRegistered || addColumns.length > 0;
 }
 
 // src/teams/team-core.ts
@@ -12864,6 +12780,22 @@ async function listTeamMembers(db, teamId) {
   }
   return out;
 }
+async function listPendingInvitations(db, teamId) {
+  const rows = await db.query("__lattice_invitations", {
+    filters: [
+      { col: "team_id", op: "eq", val: teamId },
+      { col: "redeemed_at", op: "isNull" }
+    ]
+  });
+  const nowMs = Date.now();
+  return rows.map((r) => ({
+    id: r.id,
+    invitee_email: r.invitee_email,
+    invited_at: r.created_at,
+    expires_at: r.expires_at ?? null,
+    expired: r.expires_at != null && new Date(r.expires_at).getTime() < nowMs
+  })).sort((a, b) => a.invited_at < b.invited_at ? 1 : a.invited_at > b.invited_at ? -1 : 0);
+}
 async function appendChangeEnvelope(db, entry) {
   const rows = await db.query("__lattice_change_log", {
     filters: [{ col: "team_id", op: "eq", val: entry.team_id }],
@@ -12984,6 +12916,9 @@ async function unshareObject(db, teamId, table) {
 async function listMembersDirect(db, teamId) {
   return listTeamMembers(db, teamId);
 }
+async function listPendingInvitationsDirect(db, teamId) {
+  return listPendingInvitations(db, teamId);
+}
 async function inviteDirect(db, teamId, inviterUserId, inviteeEmail, expiresInHours = 7 * 24) {
   const team = await db.get("__lattice_team", teamId);
   if (!team || team.deleted_at) {
@@ -13900,7 +13835,7 @@ function sendJson2(res, body, status = 200) {
   res.end(JSON.stringify(body));
 }
 function readJson2(req) {
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     let raw = "";
     req.setEncoding("utf8");
     req.on("data", (chunk) => {
@@ -13909,7 +13844,7 @@ function readJson2(req) {
     });
     req.on("end", () => {
       try {
-        resolve10(raw ? JSON.parse(raw) : {});
+        resolve11(raw ? JSON.parse(raw) : {});
       } catch (e) {
         reject(new Error(`Invalid JSON body: ${e.message}`));
       }
@@ -13984,6 +13919,10 @@ async function dispatchTeamRoute(req, res, ctx) {
     await handleCreateInvitation(req, res, ctx, invitationsMatch[1] ?? "");
     return true;
   }
+  if (invitationsMatch && method === "GET") {
+    await handleListInvitations(res, ctx, invitationsMatch[1] ?? "");
+    return true;
+  }
   const objectsListMatch = /^\/api\/teams\/([^/]+)\/objects$/.exec(pathname);
   if (objectsListMatch) {
     if (method === "POST") {
@@ -14260,12 +14199,24 @@ async function handleListMembers(res, ctx, teamId) {
   }
   sendJson2(res, { members: await listTeamMembers(ctx.db, teamId) });
 }
-async function handleKickMember(res, ctx, teamId, userId) {
+async function handleListInvitations(res, ctx, teamId) {
   if (!ctx.authContext) {
     sendJson2(res, { error: "Unauthorized" }, 401);
     return;
   }
-  const callerRole = await getMembershipRole(ctx.db, teamId, ctx.authContext.user.id);
+  const role = await getMembershipRole(ctx.db, teamId, ctx.authContext.user.id);
+  if (!role) {
+    sendJson2(res, { error: "Not a member of this team" }, 403);
+    return;
+  }
+  sendJson2(res, { invitations: await listPendingInvitations(ctx.db, teamId) });
+}
+async function handleKickMember(res, ctx, teamId, userId) {
+  if (!ctx.authContext) {
+    sendJson2(res, { error: "Unauthorized" }, 401);
+    return;
+  }
+  const callerRole = await getMembershipRole(ctx.db, teamId, ctx.authContext.user.id);
   if (!callerRole) {
     sendJson2(res, { error: "Not a member of this team" }, 403);
     return;
@@ -14970,6 +14921,42 @@ var TeamsClient = class {
     });
     return reg;
   }
+  /**
+   * Idempotently initialize a cloud Postgres DB as a collaborative cloud
+   * workspace (members + sharing). 1.16.3 deprecated the user-facing "team"
+   * concept and the explicit "upgrade to team" step — every cloud workspace
+   * gets this machinery automatically at migrate / connect / open time, so the
+   * members + per-table sharing surface is always available on a cloud DB.
+   *
+   * No-op (returns created:false) when the cloud already carries an identity.
+   * On a fresh cloud the caller becomes the owner. Race-safe: a concurrent
+   * initializer that wins the singleton insert is treated as success.
+   */
+  async ensureCloudWorkspaceIdentity(opts) {
+    const probe = await probeCloud(opts.cloudUrl);
+    if (!probe.reachable) {
+      throw new Error(`Cloud DB unreachable: ${probe.error ?? "unknown error"}`);
+    }
+    if (probe.teamEnabled) return { created: false };
+    if (!opts.email) {
+      throw new Error("Set your email in User settings to set up this cloud workspace.");
+    }
+    try {
+      const displayName = opts.displayName?.trim() ? opts.displayName : opts.email;
+      await this.upgradeToTeamCloud({
+        label: opts.label,
+        cloudUrl: opts.cloudUrl,
+        teamName: opts.workspaceName,
+        email: opts.email,
+        displayName
+      });
+      return { created: true };
+    } catch (e) {
+      const msg = e.message || "";
+      if (/already has (a team|users)/i.test(msg)) return { created: false };
+      throw e;
+    }
+  }
   // ── Cloud team operations (dispatch on URL scheme) ──────────────────────
   // For HTTP cloud URLs (`http://lattice-server:port`), every operation
   // round-trips through the team server's authenticated REST API. For
@@ -15003,6 +14990,18 @@ var TeamsClient = class {
     );
     return r.members;
   }
+  async listPendingInvitations(cloudUrl, token, teamId) {
+    if (isPostgresUrl(cloudUrl)) {
+      return listPendingInvitationsDirect(this.local, teamId);
+    }
+    const r = await this.fetchAuthed(
+      cloudUrl,
+      token,
+      "GET",
+      `/api/teams/${teamId}/invitations`
+    );
+    return r.invitations;
+  }
   async invite(cloudUrl, token, teamId, inviteeEmail, expiresInHours, inviterUserId) {
     if (isPostgresUrl(cloudUrl)) {
       if (!inviterUserId) {
@@ -15750,14 +15749,143 @@ var TeamsHttpError = class extends Error {
 };
 
 // src/gui/teams-routes.ts
-import { existsSync as existsSync15, readFileSync as readFileSync11, readdirSync as readdirSync5, rmSync, writeFileSync as writeFileSync6 } from "fs";
-import { dirname as dirname6, join as join14 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync12, readdirSync as readdirSync6, rmSync, writeFileSync as writeFileSync6 } from "fs";
+import { dirname as dirname8, join as join16 } from "path";
+
+// src/framework/gui-bootstrap.ts
+import { existsSync as existsSync16, readFileSync as readFileSync11, readdirSync as readdirSync5 } from "fs";
+import { basename as basename4, dirname as dirname7, join as join15, resolve as resolve6 } from "path";
+import { parse as parseYaml } from "yaml";
+
+// src/framework/migrate-to-root.ts
+import { cpSync, existsSync as existsSync15, mkdirSync as mkdirSync8 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join14 } from "path";
+var LEGACY_ENTRIES = [
+  "master.key",
+  "identity.json",
+  "preferences.json",
+  "db-credentials.enc",
+  "keys"
+];
+function importLegacyUserConfig(root) {
+  const legacy = process.env.LATTICE_CONFIG_DIR ?? join14(homedir3(), ".lattice");
+  const dest = rootConfigDir(root);
+  const copied = [];
+  if (!existsSync15(join14(legacy, "master.key"))) return { migrated: false, copied };
+  if (existsSync15(join14(dest, "master.key"))) return { migrated: false, copied };
+  mkdirSync8(dest, { recursive: true });
+  for (const entry of LEGACY_ENTRIES) {
+    const src = join14(legacy, entry);
+    if (existsSync15(src)) {
+      cpSync(src, join14(dest, entry), { recursive: true });
+      copied.push(entry);
+    }
+  }
+  return copied.length > 0 ? { migrated: true, from: legacy, copied } : { migrated: false, copied };
+}
+
+// src/framework/gui-bootstrap.ts
+function resolveContextDirForConfig(configPath) {
+  const base = dirname7(resolve6(configPath));
+  for (const dir of ["context", ".", "generated"]) {
+    const abs = resolve6(base, dir);
+    if (existsSync16(join15(abs, ".lattice", "manifest.json"))) return abs;
+  }
+  return resolve6(base, "context");
+}
+function readConfigMeta(absPath) {
+  let raw;
+  try {
+    raw = readFileSync11(absPath, "utf8");
+  } catch {
+    return null;
+  }
+  let parsed;
+  try {
+    parsed = parseYaml(raw);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  const cfg = parsed;
+  if (typeof cfg.db !== "string" || !cfg.db.trim()) return null;
+  if (!cfg.entities || typeof cfg.entities !== "object" || Array.isArray(cfg.entities)) return null;
+  const name = typeof cfg.name === "string" && cfg.name.trim() ? cfg.name.trim() : void 0;
+  return name !== void 0 ? { db: cfg.db.trim(), name } : { db: cfg.db.trim() };
+}
+function nameFromConfigPath(absPath) {
+  return basename4(absPath).replace(/\.(config\.)?ya?ml$/i, "") || "Workspace";
+}
+function adoptConfigAsWorkspace(root, configPath, opts) {
+  const abs = resolve6(configPath);
+  const meta = readConfigMeta(abs);
+  if (!meta) return null;
+  return addAdoptedWorkspace(root, {
+    displayName: opts?.displayName ?? meta.name ?? nameFromConfigPath(abs),
+    db: meta.db,
+    configPath: abs,
+    contextDir: resolveContextDirForConfig(abs),
+    makeActive: opts?.makeActive ?? false
+  });
+}
+function reconcileWorkspaceRegistry(root, scanDirs) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const dir of scanDirs) {
+    const abs = resolve6(dir);
+    if (seen.has(abs) || !existsSync16(abs)) continue;
+    seen.add(abs);
+    let entries;
+    try {
+      entries = readdirSync5(abs);
+    } catch {
+      continue;
+    }
+    for (const fname of entries) {
+      if (!fname.endsWith(".yml") && !fname.endsWith(".yaml")) continue;
+      const full = join15(abs, fname);
+      if (findWorkspaceByConfigPath(root, full)) continue;
+      adoptConfigAsWorkspace(root, full, { makeActive: false });
+    }
+  }
+}
+function ensureRootForGui(opts) {
+  const configAbs = resolve6(opts.configPath);
+  const hasConfigFile = existsSync16(configAbs);
+  let root = findLatticeRoot(opts.startDir);
+  if (!root && hasConfigFile) root = findLatticeRoot(dirname7(configAbs));
+  let freshRoot = false;
+  if (!root) {
+    root = ensureLatticeRoot(hasConfigFile ? dirname7(configAbs) : opts.startDir);
+    freshRoot = true;
+  }
+  importLegacyUserConfig(root);
+  if (hasConfigFile && (opts.explicitConfig || freshRoot || getActiveWorkspace(root) === null)) {
+    adoptConfigAsWorkspace(root, configAbs, {
+      makeActive: true,
+      ...opts.displayName !== void 0 ? { displayName: opts.displayName } : {}
+    });
+  }
+  reconcileWorkspaceRegistry(root, [dirname7(configAbs), dirname7(root)]);
+  const ws = getActiveWorkspace(root) ?? addWorkspace(root, { displayName: opts.displayName ?? "My Workspace" });
+  const paths = resolveWorkspacePaths(root, ws);
+  return {
+    root,
+    workspaceId: ws.id,
+    displayName: ws.displayName,
+    configPath: paths.configPath,
+    contextDir: paths.contextDir
+  };
+}
+
+// src/gui/teams-routes.ts
 function removeTeamConfigForCloud(ctx, cloudUrl) {
   try {
-    const dir = dirname6(ctx.configPath);
-    for (const fname of readdirSync5(dir)) {
+    const dir = dirname8(ctx.configPath);
+    const root = findLatticeRoot(dir);
+    for (const fname of readdirSync6(dir)) {
       if (!fname.endsWith(".yml") && !fname.endsWith(".yaml")) continue;
-      const full = join14(dir, fname);
+      const full = join16(dir, fname);
       let resolvedDb;
       try {
         resolvedDb = parseConfigFile(full).dbPath;
@@ -15765,7 +15893,7 @@ function removeTeamConfigForCloud(ctx, cloudUrl) {
         continue;
       }
       if (resolvedDb !== cloudUrl) continue;
-      const raw = readFileSync11(full, "utf8");
+      const raw = readFileSync12(full, "utf8");
       const labelMatch = /^\s*db:\s*\$\{LATTICE_DB:([A-Za-z0-9._-]+)\}/m.exec(raw);
       if (labelMatch?.[1]) {
         try {
@@ -15773,15 +15901,16 @@ function removeTeamConfigForCloud(ctx, cloudUrl) {
         } catch {
         }
       }
+      if (root) removeWorkspaceByConfigPath(root, full);
       rmSync(full, { force: true });
     }
   } catch {
   }
 }
 function writeTeamConfigYaml(activeConfigPath, credentialLabel, teamName) {
-  const projectDir = dirname6(activeConfigPath);
-  const yamlPath = join14(projectDir, `${credentialLabel}.yml`);
-  if (existsSync15(yamlPath)) return yamlPath;
+  const projectDir = dirname8(activeConfigPath);
+  const yamlPath = join16(projectDir, `${credentialLabel}.yml`);
+  if (existsSync17(yamlPath)) return yamlPath;
   const safeName = teamName.replace(/[\r\n]/g, " ");
   const yaml = `# Joined-team config \u2014 managed by lattice gui. Edit entities: to add
 # locally-projected tables of the team's shared data; the cloud DB at
@@ -15907,6 +16036,15 @@ async function dispatchTeamSubroute(req, res, ctx, teamId, subpath) {
     sendJson(res, { members });
     return;
   }
+  if (subpath === "invitations" && method === "GET") {
+    const invitations = await ctx.client.listPendingInvitations(
+      conn.cloud_url,
+      conn.api_token,
+      teamId
+    );
+    sendJson(res, { invitations });
+    return;
+  }
   if (subpath === "invitations" && method === "POST") {
     const body = await readJson(req);
     const inviteeEmail = requireString2(body, "invitee_email");
@@ -16027,13 +16165,32 @@ async function handleJoin(req, res, ctx) {
     cloudUrl
   });
   const configYamlPath = writeTeamConfigYaml(ctx.configPath, credentialLabel, result.team.name);
+  const workspaceId = registerJoinedCloudWorkspace(
+    ctx.configPath,
+    configYamlPath,
+    credentialLabel,
+    result.team.name
+  );
   sendJson(res, {
     ok: true,
     team: result.team,
     user: result.user,
     credential_label: credentialLabel,
-    config_path: configYamlPath
+    config_path: configYamlPath,
+    ...workspaceId ? { workspace_id: workspaceId } : {}
+  });
+}
+function registerJoinedCloudWorkspace(activeConfigPath, configYamlPath, credentialLabel, teamName) {
+  const root = findLatticeRoot(dirname8(activeConfigPath));
+  if (!root) return null;
+  const ws = registerOrUpdateCloudWorkspace(root, {
+    configPath: configYamlPath,
+    contextDir: resolveContextDirForConfig(configYamlPath),
+    displayName: teamName,
+    db: "${LATTICE_DB:" + credentialLabel + "}",
+    makeActive: false
   });
+  return ws.id;
 }
 async function handleRegisterAndCreate(req, res, ctx) {
   const body = await readJson(req);
@@ -16045,7 +16202,7 @@ async function handleRegisterAndCreate(req, res, ctx) {
     sendJson(res, { error: "cloud_url, email, user_name, team_name required" }, 400);
     return;
   }
-  const reg = await ctx.client.register(cloudUrl, email, userName, teamName);
+  const reg = isPostgresUrl(cloudUrl) ? await registerDirectViaPostgres(cloudUrl, email, userName, teamName) : await ctx.client.register(cloudUrl, email, userName, teamName);
   await ctx.client.saveConnection({
     team_id: reg.team.id,
     team_name: reg.team.name,
@@ -16053,7 +16210,26 @@ async function handleRegisterAndCreate(req, res, ctx) {
     my_user_id: reg.user.id,
     api_token: reg.raw_token
   });
-  sendJson(res, { ok: true, team: reg.team, user: reg.user });
+  const credentialLabel = saveDbCredentialForTeam({
+    teamName: reg.team.name,
+    teamId: reg.team.id,
+    cloudUrl
+  });
+  const configYamlPath = writeTeamConfigYaml(ctx.configPath, credentialLabel, reg.team.name);
+  const workspaceId = registerJoinedCloudWorkspace(
+    ctx.configPath,
+    configYamlPath,
+    credentialLabel,
+    reg.team.name
+  );
+  sendJson(res, {
+    ok: true,
+    team: reg.team,
+    user: reg.user,
+    credential_label: credentialLabel,
+    config_path: configYamlPath,
+    ...workspaceId ? { workspace_id: workspaceId } : {}
+  });
 }
 async function handleLeave(res, ctx, teamId) {
   const conn = await getConnection(ctx, teamId);
@@ -16082,8 +16258,8 @@ async function handleLeave(res, ctx, teamId) {
 }
 
 // src/gui/userconfig-routes.ts
-import { existsSync as existsSync16, readdirSync as readdirSync6 } from "fs";
-import { basename as basename4, dirname as dirname7, join as join15 } from "path";
+import { existsSync as existsSync18, readdirSync as readdirSync7 } from "fs";
+import { basename as basename5, dirname as dirname9, join as join17 } from "path";
 async function upsertIdentityRow(db, identity) {
   const existing = await db.get("__lattice_user_identity", "singleton");
   const updated_at = (/* @__PURE__ */ new Date()).toISOString();
@@ -16103,18 +16279,18 @@ async function upsertIdentityRow(db, identity) {
   }
 }
 function listProjectConfigs(activeConfigPath) {
-  const dir = dirname7(activeConfigPath);
+  const dir = dirname9(activeConfigPath);
   const out = [];
-  if (!existsSync16(dir)) return out;
-  for (const fname of readdirSync6(dir)) {
+  if (!existsSync18(dir)) return out;
+  for (const fname of readdirSync7(dir)) {
     if (!fname.endsWith(".yml") && !fname.endsWith(".yaml")) continue;
-    const full = join15(dir, fname);
+    const full = join17(dir, fname);
     try {
       const parsed = parseConfigFile(full);
       out.push({
         path: full,
         name: fname.replace(/\.(ya?ml)$/, ""),
-        dbFile: basename4(parsed.dbPath)
+        dbFile: basename5(parsed.dbPath)
       });
     } catch {
     }
@@ -16193,12 +16369,12 @@ async function dispatchUserConfigRoute(req, res, ctx) {
 }
 
 // src/gui/dbconfig-routes.ts
-import { readFileSync as readFileSync12, writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename5, isAbsolute as isAbsolute2, relative as relative2, resolve as resolve5, sep as sep3 } from "path";
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync7 } from "fs";
+import { basename as basename6, dirname as dirname10, isAbsolute as isAbsolute2, relative as relative2, resolve as resolve7, sep as sep3 } from "path";
 import { parseDocument } from "yaml";
 
 // src/framework/cloud-migration.ts
-import { existsSync as existsSync17, renameSync as renameSync3, unlinkSync as unlinkSync4 } from "fs";
+import { existsSync as existsSync19, renameSync as renameSync3, unlinkSync as unlinkSync4 } from "fs";
 
 // src/framework/native-entities.ts
 var NATIVE_ENTITY_DEFS = {
@@ -16268,7 +16444,8 @@ var NATIVE_ENTITY_DEFS = {
   notes: {
     // A generic knowledge object: a free-form note with a title and body.
     // Ordinary, user-editable rows; `source_file_id` optionally points back at
-    // an originating `files` row.
+    // an originating `files` row. Retained as native (1.16.3) because the
+    // reference/source-organizer store uses it as the fallback organizer target.
     columns: {
       id: "TEXT PRIMARY KEY",
       title: "TEXT",
@@ -16410,14 +16587,14 @@ async function openTargetLatticeForMigration(configPath, targetUrl, encryptionKe
   return target;
 }
 function archiveLocalSqlite(dbPath) {
-  if (!existsSync17(dbPath)) {
+  if (!existsSync19(dbPath)) {
     throw new Error(`archiveLocalSqlite: source file does not exist: ${dbPath}`);
   }
   const backupPath = `${dbPath}.local-bak`;
   const siblings = ["", "-shm", "-wal"];
   for (const suffix of siblings) {
     const stale = `${dbPath}.local-bak${suffix}`;
-    if (existsSync17(stale)) {
+    if (existsSync19(stale)) {
       try {
         unlinkSync4(stale);
       } catch {
@@ -16426,7 +16603,7 @@ function archiveLocalSqlite(dbPath) {
   }
   for (const suffix of siblings) {
     const src = `${dbPath}${suffix}`;
-    if (!existsSync17(src)) continue;
+    if (!existsSync19(src)) continue;
     const dest = `${dbPath}.local-bak${suffix}`;
     renameSync3(src, dest);
   }
@@ -16434,6 +16611,17 @@ function archiveLocalSqlite(dbPath) {
 }
 
 // src/gui/dbconfig-routes.ts
+function updateActiveWorkspaceToCloud(configPath, label) {
+  const root = findLatticeRoot(dirname10(configPath));
+  if (!root) return;
+  registerOrUpdateCloudWorkspace(root, {
+    configPath,
+    contextDir: resolveContextDirForConfig(configPath),
+    displayName: label,
+    db: "${LATTICE_DB:" + label + "}",
+    makeActive: true
+  });
+}
 function buildPostgresUrl(params) {
   const u = encodeURIComponent(params.user);
   const p = encodeURIComponent(params.password);
@@ -16464,7 +16652,7 @@ async function getCreatorEmail(db) {
 }
 function computeState(type, teamEnabled, label, creatorEmail) {
   if (type === "sqlite") return "local";
-  if (!teamEnabled) return "cloud-connected";
+  if (!teamEnabled) return "team-cloud-needs-invite";
   if (!label) {
     return "team-cloud-needs-invite";
   }
@@ -16486,7 +16674,7 @@ function applyTeamMembershipState(info, membership) {
   return membership.joined ? membership.isCreator ? "team-cloud-creator" : "team-cloud-member" : "team-cloud-needs-invite";
 }
 async function describeCurrent(configPath, db) {
-  const rawYaml = readFileSync12(configPath, "utf8");
+  const rawYaml = readFileSync13(configPath, "utf8");
   const doc = parseDocument(rawYaml);
   const rawDb = doc.get("db");
   const dbLine = typeof rawDb === "string" ? rawDb.trim() : "";
@@ -16552,7 +16740,7 @@ async function describeCurrent(configPath, db) {
   return {
     type: "sqlite",
     state: "local",
-    dbFile: basename5(dbLine),
+    dbFile: basename6(dbLine),
     teamEnabled
   };
 }
@@ -16565,7 +16753,7 @@ async function detectTeamEnabled(db) {
   }
 }
 function rewriteDbLine(configPath, newValue) {
-  const doc = parseDocument(readFileSync12(configPath, "utf8"));
+  const doc = parseDocument(readFileSync13(configPath, "utf8"));
   doc.set("db", newValue);
   writeFileSync7(configPath, doc.toString(), "utf8");
 }
@@ -16590,7 +16778,7 @@ function parseSaveBody(body) {
   return null;
 }
 function resolveRelativeToConfig(configPath, candidate) {
-  return isAbsolute2(candidate) ? candidate : resolve5(configPath, "..", candidate);
+  return isAbsolute2(candidate) ? candidate : resolve7(configPath, "..", candidate);
 }
 async function dispatchDbConfigRoute(req, res, ctx) {
   const { pathname, method } = ctx;
@@ -16633,7 +16821,7 @@ async function dispatchDbConfigRoute(req, res, ctx) {
         return;
       }
       const abs = resolveRelativeToConfig(ctx.configPath, parsed.path);
-      const rel = relative2(resolve5(ctx.configPath, ".."), abs);
+      const rel = relative2(resolve7(ctx.configPath, ".."), abs);
       const dbLine = rel.startsWith("..") ? abs : "./" + rel.split(sep3).join("/");
       rewriteDbLine(ctx.configPath, dbLine);
       sendJson(res, { ok: true, type: "sqlite", path: dbLine });
@@ -16744,7 +16932,21 @@ async function dispatchDbConfigRoute(req, res, ctx) {
         const sourceDbPath = parseConfigFile(ctx.configPath).dbPath;
         const backupPath = archiveLocalSqlite(sourceDbPath);
         saveDbCredential(parsed.label, url);
+        try {
+          const identity = readIdentity();
+          if (identity.email) {
+            await new TeamsClient(ctx.db).ensureCloudWorkspaceIdentity({
+              label: parsed.label,
+              cloudUrl: url,
+              workspaceName: parsed.label,
+              email: identity.email,
+              displayName: identity.display_name
+            });
+          }
+        } catch {
+        }
         rewriteDbLine(ctx.configPath, "${LATTICE_DB:" + parsed.label + "}");
+        updateActiveWorkspaceToCloud(ctx.configPath, parsed.label);
         await ctx.swap();
         sendJson(res, {
           ok: true,
@@ -16789,7 +16991,20 @@ async function dispatchDbConfigRoute(req, res, ctx) {
           ...identity.email ? { email: identity.email } : {},
           ...identity.display_name ? { name: identity.display_name } : {}
         });
+        if (!result.probe.teamEnabled && identity.email) {
+          try {
+            await client.ensureCloudWorkspaceIdentity({
+              label: parsed.label,
+              cloudUrl: url,
+              workspaceName: parsed.label,
+              email: identity.email,
+              displayName: identity.display_name
+            });
+          } catch {
+          }
+        }
         rewriteDbLine(ctx.configPath, "${LATTICE_DB:" + parsed.label + "}");
+        updateActiveWorkspaceToCloud(ctx.configPath, parsed.label);
         await ctx.swap();
         sendJson(res, {
           ok: true,
@@ -16833,6 +17048,10 @@ async function dispatchDbConfigRoute(req, res, ctx) {
           team_name: name,
           updated_at: updatedAt
         });
+        {
+          const root = findLatticeRoot(dirname10(ctx.configPath));
+          if (root) renameWorkspaceByConfigPath(root, ctx.configPath, name);
+        }
         try {
           const teams = await ctx.db.query("__lattice_team", { limit: 1 });
           if (teams[0]) {
@@ -16846,67 +17065,14 @@ async function dispatchDbConfigRoute(req, res, ctx) {
         sendJson(res, { ok: true, kind: "cloud", name });
         return;
       }
-      const doc = parseDocument(readFileSync12(ctx.configPath, "utf8"));
+      const doc = parseDocument(readFileSync13(ctx.configPath, "utf8"));
       doc.set("name", name);
       writeFileSync7(ctx.configPath, doc.toString(), "utf8");
-      sendJson(res, { ok: true, kind: "local", name });
-    });
-    return true;
-  }
-  if (pathname === "/api/dbconfig/upgrade-to-team" && method === "POST") {
-    await tryHandler(res, async () => {
-      const body = await readJson(req);
-      const teamName = typeof body.team_name === "string" && body.team_name.trim() ? body.team_name.trim() : "";
-      if (!teamName) {
-        sendJson(res, { error: "team_name is required" }, 400);
-        return;
-      }
-      const info = await describeCurrent(ctx.configPath, ctx.db);
-      if (info.type !== "postgres" || !info.label) {
-        sendJson(
-          res,
-          {
-            error: "upgrade-to-team requires the active project to be on a labeled cloud DB. Migrate to cloud first."
-          },
-          400
-        );
-        return;
-      }
-      if (info.teamEnabled) {
-        sendJson(res, { error: "Cloud DB is already a team DB" }, 409);
-        return;
-      }
-      const cloudUrl = getDbCredential(info.label);
-      if (!cloudUrl) {
-        sendJson(res, { error: "No saved credential for " + info.label }, 500);
-        return;
-      }
-      const identity = readIdentity();
-      if (!identity.email || !identity.display_name) {
-        sendJson(
-          res,
-          {
-            error: "Set your display name + email in User Config \u2192 Identity before creating a team"
-          },
-          400
-        );
-        return;
-      }
-      const client = new TeamsClient(ctx.db);
-      try {
-        const reg = await client.upgradeToTeamCloud({
-          label: info.label,
-          cloudUrl,
-          teamName,
-          email: identity.email,
-          displayName: identity.display_name
-        });
-        await ctx.swap();
-        sendJson(res, { ok: true, team: reg.team, user: reg.user });
-      } catch (e) {
-        const status = e.status ?? 500;
-        sendJson(res, { ok: false, error: e.message }, status);
+      {
+        const root = findLatticeRoot(dirname10(ctx.configPath));
+        if (root) renameWorkspaceByConfigPath(root, ctx.configPath, name);
       }
+      sendJson(res, { ok: true, kind: "local", name });
     });
     return true;
   }
@@ -17218,16 +17384,16 @@ function buildRowContextLocator(table, row, schemaDef, manifest) {
 }
 function readRowContext(outputDir, locator, secretCols) {
   const { slug, directoryRoot, fileNames } = locator;
-  const entityDir = resolve6(outputDir, directoryRoot, slug);
-  const resolvedBase = resolve6(outputDir);
+  const entityDir = resolve8(outputDir, directoryRoot, slug);
+  const resolvedBase = resolve8(outputDir);
   if (entityDir !== resolvedBase && !entityDir.startsWith(resolvedBase + sep4)) {
     throw new Error(`Path traversal detected: slug "${slug}" escapes output directory`);
   }
   return fileNames.map((filename) => {
-    const absPath = join16(entityDir, filename);
+    const absPath = join18(entityDir, filename);
     const relPath = [directoryRoot, slug, filename].join("/");
-    if (!existsSync18(absPath)) return { name: filename, path: relPath, content: "" };
-    let content = readFileSync13(absPath, "utf8");
+    if (!existsSync20(absPath)) return { name: filename, path: relPath, content: "" };
+    let content = readFileSync14(absPath, "utf8");
     for (const col of secretCols) {
       const re = new RegExp(`^(${col}):.*$`, "gm");
       content = content.replace(re, `$1: \u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022`);
@@ -17236,17 +17402,17 @@ function readRowContext(outputDir, locator, secretCols) {
   });
 }
 function resolveOutputDirForConfig(configPath) {
-  const base = dirname8(resolve6(configPath));
+  const base = dirname11(resolve8(configPath));
   for (const dir of ["context", ".", "generated"]) {
-    const abs = resolve6(base, dir);
-    if (existsSync18(join16(abs, ".lattice", "manifest.json"))) return abs;
+    const abs = resolve8(base, dir);
+    if (existsSync20(join18(abs, ".lattice", "manifest.json"))) return abs;
   }
-  return resolve6(base, "context");
+  return resolve8(base, "context");
 }
 async function openConfig(configPath, outputDir, autoRender = false) {
   const parsed = parseConfigFile(configPath);
   if (!/^postgres(ql)?:\/\//i.test(parsed.dbPath) && !parsed.dbPath.startsWith("file:") && parsed.dbPath !== ":memory:") {
-    mkdirSync8(dirname8(parsed.dbPath), { recursive: true });
+    mkdirSync9(dirname11(parsed.dbPath), { recursive: true });
   }
   const encryptionKey = getOrCreateMasterKey();
   const db = new Lattice({ config: configPath }, { encryptionKey });
@@ -17362,6 +17528,14 @@ async function openConfig(configPath, outputDir, autoRender = false) {
   } catch (e) {
     console.warn("[openConfig] could not enumerate team connections:", e.message);
   }
+  for (const name of db.getRegisteredTableNames()) {
+    if (name.startsWith("__lattice_") || name.startsWith("_lattice_")) continue;
+    validTables.add(name);
+    if (!softDeletable.has(name)) {
+      const sharedCols = db.getRegisteredColumns(name);
+      if (sharedCols && "deleted_at" in sharedCols) softDeletable.add(name);
+    }
+  }
   let teamContext = null;
   if (db.getDialect() === "postgres") {
     let teamEnabled = false;
@@ -17370,6 +17544,30 @@ async function openConfig(configPath, outputDir, autoRender = false) {
     } catch {
       teamEnabled = false;
     }
+    if (!teamEnabled) {
+      try {
+        const rawDb = parseDocument2(readFileSync14(configPath, "utf8")).get("db");
+        const dbLine = typeof rawDb === "string" ? rawDb.trim() : "";
+        const labelMatch = /^\$\{LATTICE_DB:([A-Za-z0-9._-]+)\}$/.exec(dbLine);
+        const label = labelMatch?.[1];
+        const identity = readIdentity();
+        if (label && identity.email) {
+          await teamsClient.ensureCloudWorkspaceIdentity({
+            label,
+            cloudUrl: parsed.dbPath,
+            workspaceName: label,
+            email: identity.email,
+            displayName: identity.display_name
+          });
+          teamEnabled = await db.get("__lattice_team_identity", "singleton") != null;
+        }
+      } catch (e) {
+        console.warn(
+          "[openConfig] could not auto-initialize cloud workspace:",
+          e.message
+        );
+      }
+    }
     if (teamEnabled) {
       await registerTeamCloudTables(db);
       try {
@@ -17412,7 +17610,7 @@ async function openConfig(configPath, outputDir, autoRender = false) {
     } catch (e) {
       console.warn("[openConfig] initial render failed:", e.message);
     }
-    if (!existsSync18(manifestPath(outputDir))) {
+    if (!existsSync20(manifestPath(outputDir))) {
       writeManifest(outputDir, {
         version: 2,
         generated_at: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17438,14 +17636,14 @@ async function openConfig(configPath, outputDir, autoRender = false) {
 }
 function friendlyConfigName(parsedName, configPath) {
   if (parsedName && parsedName.trim().length > 0) return parsedName.trim();
-  return basename6(configPath).replace(/\.(ya?ml)$/, "");
+  return basename7(configPath).replace(/\.(ya?ml)$/, "");
 }
 function listConfigs(activeConfigPath) {
-  const dir = dirname8(activeConfigPath);
+  const dir = dirname11(activeConfigPath);
   const entries = [];
-  for (const fname of readdirSync7(dir)) {
+  for (const fname of readdirSync8(dir)) {
     if (!fname.endsWith(".yml") && !fname.endsWith(".yaml")) continue;
-    const full = join16(dir, fname);
+    const full = join18(dir, fname);
     try {
       const parsed = parseConfigFile(full);
       entries.push({
@@ -17456,7 +17654,7 @@ function listConfigs(activeConfigPath) {
         // `label` is the friendly DB name — what the user sees in the
         // dropdown + settings. Falls back to the basename when unset.
         label: friendlyConfigName(parsed.name, full),
-        dbFile: basename6(parsed.dbPath),
+        dbFile: basename7(parsed.dbPath),
         active: full === activeConfigPath,
         // `${LATTICE_DB:...}` and postgres:// configs resolve to a
         // postgres URL; everything else is a local SQLite file. This
@@ -17475,53 +17673,46 @@ async function execSql(db, sql) {
   await adapter.runAsync(sql);
 }
 function loadConfigDoc(configPath) {
-  return parseDocument2(readFileSync13(configPath, "utf8"));
+  return parseDocument2(readFileSync14(configPath, "utf8"));
 }
 function saveConfigDoc(configPath, doc) {
   writeFileSync8(configPath, doc.toString(), "utf8");
 }
 function createBlankConfig(activeConfigPath, dbName) {
-  const dir = dirname8(activeConfigPath);
+  const dir = dirname11(activeConfigPath);
   const slug = dbName.toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
-  if (!slug) throw new Error("Database name must contain at least one alphanumeric character");
-  const configPath = join16(dir, `${slug}.config.yml`);
-  if (existsSync18(configPath)) throw new Error(`Config already exists: ${slug}.config.yml`);
+  if (!slug) throw new Error("Workspace name must contain at least one alphanumeric character");
+  const configPath = join18(dir, `${slug}.config.yml`);
+  if (existsSync20(configPath)) throw new Error(`Config already exists: ${slug}.config.yml`);
   const yaml = `db: ./data/${slug}.db
 
-entities:
-  items:
-    fields:
-      id: { type: uuid, primaryKey: true }
-      name: { type: text, required: true }
-      notes: { type: text }
-      deleted_at: { type: text }
-    outputFile: ITEMS.md
+entities: {}
 `;
   writeFileSync8(configPath, yaml, "utf8");
-  mkdirSync8(join16(dir, "data"), { recursive: true });
+  mkdirSync9(join18(dir, "data"), { recursive: true });
   return configPath;
 }
 function sqliteFileForConfig(configPath) {
-  const dbVal = parseDocument2(readFileSync13(configPath, "utf8")).get("db");
+  const dbVal = parseDocument2(readFileSync14(configPath, "utf8")).get("db");
   const raw = (typeof dbVal === "string" ? dbVal : "").trim();
   if (!raw) return null;
   if (isPostgresUrl(raw) || raw.startsWith("${LATTICE_DB:")) return null;
   if (raw === ":memory:" || raw.startsWith("file:")) return null;
-  return resolve6(dirname8(configPath), raw);
+  return resolve8(dirname11(configPath), raw);
 }
 function deleteDatabaseFiles(targetConfigPath) {
   const sqliteFile = sqliteFileForConfig(targetConfigPath);
   unlinkSync5(targetConfigPath);
   let deletedDbFile = null;
-  if (sqliteFile && existsSync18(sqliteFile)) {
+  if (sqliteFile && existsSync20(sqliteFile)) {
     unlinkSync5(sqliteFile);
     deletedDbFile = sqliteFile;
     for (const suffix of ["-wal", "-shm", "-journal"]) {
       const sidecar = sqliteFile + suffix;
-      if (existsSync18(sidecar)) unlinkSync5(sidecar);
+      if (existsSync20(sidecar)) unlinkSync5(sidecar);
     }
   }
-  return { deletedConfig: basename6(targetConfigPath), deletedDbFile };
+  return { deletedConfig: basename7(targetConfigPath), deletedDbFile };
 }
 async function disposeActive(active) {
   if (active.realtime) {
@@ -17703,15 +17894,15 @@ function schemaReverseSummary(verb, entry) {
   return `${verb} schema change (${what}) on ${entry.table_name}`;
 }
 async function startGuiServer(options) {
-  const configPath = resolve6(options.configPath);
-  const outputDir = resolve6(options.outputDir);
+  const configPath = resolve8(options.configPath);
+  const outputDir = resolve8(options.outputDir);
   const startPort = options.port ?? 4317;
   const host = options.host ?? "127.0.0.1";
   const teamCloud = options.teamCloud ?? false;
   const autoRender = options.autoRender ?? false;
   const sessionId = crypto.randomUUID();
   let active = await openConfig(configPath, outputDir, autoRender);
-  const latticeRoot = findLatticeRoot(dirname8(configPath));
+  const latticeRoot = findLatticeRoot(dirname11(configPath));
   if (teamCloud) {
     await registerTeamCloudTables(active.db);
   }
@@ -18929,6 +19120,98 @@ data: ${JSON.stringify(data)}
           sendJson(res, { ok: true, id: created.id });
           return;
         }
+        if (method === "POST" && pathname === "/api/workspaces/delete") {
+          if (teamCloud) {
+            sendJson(res, { error: "Workspace deletion is disabled in team-cloud mode" }, 403);
+            return;
+          }
+          if (!latticeRoot) {
+            sendJson(res, { error: "No .lattice root \u2014 workspaces unavailable" }, 400);
+            return;
+          }
+          const body = await readJson(req);
+          if (typeof body.id !== "string") {
+            sendJson(res, { error: "id must be a string" }, 400);
+            return;
+          }
+          const ws = getWorkspace(latticeRoot, body.id);
+          if (!ws) {
+            sendJson(res, { error: `No workspace with id ${body.id}` }, 400);
+            return;
+          }
+          const wsPaths = resolveWorkspacePaths(latticeRoot, ws);
+          const isActive = resolve8(active.configPath) === resolve8(wsPaths.configPath);
+          if (isActive && active.teamContext && !active.teamContext.isCreator) {
+            sendJson(res, { error: "Only the team owner can delete this cloud workspace" }, 403);
+            return;
+          }
+          let switchedTo = null;
+          if (isActive) {
+            const fallback = listWorkspaces(latticeRoot).find((w) => w.id !== ws.id);
+            if (!fallback) {
+              sendJson(
+                res,
+                {
+                  error: "Cannot delete the only workspace. Create or add another workspace first, then delete this one."
+                },
+                400
+              );
+              return;
+            }
+            const fbPaths = resolveWorkspacePaths(latticeRoot, fallback);
+            let next;
+            try {
+              next = await openConfig(fbPaths.configPath, fbPaths.contextDir, autoRender);
+            } catch (e) {
+              const err = e;
+              const codePrefix = err.code ? `[${err.code}] ` : "";
+              sendJson(
+                res,
+                {
+                  error: `Cannot delete: failed to switch to ${fallback.displayName} first: ${codePrefix}${err.message}`
+                },
+                500
+              );
+              return;
+            }
+            setActiveWorkspace(latticeRoot, fallback.id);
+            await disposeActive(active);
+            active = next;
+            switchedTo = fallback.id;
+          }
+          removeWorkspace(latticeRoot, ws.id);
+          try {
+            if (!ws.configPath && ws.kind === "local") {
+              rmSync2(workspaceDir(latticeRoot, ws.dir), { recursive: true, force: true });
+            } else if (ws.kind === "cloud") {
+              if (ws.configPath && existsSync20(ws.configPath)) {
+                rmSync2(ws.configPath, { force: true });
+              }
+              const labelMatch = /^\$\{LATTICE_DB:([A-Za-z0-9._-]+)\}$/.exec(ws.db.trim());
+              const label = labelMatch?.[1];
+              if (label) {
+                const stillUsed = listWorkspaces(latticeRoot).some(
+                  (w) => w.db.includes("${LATTICE_DB:" + label + "}")
+                );
+                if (!stillUsed) {
+                  try {
+                    deleteDbCredential(label);
+                  } catch {
+                  }
+                }
+              }
+            }
+          } catch (e) {
+            sendJson(
+              res,
+              { error: `Workspace unregistered but file cleanup failed: ${e.message}` },
+              500
+            );
+            return;
+          }
+          sendJson(res, { ok: true, switchedTo });
+          return;
+        }
         if (teamCloud && pathname.startsWith("/api/databases")) {
           sendJson(res, { error: "Database switching is disabled in team-cloud mode" }, 403);
           return;
@@ -18948,7 +19231,7 @@ data: ${JSON.stringify(data)}
           sendJson(res, {
             current: {
               path: active.configPath,
-              dbFile: basename6(parsedActive.dbPath),
+              dbFile: basename7(parsedActive.dbPath),
               label: friendlyLabel,
               kind
             },
@@ -18962,8 +19245,8 @@ data: ${JSON.stringify(data)}
             sendJson(res, { error: "path must be a string" }, 400);
             return;
           }
-          const newPath = resolve6(body.path);
-          if (!existsSync18(newPath)) {
+          const newPath = resolve8(body.path);
+          if (!existsSync20(newPath)) {
             sendJson(res, { error: `Config not found: ${newPath}` }, 400);
             return;
           }
@@ -19013,16 +19296,16 @@ data: ${JSON.stringify(data)}
             sendJson(res, { error: "path must be a non-empty string" }, 400);
             return;
           }
-          const target = resolve6(body.path);
+          const target = resolve8(body.path);
           const known = listConfigs(active.configPath);
-          const match = known.find((c) => resolve6(c.path) === target);
+          const match = known.find((c) => resolve8(c.path) === target);
           if (!match) {
             sendJson(res, { error: `Not a known database config: ${target}` }, 400);
             return;
           }
           let switchedTo = null;
-          if (resolve6(active.configPath) === target) {
-            const fallback = known.find((c) => resolve6(c.path) !== target);
+          if (resolve8(active.configPath) === target) {
+            const fallback = known.find((c) => resolve8(c.path) !== target);
             if (!fallback) {
               sendJson(
                 res,
@@ -19410,20 +19693,8 @@ data: ${JSON.stringify(data)}
   };
 }
 
-// src/gui/discover-output-dir.ts
-import { existsSync as existsSync19 } from "fs";
-import { join as join17, resolve as resolve7 } from "path";
-function discoverOutputDir(explicitOutput, explicit) {
-  if (explicit) return explicitOutput;
-  const candidates = ["./context", ".", "./generated"];
-  for (const dir of candidates) {
-    if (existsSync19(join17(resolve7(dir), ".lattice", "manifest.json"))) return dir;
-  }
-  return explicitOutput;
-}
-
 // src/teams/cli-commands.ts
-import { resolve as resolve8 } from "path";
+import { resolve as resolve9 } from "path";
 var TEAMS_USAGE = [
   "lattice teams <subcommand> [options]",
   "",
@@ -19544,7 +19815,7 @@ function requireArg(args, key, label) {
   return v.trim();
 }
 async function openLocal(configPath) {
-  const db = new Lattice({ config: resolve8(configPath) });
+  const db = new Lattice({ config: resolve9(configPath) });
   await db.init();
   return db;
 }
@@ -19907,34 +20178,6 @@ async function runDlq(args) {
   }
 }
 
-// src/framework/migrate-to-root.ts
-import { cpSync, existsSync as existsSync20, mkdirSync as mkdirSync9 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join18 } from "path";
-var LEGACY_ENTRIES = [
-  "master.key",
-  "identity.json",
-  "preferences.json",
-  "db-credentials.enc",
-  "keys"
-];
-function importLegacyUserConfig(root) {
-  const legacy = process.env.LATTICE_CONFIG_DIR ?? join18(homedir3(), ".lattice");
-  const dest = rootConfigDir(root);
-  const copied = [];
-  if (!existsSync20(join18(legacy, "master.key"))) return { migrated: false, copied };
-  if (existsSync20(join18(dest, "master.key"))) return { migrated: false, copied };
-  mkdirSync9(dest, { recursive: true });
-  for (const entry of LEGACY_ENTRIES) {
-    const src = join18(legacy, entry);
-    if (existsSync20(src)) {
-      cpSync(src, join18(dest, entry), { recursive: true });
-      copied.push(entry);
-    }
-  }
-  return copied.length > 0 ? { migrated: true, from: legacy, copied } : { migrated: false, copied };
-}
-
 // src/cli.ts
 function parseArgs(argv) {
   let command;
@@ -20189,7 +20432,7 @@ function printHelp() {
 function getVersion() {
   try {
     const pkgPath = new URL("../package.json", import.meta.url).pathname;
-    const pkg = JSON.parse(readFileSync14(pkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync15(pkgPath, "utf-8"));
     return pkg.version;
   } catch {
     return "unknown";
@@ -20220,10 +20463,10 @@ async function runUpdate() {
   }
 }
 function runGenerate(args) {
-  const configPath = resolve9(args.config);
+  const configPath = resolve10(args.config);
   let raw;
   try {
-    raw = readFileSync14(configPath, "utf-8");
+    raw = readFileSync15(configPath, "utf-8");
   } catch {
     console.error(`Error: cannot read config file at "${configPath}"`);
     process.exit(1);
@@ -20239,8 +20482,8 @@ function runGenerate(args) {
     console.error('Error: config must have an "entities" key');
     process.exit(1);
   }
-  const configDir2 = dirname9(configPath);
-  const outDir = resolve9(args.out);
+  const configDir2 = dirname12(configPath);
+  const outDir = resolve10(args.out);
   try {
     const result = generateAll({ config, configDir: configDir2, outDir, scaffold: args.scaffold });
     console.log(`Generated ${String(result.filesWritten.length)} file(s):`);
@@ -20253,15 +20496,15 @@ function runGenerate(args) {
   }
 }
 async function runRender(args) {
-  const outputDir = resolve9(args.output);
+  const outputDir = resolve10(args.output);
   let parsed;
   try {
-    parsed = parseConfigFile(resolve9(args.config));
+    parsed = parseConfigFile(resolve10(args.config));
   } catch (e) {
     console.error(`Error: ${e.message}`);
     process.exit(1);
   }
-  const db = new Lattice({ config: resolve9(args.config) });
+  const db = new Lattice({ config: resolve10(args.config) });
   try {
     await db.init();
     const start = Date.now();
@@ -20280,8 +20523,8 @@ async function runRender(args) {
   void parsed;
 }
 async function runReconcile(args, isDryRun) {
-  const outputDir = resolve9(args.output);
-  const db = new Lattice({ config: resolve9(args.config) });
+  const outputDir = resolve10(args.output);
+  const db = new Lattice({ config: resolve10(args.config) });
   try {
     await db.init();
     const start = Date.now();
@@ -20340,8 +20583,8 @@ function formatTimestamp() {
   return `${hh}:${mm}:${ss}`;
 }
 async function runWatch(args) {
-  const outputDir = resolve9(args.output);
-  const db = new Lattice({ config: resolve9(args.config) });
+  const outputDir = resolve10(args.output);
+  const db = new Lattice({ config: resolve10(args.config) });
   try {
     await db.init();
   } catch (e) {
@@ -20382,32 +20625,19 @@ async function runWatch(args) {
 }
 async function runGui(args) {
   try {
-    let configPath = resolve9(args.config);
-    let outputDir;
-    let autoRender = false;
-    const root = findLatticeRoot(args.root ?? process.cwd());
-    const ws = root && args.config === "./lattice.config.yml" ? getActiveWorkspace(root) : null;
-    if (root && ws) {
-      const paths = resolveWorkspacePaths(root, ws);
-      configPath = paths.configPath;
-      outputDir = paths.contextDir;
-      autoRender = true;
-      console.log(`Lattice GUI: opening workspace "${ws.displayName}".`);
-    } else {
-      const resolvedOutput = discoverOutputDir(args.output, args.outputExplicit);
-      if (!args.outputExplicit && resolvedOutput !== args.output) {
-        console.log(
-          `Lattice GUI: auto-detected rendered context at "${resolvedOutput}" (use --output to override).`
-        );
-      }
-      outputDir = resolve9(resolvedOutput);
-    }
+    if (args.root) process.env.LATTICE_ROOT = args.root;
+    const boot = ensureRootForGui({
+      startDir: args.root ?? process.cwd(),
+      configPath: resolve10(args.config),
+      explicitConfig: args.config !== "./lattice.config.yml"
+    });
+    console.log(`Lattice GUI: opening workspace "${boot.displayName}".`);
     const handle = await startGuiServer({
-      configPath,
-      outputDir,
+      configPath: boot.configPath,
+      outputDir: boot.contextDir,
       port: args.port,
       openBrowser: !args.noOpen,
-      autoRender
+      autoRender: true
     });
     console.log(`Lattice GUI listening at ${handle.url}`);
     console.log("Press Ctrl+C to stop.");
@@ -20424,8 +20654,8 @@ async function runGui(args) {
 async function runServe(args) {
   try {
     const handle = await startGuiServer({
-      configPath: resolve9(args.config),
-      outputDir: resolve9(args.output),
+      configPath: resolve10(args.config),
+      outputDir: resolve10(args.output),
       host: args.host,
       port: args.port,
       openBrowser: false,