clay-server 4.0.0-beta.22 → 4.0.0-beta.23

package/lib/public/modules/home-surface-boot.js

@@ -1,4 +1,4 @@
-// One-shot boot routing after durable Home preferences become available.
+// One-shot routing for a server-selected project or the no-project Home fallback.
 import { store } from './store.js';
 import { rememberHomePrimarySurface } from './home-surface.js';
 
@@ -10,9 +10,13 @@ function explicitProjectPath(pathname) {
 }
 
 export function resolveHomeBootDestination(options) {
-  if (!options || options.surfaceLoaded !== true) return "wait";
+  if (!options) return "wait";
   if (options.paneMode || explicitProjectPath(options.pathname)) return "project";
-  if (options.surface === "project" && options.currentSlug) return "project";
+  // The server-selected project embedded in the root shell is authoritative.
+  // Home is entered only through an explicit in-app action; reloading `/`
+  // returns to the project workspace even if Home was the last open surface.
+  if (options.currentSlug) return "project";
+  if (options.surfaceLoaded !== true) return "wait";
   if (options.dockLoaded !== true) return "wait";
   return "home";
 }

package/lib/server.js

@@ -124,6 +124,14 @@ function stripPrefix(urlPath, slug) {
   return rest || "/";
 }
 
+function injectRootProjectSlug(html, slug) {
+  var bodyPattern = /<body\b([^>]*)>/i;
+  if (!bodyPattern.test(html)) throw new Error("App shell body is missing");
+  return html.replace(bodyPattern, function (_match, attributes) {
+    return '<body' + attributes + ' data-home-project-slug="' + slug + '">';
+  });
+}
+
 /**
  * Create a multi-project server.
  * opts: { tlsOptions, caPath, pinHash, port, debug, dangerouslySkipPermissions }
@@ -741,7 +749,8 @@ function createServer(opts) {
     // --- Skills routes (delegated to server-skills) ---
     if (skills.handleRequest(req, res, fullUrl)) return;
 
-    // Root path — render home while keeping the last accessible project connected.
+    // Root path — render the default project workspace while keeping Home
+    // available as an explicit client-side surface.
     if (fullUrl === "/" && req.method === "GET") {
       if (!isRequestAuthed(req)) {
         res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -751,11 +760,16 @@ function createServer(opts) {
       if (projects.size > 0) {
         var targetSlug = null;
         var reqUser = users.isMultiUser() ? getMultiUserFromReq(req) : null;
+        function isOrdinaryProject(slug) {
+          var candidate = slug ? projects.get(slug) : null;
+          var status = candidate && candidate.getStatus ? candidate.getStatus() : null;
+          return !!candidate && (!status || status.isMate !== true);
+        }
         var homePreference = typeof users.getHomeSurfacePreference === "function"
           ? users.getHomeSurfacePreference(reqUser ? reqUser.id : "default")
           : null;
         var preferredContextSlug = homePreference && homePreference.projectSlug;
-        if (preferredContextSlug && projects.has(preferredContextSlug)) {
+        if (isOrdinaryProject(preferredContextSlug)) {
           if (reqUser && onGetProjectAccess) {
             var preferredAccess = onGetProjectAccess(preferredContextSlug);
             if (preferredAccess && !preferredAccess.error && users.canAccessProject(reqUser.id, preferredAccess)) {
@@ -767,7 +781,7 @@ function createServer(opts) {
         }
         // Check for last-visited project cookie
         var lastProject = parseCookies(req)["clay_last_project"];
-        if (!targetSlug && lastProject && projects.has(lastProject)) {
+        if (!targetSlug && isOrdinaryProject(lastProject)) {
           if (reqUser && onGetProjectAccess) {
             var lpAccess = onGetProjectAccess(lastProject);
             if (lpAccess && !lpAccess.error && users.canAccessProject(reqUser.id, lpAccess)) {
@@ -781,6 +795,7 @@ function createServer(opts) {
         if (!targetSlug) {
           projects.forEach(function (ctx, s) {
             if (targetSlug) return;
+            if (!isOrdinaryProject(s)) return;
             if (reqUser && onGetProjectAccess) {
               var access = onGetProjectAccess(s);
               if (access && !access.error && users.canAccessProject(reqUser.id, access)) {
@@ -794,7 +809,7 @@ function createServer(opts) {
         if (targetSlug) {
           try {
             var homeHtml = fs.readFileSync(path.join(publicDir, "index.html"), "utf8");
-            homeHtml = homeHtml.replace("<body>", '<body data-home-project-slug="' + targetSlug + '">');
+            homeHtml = injectRootProjectSlug(homeHtml, targetSlug);
             res.writeHead(200, { "Content-Type": "text/html; charset=utf-8", "Cache-Control": "no-cache" });
             res.end(homeHtml);
           } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "4.0.0-beta.22",
+  "version": "4.0.0-beta.23",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",