clay-server 3.3.0-beta.1 → 3.3.0

package/lib/public/modules/markdown-slides.js

@@ -0,0 +1,292 @@
+import { store } from './store.js';
+import { refreshIcons } from './icons.js';
+
+var levelMenu = null;
+
+function normalizedLevel(level) {
+  var parsed = Number(level);
+  return parsed >= 1 && parsed <= 3 ? parsed : 1;
+}
+
+function directHeadings(markdownEl, level) {
+  if (!markdownEl) return [];
+  var tagName = "H" + normalizedLevel(level);
+  return Array.from(markdownEl.children).filter(function (child) {
+    return child.tagName === tagName;
+  });
+}
+
+export function countMarkdownSlides(markdownEl, level) {
+  return directHeadings(markdownEl, level).length;
+}
+
+export function suggestedMarkdownSlideLevel(markdownEl) {
+  var counts = [0, 1, 2, 3].map(function (level) {
+    return level === 0 ? 0 : countMarkdownSlides(markdownEl, level);
+  });
+  var selected = normalizedLevel(store.get('markdownSlidePreferredLevel') || store.get('markdownSlideLevel'));
+  if (store.get('markdownSlideLevelExplicit') && counts[selected] > 0) return selected;
+  if (counts[1] === 1 && counts[2] > 1) return 2;
+  if (counts[1] > 0) return 1;
+  if (counts[2] > 0) return 2;
+  if (counts[3] > 0) return 3;
+  return selected;
+}
+
+function updateSlideButton(active, available, level) {
+  var button = document.getElementById("file-viewer-slides");
+  var levelButton = document.getElementById("file-viewer-slide-level");
+  var selectedLevel = normalizedLevel(level || store.get('markdownSlideLevel'));
+  if (!button) return;
+  button.classList.toggle("hidden", !available);
+  button.classList.toggle("active", active);
+  button.setAttribute("aria-pressed", active ? "true" : "false");
+  button.setAttribute("aria-label", active ? "Exit slide show" : "Present Markdown by H" + selectedLevel + " headings");
+  button.title = active ? "Exit slide show (Esc)" : "Present by H" + selectedLevel + " sections";
+  if (levelButton) {
+    levelButton.classList.toggle("hidden", !available || active);
+    levelButton.setAttribute("aria-label", "Choose slide heading level. Current: H" + selectedLevel);
+    levelButton.title = "Split slides by heading level";
+    var label = levelButton.querySelector("span");
+    if (label) label.textContent = "H" + selectedLevel;
+  }
+}
+
+export function syncMarkdownSlidesButton(markdownEl) {
+  if (!markdownEl) {
+    closeMarkdownSlideLevelMenu();
+    updateSlideButton(false, false, store.get('markdownSlideLevel'));
+    return 0;
+  }
+  var level = suggestedMarkdownSlideLevel(markdownEl);
+  var count = countMarkdownSlides(markdownEl, level);
+  store.set({ markdownSlideLevel: level });
+  updateSlideButton(false, count > 0, level);
+  return count;
+}
+
+function closeLevelMenuOnOutside(event) {
+  var button = document.getElementById("file-viewer-slide-level");
+  if (levelMenu && (levelMenu.contains(event.target) || (button && button.contains(event.target)))) return;
+  closeMarkdownSlideLevelMenu();
+}
+
+export function closeMarkdownSlideLevelMenu() {
+  if (levelMenu) levelMenu.remove();
+  levelMenu = null;
+  document.removeEventListener("pointerdown", closeLevelMenuOnOutside);
+  var button = document.getElementById("file-viewer-slide-level");
+  if (button) button.setAttribute("aria-expanded", "false");
+}
+
+export function toggleMarkdownSlideLevelMenu(markdownEl) {
+  if (levelMenu) {
+    closeMarkdownSlideLevelMenu();
+    return;
+  }
+  if (!markdownEl) return;
+  var button = document.getElementById("file-viewer-slide-level");
+  if (!button) return;
+  var selected = normalizedLevel(store.get('markdownSlideLevel'));
+  var menu = document.createElement("div");
+  menu.className = "markdown-slide-level-menu";
+  menu.setAttribute("role", "menu");
+  menu.setAttribute("aria-label", "Slide heading level");
+  menu.innerHTML = '<div class="markdown-slide-level-title">Start a new slide at</div>';
+  for (var level = 1; level <= 3; level++) {
+    var count = countMarkdownSlides(markdownEl, level);
+    var option = document.createElement("button");
+    option.type = "button";
+    option.className = "markdown-slide-level-option" + (level === selected ? " selected" : "");
+    option.disabled = count === 0;
+    option.dataset.level = String(level);
+    option.setAttribute("role", "menuitemradio");
+    option.setAttribute("aria-checked", level === selected ? "true" : "false");
+    option.innerHTML = '<span class="markdown-slide-level-name">H' + level + '</span>' +
+      '<code>' + "#".repeat(level) + '</code>' +
+      '<span class="markdown-slide-level-count">' + count + (count === 1 ? " heading" : " headings") + '</span>' +
+      '<i data-lucide="check"></i>';
+    option.addEventListener("click", function () {
+      var nextLevel = normalizedLevel(this.dataset.level);
+      store.set({ markdownSlideLevel: nextLevel, markdownSlidePreferredLevel: nextLevel, markdownSlideLevelExplicit: true });
+      updateSlideButton(false, true, nextLevel);
+      closeMarkdownSlideLevelMenu();
+      refreshIcons();
+    });
+    menu.appendChild(option);
+  }
+  document.body.appendChild(menu);
+  levelMenu = menu;
+  button.setAttribute("aria-expanded", "true");
+  var rect = button.getBoundingClientRect();
+  menu.style.left = Math.max(12, rect.right - menu.offsetWidth) + "px";
+  menu.style.top = Math.min(window.innerHeight - menu.offsetHeight - 12, rect.bottom + 8) + "px";
+  setTimeout(function () { document.addEventListener("pointerdown", closeLevelMenuOnOutside); }, 0);
+  refreshIcons();
+}
+
+function createControls(viewer) {
+  var controls = document.createElement("div");
+  controls.className = "markdown-slide-controls";
+  controls.innerHTML =
+    '<button type="button" class="markdown-slide-nav markdown-slide-prev" aria-label="Previous slide"><i data-lucide="arrow-left"></i></button>' +
+    '<span class="markdown-slide-counter" aria-live="polite"></span>' +
+    '<span class="markdown-slide-progress" aria-hidden="true"><span></span></span>' +
+    '<button type="button" class="markdown-slide-nav markdown-slide-next" aria-label="Next slide"><i data-lucide="arrow-right"></i></button>' +
+    '<button type="button" class="markdown-slide-exit" aria-label="Exit slide show"><i data-lucide="minimize-2"></i><span>Exit slides</span></button>';
+  controls.querySelector(".markdown-slide-prev").addEventListener("click", function () {
+    moveMarkdownSlide(-1);
+  });
+  controls.querySelector(".markdown-slide-next").addEventListener("click", function () {
+    moveMarkdownSlide(1);
+  });
+  controls.querySelector(".markdown-slide-exit").addEventListener("click", function () {
+    exitMarkdownSlides();
+  });
+  viewer.appendChild(controls);
+  return controls;
+}
+
+function showMarkdownSlide(index) {
+  var viewer = document.getElementById("file-viewer");
+  if (!viewer || !store.get('markdownSlidesActive')) return;
+  var slides = viewer.querySelectorAll(".markdown-slide");
+  if (!slides.length) return;
+  var previous = store.get('markdownSlideIndex') || 0;
+  var next = Math.max(0, Math.min(index, slides.length - 1));
+  viewer.dataset.slideDirection = next < previous ? "backward" : "forward";
+  for (var i = 0; i < slides.length; i++) {
+    var active = i === next;
+    slides[i].classList.toggle("active", active);
+    slides[i].setAttribute("aria-hidden", active ? "false" : "true");
+    slides[i].toggleAttribute("inert", !active);
+  }
+  store.set({ markdownSlideIndex: next, markdownSlideCount: slides.length });
+  var counter = viewer.querySelector(".markdown-slide-counter");
+  if (counter) counter.textContent = (next + 1) + " / " + slides.length;
+  var progress = viewer.querySelector(".markdown-slide-progress > span");
+  if (progress) progress.style.width = (((next + 1) / slides.length) * 100) + "%";
+  var prevButton = viewer.querySelector(".markdown-slide-prev");
+  var nextButton = viewer.querySelector(".markdown-slide-next");
+  if (prevButton) prevButton.disabled = next === 0;
+  if (nextButton) nextButton.disabled = next === slides.length - 1;
+  slides[next].scrollTop = 0;
+}
+
+export function moveMarkdownSlide(delta) {
+  showMarkdownSlide((store.get('markdownSlideIndex') || 0) + delta);
+}
+
+export function enterMarkdownSlides(markdownEl, startIndex, requestedLevel) {
+  var level = normalizedLevel(requestedLevel || store.get('markdownSlideLevel'));
+  var headingTag = "H" + level;
+  var headings = directHeadings(markdownEl, level);
+  if (!headings.length) return false;
+  exitMarkdownSlides();
+
+  var viewer = document.getElementById("file-viewer");
+  var deck = document.createElement("div");
+  deck.className = "markdown-slide-deck";
+  var children = Array.from(markdownEl.children);
+  var prelude = [];
+  var slide = null;
+  for (var i = 0; i < children.length; i++) {
+    var child = children[i];
+    if (child.tagName === headingTag) {
+      if (!slide && prelude.length) {
+        var cover = document.createElement("section");
+        cover.className = "markdown-slide markdown-slide-cover";
+        cover.setAttribute("role", "group");
+        cover.setAttribute("aria-roledescription", "slide");
+        for (var p = 0; p < prelude.length; p++) cover.appendChild(prelude[p]);
+        deck.appendChild(cover);
+        prelude = [];
+      }
+      slide = document.createElement("section");
+      slide.className = "markdown-slide";
+      slide.setAttribute("role", "group");
+      slide.setAttribute("aria-roledescription", "slide");
+      child.classList.add("markdown-slide-heading");
+      slide.appendChild(child);
+      deck.appendChild(slide);
+    } else if (slide) {
+      slide.appendChild(child);
+    } else {
+      prelude.push(child);
+    }
+  }
+
+  var slides = Array.from(deck.children);
+  for (var j = 0; j < slides.length; j++) {
+    slides[j].setAttribute("aria-label", "Slide " + (j + 1) + " of " + slides.length);
+  }
+  markdownEl.appendChild(deck);
+  viewer.classList.add("markdown-slides-active");
+  viewer.dataset.slideLevel = String(level);
+  createControls(viewer);
+  store.set({ markdownSlidesActive: true, markdownSlideCount: slides.length, markdownSlideIndex: 0, markdownSlideLevel: level });
+  updateSlideButton(true, true, level);
+  showMarkdownSlide(typeof startIndex === "number" ? startIndex : 0);
+  refreshIcons();
+  return true;
+}
+
+export function exitMarkdownSlides() {
+  var viewer = document.getElementById("file-viewer");
+  if (!viewer) return;
+  var markdownEl = viewer.querySelector(".file-viewer-markdown");
+  var deck = markdownEl ? markdownEl.querySelector(":scope > .markdown-slide-deck") : null;
+  if (deck) {
+    var fragment = document.createDocumentFragment();
+    var slides = Array.from(deck.children);
+    for (var i = 0; i < slides.length; i++) {
+      while (slides[i].firstChild) {
+        slides[i].firstChild.classList.remove("markdown-slide-heading");
+        fragment.appendChild(slides[i].firstChild);
+      }
+    }
+    markdownEl.insertBefore(fragment, deck);
+    deck.remove();
+  }
+  var controls = viewer.querySelector(".markdown-slide-controls");
+  if (controls) controls.remove();
+  viewer.classList.remove("markdown-slides-active");
+  delete viewer.dataset.slideDirection;
+  delete viewer.dataset.slideLevel;
+  store.set({ markdownSlidesActive: false, markdownSlideCount: 0, markdownSlideIndex: 0 });
+  closeMarkdownSlideLevelMenu();
+  var level = normalizedLevel(store.get('markdownSlideLevel'));
+  updateSlideButton(false, countMarkdownSlides(markdownEl, level) > 0, level);
+}
+
+export function handleMarkdownSlideKey(event) {
+  if (levelMenu && event.key === "Escape") {
+    event.preventDefault();
+    closeMarkdownSlideLevelMenu();
+    return true;
+  }
+  if (!store.get('markdownSlidesActive')) return false;
+  var key = event.key;
+  if (key === "Escape") {
+    event.preventDefault();
+    exitMarkdownSlides();
+    return true;
+  }
+  if (event.target && event.target.closest && event.target.closest("button, a, input, textarea, select")) return false;
+  if (key === "ArrowRight" || key === "ArrowDown" || key === "PageDown" || key === " ") {
+    event.preventDefault();
+    moveMarkdownSlide(1);
+    return true;
+  }
+  if (key === "ArrowLeft" || key === "ArrowUp" || key === "PageUp") {
+    event.preventDefault();
+    moveMarkdownSlide(-1);
+    return true;
+  }
+  if (key === "Home" || key === "End") {
+    event.preventDefault();
+    showMarkdownSlide(key === "Home" ? 0 : (store.get('markdownSlideCount') || 1) - 1);
+    return true;
+  }
+  return false;
+}

