clay-server 5.2.0-beta.5 → 5.2.0-beta.6

package/lib/project-pair-usage.js

@@ -16,16 +16,14 @@ function contextStatus(session) {
   var used = null;
   var window = null;
   var source = "unavailable";
+  var measurement = "unavailable";
   if (snapshot && typeof snapshot === "object") {
-    if (session.vendor === "claude") {
-      used = firstNumber(snapshot.totalTokens);
-      window = firstNumber(snapshot.maxTokens);
-      if (used !== null || window !== null) source = "claude_sdk_context_usage";
-    } else {
-      used = firstNumber(snapshot.input_tokens);
-      window = firstNumber(snapshot.contextWindow);
-      if (used !== null || window !== null) source = "adapter_context_usage";
-    }
+    var current = require("./yoke/usage").context(snapshot, session.vendor || "claude").context;
+    measurement = current.measurement;
+    used = firstNumber(current.usedTokens);
+    window = firstNumber(current.windowTokens);
+    if (used !== null || window !== null) source = current.source;
+
   }
   var history = session.history || [];
   var cumulativeInput = 0;
@@ -46,9 +44,9 @@ function contextStatus(session) {
       if (typeof item._ts === "number") lastCompactionAt = item._ts;
     }
     if (item.type !== "result") continue;
-    var usage = item.usage || {};
-    var input = firstNumber(usage.input_tokens, usage.inputTokens);
-    var output = firstNumber(usage.output_tokens, usage.outputTokens);
+    var usage = require("./yoke/usage").accounting(item.usage) || {};
+    var input = firstNumber(usage.inputTokens);
+    var output = firstNumber(usage.outputTokens);
     if (input !== null) { cumulativeInput += input; observedInput = true; }
     if (output !== null) { cumulativeOutput += output; observedOutput = true; }
     results++;
@@ -59,13 +57,14 @@ function contextStatus(session) {
   if (used !== null && window !== null && used > window) {
     used = null;
     source = "unavailable";
+    measurement = "unavailable";
   }
   // Older result records contain lastStreamInputTokens, but that field was
   // populated from adapter snapshots that could be cumulative or inflated by
   // cache accounting. It is not safe evidence of current context occupancy.
   var ratio = used !== null && window !== null && window > 0 ? Math.min(1, Math.round((used / window) * 1000) / 1000) : null;
   return {
-    current: { source: source, usedTokens: used, windowTokens: window, usedRatio: ratio,
+    current: { source: source, measurement: measurement, usedTokens: used, windowTokens: window, usedRatio: ratio,
       scope: used === null && window === null ? "unknown" : (used !== null && window !== null ? "current_context" : "partial_current_context") },
     cumulative: { inputTokens: observedInput ? cumulativeInput : null, outputTokens: observedOutput ? cumulativeOutput : null, tasksObserved: results, scope: "loaded_session_history", complete: false },
     lastTask: lastTask,

package/lib/project-pending-message-queue.js

@@ -249,7 +249,8 @@ function createPendingMessageQueue(opts) {
     return true;
   }
   function consumeOne(session, dispatch) {
-    if (loadError || !session || session._pendingMessageClaimId || isPaused(session) || session._pendingMessageDrainPaused || session.taskStopRequested || session._queryStarting || session._awaitingTurnResult || session.isProcessing) return null;
+    var foreground = require('./sdk-foreground-admission');
+    if (loadError || !session || session._pendingMessageClaimId || isPaused(session) || session._pendingMessageDrainPaused || session.taskStopRequested || session._queryStarting || (session._awaitingTurnResult || session.isProcessing) && !foreground.available(session)) return null;
     if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()) return null;
     for (var i = 0; i < data.items.length; i++) {
       var item = data.items[i];
@@ -262,6 +263,7 @@ function createPendingMessageQueue(opts) {
       data.revision++;
       try { persist(); } catch (e) { restore(before); return null; }
       session._pendingMessageClaimId = item.id;
+      foreground.take(session);
       broadcast(session, { type: "pending_message_claimed", sessionId: session.localId, projectSlug: opts.slug, paused: isPaused(session), id: item.id, revision: data.revision });
       var completed = false;
       function complete(ok, error) { if (completed) return false; completed = true; return finishClaim(session, item.id, ok, error); }

package/lib/project-session-history-actions.js

@@ -105,7 +105,10 @@ function attachSessionHistoryActions(ctx) {
         if (session.messageUUIDs[fi].uuid === uuid) { targetIdx = fi; break; }
       }
       var forkHistory = [];
-      if (targetIdx >= 0) {
+      if (result.localHistoryEndIndex !== undefined) {
+        if (!Number.isInteger(result.localHistoryEndIndex) || result.localHistoryEndIndex < 0 || result.localHistoryEndIndex > session.history.length) throw new Error("The provider fork exists but its local history boundary is unavailable; inspect before retrying");
+        forkHistory = session.history.slice(0, result.localHistoryEndIndex);
+      } else if (targetIdx >= 0) {
         var trimTo = session.messageUUIDs[targetIdx].historyIndex;
         forkHistory = session.history.slice(0, trimTo);
       } else {
@@ -133,8 +136,7 @@ function attachSessionHistoryActions(ctx) {
       return forked;
     } else {
       // Read history from CLI session files
-      var cliSess = require("./cli-sessions");
-      var history = await cliSess.readCliSessionHistory(resolveSessionHome(session), cwd, result.sessionId);
+      var history = await require("./yoke/session-history").read(session.vendor || "claude", resolveSessionHome(session), cwd, result.sessionId);
       revalidate();
       var options = {
         history: history,

package/lib/project-session-pair.js

@@ -350,7 +350,7 @@ function attachSessionPair(ctx) {
     if (boundRoles && boundRoles.workers.indexOf(boundSession) !== -1) return taskControl.workerToolDefs(boundSession);
     var adHocSplit = !!(group && !group.pair);
     if (!driverEligibility.isEligibleDriverSession(boundSession, sm)) return [];
-    var persistentCatalog = boundSession.vendor === "codex" && (!group || !!group.pair);
+    var persistentCatalog = require("./yoke/session-tool-transport").contract(boundSession.vendor || "claude").catalogLifetime === "conversation" && (!group || !!group.pair);
     if (!group && !persistentCatalog) {
       return workerProposal.getToolDefs(boundSession)
         .concat(workerPermission.getToolDefs(boundSession, { dormantDriver: true }));

package/lib/project-session-runtime-actions.js

@@ -11,7 +11,8 @@ function attachSessionRuntimeActions(ctx) {
     var vendor = session.vendor || ctx.sm.defaultVendor || "claude";
     var ids = Array.from(new Set([session.terminalId, session.runtimeTerminalId].filter(function (id) { return typeof id === "number"; })));
     if (!ids.length && (session.runtimeMode || session.mode || "gui") === "gui") return { status: "completed", runtimeMode: "gui", runtimeEffect: "none", threadPreserved: true };
-    if (vendor !== "claude" || !session.cliSessionId) throw new Error("Only a legacy Claude terminal thread can return to GUI chat.");
+    var lifecycle = require("./yoke/provider-contract").resolve(vendor);
+    if (typeof lifecycle.supportsLegacyGuiResume !== "function" || !lifecycle.supportsLegacyGuiResume(session)) throw new Error("This provider cannot return a legacy terminal thread to GUI chat.");
     var closed = 0, persisted = false;
     var fields = ['terminalId', 'runtimeTerminalId'];
     var originalFields = fields.map(function (field) { return session[field]; });

package/lib/project-session-spawn.js

@@ -1,6 +1,5 @@
 var yoke = require("./yoke");
 var sessionSpawnMcp = require("./session-spawn-mcp-server");
-var cliSessions = require("./cli-sessions");
 var os = require("os");
 var osUsers = require("./os-users");
 
@@ -161,7 +160,7 @@ function attachSessionSpawn(ctx) {
   var sm = ctx.sm;
   var queue = createSpawnQueue(SPAWN_CONCURRENCY);
   var adapters = ctx.adapters || {};
-  var readCliSessionHistory = ctx.readCliSessionHistory || cliSessions.readCliSessionHistory;
+  var readCliSessionHistory = ctx.readCliSessionHistory || function(home, project, sessionId, provider) { return require("./yoke/session-history").read(provider || "claude", home, project, sessionId); };
 
   function resolveSessionHome(session) {
     var linuxUser = ctx.getLinuxUserForSession(session);
@@ -283,7 +282,7 @@ function attachSessionSpawn(ctx) {
               forkHistory = parent.history.slice();
             } else {
               forkHistory = await readCliSessionHistory(
-                resolveSessionHome(parent), ctx.cwd, forkResult.sessionId
+                resolveSessionHome(parent), ctx.cwd, forkResult.sessionId, parent.vendor
               );
             }
           } catch (e) {

package/lib/project-session-vendor.js

@@ -18,7 +18,8 @@ function attachSessionVendor(ctx) {
     session.vendor = vendor;
     session.model = null;
     session.effort = yoke.clampEffort(vendor, session.effort) || null;
-    if (session.permissionMode === 'auto' && vendor !== 'claude') session.permissionMode = 'default';
+    var modes = yoke.sessionTools.contract(ctx.adapters[vendor]).permissionModes;
+    if (session.permissionMode === 'auto' && (!Array.isArray(modes) || modes.indexOf('auto') < 0)) session.permissionMode = 'default';
     session.effectivePermissionMode = null;
     try { if (ctx.sm.saveSessionFile(session) !== true) throw new Error('Could not persist the provider selection.'); }
     catch (error) { Object.assign(session, previous); throw error; }

package/lib/project-sessions.js

@@ -2,7 +2,7 @@ var serverSettingsMessages = require("./project-server-settings");
 var fs = require("fs");
 var path = require("path");
 var { execFileSync } = require("child_process");
-var { CODEX_DEFAULTS, getCodexConfig } = require("./codex-defaults");
+var providerSettings = require("./yoke/settings");
 var updateSnooze = require("./update-snooze");
 var yoke = require("./yoke");
 var sessionVisibility = require("./session-visibility");
@@ -258,7 +258,7 @@ function attachSessions(ctx) {
     if (!session || !session.cliSessionId) return;
     if (session._titleWatcherStop) return; // already watching
     var watcher;
-    try { watcher = require("./claude-jsonl-watcher"); } catch (e) { return; }
+    try { watcher = require("./yoke/claude-jsonl-watcher"); } catch (e) { return; }
     var home = resolveSessionHome(session);
     var jsonlPath = watcher.jsonlPathFor(home, cwd, session.cliSessionId);
     if (!jsonlPath) return;
@@ -326,7 +326,7 @@ function attachSessions(ctx) {
         // message right away. The transcript is small enough that a full
         // re-send beats maintaining a delta protocol.
         try {
-          var newIndex = require("./tui-transcript-index").readAssistantIndex(resolveSessionHome(s), cwd, s.cliSessionId);
+          var newIndex = require("./yoke/tui-transcript-index").readAssistantIndex(resolveSessionHome(s), cwd, s.cliSessionId);
           send({
             type: "tui_transcript_state",
             id: s.localId,
@@ -453,7 +453,7 @@ function attachSessions(ctx) {
   function prepareTuiSessionForGuiView(session, options) {
     if (!session || session.cliSessionId == null) return;
     var cliSess;
-    try { cliSess = require("./cli-sessions"); } catch (e) { return; }
+    try { cliSess = require("./yoke/cli-sessions"); } catch (e) { return; }
     // Re-read whenever the jsonl has changed since the last hydrate (a TUI
     // turn appended messages), not just when history is empty. The earlier
     // "already hydrated" short-circuit kept stale history after a
@@ -603,7 +603,7 @@ function attachSessions(ctx) {
       var from = sm.findTurnBoundary(session.history, Math.max(0, targetFrom));
       var to = before;
       var items = session.history.slice(from, to).map(function (item, index) {
-        return Object.assign({}, hydrateImageRefs(item), { _historyIndex: from + index });
+        return Object.assign({}, hydrateImageRefs(require("./yoke/usage").clientEvent(item, session.vendor || "claude")), { _historyIndex: from + index });
       });
       sendTo(ws, {
         type: "history_prepend",
@@ -918,7 +918,7 @@ function attachSessions(ctx) {
         return true;
       }
       try {
-        var tprIndex = require("./tui-transcript-index").readAssistantIndex(resolveSessionHome(tprSess), cwd, tprSess.cliSessionId);
+        var tprIndex = require("./yoke/tui-transcript-index").readAssistantIndex(resolveSessionHome(tprSess), cwd, tprSess.cliSessionId);
         sendTo(ws, {
           type: "tui_transcript_state",
           id: tprId,
@@ -1099,14 +1099,14 @@ function attachSessions(ctx) {
       var pid = msg.pid;
       if (!pid || typeof pid !== "number") return true;
       // Verify target is actually a claude process before killing
-      if (!sdk.isClaudeProcess(pid)) {
-        console.error("[project] Refused to kill PID " + pid + ": not a claude process");
-        sendTo(ws, { type: "error", text: "Process " + pid + " is not a Claude process." });
+      if (!sdk.isProviderProcess(pid, getSessionForWs(ws))) {
+        console.error("[project] Refused to kill PID " + pid + ": not a verified provider process");
+        sendTo(ws, { type: "error", text: "Process " + pid + " is not a verified provider process." });
         return true;
       }
       try {
         process.kill(pid, "SIGTERM");
-        console.log("[project] Sent SIGTERM to conflicting Claude process PID " + pid);
+        console.log("[project] Sent SIGTERM to conflicting provider process PID " + pid);
         sendTo(ws, { type: "process_killed", pid: pid });
       } catch (e) {
         console.error("[project] Failed to kill PID " + pid + ":", e.message);
@@ -1367,20 +1367,12 @@ function attachSessions(ctx) {
       return true;
     }
 
-    // Codex-specific settings (stored on sessionManager, passed to adapter via adapterOptions)
-    if (msg.type === "set_codex_approval") {
-      sm.codexApproval = getCodexConfig({ codexApproval: msg.approval }).approval;
-      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
-      return true;
-    }
-    if (msg.type === "set_codex_sandbox") {
-      sm.codexSandbox = msg.sandbox || CODEX_DEFAULTS.sandbox;
-      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
-      return true;
-    }
-    if (msg.type === "set_codex_websearch") {
-      sm.codexWebSearch = msg.webSearch || CODEX_DEFAULTS.webSearch;
-      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
+    var providerChange;
+    try { providerChange = providerSettings.change(msg, sm); }
+    catch (error) { sendTo(ws, { type: "error", text: error.message }); return true; }
+    if (providerChange) {
+      Object.keys(providerChange.patch).forEach(function(key) { sm[key] = providerChange.patch[key]; });
+      providerChange.messages.forEach(function(message) { send(message); });
       return true;
     }
 
@@ -1924,7 +1916,7 @@ function attachSessions(ctx) {
       var galManaged = [];
       var galUser = [];
       try {
-        var galInstaller = require("./claude-hook-installer");
+        var galInstaller = require("./yoke/claude-hook-installer");
         galManaged = galInstaller.CLAY_MANAGED_ALLOW || [];
       } catch (e) {}
       if (galUid) {
@@ -1950,7 +1942,7 @@ function attachSessions(ctx) {
       // home (OS-mode: getent passwd; single-user: os.homedir()).
       var salEffective = false;
       try {
-        var salInstaller = require("./claude-hook-installer");
+        var salInstaller = require("./yoke/claude-hook-installer");
         var salHome = null;
         if (osUsers && ws._clayUser && ws._clayUser.linuxUser) {
           try {

package/lib/project-user-message.js

@@ -488,6 +488,7 @@ function attachUserMessage(ctx) {
       if (queuedResult.ok) {
         messageDelivery.acknowledge(ws, deliveryReceipt, null, session);
         sendTo(ws, { type: "message_queued", clientMessageId: msg.clientMessageId || null, sessionId: session.localId, projectSlug: slug, state: "pending", paused: pendingMessageQueue.isPaused(session), revision: pendingMessageQueue.getRevision() });
+        if (require('./sdk-foreground-admission').available(session)) setImmediate(function () { consumePendingMessage(session); });
       } else {
         sendTo(ws, { type: "error", text: queuedResult.error || "Unable to queue message" });
       }

package/lib/project-vendor-login.js

@@ -25,37 +25,11 @@ var yoke = require("./yoke");
 // Login CLIs print a success line and then hand the shell back, so the PTY
 // itself does not exit. Watch the output stream instead. Deliberately narrow:
 // "Successfully logged out" and MCP-server logins must not match.
-var LOGIN_SUCCESS_PATTERNS = [
-  /successfully logged in(?![ \t]+to[ \t]+mcp)/i,
-  /logged in successfully/i,
-  /login successful/i,
-  /successfully authenticated/i,
-  /authentication successful/i,
-  /signed in successfully/i,
-  /signed in with your [a-z ]+ account/i,
-  /you(?:'re| are) (?:now )?(?:logged|signed) in/i,
-];
-
-// Rolling window kept per flow so a success line split across PTY chunks is
-// still matched, without buffering the whole login transcript.
 var OUTPUT_TAIL_MAX = 4096;
-
-// Grace period between detecting success and killing the terminal, so the user
-// actually sees the confirmation line before the modal closes.
 var CLOSE_AFTER_SUCCESS_MS = 2000;
-
-var ANSI_PATTERN = /\x1b\[[0-9;?]*[ -\/]*[@-~]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\r/g;
-
-function stripAnsi(text) {
-  return String(text).replace(ANSI_PATTERN, "");
-}
-
-function looksLikeLoginSuccess(text) {
-  for (var i = 0; i < LOGIN_SUCCESS_PATTERNS.length; i++) {
-    if (LOGIN_SUCCESS_PATTERNS[i].test(text)) return true;
-  }
-  return false;
-}
+var loginProtocol = require("./yoke/login-protocol");
+var stripAnsi = loginProtocol.stripAnsi;
+var looksLikeLoginSuccess = loginProtocol.successful;
 
 /**
  * ctx fields:
@@ -96,11 +70,7 @@ function attachVendorLogin(ctx) {
     cancel: function (vendor) { closeFlowTerminal(discardFlow(vendor)); broadcastState(); },
   });
 
-  function loginCommandFor(vendor) {
-    if (vendor === "claude") return "claude auth login";
-    var info = vendorRegistry.getVendorInfo(vendor);
-    return (info && info.loginCommand) || "claude login";
-  }
+  function loginCommandFor(vendor) { return loginProtocol.command(vendor, false); }
 
   function vendorDisplayName(vendor) {
     var info = vendorRegistry.getVendorInfo(vendor);
@@ -284,8 +254,8 @@ function attachVendorLogin(ctx) {
     var key = flowKey(ws, vendor);
     var identity = resolveLoginIdentity(ws, msg);
     var command = loginCommandFor(vendor);
-    var browserMode = msg.mode === "browser" && (vendor === "claude" || vendor === "codex");
-    if (browserMode) command = vendor === "codex" ? "codex login" : "claude auth login";
+    var browserMode = msg.mode === "browser" && !!(vendorRegistry.getVendorInfo(vendor) || {}).browserLoginCommand;
+    if (browserMode) command = loginProtocol.command(vendor, true);
     var flow = {
       vendor: vendor,
       key: key,

package/lib/public/app.js

@@ -583,6 +583,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     // rendering
     currentMsgTs: null,
     richContextUsage: null,
+    contextMeasurement: "unavailable",
     currentMsgEl: null,
     currentFullText: "",
     matePreThinkingEl: null,

package/lib/public/css/messages.css

@@ -675,7 +675,8 @@ pre.mermaid-error {
 
 .thinking-live .thinking-chevron { display: none; }
 
-.thinking-live .thinking-label {
+.thinking-live .thinking-label,
+.activity-inline .activity-text.activity-state-label {
   background: linear-gradient(100deg, var(--text-muted) 40%, var(--text-dimmer) 50%, var(--text-muted) 60%);
   background-size: 300% 100%;
   background-clip: text;
@@ -690,7 +691,10 @@ pre.mermaid-error {
 }
 
 @media (prefers-reduced-motion: reduce) {
-  .thinking-live .thinking-label { animation: none; background: none; color: var(--text-muted); }
+  .thinking-live .thinking-label,
+  .activity-inline .activity-text.activity-state-label {
+    animation: none; background: none; color: var(--text-muted); -webkit-text-fill-color: currentColor;
+  }
 }
 
 .thinking-header[aria-disabled="true"] { cursor: default; }

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

@@ -197,7 +197,7 @@ export function stopUrgentBlink() {
 
 export function setActivity(text) {
   var thinkingState = store.get('thinkingState');
-  if (text === "thinking" && thinkingState && thinkingState.active) {
+  if ((text === "thinking" || text === "running") && thinkingState && thinkingState.active) {
     // Live Thinking already owns the tail progress UI. Compaction and tool
     // activity intentionally continue through so their distinct states show.
     if (getActivityEl()) {
@@ -225,9 +225,18 @@ export function setActivity(text) {
         _actEl.innerHTML =
           '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
       }
+      _actEl.setAttribute("role", "status");
+      _actEl.setAttribute("aria-live", "polite");
       setActivityEl(_actEl);
-      addToMessages(_actEl);
     }
+    var activity = getActivityEl();
+    var labels = { waiting: "Waiting for provider", running: "Working", background: "Background work pending" };
+    var label = activity.querySelector(".activity-state-label");
+    if (labels[text]) {
+      if (!label) { label = document.createElement("span"); label.className = "activity-state-label activity-text"; activity.appendChild(label); }
+      label.textContent = labels[text];
+    } else if (label) label.remove();
+    addToMessages(activity);
     scrollToBottom();
   } else {
     if (getActivityEl()) {

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

@@ -267,14 +267,16 @@ export function initHeader() {
           addRow("Local ID", split.panes[pi].sessionId);
           if (member && member.cliSessionId) {
             addRow("Session ID", member.cliSessionId);
-            addRow("Resume", "claude --resume " + member.cliSessionId);
+            var memberResume = ((store.get("vendorInfo") || {})[member.vendor || "claude"] || {}).terminalResumeCommand;
+            if (memberResume) addRow("Resume", memberResume + " " + member.cliSessionId);
           }
         }
       } else {
         var s = store.snap();
         if (s.cliSessionId) addRow("Session ID", s.cliSessionId);
         if (s.activeSessionId) addRow("Local ID", s.activeSessionId);
-        if (s.cliSessionId) addRow("Resume", "claude --resume " + s.cliSessionId);
+        var resume = ((s.vendorInfo || {})[s.currentVendor] || {}).terminalResumeCommand;
+        if (s.cliSessionId && resume) addRow("Resume", resume + " " + s.cliSessionId);
       }
 
       document.body.appendChild(pop);

package/lib/public/modules/app-loop-ui.js

@@ -657,6 +657,8 @@ function renderPreviewModelTab(bodyEl) {
   }
 
   var opts = {
+    effortLevels: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).effortLevels || [],
+    configuration: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).configuration || {},
     models: s.currentModels || [],
     currentModel: _previewLoopSettings.model || "",
     currentMode: _previewLoopSettings.permissionMode || "default",

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

@@ -282,7 +282,7 @@ export function processMessage(msg) {
 
         // Restore accurate context data from the last result in full history
         if (msg.lastUsage || msg.lastModelUsage) {
-          accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens);
+          accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens, msg.context);
         }
         updateContextPanel();
         updateUsagePanel();
@@ -290,6 +290,7 @@ export function processMessage(msg) {
         // the restored turn instead of starting a second answer bubble.
         if (store.get('sessionIsProcessing')) {
           flushStreamBuffer();
+          if (store.get('turnActivity')) setActivity(store.get('turnActivity').phase);
         } else {
           markAllToolsDone();
           finalizeAssistantBlock();
@@ -912,7 +913,7 @@ export function processMessage(msg) {
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
         var _sessionRole = msg.sessionRole === "worker" ? "worker" : "driver";
-        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
+        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, turnActivity: null, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
         handleScheduledTaskSessionSwitched(msg);
         requestLoopInterviewState();
         activateDeliverySession(msg.id, msg.cliSessionId || null, msg.sessionOriginId || null);
@@ -1039,7 +1040,11 @@ export function processMessage(msg) {
         // running session, where history_done keeps current tools active.
         // Question answers, plan feedback and Driver delegations are injected
         // mid-turn, so tools before them may still be running.
-        else if (!msg.askUserAnswer && !msg.planFeedback && !msg.delegated) markAllToolsDone();
+        else if (!msg.askUserAnswer && !msg.planFeedback && !msg.delegated) {
+          markAllToolsDone();
+          // Older histories predate explicit foreground presentation boundaries.
+          finalizeAssistantBlock();
+        }
         resetThinkingGroup();
         if (msg.planContent) {
           setPlanContent(msg.planContent);
@@ -1136,7 +1141,7 @@ export function processMessage(msg) {
           // events make it through.
           removeMatePreThinking();
           if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) && !store.get('matePreThinkingEl')) {
-            setActivity("thinking");
+            setActivity((store.get("turnActivity") || {}).phase || "thinking");
           }
         }
         break;
@@ -1172,8 +1177,24 @@ export function processMessage(msg) {
         }
         break;
 
+      case "turn_activity":
+        if (["waiting", "running", "background"].indexOf(msg.phase) === -1) break;
+        store.set({ turnActivity: { phase: msg.phase, turnId: msg.turnId || null, disposition: msg.disposition || null } });
+        if (!store.get('replayingHistory') && store.get('sessionIsProcessing')) {
+          removeMatePreThinking();
+          setActivity(msg.phase);
+        }
+        break;
+
+      case "assistant_boundary":
+        // Foreground presentation ended; background work still owns its real
+        // terminal. Flush pending animation text without finishing tools/Stop.
+        finalizeAssistantBlock();
+        break;
+
       case "delta":
         if (typeof msg.text !== "string") break;
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         stopThinking();
         setActivity(null);
@@ -1221,6 +1242,8 @@ export function processMessage(msg) {
           renderMcpDebateProposal(msg.id, msg.input);
           startUrgentBlink();
         } else if (msg.name === "AskUserQuestion" && msg.input && msg.input.questions) {
+          store.set({ turnActivity: null });
+          setActivity(null);
           var askTool = getTools()[msg.id];
           if (askTool) {
             if (askTool.el) askTool.el.style.display = "none";
@@ -1301,6 +1324,7 @@ export function processMessage(msg) {
         break;
 
       case "permission_request":
+        store.set({ turnActivity: null });
         setActivity(null);
         renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor, msg);
         startUrgentBlink();
@@ -1317,12 +1341,15 @@ export function processMessage(msg) {
         break;
 
       case "permission_request_pending":
+        store.set({ turnActivity: null });
         setActivity(null);
         renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor, msg);
         startUrgentBlink();
         break;
 
       case "elicitation_request":
+        store.set({ turnActivity: null });
+        setActivity(null);
         renderElicitationRequest(msg);
         startUrgentBlink();
         break;
@@ -1337,6 +1364,8 @@ export function processMessage(msg) {
         break;
 
       case "user_dialog_request":
+        store.set({ turnActivity: null });
+        setActivity(null);
         renderUserDialogRequest(msg);
         startUrgentBlink();
         break;
@@ -1402,7 +1431,7 @@ export function processMessage(msg) {
         finalizeAssistantBlock();
         addTurnMeta(msg.cost, msg.duration);
         accumulateUsage(msg.cost, msg.usage);
-        accumulateContext(msg.cost, msg.usage, msg.modelUsage, msg.lastStreamInputTokens);
+        accumulateContext(msg.cost, msg.usage, msg.modelUsage, msg.lastStreamInputTokens, msg.context);
         break;
 
       case "context_usage":
@@ -1415,6 +1444,7 @@ export function processMessage(msg) {
         break;
 
       case "done":
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();
@@ -1438,6 +1468,7 @@ export function processMessage(msg) {
         break;
 
       case "error":
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();

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

@@ -26,8 +26,7 @@ function getVendorLoginCommand(vendor) {
   var vendors = store.get('vendorInfo') || {};
   var info = vendors[vendor];
   if (info && info.loginCommand) return info.loginCommand;
-  var fallbacks = { codex: "codex login --device-auth", claude: "claude login" };
-  return fallbacks[vendor] || fallbacks.claude;
+  return "";
 }
 
 // --- Pending TUI attention tracking ---