clay-server 2.7.0 → 2.7.2

package/lib/notes.js

@@ -8,8 +8,8 @@ function createNotesManager(opts) {
   var cwd = opts.cwd;
 
   // Storage path: ~/.clay/notes/{encodedCwd}.json
-  var encodedCwd = utils.encodeCwd(cwd);
   var notesDir = path.join(config.CONFIG_DIR, "notes");
+  var encodedCwd = utils.resolveEncodedFile(notesDir, cwd, ".json");
   var notesFile = path.join(notesDir, encodedCwd + ".json");
 
   // In-memory cache

package/lib/project.js

@@ -253,8 +253,8 @@ function createProjectContext(opts) {
   // Loop state persistence
   var _loopConfig = require("./config");
   var _loopUtils = require("./utils");
-  var _loopEncodedCwd = _loopUtils.encodeCwd(cwd);
   var _loopDir = path.join(_loopConfig.CONFIG_DIR, "loops");
+  var _loopEncodedCwd = _loopUtils.resolveEncodedFile(_loopDir, cwd, ".json");
   var _loopStatePath = path.join(_loopDir, _loopEncodedCwd + ".json");
 
   function saveLoopState() {

package/lib/public/app.js

@@ -560,7 +560,7 @@ import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modu
     } else if (status === "processing") {
       if (dot) { dot.classList.add("connected"); dot.classList.add("processing"); }
       processing = true;
-      setSendBtnMode("stop");
+      setSendBtnMode(inputEl.value.trim() ? "send" : "stop");
     } else {
       connected = false;
       sendBtn.disabled = true;
@@ -1052,13 +1052,21 @@ import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modu
     contextTurnsEl.textContent = String(contextData.turns);
   }
 
-  function accumulateContext(cost, usage, modelUsage) {
+  function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens) {
     if (cost != null) contextData.cost += cost;
     // Use latest turn values (not cumulative) since each turn's input_tokens
     // already includes the full conversation context up to that point
     if (usage) {
-      contextData.input = (usage.input_tokens || usage.inputTokens || 0)
-          + (usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0);
+      // Prefer per-call input_tokens from the last stream message_start event
+      // when available — result.usage.input_tokens sums all API calls in a turn,
+      // inflating context usage when tools are involved.
+      // Falls back to the summed value for setups that don't emit message_start.
+      if (lastStreamInputTokens) {
+        contextData.input = lastStreamInputTokens;
+      } else {
+        contextData.input = (usage.input_tokens || usage.inputTokens || 0)
+            + (usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0);
+      }
       contextData.output = usage.output_tokens || usage.outputTokens || 0;
       contextData.cacheRead = usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0;
       contextData.cacheWrite = usage.cache_creation_input_tokens || usage.cacheCreationInputTokens || 0;
@@ -1880,7 +1888,7 @@ import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modu
           replayingHistory = false;
           // Restore accurate context data from the last result in full history
           if (msg.lastUsage || msg.lastModelUsage) {
-            accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage);
+            accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens);
           }
           updateContextPanel();
           updateUsagePanel();
@@ -2302,7 +2310,7 @@ import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modu
           finalizeAssistantBlock();
           addTurnMeta(msg.cost, msg.duration);
           accumulateUsage(msg.cost, msg.usage);
-          accumulateContext(msg.cost, msg.usage, msg.modelUsage);
+          accumulateContext(msg.cost, msg.usage, msg.modelUsage, msg.lastStreamInputTokens);
           break;
 
         case "done":
@@ -2779,6 +2787,7 @@ import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modu
     resetContextData: resetContextData,
     showImageModal: showImageModal,
     hideSuggestionChips: hideSuggestionChips,
+    setSendBtnMode: setSendBtnMode,
   });
 
   // --- Notifications module (viewport, banners, notifications, debug, service worker) ---

package/lib/public/css/menus.css

