clay-server 2.10.0 → 2.11.0-beta.10

package/lib/project.js

@@ -6,10 +6,11 @@ var { createSessionManager } = require("./sessions");
 var { createSDKBridge } = require("./sdk-bridge");
 var { createTerminalManager } = require("./terminal-manager");
 var { createNotesManager } = require("./notes");
-var { fetchLatestVersion, isNewer } = require("./updater");
+var { fetchLatestVersion, fetchVersion, isNewer } = require("./updater");
 var { execFileSync, spawn } = require("child_process");
 var { createLoopRegistry } = require("./scheduler");
 var usersModule = require("./users");
+var { resolveOsUserInfo, fsAsUser } = require("./os-users");
 
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // 50 MB
 
@@ -108,8 +109,59 @@ function createProjectContext(opts) {
   var getScheduleCount = opts.getScheduleCount || function () { return 0; };
   var onProcessingChanged = opts.onProcessingChanged || function () {};
   var onPresenceChange = opts.onPresenceChange || function () {};
+  var updateChannel = opts.updateChannel || "stable";
+  var osUsers = opts.osUsers || false;
+  var projectOwnerId = opts.projectOwnerId || null;
   var latestVersion = null;
 
+  // --- OS-level user isolation helper ---
+  // Returns the Linux username for the session owner.
+  // Each session uses its own owner's Claude account and credits.
+  function getLinuxUserForSession(session) {
+    if (!osUsers) return null;
+    if (!session.ownerId) return null;
+    var user = usersModule.findUserById(session.ownerId);
+    if (!user || !user.linuxUser) return null;
+    return user.linuxUser;
+  }
+
+  function getLinuxUserForWs(ws) {
+    if (!osUsers) return null;
+    if (!ws._clayUser || !ws._clayUser.linuxUser) return null;
+    return ws._clayUser.linuxUser;
+  }
+
+  // Cache resolved OS user info to avoid repeated getent calls
+  var osUserInfoCache = {};
+  function getOsUserInfoForWs(ws) {
+    var linuxUser = getLinuxUserForWs(ws);
+    if (!linuxUser) return null;
+    if (osUserInfoCache[linuxUser]) return osUserInfoCache[linuxUser];
+    try {
+      var info = resolveOsUserInfo(linuxUser);
+      osUserInfoCache[linuxUser] = info;
+      return info;
+    } catch (e) {
+      console.error("[project] Failed to resolve OS user info for " + linuxUser + ":", e.message);
+      return null;
+    }
+  }
+
+  function getOsUserInfoForReq(req) {
+    if (!osUsers) return null;
+    if (!req._clayUser || !req._clayUser.linuxUser) return null;
+    var linuxUser = req._clayUser.linuxUser;
+    if (osUserInfoCache[linuxUser]) return osUserInfoCache[linuxUser];
+    try {
+      var info = resolveOsUserInfo(linuxUser);
+      osUserInfoCache[linuxUser] = info;
+      return info;
+    } catch (e) {
+      console.error("[project] Failed to resolve OS user info for " + linuxUser + ":", e.message);
+      return null;
+    }
+  }
+
   // --- Per-project clients ---
   var clients = new Set();
 
@@ -724,7 +776,7 @@ function createProjectContext(opts) {
     sendToSession(session.localId, { type: "status", status: "processing" });
     session.acceptEditsAfterStart = true;
     session.singleTurn = true;
-    sdk.startQuery(session, loopState.promptText);
+    sdk.startQuery(session, loopState.promptText, undefined, getLinuxUserForSession(session));
   }
 
   function runJudge() {
@@ -806,7 +858,7 @@ function createProjectContext(opts) {
     judgeSession.sentToolResults = {};
     judgeSession.acceptEditsAfterStart = true;
     judgeSession.singleTurn = true;
-    sdk.startQuery(judgeSession, judgePrompt);
+    sdk.startQuery(judgeSession, judgePrompt, undefined, getLinuxUserForSession(judgeSession));
   }
 
   function parseJudgeVerdict(session) {
@@ -947,7 +999,7 @@ function createProjectContext(opts) {
   var nm = createNotesManager({ cwd: cwd, send: send, sendTo: sendTo });
 
   // Check for updates in background
-  fetchLatestVersion().then(function (v) {
+  fetchVersion(updateChannel).then(function (v) {
     if (v && isNewer(v, currentVersion)) {
       latestVersion = v;
       send({ type: "update_available", version: v });
@@ -969,7 +1021,7 @@ function createProjectContext(opts) {
     // Send cached state
     var _userId = ws._clayUser ? ws._clayUser.id : null;
     var _filteredProjects = getProjectList(_userId);
-    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects });
+    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId });
     if (latestVersion) {
       sendTo(ws, { type: "update_available", version: latestVersion });
     }
@@ -979,7 +1031,7 @@ function createProjectContext(opts) {
     if (sm.currentModel) {
       sendTo(ws, { type: "model_info", model: sm.currentModel, models: sm.availableModels || [] });
     }
-    sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+    sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "term_list", terminals: tm.list() });
     sendTo(ws, { type: "notes_list", notes: nm.list() });
     sendTo(ws, { type: "loop_registry_updated", records: getHubSchedules() });
@@ -1086,7 +1138,20 @@ function createProjectContext(opts) {
         }
       }
     }
-    if (active) {
+    // Auto-create a session if none exist for this client
+    var autoCreated = false;
+    if (!active) {
+      var autoOpts = {};
+      if (wsUser) autoOpts.ownerId = wsUser.id;
+      active = sm.createSession(autoOpts, ws);
+      autoCreated = true;
+    }
+    if (active && !autoCreated) {
+      // Backfill ownerId for legacy sessions restored without one
+      if (!active.ownerId && wsUser) {
+        active.ownerId = wsUser.id;
+        sm.saveSessionFile(active);
+      }
       ws._clayActiveSession = active.localId;
       sendTo(ws, { type: "session_switched", id: active.localId, cliSessionId: active.cliSessionId || null, loop: active.loop || null });
 
@@ -1137,6 +1202,14 @@ function createProjectContext(opts) {
   }
 
   function handleMessage(ws, msg) {
+    // --- DM messages (delegated to server-level handler) ---
+    if (msg.type === "dm_open" || msg.type === "dm_send" || msg.type === "dm_list" || msg.type === "dm_typing") {
+      if (typeof opts.onDmMessage === "function") {
+        opts.onDmMessage(ws, msg);
+      }
+      return;
+    }
+
     if (msg.type === "push_subscribe") {
       if (pushModule && msg.subscription) pushModule.addSubscription(msg.subscription, msg.replaceEndpoint);
       return;
@@ -1176,20 +1249,55 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "transfer_project_owner") {
+      var isAdmin = ws._clayUser && ws._clayUser.role === "admin";
+      var isProjectOwner = ws._clayUser && projectOwnerId && ws._clayUser.id === projectOwnerId;
+      if (!ws._clayUser || (!isAdmin && !isProjectOwner)) {
+        sendTo(ws, { type: "error", text: "Only project owners or admins can transfer ownership." });
+        return;
+      }
+      var targetUser = msg.userId ? usersModule.findUserById(msg.userId) : null;
+      if (!targetUser) {
+        sendTo(ws, { type: "error", text: "User not found." });
+        return;
+      }
+      projectOwnerId = targetUser.id;
+      // Persist via daemon callback
+      if (opts.onProjectOwnerChanged) {
+        opts.onProjectOwnerChanged(slug, projectOwnerId);
+      }
+      send({ type: "project_owner_changed", ownerId: projectOwnerId, ownerName: targetUser.displayName || targetUser.username });
+      return;
+    }
+
     if (msg.type === "resume_session") {
       if (!msg.cliSessionId) return;
       var cliSess = require("./cli-sessions");
-      cliSess.readCliSessionHistory(cwd, msg.cliSessionId).then(function (history) {
-        var title = "Resumed session";
-        for (var i = 0; i < history.length; i++) {
-          if (history[i].type === "user_message" && history[i].text) {
-            title = history[i].text.substring(0, 50);
-            break;
+      // Try SDK for title first, then fall back to manual parsing
+      var titlePromise = getSDK().then(function(sdkMod) {
+        return sdkMod.getSessionInfo(msg.cliSessionId, { dir: cwd });
+      }).then(function(info) {
+        return (info && info.summary) ? info.summary.substring(0, 100) : null;
+      }).catch(function() { return null; });
+
+      Promise.all([
+        cliSess.readCliSessionHistory(cwd, msg.cliSessionId),
+        titlePromise
+      ]).then(function(results) {
+        var history = results[0];
+        var sdkTitle = results[1];
+        var title = sdkTitle || "Resumed session";
+        if (!sdkTitle) {
+          for (var i = 0; i < history.length; i++) {
+            if (history[i].type === "user_message" && history[i].text) {
+              title = history[i].text.substring(0, 50);
+              break;
+            }
           }
         }
         var resumed = sm.resumeSession(msg.cliSessionId, { history: history, title: title }, ws);
         if (resumed) ws._clayActiveSession = resumed.localId;
-      }).catch(function () {
+      }).catch(function() {
         var resumed = sm.resumeSession(msg.cliSessionId, undefined, ws);
         if (resumed) ws._clayActiveSession = resumed.localId;
       });
@@ -1197,9 +1305,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "list_cli_sessions") {
-      var cliSessions = require("./cli-sessions");
       var _fs = require("fs");
-      var _path = require("path");
       // Collect session IDs already in relay (in-memory + persisted on disk)
       var relayIds = {};
       sm.sessions.forEach(function (s) {
@@ -1214,13 +1320,34 @@ function createProjectContext(opts) {
           }
         }
       } catch (e) {}
-      cliSessions.listCliSessions(cwd).then(function (sessions) {
-        var filtered = sessions.filter(function (s) {
+
+      getSDK().then(function(sdkMod) {
+        return sdkMod.listSessions({ dir: cwd });
+      }).then(function(sdkSessions) {
+        var filtered = sdkSessions.filter(function(s) {
           return !relayIds[s.sessionId];
+        }).map(function(s) {
+          return {
+            sessionId: s.sessionId,
+            firstPrompt: s.summary || s.firstPrompt || "",
+            model: null,
+            gitBranch: s.gitBranch || null,
+            startTime: s.createdAt ? new Date(s.createdAt).toISOString() : null,
+            lastActivity: s.lastModified ? new Date(s.lastModified).toISOString() : null,
+          };
         });
         sendTo(ws, { type: "cli_session_list", sessions: filtered });
-      }).catch(function () {
-        sendTo(ws, { type: "cli_session_list", sessions: [] });
+      }).catch(function() {
+        // Fallback to manual parsing if SDK fails
+        var cliSessions = require("./cli-sessions");
+        cliSessions.listCliSessions(cwd).then(function(sessions) {
+          var filtered = sessions.filter(function(s) {
+            return !relayIds[s.sessionId];
+          });
+          sendTo(ws, { type: "cli_session_list", sessions: filtered });
+        }).catch(function() {
+          sendTo(ws, { type: "cli_session_list", sessions: [] });
+        });
       });
       return;
     }
@@ -1256,6 +1383,14 @@ function createProjectContext(opts) {
         s.title = String(msg.title).substring(0, 100);
         sm.saveSessionFile(s);
         sm.broadcastSessionList();
+        // Sync title to SDK session
+        if (s.cliSessionId) {
+          getSDK().then(function(sdk) {
+            sdk.renameSession(s.cliSessionId, s.title, { dir: cwd }).catch(function(e) {
+              console.error("[project] SDK renameSession failed:", e.message);
+            });
+          }).catch(function() {});
+        }
       }
       return;
     }
@@ -1266,9 +1401,19 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "set_update_channel") {
+      if (usersModule.isMultiUser() && (!ws._clayUser || ws._clayUser.role !== "admin")) return;
+      var newChannel = msg.channel === "beta" ? "beta" : "stable";
+      updateChannel = newChannel;
+      if (typeof opts.onSetUpdateChannel === "function") {
+        opts.onSetUpdateChannel(newChannel);
+      }
+      return;
+    }
+
     if (msg.type === "check_update") {
       if (usersModule.isMultiUser() && (!ws._clayUser || ws._clayUser.role !== "admin")) return;
-      fetchLatestVersion().then(function (v) {
+      fetchVersion(updateChannel).then(function (v) {
         if (v && isNewer(v, currentVersion)) {
           latestVersion = v;
           sendTo(ws, { type: "update_available", version: v });
@@ -1380,7 +1525,7 @@ function createProjectContext(opts) {
     if (msg.type === "set_permission_mode" && msg.mode) {
       // When dangerouslySkipPermissions is active, don't allow UI to change mode
       if (dangerouslySkipPermissions) {
-        send({ type: "config_state", model: sm.currentModel || "", mode: "bypassPermissions", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+        send({ type: "config_state", model: sm.currentModel || "", mode: "bypassPermissions", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
         return;
       }
       sm.currentPermissionMode = msg.mode;
@@ -1388,7 +1533,7 @@ function createProjectContext(opts) {
       if (session) {
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return;
     }
 
@@ -1402,7 +1547,7 @@ function createProjectContext(opts) {
         if (session) {
           sdk.setPermissionMode(session, msg.mode);
         }
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
       return;
     }
@@ -1417,14 +1562,18 @@ function createProjectContext(opts) {
         if (session) {
           sdk.setPermissionMode(session, msg.mode);
         }
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
       return;
     }
 
     if (msg.type === "set_effort" && msg.effort) {
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [] });
+      var session = getSessionForWs(ws);
+      if (session) {
+        sdk.setEffort(session, msg.effort);
+      }
+      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return;
     }
 
@@ -1433,7 +1582,7 @@ function createProjectContext(opts) {
         opts.onSetServerDefaultEffort(msg.effort);
       }
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [] });
+      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return;
     }
 
@@ -1442,13 +1591,20 @@ function createProjectContext(opts) {
         opts.onSetProjectDefaultEffort(slug, msg.effort);
       }
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [] });
+      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return;
     }
 
     if (msg.type === "set_betas") {
       sm.currentBetas = msg.betas || [];
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas });
+      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      return;
+    }
+
+    if (msg.type === "set_thinking") {
+      sm.currentThinking = msg.thinking || "adaptive";
+      if (msg.budgetTokens) sm.currentThinkingBudget = msg.budgetTokens;
+      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return;
     }
 
@@ -1549,6 +1705,34 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "fork_session" && msg.uuid) {
+      var session = getSessionForWs(ws);
+      if (!session || !session.cliSessionId) {
+        sendTo(ws, { type: "error", text: "Cannot fork: no CLI session" });
+        return;
+      }
+      var forkCliId = session.cliSessionId;
+      var forkTitle = (session.title || "New Session") + " (fork)";
+      getSDK().then(function(sdkMod) {
+        return sdkMod.forkSession(forkCliId, {
+          upToMessageId: msg.uuid,
+          dir: cwd,
+        });
+      }).then(function(result) {
+        var cliSess = require("./cli-sessions");
+        return cliSess.readCliSessionHistory(cwd, result.sessionId).then(function(history) {
+          var forked = sm.resumeSession(result.sessionId, { history: history, title: forkTitle }, ws);
+          if (forked) {
+            ws._clayActiveSession = forked.localId;
+            sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+          }
+        });
+      }).catch(function(e) {
+        sendTo(ws, { type: "error", text: "Fork failed: " + (e.message || e) });
+      });
+      return;
+    }
+
     if (msg.type === "ask_user_response") {
       var session = getSessionForWs(ws);
       if (!session) return;
@@ -1583,7 +1767,7 @@ function createProjectContext(opts) {
       if (decision === "allow_accept_edits") {
         sdk.setPermissionMode(session, "acceptEdits");
         sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
         pending.resolve({ behavior: "allow", updatedInput: pending.toolInput });
         sm.sendAndRecord(session, { type: "permission_resolved", requestId: requestId, decision: decision });
         return;
@@ -1612,7 +1796,7 @@ function createProjectContext(opts) {
 
         // Update permission mode for the new session
         sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
 
         // Build prompt from plan content (sent from client) or plan file path
         var clientPlanContent = msg.planContent || "";
@@ -1646,7 +1830,7 @@ function createProjectContext(opts) {
             newSession.sentToolResults = {};
             sendToSession(newSession.localId, { type: "status", status: "processing" });
             newSession.acceptEditsAfterStart = true;
-            sdk.startQuery(newSession, planPrompt);
+            sdk.startQuery(newSession, planPrompt, undefined, getLinuxUserForSession(newSession));
           } catch (e) {
             console.error("[project] Error starting plan execution:", e);
             sendTo(ws, { type: "error", text: "Failed to start plan execution: " + (e.message || e) });
@@ -1674,8 +1858,8 @@ function createProjectContext(opts) {
               onProcessingChanged();
               session.sentToolResults = {};
               sendToSession(session.localId, { type: "status", status: "processing" });
-              if (!session.queryInstance) {
-                sdk.startQuery(session, feedback);
+              if (!session.queryInstance && !session.worker) {
+                sdk.startQuery(session, feedback, undefined, getLinuxUserForSession(session));
               } else {
                 sdk.pushMessage(session, feedback);
               }
@@ -1705,6 +1889,26 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- MCP elicitation response ---
+    if (msg.type === "elicitation_response") {
+      var session = getSessionForWs(ws);
+      if (!session) return;
+      var pending = session.pendingElicitations && session.pendingElicitations[msg.requestId];
+      if (!pending) return;
+      delete session.pendingElicitations[msg.requestId];
+      if (msg.action === "accept") {
+        pending.resolve({ action: "accept", content: msg.content || {} });
+      } else {
+        pending.resolve({ action: "reject" });
+      }
+      sm.sendAndRecord(session, {
+        type: "elicitation_resolved",
+        requestId: msg.requestId,
+        action: msg.action,
+      });
+      return;
+    }
+
     // --- Browse directories (for add-project autocomplete) ---
     if (msg.type === "browse_dir") {
       var rawPath = (msg.path || "").replace(/^~/, process.env.HOME || "/");
@@ -1767,6 +1971,40 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- Create new empty project ---
+    if (msg.type === "create_project") {
+      var createName = (msg.name || "").trim();
+      if (!createName || !/^[a-zA-Z0-9_-]+$/.test(createName)) {
+        sendTo(ws, { type: "add_project_result", ok: false, error: "Invalid name. Use only letters, numbers, dashes, and underscores." });
+        return;
+      }
+      if (typeof opts.onCreateProject === "function") {
+        var createResult = opts.onCreateProject(createName, ws._clayUser);
+        sendTo(ws, { type: "add_project_result", ok: createResult.ok, slug: createResult.slug, error: createResult.error });
+      } else {
+        sendTo(ws, { type: "add_project_result", ok: false, error: "Not supported" });
+      }
+      return;
+    }
+
+    // --- Clone project from GitHub ---
+    if (msg.type === "clone_project") {
+      var cloneUrl = (msg.url || "").trim();
+      if (!cloneUrl || (!/^https?:\/\//.test(cloneUrl) && !/^git@/.test(cloneUrl))) {
+        sendTo(ws, { type: "add_project_result", ok: false, error: "Invalid URL. Use https:// or git@ format." });
+        return;
+      }
+      sendTo(ws, { type: "clone_project_progress", status: "cloning" });
+      if (typeof opts.onCloneProject === "function") {
+        opts.onCloneProject(cloneUrl, ws._clayUser, function (cloneResult) {
+          sendTo(ws, { type: "add_project_result", ok: cloneResult.ok, slug: cloneResult.slug, error: cloneResult.error });
+        });
+      } else {
+        sendTo(ws, { type: "add_project_result", ok: false, error: "Not supported" });
+      }
+      return;
+    }
+
     // --- Pre-check: does the project have tasks/schedules? ---
     if (msg.type === "remove_project_check") {
       var checkSlug = msg.slug;
@@ -1929,16 +2167,31 @@ function createProjectContext(opts) {
         return;
       }
       try {
-        var items = fs.readdirSync(fsDir, { withFileTypes: true });
+        var fsListUserInfo = getOsUserInfoForWs(ws);
         var entries = [];
-        for (var fi = 0; fi < items.length; fi++) {
-          var item = items[fi];
-          if (item.isDirectory() && IGNORED_DIRS.has(item.name)) continue;
-          entries.push({
-            name: item.name,
-            type: item.isDirectory() ? "dir" : "file",
-            path: path.relative(cwd, path.join(fsDir, item.name)).split(path.sep).join("/"),
-          });
+        if (fsListUserInfo) {
+          // Run as target OS user to respect Linux file permissions
+          var rawEntries = fsAsUser("list", { dir: fsDir }, fsListUserInfo);
+          for (var fi = 0; fi < rawEntries.length; fi++) {
+            var re = rawEntries[fi];
+            if (re.isDir && IGNORED_DIRS.has(re.name)) continue;
+            entries.push({
+              name: re.name,
+              type: re.isDir ? "dir" : "file",
+              path: path.relative(cwd, path.join(fsDir, re.name)).split(path.sep).join("/"),
+            });
+          }
+        } else {
+          var items = fs.readdirSync(fsDir, { withFileTypes: true });
+          for (var fi = 0; fi < items.length; fi++) {
+            var item = items[fi];
+            if (item.isDirectory() && IGNORED_DIRS.has(item.name)) continue;
+            entries.push({
+              name: item.name,
+              type: item.isDirectory() ? "dir" : "file",
+              path: path.relative(cwd, path.join(fsDir, item.name)).split(path.sep).join("/"),
+            });
+          }
         }
         sendTo(ws, { type: "fs_list_result", path: msg.path || ".", entries: entries });
         // Auto-watch the directory for changes
@@ -1956,20 +2209,38 @@ function createProjectContext(opts) {
         return;
       }
       try {
-        var stat = fs.statSync(fsFile);
+        var fsReadUserInfo = getOsUserInfoForWs(ws);
         var ext = path.extname(fsFile).toLowerCase();
-        if (stat.size > FS_MAX_SIZE) {
-          sendTo(ws, { type: "fs_read_result", path: msg.path, binary: true, size: stat.size, error: "File too large (" + (stat.size / 1024 / 1024).toFixed(1) + " MB)" });
-          return;
-        }
-        if (BINARY_EXTS.has(ext)) {
-          var result = { type: "fs_read_result", path: msg.path, binary: true, size: stat.size };
-          if (IMAGE_EXTS.has(ext)) result.imageUrl = "api/file?path=" + encodeURIComponent(msg.path);
-          sendTo(ws, result);
-          return;
+        if (fsReadUserInfo) {
+          // Run stat and read as target OS user
+          var statResult = fsAsUser("stat", { file: fsFile }, fsReadUserInfo);
+          if (statResult.size > FS_MAX_SIZE) {
+            sendTo(ws, { type: "fs_read_result", path: msg.path, binary: true, size: statResult.size, error: "File too large (" + (statResult.size / 1024 / 1024).toFixed(1) + " MB)" });
+            return;
+          }
+          if (BINARY_EXTS.has(ext)) {
+            var result = { type: "fs_read_result", path: msg.path, binary: true, size: statResult.size };
+            if (IMAGE_EXTS.has(ext)) result.imageUrl = "api/file?path=" + encodeURIComponent(msg.path);
+            sendTo(ws, result);
+            return;
+          }
+          var readResult = fsAsUser("read", { file: fsFile, readContent: true }, fsReadUserInfo);
+          sendTo(ws, { type: "fs_read_result", path: msg.path, content: readResult.content, size: statResult.size });
+        } else {
+          var stat = fs.statSync(fsFile);
+          if (stat.size > FS_MAX_SIZE) {
+            sendTo(ws, { type: "fs_read_result", path: msg.path, binary: true, size: stat.size, error: "File too large (" + (stat.size / 1024 / 1024).toFixed(1) + " MB)" });
+            return;
+          }
+          if (BINARY_EXTS.has(ext)) {
+            var result = { type: "fs_read_result", path: msg.path, binary: true, size: stat.size };
+            if (IMAGE_EXTS.has(ext)) result.imageUrl = "api/file?path=" + encodeURIComponent(msg.path);
+            sendTo(ws, result);
+            return;
+          }
+          var content = fs.readFileSync(fsFile, "utf8");
+          sendTo(ws, { type: "fs_read_result", path: msg.path, content: content, size: stat.size });
         }
-        var content = fs.readFileSync(fsFile, "utf8");
-        sendTo(ws, { type: "fs_read_result", path: msg.path, content: content, size: stat.size });
       } catch (e) {
         sendTo(ws, { type: "fs_read_result", path: msg.path, error: e.message });
       }
@@ -1984,7 +2255,12 @@ function createProjectContext(opts) {
         return;
       }
       try {
-        fs.writeFileSync(fsWriteFile, msg.content || "", "utf8");
+        var fsWriteUserInfo = getOsUserInfoForWs(ws);
+        if (fsWriteUserInfo) {
+          fsAsUser("write", { file: fsWriteFile, content: msg.content || "" }, fsWriteUserInfo);
+        } else {
+          fs.writeFileSync(fsWriteFile, msg.content || "", "utf8");
+        }
         sendTo(ws, { type: "fs_write_result", path: msg.path, ok: true });
       } catch (e) {
         sendTo(ws, { type: "fs_write_result", path: msg.path, ok: false, error: e.message });
@@ -2309,7 +2585,7 @@ function createProjectContext(opts) {
 
     // --- Web terminal ---
     if (msg.type === "term_create") {
-      var t = tm.create(msg.cols || 80, msg.rows || 24);
+      var t = tm.create(msg.cols || 80, msg.rows || 24, getOsUserInfoForWs(ws));
       if (!t) {
         sendTo(ws, { type: "term_error", error: "Cannot create terminal (node-pty not available or limit reached)" });
         return;
@@ -2447,7 +2723,7 @@ function createProjectContext(opts) {
       onProcessingChanged();
       craftingSession.sentToolResults = {};
       sendToSession(craftingSession.localId, { type: "status", status: "processing" });
-      sdk.startQuery(craftingSession, craftingPrompt);
+      sdk.startQuery(craftingSession, craftingPrompt, undefined, getLinuxUserForSession(craftingSession));
 
       send({ type: "ralph_crafting_started", sessionId: craftingSession.localId, taskId: newLoopId, source: recordSource });
       send({ type: "ralph_phase", phase: "crafting", wizardData: loopState.wizardData, craftingSessionId: craftingSession.localId });
@@ -2639,6 +2915,12 @@ function createProjectContext(opts) {
     var session = getSessionForWs(ws);
     if (!session) return;
 
+    // Backfill ownerId for legacy sessions restored without one
+    if (!session.ownerId && ws._clayUser) {
+      session.ownerId = ws._clayUser.id;
+      sm.saveSessionFile(session);
+    }
+
     var userMsg = { type: "user_message", text: msg.text || "" };
     if (msg.images && msg.images.length > 0) {
       userMsg.imageCount = msg.images.length;
@@ -2654,6 +2936,14 @@ function createProjectContext(opts) {
       session.title = (msg.text || "Image").substring(0, 50);
       sm.saveSessionFile(session);
       sm.broadcastSessionList();
+      // Sync auto-title to SDK
+      if (session.cliSessionId) {
+        getSDK().then(function(sdk) {
+          sdk.renameSession(session.cliSessionId, session.title, { dir: cwd }).catch(function(e) {
+            console.error("[project] SDK renameSession failed:", e.message);
+          });
+        }).catch(function() {});
+      }
     }
 
     var fullText = msg.text || "";
@@ -2669,8 +2959,8 @@ function createProjectContext(opts) {
       onProcessingChanged();
       session.sentToolResults = {};
       sendToSession(session.localId, { type: "status", status: "processing" });
-      if (!session.queryInstance) {
-        sdk.startQuery(session, fullText, msg.images);
+      if (!session.queryInstance && !session.worker) {
+        sdk.startQuery(session, fullText, msg.images, getLinuxUserForSession(session));
       } else {
         sdk.pushMessage(session, fullText, msg.images);
       }
@@ -2847,7 +3137,14 @@ function createProjectContext(opts) {
       var fileExt = path.extname(absFile).toLowerCase();
       if (!IMAGE_EXTS.has(fileExt)) { res.writeHead(403); res.end("Only image files"); return true; }
       try {
-        var fileContent = fs.readFileSync(absFile);
+        var fileServeUserInfo = getOsUserInfoForReq(req);
+        var fileContent;
+        if (fileServeUserInfo) {
+          var binResult = fsAsUser("read_binary", { file: absFile }, fileServeUserInfo);
+          fileContent = binResult.buffer;
+        } else {
+          fileContent = fs.readFileSync(absFile);
+        }
         var fileMime = MIME_TYPES[fileExt] || "application/octet-stream";
         res.writeHead(200, { "Content-Type": fileMime, "Cache-Control": "no-cache" });
         res.end(fileContent);
@@ -2880,13 +3177,19 @@ function createProjectContext(opts) {
           res.end('{"error":"only https:// URLs are allowed"}');
           return;
         }
-        var spawnCwd = scope === "global" ? os.homedir() : cwd;
+        var skillUserInfo = getOsUserInfoForReq(req);
+        var spawnCwd = scope === "global" ? (skillUserInfo ? skillUserInfo.home : os.homedir()) : cwd;
         var scopeFlag = scope === "global" ? "--global" : "--project";
-        var child = spawn("npx", ["skills", "add", url, "--skill", skill, "--yes", scopeFlag], {
+        var skillSpawnOpts = {
           cwd: spawnCwd,
           stdio: "ignore",
           detached: false,
-        });
+        };
+        if (skillUserInfo) {
+          skillSpawnOpts.uid = skillUserInfo.uid;
+          skillSpawnOpts.gid = skillUserInfo.gid;
+        }
+        var child = spawn("npx", ["skills", "add", url, "--skill", skill, "--yes", scopeFlag], skillSpawnOpts);
         child.on("close", function (code) {
           var success = code === 0;
           send({
@@ -2931,7 +3234,8 @@ function createProjectContext(opts) {
           res.end('{"error":"invalid skill name"}');
           return;
         }
-        var baseDir = scope === "global" ? os.homedir() : cwd;
+        var uninstallUserInfo = getOsUserInfoForReq(req);
+        var baseDir = scope === "global" ? (uninstallUserInfo ? uninstallUserInfo.home : os.homedir()) : cwd;
         var skillDir = path.join(baseDir, ".claude", "skills", skill);
         // Safety: ensure skillDir is inside the expected .claude/skills directory
         var expectedParent = path.join(baseDir, ".claude", "skills");
@@ -2942,7 +3246,17 @@ function createProjectContext(opts) {
           return;
         }
         try {
-          fs.rmSync(resolved, { recursive: true, force: true });
+          if (uninstallUserInfo) {
+            // Run rm as target user to respect permissions
+            var rmScript = "var fs = require('fs'); fs.rmSync(" + JSON.stringify(resolved) + ", { recursive: true, force: true });";
+            execFileSync(process.execPath, ["-e", rmScript], {
+              uid: uninstallUserInfo.uid,
+              gid: uninstallUserInfo.gid,
+              timeout: 10000,
+            });
+          } else {
+            fs.rmSync(resolved, { recursive: true, force: true });
+          }
           send({
             type: "skill_uninstalled",
             skill: skill,
@@ -3085,6 +3399,7 @@ function createProjectContext(opts) {
       clients: clients.size,
       sessions: sessionCount,
       isProcessing: hasProcessing,
+      projectOwnerId: projectOwnerId,
     };
     if (usersModule.isMultiUser()) {
       var seen = {};
@@ -3110,7 +3425,7 @@ function createProjectContext(opts) {
 
   function setTitle(newTitle) {
     title = newTitle || null;
-    send({ type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, lanHost: lanHost, projectCount: getProjectCount(), projects: getProjectList() });
+    send({ type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, osUsers: osUsers, lanHost: lanHost, projectCount: getProjectCount(), projects: getProjectList(), projectOwnerId: projectOwnerId });
   }
 
   function setIcon(newIcon) {
@@ -3141,6 +3456,8 @@ function createProjectContext(opts) {
     removeSchedule: function (id) { return loopRegistry.remove(id); },
     setTitle: setTitle,
     setIcon: setIcon,
+    setProjectOwner: function (ownerId) { projectOwnerId = ownerId; },
+    getProjectOwner: function () { return projectOwnerId; },
     refreshUserProfile: function (userId) {
       var user = usersModule.findUserById(userId);
       if (!user) return;
@@ -3154,6 +3471,8 @@ function createProjectContext(opts) {
     },
     warmup: function () {
       sdk.warmup();
+      // Migrate existing relay session titles to SDK format (one-time, async)
+      sm.migrateSessionTitles(getSDK, cwd);
     },
     destroy: destroy,
   };