clay-server 2.5.0 → 2.6.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

@@ -7,11 +7,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");
@@ -1250,7 +1247,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,7 +1270,7 @@ 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() });
     }
   }
 
@@ -1350,19 +1358,29 @@ 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 = {

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");
@@ -191,28 +239,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 +306,5 @@ module.exports = {
   loadClayrc: loadClayrc,
   saveClayrc: saveClayrc,
   syncClayrc: syncClayrc,
+  removeFromClayrc: removeFromClayrc,
 };

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, writeCrashInfo, readCrashInfo, clearCrashInfo } = require("./config");
+var { loadConfig, saveConfig, socketPath, generateSlug, syncClayrc, removeFromClayrc, writeCrashInfo, readCrashInfo, clearCrashInfo } = require("./config");
 var { createIPCServer } = require("./ipc");
 var { createServer, generateAuthToken } = require("./server");
 
@@ -117,9 +117,16 @@ var relay = createServer({
       if (config.projects[j].slug === slug) { found = true; break; }
     }
     if (!found) return { ok: false, error: "Project not found" };
+    // Find path before removing so we can clean up .clayrc
+    var removedPath = null;
+    for (var rj = 0; rj < config.projects.length; rj++) {
+      if (config.projects[rj].slug === slug) { removedPath = config.projects[rj].path; break; }
+    }
     relay.removeProject(slug);
     config.projects = config.projects.filter(function (p) { return p.slug !== slug; });
     saveConfig(config);
+    // Remove from .clayrc so it doesn't appear in restore prompt
+    if (removedPath) { try { removeFromClayrc(removedPath); } catch (e) {} }
     try { syncClayrc(config.projects); } catch (e) {}
     console.log("[daemon] Removed project (web):", slug);
     relay.broadcastAll({
@@ -129,6 +136,215 @@ var relay = createServer({
     });
     return { ok: true };
   },
+  onReorderProjects: function (slugs) {
+    // Build a slug->project map from current projects
+    var projectMap = {};
+    for (var j = 0; j < config.projects.length; j++) {
+      projectMap[config.projects[j].slug] = config.projects[j];
+    }
+    // Reorder based on the slugs array
+    var reordered = [];
+    for (var k = 0; k < slugs.length; k++) {
+      if (projectMap[slugs[k]]) {
+        reordered.push(projectMap[slugs[k]]);
+        delete projectMap[slugs[k]];
+      }
+    }
+    // Append any remaining projects not in slugs (safety)
+    var remaining = Object.keys(projectMap);
+    for (var m = 0; m < remaining.length; m++) {
+      reordered.push(projectMap[remaining[m]]);
+    }
+    config.projects = reordered;
+    saveConfig(config);
+    try { syncClayrc(config.projects); } catch (e) {}
+    // Also reorder the in-memory Map so getProjects() returns the new order
+    relay.reorderProjects(slugs);
+    relay.broadcastAll({
+      type: "projects_updated",
+      projects: relay.getProjects(),
+      projectCount: config.projects.length,
+    });
+    return { ok: true };
+  },
+  onSetProjectTitle: function (slug, newTitle) {
+    relay.setProjectTitle(slug, newTitle);
+    for (var ti = 0; ti < config.projects.length; ti++) {
+      if (config.projects[ti].slug === slug) {
+        if (newTitle) {
+          config.projects[ti].title = newTitle;
+        } else {
+          delete config.projects[ti].title;
+        }
+        break;
+      }
+    }
+    saveConfig(config);
+    try { syncClayrc(config.projects); } catch (e) {}
+    relay.broadcastAll({
+      type: "projects_updated",
+      projects: relay.getProjects(),
+      projectCount: config.projects.length,
+    });
+    return { ok: true };
+  },
+  onSetProjectIcon: function (slug, newIcon) {
+    relay.setProjectIcon(slug, newIcon);
+    for (var ii = 0; ii < config.projects.length; ii++) {
+      if (config.projects[ii].slug === slug) {
+        if (newIcon) {
+          config.projects[ii].icon = newIcon;
+        } else {
+          delete config.projects[ii].icon;
+        }
+        break;
+      }
+    }
+    saveConfig(config);
+    try { syncClayrc(config.projects); } catch (e) {}
+    relay.broadcastAll({
+      type: "projects_updated",
+      projects: relay.getProjects(),
+      projectCount: config.projects.length,
+    });
+    return { ok: true };
+  },
+  onGetProjectEnv: function (slug) {
+    for (var ei = 0; ei < config.projects.length; ei++) {
+      if (config.projects[ei].slug === slug) {
+        return { envrc: config.projects[ei].envrc || "" };
+      }
+    }
+    return { envrc: "" };
+  },
+  onSetProjectEnv: function (slug, envrc) {
+    for (var ei = 0; ei < config.projects.length; ei++) {
+      if (config.projects[ei].slug === slug) {
+        if (envrc) {
+          config.projects[ei].envrc = envrc;
+        } else {
+          delete config.projects[ei].envrc;
+        }
+        saveConfig(config);
+        return { ok: true };
+      }
+    }
+    return { ok: false, error: "Project not found" };
+  },
+  onGetSharedEnv: function () {
+    return { envrc: config.sharedEnv || "" };
+  },
+  onSetSharedEnv: function (envrc) {
+    if (envrc) {
+      config.sharedEnv = envrc;
+    } else {
+      delete config.sharedEnv;
+    }
+    saveConfig(config);
+    return { ok: true };
+  },
+  onGetServerDefaultEffort: function () {
+    return { effort: config.defaultEffort || null };
+  },
+  onSetServerDefaultEffort: function (effort) {
+    if (effort) {
+      config.defaultEffort = effort;
+    } else {
+      delete config.defaultEffort;
+    }
+    saveConfig(config);
+    return { ok: true };
+  },
+  onGetProjectDefaultEffort: function (slug) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        return { effort: config.projects[i].defaultEffort || null };
+      }
+    }
+    return { effort: null };
+  },
+  onSetProjectDefaultEffort: function (slug, effort) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        if (effort) {
+          config.projects[i].defaultEffort = effort;
+        } else {
+          delete config.projects[i].defaultEffort;
+        }
+        saveConfig(config);
+        return { ok: true };
+      }
+    }
+    return { ok: false, error: "Project not found" };
+  },
+  onGetServerDefaultModel: function () {
+    return { model: config.defaultModel || null };
+  },
+  onSetServerDefaultModel: function (model) {
+    if (model) {
+      config.defaultModel = model;
+    } else {
+      delete config.defaultModel;
+    }
+    saveConfig(config);
+    return { ok: true };
+  },
+  onGetProjectDefaultModel: function (slug) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        return { model: config.projects[i].defaultModel || null };
+      }
+    }
+    return { model: null };
+  },
+  onSetProjectDefaultModel: function (slug, model) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        if (model) {
+          config.projects[i].defaultModel = model;
+        } else {
+          delete config.projects[i].defaultModel;
+        }
+        saveConfig(config);
+        return { ok: true };
+      }
+    }
+    return { ok: false, error: "Project not found" };
+  },
+  onGetServerDefaultMode: function () {
+    return { mode: config.defaultMode || null };
+  },
+  onSetServerDefaultMode: function (mode) {
+    if (mode) {
+      config.defaultMode = mode;
+    } else {
+      delete config.defaultMode;
+    }
+    saveConfig(config);
+    return { ok: true };
+  },
+  onGetProjectDefaultMode: function (slug) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        return { mode: config.projects[i].defaultMode || null };
+      }
+    }
+    return { mode: null };
+  },
+  onSetProjectDefaultMode: function (slug, mode) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        if (mode) {
+          config.projects[i].defaultMode = mode;
+        } else {
+          delete config.projects[i].defaultMode;
+        }
+        saveConfig(config);
+        return { ok: true };
+      }
+    }
+    return { ok: false, error: "Project not found" };
+  },
   onGetDaemonConfig: function () {
     return {
       port: config.port,
@@ -179,7 +395,7 @@ for (var i = 0; i < projects.length; i++) {
   var p = projects[i];
   if (fs.existsSync(p.path)) {
     console.log("[daemon] Adding project:", p.slug, "→", p.path);
-    relay.addProject(p.path, p.slug, p.title);
+    relay.addProject(p.path, p.slug, p.title, p.icon);
   } else {
     console.log("[daemon] Skipping missing project:", p.path);
   }
@@ -207,6 +423,11 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       saveConfig(config);
       try { syncClayrc(config.projects); } catch (e) {}
       console.log("[daemon] Added project:", slug, "→", absPath);
+      relay.broadcastAll({
+        type: "projects_updated",
+        projects: relay.getProjects(),
+        projectCount: config.projects.length,
+      });
       return { ok: true, slug: slug };
     }
 
@@ -228,6 +449,11 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       saveConfig(config);
       try { syncClayrc(config.projects); } catch (e) {}
       console.log("[daemon] Removed project:", target);
+      relay.broadcastAll({
+        type: "projects_updated",
+        projects: relay.getProjects(),
+        projectCount: config.projects.length,
+      });
       return { ok: true };
     }
 
@@ -266,6 +492,11 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       saveConfig(config);
       try { syncClayrc(config.projects); } catch (e) {}
       console.log("[daemon] Project title:", msg.slug, "→", newTitle || "(default)");
+      relay.broadcastAll({
+        type: "projects_updated",
+        projects: relay.getProjects(),
+        projectCount: config.projects.length,
+      });
       return { ok: true };
     }
 

package/lib/notes.js

@@ -2,12 +2,13 @@ var fs = require("fs");
 var path = require("path");
 var crypto = require("crypto");
 var config = require("./config");
+var utils = require("./utils");
 
 function createNotesManager(opts) {
   var cwd = opts.cwd;
 
-  // Storage path: ~/.claude-relay/notes/{encodedCwd}.json
-  var encodedCwd = cwd.replace(/\//g, "-");
+  // Storage path: ~/.clay/notes/{encodedCwd}.json
+  var encodedCwd = utils.encodeCwd(cwd);
   var notesDir = path.join(config.CONFIG_DIR, "notes");
   var notesFile = path.join(notesDir, encodedCwd + ".json");