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

package/lib/daemon-projects.js

@@ -6,12 +6,16 @@
 
 var fs = require("fs");
 var { scanWorktrees, isWorktree } = require("./worktree");
+var { daemonSync } = require("./daemon-sync");
 
 // --- Worktree tracking state ---
 var worktreeRegistry = {}; // parentSlug -> [wtSlug, ...]
-var worktreeTimers = {};   // parentSlug -> intervalId
 var worktreeScanning = {}; // parentSlug -> boolean (mutex)
 
+function getWorktreeSyncKey(parentSlug) {
+  return "worktrees:" + parentSlug;
+}
+
 function isWorktreeSlug(slug) {
   return slug.indexOf("--") !== -1;
 }
@@ -42,11 +46,9 @@ function scanAndRegisterWorktrees(relay, parentPath, parentSlug, parentIcon, par
     worktreeRegistry[parentSlug].push(wtSlug);
     console.log("[daemon] Registered worktree:", wtSlug, "->", wt.path, wt.accessible ? "(accessible)" : "(inaccessible)");
   }
-  if (!worktreeTimers[parentSlug]) {
-    worktreeTimers[parentSlug] = setInterval(function () {
-      rescanWorktrees(relay, parentPath, parentSlug, parentIcon, parentOwnerId);
-    }, 10000);
-  }
+  daemonSync.register(getWorktreeSyncKey(parentSlug), function () {
+    rescanWorktrees(relay, parentPath, parentSlug, parentIcon, parentOwnerId);
+  });
 }
 
 /**
@@ -114,10 +116,7 @@ function cleanupWorktreesForParent(relay, parentSlug) {
     console.log("[daemon] Cascade removed worktree:", wtSlugs[i]);
   }
   delete worktreeRegistry[parentSlug];
-  if (worktreeTimers[parentSlug]) {
-    clearInterval(worktreeTimers[parentSlug]);
-    delete worktreeTimers[parentSlug];
-  }
+  daemonSync.unregister(getWorktreeSyncKey(parentSlug));
 }
 
 /**

package/lib/daemon-sync.js

@@ -0,0 +1,106 @@
+/**
+ * Shared daemon synchronization loop.
+ *
+ * Periodic daemon work registers here so every project shares one timer.
+ */
+
+function attachDaemonSync(ctx) {
+  var intervalMs = ctx.intervalMs || 10000;
+  var scheduleInterval = ctx.setInterval || setInterval;
+  var cancelInterval = ctx.clearInterval || clearInterval;
+  var onError = ctx.onError || function (key, err) {
+    console.error("[daemon] Sync task failed:", key, err);
+  };
+  var tasks = {};
+  var timer = null;
+
+  function finishTask(task) {
+    task.running = false;
+  }
+
+  function runTask(key, task) {
+    if (task.running) return;
+    task.running = true;
+    var result;
+    try {
+      result = task.run();
+    } catch (err) {
+      finishTask(task);
+      onError(key, err);
+      return;
+    }
+    if (result && typeof result.then === "function") {
+      Promise.resolve(result).then(function () {
+        finishTask(task);
+      }, function (err) {
+        finishTask(task);
+        onError(key, err);
+      });
+      return;
+    }
+    finishTask(task);
+  }
+
+  function tick() {
+    var keys = Object.keys(tasks);
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i];
+      var task = tasks[key];
+      if (task) runTask(key, task);
+    }
+  }
+
+  function start() {
+    if (timer || Object.keys(tasks).length === 0) return;
+    timer = scheduleInterval(tick, intervalMs);
+    if (timer && typeof timer.unref === "function") timer.unref();
+  }
+
+  function register(key, run) {
+    var current = tasks[key];
+    if (current) {
+      current.run = run;
+    } else {
+      tasks[key] = { run: run, running: false };
+    }
+    start();
+  }
+
+  function unregister(key) {
+    delete tasks[key];
+    if (Object.keys(tasks).length === 0 && timer) {
+      cancelInterval(timer);
+      timer = null;
+    }
+  }
+
+  function stop() {
+    if (timer) cancelInterval(timer);
+    timer = null;
+    tasks = {};
+  }
+
+  function getTaskCount() {
+    return Object.keys(tasks).length;
+  }
+
+  function isRunning() {
+    return !!timer;
+  }
+
+  return {
+    register: register,
+    unregister: unregister,
+    tick: tick,
+    stop: stop,
+    getTaskCount: getTaskCount,
+    isRunning: isRunning,
+  };
+}
+
+var daemonSync = attachDaemonSync({});
+
+module.exports = {
+  attachDaemonSync: attachDaemonSync,
+  daemonSync: daemonSync,
+};

package/lib/public/css/pane.css

@@ -83,7 +83,7 @@ body.pane-mode #input-area {
   gap: 6px;
   padding: 0 5px 0 9px;
   border-bottom: 1px solid var(--border-subtle);
-  background: var(--sidebar-bg);
+  background: var(--bg);
   color: var(--text-secondary);
   flex-shrink: 0;
 }
@@ -194,7 +194,9 @@ button.split-pair-role:hover { filter: brightness(1.25); }
   display: none;
   align-items: center;
   gap: 6px;
-  margin: 0 12px;
+  width: 100%;
+  max-width: var(--content-width);
+  margin: 0 auto;
   padding: 4px 10px;
   border: 1px solid color-mix(in srgb, var(--accent) 30%, transparent);
   border-bottom: 0;
@@ -205,6 +207,9 @@ button.split-pair-role:hover { filter: brightness(1.25); }
   line-height: 1.4;
 }
 .pane-delegation-notice.visible { display: flex; }
+.pane-delegation-notice.visible + #input-wrapper #input-row {
+  border-radius: 0 0 8px 8px;
+}
 .pane-delegation-notice::before {
   content: "";
   width: 6px;

package/lib/public/modules/split-pair-ui.js

@@ -260,11 +260,12 @@ var workerNoticeEl = null;
 export function showWorkerDelegationNotice(driverTitle) {
   if (!store.get('paneMode')) return;
   var inputArea = document.getElementById("input-area");
-  if (!inputArea || !inputArea.parentNode) return;
+  var inputWrapper = document.getElementById("input-wrapper");
+  if (!inputArea || !inputWrapper) return;
   if (!workerNoticeEl) {
     workerNoticeEl = document.createElement("div");
     workerNoticeEl.className = "pane-delegation-notice";
-    inputArea.parentNode.insertBefore(workerNoticeEl, inputArea);
+    inputArea.insertBefore(workerNoticeEl, inputWrapper);
   }
   var who = driverTitle ? "“" + driverTitle + "”" : "the Driver";
   workerNoticeEl.textContent = "Following an instruction from " + who + " — messages you send now join the same turn.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "3.2.2-beta.1",
+  "version": "3.2.2-beta.3",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",