clay-server 4.1.0-beta.2 → 4.1.0-beta.4

package/lib/ask-user-request-identity.js

@@ -0,0 +1,23 @@
+function canonicalize(value) {
+  if (Array.isArray(value)) return value.map(canonicalize);
+  if (!value || typeof value !== "object") return value;
+  var keys = Object.keys(value).sort();
+  var result = {};
+  for (var i = 0; i < keys.length; i++) result[keys[i]] = canonicalize(value[keys[i]]);
+  return result;
+}
+
+function sameAskUserRequest(event, id, input) {
+  return !!(event && event.type === "tool_executing" && event.name === "AskUserQuestion"
+    && event.id === id && JSON.stringify(canonicalize(event.input || {})) === JSON.stringify(canonicalize(input || {})));
+}
+
+function hasRecordedAskUserRequest(history, id, input) {
+  if (!Array.isArray(history) || !id) return false;
+  for (var i = history.length - 1; i >= 0; i--) {
+    if (sameAskUserRequest(history[i], id, input)) return true;
+  }
+  return false;
+}
+
+module.exports = { canonicalize: canonicalize, sameAskUserRequest: sameAskUserRequest, hasRecordedAskUserRequest: hasRecordedAskUserRequest };

package/lib/project-ask-user.js

@@ -1,4 +1,5 @@
 var userInput = require("./yoke/user-input");
+var askUserIdentity = require("./ask-user-request-identity");
 
 function attachAskUser(ctx) {
   function isFirstDebateQuestion(session) {
@@ -41,7 +42,9 @@ function attachAskUser(ctx) {
         if (boundSession.pendingAskUser && boundSession.pendingAskUser[request.id] === pending) delete boundSession.pendingAskUser[request.id];
       });
     }
-    ctx.record(boundSession, { type: "tool_executing", id: request.id, name: "AskUserQuestion", input: input });
+    if (!askUserIdentity.hasRecordedAskUserRequest(boundSession.history, request.id, input)) {
+      ctx.record(boundSession, { type: "tool_executing", id: request.id, name: "AskUserQuestion", input: input });
+    }
   }
 
   function createHandler(boundSession) {

package/lib/public/app.js

@@ -287,6 +287,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     slashCommands: [],
     processing: false,
     activeSessionId: null,
+    askUserRequests: {},
     activeBackgroundTasks: [],
     sessionVendorBound: false,
     cliSessionId: null,

package/lib/public/css/pane.css

@@ -427,6 +427,51 @@ body.pane-mode #input-area {
   background: var(--bg);
 }
 
