clay-server 2.33.1 → 2.34.0-beta.10

package/lib/ask-user-mcp-server.js

@@ -0,0 +1,120 @@
+// Ask User MCP Server for Clay
+// Provides a mate-only ask_user_questions tool that reuses the existing
+// AskUserQuestion UI and ask_user_response flow.
+
+var z;
+try { z = require("zod"); } catch (e) { z = null; }
+
+// Returns a Zod "shape" object (property -> zod field) matching what
+// Claude SDK's `sdk.tool()` expects. Do NOT wrap in z.object() here —
+// the SDK does that internally.
+//
+// The schema is deliberately tight: options are required (2-6), each with
+// a label and a short description. This pushes Codex (which treats the
+// schema as a loose hint) toward producing well-structured multiple-choice
+// cards instead of a bare "Other..." text field.
+function buildQuestionShape() {
+  if (!z) return {};
+
+  var optionSchema = z.object({
+    label: z.string().min(1).max(60)
+      .describe("Short button label, 1-6 words. Shown as the primary option text."),
+    description: z.string().min(1).max(160)
+      .describe("One-line clarifier shown under the label. Concrete example or scope."),
+    markdown: z.string().optional()
+      .describe("Optional longer markdown body shown on expand. Use sparingly."),
+  }).passthrough();
+
+  var questionSchema = z.object({
+    header: z.string().min(1).max(40)
+      .describe("Short ALL-CAPS-ish section header above the question (e.g. 'FIRST THINGS FIRST', 'SCOPE'). Gives the user context for this step."),
+    question: z.string().min(1)
+      .describe("The actual question in natural spoken tone. Be specific, not generic."),
+    multiSelect: z.boolean().optional()
+      .describe("Set true only when multiple answers genuinely make sense. Default false."),
+    options: z.array(optionSchema).min(2).max(6)
+      .describe("Concrete options. Preferred count is 4; acceptable range is 2-6. FOUR is the target. Do NOT default to 3 out of habit. If you can only think of 3, push yourself: add a scope variant, edge case, or 'combined' option as the 4th. Only drop below 4 when the answer space is genuinely narrower (e.g. yes/no/unsure). Never include an 'Other' option yourself (the UI renders one automatically)."),
+  }).passthrough();
+
+  return {
+    questions: z.array(questionSchema).min(1).max(3)
+      .describe("One to three question objects to show together as a card. Prefer ONE focused question per call."),
+  };
+}
+
+var TOOL_DESCRIPTION = [
+  "Ask the user a structured multiple-choice question. Renders as a card with a header, the question, 2-6 clickable option buttons, and an always-present 'Other...' free-text field.",
+  "",
+  "WHEN TO USE:",
+  "- Interviewing the user at mate setup, or whenever you need to narrow scope before acting.",
+  "- Any branching decision where 2-6 concrete choices cover most of the space.",
+  "",
+  "REQUIRED STRUCTURE (all fields matter, do not skip):",
+  "- header: short section label, like 'FIRST THINGS FIRST' or 'SCOPE'. Gives context.",
+  "- question: one specific question in natural tone. Avoid generic 'how can I help?'.",
+  "- options: ALWAYS provide FOUR options by default. Acceptable range is 4-6; only drop to 3 if the answer space is genuinely binary-plus-one (rare). Each option has a short label (1-6 words) AND a one-line description giving a concrete example or scope. The UI already renders an 'Other...' text field, so you never need to include an 'Other' option yourself.",
+  "- multiSelect: omit or false unless multiple answers clearly apply.",
+  "",
+  "ON OPTION COUNT (IMPORTANT):",
+  "- Default to 4 options. Not 3. Models tend to gravitate to 3 because it feels tidy; resist that.",
+  "- If you're about to produce 3 options, stop and think: is there a fourth axis you're missing? A scope variant? A 'both' or 'neither'? A more niche case? Add it.",
+  "- 3 is only acceptable when the fourth option would be truly degenerate (e.g. yes/no/unsure).",
+  "- 5 or 6 is fine when the space is wide; don't cram.",
+  "",
+  "GOOD EXAMPLE:",
+  '  { header: "FIRST THINGS FIRST",',
+  '    question: "\'Language\' is broad, what do you actually want help with?",',
+  '    options: [',
+  '      { label: "A new language from scratch", description: "Pick up a language you don\'t speak yet (e.g. Japanese, Spanish)" },',
+  '      { label: "Sharpen English",             description: "Level up your English, writing, speaking, nuance, executive communication" },',
+  '      { label: "Sharpen Korean",              description: "Polish your Korean, writing style, formal register, etc." },',
+  '      { label: "Teach me how to teach",       description: "Help you teach language to others, like Elyse or team members" }',
+  "    ] }",
+  "",
+  "BAD EXAMPLES (do not do this):",
+  "- Asking a vague question with no options and relying on the Other field.",
+  "- Options with only labels and no descriptions.",
+  "- Defaulting to exactly 3 options out of habit. Aim for 4.",
+  "- More than one question per call unless they are tightly related.",
+  "- Single-option 'questions' (use a plain message instead).",
+].join("\n");
+
+function getToolDefs(onAsk) {
+  var tools = [];
+
+  tools.push({
+    name: "ask_user_questions",
+    description: TOOL_DESCRIPTION,
+    inputSchema: buildQuestionShape(),
+    handler: function (args) {
+      if (!args || !Array.isArray(args.questions) || args.questions.length === 0) {
+        return Promise.resolve({
+          content: [{ type: "text", text: "Error: questions must be a non-empty array." }],
+          isError: true,
+        });
+      }
+      // Defensive structural check only: zod already enforces min 2.
+      // We do NOT reject on "only 3 options" — that's a soft preference
+      // expressed via the tool description, not a hard validation rule.
+      for (var i = 0; i < args.questions.length; i++) {
+        var q = args.questions[i];
+        if (!q || !Array.isArray(q.options) || q.options.length < 2) {
+          return Promise.resolve({
+            content: [{
+              type: "text",
+              text: "Error: question " + (i + 1) + " must include at least 2 options. "
+                + "Provide concrete { label, description } choices (4 preferred). "
+                + "The UI already shows an 'Other...' free-text field, so never add an 'Other' option yourself.",
+            }],
+            isError: true,
+          });
+        }
+      }
+      return onAsk(args);
+    },
+  });
+
+  return tools;
+}
+
+module.exports = { getToolDefs: getToolDefs };

