clay-server 4.3.0-beta.3 → 4.3.0-beta.5

package/lib/public/css/pane.css

@@ -365,31 +365,35 @@ body.pane-mode #input-area {
   line-height: 1;
 }
 
-/* Header-scoped (two-class) selectors: pane.css loads BEFORE menus.css in
-   style.css, so the base .session-full-access rules would win a specificity
-   tie and keep the pill at its 22px title-bar size inside the 24px pane
-   header. Scope under .split-pane-header to outrank them. */
+/* Header-scoped selectors keep the compact permission control clear of the
+   title and close affordance while preserving the shared header rhythm. */
+.split-pane-header {
+  height: 28px;
+  min-height: 28px;
+}
+
 .split-pane-header .split-pane-full-access {
-  height: 22px;
+  height: 24px;
   align-self: center;
   margin-left: 0;
   padding: 0;
   gap: 4px;
-  font-size: 10px;
+  font-size: 11px;
   letter-spacing: 0.02em;
   flex-wrap: nowrap;
   flex: 0 0 auto;
-  overflow: hidden;
 }
 
 .split-pane-header .session-permission-segmented button {
-  min-height: 18px;
-  padding: 3px 6px;
-  font-size: 10px;
+  min-height: 20px;
+  height: 20px;
+  font-size: 11px;
 }
 
-.split-pane-header .permission-label-long { display: none; }
-.split-pane-header .permission-label-short { display: inline; }
+.split-pane-header .session-permission-segmented {
+  height: 24px;
+  padding: 1px;
+}
 
 .split-pane-header .session-permission-status {
   flex: 0 0 auto;

package/lib/public/index.html

@@ -410,9 +410,9 @@
           <button id="header-info-btn" type="button" title="Session info"><i data-lucide="info"></i></button>
           <div id="header-full-access-btn" class="session-permission-control hidden" role="group" aria-label="Session permission mode">
             <div class="session-permission-segmented">
-              <button type="button" data-permission-mode="default"><span class="permission-label">Ask</span><span class="permission-spinner" aria-hidden="true"></span></button>
-              <button type="button" data-permission-mode="auto"><span class="permission-label">Auto</span><span class="permission-spinner" aria-hidden="true"></span></button>
-              <button type="button" data-permission-mode="bypassPermissions" aria-label="Skip permissions" title="Skip permissions"><span class="permission-label-long permission-label">Skip permissions</span><span class="permission-label-short permission-label" aria-hidden="true">Skip</span><span class="permission-spinner" aria-hidden="true"></span></button>
+              <button type="button" data-permission-mode="default" aria-label="Ask permissions" title="Ask permissions"><span class="permission-label">Ask</span><span class="permission-spinner" aria-hidden="true"></span></button>
+              <button type="button" data-permission-mode="auto" aria-label="Auto permissions" title="Auto permissions"><span class="permission-label">Auto</span><span class="permission-spinner" aria-hidden="true"></span></button>
+              <button type="button" data-permission-mode="bypassPermissions" aria-label="Skip permissions" title="Skip permissions"><span class="permission-label">Skip</span><span class="permission-spinner" aria-hidden="true"></span></button>
             </div>
             <span class="session-permission-status hidden" aria-live="polite"></span>
           </div>

package/lib/public/modules/app-messages.js

@@ -62,6 +62,7 @@ import { handleShellCommandResult } from './shell-command.js';
 import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled, isSchedulerOpen, enterCraftingMode, exitCraftingMode, handleLoopRegistryFiles } from './scheduler.js';
 import { handleScheduledTaskMessage, handleScheduledTaskSessionSwitched } from './scheduled-tasks.js';
 import { renderGeneratedImage, renderImageGenerationProgress, clearImageGenerationProgress, clearAllImageGenerationProgress } from './generated-images.js';
+import { clearPairResultStatus, handlePairResultStatus } from './pair-result-status.js';
 
 // --- App module imports ---
 import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