+/* Portrait phones have enough height for two useful panes but not enough
+   width for two readable transcripts. Keep the role order independent from
+   the persisted member order so the Split Worker stays above its Driver. */
+@media (max-width: 768px) and (orientation: portrait) {
+  #split-host.visible {
+    flex-direction: column;
+  }
+
+  .split-pane {
+    flex: 1 1 50%;
+    border-left: 0;
+    border-top: 1px solid var(--border-subtle);
+  }
+
+  .split-pane:first-child {
+    border-top: 1px solid var(--border-subtle);
+  }
+
+  .split-pane-role-worker {
+    order: -1;
+  }
+
+  .split-pane-role-driver {
+    order: 0;
+  }
+
+  .split-pane:first-child.split-pane-role-worker {
+    border-top: 0;
+  }
+
+  .split-pane.split-pane-role-worker {
+    border-top: 0;
+  }
+
+  #split-host.split-delegating::after {
+    content: "↑";
+    animation-name: pair-divider-flow-up;
+  }
+
+  @keyframes pair-divider-flow-up {
+    0%, 100% { transform: translateY(3px); opacity: 0.65; }
+    50% { transform: translateY(-3px); opacity: 1; }
+  }
+}
+
 /* Prevent an iframe from taking the pointer midway through a note gesture. */
 body.sticky-note-interacting .split-pane-frame {
   pointer-events: none;

package/lib/public/modules/ask-user-state.js

@@ -0,0 +1,66 @@
+import { store } from './store.js';
+
+function scopeKey() {
+  var sessionId = store.get('paneSessionId') || store.get('activeSessionId') || "unknown";
+  var project = store.get('currentSlug') || "unknown-project";
+  var pane = store.get('paneMode') ? "pane" : "main";
+  return project + "\u0000" + pane + "\u0000" + String(sessionId);
+}
+
+function requestKey(toolId) {
+  return scopeKey() + "\u0000" + String(toolId);
+}
+
+function requests() {
+  return store.get('askUserRequests') || {};
+}
+
+export function getAskUserRequestKey(toolId) {
+  return requestKey(toolId);
+}
+
+export function rememberAskUserRequest(toolId) {
+  var key = requestKey(toolId);
+  var current = requests();
+  if (!current[key]) {
+    var next = Object.assign({}, current);
+    next[key] = { toolId: String(toolId), scope: scopeKey(), answered: false };
+    store.set({ askUserRequests: next });
+  }
+  return key;
+}
+
+export function hasAskUserRequest(toolId) {
+  return !!requests()[requestKey(toolId)];
+}
+
+export function markAskUserRequestAnswered(toolId) {
+  var key = requestKey(toolId);
+  var current = requests();
+  if (!current[key]) return;
+  var next = Object.assign({}, current);
+  next[key] = Object.assign({}, next[key], { answered: true });
+  store.set({ askUserRequests: next });
+}
+
+export function findAskUserCard(root, toolId) {
+  if (!root || !root.querySelectorAll) return null;
+  var key = requestKey(toolId);
+  var cards = root.querySelectorAll(".ask-user-container");
+  for (var i = 0; i < cards.length; i++) {
+    if (cards[i].dataset && cards[i].dataset.askUserRequestKey === key) return cards[i];
+  }
+  return null;
+}
+
+export function saveAskUserState() {
+  return Object.assign({}, requests());
+}
+
+export function restoreAskUserState(saved) {
+  store.set({ askUserRequests: Object.assign({}, saved || {}) });
+}
+
+export function resetAskUserState() {
+  store.set({ askUserRequests: {} });
+}

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

@@ -242,6 +242,10 @@ export function syncPairChrome(host, split) {
   }
   var oldBadges = host.querySelectorAll(".split-pair-role, .split-pair-live, .split-pair-set-driver, .split-worker-runtime");
   for (var bi = 0; bi < oldBadges.length; bi++) oldBadges[bi].remove();
+  var paneEls = host.querySelectorAll(".split-pane");
+  for (var paneIndex = 0; paneIndex < paneEls.length; paneIndex++) {
+    paneEls[paneIndex].classList.remove("split-pane-role-driver", "split-pane-role-worker");
+  }
   var runtimeHeaders = host.querySelectorAll(".has-worker-runtime");
   for (var ri = 0; ri < runtimeHeaders.length; ri++) runtimeHeaders[ri].classList.remove("has-worker-runtime");
   host.classList.remove("split-delegating", "split-direction-right", "split-direction-left");
@@ -267,6 +271,7 @@ export function syncPairChrome(host, split) {
   for (var pi = 0; pi < split.panes.length && pi < headers.length; pi++) {
     (function (sessionId, header) {
       var isDriver = sessionId === group.pair.driverId;
+      if (paneEls[pi]) paneEls[pi].classList.add(isDriver ? "split-pane-role-driver" : "split-pane-role-worker");
       var role = isDriver ? "Driver" : "Split Worker";
       var badge = document.createElement("span");
       badge.className = "split-pair-role split-pair-role-" + role.toLowerCase().replace(/ /g, "-");

package/lib/public/modules/split-view.js

@@ -505,6 +505,7 @@ export function initSplitView() {
     if (state.splitGroups !== prev.splitGroups) {
       var split = state.splitPanes;
       if (!split || !split.panes) return;
+      syncPairChrome(host, split);
       if (split.groupId) {
         var stillExists = state.splitGroups.some(function (group) { return group.id === split.groupId; });
         if (!stillExists) switchNativeSession(split.panes[0].sessionId);

package/lib/public/modules/tools.js

@@ -8,6 +8,7 @@ import { getChatLayout } from './theme.js';
 import { store } from './store.js';
 import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
+import { findAskUserCard, getAskUserRequestKey, hasAskUserRequest, rememberAskUserRequest, markAskUserRequestAnswered, saveAskUserState, restoreAskUserState, resetAskUserState } from './ask-user-state.js';
 
 var ctx;
 
@@ -227,6 +228,10 @@ function shortPath(p) {
 
 // --- AskUserQuestion ---
 export function renderAskUserQuestion(toolId, input) {
+  var existingCard = findAskUserCard(ctx.messagesEl, toolId);
+  if (existingCard) return existingCard;
+  if (hasAskUserRequest(toolId)) return null;
+
   ctx.finalizeAssistantBlock();
   stopThinking();
   closeToolGroup();
@@ -237,6 +242,9 @@ export function renderAskUserQuestion(toolId, input) {
   var container = document.createElement("div");
   container.className = "ask-user-container";
   container.dataset.toolId = toolId;
+  var requestKey = getAskUserRequestKey(toolId);
+  container.dataset.askUserRequestKey = requestKey;
+  rememberAskUserRequest(toolId);
 
   // Mate DM: wrap in avatar + content layout (same as msg-assistant)
   var mateContentWrap = null;
@@ -372,6 +380,7 @@ export function renderAskUserQuestion(toolId, input) {
   skipBtn.addEventListener("click", function () {
     if (container.classList.contains("answered")) return;
     container.classList.add("answered");
+    markAskUserRequestAnswered(toolId);
     enableMainInput();
     if (ctx.ws && ctx.connected) {
       ctx.ws.send(JSON.stringify({ type: "stop" }));
@@ -415,7 +424,7 @@ export function enableMainInput() {
 }
 
 function submitAskUserAnswer(container, toolId, questions, answers, multiSelections) {
-  if (container.classList.contains("answered")) return;
+  if (container.classList.contains("answered") || container.dataset.askUserSubmitted === "true") return;
 
   var result = {};
   for (var i = 0; i < questions.length; i++) {
@@ -430,6 +439,7 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   if (Object.keys(result).length === 0) return;
 
   container.classList.add("answered");
+  container.dataset.askUserSubmitted = "true";
   enableMainInput();
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
 
@@ -471,9 +481,10 @@ function showAnswerSummary(container, questions, answers) {
 }
 
 export function markAskUserAnswered(toolId, answers) {
-  var container = document.querySelector('.ask-user-container[data-tool-id="' + toolId + '"]');
+  var container = findAskUserCard(ctx.messagesEl, toolId);
   if (container && !container.classList.contains("answered")) {
     container.classList.add("answered");
+    markAskUserRequestAnswered(toolId);
     enableMainInput();
     // Restore answers from history replay
     if (answers && Object.keys(answers).length > 0) {
@@ -2420,6 +2431,7 @@ export function saveToolState() {
     toolGroupCounter: toolGroupCounter,
     toolGroups: toolGroups,
     lastCumulativeCost: _lastCumulativeCost,
+    askUserState: saveAskUserState(),
   };
 }
 
@@ -2435,6 +2447,7 @@ export function restoreToolState(saved) {
   toolGroupCounter = saved.toolGroupCounter;
   toolGroups = saved.toolGroups;
   _lastCumulativeCost = saved.lastCumulativeCost || 0;
+  restoreAskUserState(saved.askUserState);
   if (todoWidgetEl) {
     setupTodoObserver();
   }
@@ -2442,6 +2455,7 @@ export function restoreToolState(saved) {
 
 export function resetToolState() {
   tools = {};
+  resetAskUserState();
   clearThinkingState();
   inPlanMode = false;
   planContent = null;

package/lib/sdk-message-processor.js

@@ -2,6 +2,7 @@ var usersModule = require("./users");
 var yoke = require("./yoke");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionTitlePolicy = require("./session-title-policy");
+var askUserIdentity = require("./ask-user-request-identity");
 
 var OVERLOAD_RETRY_LIMIT = 3;
 
@@ -379,7 +380,24 @@ function attachMessageProcessor(ctx) {
       if (block && block.type === "tool_use") {
         var input = {};
         try { input = JSON.parse(block.inputJson); } catch (e) {}
-        sendAndRecord(session, { type: "tool_executing", id: block.id, name: block.name, input: input });
+        // Native AskUserQuestion is recorded when canUseTool opens the
+        // request. The later block_stop is the SDK's completion notification
+        // for that same request, not a second question. Keeping both records
+        // made replay render two independently editable cards and allowed the
+        // client to submit the same request twice.
+        var alreadyRecordedAsk = false;
+        if (block.name === "AskUserQuestion" && block.id && Array.isArray(session.history)) {
+          for (var ahi = session.history.length - 1; ahi >= 0; ahi--) {
+            var priorAsk = session.history[ahi];
+            if (askUserIdentity.sameAskUserRequest(priorAsk, block.id, input)) {
+              alreadyRecordedAsk = true;
+              break;
+            }
+          }
+        }
+        if (!alreadyRecordedAsk) {
+          sendAndRecord(session, { type: "tool_executing", id: block.id, name: block.name, input: input });
+        }
 
         // Track active Task tools for sub-agent done detection
         if (block.name === "Task") {

package/lib/session-pair-prompts.js

@@ -4,14 +4,21 @@
 // the size limit and so the guidance can be reviewed as prose.
 
 var WORKER_RUNTIME_SELECTION = [
-  "Use a high-low model mix: keep decomposition, judgment, and review with the Driver, and prefer a lighter",
-  "Worker model capable of the bounded execution task. Do not mirror the Driver's model or default to the",
+  "Use a high-low model mix by default: keep decomposition, judgment, review, and independent verification",
+  "with the Driver. Give the Split Worker concrete, bounded execution tasks with clear acceptance criteria.",
+  "For routine bounded implementation, start with a lightweight Worker at low effort. When the installed",
+  "catalog offers it, codex / gpt-5.6-luna / low is the starting recommendation; otherwise choose a comparable",
+  "lightweight option from the offered catalog. Do not routinely recommend gpt-5.6-sol at high effort.",
+  "Do not mirror the Driver's model or default to the",
   "strongest available model merely because it is available. Explicitly fill the vendor, model, and thinking",
   "effort recommendation fields for both creation and replacement; never leave model selection to card defaults.",
   "Select model capability and thinking effort separately. Start with the lowest effort adequate for the task,",
   "not high effort by habit. Choose from the installed, offered catalog; do not invent model availability or prices.",
   "Explain why the lighter choice can handle the task. Escalate only for a concrete requirement beyond its",
-  "capabilities or observed failures, and state that reason. Use recorded Worker outcomes when available,",
+  "capabilities or observed failures it cannot adequately resolve, and state that reason. Small corrections",
+  "found during Driver review are not by themselves a reason to escalate. Send those corrections back to the",
+  "Worker and verify the final result. Optimize for time to a completed, verified outcome, not first-draft speed.",
+  "Use recorded Worker outcomes when available,",
   "and reconsider a lighter model for the next bounded task after an escalation. Honor the user's explicit",
   "runtime choice; this is a recommendation policy, not a restriction on which model the user may select.",
 ].join(" ").replace(/ {2,}/g, " ");

package/package.json

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