@@ -507,6 +507,7 @@
 }
 
 #config-chip .lucide { width: 10px; height: 10px; }
+#config-chip .config-chip-icon { display: none; }
 #config-chip:hover { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.06); }
 #config-chip.active { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.06); }
 
@@ -851,6 +852,10 @@
     width: auto;
     max-height: 60vh;
   }
+
+  /* Config chip: icon-only on mobile */
+  #config-chip .config-chip-icon { display: inline; width: 14px; height: 14px; }
+  #config-chip-label { display: none; }
 }
 
 

package/lib/public/css/mobile-nav.css

@@ -17,11 +17,12 @@
     left: 0;
     right: 0;
     height: calc(56px + var(--safe-bottom));
+    padding-top: 1px;
     padding-bottom: var(--safe-bottom);
     background: var(--bg);
     border-top: 1px solid var(--border);
     display: flex;
-    align-items: flex-start;
+    align-items: center;
     justify-content: space-around;
     z-index: 200;
   }
@@ -88,33 +89,32 @@
 
   .mobile-tab { position: relative; }
 
-  /* --- Center "+" button (raised) --- */
+  /* --- Center "+" button --- */
   .mobile-tab-new {
-    flex: none;
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    background: var(--accent);
-    color: #fff;
+    flex: 1;
+    height: 100%;
+    background: none;
     border: none;
     display: flex;
     align-items: center;
     justify-content: center;
     cursor: pointer;
-    margin-top: -12px;
-    box-shadow: 0 2px 12px rgba(var(--shadow-rgb), 0.25);
     -webkit-tap-highlight-color: transparent;
-    transition: transform 0.1s, box-shadow 0.15s;
   }
 
   .mobile-tab-new .lucide {
-    width: 24px;
-    height: 24px;
+    width: 20px;
+    height: 20px;
+    padding: 8px;
+    box-sizing: content-box;
+    border-radius: 50%;
+    background: var(--border);
+    color: #fff;
+    transition: transform 0.1s;
   }
 
-  .mobile-tab-new:active {
+  .mobile-tab-new:active .lucide {
     transform: scale(0.92);
-    box-shadow: 0 1px 6px rgba(var(--shadow-rgb), 0.2);
   }
 
   /* --- Mobile project list items (inside sidebar) --- */

package/lib/public/css/title-bar.css

@@ -131,21 +131,21 @@
   z-index: 1;
 }
 
-/* Dark mode (unchecked) — thumb LEFT on sun */
-.theme-toggle-sun { color: var(--bg); }           /* dark icon on lighter thumb */
-.theme-toggle-moon { color: var(--text-muted); }   /* light icon on dark track */
+/* Dark mode (unchecked) — thumb LEFT on moon */
+.theme-toggle-moon { color: var(--bg); }           /* dark icon on lighter thumb */
+.theme-toggle-sun { color: var(--text-muted); }    /* light icon on dark track */
 
-/* Light mode (checked) — thumb RIGHT on moon */
+/* Light mode (checked) — thumb RIGHT on sun */
 .theme-toggle input:checked ~ .theme-toggle-track .theme-toggle-thumb {
   left: 24px;
   background: var(--bg-alt);
 }
 
