clay-server 3.8.1 → 4.0.0-beta.10

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

@@ -6,11 +6,12 @@ import { refreshIcons, iconHtml } from './icons.js';
 import { escapeHtml } from './utils.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { openDm } from './app-dm.js';
+import { showHomeHub } from './app-home-hub.js';
+import { openHomeChat } from './home-mate-chat.js';
 import { getCachedProjects, switchProject, renderProjectList } from './app-projects.js';
 import { mateAvatarUrl, userAvatarUrl } from './avatar.js';
-import { openTerminal } from './terminal.js';
 import { openTuiModal } from './tui-attention.js';
+import { requestVendorLogin } from './vendor-login.js';
 import { startUrgentBlink, stopUrgentBlink } from './app-favicon.js';
 import { playDoneSound, isNotifSoundEnabled } from './notifications.js';
 var notifications = [];
@@ -46,7 +47,6 @@ var pendingTuiTotal = 0;
 // (next hour) acts as a fresh ping.
 var pendingUpdateMsg = null;
 var activeAuthRequiredMsg = null;
-var authReminderVisible = false;
 
 // ========================================================
 // Init
@@ -90,7 +90,6 @@ function showAllBanners() {
   }
 
   if (activeAuthRequiredMsg) showAuthRequiredBanner(activeAuthRequiredMsg);
-  if (authReminderVisible) showLoginReminderBanner();
 
   // Check if any banner actually got rendered (update/auth banners can be suppressed)
   var hasVisibleBanner = bannerContainer.children.length > 0;
@@ -265,8 +264,9 @@ function showBanner(notif, autoDismissMs) {
           removeBanner(banner);
           dismissNotif(notif.id);
           var authMeta = notif.meta || {};
-          startLoginInModal(authMeta.loginCommand || getVendorLoginCommand(authMeta.vendor || "claude"), authMeta.vendor || "claude");
-          showLoginReminderBanner();
+          // Deliberate click: re-attach to a live login terminal instead of
+          // spawning a second one (the server dedups per vendor).
+          requestVendorLogin(authMeta.vendor || "claude", { sessionId: notif.sessionId || null });
         });
       }
     }
@@ -324,118 +324,6 @@ function showBanner(notif, autoDismissMs) {
   }
 }
 
