clay-server 2.39.0-beta.1 → 2.39.0-beta.3

package/lib/claude-hook-installer.js

@@ -0,0 +1,245 @@
+// claude-hook-installer.js
+//
+// Registers Clay's notification webhook in `~/.claude/settings.json` so the
+// `claude` CLI fires a request to the Clay daemon whenever it surfaces a
+// Notification (permission requests, idle prompts, etc.). This is what makes
+// TUI sessions feel like first-class Clay sessions: the user gets the same
+// toasts and push notifications they would in GUI mode.
+//
+// Design notes:
+//   - Settings merge is idempotent: existing hooks are preserved, ours are
+//     identified by a marker substring so re-runs don't duplicate them.
+//   - The hook command uses curl with --max-time / --connect-timeout so that
+//     a downed daemon can't stall claude's UI for more than ~1s.
+//   - Multi-user mode: caller passes one home directory per OS user; we
+//     write each user's own settings.json so per-user filtering works.
+
+var fs = require("fs");
+var path = require("path");
+
+// Substring that uniquely identifies a Clay-installed hook entry so we can
+// safely remove/replace it without touching user-authored hooks.
+var CLAY_HOOK_MARKER = "clay:tui-notify";
+
+// Allow-patterns Clay manages in ~/.claude/settings.json `permissions.allow`.
+// These mirror sdk-bridge.js `checkToolWhitelist` so TUI sessions get the
+// same auto-approval convenience as SDK sessions. Conservative: only
+// commands that stay safe even under Claude Code's prefix matching (compound
+// commands like `ls && rm -rf /` would otherwise sneak past `Bash(ls:*)`).
+//
+// User-authored entries are preserved -- on re-install we only strip
+// patterns that appear in this constant list.
+var CLAY_MANAGED_ALLOW = [
+  // Read-only built-in tools (no side effects).
+  "Read", "Glob", "Grep", "WebFetch", "WebSearch",
+
+  // Clay's own MCP servers. Strictly read/safe by design.
+  "mcp__clay-browser__browser_watch_tab",
+  "mcp__clay-browser__browser_unwatch_tab",
+  "mcp__clay-debate__propose_debate",
+  "mcp__clay-datastore__*",
+  "mcp__clay-history__*",
+  // Email: read-side only. Send / reply / mark_read still prompt.
+  "mcp__clay-email__clay_read_email",
+  "mcp__clay-email__clay_read_email_body",
+  "mcp__clay-email__clay_search_email",
+  "mcp__clay-email__clay_list_labels",
+
+  // Safe Bash commands. Match the curated set in sdk-bridge.js's
+  // safeBashCommands, restricted to ones whose pure read-only behavior
+  // doesn't depend on argument shape.
+  "Bash(ls:*)", "Bash(cat:*)", "Bash(head:*)", "Bash(tail:*)", "Bash(wc:*)",
+  "Bash(file:*)", "Bash(stat:*)", "Bash(find:*)", "Bash(tree:*)",
+  "Bash(du:*)", "Bash(df:*)", "Bash(readlink:*)", "Bash(realpath:*)",
+  "Bash(basename:*)", "Bash(dirname:*)",
+  "Bash(grep:*)", "Bash(rg:*)", "Bash(ag:*)", "Bash(ack:*)",
+  "Bash(fgrep:*)", "Bash(egrep:*)",
+  "Bash(which:*)", "Bash(type:*)", "Bash(whereis:*)",
+  "Bash(echo:*)", "Bash(printf:*)", "Bash(env:*)", "Bash(printenv:*)",
+  "Bash(pwd:*)", "Bash(whoami:*)", "Bash(id:*)", "Bash(groups:*)",
+  "Bash(date:*)", "Bash(uname:*)", "Bash(hostname:*)", "Bash(uptime:*)",
+  "Bash(arch:*)", "Bash(nproc:*)", "Bash(free:*)",
+  "Bash(lsb_release:*)", "Bash(sw_vers:*)", "Bash(locale:*)",
+  // Git read-only subcommands. Listed individually so write subcommands
+  // (commit, push, reset, etc.) still prompt.
+  "Bash(git status:*)", "Bash(git log:*)", "Bash(git diff:*)",
+  "Bash(git show:*)", "Bash(git branch:*)", "Bash(git tag:*)",
+  "Bash(git remote:*)", "Bash(git config --get:*)",
+  "Bash(git rev-parse:*)", "Bash(git ls-files:*)",
+  "Bash(git blame:*)", "Bash(git describe:*)",
+  // Package manager read-only subcommands
+  "Bash(npm list:*)", "Bash(npm ls:*)", "Bash(npm view:*)", "Bash(npm outdated:*)",
+  "Bash(npm config get:*)", "Bash(yarn list:*)", "Bash(pnpm list:*)",
+  // Version checks
+  "Bash(node --version:*)", "Bash(npm --version:*)", "Bash(python --version:*)",
+  "Bash(python3 --version:*)", "Bash(go version:*)", "Bash(ruby --version:*)",
+  // Text processing (pure stdin/stdout)
+  "Bash(jq:*)", "Bash(yq:*)", "Bash(sort:*)", "Bash(uniq:*)",
+  "Bash(cut:*)", "Bash(tr:*)", "Bash(awk:*)", "Bash(sed:*)",
+  "Bash(paste:*)", "Bash(column:*)", "Bash(rev:*)", "Bash(tac:*)",
+  "Bash(nl:*)", "Bash(fmt:*)", "Bash(comm:*)", "Bash(join:*)",
+  // Comparison / hashing (read-only)
+  "Bash(diff:*)", "Bash(cmp:*)", "Bash(md5sum:*)", "Bash(sha256sum:*)",
+  "Bash(sha1sum:*)", "Bash(shasum:*)", "Bash(cksum:*)", "Bash(base64:*)",
+  "Bash(xxd:*)", "Bash(od:*)", "Bash(hexdump:*)",
+  // Calendar / math
+  "Bash(cal:*)", "Bash(bc:*)", "Bash(expr:*)", "Bash(factor:*)", "Bash(seq:*)",
+  // Process / network introspection (read-only)
+  "Bash(ps:*)", "Bash(top:*)", "Bash(htop:*)", "Bash(pgrep:*)", "Bash(lsof:*)",
+  "Bash(netstat:*)", "Bash(ss:*)", "Bash(ifconfig:*)", "Bash(ip:*)",
+  "Bash(dig:*)", "Bash(nslookup:*)", "Bash(host:*)",
+];
+
+function buildHookCommand(notifyUrl) {
+  // Read stdin once (the JSON Claude Code pipes in), then post it. --max-time
+  // and --connect-timeout cap total hook latency around ~1s even if the
+  // daemon is down. --insecure (-k) is needed because Clay's optional TLS
+  // mode uses a locally generated CA that curl won't trust by default;
+  // safe to skip verification since we're going to 127.0.0.1. Output is
+  // silenced so it doesn't leak into the TUI. The marker comment keeps the
+  // entry recognizable when we re-merge.
+  var insecure = notifyUrl.indexOf("https://") === 0 ? " --insecure" : "";
+  return "curl --silent --show-error --max-time 1 --connect-timeout 1" + insecure +
+    " -X POST -H 'Content-Type: application/json' --data-binary @- " +
+    JSON.stringify(notifyUrl) + " > /dev/null 2>&1 # " + CLAY_HOOK_MARKER;
+}
+
+function readSettings(settingsPath) {
+  try {
+    var raw = fs.readFileSync(settingsPath, "utf8");
+    return JSON.parse(raw);
+  } catch (e) {
+    return {};
+  }
+}
+
+function writeSettings(settingsPath, data) {
+  var dir = path.dirname(settingsPath);
+  try { fs.mkdirSync(dir, { recursive: true }); } catch (e) {}
+  fs.writeFileSync(settingsPath, JSON.stringify(data, null, 2) + "\n");
+}
+
+// Merge our Notification hook into the user's settings.json without
+// clobbering anything else. Returns true if the file changed.
+function mergeHook(settingsPath, command) {
+  var data = readSettings(settingsPath);
+  if (!data.hooks || typeof data.hooks !== "object") data.hooks = {};
+  if (!Array.isArray(data.hooks.Notification)) data.hooks.Notification = [];
+
+  // Strip any prior Clay entries before inserting the fresh one so port /
+  // URL changes propagate cleanly.
+  var before = JSON.stringify(data.hooks.Notification);
+  var cleaned = [];
+  for (var i = 0; i < data.hooks.Notification.length; i++) {
+    var group = data.hooks.Notification[i];
+    if (!group || !Array.isArray(group.hooks)) { cleaned.push(group); continue; }
+    var filtered = group.hooks.filter(function (h) {
+      return !(h && typeof h.command === "string" && h.command.indexOf(CLAY_HOOK_MARKER) !== -1);
+    });
+    if (filtered.length > 0) cleaned.push({ matcher: group.matcher || "", hooks: filtered });
+    else if (group.matcher) cleaned.push(group);
+  }
+  data.hooks.Notification = cleaned;
+
+  data.hooks.Notification.push({
+    matcher: "",
+    hooks: [{ type: "command", command: command }],
+  });
+
+  var after = JSON.stringify(data.hooks.Notification);
+  if (before === after) return false;
+  writeSettings(settingsPath, data);
+  return true;
+}
+
+/**
+ * Install (or refresh) the Notification hook in one or more user home dirs.
+ *
+ * opts:
+ *   notifyUrl  -- full URL Clay listens on, e.g. "http://127.0.0.1:2633/api/tui-notify".
+ *   homeDirs   -- array of absolute paths to user home directories. Each one
+ *                 gets its own settings.json updated. Defaults to [os.homedir()].
+ *
+ * Returns { installed: [paths], errors: [{path, error}] } so the caller can log.
+ */
+function installNotificationHook(opts) {
+  opts = opts || {};
+  var os = require("os");
+  var homes = opts.homeDirs && opts.homeDirs.length ? opts.homeDirs : [os.homedir()];
+  var notifyUrl = opts.notifyUrl;
+  if (!notifyUrl) throw new Error("installNotificationHook: notifyUrl is required");
+
+  var command = buildHookCommand(notifyUrl);
+  var installed = [];
+  var errors = [];
+  for (var i = 0; i < homes.length; i++) {
+    var home = homes[i];
+    if (!home) continue;
+    var settingsPath = path.join(home, ".claude", "settings.json");
+    try {
+      var changed = mergeHook(settingsPath, command);
+      if (changed) installed.push(settingsPath);
+    } catch (e) {
+      errors.push({ path: settingsPath, error: e && e.message ? e.message : String(e) });
+    }
+  }
+  return { installed: installed, errors: errors };
+}
+
+// Merge Clay's managed allow-list into permissions.allow without disturbing
+// the user's own entries. We identify "ours" by membership in
+// CLAY_MANAGED_ALLOW: re-install strips any existing CLAY_MANAGED_ALLOW
+// patterns, then re-inserts the current list. User-authored patterns
+// survive unchanged because they're never in CLAY_MANAGED_ALLOW.
+function mergeAllowList(settingsPath, patterns) {
+  var data = readSettings(settingsPath);
+  if (!data.permissions || typeof data.permissions !== "object") data.permissions = {};
+  var allow = Array.isArray(data.permissions.allow) ? data.permissions.allow : [];
+
+  var managedSet = {};
+  for (var i = 0; i < CLAY_MANAGED_ALLOW.length; i++) managedSet[CLAY_MANAGED_ALLOW[i]] = true;
+
+  // Strip prior Clay-managed entries, then append the fresh list.
+  var preserved = allow.filter(function (p) { return !managedSet[p]; });
+  var next = preserved.concat(patterns);
+
+  var before = JSON.stringify(allow);
+  var after = JSON.stringify(next);
+  if (before === after) return false;
+
+  data.permissions.allow = next;
+  writeSettings(settingsPath, data);
+  return true;
+}
+
+/**
+ * Install (or refresh) Clay's auto-approve patterns into permissions.allow
+ * for one or more user home dirs. Mirrors installNotificationHook's API.
+ */
+function installAllowList(opts) {
+  opts = opts || {};
+  var os = require("os");
+  var homes = opts.homeDirs && opts.homeDirs.length ? opts.homeDirs : [os.homedir()];
+  var patterns = (opts.patterns && opts.patterns.length) ? opts.patterns : CLAY_MANAGED_ALLOW;
+  var installed = [];
+  var errors = [];
+  for (var i = 0; i < homes.length; i++) {
+    var home = homes[i];
+    if (!home) continue;
+    var settingsPath = path.join(home, ".claude", "settings.json");
+    try {
+      var changed = mergeAllowList(settingsPath, patterns);
+      if (changed) installed.push(settingsPath);
+    } catch (e) {
+      errors.push({ path: settingsPath, error: e && e.message ? e.message : String(e) });
+    }
+  }
+  return { installed: installed, errors: errors };
+}
+
+module.exports = {
+  installNotificationHook: installNotificationHook,
+  installAllowList: installAllowList,
+  CLAY_HOOK_MARKER: CLAY_HOOK_MARKER,
+  CLAY_MANAGED_ALLOW: CLAY_MANAGED_ALLOW,
+};

