clay-server 4.1.0-beta.7 → 4.1.0-beta.9

package/lib/project.js

@@ -634,6 +634,8 @@ function createProjectContext(opts) {
       var access = opts.getProjectAccess ? opts.getProjectAccess() : { visibility: "public", ownerId: projectOwnerId || null };
       return !usersModule.isMultiUser() || !!(freshActor && (!opts.canAccessProjectSlug || opts.canAccessProjectSlug(freshActor.id, slug)) && usersModule.canAccessSession(freshActor.id, session, access));
     },
+    onItemCancelled: function (item) { return _scheduledMessages && _scheduledMessages.onQueueCancelled(item); },
+    onItemConsumed: function (item) { return _scheduledMessages && _scheduledMessages.onQueueConsumed(item); },
   });
 
   var sdk = null;
@@ -1360,6 +1362,8 @@ function createProjectContext(opts) {
     isDriverOperatedSession: function (session) {
       return !isMate && _sessionPair.workerPermission.isDriverOperated(session);
     },
+    pendingMessageQueue: _pendingMessageQueue,
+    consumePendingMessage: function (session) { return _userMessage && _userMessage.consumePendingMessage(session); },
   });
 
   // --- Loop engine (delegated to project-loop.js) ---
@@ -1544,8 +1548,8 @@ function createProjectContext(opts) {
   }
 
   // --- Schedule / cancel a message (used by WS handler and auto-continue) ---
