clay-server 2.5.1 → 2.7.0

package/bin/claude-relay.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+console.warn("\x1b[33m⚠  'claude-relay' is deprecated and will be removed in a future version.\x1b[0m");
+console.warn("\x1b[33m   Use \x1b[1mnpx clay-server\x1b[22m instead.\x1b[0m\n");
+
+require("./cli.js");

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,11 +21,8 @@ var { execSync, execFileSync, spawn } = require("child_process");
 var qrcode = require("qrcode-terminal");
 var net = require("net");
 
-// Detect dev mode before loading config (env must be set before require)
+// Detect dev mode (no separate storage — dev and prod share ~/.clay)
 var _isDev = (process.argv[1] && path.basename(process.argv[1]) === "clay-dev") || process.argv.includes("--dev");
-if (_isDev) {
-  process.env.CLAY_HOME = path.join(os.homedir(), ".clay-dev");
-}
 
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
@@ -36,12 +47,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") {
@@ -51,6 +64,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") {
@@ -68,6 +84,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++;
@@ -82,19 +100,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");
@@ -131,6 +151,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);
@@ -1250,7 +1289,18 @@ async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
   // Only include cwd if explicitly requested
   if (addCwd) {
     var slug = generateSlug(cwd, []);
-    allProjects.push({ path: cwd, slug: slug, addedAt: Date.now() });
+    var cwdEntry = { path: cwd, slug: slug, addedAt: Date.now() };
+    // Restore title/icon from .clayrc if available
+    var cwdRc = loadClayrc();
+    var cwdRecent = cwdRc.recentProjects || [];
+    for (var cr = 0; cr < cwdRecent.length; cr++) {
+      if (cwdRecent[cr].path === cwd) {
+        if (cwdRecent[cr].title) cwdEntry.title = cwdRecent[cr].title;
+        if (cwdRecent[cr].icon) cwdEntry.icon = cwdRecent[cr].icon;
+        break;
+      }
+    }
+    allProjects.push(cwdEntry);
     usedSlugs.push(slug);
   }
 
@@ -1262,13 +1312,14 @@ async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
       if (!fs.existsSync(rp.path)) continue; // skip missing directories
       var rpSlug = generateSlug(rp.path, usedSlugs);
       usedSlugs.push(rpSlug);