-.theme-toggle input:checked ~ .theme-toggle-track .theme-toggle-sun {
+.theme-toggle input:checked ~ .theme-toggle-track .theme-toggle-moon {
   color: var(--text-muted);   /* darker icon on light track */
 }
 
-.theme-toggle input:checked ~ .theme-toggle-track .theme-toggle-moon {
+.theme-toggle input:checked ~ .theme-toggle-track .theme-toggle-sun {
   color: var(--text-dimmer);  /* darker icon on light thumb */
 }
 

package/lib/public/index.html

@@ -60,8 +60,8 @@
       <label id="theme-toggle-btn" class="theme-toggle" title="Toggle dark/light mode">
         <input type="checkbox" id="theme-toggle-check">
         <span class="theme-toggle-track">
-          <span class="theme-toggle-icon theme-toggle-sun"><i data-lucide="sun"></i></span>
           <span class="theme-toggle-icon theme-toggle-moon"><i data-lucide="moon"></i></span>
+          <span class="theme-toggle-icon theme-toggle-sun"><i data-lucide="sun"></i></span>
           <span class="theme-toggle-thumb"></span>
         </span>
       </label>
@@ -262,6 +262,7 @@
             <div id="input-bottom-right">
               <div id="config-chip-wrap" class="hidden">
                 <button id="config-chip" title="Model, mode, and effort settings">
+                  <i class="config-chip-icon" data-lucide="sliders-horizontal"></i>
                   <span id="config-chip-label"></span>
                   <i data-lucide="chevron-down"></i>
                 </button>

package/lib/public/modules/input.js

@@ -105,6 +105,10 @@ export function sendMessage() {
   clearPendingImages();
   autoResize();
   ctx.inputEl.focus();
+  // Input cleared — switch back to stop mode if still processing
+  if (ctx.processing && ctx.setSendBtnMode) {
+    ctx.setSendBtnMode("stop");
+  }
 }
 
 export function autoResize() {
@@ -580,6 +584,10 @@ export function initInput(_ctx) {
     } else {
       hideSlashMenu();
     }
+    // Toggle send/stop button based on input content during processing
+    if (ctx.processing && ctx.setSendBtnMode) {
+      ctx.setSendBtnMode(val.trim() ? "send" : "stop");
+    }
   });
 
   ctx.inputEl.addEventListener("compositionstart", function () { isComposing = true; });
@@ -639,13 +647,15 @@ export function initInput(_ctx) {
     ctx.inputEl.setAttribute("enterkeyhint", "enter");
   }
 
-  // Send/Stop button
+  // Send/Stop button — if input has text, always send; otherwise stop
   ctx.sendBtn.addEventListener("click", function () {
+    if (ctx.inputEl.value.trim()) {
+      sendMessage();
+      return;
+    }
     if (ctx.processing && ctx.connected) {
       ctx.ws.send(JSON.stringify({ type: "stop" }));
-      return;
     }
-    sendMessage();
   });
   ctx.sendBtn.addEventListener("dblclick", function (e) { e.preventDefault(); });
 }

package/lib/sdk-bridge.js

