clay-server 4.0.0-beta.12 → 4.0.0-beta.14

package/lib/public/css/project-logs.css

@@ -1,4 +1,4 @@
-/* Project Logs — restrained, factual project ledger. */
+/* Project Logs — a restrained editorial ledger, designed for close reading. */
 
 /* Wide screens: bounded workbench window beside #app, matching the geometry of
    the document viewer and the terminal. */
@@ -94,90 +94,32 @@
 .project-logs-icon-btn[aria-pressed="true"] { border-color: var(--accent); color: var(--accent); }
 .project-logs-icon-btn:disabled { opacity: 0.4; cursor: default; }
 .project-logs-window-actions { display: inline-flex; align-items: center; gap: 6px; }
-/* --- Ambient edge handle ---------------------------------------------
-   A slim notch on the right workbench boundary, offered only where a real
-   pointer can hover. Touch keeps the explicit toolbar route. */
-@media (min-width: 1024px) {
-  .project-logs-handle {
-    position: absolute;
-    top: 50%;
-    right: 0;
-    transform: translateY(-50%);
-    width: 14px;
-    height: 88px;
-    padding: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid var(--border);
-    border-right: 0;
-    border-radius: 8px 0 0 8px;
-    background: var(--bg-alt);
-    cursor: pointer;
-    z-index: 40;
-    transition: width 0.16s ease, background 0.16s ease;
-  }
-  .project-logs-handle:hover,
-  .project-logs-handle:focus-visible { width: 18px; background: var(--bg); }
-  .project-logs-handle:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
-  .project-logs-handle.hidden { display: none; }
-  .project-logs-handle-notch {
-    width: 3px;
-    height: 34px;
-    border-radius: 999px;
-    background: var(--border);
-    transition: background 0.16s ease, height 0.16s ease;
-  }
-  .project-logs-handle:hover .project-logs-handle-notch { background: var(--text-dimmer); }
-  /* Unread: a brighter notch, no motion of its own. */
-  .project-logs-handle.has-unread .project-logs-handle-notch { background: var(--accent); height: 46px; }
-}
-
-/* Touch and narrow viewports never depend on hover. */
-@media (max-width: 1023px) {
-  .project-logs-handle { display: none; }
-}
-
-/* A preview is the same pane, revealed but uncommitted. */
-#project-logs-panel.project-logs-previewing { box-shadow: 0 0 0 1px var(--accent), 4px 8px 24px rgba(var(--shadow-rgb), 0.2); }
-
-/* --- Unread cues --- */
+/* The explicit tool button is the only discovery affordance. */
 #project-logs-btn.project-logs-unread { color: var(--accent); }
 #project-logs-count { background: var(--accent); color: #fff; }
 
-@keyframes project-logs-pulse {
-  0% { box-shadow: 0 0 0 0 color-mix(in srgb, var(--accent) 45%, transparent); }
-  70% { box-shadow: 0 0 0 7px transparent; }
-  100% { box-shadow: 0 0 0 0 transparent; }
-}
-.project-logs-pulse { animation: project-logs-pulse 1.1s ease-out 2; }
-
-/* Reduced motion keeps the static unread marker and drops every flourish. */
-@media (prefers-reduced-motion: reduce) {
-  .project-logs-pulse { animation: none; }
-  .project-logs-handle { transition: none; }
-  .project-logs-handle-notch { transition: none; }
-}
-
 /* --- Ledger toolbar --- */
-.project-logs-toolbar { display: flex; align-items: center; gap: 8px; padding: 10px 12px; border-bottom: 1px solid var(--border-subtle); flex: 0 0 auto; }
+.project-logs-toolbar { display: flex; align-items: center; gap: 8px; padding: 12px 14px; border-bottom: 1px solid var(--border-subtle); flex: 0 0 auto; background: color-mix(in srgb, var(--bg-alt) 72%, transparent); }
 .project-logs-toolbar.hidden { display: none; }