-// Open the login terminal as a modal dialog (the same modal used for TUI
-// attention), running the vendor login command. The terminal is created with
-// the command as its initial input, so when the modal attaches it replays the
-// scrollback and the user sees the login URL / prompts immediately.
-// Falls back to the sidebar terminal if the current project slug is unknown
-// (the modal needs a slug to open its own WS to the project).
-function currentProjectSlug() {
-  var slug = store.get('currentSlug') || "";
-  if (slug) return slug;
-  // Fallback: derive from the URL (/p/<slug>/...).
-  try {
-    var m = (window.location.pathname || "").match(/^\/p\/([a-z0-9_-]+)/);
-    if (m) return m[1];
-  } catch (e) {}
-  return "";
-}
-
-function startLoginInModal(loginCommand, vendor) {
-  if (authReminderVisible) return;
-  var ws = getWs();
-  if (!ws || ws.readyState !== 1) return;
-  var cmd = loginCommand || getVendorLoginCommand(vendor);
-  var slug = currentProjectSlug();
-  if (!slug) { startLoginCommand(cmd); return; }
-  store.set({ pendingLoginModal: { slug: slug, vendor: vendor || "claude" } });
-  ws.send(JSON.stringify({
-    type: "term_create",
-    cols: 100,
-    rows: 30,
-    initialCommand: cmd + "\n",
-  }));
-}
-
-// Sidebar-terminal fallback (used when no slug is available for the modal).
-function startLoginCommand(loginCommand) {
-  if (authReminderVisible) return;
-  var ws = getWs();
-  if (!ws || ws.readyState !== 1) return;
-  var termCommand = (loginCommand || "claude login") + "\n";
-  store.set({ pendingTermCommand: termCommand });
-  ws.send(JSON.stringify({ type: "term_create", cols: 80, rows: 24 }));
-  openTerminal();
-}
-
-// Auto-open the login modal and run the login command when the server reports
-// the vendor isn't logged in. The popup terminal runs as the connected user's
-// own OS identity (term_create -> getOsUserInfoForWs), so login always targets
-// the right account — we pop it unconditionally rather than gating on
-// canAutoLogin. Idempotent: startLoginInModal is guarded by authReminderVisible
-// so repeat auth_required events no-op.
-export function autoStartLoginIfNeeded(msg) {
-  if (!msg) return false;
-  if (authReminderVisible) return false;
-  var vendor = msg.vendor || "claude";
-  var cmd = msg.loginCommand
-    || getVendorLoginCommand(vendor);
-  startLoginInModal(cmd, vendor);
-  showLoginReminderBanner();
-  return true;
-}
-
-function showLoginReminderBanner() {
-  if (!bannerContainer) return;
-  authReminderVisible = true;
-  var existing = bannerContainer.querySelector('[data-auth-reminder="true"]');
-  if (existing) removeBanner(existing);
-  var banner = document.createElement("div");
-  banner.className = "notif-banner notif-banner-update";
-  banner.setAttribute("data-notif-id", "_auth_reminder");
-  banner.setAttribute("data-auth-reminder", "true");
-  banner.innerHTML =
-    '<div class="notif-banner-icon">' + iconHtml("check-circle") + '</div>' +
-    '<div class="notif-banner-body">' +
-      '<div class="notif-banner-project">CLAY</div>' +
-      '<div class="notif-banner-title">Login started</div>' +
-      '<div class="notif-banner-text">After the login completes, open a new session so Clay picks up the fresh auth state.</div>' +
-      '<div class="notif-banner-actions">' +
-        '<button class="notif-banner-new-session notif-banner-update-now">Open new session</button>' +
-      '</div>' +
-    '</div>' +
-    '<button class="notif-banner-close">' + iconHtml("x") + '</button>';
-
-  bannerContainer.appendChild(banner);
-  refreshIcons();
-
-  requestAnimationFrame(function () {
-    banner.classList.add("show");
-  });
-
-  var newSessionBtn = banner.querySelector(".notif-banner-new-session");
-  if (newSessionBtn) {
-    newSessionBtn.addEventListener("click", function (e) {
-      e.stopPropagation();
-      authReminderVisible = false;
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify({ type: "new_session" }));
-      }
-      removeBanner(banner);
-    });
-  }
-
-  var closeBtn = banner.querySelector(".notif-banner-close");
-  if (closeBtn) {
-    closeBtn.addEventListener("click", function (e) {
-      e.stopPropagation();
-      authReminderVisible = false;
-      removeBanner(banner);
-    });
-  }
-}
-
 export function showAuthRequiredBanner(msg) {
   if (!bannerContainer) return;
   var vendor = (msg && (msg.vendor || (msg.meta && msg.meta.vendor))) || "claude";
@@ -726,7 +614,8 @@ function navigateToNotification(notif) {
     if (notif.sessionId) {
       try { sessionStorage.setItem("pending-notif-session", notif.sessionId); } catch (e) {}
     }
-    openDm(mateId);
+    showHomeHub();
+    openHomeChat(mateId);
     return;
   }
 

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

@@ -10,7 +10,7 @@ import { setupModelPicker, renderModelPicker, requestVendorModels, prepareModelP
 
 // --- Module-owned state (not in store) ---
 var sessionUsage = { cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
-var contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
+var contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0, thinking: null, costBasis: null };
 var ctxPopoverEl = null;
 var ctxHoverTimer = null;
 var statusRefreshTimer = null;
@@ -72,6 +72,10 @@ var contextCacheReadEl = null;
 var contextCacheWriteEl = null;
 var contextModelEl = null;
 var contextCostEl = null;
+var contextThinkingEl = null;
+var contextThinkingRow = null;
+var contextCostBasisEl = null;
+var contextCostBasisRow = null;
 var contextTurnsEl = null;
 var contextMini = null;
 var contextMiniFill = null;
@@ -449,6 +453,10 @@ export function initPanels() {
   contextCacheWriteEl = $("context-cache-write");
   contextModelEl = $("context-model");
   contextCostEl = $("context-cost");
+  contextThinkingEl = $("context-thinking");
+  contextThinkingRow = $("context-thinking-row");
+  contextCostBasisEl = $("context-cost-basis");
+  contextCostBasisRow = $("context-cost-basis-row");
   contextTurnsEl = $("context-turns");
   contextMini = $("context-mini");
   contextMiniFill = $("context-mini-fill");
@@ -776,6 +784,16 @@ export function updateContextPanel() {
   contextCacheWriteEl.textContent = formatTokens(contextData.cacheWrite);
   contextModelEl.textContent = contextData.model;
   contextCostEl.textContent = "$" + contextData.cost.toFixed(4);
+  // Optional SDK fields: shown only once the CLI has actually reported them.
+  if (contextThinkingRow && contextThinkingEl) {
+    var hasThinking = typeof contextData.thinking === "number";
+    contextThinkingRow.classList.toggle("hidden", !hasThinking);
+    if (hasThinking) contextThinkingEl.textContent = formatTokens(contextData.thinking);
+  }
+  if (contextCostBasisRow && contextCostBasisEl) {
+    contextCostBasisRow.classList.toggle("hidden", !contextData.costBasis);
+    if (contextData.costBasis) contextCostBasisEl.textContent = contextData.costBasis;
+  }
   contextTurnsEl.textContent = String(contextData.turns);
 }
 
@@ -811,6 +829,29 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
       contextData.model = displayModel;
       contextData.contextWindow = resolveContextWindow(displayModel, mu.contextWindow);
       if (mu.maxOutputTokens) contextData.maxOutputTokens = mu.maxOutputTokens;
+
+      // thinkingTokens and costBasis are per-model and optional: absent on
+      // older CLI builds and, for a resumed session, on the turns that ran
+      // before the field existed. Leave them null in that case so the rows
+      // stay hidden rather than claiming a confident zero.
+      var thinkingTotal = null;
+      var basis = null;
+      var basisMixed = false;
+      for (var mi = 0; mi < models.length; mi++) {
+        var entry = modelUsage[models[mi]];
+        if (!entry) continue;
+        if (typeof entry.thinkingTokens === "number") {
+          thinkingTotal = (thinkingTotal || 0) + entry.thinkingTokens;
+        }
+        if (entry.costBasis) {
+          if (basis === null) basis = entry.costBasis;
+          else if (basis !== entry.costBasis) basisMixed = true;
+        }
+      }
+      contextData.thinking = thinkingTotal;
+      // Several models in one query can be priced differently; say so rather
+      // than reporting whichever happened to come first.
+      contextData.costBasis = basisMixed ? "mixed" : basis;
     }
   }
   if (!store.get('replayingHistory')) updateContextPanel();
@@ -832,7 +873,7 @@ export function applyContextView(view) {
 }
 
 export function resetContextData() {
-  contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
+  contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0, thinking: null, costBasis: null };
   store.set({ richContextUsage: null });
   // hideCtxPopover + updateContextPanel handled by store subscriber
 }

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

@@ -413,6 +413,7 @@ export function resetClientState() {
 
 export function switchProject(slug) {
   if (!slug) return;
+  document.cookie = "clay_last_project=" + encodeURIComponent(slug) + "; Path=/; SameSite=Strict; Max-Age=31536000";
   var st = store.snap();
   var wasDm = st.dmMode;
   var wasMate = st.dmMode && st.dmTargetUser && st.dmTargetUser.isMate;
@@ -420,7 +421,14 @@ export function switchProject(slug) {
   closeWhatsNewArticle();
   if (isHomeHubVisible()) {
     hideHomeHub();
-    if (slug === store.get('currentSlug')) return;
+    if (slug === store.get('currentSlug')) {
+      if (document.documentElement.classList.contains("pwa-standalone")) {
+        history.replaceState(null, "", "/p/" + slug + "/");
+      } else {
+        history.pushState(null, "", "/p/" + slug + "/");
+      }
+      return;
+    }
   }
   if (slug === store.get('currentSlug')) {
     var ws = getWs();