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

package/lib/daemon.js

@@ -1248,11 +1248,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/index.html

@@ -1556,26 +1556,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();

package/lib/public/modules/session-tui-view.js

@@ -15,6 +15,7 @@
 // the new session list; this view tears itself down via handleTermExited.
 
 import { getWs } from './ws-ref.js';
+import { store } from './store.js';
 import { openArticle as openWhatsNewArticle } from './whats-new-article.js';
 
 // Stable id of the canonical "Why TUI mode?" article in
@@ -164,10 +165,91 @@ function ensureHostEl() {
   xtermContainerEl.style.position = "relative";
   hostEl.appendChild(xtermContainerEl);
 
+  // Paste-image handling. xterm.js natively pastes text but ignores
+  // image/file clipboard payloads, so an image copied in Finder/Preview
+  // would silently drop on Cmd+V. We intercept in the capture phase
+  // (before xterm's hidden textarea handles the event), upload the
+  // image to /api/upload, and inject the returned absolute path into
+  // the PTY. Claude CLI accepts file paths as prompt input - the user
+  // can then submit with Enter.
+  //
+  // Capture phase + stopImmediatePropagation on image hits is what
+  // keeps xterm from ALSO pasting the file's text representation
+  // (Finder copies leave a "filename.png" string in text/plain).
+  // Text-only paste falls through so xterm's built-in text paste keeps
+  // working unchanged.
+  hostEl.addEventListener("paste", handleTuiPaste, true);
+
   document.body.appendChild(hostEl);
   return hostEl;
 }
 