-      allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, addedAt: rp.addedAt || Date.now() });
+      allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() });
     }
   }
 
   var config = {
     pid: null,
     port: port,
+    host: host,
     pinHash: pin ? generateAuthToken(pin) : null,
     tls: hasTls,
     debug: debugMode,
@@ -1350,24 +1401,35 @@ async function devMode(pin, keepAwake, existingPinHash) {
   }
 
   var slug = generateSlug(cwd, []);
-  var allProjects = [{ path: cwd, slug: slug, addedAt: Date.now() }];
+  var cwdDevEntry = { path: cwd, slug: slug, addedAt: Date.now() };
 
   // Restore previous projects
   var rc = loadClayrc();
   var restorable = (rc.recentProjects || []).filter(function (p) {
     return p.path !== cwd && fs.existsSync(p.path);
   });
+  // Restore title/icon for cwd from .clayrc
+  var rcAll = rc.recentProjects || [];
+  for (var ci = 0; ci < rcAll.length; ci++) {
+    if (rcAll[ci].path === cwd) {
+      if (rcAll[ci].title) cwdDevEntry.title = rcAll[ci].title;
+      if (rcAll[ci].icon) cwdDevEntry.icon = rcAll[ci].icon;
+      break;
+    }
+  }
+  var allProjects = [cwdDevEntry];
   var usedSlugs = [slug];
   for (var ri = 0; ri < restorable.length; ri++) {
     var rp = restorable[ri];
     var rpSlug = generateSlug(rp.path, usedSlugs);
     usedSlugs.push(rpSlug);
-    allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, addedAt: rp.addedAt || Date.now() });
+    allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() });
   }
 
   var config = {
     pid: null,
     port: port,
+    host: host,
     pinHash: existingPinHash || (pin ? generateAuthToken(pin) : null),
     tls: hasTls,
     debug: true,
@@ -2352,8 +2414,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/cli-sessions.js

@@ -2,14 +2,9 @@ var fs = require("fs");
 var path = require("path");
 var os = require("os");
 var readline = require("readline");
+var utils = require("./utils");
 
-/**
- * Compute the encoded project directory name used by the Claude CLI.
- * Replaces all "/" with "-", e.g. "/Users/foo/project" -> "-Users-foo-project"
- */
-function encodeCwd(cwd) {
-  return cwd.replace(/\//g, "-");
-}
+var encodeCwd = utils.encodeCwd;
 
 /**
  * Parse the first ~20 lines of a CLI session JSONL file to extract metadata.

package/lib/config.js

@@ -18,6 +18,54 @@ if (!fs.existsSync(CLAY_HOME) && fs.existsSync(LEGACY_HOME)) {
   }
 }
 
+// Auto-migrate dev sessions: merge ~/.clay-dev/sessions/ into ~/.clay/sessions/
+var CLAY_DEV_HOME = path.join(os.homedir(), ".clay-dev");
+var devSessionsRoot = path.join(CLAY_DEV_HOME, "sessions");
+if (fs.existsSync(devSessionsRoot)) {
+  try {
+    var prodSessionsRoot = path.join(CLAY_HOME, "sessions");
+    fs.mkdirSync(prodSessionsRoot, { recursive: true });
+    var projectDirs = fs.readdirSync(devSessionsRoot);
+    var totalMigrated = 0;
+    for (var di = 0; di < projectDirs.length; di++) {
+      var srcDir = path.join(devSessionsRoot, projectDirs[di]);
+      if (!fs.statSync(srcDir).isDirectory()) continue;
+      var destDir = path.join(prodSessionsRoot, projectDirs[di]);
+      fs.mkdirSync(destDir, { recursive: true });
+      var files = fs.readdirSync(srcDir);
+      for (var fi = 0; fi < files.length; fi++) {
+        if (!files[fi].endsWith(".jsonl")) continue;
+        var srcFile = path.join(srcDir, files[fi]);
+        var destFile = path.join(destDir, files[fi]);
+        if (fs.existsSync(destFile)) continue;
+        try {
+          fs.renameSync(srcFile, destFile);
+          totalMigrated++;
+        } catch (e2) {
+          try {
+            fs.copyFileSync(srcFile, destFile);
+            fs.unlinkSync(srcFile);
+            totalMigrated++;
+          } catch (e3) {}
+        }
+      }
+      // Clean up empty project dir
+      try {
+        if (fs.readdirSync(srcDir).length === 0) fs.rmdirSync(srcDir);
+      } catch (e4) {}
+    }
+    if (totalMigrated > 0) {
+      console.log("[config] Migrated " + totalMigrated + " dev session(s) from " + devSessionsRoot + " → " + prodSessionsRoot);
+    }
+    // Clean up empty dev sessions root
+    try {
+      if (fs.readdirSync(devSessionsRoot).length === 0) fs.rmdirSync(devSessionsRoot);
+    } catch (e5) {}
+  } catch (e) {
+    console.error("[config] Dev session migration failed:", e.message);
+  }
+}
+
 var CONFIG_DIR = CLAY_HOME;
 var CLAYRC_PATH = path.join(os.homedir(), ".clayrc");
 var CRASH_INFO_PATH = path.join(CONFIG_DIR, "crash.json");
@@ -28,7 +76,7 @@ function configPath() {
 
 function socketPath() {
   if (process.platform === "win32") {
-    var pipeName = process.env.CLAY_HOME ? "clay-dev-daemon" : "clay-daemon";
+    var pipeName = "clay-daemon";
     return "\\\\.\\pipe\\" + pipeName;
   }
   return path.join(CONFIG_DIR, "daemon.sock");
@@ -69,7 +117,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 {
@@ -83,7 +134,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);
@@ -191,28 +245,52 @@ function syncClayrc(projects) {
       byPath[p.path].slug = p.slug;
       byPath[p.path].lastUsed = Date.now();
       if (p.title) byPath[p.path].title = p.title;
-      else delete byPath[p.path].title;
+      else if ("title" in p) delete byPath[p.path].title;
+      if (p.icon) byPath[p.path].icon = p.icon;
+      else if ("icon" in p) delete byPath[p.path].icon;
     } else {
       // New entry
       byPath[p.path] = {
         path: p.path,
         slug: p.slug,
         title: p.title || undefined,
+        icon: p.icon || undefined,
         addedAt: p.addedAt || Date.now(),
         lastUsed: Date.now(),
       };
     }
   }
 
-  // Rebuild array, sorted by lastUsed descending
-  var all = Object.keys(byPath).map(function (k) { return byPath[k]; });
-  all.sort(function (a, b) { return (b.lastUsed || 0) - (a.lastUsed || 0); });
+  // Active projects first, preserving config order (user's drag-and-drop order),
+  // then inactive recent projects sorted by lastUsed descending
+  var activePaths = {};
+  var ordered = [];
+  for (var k = 0; k < projects.length; k++) {
+    activePaths[projects[k].path] = true;
+    if (byPath[projects[k].path]) ordered.push(byPath[projects[k].path]);
+  }
+  var inactive = [];
+  var paths = Object.keys(byPath);
+  for (var m = 0; m < paths.length; m++) {
+    if (!activePaths[paths[m]]) inactive.push(byPath[paths[m]]);
+  }
+  inactive.sort(function (a, b) { return (b.lastUsed || 0) - (a.lastUsed || 0); });
+  var all = ordered.concat(inactive);
 
   // Keep at most 20 recent projects
   rc.recentProjects = all.slice(0, 20);
   saveClayrc(rc);
 }
 
+function removeFromClayrc(projectPath) {
+  var rc = loadClayrc();
+  var before = (rc.recentProjects || []).length;
+  rc.recentProjects = (rc.recentProjects || []).filter(function (p) {
+    return p.path !== projectPath;
+  });
+  if (rc.recentProjects.length !== before) saveClayrc(rc);
+}
+
 module.exports = {
   CONFIG_DIR: CONFIG_DIR,
   configPath: configPath,
@@ -234,4 +312,5 @@ module.exports = {
   loadClayrc: loadClayrc,
   saveClayrc: saveClayrc,
   syncClayrc: syncClayrc,
+  removeFromClayrc: removeFromClayrc,
 };