clay-server 2.22.1 → 2.22.2-beta.1

package/bin/cli.js

@@ -2011,14 +2011,6 @@ function showMainMenu(config, ip, setupCode) {
         log("");
       }
 
-      // Always show setup code if one exists (persists until admin is created)
-      var displayCode = setupCode || getSetupCode();
-      if (displayCode) {
-        log("  " + a.yellow + sym.warn + " Setup code:  " + a.bold + displayCode + a.reset);
-        log("  " + a.dim + "Open Clay in your browser and enter this code to create the admin account." + a.reset);
-        log("");
-      }
-
       showMenuItems();
     }
 
@@ -2036,7 +2028,6 @@ function showMainMenu(config, ip, setupCode) {
 
     function showMenuItems() {
       var items = [
-        { label: "Setup notifications", value: "notifications" },
         { label: "Settings", value: "settings" },
         { label: "Shut down server", value: "shutdown" },
         { label: "Keep server alive & exit", value: "exit" },
@@ -2044,13 +2035,6 @@ function showMainMenu(config, ip, setupCode) {
 
       promptSelect("What would you like to do?", items, function (choice) {
         switch (choice) {
-          case "notifications":
-            showSetupGuide(config, ip, function () {
-              config = loadConfig() || config;
-              showMainMenu(config, ip);
-            });
-            break;
-
           case "settings":
             showSettingsMenu(config, ip);
             break;
@@ -2109,190 +2093,6 @@ function showMainMenu(config, ip, setupCode) {
 // ==============================
 // Setup guide (2x2 toggle flow)
 // ==============================
-function showSetupGuide(config, ip, goBack) {
-  var protocol = config.tls ? "https" : "http";
-  var wantRemote = false;
-  var wantPush = false;
-
-  console.clear();
-  printLogo();
-  log("");
-  log(sym.pointer + "  " + a.bold + "Setup Notifications" + a.reset);
-  log(sym.bar);
-
-  function redraw(renderFn) {
-    console.clear();
-    printLogo();
-    log("");
-    log(sym.pointer + "  " + a.bold + "Setup Notifications" + a.reset);
-    log(sym.bar);
-    if (wantRemote) log(sym.done + "  Access from outside your network? " + a.dim + "·" + a.reset + " " + a.green + "Yes" + a.reset);
-    else log(sym.done + "  Access from outside your network? " + a.dim + "· No" + a.reset);
-    log(sym.bar);
-    if (wantPush) log(sym.done + "  Want push notifications? " + a.dim + "·" + a.reset + " " + a.green + "Yes" + a.reset);
-    else log(sym.done + "  Want push notifications? " + a.dim + "· No" + a.reset);
-    log(sym.bar);
-    renderFn();
-  }
-
-  promptToggle("Access from outside your network?", "Requires Tailscale on both devices", false, function (remote) {
-    wantRemote = remote;
-    log(sym.bar);
-    promptToggle("Want push notifications?", "Requires HTTPS", false, function (push) {
-      wantPush = push;
-      log(sym.bar);
-      afterToggles();
-    });
-  });
-
-  function afterToggles() {
-    if (!wantRemote && !wantPush) {
-      log(sym.done + "  " + a.green + "All set!" + a.reset + a.dim + " · No additional setup needed." + a.reset);
-      log(sym.end);
-      log("");
-      promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
-        goBack();
-      });
-      return;
-    }
-    if (wantRemote) {
-      renderTailscale();
-    } else {
-      renderHttps();
-    }
-  }
-
-  function renderTailscale() {
-    var tsIP = getTailscaleIP();
-
-    log(sym.pointer + "  " + a.bold + "Tailscale Setup" + a.reset);
-    if (tsIP) {
-      log(sym.bar + "  " + a.green + "Tailscale is running" + a.reset + a.dim + " · " + tsIP + a.reset);
-      log(sym.bar);
-      log(sym.bar + "  On your phone/tablet:");
-      log(sym.bar + "  " + a.dim + "1. Install Tailscale (App Store / Google Play)" + a.reset);
-      log(sym.bar + "  " + a.dim + "2. Sign in with the same account" + a.reset);
-      log(sym.bar);
-      renderHttps();
-    } else {
-      log(sym.bar + "  " + a.yellow + "Tailscale not found on this machine." + a.reset);
-      log(sym.bar + "  " + a.dim + "Install: " + a.reset + "https://tailscale.com/download");
-      log(sym.bar + "  " + a.dim + "Then run: " + a.reset + "tailscale up");
-      log(sym.bar);
-      log(sym.bar + "  On your phone/tablet:");
-      log(sym.bar + "  " + a.dim + "1. Install Tailscale (App Store / Google Play)" + a.reset);
-      log(sym.bar + "  " + a.dim + "2. Sign in with the same account" + a.reset);
-      log(sym.bar);
-      promptSelect("Select", [
-        { label: "Re-check", value: "recheck" },
-        { label: "Back", value: "back" },
-      ], function (choice) {
-        if (choice === "recheck") {
-          redraw(renderTailscale);
-        } else {
-          goBack();
-        }
-      });
-    }
-  }
-
-  function renderHttps() {
-    if (!wantPush) {
-      showSetupQR();
-      return;
-    }
-
-    // Builtin cert: HTTPS already active, skip mkcert flow entirely
-    if (config.builtinCert) {
-      log(sym.pointer + "  " + a.bold + "HTTPS" + a.reset + a.dim + " · Enabled (builtin certificate)" + a.reset);
-      log(sym.bar);
-      showSetupQR();
-      return;
-    }
-
-    // mkcert flow (--mkcert or fallback)
-    var mcReady = hasMkcert();
-    log(sym.pointer + "  " + a.bold + "HTTPS Setup (for push notifications)" + a.reset);
-    if (mcReady) {
-      log(sym.bar + "  " + a.green + "mkcert is installed" + a.reset);
-      if (!config.tls) {
-        log(sym.bar + "  " + a.dim + "Restarting server with HTTPS..." + a.reset);
-        restartDaemonWithTLS(config, function (newConfig) {
-          config = newConfig;
-          log(sym.bar);
-          showSetupQR();
-        });
-        return;
-      }
-      log(sym.bar);
-      showSetupQR();
-    } else {
-      log(sym.bar + "  " + a.yellow + "mkcert not found." + a.reset);
-      var mkcertHint = process.platform === "win32"
-        ? "choco install mkcert && mkcert -install"
-        : process.platform === "darwin"
-          ? "brew install mkcert && mkcert -install"
-          : "apt install mkcert && mkcert -install";
-      log(sym.bar + "  " + a.dim + "Install: " + a.reset + mkcertHint);
-      log(sym.bar);
-      promptSelect("Select", [
-        { label: "Re-check", value: "recheck" },
-        { label: "Back", value: "back" },
-      ], function (choice) {
-        if (choice === "recheck") {
-          redraw(renderHttps);
-        } else {
-          goBack();
-        }
-      });
-    }
-  }
-
-  function showSetupQR() {
-    var tsIP = getTailscaleIP();
-    var lanIP = null;
-    if (!wantRemote) {
-      var allIPs = getAllIPs();
-      for (var j = 0; j < allIPs.length; j++) {
-        if (!allIPs[j].startsWith("100.")) { lanIP = allIPs[j]; break; }
-      }
-    }
-    var setupIP = wantRemote ? (tsIP || ip) : (lanIP || ip);
-    var setupQuery = wantRemote ? "" : "?mode=lan";
-    // Builtin cert: link directly to the app with push notification guide
-    // mkcert: use HTTP onboarding server for CA install flow
-    var setupUrl;
-    if (config.builtinCert) {
-      setupUrl = toClayStudioUrl(setupIP, config.port, "https") + "/pwa";
-    } else if (config.tls) {
-      setupUrl = "http://" + setupIP + ":" + (config.port + 1) + "/setup" + setupQuery;
-    } else {
-      setupUrl = "http://" + setupIP + ":" + config.port + "/setup" + setupQuery;
-    }
-    log(sym.pointer + "  " + a.bold + "Continue on your device" + a.reset);
-    log(sym.bar + "  " + a.dim + "Scan the QR code or open:" + a.reset);
-    log(sym.bar + "  " + a.bold + setupUrl + a.reset);
-    log(sym.bar);
-    qrcode.generate(setupUrl, { small: !isBasicTerm }, function (code) {
-      var lines = code.split("\n").map(function (l) { return "  " + sym.bar + "  " + l; }).join("\n");
-      console.log(lines);
-      log(sym.bar);
-      if (wantRemote) {
-        log(sym.bar + "  " + a.dim + "Can't connect? Make sure Tailscale is installed on your phone too." + a.reset);
-      } else {
-        log(sym.bar + "  " + a.dim + "Can't connect? Your phone must be on the same Wi-Fi network." + a.reset);
-      }
-      log(sym.bar);
-      log(sym.done + "  " + a.dim + "Setup complete." + a.reset);
-      log(sym.end);
-      log("");
-      promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
-        goBack();
-      });
-    });
-  }
-}
-
 // ==============================
 // Settings sub-menu
 // ==============================
@@ -2308,16 +2108,6 @@ function showSettingsMenu(config, ip) {
     log(sym.bar);
 
     // Detect current state
-    var tsIP = getTailscaleIP();
-    var tsOk = tsIP !== null;
-    var mcOk = hasMkcert();
-
-    var tsStatus = tsOk
-      ? a.green + "Connected" + a.reset + a.dim + " · " + tsIP + a.reset
-      : a.dim + "Not detected" + a.reset;
-    var mcStatus = mcOk
-      ? a.green + "Installed" + a.reset
-      : a.dim + "Not found" + a.reset;
     var tlsStatus = config.tls
       ? a.green + "Enabled" + a.reset
       : a.dim + "Disabled" + a.reset;
@@ -2328,8 +2118,6 @@ function showSettingsMenu(config, ip) {
       ? a.green + "On" + a.reset
       : a.dim + "Off" + a.reset;
 
-    log(sym.bar + "  Tailscale    " + tsStatus);
-    log(sym.bar + "  mkcert       " + mcStatus);
     log(sym.bar + "  HTTPS        " + tlsStatus);
     var muEnabled = isMultiUser();
     var muStatus = muEnabled
@@ -2355,9 +2143,7 @@ function showSettingsMenu(config, ip) {
     log(sym.bar);
 
     // Build items
-    var items = [
-      { label: "Setup notifications", value: "guide" },
-    ];
+    var items = [];
 
     if (!muEnabled) {
       if (config.pinHash) {
@@ -2392,13 +2178,6 @@ function showSettingsMenu(config, ip) {
 
   promptSelect("Select", items, function (choice) {
     switch (choice) {
-      case "guide":
-        showSetupGuide(config, ip, function () {
-          config = loadConfig() || config;
-          showSettingsMenu(config, ip);
-        });
-        break;
-
       case "pin":
         log(sym.bar);
         promptPin(function (pin) {

package/lib/daemon.js

@@ -1343,25 +1343,43 @@ if (config.keepAwake && process.platform === "darwin") {
 // --- Spawn new daemon and graceful restart ---
 function spawnAndRestart() {
   try {
-    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);
+    ipc.close();
+    relay.destroyAll();
+    if (relay.onboardingServer) relay.onboardingServer.close();
+
+    // Close the server first so the port is released before spawning the new daemon
+    relay.server.close(function () {
+      try {
+        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 + "), exiting.");
+        process.exit(120);
+      } catch (e) {
+        console.error("[daemon] Restart failed:", e.message);
+        process.exit(1);
+      }
+    });
+
+    // Force exit after 5 seconds if server.close hangs
+    setTimeout(function () {
+      console.error("[daemon] Forced exit after timeout during restart");
+      process.exit(1);
+    }, 5000);
   } catch (e) {
     console.error("[daemon] Restart failed:", e.message);
     relay.broadcastAll({ type: "toast", level: "error", message: "Restart failed: " + e.message });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.22.1",
+  "version": "2.22.2-beta.1",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",