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

package/lib/daemon.js

@@ -728,6 +728,19 @@ var relay = createServer({
     console.log("[daemon] Chat layout:", val, "(web)");
     return { ok: true, chatLayout: val };
   },
+  onSetTerminalFont: function (family, size) {
+    var DEFAULT_FAMILY = "'SF Mono', Menlo, Monaco, 'Courier New', monospace";
+    var current = config.terminalFont || { family: DEFAULT_FAMILY, size: 13 };
+    var nextFamily = (typeof family === "string" && family.trim()) ? family.trim().slice(0, 200) : current.family;
+    var nextSize = current.size;
+    if (typeof size === "number" && size >= 9 && size <= 32) {
+      nextSize = Math.round(size);
+    }
+    config.terminalFont = { family: nextFamily, size: nextSize };
+    saveConfig(config);
+    console.log("[daemon] Terminal font:", nextFamily, nextSize);
+    return config.terminalFont;
+  },
   onSetMateOnboarded: function () {
     config.mateOnboardingShown = true;
     saveConfig(config);
@@ -1248,11 +1261,114 @@ var ipc = createIPCServer(socketPath(), function (msg) {
   }
 });
 
+// --- Cleanup stale SDK warmup CLI session files ---
+//
+// On adapter init the SDK is given a dummy "hi" prompt to discover models,
+// skills, and capabilities. Even though we abort before any response
+// arrives, the SDK creates a real CLI session jsonl on disk. Going forward
+// we delete those inline (see lib/yoke/adapters/claude.js and
+// claude-worker.js), but installs from before that fix can have a long
+// tail of "hi"-only sessions polluting the Resume CLI session dialog.
+//
+// On every daemon startup we scan REAL_HOME/.claude/projects/*/ and unlink
+// files that match a strict warmup signature so legitimate "hi" sessions
+// from real users are never touched. All checks must pass:
+//
+//   1. file size < 64 KB                  (real sessions grow past this fast;
+//      threshold is generous because warmup files include the SDK's
+//      skill_listing / deferred_tools attachments which can run into the
+//      tens of KB on its own)
+//   2. mtime older than 60 seconds        (avoid racing an in-flight warmup)
+//   3. exactly one user message, content text equals literal "hi"
+//   4. zero assistant messages            (real users virtually always get a reply)
+//
+// Multi-user OS-isolated installs have per-user ~/.claude trees that the
+// daemon process can't traverse; the inline cleanup in claude-worker.js
+// covers those.
+function cleanupSdkWarmupSessions() {
+  var projectsRoot = path.join(REAL_HOME, ".claude", "projects");
+  var projectDirs;
+  try { projectDirs = fs.readdirSync(projectsRoot, { withFileTypes: true }); }
+  catch (e) { return; }
+
+  var deleted = 0;
+  var nowMs = Date.now();
+  var MAX_BYTES = 64 * 1024;
+  var MIN_AGE_MS = 60 * 1000;
+
+  for (var di = 0; di < projectDirs.length; di++) {
+    if (!projectDirs[di].isDirectory()) continue;
+    var projDir = path.join(projectsRoot, projectDirs[di].name);
+    var files;
+    try { files = fs.readdirSync(projDir); } catch (e) { continue; }
+
+    for (var fi = 0; fi < files.length; fi++) {
+      var f = files[fi];
+      if (!f.endsWith(".jsonl")) continue;
+      var fp = path.join(projDir, f);
+
+      var st;
+      try { st = fs.statSync(fp); } catch (e) { continue; }
+      if (st.size >= MAX_BYTES) continue;
+      if (nowMs - st.mtimeMs < MIN_AGE_MS) continue;
+
+      var raw;
+      try { raw = fs.readFileSync(fp, "utf8"); } catch (e) { continue; }
+      var lines = raw.split("\n");
+      var userCount = 0;
+      var assistantCount = 0;
+      var userText = null;
+      var parseOk = true;
+      for (var li = 0; li < lines.length; li++) {
+        var line = lines[li];
+        if (!line) continue;
+        var ev;
+        try { ev = JSON.parse(line); } catch (e) { parseOk = false; break; }
+        if (!ev || typeof ev !== "object") continue;
+        if (ev.type === "user") {
+          userCount++;
+          if (userCount > 1) break;
+          var msg = ev.message;
+          var content = msg && msg.content;
+          if (typeof content === "string") {
+            userText = content;
+          } else if (Array.isArray(content)) {
+            var parts = [];
+            for (var ci = 0; ci < content.length; ci++) {
+              if (content[ci] && content[ci].type === "text" && typeof content[ci].text === "string") {
+                parts.push(content[ci].text);
+              }
+            }
+            userText = parts.join("");
+          }
+        } else if (ev.type === "assistant") {
+          assistantCount++;
+          if (assistantCount > 0) break;
+        }
+      }
+      if (!parseOk) continue;
+      if (userCount !== 1) continue;
+      if (assistantCount !== 0) continue;
+      if (userText !== "hi") continue;
+
+      try { fs.unlinkSync(fp); deleted++; } catch (e) {}
+    }
+  }
+
+  if (deleted > 0) {
+    console.log("[daemon] Removed " + deleted + " stale SDK warmup session file(s)");
+  }
+}
+
 // --- Start listening (with retry for port-in-use during update handoff) ---
 var listenRetries = 0;
 var MAX_LISTEN_RETRIES = 15;
 
 function startListening() {
+  // One-shot cleanup of stale SDK warmup CLI session files from previous
+  // daemon runs (best-effort, never fatal).
+  try { cleanupSdkWarmupSessions(); } catch (e) {}
+
   relay.server.listen(config.port, listenHost, function () {
     var protocol = tlsOptions ? "https" : "http";
     console.log("[daemon] Listening on " + protocol + "://" + listenHost + ":" + config.port);

package/lib/project-sessions.js

@@ -265,12 +265,21 @@ function attachSessions(ctx) {
     return null;
   }
 
-  // In-place conversion of a TUI session to GUI when the user's preference
-  // is 'gui'. Reads the jsonl transcript through the existing import path
-  // (same code Import CLI uses), populates session.history, flips the mode
-  // to 'gui', and kills the PTY. Subsequent clicks render via the SDK chat.
-  function convertTuiSessionToGui(session) {
+  // Prepare a born-TUI session to be rendered via the SDK GUI chat for the
+  // current click. Reads the CLI jsonl transcript (cli-sessions.js),
+  // populates session.history, and tears
+  // down the PTY. The born-TUI marker (session.mode === 'tui') is kept on
+  // disk so that flipping claudeOpenMode back to 'tui' later restores the
+  // embedded-terminal experience instead of locking the session as GUI.
+  //
+  // Idempotent: if the PTY is already gone and history is populated, this
+  // is a no-op (avoids re-reading jsonl and re-writing the session file on
+  // every click while the user is reading the session in GUI mode).
+  function prepareTuiSessionForGuiView(session) {
     if (!session || session.cliSessionId == null) return;
+    var alreadyHydrated = (typeof session.terminalId !== "number") &&
+                          Array.isArray(session.history) && session.history.length > 0;
+    if (alreadyHydrated) return;
     var cliSess;
     try { cliSess = require("./cli-sessions"); } catch (e) { return; }
     var history = null;
@@ -278,7 +287,6 @@ function attachSessions(ctx) {
     if (Array.isArray(history)) {
       session.history = history;
     }
-    session.mode = "gui";
     if (typeof session.terminalId === "number" && tm) {
       try { tm.close(session.terminalId); } catch (e) {}
     }
@@ -494,101 +502,10 @@ function attachSessions(ctx) {
       return true;
     }
 
-    if (msg.type === "resume_session") {
-      if (!msg.cliSessionId) return true;
-      var cliSess = require("./cli-sessions");
-
-      // If Clay already has a persisted meta file for this cliSessionId, read
-      // its vendor so resumeSession doesn't silently default to the project's
-      // primary vendor (which would break codex sessions after server restart).
-      var persistedVendor = null;
-      try {
-        var _fsResume = require("fs");
-        var _pathResume = require("path");
-        var metaPath = _pathResume.join(sm.sessionsDir, msg.cliSessionId + ".jsonl");
-        if (_fsResume.existsSync(metaPath)) {
-          var firstLine = _fsResume.readFileSync(metaPath, "utf8").split("\n", 1)[0];
-          try {
-            var metaObj = JSON.parse(firstLine);
-            if (metaObj && metaObj.type === "meta" && metaObj.vendor) persistedVendor = metaObj.vendor;
-          } catch (e) {}
-        }
-      } catch (e) {}
-
-      // Try SDK for title first, then fall back to manual parsing
-      var titlePromise = adapter.getSessionInfo(msg.cliSessionId, { dir: cwd }).then(function(info) {
-        return (info && info.summary) ? info.summary.substring(0, 100) : null;
-      }).catch(function() { return null; });
-
-      Promise.all([
-        cliSess.readCliSessionHistory(cwd, msg.cliSessionId),
-        titlePromise
-      ]).then(function(results) {
-        var history = results[0];
-        var sdkTitle = results[1];
-        var title = sdkTitle || "Resumed session";
-        if (!sdkTitle) {
-          for (var i = 0; i < history.length; i++) {
-            if (history[i].type === "user_message" && history[i].text) {
-              title = history[i].text.substring(0, 50);
-              break;
-            }
-          }
-        }
-        var resumed = sm.resumeSession(msg.cliSessionId, { history: history, title: title, vendor: persistedVendor || undefined }, ws);
-        if (resumed) ws._clayActiveSession = resumed.localId;
-      }).catch(function() {
-        var resumed = sm.resumeSession(msg.cliSessionId, persistedVendor ? { vendor: persistedVendor } : undefined, ws);
-        if (resumed) ws._clayActiveSession = resumed.localId;
-      });
-      return true;
-    }
-
-    if (msg.type === "list_cli_sessions") {
-      var _fs = require("fs");
-      // Collect session IDs already in relay (in-memory + persisted on disk)
-      var relayIds = {};
-      sm.sessions.forEach(function (s) {
-        if (s.cliSessionId) relayIds[s.cliSessionId] = true;
-      });
-      try {
-        var sessDir = sm.sessionsDir;
-        var diskFiles = _fs.readdirSync(sessDir);
-        for (var fi = 0; fi < diskFiles.length; fi++) {
-          if (diskFiles[fi].endsWith(".jsonl")) {
-            relayIds[diskFiles[fi].replace(".jsonl", "")] = true;
-          }
-        }
-      } catch (e) {}
-
-      adapter.listSessions({ dir: cwd }).then(function(sdkSessions) {
-        var filtered = sdkSessions.filter(function(s) {
-          return !relayIds[s.sessionId];
-        }).map(function(s) {
-          return {
-            sessionId: s.sessionId,
-            firstPrompt: s.summary || s.firstPrompt || "",
-            model: null,
-            gitBranch: s.gitBranch || null,
-            startTime: s.createdAt ? new Date(s.createdAt).toISOString() : null,
-            lastActivity: s.lastModified ? new Date(s.lastModified).toISOString() : null,
-          };
-        });
-        sendTo(ws, { type: "cli_session_list", sessions: filtered });
-      }).catch(function() {
-        // Fallback to manual parsing if SDK fails
-        var cliSessions = require("./cli-sessions");
-        cliSessions.listCliSessions(cwd).then(function(sessions) {
-          var filtered = sessions.filter(function(s) {
-            return !relayIds[s.sessionId];
-          });
-          sendTo(ws, { type: "cli_session_list", sessions: filtered });
-        }).catch(function() {
-          sendTo(ws, { type: "cli_session_list", sessions: [] });
-        });
-      });
-      return true;
-    }
+    // Note: the old `resume_session` and `list_cli_sessions` WS handlers
+    // were removed when CLI sessions started being auto-adopted into the
+    // unified session list on server start (see sessions.js
+    // adoptOrphanedCliSessions). Click a session in the sidebar instead.
 
     if (msg.type === "switch_session") {
       if (msg.id && sm.sessions.has(msg.id)) {
@@ -598,21 +515,24 @@ function attachSessions(ctx) {
         //  - born-GUI viewed under TUI pref:  spawn a transient PTY running
         //    `claude --resume <cliSessionId>`; the session record stays GUI
         //    so a later pref flip back to GUI just hides the runtime link.
-        //  - born-TUI viewed under GUI pref:  in-place convert via the
-        //    Import CLI code path (jsonl history -> session.history,
-        //    session.mode -> 'gui', kill PTY). This is destructive but
-        //    matches "TUI->GUI is what Import CLI was always for."
+        //  - born-TUI viewed under GUI pref:  hydrate session.history from
+        //    the jsonl transcript and tear down the PTY so the session
+        //    renders via the SDK chat. The born-TUI marker stays on the
+        //    record so a later pref flip back to TUI restores the
+        //    embedded-terminal experience.
         //
         // runtimeMode / runtimeTerminalId are set on the session record so
         // the session_switched and session_list broadcasts surface them to
         // the client without sessions.js needing to know about the pref.
         var xmTarget = sm.sessions.get(msg.id);
         if (xmTarget && (xmTarget.vendor === "claude" || !xmTarget.vendor)) {
+          var xmPref = getClaudeOpenModeForWs(ws);
           // Born-TUI session whose PTY is gone (typically after a daemon
-          // restart). Respawn via `claude --resume <cliSessionId>` before
-          // the cross-mode logic runs - the rest of the pipeline assumes
-          // terminalId points at a live PTY for TUI sessions.
-          if (xmTarget.mode === "tui" && xmTarget.cliSessionId && tm &&
+          // restart) AND the user wants TUI rendering this click. Respawn
+          // via `claude --resume <cliSessionId>` so the rest of the pipeline
+          // has a live PTY to point at. Skipped when the user's pref is GUI
+          // - we'd just tear it back down two lines later.
+          if (xmTarget.mode === "tui" && xmTarget.cliSessionId && tm && xmPref === "tui" &&
               (typeof xmTarget.terminalId !== "number" || !tm.has(xmTarget.terminalId))) {
             var rsSid = xmTarget.cliSessionId;
             var rsLocalId = xmTarget.localId;
@@ -632,11 +552,15 @@ function attachSessions(ctx) {
             if (rsTerm) xmTarget.terminalId = rsTerm.id;
             startTitleWatcher(xmTarget);
           }
-          var xmPref = getClaudeOpenModeForWs(ws);
           var xmRuntime = computeRuntimeMode(xmTarget, xmPref);
           if (xmRuntime === "gui" && xmTarget.mode === "tui") {
-            convertTuiSessionToGui(xmTarget);
-            xmTarget.runtimeMode = null;
+            // Born-TUI session under GUI pref. Hydrate history + drop PTY
+            // without flipping session.mode, so flipping back to TUI later
+            // restores the embedded-terminal rendering. runtimeMode is set
+            // to 'gui' explicitly so the client doesn't fall back to
+            // session.mode (which is still 'tui').
+            prepareTuiSessionForGuiView(xmTarget);
+            xmTarget.runtimeMode = "gui";
             xmTarget.runtimeTerminalId = null;
           } else if (xmRuntime === "tui" && xmTarget.mode === "gui" && xmTarget.cliSessionId) {
             var xmRid = spawnRuntimeTuiPty(xmTarget, ws);

package/lib/public/app.js

@@ -5,7 +5,7 @@ import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks, closeMermaidM
 import { initSidebar, updatePageTitle, spawnDustParticles } from './modules/sidebar.js';
 import {
   renderSessionList, handleSearchResults, updateSessionPresence,
-  updateSessionBadge, populateCliSessionList
+  updateSessionBadge
 } from './modules/sidebar-sessions.js';
 import {
   renderIconStrip, getEmojiCategories, updateProjectBadge
@@ -99,7 +99,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var hamburgerBtn = $("hamburger-btn");
   var sidebarToggleBtn = $("sidebar-toggle-btn");
   var sidebarExpandBtn = $("sidebar-expand-btn");
-  var resumeSessionBtn = $("resume-session-btn");
   var imagePreviewBar = $("image-preview-bar");
   var connectOverlay = $("connect-overlay");
 
@@ -378,7 +377,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     sidebarExpandBtn: sidebarExpandBtn,
     hamburgerBtn: hamburgerBtn,
     newSessionBtn: newSessionBtn,
-    resumeSessionBtn: resumeSessionBtn,
     headerTitleEl: headerTitleEl,
     showConfirm: showConfirm,
     onFilesTabOpen: function () { loadRootDirectory(); },

package/lib/public/css/sidebar.css

@@ -1119,35 +1119,6 @@
   margin-left: 12px;
 }
 
-/* TUI session indicator: a tiny black "screen" with a bold green prompt
-   glyph, meant to read as a miniature terminal (CRT-style cursor) at
-   sidebar scale. Aligned to the middle of the text x-height so it sits
-   visually centered with the session title rather than dropping below. */
-.session-tui-icon {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 14px;
-  height: 14px;
-  border-radius: 3px;
-  background: #000;
-  margin-right: 6px;
-  vertical-align: middle;
-  flex-shrink: 0;
-  /* Nudge upward a hair so the icon optical-centers with lowercase glyphs
-     (lucide icons render slightly below the geometric center). */
-  position: relative;
-  top: -1px;
-}
-.session-tui-icon svg,
-.session-tui-icon .lucide {
-  width: 10px;
-  height: 10px;
-  color: #50fa7b;
-  stroke: #50fa7b;
-  stroke-width: 3;
-}
-
 .session-top-action:hover {
   background: var(--sidebar-hover);
   color: var(--text);

package/lib/public/css/tui-attention.css

@@ -1,3 +1,13 @@
+/* Subtle 1px divider against the sidebar so the embedded terminal
+   doesn't visually bleed into the session list. The host is
+   position:fixed and anchored to #messages' bounding rect, so its
+   left edge sits exactly on the sidebar boundary. Color matches
+   #main-area's existing border-left so the line reads as one
+   continuous edge with the rest of the chrome. */
+#tui-session-host {
+  border-left: 1px solid var(--border-subtle);
+}
+
 /* Policy notice that sits above the embedded xterm in fullscreen TUI
    sessions, explaining why this mode exists (post-2026-06-15 Agent SDK
    billing split). Thin so it doesn't eat terminal real estate. */

package/lib/public/css/user-settings.css

@@ -859,3 +859,46 @@
     align-items: stretch;
   }
 }
+
+/* Terminal font picker row */
+.us-term-font-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+.us-term-font-family {
+  flex: 1 1 auto;
+  min-width: 180px;
+  padding: 7px 10px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--input-bg);
+  color: var(--text);
+  font-size: 13px;
+}
+.us-term-font-custom {
+  flex: 1 1 100%;
+  padding: 7px 10px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--input-bg);
+  color: var(--text);
+  font-size: 13px;
+  font-family: "Roboto Mono", monospace;
+}
+.us-term-font-custom.hidden { display: none; }
+.us-term-font-size {
+  width: 64px;
+  padding: 7px 10px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--input-bg);
+  color: var(--text);
+  font-size: 13px;
+  text-align: center;
+}
+.us-term-font-unit {
+  font-size: 13px;
+  color: var(--text-dimmer);
+}

package/lib/public/index.html

@@ -879,7 +879,7 @@
       </div>
     </div>
     <div class="user-island-actions">
-      <button id="user-theme-toggle-btn" title="Switch theme" aria-label="Switch theme"><i data-lucide="moon"></i></button>
+      <button id="user-theme-toggle-btn" title="Themes" aria-label="Themes"><i data-lucide="palette"></i></button>
       <button id="user-settings-btn" title="User settings"><i data-lucide="settings"></i></button>
     </div>
   </div>
@@ -1002,18 +1002,22 @@
         <div class="us-section" data-section="us-appearance">
           <h2>Appearance</h2>
           <div class="settings-card">
-            <div class="settings-label" style="margin-bottom:10px;">Theme</div>
-            <div class="layout-switcher" id="us-theme-switcher">
-              <button class="layout-option" data-theme="light">
-                <span class="layout-option-icon">☀️</span>
-                <span class="layout-option-label">Light</span>
-                <span class="layout-option-desc">For people who open curtains. Bright, clean, productive.</span>
-              </button>
-              <button class="layout-option" data-theme="dark">
-                <span class="layout-option-icon">🌙</span>
-                <span class="layout-option-label">Dark</span>
-                <span class="layout-option-desc">For those who thrive after sunset. Your screen, your cave.</span>
-              </button>
+            <div class="settings-label" style="margin-bottom:10px;">Terminal font</div>
+            <div class="us-term-font-row">
+              <select id="us-term-font-family" class="us-term-font-family">
+                <option value="'SF Mono', Menlo, Monaco, 'Courier New', monospace">SF Mono / Menlo (default)</option>
+                <option value="'JetBrains Mono', 'SF Mono', Menlo, monospace">JetBrains Mono</option>
+                <option value="'Fira Code', 'SF Mono', Menlo, monospace">Fira Code</option>
+                <option value="'Cascadia Code', 'SF Mono', Menlo, monospace">Cascadia Code</option>
+                <option value="'IBM Plex Mono', 'SF Mono', Menlo, monospace">IBM Plex Mono</option>
+                <option value="'Source Code Pro', 'SF Mono', Menlo, monospace">Source Code Pro</option>
+                <option value="'Roboto Mono', 'SF Mono', Menlo, monospace">Roboto Mono</option>
+                <option value="ui-monospace, monospace">System monospace</option>
+                <option value="__custom__">Custom...</option>
+              </select>
+              <input type="text" id="us-term-font-family-custom" class="us-term-font-custom hidden" placeholder="e.g. 'My Font', monospace" maxlength="200">
+              <input type="number" id="us-term-font-size" class="us-term-font-size" min="9" max="32" step="1">
+              <span class="us-term-font-unit">px</span>
             </div>
           </div>
           <div class="settings-card">
@@ -1556,26 +1560,6 @@
   </div>
 </div>
 
-<div id="resume-modal" class="hidden">
-  <div class="confirm-backdrop"></div>
-  <div class="confirm-dialog resume-picker-dialog">
-    <div class="resume-modal-title">Resume CLI session</div>
-    <div class="resume-picker-body">
-      <div id="resume-picker-loading" class="resume-picker-loading">
-        <div class="resume-picker-spinner"></div>
-        <span>Loading sessions...</span>
-      </div>
-      <div id="resume-picker-empty" class="resume-picker-empty hidden">
-        No CLI sessions found for this project.
-      </div>
-      <div id="resume-picker-list" class="resume-picker-list hidden"></div>
-    </div>
-    <div class="confirm-actions">
-      <button class="confirm-btn confirm-cancel" id="resume-cancel">Cancel</button>
-    </div>
-  </div>
-</div>
-
 <div id="rewind-modal" class="hidden">
   <div class="confirm-backdrop"></div>
   <div class="confirm-dialog">

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

@@ -10,7 +10,7 @@ import { showToast } from './utils.js';
 import { refreshIcons, iconHtml } from './icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks } from './markdown.js';
 import { updatePageTitle } from './sidebar.js';
-import { renderSessionList, updateSessionPresence, populateCliSessionList, handleSearchResults, updateSessionBadge } from './sidebar-sessions.js';
+import { renderSessionList, updateSessionPresence, handleSearchResults, updateSessionBadge } from './sidebar-sessions.js';
 import { updateDmBadge, renderSidebarPresence, setMentionActive, renderUserStrip } from './sidebar-mates.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
@@ -585,10 +585,6 @@ export function processMessage(msg) {
         }
         break;
 
-      case "cli_session_list":
-        populateCliSessionList(msg.sessions || []);
-        break;
-
       case "session_switched":
         hideHomeHub();
         closeWhatsNewArticle();