package/lib/config.js

@@ -2,31 +2,27 @@ var fs = require("fs");
 var path = require("path");
 var os = require("os");
 var net = require("net");
+var execFileSync = require("child_process").execFileSync;
+
+function isSafeSystemUserName(name) {
+  return typeof name === "string" && /^[a-z_][a-z0-9_-]*[$]?$/.test(name);
+}
 
 // When running under sudo, resolve the real user's home directory
 // so that ~/.clay/ points to the original user's data, not /root/.clay/
 function getRealHome() {
   var sudoUser = process.env.SUDO_USER;
-  if (sudoUser && sudoUser !== "root") {
+  if (sudoUser && sudoUser !== "root" && isSafeSystemUserName(sudoUser)) {
     // 1. Try getent passwd (works on most Linux, may fail with some NSS configs)
     try {
-      var entry = require("child_process")
-        .execSync("getent passwd " + sudoUser, { encoding: "utf8", timeout: 3000 })
-        .trim();
+      var entry = execFileSync("getent", ["passwd", sudoUser], { encoding: "utf8", timeout: 3000 }).trim();
       var home = entry.split(":")[5];
       if (home && fs.existsSync(home)) return home;
     } catch (e) {}
-    // 2. Try shell expansion of ~USER
-    try {
-      var home = require("child_process")
-        .execSync("eval echo ~" + sudoUser, { encoding: "utf8", timeout: 3000 })
-        .trim();
-      if (home && home !== "~" + sudoUser && fs.existsSync(home)) return home;
-    } catch (e2) {}
-    // 3. Direct path fallback (GCE, cloud VMs)
+    // 2. Direct path fallback (GCE, cloud VMs)
     var directHome = "/home/" + sudoUser;
     if (fs.existsSync(directHome)) return directHome;
-    // 4. SUDO_USER's original HOME (some sudo configs preserve it)
+    // 3. SUDO_USER's original HOME (some sudo configs preserve it)
     if (process.env.SUDO_HOME && fs.existsSync(process.env.SUDO_HOME)) return process.env.SUDO_HOME;
   }
   return os.homedir();

package/lib/daemon.js

@@ -53,11 +53,11 @@ console.log("[daemon] UID: " + (typeof process.getuid === "function" ? process.g
 
 // --- OS users mode: check required system dependencies ---
 if (config.osUsers) {
-  var { execSync: checkExec } = require("child_process");
+  var checkExec = require("child_process").execFileSync;
   var missing = [];
-  try { checkExec("which setfacl", { stdio: "ignore" }); } catch (e) { missing.push("acl (setfacl)"); }
-  try { checkExec("which git", { stdio: "ignore" }); } catch (e) { missing.push("git"); }
-  try { checkExec("which useradd", { stdio: "ignore" }); } catch (e) { missing.push("useradd"); }
+  try { checkExec("which", ["setfacl"], { stdio: "ignore" }); } catch (e) { missing.push("acl (setfacl)"); }
+  try { checkExec("which", ["git"], { stdio: "ignore" }); } catch (e) { missing.push("git"); }
+  try { checkExec("which", ["useradd"], { stdio: "ignore" }); } catch (e) { missing.push("useradd"); }
   if (missing.length > 0) {
     console.error("[daemon] OS users mode requires missing system packages: " + missing.join(", "));
     console.error("[daemon] Install with:  sudo apt install " + missing.map(function (m) { return m.split(" ")[0]; }).join(" "));
@@ -179,7 +179,7 @@ var relay = createServer({
   onCreateProject: function (projectName, wsUser) {
     console.log("[daemon] onCreateProject wsUser:", JSON.stringify(wsUser ? { id: wsUser.id, role: wsUser.role, username: wsUser.username, linuxUser: wsUser.linuxUser } : null));
     var os = require("os");
-    var { execSync } = require("child_process");
+    var execFileSync = require("child_process").execFileSync;
     var baseDir;
     if (config.osUsers) {
       baseDir = "/var/clay/projects";
@@ -199,21 +199,23 @@ var relay = createServer({
         if (linuxUser) {
           var uidGid = null;
           try {
-            var passwdLine = execSync("id -u " + linuxUser + " && id -g " + linuxUser, { encoding: "utf8" }).trim().split("\n");
-            uidGid = { uid: parseInt(passwdLine[0], 10), gid: parseInt(passwdLine[1], 10) };
+            uidGid = {
+              uid: parseInt(execFileSync("id", ["-u", linuxUser], { encoding: "utf8", stdio: "pipe" }).trim(), 10),
+              gid: parseInt(execFileSync("id", ["-g", linuxUser], { encoding: "utf8", stdio: "pipe" }).trim(), 10),
+            };
           } catch (e) {}
           if (uidGid) {
             fs.chmodSync(targetDir, 0o700);
-            execSync("chown -R " + linuxUser + ":" + linuxUser + " " + JSON.stringify(targetDir));
-            execSync("git init", { cwd: targetDir, uid: uidGid.uid, gid: uidGid.gid, env: { PATH: "/usr/local/bin:/usr/bin:/bin" } });
+            execFileSync("chown", ["-R", linuxUser + ":" + linuxUser, targetDir]);
+            execFileSync("git", ["init"], { cwd: targetDir, uid: uidGid.uid, gid: uidGid.gid, env: { PATH: "/usr/local/bin:/usr/bin:/bin" } });
           } else {
-            execSync("git init", { cwd: targetDir });
+            execFileSync("git", ["init"], { cwd: targetDir });
           }
         } else {
-          execSync("git init", { cwd: targetDir });
+          execFileSync("git", ["init"], { cwd: targetDir });
         }
       } else {
-        execSync("git init", { cwd: targetDir });
+        execFileSync("git", ["init"], { cwd: targetDir });
       }
     } catch (e) {
       try { fs.rmSync(targetDir, { recursive: true, force: true }); } catch (ce) {}
@@ -245,7 +247,8 @@ var relay = createServer({
   },
   onCloneProject: function (cloneUrl, wsUser, callback) {
     var os = require("os");
-    var { spawn, execSync } = require("child_process");
+    var spawn = require("child_process").spawn;
+    var execFileSync = require("child_process").execFileSync;
     var baseDir;
     if (config.osUsers) {
       baseDir = "/var/clay/projects";
@@ -262,9 +265,8 @@ var relay = createServer({
     var spawnOpts = { cwd: baseDir };
     if (config.osUsers && wsUser && wsUser.linuxUser) {
       try {
-        var passwdLine = execSync("id -u " + wsUser.linuxUser + " && id -g " + wsUser.linuxUser, { encoding: "utf8" }).trim().split("\n");
-        spawnOpts.uid = parseInt(passwdLine[0], 10);
-        spawnOpts.gid = parseInt(passwdLine[1], 10);
+        spawnOpts.uid = parseInt(execFileSync("id", ["-u", wsUser.linuxUser], { encoding: "utf8", stdio: "pipe" }).trim(), 10);
+        spawnOpts.gid = parseInt(execFileSync("id", ["-g", wsUser.linuxUser], { encoding: "utf8", stdio: "pipe" }).trim(), 10);
         spawnOpts.env = Object.assign({}, process.env, {
           HOME: "/home/" + wsUser.linuxUser,
           USER: wsUser.linuxUser
@@ -304,7 +306,7 @@ var relay = createServer({
       if (config.osUsers && wsUser && wsUser.linuxUser) {
         try {
           fs.chmodSync(targetDir, 0o700);
-          execSync("chown -R " + wsUser.linuxUser + ":" + wsUser.linuxUser + " " + JSON.stringify(targetDir));
+          execFileSync("chown", ["-R", wsUser.linuxUser + ":" + wsUser.linuxUser, targetDir]);
         } catch (e) {}
       }
       // Register project - creator always becomes owner
@@ -902,6 +904,47 @@ var relay = createServer({
   },
 });
 
+var IDLE_MS = Number(process.env.CLAY_CODEX_IDLE_MS) || 5 * 60 * 1000;
+var REAP_MS = Number(process.env.CLAY_CODEX_REAPER_MS) || 60 * 1000;
+var reaperHandle = setInterval(function () {
+  if (!relay || typeof relay.forEachProject !== "function") return;
+  relay.forEachProject(function (ctx) {
+    try {
+      if (ctx && ctx.adapters && ctx.adapters.codex && typeof ctx.adapters.codex.shutdownIfIdle === "function") {
+        var result = ctx.adapters.codex.shutdownIfIdle(IDLE_MS);
+        if (result && typeof result.catch === "function") {
+          result.catch(function (e) {
+            console.error("[daemon] Codex idle reclaim failed:", e && e.message ? e.message : e);
+          });
+        }
+      }
+    } catch (e) {}
+  });
+}, REAP_MS);
+if (reaperHandle && typeof reaperHandle.unref === "function") {
+  reaperHandle.unref();
+}
+
+function stopCodexReaper() {
+  if (reaperHandle) {
+    clearInterval(reaperHandle);
+    reaperHandle = null;
+  }
+}
+
+function shutdownProjects() {
+  stopCodexReaper();
+  try {
+    var result = relay.destroyAll();
+    if (result && typeof result.then === "function") {
+      return result;
+    }
+    return Promise.resolve(true);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+}
+
 // Worktree tracking extracted to daemon-projects.js
 
 // --- Register projects ---
@@ -1303,41 +1346,48 @@ function spawnAndRestart() {
   try {
     updateHandoff = true;
     ipc.close();
-    relay.destroyAll();
-    if (relay.onboardingServer) relay.onboardingServer.close();
+    shutdownProjects().then(function () {
+      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);
+      // 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);
+        }
+      });
+    }).catch(function (e) {
+      console.error("[daemon] Restart shutdown failed:", e && e.message ? e.message : e);
+      if (relay.onboardingServer) relay.onboardingServer.close();
+      relay.server.close(function () {
         process.exit(1);
-      }
+      });
     });
 
-    // Force exit after 5 seconds if server.close hangs
+    // Force exit after 10 seconds if server.close hangs
     setTimeout(function () {
       console.error("[daemon] Forced exit after timeout during restart");
       process.exit(1);
-    }, 5000);
+    }, 10000);
   } catch (e) {
     console.error("[daemon] Restart failed:", e.message);
     relay.broadcastAll({ type: "toast", level: "error", message: "Restart failed: " + e.message });
@@ -1347,9 +1397,12 @@ function spawnAndRestart() {
 
 // --- Graceful shutdown ---
 var updateHandoff = false; // true when shutting down for update (new daemon already spawned)
+var shutdownStarted = false;
 
 function gracefulShutdown() {
   try { console.log("[daemon] Shutting down..."); } catch (e) {}
+  if (shutdownStarted) return;
+  shutdownStarted = true;
   var exitCode = updateHandoff ? 120 : 0; // 120 = update handoff, don't auto-restart
 
   if (caffeinateProc) {
@@ -1369,22 +1422,30 @@ function gracefulShutdown() {
     } catch (e) {}
   }
 
-  relay.destroyAll();
-
-  if (relay.onboardingServer) {
-    relay.onboardingServer.close();
-  }
+  shutdownProjects().then(function () {
+    if (relay.onboardingServer) {
+      relay.onboardingServer.close();
+    }
 
-  relay.server.close(function () {
-    try { console.log("[daemon] Server closed"); } catch (e) {}
-    process.exit(exitCode);
+    relay.server.close(function () {
+      try { console.log("[daemon] Server closed"); } catch (e) {}
+      process.exit(exitCode);
+    });
+  }).catch(function (e) {
+    console.error("[daemon] Shutdown cleanup failed:", e && e.message ? e.message : e);
+    if (relay.onboardingServer) {
+      relay.onboardingServer.close();
+    }
+    relay.server.close(function () {
+      process.exit(exitCode);
+    });
   });
 
-  // Force exit after 5 seconds
+  // Force exit after 10 seconds
   setTimeout(function () {
     try { console.error("[daemon] Forced exit after timeout"); } catch (e) {}
     process.exit(1);
-  }, 5000);
+  }, 10000);
 }
 
 process.on("SIGTERM", gracefulShutdown);