package/lib/claude-jsonl-watcher.js

@@ -0,0 +1,204 @@
+// claude-jsonl-watcher.js
+//
+// Tails the per-session jsonl that Claude Code writes to
+// ~/.claude/projects/<encoded-cwd>/<cliSessionId>.jsonl, parsing new lines
+// for title events:
+//
+//   {"type":"ai-title","aiTitle":"..."}          - auto-generated after the
+//                                                  first exchange
+//   {"type":"custom-title","customTitle":"..."}  - explicit /title or
+//                                                  similar override
+//
+// Used by Clay TUI sessions to mirror claude's session naming into the
+// sidebar so they don't sit as "New Session" forever.
+//
+// Public API:
+//   start(jsonlPath, onTitle) -> stop()
+//     onTitle(title, source) where source is "ai-title" or "custom-title".
+//     stop() detaches the watcher and clears any timer.
+
+var fs = require("fs");
+var path = require("path");
+
+function pickLatestTitle(lines, current) {
+  // Walk lines in order; the final ai-title and custom-title win. Custom
+  // beats ai because users explicitly chose it.
+  var ai = current.aiTitle || null;
+  var custom = current.customTitle || null;
+  for (var i = 0; i < lines.length; i++) {
+    var raw = lines[i].trim();
+    if (!raw || raw[0] !== "{") continue;
+    var obj = null;
+    try { obj = JSON.parse(raw); } catch (e) { continue; }
+    if (!obj || !obj.type) continue;
+    if (obj.type === "ai-title" && typeof obj.aiTitle === "string") {
+      ai = obj.aiTitle;
+    } else if (obj.type === "custom-title" && typeof obj.customTitle === "string") {
+      custom = obj.customTitle;
+    }
+  }
+  current.aiTitle = ai;
+  current.customTitle = custom;
+  return custom || ai;
+}
+
+// Pull the latest visible "text" block from any new assistant entries.
+// Thinking and tool_use blocks are skipped - they're internals, not the
+// response surface. Returns the most recent text seen, or null.
+function extractLatestAssistantText(lines, seenUuids) {
+  var latest = null;
+  for (var i = 0; i < lines.length; i++) {
+    var raw = lines[i].trim();
+    if (!raw || raw[0] !== "{") continue;
+    var obj = null;
+    try { obj = JSON.parse(raw); } catch (e) { continue; }
+    if (!obj || obj.type !== "assistant" || !obj.message) continue;
+    if (obj.uuid && seenUuids[obj.uuid]) continue;
+    if (obj.uuid) seenUuids[obj.uuid] = true;
+    var blocks = obj.message.content || [];
+    if (!Array.isArray(blocks)) continue;
+    for (var j = 0; j < blocks.length; j++) {
+      var b = blocks[j];
+      if (b && b.type === "text" && typeof b.text === "string" && b.text.trim()) {
+        latest = b.text;
+      }
+    }
+  }
+  return latest;
+}
+
+/**
+ * Watch a Claude Code session jsonl for title and response updates.
+ *
+ *   start(jsonlPath, { onTitle, onResponse }) -> stop()
+ *
+ * onTitle(text, source)   fires on ai-title / custom-title updates.
+ * onResponse(text)        fires on new assistant text blocks (debounced so
+ *                         a multi-block turn coalesces to one callback,
+ *                         using only the *final* visible text). Pre-existing
+ *                         entries from before start() are ignored - the
+ *                         initial scan seeds the "seen" set so we don't
+ *                         spam notifications when the watcher boots up.
+ */
+function start(jsonlPath, opts) {
+  if (!jsonlPath) return function () {};
+  var onTitle = (opts && typeof opts.onTitle === "function") ? opts.onTitle : null;
+  var onResponse = (opts && typeof opts.onResponse === "function") ? opts.onResponse : null;
+  if (!onTitle && !onResponse) return function () {};
+
+  var pos = 0;
+  var leftover = "";
+  var current = { aiTitle: null, customTitle: null };
+  var lastTitleEmitted = null;
+  var seenAssistantUuids = {};
+  var didInitialScan = false;
+  var responseDebounceTimer = null;
+  var pendingResponseText = null;
+  var lastResponseEmitted = null;
+  var watcher = null;
+  var pollTimer = null;
+  var stopped = false;
+
+  var RESPONSE_DEBOUNCE_MS = 1500;
+  function maybeFireResponse() {
+    if (responseDebounceTimer) clearTimeout(responseDebounceTimer);
+    responseDebounceTimer = setTimeout(function () {
+      responseDebounceTimer = null;
+      if (!pendingResponseText) return;
+      if (pendingResponseText === lastResponseEmitted) return;
+      var t = pendingResponseText;
+      pendingResponseText = null;
+      lastResponseEmitted = t;
+      try { if (onResponse) onResponse(t); } catch (e) {}
+    }, RESPONSE_DEBOUNCE_MS);
+  }
+
+  function readNew() {
+    if (stopped) return;
+    try {
+      var stat = fs.statSync(jsonlPath);
+      if (stat.size <= pos) return;
+      var fd = fs.openSync(jsonlPath, "r");
+      var len = stat.size - pos;
+      var buf = Buffer.alloc(len);
+      fs.readSync(fd, buf, 0, len, pos);
+      fs.closeSync(fd);
+      pos = stat.size;
+      var chunk = leftover + buf.toString("utf8");
+      var parts = chunk.split("\n");
+      // Last fragment may be a partial line; hold it for next read.
+      leftover = parts.pop();
+
+      // Title side: fire whenever we see a new value.
+      if (onTitle) {
+        var resolved = pickLatestTitle(parts, current);
+        if (resolved && resolved !== lastTitleEmitted) {
+          lastTitleEmitted = resolved;
+          try { onTitle(resolved, current.customTitle === resolved ? "custom-title" : "ai-title"); } catch (e) {}
+        }
+      }
+
+      // Response side: collect new assistant text blocks. Initial scan
+      // seeds the "seen" set silently so old history doesn't fire.
+      var latest = extractLatestAssistantText(parts, seenAssistantUuids);
+      if (onResponse && didInitialScan && latest) {
+        pendingResponseText = latest;
+        maybeFireResponse();
+      }
+    } catch (e) {
+      // File may not exist yet; readNew is called again on the next event.
+    }
+  }
+
+  function arm() {
+    if (stopped) return;
+    if (watcher) return;
+    try {
+      watcher = fs.watch(jsonlPath, { persistent: false }, function () {
+        readNew();
+      });
+      watcher.on("error", function () {
+        try { watcher.close(); } catch (e) {}
+        watcher = null;
+        // Fall back to polling; some filesystems (network mounts) don't
+        // deliver fs.watch events reliably.
+      });
+    } catch (e) {
+      // Path doesn't exist yet; rely on the poll loop to retry once it appears.
+    }
+  }
+
+  // Initial pass to capture anything already written before we attached.
+  // didInitialScan stays false during this pass so onResponse doesn't fire
+  // for old history; subsequent reads (live updates) will emit.
+  readNew();
+  didInitialScan = true;
+  arm();
+
+  // Poll every 2s as a safety net for fs.watch misses and for the
+  // "file doesn't exist yet" boot case.
+  pollTimer = setInterval(function () {
+    if (!watcher) arm();
+    readNew();
+  }, 2000);
+
+  return function stop() {
+    stopped = true;
+    if (pollTimer) { clearInterval(pollTimer); pollTimer = null; }
+    if (responseDebounceTimer) { clearTimeout(responseDebounceTimer); responseDebounceTimer = null; }
+    if (watcher) { try { watcher.close(); } catch (e) {} watcher = null; }
+  };
+}
+
+// Resolve the jsonl path for a (cwd, cliSessionId) without depending on
+// utils.js so this module stays self-contained.
+function jsonlPathFor(home, cwd, cliSessionId) {
+  if (!home || !cwd || !cliSessionId) return null;
+  var encoded = cwd.replace(/[^a-zA-Z0-9]/g, "-");
+  return path.join(home, ".claude", "projects", encoded, cliSessionId + ".jsonl");
+}
+
+module.exports = {
+  start: start,
+  jsonlPathFor: jsonlPathFor,
+};