-.project-logs-search { flex: 1; min-width: 0; height: 32px; display: flex; align-items: center; gap: 7px; padding: 0 9px; border: 1px solid var(--border); border-radius: 7px; background: var(--bg-alt); color: var(--text-dimmer); }
+.project-logs-search { flex: 1; min-width: 0; height: 36px; display: flex; align-items: center; gap: 8px; padding: 0 10px; border: 1px solid var(--border); border-radius: 6px; background: var(--bg); color: var(--text-dimmer); }
 .project-logs-search .lucide { width: 14px; flex: 0 0 auto; }
 .project-logs-search input { width: 100%; border: 0; outline: 0; background: transparent; color: var(--text); font: inherit; font-size: 12px; }
-.project-logs-filter { height: 32px; max-width: 42%; padding: 0 8px; border: 1px solid var(--border); border-radius: 7px; background: var(--bg-alt); color: var(--text-secondary); font: inherit; font-size: 12px; cursor: pointer; }
+.project-logs-search:focus-within, .project-logs-filter:focus-visible { outline: 2px solid color-mix(in srgb, var(--accent) 35%, transparent); border-color: var(--accent); }
+.project-logs-filter { height: 36px; max-width: 42%; padding: 0 8px; border: 1px solid var(--border); border-radius: 6px; background: var(--bg); color: var(--text-secondary); font: inherit; font-size: 12px; cursor: pointer; }
 
 /* --- Ledger list: full pane, chronological, commit-history feel --- */
-.project-logs-list { flex: 1; min-height: 0; overflow-y: auto; padding: 4px 0; }
+.project-logs-list { flex: 1; min-height: 0; overflow-y: auto; padding: 8px 0 18px; }
 .project-logs-list.hidden { display: none; }
-.project-log-row { width: 100%; display: block; padding: 12px 14px; border: 0; border-bottom: 1px solid var(--border-subtle); background: transparent; color: inherit; text-align: left; cursor: pointer; }
-.project-log-row:hover { background: rgba(var(--overlay-rgb), 0.05); }
+.project-log-row { width: 100%; display: block; padding: 15px 18px 14px; border: 0; border-bottom: 1px solid var(--border-subtle); border-left: 2px solid transparent; background: transparent; color: inherit; text-align: left; cursor: pointer; transition: background 0.14s ease, border-color 0.14s ease; }
+.project-log-row:hover { background: color-mix(in srgb, var(--accent) 5%, transparent); border-left-color: var(--accent); }
+.project-log-row:focus-visible { outline: 2px solid var(--accent); outline-offset: -3px; }
 .project-log-row:last-child { border-bottom: 0; }
 .project-log-row-head { display: flex; align-items: baseline; gap: 7px; flex-wrap: wrap; }
-.project-log-row-title { flex: 1; min-width: 0; font-size: 13px; font-weight: 650; color: var(--text); }
-.project-log-row-summary { margin: 5px 0 0; color: var(--text-secondary); font-size: 12px; line-height: 1.5; }
-.project-log-row-meta { margin-top: 6px; color: var(--text-dimmer); font-size: 10.5px; font-family: var(--font-mono); }
-.project-logs-list-empty { padding: 32px 20px; color: var(--text-dimmer); font-size: 12px; text-align: center; line-height: 1.6; }
+.project-log-row-title { flex: 1; min-width: 0; font-size: 14px; font-weight: 700; letter-spacing: -0.01em; color: var(--text); }
+.project-log-row-summary { margin: 7px 0 0; color: var(--text-secondary); font-size: 12.5px; line-height: 1.55; }
+.project-log-row-meta { margin-top: 8px; color: var(--text-dimmer); font-size: 10.5px; font-family: var(--font-mono); }
+.project-logs-list-empty { max-width: 320px; margin: 54px auto; padding: 20px; border-top: 1px solid var(--border); border-bottom: 1px solid var(--border); color: var(--text-dimmer); font-size: 12px; text-align: center; line-height: 1.7; }
+.project-logs-list[aria-busy="true"] .project-logs-list-empty { color: var(--text-secondary); font-family: var(--font-mono); }
 
 /* Category chip and priority signal. Categories are project-defined, so the
    chip is deliberately neutral: no per-category selectors and no exhaustive
@@ -191,13 +133,13 @@
 /* --- Entry detail: full pane, replaces the list --- */
 .project-logs-detail { flex: 1; min-width: 0; min-height: 0; overflow-y: auto; }
 .project-logs-detail.hidden { display: none; }
