clay-server 2.34.1-beta.1 → 2.34.1-beta.3

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

@@ -103,30 +103,12 @@ function onConnected() {
 
   // Session restore is now server-driven (user-presence.json).
   // Mate DM restore is also server-driven via "restore_mate_dm" message.
-  // Fallback: if server doesn't restore DM within 2s, try localStorage
-  var savedDm = null;
-  try { savedDm = localStorage.getItem("clay-active-dm"); } catch (e) {}
-  if (savedDm && !store.get('dmMode') && !store.get('mateProjectSlug')) {
-    var dmFallbackTimer = setTimeout(function () {
-      if (!store.get('dmMode') && savedDm) {
-        console.log("[dm-restore] Server did not restore DM, using localStorage fallback:", savedDm);
-        openDm(savedDm);
-      }
-    }, 2000);
-    // Cancel fallback if server restores DM first
-    var patchedOnce = false;
-    var checkRestore = function (evt) {
-      try {
-        var d = JSON.parse(evt.data);
-        if (d.type === "restore_mate_dm" && !patchedOnce) {
-          patchedOnce = true;
-          clearTimeout(dmFallbackTimer);
-        }
-      } catch (e) {}
-    };
-    ws.addEventListener("message", checkRestore);
-    setTimeout(function () { ws.removeEventListener("message", checkRestore); }, 3000);
-  }
+  // Previously there was a 2s localStorage fallback that auto-called
+  // openDm(savedDm) on every reconnect. That fallback re-opened stale
+  // mate DMs on every refresh / project switch and was the root cause
+  // of the skill-install modal popping unprompted. Server-driven restore
+  // is authoritative — drop the client-side fallback entirely.
+  try { localStorage.removeItem("clay-active-dm"); } catch (e) {}
   // Safety: clear returningFromMateDm after initial messages settle
   if (store.get('returningFromMateDm')) {
     setTimeout(function () {

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

@@ -21,7 +21,6 @@ import { closeTerminal } from './terminal.js';
 import { openMobileSheet, setMobileSheetMateData } from './sidebar-mobile.js';
 import { getProfileLang } from './profile.js';
 import { isSchedulerOpen, closeScheduler } from './scheduler.js';
-import { requireClayMateInterview } from './app-skills-install.js';
 import { syncResizeHandles } from './sidebar.js';
 
 var MATE_ONBOARDING_KEY = "clay-mate-onboarding-shown";
@@ -77,13 +76,15 @@ export function openDm(targetUserId) {
   if (!ws || ws.readyState !== 1) return;
   // Persist DM state for refresh recovery
   try { localStorage.setItem("clay-active-dm", targetUserId); } catch (e) {}
-  // Check mate skill updates before opening mate DM
+  // Opening an existing mate DM does not require the clay-mate-interview
+  // skill — that skill is only used during new mate creation / reshaping.
+  // Showing onboarding + gating a skill version check here caused the
+  // "Skill Installation Required" modal to pop on every refresh / project
+  // switch via the localStorage DM-restore fallback in app-connection.js.
   if (typeof targetUserId === "string" && targetUserId.indexOf("mate_") === 0) {
     showMateOnboarding(function () {
-      requireClayMateInterview(function () {
-        var ws2 = getWs();
-        if (ws2) ws2.send(JSON.stringify({ type: "dm_open", targetUserId: targetUserId }));
-      });
+      var ws2 = getWs();
+      if (ws2) ws2.send(JSON.stringify({ type: "dm_open", targetUserId: targetUserId }));
     });
     return;
   }

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

@@ -10,7 +10,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { userAvatarUrl } from './avatar.js';
 import { closeToolGroup } from './tools.js';
 import { showImageModal, showPasteModal } from './app-misc.js';
-import { sendMessage } from './input.js';
+import { sendMessage, hasSendableContent } from './input.js';
 import { getChatLayout } from './theme.js';
 import { getScheduledMsgEl } from './app-rate-limit.js';
 
@@ -547,9 +547,11 @@ export function getGhostSuggestion() {
 
 export function showSuggestionChips(suggestion) {
   if (!suggestion || store.get('processing')) return;
-  var inputEl = getInputEl();
-  // Only show ghost text if input is empty
-  if (inputEl && inputEl.value.trim()) return;
+  // Only show ghost text when there is no sendable content — typed text,
+  // pending pastes, pending images, or pending files all suppress the
+  // suggestion so Enter can't accidentally send it instead of the user's
+  // actual attached content.
+  if (hasSendableContent()) return;
   _ghostSuggestionText = suggestion;
   var ghostEl = document.getElementById("ghost-suggestion");
   if (!ghostEl) return;

package/lib/public/modules/app-skills-install.js

@@ -197,10 +197,14 @@ export function requireSkills(opts, cb) {
     .then(function (res) { return res.json(); })
     .then(function (data) {
       var results = data.results || [];
+      // Only "missing" skills block the feature. "outdated" skills already
+      // function — an available update should not hard-gate with a modal
+      // every time a user opens a DM or refreshes the page. Callers can
+      // surface outdated versions elsewhere (e.g. settings / notifications).
       var actionable = [];
       for (var i = 0; i < results.length; i++) {
         var r = results[i];
-        if (r.status === "missing" || r.status === "outdated") {
+        if (r.status === "missing") {
           var orig = null;
           for (var j = 0; j < opts.skills.length; j++) {
             if (opts.skills[j].name === r.name) { orig = opts.skills[j]; break; }

package/lib/public/modules/input.js

@@ -360,6 +360,9 @@ function renderInputPreviews() {
     return;
   }
   bar.classList.add("visible");
+  // Hide any ghost suggestion as soon as attached content appears — Enter
+  // must not silently swallow the user's paste/image/file.
+  if (ctx && ctx.hideSuggestionChips) ctx.hideSuggestionChips();
 
   // Image thumbnails
   for (var i = 0; i < pendingImages.length; i++) {
@@ -1040,9 +1043,13 @@ export function initInput(_ctx) {
         return;
       }
       e.preventDefault();
-      // If input is empty but ghost suggestion is showing, adopt it
+      // If input has no sendable content but ghost suggestion is showing, adopt it.
+      // Use hasSendableContent() instead of checking inputEl.value alone so that
+      // pending images, pastes, or files block the ghost-text adoption — otherwise
+      // pressing Enter with only a pasted image/block queued would send the
+      // suggestion instead of the user's actual content.
       var ghost = ctx.getGhostSuggestion ? ctx.getGhostSuggestion() : "";
-      if (!ctx.inputEl.value.trim() && ghost) {
+      if (!hasSendableContent() && ghost) {
         ctx.inputEl.value = ghost;
         if (ctx.hideSuggestionChips) ctx.hideSuggestionChips();
       }

package/lib/users-preferences.js

@@ -87,6 +87,36 @@ function attachPreferences(deps) {
   }
 
   // --- Deleted built-in mate keys tracking ---
+  //
+  // In single-user mode there is no users.json, so the user row lookup
+  // below returns nothing and the key is silently dropped. That made
+  // "Remove mate" in the sidebar picker a no-op: the key was never
+  // persisted, ensureBuiltinMates re-created the mate on next mate_list,
+  // and the user could not actually get rid of built-in mates.
+  //
+  // Fallback: when the user record isn't found (single-user mode), read
+  // and write deletedBuiltinKeys on daemon.json via lib/config.js. This
+  // preserves multi-user behavior (users.json row still wins) while
+  // giving single-user deploys a place to persist the setting.
+
+  function loadSingleUserDeletedKeys() {
+    try {
+      var config = require("./config");
+      var cfg = config.loadConfig() || {};
+      return Array.isArray(cfg.deletedBuiltinKeys) ? cfg.deletedBuiltinKeys : [];
+    } catch (e) {
+      return [];
+    }
+  }
+
+  function saveSingleUserDeletedKeys(keys) {
+    try {
+      var config = require("./config");
+      var cfg = config.loadConfig() || {};
+      cfg.deletedBuiltinKeys = keys;
+      config.saveConfig(cfg);
+    } catch (e) {}
+  }
 
   function getDeletedBuiltinKeys(userId) {
     var data = loadUsers();
@@ -95,7 +125,7 @@ function attachPreferences(deps) {
         return data.users[i].deletedBuiltinKeys || [];
       }
     }
-    return [];
+    return loadSingleUserDeletedKeys();
   }
 
   function addDeletedBuiltinKey(userId, key) {
@@ -110,6 +140,12 @@ function attachPreferences(deps) {
         return;
       }
     }
+    // Single-user fallback
+    var keys = loadSingleUserDeletedKeys();
+    if (keys.indexOf(key) === -1) {
+      keys.push(key);
+      saveSingleUserDeletedKeys(keys);
+    }
   }
 
   function removeDeletedBuiltinKey(userId, key) {
@@ -124,6 +160,12 @@ function attachPreferences(deps) {
         return;
       }
     }
+    // Single-user fallback
+    var keys = loadSingleUserDeletedKeys();
+    var filtered = keys.filter(function (k) { return k !== key; });
+    if (filtered.length !== keys.length) {
+      saveSingleUserDeletedKeys(filtered);
+    }
   }
 
   // --- Per-user chat layout setting ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.34.1-beta.1",
+  "version": "2.34.1-beta.3",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.112",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@openai/codex": "^0.121.0",
+    "@openai/codex": "^0.124.0",
     "imapflow": "^1.3.1",
     "nodemailer": "^6.10.1",
     "qrcode-terminal": "^0.12.0",