clay-server 2.31.0 → 2.32.0-beta.10

package/lib/sessions.js

@@ -3,6 +3,7 @@ var path = require("path");
 var config = require("./config");
 var utils = require("./utils");
 var users = require("./users");
+var { CODEX_DEFAULTS } = require("./codex-defaults");
 
 function createSessionManager(opts) {
   var cwd = opts.cwd;
@@ -16,10 +17,16 @@ function createSessionManager(opts) {
   var nextLocalId = 1;
   var sessions = new Map();     // localId -> session object
   var activeSessionId = null;   // currently active local ID
-  var slashCommands = null;     // shared across sessions
+  var slashCommands = null;     // shared across sessions (deprecated, use slashCommandsByVendor)
+  var slashCommandsByVendor = {}; // vendor -> array of slash commands
   var skillNames = null;        // Claude-only skills to filter from slash menu
   var singleUserUnread = {};    // sessionLocalId -> unread count (single-user mode)
   var permissionRequestIndex = {}; // requestId -> sessionLocalId (O(1) lookup)
+  var capabilitiesByVendor = null; // set by sdk-bridge after adapter init
+  var defaultVendor = null;        // set by sdk-bridge
+  var codexApproval = CODEX_DEFAULTS.approval;
+  var codexSandbox = CODEX_DEFAULTS.sandbox;
+  var codexWebSearch = CODEX_DEFAULTS.webSearch;
 
   // --- Session persistence (centralized in ~/.clay/sessions/{encoded-cwd}/) ---
   var sessionsBase = path.join(config.CONFIG_DIR, "sessions");
@@ -86,6 +93,7 @@ function createSessionManager(opts) {
         createdAt: session.createdAt,
       };
       if (session.ownerId) metaObj.ownerId = session.ownerId;
+      if (session.vendor) metaObj.vendor = session.vendor;
       if (session.sessionVisibility) metaObj.sessionVisibility = session.sessionVisibility;
       if (session.lastRewindUuid) metaObj.lastRewindUuid = session.lastRewindUuid;
       if (session.loop) metaObj.loop = session.loop;
@@ -186,6 +194,7 @@ function createSessionManager(opts) {
         messageUUIDs: messageUUIDs,
         lastRewindUuid: m.lastRewindUuid || null,
       };
+      if (m.vendor) session.vendor = m.vendor;
       if (m.loop) session.loop = m.loop;
       if (m.debateState) session.debateState = m.debateState;
       if (m.debateSetupMode) session.debateSetupMode = true;
@@ -230,6 +239,7 @@ function createSessionManager(opts) {
       ownerId: s.ownerId || null,
       sessionVisibility: s.sessionVisibility || "shared",
       unread: unreadMap[s.localId] || 0,
+      vendor: s.vendor || null,
     };
   }
 
@@ -281,12 +291,15 @@ function createSessionManager(opts) {
       allowedTools: {},
       isProcessing: false,
       title: "",
+      titleAutoGenerated: false,
+      turnCount: 0,
       createdAt: Date.now(),
       lastActivity: Date.now(),
       history: [],
       messageUUIDs: [],
       ownerId: (sessionOpts && sessionOpts.ownerId) || null,
       sessionVisibility: (sessionOpts && sessionOpts.sessionVisibility) || "shared",
+      vendor: (sessionOpts && sessionOpts.vendor) || null,
     };
     sessions.set(localId, session);
     switchSession(localId, targetWs);
@@ -308,12 +321,15 @@ function createSessionManager(opts) {
       allowedTools: {},
       isProcessing: false,
       title: "",
+      titleAutoGenerated: false,
+      turnCount: 0,
       createdAt: Date.now(),
       lastActivity: Date.now(),
       history: [],
       messageUUIDs: [],
       ownerId: (sessionOpts && sessionOpts.ownerId) || null,
       sessionVisibility: (sessionOpts && sessionOpts.sessionVisibility) || "shared",
+      vendor: (sessionOpts && sessionOpts.vendor) || null,
     };
     sessions.set(localId, session);
     return session;
@@ -343,6 +359,8 @@ function createSessionManager(opts) {
 
     for (var i = fromIndex; i < total; i++) {
       var _item = session.history[i];
+      // Skip internal bookkeeping entries not meant for the UI
+      if (_item && _item.type === "digest_checkpoint") continue;
       if (_item && (_item.type === "mention_user" || _item.type === "mention_response")) {
         console.log("[DEBUG replayHistory] sending mention at index=" + i + " from=" + fromIndex + " total=" + total + " type=" + _item.type + " mate=" + (_item.mateName || ""));
       }
@@ -389,7 +407,13 @@ function createSessionManager(opts) {
     // In multi-user mode with a specific client, only send to that client
     var _send = (targetWs && sendTo) ? function (obj) { sendTo(targetWs, obj); } : send;
 
-    _send({ type: "session_switched", id: localId, cliSessionId: session.cliSessionId || null, loop: session.loop || null });
+    var _capsByVendor = capabilitiesByVendor || {};
+    var _sessionVendor = session.vendor || defaultVendor || "claude";
+    var _vendorCaps = _capsByVendor[_sessionVendor] || {};
+    _send({ type: "session_switched", id: localId, cliSessionId: session.cliSessionId || null, loop: session.loop || null, vendor: session.vendor || null, hasHistory: (session.history && session.history.length > 0), capabilities: _vendorCaps });
+    // Send vendor-specific slash commands
+    var _vendorCmds = slashCommandsByVendor[_sessionVendor] || slashCommands || [];
+    _send({ type: "slash_commands", commands: _vendorCmds, vendor: _sessionVendor });
     broadcastSessionList();
     replayHistory(session, undefined, targetWs, transform);
 
@@ -410,6 +434,11 @@ function createSessionManager(opts) {
         decisionReason: p.decisionReason,
       });
     }
+
+    // Re-send active mention indicator so returning clients restore the mate avatar state
+    if (session._mentionInProgress && session._mentionActiveMateId) {
+      _send({ type: "mention_processing", mateId: session._mentionActiveMateId, active: true });
+    }
   }
 
   function cleanupMentionSessions(session) {
@@ -677,7 +706,7 @@ function createSessionManager(opts) {
   }
 
   var _migrationFailedIds = {};
-  function migrateSessionTitles(getSDK, migrateCwd) {
+  function migrateSessionTitles(adapter, migrateCwd) {
     var candidates = [];
     sessions.forEach(function(s) {
       if (s.cliSessionId && s.title && s.title !== "New Session" && s.title !== "Resumed session"
@@ -686,43 +715,41 @@ function createSessionManager(opts) {
       }
     });
     if (candidates.length === 0) return;
-    getSDK().then(function(sdkMod) {
-      return sdkMod.listSessions({ dir: migrateCwd }).then(function(sdkSessions) {
-        var sdkTitles = {};
-        for (var i = 0; i < sdkSessions.length; i++) {
-          if (sdkSessions[i].customTitle) {
-            sdkTitles[sdkSessions[i].sessionId] = sdkSessions[i].customTitle;
-          }
+    adapter.listSessions({ dir: migrateCwd }).then(function(sdkSessions) {
+      var sdkTitles = {};
+      for (var i = 0; i < sdkSessions.length; i++) {
+        if (sdkSessions[i].customTitle) {
+          sdkTitles[sdkSessions[i].sessionId] = sdkSessions[i].customTitle;
         }
-        var toMigrate = candidates.filter(function(item) {
-          return sdkTitles[item.cliSessionId] !== item.title;
-        });
-        if (toMigrate.length === 0) return;
-        var migrated = 0;
-        var failed = 0;
-        var chain = Promise.resolve();
-        for (var j = 0; j < toMigrate.length; j++) {
-          (function(item) {
-            chain = chain.then(function() {
-              return sdkMod.renameSession(item.cliSessionId, item.title, { dir: migrateCwd }).then(function() {
-                migrated++;
-              }).catch(function(e) {
-                failed++;
-                _migrationFailedIds[item.cliSessionId] = true;
-              });
+      }
+      var toMigrate = candidates.filter(function(item) {
+        return sdkTitles[item.cliSessionId] !== item.title;
+      });
+      if (toMigrate.length === 0) return;
+      var migrated = 0;
+      var failed = 0;
+      var chain = Promise.resolve();
+      for (var j = 0; j < toMigrate.length; j++) {
+        (function(item) {
+          chain = chain.then(function() {
+            return adapter.renameSession(item.cliSessionId, item.title, { dir: migrateCwd }).then(function() {
+              migrated++;
+            }).catch(function(e) {
+              failed++;
+              _migrationFailedIds[item.cliSessionId] = true;
             });
-          })(toMigrate[j]);
+          });
+        })(toMigrate[j]);
+      }
+      chain.then(function() {
+        if (migrated > 0) {
+          console.log("[session] Migrated " + migrated + " session title(s) to SDK format");
         }
-        chain.then(function() {
-          if (migrated > 0) {
-            console.log("[session] Migrated " + migrated + " session title(s) to SDK format");
-          }
-          if (failed > 0) {
-            console.log("[session] Skipped " + failed + " session(s) (CLI session not found for current user)");
-          }
-        }).catch(function(e) {
-          console.error("[session] Migration chain failed:", e.message || e);
-        });
+        if (failed > 0) {
+          console.log("[session] Skipped " + failed + " session(s) (CLI session not found for current user)");
+        }
+      }).catch(function(e) {
+        console.error("[session] Migration chain failed:", e.message || e);
       });
     }).catch(function() {});
   }
@@ -732,8 +759,25 @@ function createSessionManager(opts) {
     get nextLocalId() { return nextLocalId; },
     get slashCommands() { return slashCommands; },
     set slashCommands(v) { slashCommands = v; },
+    get slashCommandsByVendor() { return slashCommandsByVendor; },
+    setSlashCommandsForVendor: function(vendor, cmds) {
+      slashCommandsByVendor[vendor] = cmds || [];
+    },
+    getSlashCommandsForVendor: function(vendor) {
+      return slashCommandsByVendor[vendor] || [];
+    },
     get skillNames() { return skillNames; },
     set skillNames(v) { skillNames = v; },
+    get capabilitiesByVendor() { return capabilitiesByVendor; },
+    set capabilitiesByVendor(v) { capabilitiesByVendor = v; },
+    get defaultVendor() { return defaultVendor; },
+    set defaultVendor(v) { defaultVendor = v; },
+    get codexApproval() { return codexApproval; },
+    set codexApproval(v) { codexApproval = v; },
+    get codexSandbox() { return codexSandbox; },
+    set codexSandbox(v) { codexSandbox = v; },
+    get codexWebSearch() { return codexWebSearch; },
+    set codexWebSearch(v) { codexWebSearch = v; },
     sessions: sessions,
     sessionsDir: sessionsDir,
     HISTORY_PAGE_SIZE: HISTORY_PAGE_SIZE,

package/lib/ws-schema.js

@@ -256,6 +256,8 @@ var schema = {
   // -----------------------------------------------------------------------
   "fs_list":                  { direction: "c2s", handler: "lib/project-filesystem.js", description: "List directory contents" },
   "fs_list_result":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Directory listing result" },
+  "fs_search":                { direction: "c2s", handler: "lib/project-filesystem.js", description: "Search files by name" },
+  "fs_search_result":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "File search results" },
   "fs_read":                  { direction: "c2s", handler: "lib/project-filesystem.js", description: "Read file contents" },
   "fs_read_result":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "File content result" },
   "fs_write":                 { direction: "c2s", handler: "lib/project-filesystem.js", description: "Write file contents" },