package/lib/public/modules/mate-sidebar.js

@@ -109,13 +109,6 @@ export function initMateSidebar(wsGetter) {
       if (origBtn) origBtn.click();
     });
   }
-  var mateEmailBtn = document.getElementById("mate-email-btn");
-  if (mateEmailBtn) {
-    mateEmailBtn.addEventListener("click", function () {
-      var origBtn = document.getElementById("email-sidebar-btn");
-      if (origBtn) origBtn.click();
-    });
-  }
   var mateSkillsBtn = document.getElementById("mate-skills-btn");
   if (mateSkillsBtn) {
     mateSkillsBtn.addEventListener("click", function () {

package/lib/public/modules/sidebar.js

@@ -2,6 +2,7 @@ import { closeArchive } from './sticky-notes.js';
 import { closeScheduler } from './scheduler.js';
 import { initSidebarSessions } from './sidebar-sessions.js';
 import { focusFileTree } from './filebrowser.js';
+import { refreshGitStatus } from './git-panel.js';
 import { initSidebarProjects, closeProjectCtxMenu } from './sidebar-projects.js';
 import {
   initSidebarMates,
@@ -118,16 +119,20 @@ export function initSidebar(_ctx) {
 
   // --- Panel switch (sessions / files / projects) ---
   var fileBrowserBtn = ctx.$("file-browser-btn");
+  var gitBtn = ctx.$("git-sidebar-btn");
   var projectsPanel = ctx.$("sidebar-panel-projects");
   var sessionsPanel = ctx.$("sidebar-panel-sessions");
   var filesPanel = ctx.$("sidebar-panel-files");
+  var gitPanel = ctx.$("sidebar-panel-git");
   var sessionsHeaderContent = ctx.$("sessions-header-content");
   var filePanelClose = ctx.$("file-panel-close");
+  var gitPanelClose = ctx.$("git-panel-close");
 
   function hideAllPanels() {
     if (projectsPanel) projectsPanel.classList.add("hidden");
     if (sessionsPanel) sessionsPanel.classList.add("hidden");
     if (filesPanel) filesPanel.classList.add("hidden");
+    if (gitPanel) gitPanel.classList.add("hidden");
     if (sessionsHeaderContent) sessionsHeaderContent.classList.add("hidden");
   }
 
@@ -155,6 +160,16 @@ export function initSidebar(_ctx) {
     requestAnimationFrame(function () { focusFileTree(); });
   }
 
+  function showGitPanel() {
+    hideAllPanels();
+    if (gitPanel) {
+      gitPanel.classList.remove("hidden");
+      gitPanel.classList.remove("fb-exit");
+      gitPanel.classList.add("fb-enter");
+    }
+    refreshGitStatus();
+  }
+
   function hideFilesPanel(cb) {
     if (!filesPanel || filesPanel.classList.contains("hidden")) { if (cb) cb(); return; }
     filesPanel.classList.remove("fb-enter");
@@ -168,6 +183,20 @@ export function initSidebar(_ctx) {
     filesPanel.addEventListener("animationend", onDone);
   }
 
+  function hideGitPanel(cb) {
+    if (!gitPanel || gitPanel.classList.contains("hidden")) { if (cb) cb(); return; }
+    gitPanel.classList.remove("fb-enter");
+    gitPanel.classList.add("fb-exit");
+    function onDone(e) {
+      if (e.target !== gitPanel) return;
+      gitPanel.removeEventListener("animationend", onDone);
+      gitPanel.classList.remove("fb-exit");
+      gitPanel.classList.add("hidden");
+      if (cb) cb();
+    }
+    gitPanel.addEventListener("animationend", onDone);
+  }
+
   if (fileBrowserBtn) {
     // Clicking the tile toggles: open if closed, close (back to sessions)
     // if it's already the visible panel. Same behavior via the Cmd+O
@@ -187,6 +216,19 @@ export function initSidebar(_ctx) {
       });
     });
   }
+  if (gitBtn) {
+    gitBtn.addEventListener("click", function () {
+      if (gitPanel && !gitPanel.classList.contains("hidden")) {
+        hideGitPanel(function () { showSessionsPanel(); });
+      }
+      else showGitPanel();
+    });
+  }
+  if (gitPanelClose) {
+    gitPanelClose.addEventListener("click", function () {
+      hideGitPanel(function () { showSessionsPanel(); });
+    });
+  }
 
   // --- User island width sync ---
   var userIsland = document.getElementById("user-island");

package/lib/public/modules/tool-palette.js

@@ -25,7 +25,7 @@ var SESSION_TOOLS = [
   { id: "sticky-notes-sidebar-btn", icon: "sticky-note",   label: "Sticky Notes",    countId: "sticky-notes-sidebar-count" },
   { id: "scheduler-btn",           icon: "calendar-clock", label: "Scheduled Tasks" },
   { id: "loop-tool-btn",           icon: "repeat",         label: "Loop" },
-  { id: "email-sidebar-btn",       icon: "mail",           label: "Email" },
+  { id: "git-sidebar-btn",         icon: "git-branch",     label: "Git",             countId: "git-sidebar-count" },
   { id: "mcp-btn",                 icon: "cable",          label: "MCP Servers",     countId: "mcp-sidebar-count" },
   { id: "skills-btn",              icon: "puzzle",         label: "Skills" },
 ];
@@ -36,7 +36,6 @@ var MATE_TOOLS = [
   { id: "mate-sticky-notes-btn", icon: "sticky-note",    label: "Sticky Notes" },
   { id: "mate-scheduler-btn",    icon: "calendar-clock", label: "Scheduled Tasks" },
   { id: "mate-debate-btn",       icon: "mic",            label: "Debate" },
-  { id: "mate-email-btn",        icon: "mail",           label: "Email" },
   { id: "mate-mcp-btn",          icon: "cable",          label: "MCP Servers",     countId: "mate-mcp-sidebar-count" },
   { id: "mate-skills-btn",       icon: "puzzle",         label: "Skills" },
 ];

package/lib/public/style.css

@@ -10,6 +10,7 @@
 @import url("css/rewind.css");
 @import url("css/input.css");
 @import url("css/filebrowser.css");
+@import url("css/git-panel.css");
 @import url("css/diff.css");
 @import url("css/highlight.css");
 @import url("css/server-settings.css");

package/lib/sdk-bridge.js

@@ -863,7 +863,8 @@ function createSDKBridge(opts) {
       // Stream ended normally after a task stop — no "result" message was sent,
       // so the session is still marked as processing. Send interrupted feedback.
       console.log("[sdk-bridge] processQueryStream ended: isProcessing=" + session.isProcessing + " taskStopRequested=" + session.taskStopRequested);
-      if (session.isProcessing && session.taskStopRequested) {
+      var stillOwnsRuntime = session.queryInstance === myQueryInstance;
+      if (session.isProcessing && session.taskStopRequested && stillOwnsRuntime) {
         session.isProcessing = false;
         onProcessingChanged();
         send({ type: "status", processing: false });
@@ -874,9 +875,24 @@ function createSDKBridge(opts) {
         sendAndRecord(session, { type: "info", text: interruptMsg });
         sendAndRecord(session, { type: "done", code: 0 });
         sm.broadcastSessionList();
+      } else if (session.isProcessing && stillOwnsRuntime) {
+        // Codex and Kiro can report a protocol error and then close their
+        // iterator without a result event. Treat any result-less stream end as
+        // a failed turn so the UI cannot remain on processing forever.
+        session.isProcessing = false;
+        onProcessingChanged();
+        if (!session._lastAdapterError) {
+          sendAndRecord(session, {
+            type: "error",
+            text: "The agent connection ended before completing the response.",
+          });
+        }
+        session._lastAdapterError = null;
+        sendAndRecord(session, { type: "done", code: 1 });
+        sm.broadcastSessionList();
       }
     } catch (err) {
-      if (session.isProcessing) {
+      if (session.isProcessing && session.queryInstance === myQueryInstance) {
         session.isProcessing = false;
         onProcessingChanged();
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
@@ -1310,6 +1326,7 @@ function createSDKBridge(opts) {
     session.pendingElicitations = {};
     session.streamedText = false;
     session.responsePreview = "";
+    session._lastAdapterError = null;
 
     // For in-process path, create AbortController. For worker path, the adapter
     // handles abort internally and exposes it via handle.abort().
@@ -1574,7 +1591,22 @@ function createSDKBridge(opts) {
 
     // Push initial user message through the QueryHandle
     console.log("[sdk-bridge] pushing initial message via handle.pushMessage...");
-    handle.pushMessage(text, images);
+    var initialMessageAccepted = handle.pushMessage(text, images) !== false;
+    if (!initialMessageAccepted) {
+      console.error("[sdk-bridge] Query rejected initial message for session " + session.localId);
+      try { handle.close(); } catch (e) {}
+      if (session.queryInstance === handle) session.queryInstance = null;
+      session.messageQueue = null;
+      session.abortController = null;
+      session.isProcessing = false;
+      onProcessingChanged();
+      sendAndRecord(session, { type: "error", text: "The agent connection closed before it received your message. Please send it again." });
+      sendAndRecord(session, { type: "done", code: 1 });
+      sm.broadcastSessionList();
+      return;
+    }
+    session._awaitingTurnResult = true;
+    session._queuedTurnCount = 0;
     console.log("[sdk-bridge] pushMessage done, starting processQueryStream...");
 
     // Flush messages that arrived while createQuery was still awaiting
@@ -1585,7 +1617,9 @@ function createSDKBridge(opts) {
       session.pendingPush = [];
       console.log("[sdk-bridge] flushing " + backlog.length + " buffered message(s) into new query");
       for (var bi = 0; bi < backlog.length; bi++) {
-        handle.pushMessage(backlog[bi].text, backlog[bi].images);
+        if (handle.pushMessage(backlog[bi].text, backlog[bi].images) !== false) {
+          session._queuedTurnCount++;
+        }
       }
     }
 
@@ -1634,7 +1668,14 @@ function createSDKBridge(opts) {
       } catch (e) {
         console.error("[sdk-bridge] QueryHandle rejected message for session " + session.localId + ":", e.message || e);
       }
-      if (delivered) return true;
+      if (delivered) {
+        if (session._awaitingTurnResult) {
+          session._queuedTurnCount = (session._queuedTurnCount || 0) + 1;
+        } else {
+          session._awaitingTurnResult = true;
+        }
+        return true;
+      }
 
       // The handle object can outlive its underlying input queue or worker.
       // Retire it before the caller starts a resumed replacement query; the

package/lib/sdk-message-processor.js

@@ -451,6 +451,8 @@ function attachMessageProcessor(ctx) {
         if (parsed.terminalReason) execError += " (reason: " + parsed.terminalReason + ")";
         console.error("[sdk-bridge] Execution error for session " + session.localId + ": " + execError);
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
         sendAndRecord(session, { type: "done", code: 1 });
@@ -458,8 +460,17 @@ function attachMessageProcessor(ctx) {
         return;
       }
 
-      session.isProcessing = false;
-      onProcessingChanged();
+      session._lastAdapterError = null;
+      var hasQueuedTurn = (session._queuedTurnCount || 0) > 0;
+      if (hasQueuedTurn) {
+        session._queuedTurnCount--;
+        session._awaitingTurnResult = true;
+      } else {
+        session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
+        onProcessingChanged();
+      }
       // Detect "Not logged in" scenario early for the check below
       var previewTrimmed = (session.responsePreview || "").trim();
       var isZeroCost = !parsed.cost || parsed.cost === 0;
@@ -494,6 +505,11 @@ function attachMessageProcessor(ctx) {
         emitAuthRequired(session);
       }
       sendAndRecord(session, { type: "done", code: 0 });
+      if (hasQueuedTurn) {
+        // The adapter immediately continues with the already queued user turn.
+        // Restore the client stop state after the previous turn's done event.
+        sendToSession(session, { type: "status", status: "processing" });
+      }
       var _donePreviewText = (session.responsePreview || "").replace(/\s+/g, " ").trim();
       if (_donePreviewText.length > 140) _donePreviewText = _donePreviewText.substring(0, 140) + "...";
       var _doneTitle = mateDisplayName ? (mateDisplayName + " responded") : (session.title || "Claude");
@@ -770,6 +786,14 @@ function attachMessageProcessor(ctx) {
       onProcessingChanged();
       emitAuthRequired(session);
 
+    } else if (parsed.yokeType === "error") {
+      // Adapters use a neutral error event for turn failures that arrive as
+      // protocol messages instead of thrown iterator errors. Remember it so
+      // processQueryStream can finish the turn when the iterator closes.
+      var adapterErrorText = parsed.text || parsed.message || parsed.error || "Agent runtime error";
+      session._lastAdapterError = adapterErrorText;
+      sendAndRecord(session, { type: "error", text: adapterErrorText });
+
     } else if (parsed.yokeType === "model_refusal") {
       // Model declined the request. "fallback" => the CLI retried on another
       // model; "no_fallback" => the turn ended with a refusal.

package/lib/sessions.js

@@ -926,7 +926,7 @@ function createSessionManager(opts) {
       }
     }
     // Notify server for cross-project unread tracking
-    if (obj.type === "done") onSessionDone();
+    if (obj.type === "done") onSessionDone(session);
   }
 
   function resumeSession(cliSessionId, opts, targetWs) {