@venturewild/workspace 0.6.29 → 0.6.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@venturewild/workspace",
-  "version": "0.6.29",
+  "version": "0.6.30",
   "description": "Claude Code Web — Replit/Lovable-style chat-first browser UI that wraps the AI agent already installed on your machine.",
   "license": "MIT",
   "bin": {

package/server/src/index.mjs

@@ -65,6 +65,7 @@ import {
   proxyWsUpgrade,
   reconcilePreviews,
   previewUrlFor,
+  pickPreviewSlug,
   PREVIEW_ENDED_PAGE,
 } from './preview-proxy.mjs';
 import { createPreviewRails } from './preview-rails.mjs';
@@ -1107,6 +1108,10 @@ export async function createServer(overrides = {}) {
   // relay strips any client-forged X-Forwarded-* so the host can't be spoofed
   // from off-box. Populated by the dev-port watcher (Part B).
   const localPreviews = overrides.localPreviews || new LocalPreviewRegistry();
+  // Most-recently-viewed workspace id (set by the auth middleware from
+  // X-Workspace-Id) — the shared-preview watcher tags previews with the workspace
+  // the user is actively collaborating in, so teammates can discover them.
+  let lastActiveWorkspaceId = null;
   app.use('*', async (c, next) => {
     const token = previewTokenFromHeaders((n) => c.req.header(n));
     if (!token) return next();
@@ -1180,7 +1185,13 @@ export async function createServer(overrides = {}) {
     c.set('session', session);
     // Resolve the active workspace for this request (lobby M1). Per-tab via the
     // X-Workspace-Id header; absent/unknown → the boot default.
-    c.set('workspace', resolveWorkspace(c.req.header('x-workspace-id')));
+    const xwid = c.req.header('x-workspace-id');
+    const activeWs = resolveWorkspace(xwid);
+    c.set('workspace', activeWs);
+    // Track the most-recently-viewed workspace so the shared-preview watcher can
+    // tag previews with the workspace the user is actually collaborating in
+    // (not the boot-default launch folder). (tk-5d09bf04-5.)
+    if (xwid && activeWs?.id) lastActiveWorkspaceId = activeWs.id;
     // Block the API for denied (non-localhost, unauthenticated) requests, but
     // let static assets + the public endpoints through so the SPA can still
     // load and prompt for sign-in. (Concern C1.)
@@ -3704,10 +3715,18 @@ export async function createServer(overrides = {}) {
   // shared slug for member discovery (the picker covers the multi-server edge).
   // Skipped under the test runner; tests drive reconcilePreviews directly.
   let previewTimer = null;
-  function defaultSharedSlug() {
+  // Tag previews with the workspace the user is actively collaborating in (active
+  // → sole shared workspace → boot-default), so a teammate's Live view discovers
+  // them. Tagging only with the boot-default (a local launch folder) meant
+  // cross-member discovery never fired. (tk-5d09bf04-5.)
+  function previewSlug() {
     try {
-      const entry = getWorkspace(config.workspaceId, registryEnv);
-      return entry?.kind === 'shared' && entry.shared?.slug ? entry.shared.slug : null;
+      return pickPreviewSlug({
+        activeId: lastActiveWorkspaceId,
+        bootDefaultId: config.workspaceId,
+        resolve: (id) => getWorkspace(id, registryEnv),
+        all: () => listWorkspaces(registryEnv),
+      });
     } catch {
       return null;
     }
@@ -3721,7 +3740,7 @@ export async function createServer(overrides = {}) {
       detect: () => detectPreviewPorts(),
       registry: localPreviews,
       rails: previewRails,
-      slug: defaultSharedSlug(),
+      slug: previewSlug(),
       initiator: config.account?.email || config.account?.slug || null,
       selfPort: config.port,
     });

package/server/src/preview-proxy.mjs

@@ -204,6 +204,32 @@ export function previewUrlFor(shareBaseUrl, token) {
   return `https://${parts.join('.')}`;
 }
 
+// Choose which shared-workspace slug to TAG a published preview with, so
+// collaborators can discover it (the membership-gated `/api/preview/list` filters
+// by this tag). A raw dev port can't be perfectly attributed to a workspace, so:
+//   1. the workspace the user is actively in (last X-Workspace-Id) — strongest;
+//   2. else the SOLE shared workspace, if the install has exactly one — the
+//      unambiguous common case (a small team in one shared workspace);
+//   3. else the boot-default workspace (original behaviour; usually local → null).
+// `resolve(id)` → a registry entry (with `kind`/`shared`) or null; `all()` → all
+// entries. Pure (deps injected) so it's unit-testable without a live registry.
+//
+// WHY this exists: tagging with the boot-default alone (the install's launch
+// folder, almost always a LOCAL workspace) meant cross-member discovery never
+// fired — a teammate's preview never appeared in your picker. (tk-5d09bf04-5.)
+export function pickPreviewSlug({ activeId, bootDefaultId, resolve, all }) {
+  const sharedSlugOf = (id) => {
+    if (!id) return null;
+    const e = resolve(id);
+    return e && e.kind === 'shared' && e.shared && e.shared.slug ? e.shared.slug : null;
+  };
+  const active = sharedSlugOf(activeId);
+  if (active) return active;
+  const shared = (all() || []).filter((w) => w && w.kind === 'shared' && w.shared && w.shared.slug);
+  if (shared.length === 1) return shared[0].shared.slug;
+  return sharedSlugOf(bootDefaultId);
+}
+
 // ---------------------------------------------------------------------------
 // Dev-port reconcile (Part B) — one detection pass, kept pure for unit tests.
 // ---------------------------------------------------------------------------