@@ -243,6 +244,7 @@ export function processMessage(msg) {
         // Restore cached rich context usage BEFORE updateContextPanel runs
         if (msg.contextUsage && !msg.contextUsage.unavailable) store.set({ richContextUsage: msg.contextUsage });
         else markContextUnavailable();
+
         // Restore accurate context data from the last result in full history
         if (msg.lastUsage || msg.lastModelUsage) {
           accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens);
@@ -804,6 +806,10 @@ export function processMessage(msg) {
         handleRemoteSelection(msg);
         break;
 
+      case "pair_result_status":
+        handlePairResultStatus(msg);
+        break;
+
       case "session_io":
         blinkSessionDot(msg.id);
         break;
@@ -823,6 +829,7 @@ export function processMessage(msg) {
         break;
 
       case "session_switched":
+        clearPairResultStatus();
         syncAutonomousRunForSession(msg.autonomousRun || null);
         closeWhatsNewArticle();
         // Save draft from outgoing session

package/lib/public/modules/pair-result-status.js

@@ -0,0 +1,87 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { showConfirm } from './app-misc.js';
+
+var statusGeneration = 0;
+
+function retrySource(item) {
+  return { item: item, generation: statusGeneration, projectSlug: store.get("currentSlug") || store.get("activeProjectSlug") || null,
+    sessionId: store.get("activeSessionId"), userId: store.get("myUserId") || null, ws: getWs() };
+}
+
+function sendRetry(source, confirmed) {
+  var ws = getWs();
+  var projectSlug = store.get("currentSlug") || store.get("activeProjectSlug") || null;
+  var items = store.get("pairResultStatus") || [];
+  var stillVisible = items.some(function (item) { return item.id === source.item.id; });
+  if (!ws || ws !== source.ws || ws.readyState !== 1 || statusGeneration !== source.generation ||
+      store.get("activeSessionId") !== source.sessionId || projectSlug !== source.projectSlug ||
+      (store.get("myUserId") || null) !== source.userId || !stillVisible) return false;
+  ws.send(JSON.stringify({ type: "pair_result_retry", id: source.item.id, confirmDuplicate: confirmed === true,
+    sessionId: source.sessionId, projectSlug: source.projectSlug }));
+  return true;
+}
+
+function retry(item) {
+  var source = retrySource(item);
+  if (item.confirmDuplicate) {
+    showConfirm("The Driver may already have received this completed result. Retry delivery anyway? This can cause a duplicate result receipt.", function () {
+      sendRetry(source, true);
+    }, "Retry delivery", false);
+    return;
+  }
+  sendRetry(source, false);
+}
+
+function renderPairResultStatus() {
+  var existing = document.getElementById("pair-result-status");
+  if (existing) existing.remove();
+  var items = store.get("pairResultStatus") || [];
+  if (!items.length) return;
+  var messages = document.getElementById("messages");
+  if (!messages || !messages.parentElement) return;
+  var section = document.createElement("section");
+  section.id = "pair-result-status";
+  section.className = "pair-result-status";
+  section.setAttribute("role", "status");
+  for (var i = 0; i < items.length; i++) {
+    var item = items[i], card = document.createElement("div");
+    card.className = "pair-result-status-card pair-result-status-" + item.state;
+    var title = document.createElement("strong");
+    title.textContent = item.state === "blocked" ? "Split Worker result blocked" :
+      (item.state === "uncertain" ? (item.hasCompletedResult === false ? "Split Worker recovery uncertain" : "Split Worker result delivery uncertain") : "Split Worker result pending");
+    var message = document.createElement("span");
+    message.textContent = item.message || "The completed result is retained.";
+    card.appendChild(title); card.appendChild(message);
+    if (item.hasCompletedResult !== false) {
+      var details = document.createElement("details"), summary = document.createElement("summary"), body = document.createElement("pre");
+      summary.textContent = "View completed result";
+      body.textContent = item.error ? "Error: " + item.error : (item.response || "No text response was recorded.");
+      details.appendChild(summary); details.appendChild(body); card.appendChild(details);
+    }
+    if (item.canRetry) {
+      var button = document.createElement("button");
+      button.type = "button"; button.className = "confirm-btn confirm-ok pair-result-status-retry"; button.textContent = "Retry delivery";
+      button.addEventListener("click", retry.bind(null, item));
+      card.appendChild(button);
+    }
+    section.appendChild(card);
+  }
+  messages.parentElement.insertBefore(section, messages);
+}
+
+function handlePairResultStatus(msg) {
+  if (!msg || msg.sessionId !== store.get("activeSessionId")) return false;
+  statusGeneration++;
+  store.set({ pairResultStatus: Array.isArray(msg.items) ? msg.items : [] });
+  renderPairResultStatus();
+  return true;
+}
+
+function clearPairResultStatus() {
+  statusGeneration++;
+  store.set({ pairResultStatus: [] });
+  renderPairResultStatus();
+}
+
+export { clearPairResultStatus, handlePairResultStatus, renderPairResultStatus };

package/lib/public/modules/permission-control.js

@@ -46,9 +46,9 @@ export function createPermissionControl(className, ariaLabel) {
   control.setAttribute("role", "group");
   control.setAttribute("aria-label", ariaLabel || "Session permission mode");
   control.innerHTML = '<div class="session-permission-segmented">' +
-    '<button type="button" data-permission-mode="default"><span class="permission-label">Ask</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
-    '<button type="button" data-permission-mode="auto"><span class="permission-label">Auto</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
-    '<button type="button" data-permission-mode="bypassPermissions" aria-label="Skip permissions" title="Skip permissions"><span class="permission-label-long permission-label">Skip permissions</span><span class="permission-label-short permission-label" aria-hidden="true">Skip</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
+    '<button type="button" data-permission-mode="default" aria-label="Ask permissions" title="Ask permissions"><span class="permission-label">Ask</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
+    '<button type="button" data-permission-mode="auto" aria-label="Auto permissions" title="Auto permissions"><span class="permission-label">Auto</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
+    '<button type="button" data-permission-mode="bypassPermissions" aria-label="Skip permissions" title="Skip permissions"><span class="permission-label">Skip</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
     '</div><span class="session-permission-status" aria-live="polite"></span>';
   control.querySelector(".session-permission-status").setAttribute("aria-atomic", "true");
   return control;
@@ -101,6 +101,7 @@ export function renderPermissionControl(control, state) {
   control.classList.toggle("permission-globally-forced", globallyForced);
   control.classList.toggle("permission-runtime-fallback", state.permissionMode === "auto" && !!state.effectivePermissionMode && state.effectivePermissionMode !== "auto");
   control.setAttribute("aria-busy", pending ? "true" : "false");
+  var buttonTitles = { default: "Ask permissions", auto: "Auto permissions", bypassPermissions: "Skip permissions" };
   var buttons = control.querySelectorAll("[data-permission-mode]");
   for (var i = 0; i < buttons.length; i++) {
     var mode = buttons[i].dataset.permissionMode;
@@ -113,8 +114,7 @@ export function renderPermissionControl(control, state) {
     buttons[i].classList.toggle("pending", requested);
     buttons[i].setAttribute("aria-pressed", selected ? "true" : "false");
     buttons[i].setAttribute("aria-busy", requested ? "true" : "false");
-    if (unsupported) buttons[i].title = "Auto permissions are unavailable for this Claude session.";
-    else buttons[i].removeAttribute("title");
+    buttons[i].title = unsupported ? "Auto permissions are unavailable for this Claude session." : buttonTitles[mode];
   }
   var status = control.querySelector(".session-permission-status");
   if (status) {

package/lib/session-pair-mcp-server.js

@@ -19,7 +19,7 @@ function getToolDefs(handlers, options) {
       description: "Delegate one concrete follow-up task to the existing visible Split Worker. This tool is exposed only after the user has configured and accepted an exact pair. A completed turn does not end the Split Worker session: reuse the same Split Worker for follow-up implementation and corrections instead of taking over its work. Detached completions are pushed back automatically. A delegated turn cannot delegate back, so keep orchestration one hop deep.",
       inputSchema: buildShape({
         message: { type: "string", description: "The complete task or question for the partner." },
-        wait: { type: "boolean", description: "Wait for the partner's turn to finish. Defaults to true." },
+        wait: { type: "boolean", description: "Wait for the partner's turn to finish. Defaults to false; set true for an explicit blocking wait." },
         timeoutSeconds: { type: "number", description: "Maximum wait in seconds, from 1 to 900. Defaults to 300." },
         operationId: { type: "string", description: "Optional stable id for this delegation. Reusing it within the same human turn returns the original operation instead of sending twice." },
         taskId: { type: "string", description: "Optional stable task id for generation and completion correlation." },
@@ -28,7 +28,7 @@ function getToolDefs(handlers, options) {
     },
     {
       name: "read_partner",
-      description: "Read the Split Worker's current status and recent conversation turns, plus the same bounded capacity report partner_status returns. Use this for an interim check after a non-waiting delegation or timeout; completed results are pushed automatically.",
+      description: "Read the Split Worker's current status and recent conversation turns, plus the same bounded capacity report partner_status returns. Use only for a requested status, concrete failure or stall diagnosis, or capacity/queue decision; do not poll routinely. Completed results are pushed automatically.",
       inputSchema: buildShape({
         lastTurns: { type: "number", description: "Number of recent user-message-delimited turns, from 0 to 5. Use 0 for status only. Defaults to 1." },
       }),

package/lib/session-pair-prompts.js

@@ -76,7 +76,13 @@ var DRIVER_CORE = [
   "ambiguous and a visible pair exists, prefer the visible Split Worker. If review or user feedback requires",
   "corrections to the Split Worker's implementation, delegate a follow-up turn to that Split Worker instead of",
   "editing its files yourself. If a non-waiting delegation finishes later, Clay pushes the result back and",
-  "resumes you automatically. You also decide the Split Worker's tool-permission requests when they arise;",
+  "resumes you automatically. send_to_partner returns immediately by default; set wait to true only when you",
+  "explicitly need the final result in the same tool call. Do useful independent work after a non-waiting",
+  "delegation, then yield for Clay's automatic completion callback; do not poll read_partner or partner_status,",
+  "or sleep while waiting. Use those reads only for a user-requested status, concrete failure or stall diagnosis,",
+  "capacity/reuse decision, or exact queue inspection before mutation. Do not send the same correction as both",
+  "a live message and a queued task; consolidate review feedback into one bounded follow-up. You also decide",
+  "the Split Worker's tool-permission requests when they arise;",
   "approve only what falls inside the task the user authorized. Integrate and verify the final outcome. Do not",
   "search the project for implementations of these tools, and do not delegate work that must be performed",
   "sequentially in this same session.",

package/lib/sessions.js

@@ -230,7 +230,7 @@ function createSessionManager(opts) {
   }
 
   function appendToSessionFile(session, obj) {
-    if (!session.cliSessionId) return;
+    if (!session.cliSessionId) return true;
     session.lastActivity = Date.now();
     try {
       var afPath = sessionFilePath(session.cliSessionId);
@@ -238,8 +238,10 @@ function createSessionManager(opts) {
       if (process.platform !== "win32") {
         try { fs.chmodSync(afPath, 0o600); } catch (chmodErr) {}
       }
+      return true;
     } catch(e) {
       console.error("[session] Failed to append to session file:", e.message);
+      return false;
     }
   }
 
@@ -1031,7 +1033,7 @@ function createSessionManager(opts) {
     var outgoingObj = clientObj || obj;
     if (!outgoingObj._ts) outgoingObj._ts = obj._ts;
     session.history.push(obj);
-    appendToSessionFile(session, obj);
+    if (appendToSessionFile(session, obj) === false) return false;
     // Per-session out-of-band subscribers mirror mate session events into
     // a parallel UI without joining the project's
     // ws clients set). Subscribers receive the same obj that goes to ws
@@ -1087,6 +1089,33 @@ function createSessionManager(opts) {
     }
     // Notify server for cross-project unread tracking
     if (obj.type === "done") onSessionDone(session);
+    return true;
+  }
+
+  function sendAndRecordDurably(session, obj, clientObj) {
+    if (!session || !session.cliSessionId) return false;
+    var saved;
+    try { saved = doSendAndRecord(session, obj, clientObj); }
+    catch (error) {
+      var exact = JSON.stringify(obj);
+      if (hasDurableSessionRecord(session, function (record) { return JSON.stringify(record) === exact; })) return true;
+      if (session.history[session.history.length - 1] === obj) session.history.pop();
+      throw error;
+    }
+    if (saved === false && session.history[session.history.length - 1] === obj) session.history.pop();
+    return saved === true;
+  }
+
+  function hasDurableSessionRecord(session, predicate) {
+    if (!session || !session.cliSessionId || typeof predicate !== "function") return false;
+    try {
+      var lines = fs.readFileSync(sessionFilePath(session.cliSessionId), "utf8").split("\n");
+      for (var i = lines.length - 1; i >= 0; i--) {
+        if (!lines[i]) continue;
+        try { if (predicate(JSON.parse(lines[i]))) return true; } catch (error) {}
+      }
+    } catch (error) {}
+    return false;
   }
 
   function resumeSession(cliSessionId, opts, targetWs) {
@@ -1384,6 +1413,8 @@ function createSessionManager(opts) {
     saveSessionFile: saveSessionFile,
     appendToSessionFile: appendToSessionFile,
     sendAndRecord: doSendAndRecord,
+    sendAndRecordDurably: sendAndRecordDurably,
+    hasDurableSessionRecord: hasDurableSessionRecord,
     subscribeSession: function (localId, cb) {
       var session = sessions.get(localId);
       if (!session) return null;

package/package.json

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