-.project-log-document { max-width: 820px; margin: 0 auto; padding: 22px 22px 40px; }
+.project-log-document { max-width: 760px; margin: 0 auto; padding: 32px 28px 52px; }
 #project-logs-panel.panel-fullscreen .project-log-document { padding: clamp(28px, 5vw, 64px); }
 .project-log-doc-chips { display: flex; align-items: center; gap: 7px; margin-bottom: 10px; }
-.project-log-document h1 { margin: 0 0 8px; color: var(--text); font-family: var(--font-display); font-size: clamp(20px, 2.4vw, 28px); line-height: 1.2; }
-.project-log-doc-summary { margin: 0 0 10px; color: var(--text-secondary); font-size: 13px; line-height: 1.55; }
-.project-log-byline { margin: 0 0 18px; padding-bottom: 16px; border-bottom: 1px solid var(--border-subtle); color: var(--text-dimmer); font-size: 11px; font-family: var(--font-mono); }
-.project-log-markdown { line-height: 1.65; }
+.project-log-document h1 { margin: 0 0 10px; color: var(--text); font-family: var(--font-display); font-size: clamp(24px, 2.8vw, 34px); letter-spacing: -0.025em; line-height: 1.12; }
+.project-log-doc-summary { margin: 0 0 13px; color: var(--text-secondary); font-size: 14px; line-height: 1.6; }
+.project-log-byline { margin: 0 0 25px; padding-bottom: 18px; border-bottom: 2px solid var(--border-subtle); color: var(--text-dimmer); font-size: 11px; font-family: var(--font-mono); }
+.project-log-markdown { font-size: 14px; line-height: 1.75; }
 
 /* --- Discussion --- */
 .project-log-discussion { margin-top: 30px; padding-top: 18px; border-top: 1px solid var(--border-subtle); }
@@ -230,5 +172,9 @@
 
 @media (max-width: 768px) {
   .project-logs-subtitle { display: none; }
-  .project-log-document { padding: 18px 16px 32px; }
+  .project-logs-topbar { gap: 8px; padding: 0 12px; }
+  .project-logs-toolbar { padding: 10px 12px; }
+  .project-logs-filter { max-width: 44%; }
+  .project-log-row { padding: 14px 14px 13px; }
+  .project-log-document { padding: 24px 18px 38px; }
 }

package/lib/public/modules/project-logs-render.js

@@ -159,12 +159,12 @@ function renderRow(entry, onOpen) {
   return row;
 }
 