+function handleTuiPaste(e) {
+  var cd = e.clipboardData;
+  if (!cd || currentTermId == null) return;
+
+  // Collect image blobs from both cd.files (Safari/iOS friendly) and
+  // cd.items. Plain-text-only paste is left untouched so xterm's built-in
+  // text paste keeps working.
+  var blobs = [];
+  if (cd.files && cd.files.length > 0) {
+    for (var i = 0; i < cd.files.length; i++) {
+      if (cd.files[i] && cd.files[i].type.indexOf("image/") === 0) blobs.push(cd.files[i]);
+    }
+  }
+  if (blobs.length === 0 && cd.items) {
+    for (var j = 0; j < cd.items.length; j++) {
+      if (cd.items[j] && cd.items[j].type && cd.items[j].type.indexOf("image/") === 0) {
+        var b = cd.items[j].getAsFile();
+        if (b) blobs.push(b);
+      }
+    }
+  }
+  if (blobs.length === 0) return; // text or other - let xterm handle
+
+  // Stop xterm's textarea from also seeing this event and pasting the
+  // file's text representation (filename) alongside our injected path.
+  e.preventDefault();
+  e.stopImmediatePropagation();
+  for (var k = 0; k < blobs.length; k++) {
+    uploadAndInjectPath(blobs[k]);
+  }
+}
+
+function uploadAndInjectPath(blob) {
+  var ext = ".png";
+  if (blob.type === "image/jpeg") ext = ".jpg";
+  else if (blob.type === "image/gif") ext = ".gif";
+  else if (blob.type === "image/webp") ext = ".webp";
+  var name = blob.name || ("pasted-" + Date.now() + ext);
+
+  var reader = new FileReader();
+  reader.onload = function (ev) {
+    var dataUrl = ev.target.result;
+    var commaIdx = dataUrl.indexOf(",");
+    var b64 = commaIdx !== -1 ? dataUrl.substring(commaIdx + 1) : "";
+    var basePath = store.get("basePath") || "/";
+    var xhr = new XMLHttpRequest();
+    xhr.open("POST", basePath + "api/upload");
+    xhr.setRequestHeader("Content-Type", "application/json");
+    xhr.onload = function () {
+      if (xhr.status !== 200) return;
+      try {
+        var resp = JSON.parse(xhr.responseText);
+        if (!resp || !resp.path || currentTermId == null) return;
+        var ws = getWs();
+        if (!ws || ws.readyState !== 1) return;
+        // Wrap in double quotes if the path contains whitespace so the
+        // shell / claude CLI treats it as a single token.
+        var injected = /\s/.test(resp.path) ? '"' + resp.path + '"' : resp.path;
+        ws.send(JSON.stringify({ type: "term_input", id: currentTermId, data: injected }));
+      } catch (e) {}
+    };
+    xhr.send(JSON.stringify({ name: name, data: b64 }));
+  };
+  reader.readAsDataURL(blob);
+}
+
 function syncHostBounds() {
   if (!hostEl) return;
   var messagesEl = document.getElementById("messages");

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

@@ -11,8 +11,7 @@ import { getMateSessions } from './mate-sidebar.js';
 import { openProjectSettings } from './project-settings.js';
 import {
   getCachedSessions,
-  getDateGroup,
-  openResumePicker
+  getDateGroup
 } from './sidebar-sessions.js';
 import {
   getCachedProjectList,
@@ -710,15 +709,6 @@ function renderMobileSessionsInto(container) {
   });
   container.appendChild(newBtn);
 
-  var importBtn = document.createElement("button");
-  importBtn.className = "mobile-session-new";
-  importBtn.innerHTML = '<i data-lucide="import" style="width:16px;height:16px"></i> Import session';
-  importBtn.addEventListener("click", function () {
-    closeMobileSheet();
-    setTimeout(function () { openResumePicker(); }, 250);
-  });
-  container.appendChild(importBtn);
-
   // Partition: loop sessions vs normal sessions (same logic as desktop renderSessionList)
   var sessions = getCachedSessions();
   var loopGroups = {};

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

@@ -34,15 +34,10 @@ var sessionCtxMenu = null;
 var sessionCtxSessionId = null;
 var draggedSessionId = null;
 var draggedSessionBookmarked = false;
-var openResumePickerModal = function () {};
 var headerSearchOpen = false;
 var armedDeleteSessionId = null;
 var armedDeleteTimer = null;
 
-export function openResumePicker() {
-  openResumePickerModal();
-}
-
 function sendSessionBookmark(sessionId, bookmarked) {
   if (getWs() && store.get('connected')) {
     getWs().send(JSON.stringify({ type: "set_session_bookmark", sessionId: sessionId, bookmarked: !!bookmarked }));
@@ -311,10 +306,13 @@ function openClaudeModeMenu(x, y) {
   closeClaudeModeMenu();
   var menu = document.createElement("div");
   menu.className = "claude-mode-menu";
+  // CLI sessions (created by the `claude` CLI outside Clay) are now
+  // auto-adopted into the regular session list on server start, so no
+  // separate "Import CLI" entry is needed. Users see all sessions as one
+  // list and click renders per their claudeOpenMode pref.
   var items = [
     { label: "Start as TUI", hint: "Real claude terminal", action: "new", mode: "tui" },
     { label: "Start as GUI", hint: "Clay chat UI",         action: "new", mode: "gui" },
-    { label: "Import CLI",   hint: "Resume an existing claude session", action: "import" },
   ];
   for (var i = 0; i < items.length; i++) {
     (function (it) {
@@ -326,9 +324,7 @@ function openClaudeModeMenu(x, y) {
       b.addEventListener("click", function (e) {
         e.stopPropagation();
         closeClaudeModeMenu();
-        if (it.action === "import") {
-          openResumePickerModal();
-        } else if (getWs() && store.get('connected')) {
+        if (getWs() && store.get('connected')) {
           getWs().send(JSON.stringify({ type: "new_session", vendor: "claude", mode: it.mode }));
         }
       });
@@ -539,31 +535,6 @@ export function initSidebarSessions() {
   }
 
   // --- Resume session picker ---
-  var resumeModal = document.getElementById("resume-modal");
-  var resumeCancel = document.getElementById("resume-cancel");
-  var pickerLoading = document.getElementById("resume-picker-loading");
-  var pickerEmpty = document.getElementById("resume-picker-empty");
-  var pickerList = document.getElementById("resume-picker-list");
-
-  function openResumeModal() {
-    resumeModal.classList.remove("hidden");
-    pickerLoading.classList.remove("hidden");
-    pickerEmpty.classList.add("hidden");
-    pickerList.classList.add("hidden");
-    pickerList.innerHTML = "";
-    if (getWs() && store.get('connected')) {
-      getWs().send(JSON.stringify({ type: "list_cli_sessions" }));
-    }
-  }
-  openResumePickerModal = openResumeModal;
-
-  function closeResumeModal() {
-    resumeModal.classList.add("hidden");
-  }
-
-  resumeCancel.addEventListener("click", closeResumeModal);
-  resumeModal.querySelector(".confirm-backdrop").addEventListener("click", closeResumeModal);
-
   // --- Schedule countdown timer ---
   startCountdownTimer();
 }
@@ -1450,66 +1421,3 @@ function relativeTime(isoString) {
   return new Date(isoString).toLocaleDateString();
 }
 
-export function populateCliSessionList(sessions) {
-  var pickerLoading = document.getElementById("resume-picker-loading");
-  var pickerEmpty = document.getElementById("resume-picker-empty");
-  var pickerList = document.getElementById("resume-picker-list");
-  if (!pickerLoading || !pickerList) return;
-
-  pickerLoading.classList.add("hidden");
-
-  if (!sessions || sessions.length === 0) {
-    pickerEmpty.classList.remove("hidden");
-    pickerList.classList.add("hidden");
-    return;
-  }
-
-  pickerEmpty.classList.add("hidden");
-  pickerList.classList.remove("hidden");
-  pickerList.innerHTML = "";
-
-  for (var i = 0; i < sessions.length; i++) {
-    var s = sessions[i];
-    var item = document.createElement("div");
-    item.className = "cli-session-item";
-
-    var title = document.createElement("div");
-    title.className = "cli-session-title";
-    title.textContent = s.firstPrompt || "Untitled session";
-    item.appendChild(title);
-
-    var meta = document.createElement("div");
-    meta.className = "cli-session-meta";
-    if (s.lastActivity) {
-      var time = document.createElement("span");
-      time.textContent = relativeTime(s.lastActivity);
-      meta.appendChild(time);
-    }
-    if (s.model) {
-      var model = document.createElement("span");
-      model.className = "badge";
-      model.textContent = s.model;
-      meta.appendChild(model);
-    }
-    if (s.gitBranch) {
-      var branch = document.createElement("span");
-      branch.className = "badge";
-      branch.textContent = s.gitBranch;
-      meta.appendChild(branch);
-    }
-    item.appendChild(meta);
-
-    (function (sessionId) {
-      item.addEventListener("click", function () {
-        if (getWs() && store.get('connected')) {
-          getWs().send(JSON.stringify({ type: "resume_session", cliSessionId: sessionId }));
-        }
-        var modal = document.getElementById("resume-modal");
-        if (modal) modal.classList.add("hidden");
-        closeSidebar();
-      });
-    })(s.sessionId);
-
-    pickerList.appendChild(item);
-  }
-}

package/lib/sessions.js

@@ -222,8 +222,144 @@ function createSessionManager(opts) {
     }
   }
 
-  // Load persisted sessions from disk
+  // Adopt orphaned CLI sessions from ~/.claude/projects/<encoded-cwd>/ as
+  // Clay session records. After this runs the sidebar shows a single
+  // unified list of sessions regardless of whether they were born inside
+  // Clay or via the `claude` CLI directly. The user's claudeOpenMode pref
+  // decides how each click renders (TUI respawn vs GUI hydration) - both
+  // paths already exist for born-TUI sessions.
+  //
+  // Adopted records are saved with mode='tui' because they originated in
+  // the CLI, not via the SDK. The cross-mode click logic in
+  // project-sessions.js (prepareTuiSessionForGuiView + respawn) handles
+  // rendering them in either mode without further special-casing.
+  //
+  // Strict skip rules:
+  //   - cliSessionId already known to Clay  (avoids duplicate records)
+  //   - File has zero user messages         (incomplete / corrupted file)
+  //   - Warmup shape: 1 user message that is literal "hi", 0 assistant
+  //     messages (covered by daemon cleanup but defensive here too)
+  function adoptOrphanedCliSessions() {
+    var encodedCwd = utils.encodeCwd(cwd);
+    var cliDir = path.join(config.REAL_HOME, ".claude", "projects", encodedCwd);
+    var files;
+    try { files = fs.readdirSync(cliDir); } catch (e) { return; }
+
+    // Build set of cliSessionIds Clay already tracks
+    var knownCliIds = new Set();
+    sessions.forEach(function (s) {
+      if (s.cliSessionId) knownCliIds.add(s.cliSessionId);
+    });
+
+    var MAX_READ = 64 * 1024;  // first 64KB is enough for first user message
+    var adopted = 0;
+
+    for (var i = 0; i < files.length; i++) {
+      if (!files[i].endsWith(".jsonl")) continue;
+      var cliSid = files[i].slice(0, -".jsonl".length);
+      if (knownCliIds.has(cliSid)) continue;
+
+      var fp = path.join(cliDir, files[i]);
+      var raw;
+      try {
+        var stat = fs.statSync(fp);
+        var fd = fs.openSync(fp, "r");
+        var bytesToRead = Math.min(stat.size, MAX_READ);
+        var buf = Buffer.alloc(bytesToRead);
+        fs.readSync(fd, buf, 0, bytesToRead, 0);
+        fs.closeSync(fd);
+        raw = buf.toString("utf8");
+      } catch (e) { continue; }
+
+      var lines = raw.split("\n");
+      var userCount = 0;
+      var assistantCount = 0;
+      var firstUserText = null;
+      var createdAtIso = null;
+      for (var li = 0; li < lines.length; li++) {
+        var line = lines[li];
+        if (!line) continue;
+        var ev;
+        try { ev = JSON.parse(line); } catch (e) { continue; }
+        if (!ev || typeof ev !== "object") continue;
+        if (ev.type === "user" && ev.message && ev.message.role === "user") {
+          userCount++;
+          if (firstUserText == null) {
+            var c = ev.message.content;
+            if (typeof c === "string") {
+              firstUserText = c;
+            } else if (Array.isArray(c)) {
+              var parts = [];
+              for (var ci = 0; ci < c.length; ci++) {
+                if (c[ci] && c[ci].type === "text" && typeof c[ci].text === "string") parts.push(c[ci].text);
+              }
+              firstUserText = parts.join("");
+            }
+            if (ev.timestamp && !createdAtIso) createdAtIso = ev.timestamp;
+          }
+        } else if (ev.type === "assistant") {
+          assistantCount++;
+        }
+      }
+
+      if (userCount === 0) continue;
+      // Defensive warmup skip (daemon also cleans these)
+      if (userCount === 1 && assistantCount === 0 && firstUserText === "hi") continue;
+
+      // Title: first user message trimmed/truncated. Fall back to a
+      // neutral label so the sidebar entry is identifiable.
+      var title = (firstUserText || "").trim().replace(/\s+/g, " ");
+      if (title.length > 60) title = title.slice(0, 57) + "...";
+      if (!title) title = "Imported CLI session";
+
+      var createdAt = Date.now();
+      if (createdAtIso) {
+        var t = Date.parse(createdAtIso);
+        if (!isNaN(t)) createdAt = t;
+      }
+      var lastActivity = createdAt;
+      try { lastActivity = fs.statSync(fp).mtimeMs; } catch (e) {}
+
+      var localId = nextLocalId++;
+      var session = {
+        localId: localId,
+        queryInstance: null,
+        messageQueue: null,
+        cliSessionId: cliSid,
+        blocks: {},
+        sentToolResults: {},
+        pendingPermissions: {},
+        pendingAskUser: {},
+        isProcessing: false,
+        title: title,
+        createdAt: createdAt,
+        lastActivity: lastActivity,
+        history: [],
+        messageUUIDs: [],
+        lastRewindUuid: null,
+        vendor: "claude",
+        mode: "tui",
+        terminalId: null,
+        runtimeMode: null,
+        runtimeTerminalId: null,
+        sessionVisibility: "shared",
+        bookmarked: false,
+        favoriteOrder: null,
+      };
+      sessions.set(localId, session);
+      try { saveSessionFile(session); } catch (e) {}
+      knownCliIds.add(cliSid);
+      adopted++;
+    }
+
+    if (adopted > 0) {
+      console.log("[sessions] Adopted " + adopted + " CLI session(s) for " + cwd);
+    }
+  }
+
+  // Load persisted sessions from disk, then adopt any orphan CLI sessions
   loadSessions();
+  adoptOrphanedCliSessions();
 
   function getActiveSession() {
     return sessions.get(activeSessionId) || null;

package/lib/users-preferences.js

@@ -234,9 +234,10 @@ function attachPreferences(deps) {
   //      the cutover persist normally.
   //
   // The preference applies on the next session open. Currently displayed
-  // sessions are not re-rendered retroactively. Existing TUI-born sessions
-  // always stay TUI regardless of preference (use Import CLI to bring a
-  // TUI conversation into the GUI flow).
+  // sessions are not re-rendered retroactively. The cross-mode click
+  // logic in project-sessions.js handles both directions in-place
+  // (prepareTuiSessionForGuiView for tui->gui rendering, claude --resume
+  // PTY respawn for gui->tui rendering on a born-tui session).
 
   // Single cutover instant for both default flip and one-time reset:
   // 2026-06-15 00:00 in UTC+14 = 2026-06-14 10:00 UTC.

package/lib/ws-schema.js

@@ -23,11 +23,9 @@ var schema = {
   "set_session_bookmark":     { direction: "c2s", handler: "lib/project-sessions.js", description: "Bookmark or unbookmark a session in the sidebar" },
   "reorder_session_bookmarks": { direction: "c2s", handler: "lib/project-sessions.js", description: "Reorder favorited sessions within the favorites area" },
   "bulk_delete_sessions":    { direction: "c2s", handler: "lib/project-sessions.js", description: "Delete a group of sessions at once" },
-  "resume_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Resume a CLI session by its CLI session ID" },
   "set_session_visibility":   { direction: "c2s", handler: "lib/project-sessions.js", description: "Show or hide a session in the sidebar" },
   "search_sessions":          { direction: "c2s", handler: "lib/project-sessions.js", description: "Search session titles" },
   "search_session_content":   { direction: "c2s", handler: "lib/project-sessions.js", description: "Full-text search within a session" },
-  "list_cli_sessions":        { direction: "c2s", handler: "lib/project-sessions.js", description: "List active CLI sessions available for resume" },
   "load_more_history":        { direction: "c2s", handler: "lib/project-sessions.js", description: "Request older history entries for the current session" },
   "fork_session":             { direction: "c2s", handler: "lib/project-sessions.js", description: "Fork a session from a given message UUID" },
   "input_sync":               { direction: "c2s", handler: "lib/project-sessions.js", description: "Sync the current input field text to other clients" },
@@ -40,7 +38,6 @@ var schema = {
   "session_unread":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Unread message count for a session" },
   "search_results":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Session title search results" },
   "search_content_results":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full-text content search results" },
-  "cli_session_list":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "List of resumable CLI sessions" },
   "fork_complete":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Fork succeeded, includes new session ID" },
   "input_sync_broadcast":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Broadcast input text from another client" },
 

package/lib/yoke/adapters/claude-worker.js

@@ -649,6 +649,11 @@ async function handleWarmup(msg) {
   warmupOptions.abortController = ac;
   applyWorkerClaudeBinary(warmupOptions);
 
+  // Capture session_id so we can delete the SDK-created CLI jsonl after
+  // abort. Without this every warmup leaves a one-line ("hi") session
+  // file in ~/.claude/projects/<encodedCwd>/ that pollutes the Resume
+  // CLI session list.
+  var warmupSessionId = null;
   try {
     var stream = sdk.query({
       prompt: mq,
@@ -657,6 +662,7 @@ async function handleWarmup(msg) {
 
     for await (var event of stream) {
       if (event.type === "system" && event.subtype === "init") {
+        warmupSessionId = event.session_id || null;
         var result = {
           slashCommands: event.slash_commands || [],
           model: event.model || "",
@@ -682,6 +688,19 @@ async function handleWarmup(msg) {
       sendToDaemon({ type: "warmup_error", error: "Warmup failed: " + (e.message || e) });
     }
   }
+
+  // Delete the warmup CLI jsonl. Worker runs as the target OS user so
+  // os.homedir() resolves to that user's home, which is where the SDK
+  // wrote the file. Best-effort cleanup.
+  if (warmupSessionId) {
+    try {
+      var os = require("os");
+      var wmCwd = (warmupOptions && warmupOptions.cwd) || process.cwd();
+      var wmEncoded = wmCwd.replace(/[^a-zA-Z0-9]/g, "-");
+      var wmPath = path.join(os.homedir(), ".claude", "projects", wmEncoded, warmupSessionId + ".jsonl");
+      fs.unlinkSync(wmPath);
+    } catch (e) {}
+  }
 }
 
 // --- Cleanup ---

package/lib/yoke/adapters/claude.js

@@ -1079,11 +1079,18 @@ function createClaudeAdapter(opts) {
         },
       };
 
+      // Capture the session_id from the system/init event so we can
+      // delete the SDK-created jsonl file after we abort. The SDK starts
+      // a real CLI session as soon as it receives our dummy "hi" prompt;
+      // without cleanup these one-line ("hi") sessions pile up in the
+      // Resume CLI session list.
+      var warmupSessionId = null;
       try {
         var stream = sdk.query({ prompt: mq, options: warmupOptions });
 
         for await (var msg of stream) {
           if (msg.type === "system" && msg.subtype === "init") {
+            warmupSessionId = msg.session_id || null;
             result.skills = msg.skills || [];
             result.defaultModel = msg.model || "";
             result.slashCommands = msg.slash_commands || [];
@@ -1107,6 +1114,17 @@ function createClaudeAdapter(opts) {
         }
       }
 
+      // Delete the warmup CLI jsonl file. Best-effort: file may not exist
+      // (race conditions, alt SDK behavior, etc.) - silently skip.
+      if (warmupSessionId) {
+        try {
+          var wmCwd = (initOpts && initOpts.cwd) || _cwd;
+          var wmEncoded = wmCwd.replace(/[^a-zA-Z0-9]/g, "-");
+          var wmPath = path.join(os.homedir(), ".claude", "projects", wmEncoded, warmupSessionId + ".jsonl");
+          fs.unlinkSync(wmPath);
+        } catch (e) {}
+      }
+
       return result;
     },
 

package/package.json

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