-  function scheduleMessage(session, text, resetsAt, actorUser, targetWs) {
-    return _scheduledMessages ? _scheduledMessages.schedule(session, text, resetsAt, actorUser, targetWs) : null;
+  function scheduleMessage(session, text, resetsAt, actorUser, targetWs, attachments, requestId, transportAccountId) {
+    return _scheduledMessages ? _scheduledMessages.schedule(session, text, resetsAt, actorUser, targetWs, attachments, requestId, transportAccountId) : null;
   }
 
   function cancelScheduledMessage(session, actorUser, targetWs, correlation) {
@@ -1996,6 +2000,7 @@ function createProjectContext(opts) {
     beginHumanPairTurn: function (session) { return _sessionPair.beginHumanTurn(session); },
     authorizePendingDispatch: function (session, actor, item) {
       if (!session || sm.sessions.get(session.localId) !== session || !item || item.projectSlug !== slug) return false;
+      if (_scheduledMessages && !_scheduledMessages.authorizePending(item, session)) return false;
       if (!isMate && _sessionPair.workerPermission && _sessionPair.workerPermission.isDriverOperated(session)) return false;
       if (!usersModule.isMultiUser()) return item.actorId === "default" || !!(actor && String(actor.id) === item.actorId);
       var freshActor = actor && actor.id && usersModule.findUserById(actor.id);

package/lib/public/app.js

@@ -68,7 +68,7 @@ import { initHomeSidebar } from './modules/home-sidebar.js';
 import { openHomeMateAction } from './modules/home-mate-chat.js';
 import { initHomeSurfaceBoot } from './modules/home-surface-boot.js';
 import { rememberHomePrimarySurface } from './modules/home-surface.js';
-import { initRateLimit, handleRateLimitEvent as _rlHandleRateLimitEvent, updateRateLimitUsage as _rlUpdateRateLimitUsage, addScheduledMessageBubble as _rlAddScheduledMessageBubble, removeScheduledMessageBubble as _rlRemoveScheduledMessageBubble, handleFastModeState as _rlHandleFastModeState, getScheduledMsgEl, resetRateLimitState } from './modules/app-rate-limit.js';
+import { initRateLimit, handleRateLimitEvent as _rlHandleRateLimitEvent, updateRateLimitUsage as _rlUpdateRateLimitUsage, handleFastModeState as _rlHandleFastModeState, resetRateLimitState } from './modules/app-rate-limit.js';
 import { initCursors, handleRemoteCursorMove as _curHandleRemoteCursorMove, handleRemoteCursorLeave as _curHandleRemoteCursorLeave, handleRemoteSelection as _curHandleRemoteSelection, clearRemoteCursors as _curClearRemoteCursors, initCursorToggle } from './modules/app-cursors.js';
 import { initDefaultAi } from './modules/default-ai.js';
 import { initFavicon, updateFavicon as _favUpdateFavicon, setSendBtnMode as _favSetSendBtnMode, blinkIO as _favBlinkIO, blinkSessionDot as _favBlinkSessionDot, updateCrossProjectBlink as _favUpdateCrossProjectBlink, startUrgentBlink as _favStartUrgentBlink, stopUrgentBlink as _favStopUrgentBlink, setActivity as _favSetActivity } from './modules/app-favicon.js';
@@ -844,8 +844,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Rate Limit / Scheduled Messages / Fast Mode (delegated to app-rate-limit.js) ---
   function handleRateLimitEvent(msg) { _rlHandleRateLimitEvent(msg); }
   function updateRateLimitUsage(msg) { _rlUpdateRateLimitUsage(msg); }
-  function addScheduledMessageBubble(text, resetsAt) { _rlAddScheduledMessageBubble(text, resetsAt); }
-  function removeScheduledMessageBubble() { _rlRemoveScheduledMessageBubble(); }
   function handleFastModeState(state) { _rlHandleFastModeState(state); }
 
   // --- Prompt suggestion chips (delegated to app-rendering.js) ---

package/lib/public/css/input.css

@@ -1717,112 +1717,3 @@ body.tui-composer-active #config-chip-wrap {
   font-weight: 600;
   color: inherit;
 }
-
-/* Scheduled message bubble: accent-tinted user bubble */
-.scheduled-msg-wrap .bubble {
-  background: color-mix(in srgb, var(--accent) 18%, var(--user-bubble, var(--bg-alt)));
-  border: 1px solid color-mix(in srgb, var(--accent) 35%, transparent);
-}
-
-.scheduled-msg-wrap .msg-user-rewind-btn,
-.scheduled-msg-wrap .msg-actions { display: none !important; }
-
-.scheduled-msg-meta {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  padding-right: 4px;
-  font-size: 12px;
-  color: var(--accent);
-}
-
-.scheduled-msg-icon svg,
-.scheduled-msg-icon .lucide {
-  width: 14px;
-  height: 14px;
-}
-
-.scheduled-msg-countdown {
-  flex: 1;
-}
-
-
-/* Channel mode: scheduled badge in header row */
-.scheduled-msg-badge {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-  padding: 3px 10px;
-  border-radius: 12px;
-  font-size: 12px;
-  font-weight: 600;
-  line-height: 1;
-  color: var(--accent);
-  background: color-mix(in srgb, var(--accent) 12%, transparent);
-  vertical-align: middle;
-}
-.scheduled-msg-badge svg,
-.scheduled-msg-badge .lucide {
-  width: 13px;
-  height: 13px;
-}
-/* Scheduled message action links (shared by both modes) */
-.scheduled-msg-actions {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  margin-left: 4px;
-}
-.scheduled-msg-send-now {
-  padding: 0;
-  border: none;
-  background: none;
-  color: var(--accent);
-  font-size: 12px;
-  font-weight: 500;
-  font-family: inherit;
-  cursor: pointer;
-  transition: text-decoration 0.15s;
-}
-.scheduled-msg-send-now:hover {
-  text-decoration: underline;
-}
-.scheduled-msg-sep {
-  color: var(--text-dimmer);
-  font-size: 12px;
-  user-select: none;
-}
-.scheduled-msg-cancel {
-  padding: 0;
-  border: none;
-  background: none;
-  color: var(--text-dimmer);
-  font-size: 12px;
-  font-weight: 500;
-  font-family: inherit;
-  cursor: pointer;
-  transition: color 0.15s;
-}
-.scheduled-msg-cancel:hover {
-  color: var(--error);
-}
-
-/* Channel mode: strip bubble box styling, render as plain text */
-body.wide-view .scheduled-msg-wrap .bubble {
-  background: none;
-  border: none;
-  box-shadow: none;
-  padding: 0;
-  border-radius: 0;
-}
-
-/* Channel mode: header alignment */
-body.wide-view .scheduled-msg-wrap .dm-bubble-header {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-}
-body.wide-view .scheduled-msg-wrap .scheduled-msg-countdown {
-  font-size: inherit;
-  color: inherit;
-}

package/lib/public/css/pending-message-queue.css

@@ -134,6 +134,9 @@ button.pending-message-drag:active { cursor: grabbing; }
 .pending-message-meta { display: flex; gap: 8px; margin-top: 3px; color: var(--text-dimmer); font-size: 9px; line-height: 1.2; }
 .pending-message-meta span + span::before { content: "·"; margin-right: 8px; }
 .pending-message-sending { color: var(--accent); font-weight: 650; }
+.pending-message-schedule-meta { display: flex; align-items: center; gap: 4px; margin-top: 4px; color: var(--accent); font-size: 10px; font-variant-numeric: tabular-nums; }
+.pending-message-schedule-meta .lucide { width: 11px; height: 11px; }
+.pending-message-chip.is-future { border-color: color-mix(in srgb, var(--accent) 35%, var(--border-subtle)); }
 
 .pending-message-actions { display: flex; align-items: center; gap: 1px; padding-right: 5px; }
 .pending-message-actions button { cursor: pointer; }

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

@@ -28,7 +28,7 @@ import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
 import { handleSessionActionMessage } from './session-actions.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
-import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent, handleAcceptedOrdinaryMessage } from './input.js';
+import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent, handleAcceptedOrdinaryMessage, handleScheduleMessageResult } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
 import { finishThinkingTurn, resumeThinkingAfterReplay } from './thinking-lifecycle.js';
 import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
@@ -73,8 +73,7 @@ import { handleToolsState, handleToolInstalled, handleToolRemoved, handleToolSto
 import { handleHomeDockState } from './home-dock.js';
 import { handleToolFrameUrlState } from './home-tool-frame.js';
 import { enterDmMode, exitDmMode, handleMateCreatedInApp, updateMateIconStatus, appendDmMessage, showDmTypingIndicator, buildMateInterviewPrompt } from './app-dm.js';
-import { handleRateLimitEvent, updateRateLimitUsage, addScheduledMessageBubble, removeScheduledMessageBubble, handleFastModeState } from './app-rate-limit.js';
-import { applyScheduledMessageQueued, applyScheduledMessageState, applyScheduledMessageTerminal } from './scheduled-message-state.js';
+import { handleRateLimitEvent, updateRateLimitUsage, handleFastModeState } from './app-rate-limit.js';
 import { handleRemoteCursorMove, handleRemoteCursorLeave, handleRemoteSelection, clearRemoteCursors } from './app-cursors.js';
 import { showLoopBanner, updateLoopBanner, updateLoopInputVisibility, showRalphApprovalBar, updateRalphApprovalStatus, openRalphPreviewModal, showExecModal, updateExecModalStatus } from './app-loop-ui.js';
 import { handleAutonomousRunMessage, syncAutonomousRunForSession } from './autonomous-run.js';
@@ -98,6 +97,10 @@ export function processMessage(msg) {
   if (handleAutonomousRunMessage(msg)) return;
   if (handleLoopInterviewMessage(msg)) return;
   if (handleScheduledTaskMessage(msg)) return;
+  if (msg && msg.type === "schedule_message_result") {
+    handleScheduleMessageResult(msg);
+    return;
+  }
     if (msg.type === "access_revoked") {
       window.location.assign("/");
       return;
@@ -1411,28 +1414,6 @@ export function processMessage(msg) {
         updateRateLimitUsage(msg);
         break;
 
-      case "scheduled_message_queued":
-        applyScheduledMessageQueued(msg, { add: addScheduledMessageBubble, setDisabled: setScheduleBtnDisabled });
-        break;
-
-      case "scheduled_message_sent":
-        applyScheduledMessageTerminal(msg, { remove: removeScheduledMessageBubble, setDisabled: setScheduleBtnDisabled });
-        setStatus("processing");
-        break;
-
-      case "scheduled_message_cancelled":
-        applyScheduledMessageTerminal(msg, { remove: removeScheduledMessageBubble, setDisabled: setScheduleBtnDisabled });
-        break;
-
-      case "scheduled_message_state":
-        applyScheduledMessageState(msg, {
-          remove: removeScheduledMessageBubble,
-          setDisabled: setScheduleBtnDisabled,
-          add: addScheduledMessageBubble,
-          interrupted: function () { addSystemMessage("A scheduled message was interrupted during server recovery and was not sent again automatically."); },
-        });
-        break;
-
       case "auto_continue_scheduled":
         // Scheduler auto-continue, just show info
         break;

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

@@ -377,6 +377,7 @@ export function resetClientState() {
   store.set({ currentFullText: "" });
   resetToolState();
   clearPendingImages();
+  store.set({ pendingScheduleAdmissions: {}, pendingScheduleAdmission: null });
   resetShellCommand();
   clearAllMentionActive();
   setActivityEl(null);

package/lib/public/modules/app-rate-limit.js

@@ -3,10 +3,6 @@
 
 import { iconHtml, refreshIcons } from './icons.js';
 import { store } from './store.js';
-import { scheduledMessageControl } from './scheduled-message-state.js';
-import { getWs } from './ws-ref.js';
-import { addToMessages, scrollToBottom } from './app-rendering.js';
-import { userAvatarUrl } from './avatar.js';
 import { setScheduleDelayMs, clearScheduleDelay } from './input.js';
 
 // --- Module-owned state ---
@@ -17,8 +13,6 @@ var rateLimitResetTimer = null;
 var rateLimitUsageEl = null;
 var rateLimitResetState = {};
 var rateLimitTickTimer = null;
-var scheduledMsgEl = null;
-var scheduledCountdownTimer = null;
 var fastModeIndicatorEl = null;
 
 // --- Internal helpers ---
@@ -299,178 +293,6 @@ export function updateRateLimitUsage(msg) {
   }
 }
 
-export function addScheduledMessageBubble(text, resetsAt, correlation) {
-  removeScheduledMessageBubble();
-  var isChannel = document.body.classList.contains("wide-view");
-  var wrap = document.createElement("div");
-  wrap.className = "msg-user scheduled-msg-wrap";
-  wrap.id = "scheduled-msg-bubble";
-
-  var countdownEl;
-  var cancelBtn;
-
-  if (isChannel) {
-    // Channel mode: avatar + header with scheduled badge + message
-    var _me = store.get('cachedAllUsers').find(function (u) { return u.id === store.get('myUserId'); });
-    var _myName = document.body.dataset.myDisplayName || (_me && (_me.displayName || _me.username)) || "Me";
-
-    var avi = document.createElement("img");
-    avi.className = "dm-bubble-avatar dm-bubble-avatar-me";
-    avi.src = document.body.dataset.myAvatarUrl || userAvatarUrl(_me || { id: store.get('myUserId') }, 36);
-    wrap.appendChild(avi);
-
-    var content = document.createElement("div");
-    content.className = "dm-bubble-content";
-
-    var header = document.createElement("div");
-    header.className = "dm-bubble-header";
-
-    var nameSpan = document.createElement("span");
-    nameSpan.className = "dm-bubble-name";
-    nameSpan.textContent = _myName;
-    header.appendChild(nameSpan);
-
-    var badge = document.createElement("span");
-    badge.className = "scheduled-msg-badge";
-    badge.innerHTML = iconHtml("clock");
-    countdownEl = document.createElement("span");
-    countdownEl.className = "scheduled-msg-countdown";
-    badge.appendChild(countdownEl);
-    header.appendChild(badge);
-
-    var actions = document.createElement("span");
-    actions.className = "scheduled-msg-actions";
-
-    var sendNowBtn = document.createElement("button");
-    sendNowBtn.className = "scheduled-msg-send-now";
-    sendNowBtn.textContent = "Send now";
-    sendNowBtn.addEventListener("click", function () {
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify(scheduledMessageControl("send_scheduled_now", correlation)));
-      }
-    });
-    actions.appendChild(sendNowBtn);
-
-    var sep = document.createElement("span");
-    sep.className = "scheduled-msg-sep";
-    sep.textContent = "\u00b7";
-    actions.appendChild(sep);
-
-    cancelBtn = document.createElement("button");
-    cancelBtn.className = "scheduled-msg-cancel";
-    cancelBtn.textContent = "Cancel";
-    cancelBtn.addEventListener("click", function () {
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify(scheduledMessageControl("cancel_scheduled_message", correlation)));
-      }
-    });
-    actions.appendChild(cancelBtn);
-
-    header.appendChild(actions);
-
-    content.appendChild(header);
-
-    var bubble = document.createElement("div");
-    bubble.className = "bubble scheduled-msg-bubble";
-    var textEl = document.createElement("span");
-    textEl.textContent = text;
-    bubble.appendChild(textEl);
-    content.appendChild(bubble);
-
-    wrap.appendChild(content);
-  } else {
-    // Bubble mode: original layout
-    var bubble = document.createElement("div");
-    bubble.className = "bubble scheduled-msg-bubble";
-
-    var textEl = document.createElement("span");
-    textEl.textContent = text;
-    bubble.appendChild(textEl);
-
-    var metaEl = document.createElement("div");
-    metaEl.className = "scheduled-msg-meta";
-
-    var clockIcon = document.createElement("span");
-    clockIcon.className = "scheduled-msg-icon";
-    clockIcon.innerHTML = iconHtml("clock");
-    metaEl.appendChild(clockIcon);
-
-    countdownEl = document.createElement("span");
-    countdownEl.className = "scheduled-msg-countdown";
-    metaEl.appendChild(countdownEl);
-
-    var sendNowBtn2 = document.createElement("button");
-    sendNowBtn2.className = "scheduled-msg-send-now";
-    sendNowBtn2.textContent = "Send now";
-    sendNowBtn2.addEventListener("click", function () {
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify(scheduledMessageControl("send_scheduled_now", correlation)));
-      }
-    });
-    metaEl.appendChild(sendNowBtn2);
-
-    var sep2 = document.createElement("span");
-    sep2.className = "scheduled-msg-sep";
-    sep2.textContent = "\u00b7";
-    metaEl.appendChild(sep2);
-
-    cancelBtn = document.createElement("button");
-    cancelBtn.className = "scheduled-msg-cancel";
-    cancelBtn.textContent = "Cancel";
-    cancelBtn.addEventListener("click", function () {
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify(scheduledMessageControl("cancel_scheduled_message", correlation)));
-      }
-    });
-    metaEl.appendChild(cancelBtn);
-
-    wrap.appendChild(bubble);
-    wrap.appendChild(metaEl);
-  }
-
-  addToMessages(wrap);
-  scheduledMsgEl = wrap;
-  scrollToBottom();
-
-  // Start countdown
-  function updateCountdown() {
-    var remaining = resetsAt - Date.now();
-    if (remaining <= 0) {
-      countdownEl.textContent = "Sending...";
-      if (scheduledCountdownTimer) { clearInterval(scheduledCountdownTimer); scheduledCountdownTimer = null; }
-      return;
-    }
-    var hrs = Math.floor(remaining / 3600000);
-    var mins = Math.floor((remaining % 3600000) / 60000);
-    var secs = Math.floor((remaining % 60000) / 1000);
-    var timeStr = "";
-    if (hrs > 0) timeStr += hrs + "h ";
-    if (mins > 0 || hrs > 0) timeStr += mins + "m ";
-    timeStr += secs + "s";
-
-    var sendDate = new Date(resetsAt);
-    var absTime = sendDate.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-    countdownEl.textContent = "Sends at " + absTime + " (" + timeStr + ")";
-  }
-  updateCountdown();
-  scheduledCountdownTimer = setInterval(updateCountdown, 1000);
-}
-
-export function removeScheduledMessageBubble() {
-  if (scheduledMsgEl) {
-    scheduledMsgEl.remove();
-    scheduledMsgEl = null;
-  }
-  if (scheduledCountdownTimer) {
-    clearInterval(scheduledCountdownTimer);
-    scheduledCountdownTimer = null;
-  }
-}
-
 export function handleFastModeState(state) {
   var statusArea = document.querySelector(".title-bar-content .status");
   if (!statusArea) return;
@@ -498,12 +320,8 @@ export function handleFastModeState(state) {
   refreshIcons();
 }
 
-export function getScheduledMsgEl() { return scheduledMsgEl; }
-
 export function resetRateLimitState() {
   clearRateLimitIndicator();
-  store.set({ scheduledMessageCorrelation: null });
-  removeScheduledMessageBubble();
   if (rateLimitCountdownTimer) { clearInterval(rateLimitCountdownTimer); rateLimitCountdownTimer = null; }
   if (fastModeIndicatorEl) { fastModeIndicatorEl.remove(); fastModeIndicatorEl = null; }
 }

package/lib/public/modules/chat-render-runtime.js

@@ -145,8 +145,6 @@ export function addToMessages(element) {
   var messagesEl = getMessagesEl();
   if (prependAnchor) messagesEl.insertBefore(element, prependAnchor);
   else messagesEl.appendChild(element);
-  var scheduled = document.getElementById("scheduled-msg-bubble");
-  if (scheduled && element !== scheduled && scheduled.parentNode === messagesEl) messagesEl.appendChild(scheduled);
 }
 
 export function scrollToBottom() {

package/lib/public/modules/input.js

@@ -11,6 +11,7 @@ import { showToast } from './utils.js';
 import { isShellCommandMode, submitShellCommand } from './shell-command.js';
 import { showPasteModal } from './paste-modal.js';
 import { prepareAutonomousPayload } from './autonomous-run.js';
+export { setScheduleBtnDisabled } from './scheduled-message-state.js';
 
 var ctx;
 
@@ -25,6 +26,7 @@ var isComposing = false;
 var isRemoteInput = false;
 var scheduleDelayMs = 0; // 0 = no schedule, >0 = delay in ms
 var _setScheduleDelayFn = null; // set by initInput
+var scheduleRequestCounter = 0;
 
 export function hasSendableContent() {
   return !!(
@@ -58,19 +60,6 @@ export function clearScheduleDelay() {
   }
 }
 
-export function setScheduleBtnDisabled(disabled) {
-  var btn = document.getElementById("schedule-btn");
-  if (!btn) return;
-  btn.disabled = disabled;
-  if (disabled) {
-    btn.style.opacity = "0.3";
-    btn.style.pointerEvents = "none";
-  } else {
-    btn.style.opacity = "";
-    btn.style.pointerEvents = "";
-  }
-}
-
 export var builtinCommands = [
   { name: "clear", desc: "Clear conversation" },
   { name: "context", desc: "Context window usage" },
@@ -94,6 +83,24 @@ function commitVendorForTurn() {
   store.set({ vendorSelectionLocked: false, sessionHasHistory: true });
 }
 
+function scheduleAdmissionMap() {
+  return store.get("pendingScheduleAdmissions") || {};
+}
+
+function scheduleDraftMatches(left, right) {
+  return !!left && !!right && JSON.stringify(left) === JSON.stringify(right);
+}
+
+function scheduleContextMatches(left, right) {
+  return !!left && !!right && left.projectSlug === right.projectSlug && String(left.sessionId) === String(right.sessionId) && left.accountId === right.accountId;
+}
+
+store.subscribe(function (state, previous) {
+  if (state.currentSlug === previous.currentSlug && state.activeSessionId === previous.activeSessionId &&
+      state.myUserId === previous.myUserId && state.connected === previous.connected) return;
+  if (Object.keys(scheduleAdmissionMap()).length > 0) store.set({ pendingScheduleAdmissions: {}, pendingScheduleAdmission: null });
+});
+
 function showPreThinkingForTurn() {
   if (ctx.isMateDm && ctx.isMateDm()) {
     ctx.showMatePreThinking();
@@ -295,13 +302,37 @@ export function sendMessage() {
   // Scheduled message: queue message with timer delay
   if (scheduleDelayMs > 0) {
     var resetsAt = Date.now() + scheduleDelayMs;
-    ctx.ws.send(JSON.stringify({ type: "schedule_message", text: text || "", resetsAt: resetsAt }));
-    clearScheduleDelay();
-    ctx.inputEl.value = "";
-    sendInputSync();
-    clearPendingImages();
-    autoResize();
-    ctx.inputEl.focus();
+    var scheduleContext = {
+      projectSlug: store.get("currentSlug"),
+      sessionId: store.get("activeSessionId"),
+      accountId: store.get("myUserId") || "default",
+    };
+    var scheduleDraft = { text: ctx.inputEl.value, images: images, pastes: pastes, files: files, delay: scheduleDelayMs };
+    var admissions = scheduleAdmissionMap();
+    var scheduleRequestId = null;
+    var admissionIds = Object.keys(admissions);
+    for (var admissionIndex = 0; admissionIndex < admissionIds.length; admissionIndex++) {
+      var candidate = admissions[admissionIds[admissionIndex]];
+      if (candidate.context.projectSlug === scheduleContext.projectSlug && String(candidate.context.sessionId) === String(scheduleContext.sessionId) &&
+          candidate.context.accountId === scheduleContext.accountId && scheduleDraftMatches(candidate.draft, scheduleDraft)) {
+        scheduleRequestId = candidate.requestId;
+        break;
+      }
+    }
+    if (!scheduleRequestId) {
+      scheduleRequestCounter++;
+      scheduleRequestId = "schedule-" + Date.now().toString(36) + "-" + scheduleRequestCounter;
+      admissions = Object.assign({}, admissions);
+      admissions[scheduleRequestId] = { requestId: scheduleRequestId, context: scheduleContext, draft: scheduleDraft };
+      var boundedIds = Object.keys(admissions);
+      while (boundedIds.length > 8) delete admissions[boundedIds.shift()];
+    }
+    store.set({ pendingScheduleAdmissions: admissions, pendingScheduleAdmission: admissions[scheduleRequestId] });
+    ctx.ws.send(JSON.stringify({
+      type: "schedule_message", requestId: scheduleRequestId,
+      projectSlug: scheduleContext.projectSlug, sessionId: scheduleContext.sessionId, accountId: scheduleContext.accountId,
+      text: text || "", images: images, pastes: pastes, resetsAt: resetsAt,
+    }));
     return;
   }
 
@@ -348,6 +379,36 @@ export function handleAcceptedOrdinaryMessage() {
   showPreThinkingForTurn();
 }
 
+export function handleScheduleMessageResult(msg) {
+  var admissions = scheduleAdmissionMap();
+  var pending = admissions[msg && msg.requestId];
+  var currentContext = { projectSlug: store.get("currentSlug"), sessionId: store.get("activeSessionId"), accountId: store.get("myUserId") || "default" };
+  if (!pending || !msg || msg.requestId !== pending.requestId) return false;
+  if (!store.get("connected") || !scheduleContextMatches(pending.context, currentContext) ||
+      msg.projectSlug !== currentContext.projectSlug || String(msg.sessionId) !== String(currentContext.sessionId) || msg.accountId !== currentContext.accountId) {
+    admissions = Object.assign({}, admissions);
+    delete admissions[msg.requestId];
+    store.set({ pendingScheduleAdmissions: admissions, pendingScheduleAdmission: null });
+    return true;
+  }
+  if (!msg.ok) {
+    showToast(msg.error || "Could not schedule the message.", "error");
+    return true;
+  }
+  admissions = Object.assign({}, admissions);
+  delete admissions[msg.requestId];
+  store.set({ pendingScheduleAdmissions: admissions, pendingScheduleAdmission: null });
+  var currentDraft = { text: ctx.inputEl.value, images: pendingImages, pastes: pendingPastes.map(function (p) { return p.text; }), files: pendingFiles, delay: scheduleDelayMs };
+  if (JSON.stringify(currentDraft) !== JSON.stringify(pending.draft)) return true;
+  clearScheduleDelay();
+  ctx.inputEl.value = "";
+  sendInputSync();
+  clearPendingImages();
+  autoResize();
+  ctx.inputEl.focus();
+  return true;
+}
+
 export function sendTextMessage(text) {
   if (!ctx || !ctx.inputEl || typeof text !== "string" || !text.trim()) return false;
   clearPendingImages();