clay-server 2.10.0 → 2.11.0-beta.2

package/lib/dm.js

@@ -0,0 +1,135 @@
+var fs = require("fs");
+var path = require("path");
+var config = require("./config");
+
+var DM_DIR = path.join(config.CONFIG_DIR, "dm");
+
+// Ensure dm directory exists
+function ensureDmDir() {
+  fs.mkdirSync(DM_DIR, { recursive: true });
+  config.chmodSafe(DM_DIR, 0o700);
+}
+
+// Generate deterministic DM key from two user IDs (sorted, order-independent)
+function dmKey(userId1, userId2) {
+  return [userId1, userId2].sort().join(":");
+}
+
+// File path for a DM conversation
+function dmFilePath(key) {
+  // Replace : with _ for safe filename
+  return path.join(DM_DIR, key.replace(/:/g, "_") + ".jsonl");
+}
+
+// Load DM history from JSONL file
+function loadHistory(key) {
+  var filePath = dmFilePath(key);
+  if (!fs.existsSync(filePath)) return [];
+  try {
+    var content = fs.readFileSync(filePath, "utf8").trim();
+    if (!content) return [];
+    var lines = content.split("\n");
+    var messages = [];
+    for (var i = 0; i < lines.length; i++) {
+      if (!lines[i].trim()) continue;
+      try {
+        messages.push(JSON.parse(lines[i]));
+      } catch (e) {
+        // skip malformed lines
+      }
+    }
+    return messages;
+  } catch (e) {
+    return [];
+  }
+}
+
+// Append a message to DM JSONL file
+function appendMessage(key, message) {
+  ensureDmDir();
+  var filePath = dmFilePath(key);
+  var line = JSON.stringify(message) + "\n";
+  fs.appendFileSync(filePath, line);
+}
+
+// Open a DM conversation (find or create)
+function openDm(userId1, userId2) {
+  var key = dmKey(userId1, userId2);
+  var history = loadHistory(key);
+  return { dmKey: key, messages: history };
+}
+
+// Send a DM message
+function sendMessage(key, fromUserId, text) {
+  var message = {
+    type: "dm_message",
+    ts: Date.now(),
+    from: fromUserId,
+    text: text,
+  };
+  appendMessage(key, message);
+  return message;
+}
+
+// Get list of all DM conversations for a user
+// Returns: [{ dmKey, otherUserId, lastMessage, lastTs }]
+function getDmList(userId) {
+  ensureDmDir();
+  var files;
+  try {
+    files = fs.readdirSync(DM_DIR).filter(function (f) {
+      return f.endsWith(".jsonl");
+    });
+  } catch (e) {
+    return [];
+  }
+
+  var dms = [];
+  for (var i = 0; i < files.length; i++) {
+    // Reconstruct dmKey from filename (replace _ back to :)
+    var key = files[i].replace(".jsonl", "").replace(/_/g, ":");
+    var parts = key.split(":");
+    if (parts.length !== 2) continue;
+
+    // Check if this user is a participant
+    var idx = parts.indexOf(userId);
+    if (idx === -1) continue;
+
+    var otherUserId = parts[idx === 0 ? 1 : 0];
+
+    // Get last message
+    var messages = loadHistory(key);
+    var lastMessage = messages.length > 0 ? messages[messages.length - 1] : null;
+
+    dms.push({
+      dmKey: key,
+      otherUserId: otherUserId,
+      lastMessage: lastMessage ? lastMessage.text : null,
+      lastTs: lastMessage ? lastMessage.ts : 0,
+      messageCount: messages.length,
+    });
+  }
+
+  // Sort by most recent activity
+  dms.sort(function (a, b) {
+    return b.lastTs - a.lastTs;
+  });
+
+  return dms;
+}
+
+// Extension point: check if a user is a mate (AI persona)
+// Returns false for now - will be implemented when Mates feature is added
+function isMate(userId) {
+  return false;
+}
+
+module.exports = {
+  dmKey: dmKey,
+  openDm: openDm,
+  sendMessage: sendMessage,
+  getDmList: getDmList,
+  loadHistory: loadHistory,
+  isMate: isMate,
+  DM_DIR: DM_DIR,
+};

package/lib/project.js

@@ -979,7 +979,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() });
@@ -1137,6 +1137,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;
@@ -1179,17 +1187,31 @@ function createProjectContext(opts) {
     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 +1219,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 +1234,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 +1297,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;
     }
@@ -1380,7 +1429,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 +1437,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 +1451,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 +1466,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 +1486,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 +1495,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 +1609,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 +1671,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 +1700,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 || "";
@@ -1705,6 +1793,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 || "/");
@@ -2654,6 +2762,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 || "";
@@ -3154,6 +3270,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,
   };