package/lib/project-connection.js

@@ -157,6 +157,21 @@ function attachConnection(ctx) {
       var _comVal = _comUid ? usersModule.getClaudeOpenMode(_comUid) : "tui";
       sendTo(ws, { type: "claude_open_mode_changed", claudeOpenMode: _comVal || "tui" });
     }
+
+    // What's New: push the full entries list (for the home-page feed)
+    // plus the subset of unseen ids (for the auto-pop carousel). Content
+    // lives in lib/whats-new-content.js so adding an entry doesn't touch
+    // this file.
+    try {
+      var _wn = require("./whats-new");
+      var _wnUid = (wsUser && wsUser.id) || null;
+      var _wnState = _wnUid ? _wn.getStateForUser(_wnUid) : { entries: _wn.listEntries(), unseenIds: [] };
+      if (_wnState.entries.length > 0) {
+        sendTo(ws, { type: "whats_new_state", entries: _wnState.entries, unseenIds: _wnState.unseenIds });
+      }
+    } catch (e) {
+      if (debug) console.error("[project] whats_new send failed:", e && e.message);
+    }
     _loop.sendConnectionState(ws);
     if (_mcp) _mcp.sendConnectionState(ws);
     if (_notifications) _notifications.sendConnectionState(ws, sendTo);

package/lib/project-http.js

@@ -236,6 +236,10 @@ function attachHTTP(ctx) {
       return true;
     }
 
+    // /api/tui-notify is handled at the server top-level (server.js
+    // appHandler) so a single hook in ~/.claude/settings.json can route
+    // to any project. Don't shadow it here.
+
     // VAPID public key
     if (req.method === "GET" && urlPath === "/api/vapid-public-key") {
       if (pushModule) {

package/lib/project-notifications.js

@@ -69,6 +69,19 @@ var formatters = {
     };
   },
 
+  tui_attention: function (data) {
+    return {
+      type: "tui_attention",
+      title: data.title || "Claude needs your attention",
+      body: data.body || "",
+      meta: {
+        terminalId: typeof data.terminalId === "number" ? data.terminalId : null,
+        cliSessionId: data.cliSessionId || null,
+        sessionTitle: data.sessionTitle || "",
+      },
+    };
+  },
+
   mate_dm: function (data) {
     return {
       type: "mate_dm",