clay-server 2.6.0 → 2.7.1

package/bin/cli.js

@@ -1,5 +1,19 @@
 #!/usr/bin/env node
 
+// --- Node version check (must run before any require that may use Node 20+ features) ---
+var _nodeMajor = parseInt(process.versions.node.split(".")[0], 10);
+if (_nodeMajor < 20) {
+  console.error("");
+  console.error("\x1b[31m[clay] Node.js 20+ is required (current: " + process.version + ")\x1b[0m");
+  console.error("[clay] The Claude Agent SDK 0.2.40+ requires Node 20 for Symbol.dispose support.");
+  console.error("[clay] If you cannot upgrade Node, use claude-relay@2.4.3 which supports Node 18.");
+  console.error("");
+  console.error("  Upgrade Node:  nvm install 22 && nvm use 22");
+  console.error("  Or use older:  npx claude-relay@2.4.3");
+  console.error("");
+  process.exit(78);
+}
+
 var os = require("os");
 var fs = require("fs");
 var path = require("path");
@@ -7,8 +21,9 @@ var { execSync, execFileSync, spawn } = require("child_process");
 var qrcode = require("qrcode-terminal");
 var net = require("net");
 
-// Detect dev mode (no separate storage — dev and prod share ~/.clay)
+// Detect dev mode — dev and prod use separate daemon files so they can run simultaneously
 var _isDev = (process.argv[1] && path.basename(process.argv[1]) === "clay-dev") || process.argv.includes("--dev");
+if (_isDev) process.env.CLAY_DEV = "1";
 
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
@@ -33,12 +48,14 @@ var debugMode = false;
 var autoYes = false;
 var cliPin = null;
 var shutdownMode = false;
+var restartMode = false;
 var addPath = null;
 var removePath = null;
 var listMode = false;
 var dangerouslySkipPermissions = false;
 var headlessMode = false;
 var watchMode = false;
