clay-server 4.1.0-beta.8 → 4.1.0

package/lib/yoke/mcp-bridge-server.js

@@ -58,6 +58,7 @@ var CLAY_MCP_PATH = claySlug
 
 // --- Auth ---
 var clayAuthToken = process.env.CLAY_AUTH_TOKEN || "";
+var clayBridgeToken = process.env.CLAY_BRIDGE_TOKEN || "";
 
 // --- Tool cache ---
 var _tools = [];         // [{ server, name, description, inputSchema }]
@@ -79,6 +80,7 @@ function postJson(urlPath, body) {
     if (clayAuthToken) {
       headers["Cookie"] = "relay_auth=" + clayAuthToken;
     }
+    if (clayBridgeToken) headers["X-Clay-Bridge-Token"] = clayBridgeToken;
 
     var reqOpts = {
       hostname: parsed.hostname,
@@ -95,6 +97,15 @@ function postJson(urlPath, body) {
       res.on("data", function (chunk) { chunks.push(chunk); });
       res.on("end", function () {
         var respBody = Buffer.concat(chunks).toString("utf8");
+        if (res.statusCode < 200 || res.statusCode >= 300) {
+          var statusError = "Clay MCP bridge HTTP " + res.statusCode;
+          try {
+            var errorBody = JSON.parse(respBody);
+            if (errorBody && errorBody.error) statusError += ": " + errorBody.error;
+          } catch (e) {}
+          reject(new Error(statusError));
+          return;
+        }
         try {
           resolve(JSON.parse(respBody));
         } catch (e) {
@@ -122,8 +133,7 @@ function postJson(urlPath, body) {
 function fetchTools() {
   return postJson(CLAY_MCP_PATH, { action: "list_tools", sessionId: claySessionId, queryGeneration: clayQueryGeneration, sessionOnly: sessionOnly }).then(function (resp) {
     if (resp.error) {
-      log("Failed to fetch tools: " + resp.error);
-      return [];
+      throw new Error(resp.error);
     }
     _tools = resp.tools || [];
     _toolsFetched = true;
@@ -135,7 +145,8 @@ function fetchTools() {
     return _tools;
   }).catch(function (err) {
     log("Error fetching tools: " + err.message);
-    return [];
+    _toolsFetched = false;
+    throw err;
   });
 }
 
@@ -194,7 +205,7 @@ function handleInitialize(id, params) {
   });
 
   // Pre-fetch tools after handshake
-  fetchTools();
+  fetchTools().catch(function () {});
 }
 
 function handleToolsList(id, params) {
@@ -210,7 +221,9 @@ function handleToolsList(id, params) {
   }
 
   // Always re-fetch: remote MCP servers may connect after initial fetch
-  fetchTools().then(respond);
+  fetchTools().then(respond).catch(function (err) {
+    sendError(id, -32001, "Clay tool discovery failed: " + err.message);
+  });
 }
 
 function handleToolsCall(id, params) {

package/lib/yoke/session-skill-catalog.js

@@ -0,0 +1,45 @@
+// Session-owned shared skill catalog.
+// ----------------------------------
+// Keeps personal skill names out of project-wide session-manager state while
+// retaining vendor commands separately for hydration and session switching.
+
+var skillDiscovery = require("./skill-discovery");
+
+function createSessionSkillCatalog(opts) {
+  opts = opts || {};
+  var cwd = opts.cwd;
+  var osUsers = !!opts.osUsers;
+  var getLinuxUser = opts.getLinuxUser || function () { return null; };
+  var resolveUser = opts.resolveUser || require("../os-users").resolveOsUserInfo;
+
+  function optionsFor(session) {
+    if (!osUsers) return opts.homeDir ? { homeDir: opts.homeDir, env: opts.env } : {};
+    var linuxUser = getLinuxUser(session);
+    if (!linuxUser) return { disable: true };
+    try {
+      return skillDiscovery.optionsForOsUser(resolveUser(linuxUser));
+    } catch (e) {
+      return { disable: true };
+    }
+  }
+
+  function hydrate(session) {
+    if (!session) return [];
+    var discovered = skillDiscovery.discoverSkills(cwd, optionsFor(session));
+    var names = discovered.map(function (skill) { return skill.name; });
+    session.skillNames = names;
+    var vendorCommands = Array.isArray(session.vendorSlashCommands) ? session.vendorSlashCommands : [];
+    var combined = vendorCommands.slice();
+    for (var i = 0; i < names.length; i++) {
+      if (combined.indexOf(names[i]) === -1) combined.push(names[i]);
+    }
+    session.slashCommands = combined;
+    session.slashCommandsByVendor = session.slashCommandsByVendor || {};
+    session.slashCommandsByVendor[session.vendor || "claude"] = combined;
+    return combined;
+  }
+
+  return { hydrate: hydrate, optionsFor: optionsFor };
+}
+
+module.exports = { createSessionSkillCatalog: createSessionSkillCatalog };

package/lib/yoke/skill-discovery.js

@@ -11,6 +11,18 @@ function defaultHomeDir() {
   try { return require("../config").REAL_HOME; } catch (e) { return os.homedir(); }
 }
 
+function optionsForOsUser(userInfo, fsAsUser) {
+  if (!userInfo || typeof userInfo.home !== "string" || !userInfo.home) return { disable: true };
+  fsAsUser = fsAsUser || require("../os-users").fsAsUser;
+  return {
+    homeDir: userInfo.home,
+    scopedHome: true,
+    readDir: function (dir) { return fsAsUser("list", { dir: dir }, userInfo).map(function (entry) { return { name: entry.name, isDir: entry.isDir }; }); },
+    readFile: function (file) { return fsAsUser("read", { file: file, readContent: true }, userInfo).content; },
+    realpath: function (file) { return fsAsUser("realpath", { file: file }, userInfo).path; },
+  };
+}
+
 function unquote(value) {
   var text = String(value || "").trim();
   if ((text[0] === '"' && text[text.length - 1] === '"') ||
@@ -20,61 +32,83 @@ function unquote(value) {
   return text;
 }
 
-function readMetadata(skillPath, fallbackName) {
+function readMetadata(skillPath, fallbackName, opts) {
   var content;
-  try { content = fs.readFileSync(skillPath, "utf8"); } catch (e) { return null; }
+  try { content = opts && opts.readFile ? opts.readFile(skillPath) : fs.readFileSync(skillPath, "utf8"); } catch (e) { return null; }
   var name = fallbackName;
   var description = "";
+  var version = "";
   var frontmatter = content.match(/^---\s*\r?\n([\s\S]*?)\r?\n---(?:\s*\r?\n|$)/);
   if (frontmatter) {
     var nameMatch = frontmatter[1].match(/^name:\s*(.+)$/m);
     var descriptionMatch = frontmatter[1].match(/^description:\s*(.+)$/m);
     if (nameMatch) name = unquote(nameMatch[1]) || fallbackName;
     if (descriptionMatch) description = unquote(descriptionMatch[1]);
+    var versionMatch = frontmatter[1].match(/^version:\s*(.+)$/m);
+    if (versionMatch) version = unquote(versionMatch[1]);
   }
   if (!description) {
     var heading = content.match(/^#\s+(.+)$/m);
     if (heading) description = heading[1].trim();
   }
-  return { name: name, description: description };
+  return { name: name, description: description, version: version };
 }
 
-function scanRoot(root, source, merged) {
+function scanRoot(root, source, merged, opts) {
   var entries;
-  try { entries = fs.readdirSync(root, { withFileTypes: true }); } catch (e) { return; }
+  try { entries = opts && opts.readDir ? opts.readDir(root) : fs.readdirSync(root, { withFileTypes: true }); } catch (e) { return; }
   entries.sort(function(a, b) { return a.name.localeCompare(b.name); });
   for (var i = 0; i < entries.length; i++) {
     var entry = entries[i];
-    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
+    if ((!opts || !opts.readDir) && (entry.isDir === false || (typeof entry.isDirectory === "function" && !entry.isDirectory() && !entry.isSymbolicLink()))) continue;
     var skillPath = path.join(root, entry.name, "SKILL.md");
-    var metadata = readMetadata(skillPath, entry.name);
+    var realSkillPath;
+    try { realSkillPath = opts && opts.realpath ? opts.realpath(skillPath) : fs.realpathSync(skillPath); } catch (e) { continue; }
+    var metadata = readMetadata(realSkillPath, entry.name, opts);
     if (!metadata) continue;
-    merged[metadata.name] = {
+    var key = opts && opts.includeDuplicates ? source + "\0" + metadata.name : metadata.name;
+    merged[key] = {
       name: metadata.name,
-      path: skillPath,
+      path: realSkillPath,
       description: metadata.description,
+      version: metadata.version,
       source: source,
     };
   }
 }
 
 function getSkillRoots(cwd, opts) {
-  var homeDir = (opts && opts.homeDir) || defaultHomeDir();
+  opts = opts || {};
+  var env = opts.env || (opts.homeDir ? {} : process.env);
+  if (opts.scopedHome) {
+    env = Object.assign({}, env);
+    delete env.CODEX_HOME;
+    delete env.CLAUDE_CONFIG_DIR;
+  }
+  var homeDir = opts.homeDir || env.HOME || defaultHomeDir();
+  var codexHome = env.CODEX_HOME ? path.resolve(homeDir, env.CODEX_HOME) : path.join(homeDir, ".codex");
+  var claudeConfigDir = env.CLAUDE_CONFIG_DIR ? path.resolve(homeDir, env.CLAUDE_CONFIG_DIR) : path.join(homeDir, ".claude");
   var roots = [
-    { path: path.join(homeDir, ".codex", "skills"), source: "codex-user" },
-    { path: path.join(homeDir, ".claude", "skills"), source: "claude-user" },
+    { path: path.join(homeDir, ".agents", "skills"), source: "agents-user" },
+    { path: path.join(codexHome, "skills"), source: "codex-user" },
+    { path: path.join(codexHome, "skills", ".system"), source: "codex-system-user" },
+    { path: path.join(claudeConfigDir, "skills"), source: "claude-user" },
   ];
   if (cwd) {
     roots.push({ path: path.join(cwd, "skills"), source: "project" });
+    roots.push({ path: path.join(cwd, ".agents", "skills"), source: "agents-project" });
+    roots.push({ path: path.join(cwd, ".codex", "skills"), source: "codex-project" });
+    roots.push({ path: path.join(cwd, ".codex", "skills", ".system"), source: "codex-system-project" });
     roots.push({ path: path.join(cwd, ".claude", "skills"), source: "claude-project" });
   }
   return roots;
 }
 
 function discoverSkills(cwd, opts) {
+  if (opts && opts.disable) return [];
   var merged = {};
   var roots = getSkillRoots(cwd, opts);
-  for (var i = 0; i < roots.length; i++) scanRoot(roots[i].path, roots[i].source, merged);
+  for (var i = 0; i < roots.length; i++) scanRoot(roots[i].path, roots[i].source, merged, opts);
   return Object.keys(merged).sort().map(function(name) { return merged[name]; });
 }
 
@@ -112,13 +146,13 @@ function buildSkillIndex(skills) {
   return lines.join("\n");
 }
 
-function readReferencedSkills(text, skills, maxChars) {
+function readReferencedSkills(text, skills, maxChars, readOpts) {
   var references = findSkillReferences(text, skills);
   var remaining = maxChars || 32768;
   var blocks = [];
   for (var i = 0; i < references.length && remaining > 0; i++) {
     var content;
-    try { content = fs.readFileSync(references[i].path, "utf8"); } catch (e) { continue; }
+    try { content = readOpts && readOpts.readFile ? readOpts.readFile(references[i].path) : fs.readFileSync(references[i].path, "utf8"); } catch (e) { continue; }
     var header = "<shared-skill name=\"" + references[i].name + "\" source=\"" + references[i].source + "\">\n";
     var footer = "\n</shared-skill>";
     var available = Math.max(0, remaining - header.length - footer.length);
@@ -142,18 +176,20 @@ function lstatOrNull(target) {
 }
 
 function ensureClaudeCodexPlugin(opts) {
-  var homeDir = (opts && opts.homeDir) || defaultHomeDir();
-  var source = path.join(homeDir, ".codex", "skills");
+  opts = opts || {};
+  var homeDir = opts.homeDir || defaultHomeDir();
+  var source = opts.source || path.join(homeDir, ".codex", "skills");
+  var bridgeName = opts.name || "codex";
   try {
     if (!fs.statSync(source).isDirectory()) return null;
   } catch (e) { return null; }
 
-  var pluginDir = path.join(homeDir, ".clay", "skill-bridge", "codex");
+  var pluginDir = path.join(homeDir, ".clay", "skill-bridge", bridgeName);
   var bridgeRoot = path.dirname(pluginDir);
   var manifestDir = path.join(pluginDir, ".claude-plugin");
   var manifestPath = path.join(manifestDir, "plugin.json");
   var skillsLink = path.join(pluginDir, "skills");
-  var manifest = JSON.stringify({ name: "codex", version: "1.0.0", description: "Codex skills shared by Clay" }, null, 2) + "\n";
+  var manifest = JSON.stringify({ name: bridgeName, version: "1.0.0", description: "Shared skills provided by Clay" }, null, 2) + "\n";
 
   try {
     fs.mkdirSync(path.join(homeDir, ".clay"), { recursive: true });
@@ -168,7 +204,10 @@ function ensureClaudeCodexPlugin(opts) {
     if (!manifestDirStat) fs.mkdirSync(manifestDir);
     var manifestStat = lstatOrNull(manifestPath);
     if (manifestStat) {
-      if (!manifestStat.isFile() || fs.readFileSync(manifestPath, "utf8") !== manifest) return null;
+      if (!manifestStat.isFile()) return null;
+      var existingManifest = fs.readFileSync(manifestPath, "utf8");
+      var legacyManifest = JSON.stringify({ name: "codex", version: "1.0.0", description: "Codex skills shared by Clay" }, null, 2) + "\n";
+      if (existingManifest !== manifest && existingManifest !== legacyManifest) return null;
     } else {
       fs.writeFileSync(manifestPath, manifest, { mode: 0o600, flag: "wx" });
     }
@@ -192,5 +231,6 @@ module.exports = {
   findSkillReferences: findSkillReferences,
   getSkillRoots: getSkillRoots,
   indexSkills: indexSkills,
+  optionsForOsUser: optionsForOsUser,
   readReferencedSkills: readReferencedSkills,
 };

package/lib/yoke/vendor-registry.js

@@ -38,7 +38,7 @@ var VENDOR_REGISTRY = {
     usageDashboard: {
       icon: "/codex-avatar.png",
       alt: "Codex",
-      href: "https://chatgpt.com/admin/usage",
+      href: "https://chatgpt.com/codex/settings/usage",
       title: "Check usage on ChatGPT",
     },
     rateLimitTracking: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "4.1.0-beta.8",
+  "version": "4.1.0",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js"
@@ -8,8 +8,6 @@
   "scripts": {
     "dev": "node bin/cli.js --dev",
     "test": "node --test --test-force-exit test/*.test.js",
-    "prepack": "npm pkg delete bin.clay-dev",
-    "postpack": "npm pkg set bin.clay-dev=./bin/cli.js",
     "semantic-release": "semantic-release"
   },
   "files": [
@@ -49,12 +47,12 @@
   "homepage": "https://github.com/chadbyte/clay#readme",
   "author": "Chad",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.258",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.272",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@openai/codex": "^0.153.4",
+    "@openai/codex": "^0.154.0",
     "@seald-io/nedb": "^4.1.2",
-    "imapflow": "^1.3.1",
-    "nodemailer": "^9.0.5",
+    "imapflow": "^1.7.8",
+    "nodemailer": "^9.1.1",
     "qrcode-terminal": "^0.12.0",
     "web-push": "^3.6.7",
     "ws": "^8.18.0"