-export function renderList(listEl, entries, onOpen) {
+export function renderList(listEl, entries, onOpen, emptyState) {
   listEl.innerHTML = "";
   if (!entries.length) {
     var empty = document.createElement("div");
     empty.className = "project-logs-list-empty";
-    empty.textContent = "No logs yet. This project's agent sessions record decisions and work here.";
+    empty.textContent = emptyState || "No logs yet. This project's agent sessions record decisions and work here.";
     listEl.appendChild(empty);
     return;
   }

package/lib/public/modules/project-logs.js

@@ -15,15 +15,10 @@ import { getWs } from './ws-ref.js';
 import { refreshIcons } from './icons.js';
 import { showToast } from './utils.js';
 import { closeScheduler } from './scheduler.js';
-import { hideNotes } from './sticky-notes.js';
 import { closeNotesBrowser } from './sticky-notes-browser.js';
 import { closeFileViewer } from './filebrowser.js';
 import { closeTerminal } from './terminal.js';
 import { renderFilter, renderList, renderDetail } from './project-logs-render.js';
-import {
-  initProjectLogsAmbient, bindPanelHover, noteCanonicalUpdate,
-  acknowledgeUpdates, resetAmbient, syncAmbient, hidePreview, pinFromPreview
-} from './project-logs-ambient.js';
 
 var panel = null;
 var listEl = null;
@@ -34,6 +29,37 @@ var backBtn = null;
 var searchTimer = null;
 var requestCounter = 0;
 
+function syncUnreadBadge() {
+  var button = document.getElementById("project-logs-btn");
+  if (!button) return;
+  var unread = store.get('projectLogsUnread') || 0;
+  button.classList.toggle("project-logs-unread", unread > 0);
+  var badge = document.getElementById("project-logs-count");
+  if (!badge) return;
+  badge.textContent = unread > 0 ? String(unread) : "";
+  badge.classList.toggle("hidden", unread < 1);
+}
+
+function acknowledgeUpdates() {
+  if (!store.get('projectLogsUnread')) return;
+  store.set({ projectLogsUnread: 0 });
+  syncUnreadBadge();
+}
+
+function noteCanonicalUpdate(msg) {
+  if (!msg || !msg.ref || !msg.revision) return false;
+  var seen = store.get('projectLogsSeenRevisions') || {};
+  if (seen[msg.ref] >= msg.revision) return false;
+  var next = Object.assign({}, seen);
+  next[msg.ref] = msg.revision;
+  store.set({
+    projectLogsSeenRevisions: next,
+    projectLogsUnread: store.get('projectLogsOpen') ? 0 : (store.get('projectLogsUnread') || 0) + 1,
+  });
+  syncUnreadBadge();
+  return true;
+}
+
 function nextRequestId(prefix) {
   requestCounter += 1;
   return prefix + "-" + Date.now() + "-" + requestCounter;
@@ -80,11 +106,7 @@ function ensurePanel() {
   backBtn = panel.querySelector("#project-logs-back");
 
   panel.querySelector("#project-logs-close").addEventListener("click", closeProjectLogs);
-  backBtn.addEventListener("click", function () { pinOnInteraction(); showList(); });
-  // Any meaningful interaction inside a preview commits to it.
-  searchEl.addEventListener("focus", pinOnInteraction);
-  panel.addEventListener("pointerdown", pinOnInteraction);
-  bindPanelHover(panel);
+  backBtn.addEventListener("click", showList);
   panel.querySelector("#project-logs-wide").addEventListener("click", function () {
     applyWindowState(!store.get('projectLogsWide'), store.get('projectLogsFullscreen'));
   });
@@ -98,24 +120,6 @@ function ensurePanel() {
   refreshIcons();
 }
 
-// A preview reveals the pane without committing to it: no acknowledgement, no
-// open state, and no list refresh beyond what is already on screen.
-function revealPreview() {
-  ensurePanel();
-  if (!panel) return;
-  panel.classList.remove("hidden");
-  panel.classList.add("project-logs-previewing");
-  applyWindowState(store.get('projectLogsWide'), false);
-  if (!store.get('projectLogsEntries') || !store.get('projectLogsEntries').length) requestList();
-}
-
-function hideRevealedPreview() {
-  if (!panel) return;
-  panel.classList.remove("project-logs-previewing");
-  if (store.get('projectLogsOpen')) return;
-  panel.classList.add("hidden");
-}
-
 // Width and fullscreen are transient view state, so they live in the store like
 // every other mutable UI value. `panel-fullscreen` is the shared class the
 // document viewer and terminal already use.
@@ -147,13 +151,6 @@ function showList() {
   listEl.scrollTop = store.get('projectLogsListScroll') || 0;
 }
 
-// A preview becomes a real open the moment the user does something with it.
-function pinOnInteraction() {
-  if (store.get('projectLogsOpen')) return;
-  if (!store.get('projectLogsPreview')) return;
-  pinFromPreview();
-}
-
 function showDetail(entry) {
   if (!panel || !entry) return;
   store.set({ projectLogsListScroll: listEl.scrollTop, projectLogsView: "detail", projectLogsSelectedRef: entry.ref });
@@ -170,12 +167,21 @@ function showDetail(entry) {
 function requestList() {
   var requestId = nextRequestId("list-logs");
   store.set({ projectLogsListRequestId: requestId });
-  send({
+  if (listEl && !store.get('projectLogsEntries').length) {
+    listEl.setAttribute("aria-busy", "true");
+    renderList(listEl, [], requestEntry, "Loading the project ledger...");
+  }
+  if (!send({
     type: "project_logs_list",
     requestId: requestId,
     query: searchEl ? searchEl.value.trim() : "",
     category: store.get('projectLogsCategory') || "",
-  });
+  })) {
+    if (listEl) {
+      listEl.removeAttribute("aria-busy");
+      renderList(listEl, [], requestEntry, "Logs are unavailable while disconnected.");
+    }
+  }
 }
 
 function requestEntry(ref) {
@@ -185,7 +191,6 @@ function requestEntry(ref) {
 }
 
 function submitComment(ref, body, statusEl, inputEl) {
-  pinOnInteraction();
   var requestId = nextRequestId("comment-log");
   store.set({ projectLogsCommentRequestId: requestId, projectLogsCommentInput: inputEl || null });
   if (!send({ type: "project_log_comment", requestId: requestId, ref: ref, body: body })) {
@@ -197,7 +202,6 @@ function submitComment(ref, body, statusEl, inputEl) {
 }
 
 function applyFilter(category) {
-  pinOnInteraction();
   store.set({ projectLogsCategory: category || "" });
   requestList();
 }
@@ -211,18 +215,13 @@ export function initProjectLogs() {
     if (store.get('projectLogsOpen')) closeProjectLogs();
     else openProjectLogs();
   });
-  initProjectLogsAmbient({
-    reveal: revealPreview,
-    hide: hideRevealedPreview,
-    pin: openProjectLogs,
-  });
+  syncUnreadBadge();
   store.subscribe(function (state, previous) {
     if (state.currentSlug === previous.currentSlug) return;
     closeProjectLogs();
     applyWindowState(false, false);
     // A different project must never inherit the previous project's unread
-    // state or animate its updates.
-    resetAmbient();
+    // state.
     store.set({
       projectLogsEntries: [],
       projectLogsSelectedRef: null,
@@ -231,8 +230,11 @@ export function initProjectLogs() {
       projectLogsListScroll: 0,
       projectLogsListRequestId: null,
       projectLogsReadRequestId: null,
-      projectLogsCommentRequestId: null
+      projectLogsCommentRequestId: null,
+      projectLogsUnread: 0,
+      projectLogsSeenRevisions: {}
     });
+    syncUnreadBadge();
   });
 }
 
@@ -243,37 +245,31 @@ export function openProjectLogs() {
   if (!panel) return;
   closeScheduler();
   closeNotesBrowser();
-  hideNotes();
   // Claim the single right workbench slot.
   try { closeFileViewer(); } catch (e) {}
   try { closeTerminal(); } catch (e) {}
   panel.classList.remove("hidden");
-  panel.classList.remove("project-logs-previewing");
   applyWindowState(store.get('projectLogsWide'), false);
   var button = document.getElementById("project-logs-btn");
   if (button) button.classList.add("active");
-  store.set({ projectLogsOpen: true, projectLogsPinned: true, projectLogsPreview: false });
-  // Opening the ledger is the acknowledgement; the ambient cues clear here and
-  // nowhere else.
+  store.set({ projectLogsOpen: true });
+  // Opening through the explicit tool button acknowledges the live badge.
   acknowledgeUpdates();
   showList();
   requestList();
 }
 
 export function closeProjectLogs() {
-  hidePreview();
   if (!store.get('projectLogsOpen')) return;
   if (panel) {
     panel.classList.add("hidden");
-    panel.classList.remove("project-logs-previewing");
   }
   // Fullscreen is always dropped on close so the next open is a bounded pane
   // and never silently hides the conversation.
   applyWindowState(store.get('projectLogsWide'), false);
   var button = document.getElementById("project-logs-btn");
   if (button) button.classList.remove("active");
-  store.set({ projectLogsOpen: false, projectLogsPinned: false });
-  syncAmbient();
+  store.set({ projectLogsOpen: false });
 }
 
 // --- Server messages -----------------------------------------------------
@@ -282,10 +278,13 @@ export function handleProjectLogsState(msg) {
   if (msg.requestId && msg.requestId !== store.get('projectLogsListRequestId')) return;
   store.set({ projectLogsEntries: msg.entries || [] });
   if (!listEl) return;
+  listEl.removeAttribute("aria-busy");
   if (filterEl && Array.isArray(msg.categories)) {
     renderFilter(filterEl, msg.categories, store.get('projectLogsCategory'), applyFilter);
   }
-  renderList(listEl, msg.entries || [], requestEntry);
+  var isFiltered = !!((searchEl && searchEl.value.trim()) || store.get('projectLogsCategory'));
+  renderList(listEl, msg.entries || [], requestEntry,
+    isFiltered ? "No entries match this search or category." : "No logs yet. This project's agent sessions record decisions and work here.");
   if (store.get('projectLogsView') !== "detail") listEl.scrollTop = store.get('projectLogsListScroll') || 0;
 }
 
@@ -309,8 +308,8 @@ export function handleProjectLogCommented(msg) {
   requestList();
 }
 
-// A canonical revision landed. This marks the ambient cues and never opens,
-// focuses, or scrolls anything.
+// A canonical revision landed. This marks the explicit button only; it never
+// opens, reveals, focuses, or scrolls the pane.
 export function handleProjectLogUpdated(msg) {
   noteCanonicalUpdate(msg);
   // Refresh the ledger only when it is already on screen, so the row moves to
@@ -325,5 +324,9 @@ export function handleProjectLogsError(msg) {
     store.get('projectLogsCommentRequestId')
   ];
   if (msg.requestId && pending.indexOf(msg.requestId) === -1) return;
+  if (msg.requestId && msg.requestId === store.get('projectLogsListRequestId') && listEl) {
+    listEl.removeAttribute("aria-busy");
+    renderList(listEl, [], requestEntry, "The ledger could not be loaded. Try opening Logs again.");
+  }
   showToast(msg.message || "Project Logs could not complete the request.", "error");
 }

package/lib/public/modules/split-group-helpers.js

@@ -16,3 +16,11 @@ export function findSplitGroup(groups, memberIds) {
   }
   return null;
 }
+
+export function isConfiguredWorker(groups, sessionId) {
+  var list = groups || [];
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].pair && list[i].pair.workerId === sessionId) return true;
+  }
+  return false;
+}

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

@@ -7,7 +7,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { detachTuiView } from './session-tui-view.js';
 import { formatTokens } from './app-panels.js';
 import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
-import { groupedSessionIds, findSplitGroup } from './split-group-helpers.js';
+import { groupedSessionIds, findSplitGroup, isConfiguredWorker } from './split-group-helpers.js';
 import { showConfirm } from './app-misc.js';
 import { syncPairChrome } from './split-pair-ui.js';
 import { presentMarkdownEdit } from './filebrowser.js';
@@ -159,7 +159,10 @@ export function syncPaneTitles() {
 function updatePaneFullAccessButton(button, session) {
   if (!button) return;
   var mode = session && (session.runtimeMode || session.mode || "gui");
-  var visible = !!session && !store.get('skipPermsEnabled') && mode === "gui";
+  var worker = !!session && isConfiguredWorker(store.get('splitGroups'), session.id);
+  // Permission policy belongs to the Driver. A configured Worker inherits it
+  // server-side and must not present a second, misleading control.
+  var visible = !!session && !worker && !store.get('skipPermsEnabled') && mode === "gui";
   var enabled = visible && session.permissionMode === "bypassPermissions";
   button.classList.toggle("hidden", !visible);
   button.classList.toggle("active", enabled);

package/lib/sdk-bridge.js

@@ -12,6 +12,7 @@ var { createMessageQueue } = require("./sdk-message-queue");
 var { attachMessageProcessor } = require("./sdk-message-processor");
 var homeDebateToolPolicy = require("./home-debate-tool-policy");
 var yoke = require("./yoke");
+var sessionTitlePolicy = require("./session-title-policy");
 
 // Extract serializable tool descriptors from MCP server instances.
 // Used for IPC to worker processes (McpSdkServerConfigWithInstance is not serializable).
@@ -663,6 +664,14 @@ function createSDKBridge(opts) {
       return { behavior: "allow", updatedInput: input };
     }
 
+    // Project Logs are exact-session, project-bound tools whose authority is
+    // enforced again by the server binding. Canonical changes are append-only
+    // revisions, and the surface exposes no destructive delete operation, so
+    // a second provider permission prompt adds no additional safety.
+    if (toolName.indexOf("mcp__clay-logs__") === 0) {
+      return { behavior: "allow", updatedInput: input };
+    }
+
     // This tool only prepares a read-only UI projection for the document the
     // agent is about to edit. The subsequent Edit/Write keeps its own normal
     // permission behavior.
@@ -1608,24 +1617,17 @@ function createSDKBridge(opts) {
       sessionToolDefs = sessionToolDefs.concat(yoke.userInput.fallbackToolDefs(sessionUserInputHandler));
     }
 
-    // Derive an explicit session title for fresh queries so the SDK records
-    // it at session creation and skips its own auto-generation. This also
-    // lets us short-circuit autoGenerateTitle below for the common case.
+    // Give fresh queries an immediate provisional label. The visible user
+    // message in history wins over `text`, which may contain an internal
+    // provider wrapper rather than what the person typed.
     // Only applied to NEW sessions (no cliSessionId yet) — when resuming,
     // the SDK ignores Options.title in favor of the persisted title.
     var initialTitle = null;
+    var initialTitleProvisional = false;
     if (!session.cliSessionId && !session.titleManuallySet && !session.titleAutoGenerated) {
-      if (session.title) {
-        // Loop / scheduled / mate-seeded sessions arrive with a title already set.
-        initialTitle = session.title;
-      } else if (typeof text === "string") {
-        // Derive a quick first-line snippet from the user's first message.
-        // Skip if too short to be meaningful — fall back to autoGenerateTitle.
-        var firstLine = text.replace(/\s+/g, " ").trim();
-        if (firstLine.length >= 10) {
-          initialTitle = firstLine.length > 60 ? firstLine.substring(0, 60) : firstLine;
-        }
-      }
+      var initialTitleChoice = sessionTitlePolicy.selectInitialTitle(session, text);
+      initialTitle = initialTitleChoice.title;
+      initialTitleProvisional = initialTitleChoice.provisional;
     }
 
     var queryOpts = {
@@ -1720,16 +1722,16 @@ function createSDKBridge(opts) {
     try {
       handle = await sessionAdapter.createQuery(queryOpts);
       console.log("[sdk-bridge] createQuery returned handle, vendor=" + sessionAdapter.vendor);
-      // SDK accepted the explicit title — adopt it locally so the session
-      // list reflects it immediately and autoGenerateTitle skips this
-      // session (titleAutoGenerated gates re-trigger).
+      // SDK accepted the explicit title. Provisional labels remain eligible
+      // for semantic generation after the first Home exchange (or the normal
+      // project threshold); seeded titles remain fixed.
       if (initialTitle && !session.title) {
         session.title = initialTitle;
-        session.titleAutoGenerated = true;
+        session.titleAutoGenerated = !initialTitleProvisional;
         sm.saveSessionFile(session);
         sm.broadcastSessionList();
       } else if (initialTitle && session.title === initialTitle) {
-        session.titleAutoGenerated = true;
+        session.titleAutoGenerated = !initialTitleProvisional;
         sm.saveSessionFile(session);
       }
     } catch (e) {

package/lib/sdk-message-processor.js

@@ -1,6 +1,9 @@
 var usersModule = require("./users");
 var yoke = require("./yoke");
 var backgroundTaskTiming = require("./background-task-timing");
+var sessionTitlePolicy = require("./session-title-policy");
+
+var OVERLOAD_RETRY_LIMIT = 3;
 
 function attachMessageProcessor(ctx) {
   var sm = ctx.sm;
@@ -23,8 +26,6 @@ function attachMessageProcessor(ctx) {
   var saveImageFile = ctx.saveImageFile;
   var getSessionLinuxUser = ctx.getSessionLinuxUser || function () { return null; };
 
-  var AUTO_TITLE_TURN_THRESHOLD = 2;
-
   function getMateIdForNotification() {
     if (!isMate) return null;
     if (typeof slug === "string" && slug.indexOf("mate-") === 0) {
@@ -488,6 +489,8 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "result") {
+      var overloadAbortRequested = !!session._overloadAbortRequested;
+      session._overloadAbortRequested = false;
       session.blocks = {};
       session.sentToolResults = {};
       session.pendingPermissions = {};
@@ -533,7 +536,9 @@ function attachMessageProcessor(ctx) {
         session._awaitingTurnResult = false;
         session._queuedTurnCount = 0;
         onProcessingChanged();
-        sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
+        if (!overloadAbortRequested) {
+          sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
+        }
         sendAndRecord(session, { type: "done", code: 1 });
         sm.broadcastSessionList();
         return;
@@ -625,7 +630,7 @@ function attachMessageProcessor(ctx) {
       sm.broadcastSessionList();
 
       // Auto-generate title after N turns (skip if loop or already auto-generated)
-      if (session.turnCount === AUTO_TITLE_TURN_THRESHOLD
+      if (session.turnCount === sessionTitlePolicy.generationTurn(isMate)
           && !session.titleAutoGenerated
           && !session.titleManuallySet
           && !session.loop
@@ -820,9 +825,33 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "api_retry") {
-      // Transient retry notification, show in UI but don't persist in history
-      var retryText = parsed.message || parsed.error || "Retrying API request...";
-      sendToSession(session, { type: "system_info", text: retryText });
+      // The Claude SDK may otherwise paint one persistent red error for every
+      // retry and remain busy for many minutes. Show one transient status, and
+      // stop a repeatedly overloaded turn after a small bounded number of
+      // attempts so the user regains control and can retry or change models.
+      var apiRetryAttempt = parsed.attempt || 1;
+      if (parsed.error === "overloaded") {
+        if (apiRetryAttempt === 1) {
+          session._overloadAbortRequested = false;
+          sendToSession(session, {
+            type: "system_info",
+            text: "The model is overloaded. Retrying briefly...",
+          });
+        }
+        if (apiRetryAttempt >= OVERLOAD_RETRY_LIMIT && !session._overloadAbortRequested) {
+          session._overloadAbortRequested = true;
+          sendAndRecord(session, {
+            type: "error",
+            text: "The model remained overloaded after " + apiRetryAttempt +
+              " attempts, so this turn was stopped. Try again or choose another model.",
+          });
+          if (session.abortController && typeof session.abortController.abort === "function") {
+            try { session.abortController.abort(); } catch (e) {}
+          }
+        }
+      } else if (apiRetryAttempt === 1) {
+        sendToSession(session, { type: "system_info", text: "The model request failed temporarily. Retrying..." });
+      }
 
     } else if (parsed.yokeType === "commands_changed") {
       // Mid-session command list change: rebuild the union with skills (same as

package/lib/server-home-chat.js

@@ -9,6 +9,7 @@ var attachHomeMateCreation = require("./server-home-mate-creation").attachHomeMa
 var attachHomeDebates = require("./server-home-debates").attachHomeDebates, attachHomeClayEntry = require("./server-home-clay-entry").attachHomeClayEntry;
 var homeChatEvents = require("./server-home-chat-events");
 var homeCapsuleCreation = require("./server-home-capsule-creation");
+var sessionTitlePolicy = require("./session-title-policy");
 var historyToHomeChat = homeChatEvents.historyToHomeChat;
 var transformEvent = homeChatEvents.transformEvent;
 function attachHomeChat(deps) {
@@ -84,6 +85,10 @@ function attachHomeChat(deps) {
     var result = [];
     sessionManager.sessions.forEach(function (session) {
       if (!ownsSession(session, userId)) return;
+      if (sessionTitlePolicy.repairLegacySearchTitle(session)
+          && typeof sessionManager.saveSessionFile === "function") {
+        sessionManager.saveSessionFile(session);
+      }
       var cliSessionId = sessionString(session.cliSessionId, 512);
       var createdAt = sessionTimestamp(session.createdAt);
       var lastActivity = sessionTimestamp(session.lastActivity) || createdAt;