+var host = null;
 
 for (var i = 0; i < args.length; i++) {
   if (args[i] === "-p" || args[i] === "--port") {
@@ -48,6 +65,9 @@ for (var i = 0; i < args.length; i++) {
       process.exit(1);
     }
     i++;
+  } else if (args[i] === "--host" || args[i] === "--bind") {
+    host = args[i + 1] || null;
+    i++;
   } else if (args[i] === "--no-https") {
     useHttps = false;
   } else if (args[i] === "--no-update" || args[i] === "--skip-update") {
@@ -65,6 +85,8 @@ for (var i = 0; i < args.length; i++) {
     i++;
   } else if (args[i] === "--shutdown") {
     shutdownMode = true;
+  } else if (args[i] === "--restart") {
+    restartMode = true;
   } else if (args[i] === "--add") {
     addPath = args[i + 1] || ".";
     i++;
@@ -79,19 +101,21 @@ for (var i = 0; i < args.length; i++) {
   } else if (args[i] === "--dangerously-skip-permissions") {
     dangerouslySkipPermissions = true;
   } else if (args[i] === "-h" || args[i] === "--help") {
-    console.log("Usage: clay-server [-p|--port <port>] [--no-https] [--no-update] [--debug] [-y|--yes] [--pin <pin>] [--shutdown]");
+    console.log("Usage: clay-server [-p|--port <port>] [--host <address>] [--no-https] [--no-update] [--debug] [-y|--yes] [--pin <pin>] [--shutdown] [--restart]");
     console.log("       clay-server --add <path>     Add a project to the running daemon");
     console.log("       clay-server --remove <path>  Remove a project from the running daemon");
     console.log("       clay-server --list            List registered projects");
     console.log("");
     console.log("Options:");
     console.log("  -p, --port <port>  Port to listen on (default: 2633)");
+    console.log("  --host <address>   Address to bind to (default: 0.0.0.0)");
     console.log("  --no-https         Disable HTTPS (enabled by default via mkcert)");
     console.log("  --no-update        Skip auto-update check on startup");
     console.log("  --debug            Enable debug panel in the web UI");
     console.log("  -y, --yes          Skip interactive prompts (accept defaults)");
     console.log("  --pin <pin>        Set 6-digit PIN (use with --yes)");
     console.log("  --shutdown         Shut down the running relay daemon");
+    console.log("  --restart          Restart the running relay daemon");
     console.log("  --add <path>       Add a project directory (use '.' for current)");
     console.log("  --remove <path>    Remove a project directory");
     console.log("  --list             List all registered projects");
@@ -128,6 +152,25 @@ if (shutdownMode) {
   return;
 }
 
+// --- Handle --restart before anything else ---
+if (restartMode) {
+  var restartConfig = loadConfig();
+  isDaemonAliveAsync(restartConfig).then(function (alive) {
+    if (!alive) {
+      console.error("No running daemon found.");
+      process.exit(1);
+    }
+    sendIPCCommand(socketPath(), { cmd: "restart" }).then(function () {
+      console.log("Server restarted.");
+      process.exit(0);
+    }).catch(function (err) {
+      console.error("Restart failed:", err.message);
+      process.exit(1);
+    });
+  });
+  return;
+}
+
 // --- Handle --add before anything else ---
 if (addPath !== null) {
   var absAdd = path.resolve(addPath);
@@ -1277,6 +1320,7 @@ async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
   var config = {
     pid: null,
     port: port,
+    host: host,
     pinHash: pin ? generateAuthToken(pin) : null,
     tls: hasTls,
     debug: debugMode,
@@ -1386,6 +1430,7 @@ async function devMode(pin, keepAwake, existingPinHash) {
   var config = {
     pid: null,
     port: port,
+    host: host,
     pinHash: existingPinHash || (pin ? generateAuthToken(pin) : null),
     tls: hasTls,
     debug: true,
@@ -2370,8 +2415,12 @@ var currentVersion = require("../package.json").version;
       if (autoRestorable.length > 0) {
         console.log("  " + sym.done + "  Restoring " + autoRestorable.length + " previous project(s)");
       }
-      var hasRestorable = autoRestorable.length > 0;
-      await forkDaemon(pin, false, hasRestorable ? autoRestorable : undefined, !hasRestorable);
+      // Add cwd if it has history in .clayrc, or if there are no other projects to restore
+      var cwdInRc = (autoRc.recentProjects || []).some(function (p) {
+        return p.path === cwd;
+      });
+      var addCwd = cwdInRc || autoRestorable.length === 0;
+      await forkDaemon(pin, false, autoRestorable.length > 0 ? autoRestorable : undefined, addCwd);
     } else {
       setup(function (pin, keepAwake) {
         if (dangerouslySkipPermissions && !pin) {

package/lib/config.js

@@ -70,20 +70,23 @@ var CONFIG_DIR = CLAY_HOME;
 var CLAYRC_PATH = path.join(os.homedir(), ".clayrc");
 var CRASH_INFO_PATH = path.join(CONFIG_DIR, "crash.json");
 
+// Dev mode uses separate daemon files so dev and prod can run simultaneously
+var _devMode = !!process.env.CLAY_DEV;
+
 function configPath() {
-  return path.join(CONFIG_DIR, "daemon.json");
+  return path.join(CONFIG_DIR, _devMode ? "daemon-dev.json" : "daemon.json");
 }
 
 function socketPath() {
   if (process.platform === "win32") {
-    var pipeName = "clay-daemon";
+    var pipeName = _devMode ? "clay-daemon-dev" : "clay-daemon";
     return "\\\\.\\pipe\\" + pipeName;
   }
-  return path.join(CONFIG_DIR, "daemon.sock");
+  return path.join(CONFIG_DIR, _devMode ? "daemon-dev.sock" : "daemon.sock");
 }
 
 function logPath() {
-  return path.join(CONFIG_DIR, "daemon.log");
+  return path.join(CONFIG_DIR, _devMode ? "daemon-dev.log" : "daemon.log");
 }
 
 function ensureConfigDir() {
@@ -117,7 +120,10 @@ function isPidAlive(pid) {
 
 function isDaemonAlive(config) {
   if (!config || !config.pid) return false;
-  if (!isPidAlive(config.pid)) return false;
+  if (!isPidAlive(config.pid)) {
+    clearStaleConfig();
+    return false;
+  }
   // Named pipes on Windows can't be stat'd, just check PID
   if (process.platform === "win32") return true;
   try {
@@ -131,7 +137,10 @@ function isDaemonAlive(config) {
 function isDaemonAliveAsync(config) {
   return new Promise(function (resolve) {
     if (!config || !config.pid) return resolve(false);
-    if (!isPidAlive(config.pid)) return resolve(false);
+    if (!isPidAlive(config.pid)) {
+      clearStaleConfig();
+      return resolve(false);
+    }
 
     var sock = socketPath();
     var client = net.connect(sock);

package/lib/daemon.js

@@ -22,7 +22,7 @@ delete process.env.CLAUDECODE;
 
 var fs = require("fs");
 var path = require("path");
-var { loadConfig, saveConfig, socketPath, generateSlug, syncClayrc, removeFromClayrc, writeCrashInfo, readCrashInfo, clearCrashInfo } = require("./config");
+var { loadConfig, saveConfig, socketPath, generateSlug, syncClayrc, removeFromClayrc, writeCrashInfo, readCrashInfo, clearCrashInfo, isPidAlive, clearStaleConfig } = require("./config");
 var { createIPCServer } = require("./ipc");
 var { createServer, generateAuthToken } = require("./server");
 
@@ -81,6 +81,8 @@ var lanIp = (function () {
 })();
 
 // --- Create multi-project server ---
+var listenHost = config.host || "0.0.0.0";
+
 var relay = createServer({
   tlsOptions: tlsOptions,
   caPath: caRoot,
@@ -387,6 +389,10 @@ var relay = createServer({
     console.log("[daemon] Shutdown requested via web UI");
     gracefulShutdown();
   },
+  onRestart: function () {
+    console.log("[daemon] Restart requested via web UI");
+    spawnAndRestart();
+  },
 });
 
 // --- Register projects ---
@@ -405,6 +411,14 @@ for (var i = 0; i < projects.length; i++) {
 try { syncClayrc(config.projects); } catch (e) {}
 
 // --- IPC server ---
+// Clean up stale socket/config left by a previously killed daemon
+var existingConfig = loadConfig();
+if (existingConfig && existingConfig.pid && existingConfig.pid !== process.pid) {
+  if (!isPidAlive(existingConfig.pid)) {
+    console.log("[daemon] Clearing stale config from dead PID " + existingConfig.pid);
+    clearStaleConfig();
+  }
+}
 var ipc = createIPCServer(socketPath(), function (msg) {
   switch (msg.cmd) {
     case "add_project": {
@@ -523,6 +537,11 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       gracefulShutdown();
       return { ok: true };
 
+    case "restart":
+      console.log("[daemon] Restart requested via IPC");
+      spawnAndRestart();
+      return { ok: true };
+
     case "update": {
       console.log("[daemon] Update & restart requested via IPC");
 
@@ -584,9 +603,9 @@ var listenRetries = 0;
 var MAX_LISTEN_RETRIES = 15;
 
 function startListening() {
-  relay.server.listen(config.port, function () {
+  relay.server.listen(config.port, listenHost, function () {
     var protocol = tlsOptions ? "https" : "http";
-    console.log("[daemon] Listening on " + protocol + "://0.0.0.0:" + config.port);
+    console.log("[daemon] Listening on " + protocol + "://" + listenHost + ":" + config.port);
     console.log("[daemon] PID:", process.pid);
     console.log("[daemon] Projects:", config.projects.length);
 
@@ -637,8 +656,8 @@ if (relay.onboardingServer) {
   relay.onboardingServer.on("error", function (err) {
     console.error("[daemon] Onboarding HTTP server error:", err.message);
   });
-  relay.onboardingServer.listen(onboardingPort, function () {
-    console.log("[daemon] Onboarding HTTP on http://0.0.0.0:" + onboardingPort);
+  relay.onboardingServer.listen(onboardingPort, listenHost, function () {
+    console.log("[daemon] Onboarding HTTP on http://" + listenHost + ":" + onboardingPort);
   });
 }
 
@@ -652,6 +671,29 @@ if (config.keepAwake && process.platform === "darwin") {
   } catch (e) {}
 }
 
+// --- Spawn new daemon and graceful restart ---
+function spawnAndRestart() {
+  var { spawn: spawnRestart } = require("child_process");
+  var { logPath: restartLogPath, configPath: restartConfigPath } = require("./config");
+  var daemonScript = path.join(__dirname, "daemon.js");
+  var logFd = fs.openSync(restartLogPath(), "a");
+  var child = spawnRestart(process.execPath, [daemonScript], {
+    detached: true,
+    windowsHide: true,
+    stdio: ["ignore", logFd, logFd],
+    env: Object.assign({}, process.env, {
+      CLAY_CONFIG: restartConfigPath(),
+    }),
+  });
+  child.unref();
+  fs.closeSync(logFd);
+  config.pid = child.pid;
+  saveConfig(config);
+  console.log("[daemon] Spawned new daemon (PID " + child.pid + "), shutting down...");
+  updateHandoff = true;
+  setTimeout(function () { gracefulShutdown(); }, 100);
+}
+
 // --- Graceful shutdown ---
 var updateHandoff = false; // true when shutting down for update (new daemon already spawned)
 

package/lib/ipc.js

@@ -46,6 +46,18 @@ function createIPCServer(sockPath, handler) {
     conn.on("error", function () {});
   });
 
+  var retried = false;
+  server.on("error", function (err) {
+    if (err.code === "EADDRINUSE" && !retried) {
+      retried = true;
+      console.log("[ipc] Socket in use, removing stale socket and retrying...");
+      try { fs.unlinkSync(sockPath); } catch (e) {}
+      server.listen(sockPath);
+    } else {
+      console.error("[ipc] Failed to bind socket:", err.message);
+      process.exit(1);
+    }
+  });
   server.listen(sockPath);
 
   return {

package/lib/notes.js

@@ -8,8 +8,8 @@ function createNotesManager(opts) {
   var cwd = opts.cwd;
 
   // Storage path: ~/.clay/notes/{encodedCwd}.json
-  var encodedCwd = utils.encodeCwd(cwd);
   var notesDir = path.join(config.CONFIG_DIR, "notes");
+  var encodedCwd = utils.resolveEncodedFile(notesDir, cwd, ".json");
   var notesFile = path.join(notesDir, encodedCwd + ".json");
 
   // In-memory cache
@@ -67,7 +67,7 @@ function createNotesManager(opts) {
   function update(id, changes) {
     for (var i = 0; i < notes.length; i++) {
       if (notes[i].id === id) {
-        var allowed = ["text", "x", "y", "w", "h", "color", "minimized", "zIndex"];
+        var allowed = ["text", "x", "y", "w", "h", "color", "minimized", "hidden", "zIndex"];
         for (var j = 0; j < allowed.length; j++) {
           var key = allowed[j];
           if (changes[key] !== undefined) {