@@ -159,6 +159,11 @@ function createSDKBridge(opts) {
     if (parsed.type === "stream_event" && parsed.event) {
       var evt = parsed.event;
 
+      if (evt.type === "message_start" && evt.message && evt.message.usage) {
+        var u = evt.message.usage;
+        session.lastStreamInputTokens = (u.input_tokens || 0) + (u.cache_read_input_tokens || 0);
+      }
+
       if (evt.type === "content_block_start") {
         var block = evt.content_block;
         var idx = evt.index;
@@ -309,6 +314,8 @@ function createSDKBridge(opts) {
       session.taskIdMap = {};
       session.isProcessing = false;
       onProcessingChanged();
+      var lastStreamInput = session.lastStreamInputTokens || null;
+      session.lastStreamInputTokens = null;
       sendAndRecord(session, {
         type: "result",
         cost: parsed.total_cost_usd,
@@ -316,6 +323,7 @@ function createSDKBridge(opts) {
         usage: parsed.usage || null,
         modelUsage: parsed.modelUsage || null,
         sessionId: parsed.session_id,
+        lastStreamInputTokens: lastStreamInput,
       });
       if (parsed.fast_mode_state) {
         sendAndRecord(session, { type: "fast_mode_state", state: parsed.fast_mode_state });

package/lib/sessions.js

@@ -16,8 +16,9 @@ function createSessionManager(opts) {
   var skillNames = null;        // Claude-only skills to filter from slash menu
 
   // --- Session persistence (centralized in ~/.clay/sessions/{encoded-cwd}/) ---
-  var encodedCwd = utils.encodeCwd(cwd);
-  var sessionsDir = path.join(config.CONFIG_DIR, "sessions", encodedCwd);
+  var sessionsBase = path.join(config.CONFIG_DIR, "sessions");
+  var encodedCwd = utils.resolveEncodedDir(sessionsBase, cwd);
+  var sessionsDir = path.join(sessionsBase, encodedCwd);
   fs.mkdirSync(sessionsDir, { recursive: true });
 
   // Auto-migrate sessions from legacy locations:
@@ -237,17 +238,19 @@ function createSessionManager(opts) {
     var lastUsage = null;
     var lastModelUsage = null;
     var lastCost = null;
+    var lastStreamInputTokens = null;
     for (var j = total - 1; j >= 0; j--) {
       if (session.history[j].type === "result") {
         var r = session.history[j];
         lastUsage = r.usage || null;
         lastModelUsage = r.modelUsage || null;
         lastCost = r.cost != null ? r.cost : null;
+        lastStreamInputTokens = r.lastStreamInputTokens || null;
         break;
       }
     }
 
-    send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost });
+    send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens });
   }
 
   function switchSession(localId) {

package/lib/utils.js

@@ -2,17 +2,63 @@
  * Shared utility functions.
  */
 
+var fs = require("fs");
+
 /**
  * Encode a cwd path into a filesystem-safe directory/file name.
- * Replaces forward slashes and dots with hyphens so that usernames
- * like "jon.doe" don't break session/note lookups.
+ * Replaces all non-alphanumeric characters with hyphens, matching
+ * Claude Code CLI's encoding logic exactly (/[^a-zA-Z0-9]/g -> "-").
  *
- * Example: "/Users/jon.doe/my-project" -> "-Users-jon-doe-my-project"
+ * Example: "/Users/jon.doe_42/my project" -> "-Users-jon-doe-42-my-project"
  */
 function encodeCwd(cwd) {
+  return cwd.replace(/[^a-zA-Z0-9]/g, "-");
+}
+
+/**
+ * Legacy encoding (pre-#182 fix). Only slashes and dots were replaced.
+ * Used for fallback resolution of on-disk data written before the fix.
+ */
+function legacyEncodeCwd(cwd) {
   return cwd.replace(/[\/\.]/g, "-");
 }
 
+/**
+ * Try candidate encoded names against a base directory.
+ * Returns the first match that exists on disk, or the first candidate
+ * (newest encoding) if none exist yet.
+ */
+function resolveEncoded(baseDir, cwd, ext, checkFn) {
+  var newEncoded = encodeCwd(cwd);
+  var legacyEncoded = legacyEncodeCwd(cwd);
+  if (newEncoded === legacyEncoded) return newEncoded;
+  var full = baseDir + "/" + newEncoded + (ext || "");
+  try { if (checkFn(full)) return newEncoded; } catch (e) {}
+  var legacyFull = baseDir + "/" + legacyEncoded + (ext || "");
+  try { if (checkFn(legacyFull)) return legacyEncoded; } catch (e) {}
+  return newEncoded;
+}
+
+/**
+ * Resolve an encoded directory path with legacy fallback.
+ */
+function resolveEncodedDir(baseDir, cwd) {
+  return resolveEncoded(baseDir, cwd, "", function(p) {
+    return fs.statSync(p).isDirectory();
+  });
+}
+
+/**
+ * Resolve an encoded file path with legacy fallback.
+ */
+function resolveEncodedFile(baseDir, cwd, ext) {
+  return resolveEncoded(baseDir, cwd, ext, function(p) {
+    return fs.statSync(p).isFile();
+  });
+}
+
 module.exports = {
   encodeCwd: encodeCwd,
+  resolveEncodedDir: resolveEncodedDir,
+  resolveEncodedFile: resolveEncodedFile,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",