clay-server 2.39.0 → 2.40.0-beta.2

package/lib/claude-hook-installer.js

@@ -24,8 +24,17 @@ var CLAY_HOOK_MARKER = "clay:tui-notify";
 // Allow-patterns Clay manages in ~/.claude/settings.json `permissions.allow`.
 // These mirror sdk-bridge.js `checkToolWhitelist` so TUI sessions get the
 // same auto-approval convenience as SDK sessions. Conservative: only
-// commands that stay safe even under Claude Code's prefix matching (compound
-// commands like `ls && rm -rf /` would otherwise sneak past `Bash(ls:*)`).
+// commands that stay safe even under Claude Code's wildcard matching
+// (compound commands like `ls && rm -rf /` would otherwise sneak past
+// `Bash(ls *)`).
+//
+// Pattern syntax note: claude 2.x uses space-wildcard form `Bash(cmd *)`
+// for prefix matching. The older colon form `Bash(cmd:*)` is flagged as
+// legacy in the CLI and no longer reliably matches argument-bearing
+// commands - the TUI was still prompting for read-only invocations like
+// `ls -la` even with the allow-list installed. Patterns below use the
+// modern form. The bare command (e.g. `Bash(ls)`) is included alongside
+// the wildcard so zero-arg invocations are also covered.
 //
 // User-authored entries are preserved -- on re-install we only strip
 // patterns that appear in this constant list.
@@ -48,46 +57,48 @@ var CLAY_MANAGED_ALLOW = [
   // Safe Bash commands. Match the curated set in sdk-bridge.js's
   // safeBashCommands, restricted to ones whose pure read-only behavior
   // doesn't depend on argument shape.
-  "Bash(ls:*)", "Bash(cat:*)", "Bash(head:*)", "Bash(tail:*)", "Bash(wc:*)",
-  "Bash(file:*)", "Bash(stat:*)", "Bash(find:*)", "Bash(tree:*)",
-  "Bash(du:*)", "Bash(df:*)", "Bash(readlink:*)", "Bash(realpath:*)",
-  "Bash(basename:*)", "Bash(dirname:*)",
-  "Bash(grep:*)", "Bash(rg:*)", "Bash(ag:*)", "Bash(ack:*)",
-  "Bash(fgrep:*)", "Bash(egrep:*)",
-  "Bash(which:*)", "Bash(type:*)", "Bash(whereis:*)",
-  "Bash(echo:*)", "Bash(printf:*)", "Bash(env:*)", "Bash(printenv:*)",
-  "Bash(pwd:*)", "Bash(whoami:*)", "Bash(id:*)", "Bash(groups:*)",
-  "Bash(date:*)", "Bash(uname:*)", "Bash(hostname:*)", "Bash(uptime:*)",
-  "Bash(arch:*)", "Bash(nproc:*)", "Bash(free:*)",
-  "Bash(lsb_release:*)", "Bash(sw_vers:*)", "Bash(locale:*)",
+  "Bash(ls)", "Bash(ls *)", "Bash(cat *)", "Bash(head *)", "Bash(tail *)", "Bash(wc *)",
+  "Bash(file *)", "Bash(stat *)", "Bash(find *)", "Bash(tree)", "Bash(tree *)",
+  "Bash(du *)", "Bash(df)", "Bash(df *)", "Bash(readlink *)", "Bash(realpath *)",
+  "Bash(basename *)", "Bash(dirname *)",
+  "Bash(grep *)", "Bash(rg *)", "Bash(ag *)", "Bash(ack *)",
+  "Bash(fgrep *)", "Bash(egrep *)",
+  "Bash(which *)", "Bash(type *)", "Bash(whereis *)",
+  "Bash(echo)", "Bash(echo *)", "Bash(printf *)", "Bash(env)", "Bash(env *)", "Bash(printenv)", "Bash(printenv *)",
+  "Bash(pwd)", "Bash(whoami)", "Bash(id)", "Bash(id *)", "Bash(groups)", "Bash(groups *)",
+  "Bash(date)", "Bash(date *)", "Bash(uname)", "Bash(uname *)", "Bash(hostname)", "Bash(uptime)",
+  "Bash(arch)", "Bash(nproc)", "Bash(free)", "Bash(free *)",
+  "Bash(lsb_release *)", "Bash(sw_vers)", "Bash(sw_vers *)", "Bash(locale)", "Bash(locale *)",
   // Git read-only subcommands. Listed individually so write subcommands
   // (commit, push, reset, etc.) still prompt.
-  "Bash(git status:*)", "Bash(git log:*)", "Bash(git diff:*)",
-  "Bash(git show:*)", "Bash(git branch:*)", "Bash(git tag:*)",
-  "Bash(git remote:*)", "Bash(git config --get:*)",
-  "Bash(git rev-parse:*)", "Bash(git ls-files:*)",
-  "Bash(git blame:*)", "Bash(git describe:*)",
+  "Bash(git status)", "Bash(git status *)", "Bash(git log)", "Bash(git log *)",
+  "Bash(git diff)", "Bash(git diff *)", "Bash(git show)", "Bash(git show *)",
+  "Bash(git branch)", "Bash(git branch *)", "Bash(git tag)", "Bash(git tag *)",
+  "Bash(git remote)", "Bash(git remote *)", "Bash(git config --get *)",
+  "Bash(git rev-parse *)", "Bash(git ls-files)", "Bash(git ls-files *)",
+  "Bash(git blame *)", "Bash(git describe)", "Bash(git describe *)",
   // Package manager read-only subcommands
-  "Bash(npm list:*)", "Bash(npm ls:*)", "Bash(npm view:*)", "Bash(npm outdated:*)",
-  "Bash(npm config get:*)", "Bash(yarn list:*)", "Bash(pnpm list:*)",
+  "Bash(npm list)", "Bash(npm list *)", "Bash(npm ls)", "Bash(npm ls *)",
+  "Bash(npm view *)", "Bash(npm outdated)", "Bash(npm outdated *)",
+  "Bash(npm config get *)", "Bash(yarn list)", "Bash(yarn list *)", "Bash(pnpm list)", "Bash(pnpm list *)",
   // Version checks
-  "Bash(node --version:*)", "Bash(npm --version:*)", "Bash(python --version:*)",
-  "Bash(python3 --version:*)", "Bash(go version:*)", "Bash(ruby --version:*)",
+  "Bash(node --version)", "Bash(npm --version)", "Bash(python --version)",
+  "Bash(python3 --version)", "Bash(go version)", "Bash(ruby --version)",
   // Text processing (pure stdin/stdout)
-  "Bash(jq:*)", "Bash(yq:*)", "Bash(sort:*)", "Bash(uniq:*)",
-  "Bash(cut:*)", "Bash(tr:*)", "Bash(awk:*)", "Bash(sed:*)",
-  "Bash(paste:*)", "Bash(column:*)", "Bash(rev:*)", "Bash(tac:*)",
-  "Bash(nl:*)", "Bash(fmt:*)", "Bash(comm:*)", "Bash(join:*)",
+  "Bash(jq *)", "Bash(yq *)", "Bash(sort)", "Bash(sort *)", "Bash(uniq)", "Bash(uniq *)",
+  "Bash(cut *)", "Bash(tr *)", "Bash(awk *)", "Bash(sed *)",
+  "Bash(paste *)", "Bash(column *)", "Bash(rev)", "Bash(rev *)", "Bash(tac)", "Bash(tac *)",
+  "Bash(nl)", "Bash(nl *)", "Bash(fmt)", "Bash(fmt *)", "Bash(comm *)", "Bash(join *)",
   // Comparison / hashing (read-only)
-  "Bash(diff:*)", "Bash(cmp:*)", "Bash(md5sum:*)", "Bash(sha256sum:*)",
-  "Bash(sha1sum:*)", "Bash(shasum:*)", "Bash(cksum:*)", "Bash(base64:*)",
-  "Bash(xxd:*)", "Bash(od:*)", "Bash(hexdump:*)",
+  "Bash(diff *)", "Bash(cmp *)", "Bash(md5sum *)", "Bash(sha256sum *)",
+  "Bash(sha1sum *)", "Bash(shasum *)", "Bash(cksum *)", "Bash(base64)", "Bash(base64 *)",
+  "Bash(xxd *)", "Bash(od *)", "Bash(hexdump *)",
   // Calendar / math
-  "Bash(cal:*)", "Bash(bc:*)", "Bash(expr:*)", "Bash(factor:*)", "Bash(seq:*)",
+  "Bash(cal)", "Bash(cal *)", "Bash(bc)", "Bash(bc *)", "Bash(expr *)", "Bash(factor *)", "Bash(seq *)",
   // Process / network introspection (read-only)
-  "Bash(ps:*)", "Bash(top:*)", "Bash(htop:*)", "Bash(pgrep:*)", "Bash(lsof:*)",
-  "Bash(netstat:*)", "Bash(ss:*)", "Bash(ifconfig:*)", "Bash(ip:*)",
-  "Bash(dig:*)", "Bash(nslookup:*)", "Bash(host:*)",
+  "Bash(ps)", "Bash(ps *)", "Bash(top)", "Bash(top *)", "Bash(htop)", "Bash(pgrep *)", "Bash(lsof)", "Bash(lsof *)",
+  "Bash(netstat)", "Bash(netstat *)", "Bash(ss)", "Bash(ss *)", "Bash(ifconfig)", "Bash(ifconfig *)", "Bash(ip *)",
+  "Bash(dig *)", "Bash(nslookup *)", "Bash(host *)",
 ];
 
 function buildHookCommand(notifyUrl) {
@@ -186,11 +197,27 @@ function installNotificationHook(opts) {
   return { installed: installed, errors: errors };
 }
 
+// Pattern shapes Clay used to install in older versions. Listed here so an
+// upgrade can strip them from settings.json before re-installing the modern
+// list. Without this, users who already had Clay running would end up with
+// stale legacy-syntax entries next to the new ones - mostly harmless but
+// noisy, and confusing if anyone reads the file.
+function isLegacyClayPattern(p) {
+  if (typeof p !== "string") return false;
+  // Old colon-prefix Bash patterns: Bash(ls:*), Bash(git status:*), etc.
+  // Modern patterns use space-asterisk and never contain ":*", so this is
+  // a safe identifier for old Clay entries even though it can't tell apart
+  // user-authored colon patterns. The risk is judged acceptable because
+  // claude flags the colon form as legacy and is phasing it out anyway.
+  if (p.indexOf("Bash(") === 0 && p.indexOf(":*)") !== -1) return true;
+  return false;
+}
+
 // Merge Clay's managed allow-list into permissions.allow without disturbing
 // the user's own entries. We identify "ours" by membership in
-// CLAY_MANAGED_ALLOW: re-install strips any existing CLAY_MANAGED_ALLOW
-// patterns, then re-inserts the current list. User-authored patterns
-// survive unchanged because they're never in CLAY_MANAGED_ALLOW.
+// CLAY_MANAGED_ALLOW (current) or isLegacyClayPattern (previous shape):
+// re-install strips both, then re-inserts the current list. User-authored
+// patterns survive unchanged.
 function mergeAllowList(settingsPath, patterns) {
   var data = readSettings(settingsPath);
   if (!data.permissions || typeof data.permissions !== "object") data.permissions = {};
@@ -199,8 +226,13 @@ function mergeAllowList(settingsPath, patterns) {
   var managedSet = {};
   for (var i = 0; i < CLAY_MANAGED_ALLOW.length; i++) managedSet[CLAY_MANAGED_ALLOW[i]] = true;
 
-  // Strip prior Clay-managed entries, then append the fresh list.
-  var preserved = allow.filter(function (p) { return !managedSet[p]; });
+  // Strip prior Clay-managed entries (current shape + legacy colon shape),
+  // then append the fresh list.
+  var preserved = allow.filter(function (p) {
+    if (managedSet[p]) return false;
+    if (isLegacyClayPattern(p)) return false;
+    return true;
+  });
   var next = preserved.concat(patterns);
 
   var before = JSON.stringify(allow);

package/lib/public/app.js

@@ -65,6 +65,7 @@ import { initLoopWizard, openRalphWizard as _loopOpenRalphWizard, closeRalphWiza
 import { initAppNotifications, handleNotificationsState as _notifHandleState, handleNotificationCreated as _notifHandleCreated, handleNotificationDismissed as _notifHandleDismissed, handleNotificationDismissedAll as _notifHandleDismissedAll } from './modules/app-notifications.js';
 import { initWhatsNew, handleWhatsNewState as _wnHandleState, handleWhatsNewSeenResult as _wnHandleSeenResult } from './modules/whats-new.js';
 import { initWhatsNewArticle, openArticle as openWhatsNewArticle } from './modules/whats-new-article.js';
+import { initHeaderTuiFont } from './modules/header-tui-font.js';
 import { createStore, store } from './modules/store.js';
 import { initPanels, updateConfigChip as _panUpdateConfigChip, getModelEffortLevels as _panGetModelEffortLevels, accumulateUsage as _panAccumulateUsage, updateUsagePanel as _panUpdateUsagePanel, resetUsage as _panResetUsage, toggleUsagePanel as _panToggleUsagePanel, formatTokens as _panFormatTokens, updateStatusPanel as _panUpdateStatusPanel, requestProcessStats as _panRequestProcessStats, toggleStatusPanel as _panToggleStatusPanel, accumulateContext as _panAccumulateContext, updateContextPanel as _panUpdateContextPanel, resetContext as _panResetContext, resetContextData as _panResetContextData, minimizeContext as _panMinimizeContext, expandContext as _panExpandContext, toggleContextPanel as _panToggleContextPanel, getContextView as _panGetContextView, renderCtxPopover as _panRenderCtxPopover, hideCtxPopover as _panHideCtxPopover, formatBytes as _panFormatBytes, formatUptime as _panFormatUptime, getModelSupportsEffort as _panGetModelSupportsEffort, getSessionUsage, setSessionUsage, getContextData, setContextData, setContextView as _panSetContextView, applyContextView as _panApplyContextView } from './modules/app-panels.js';
 import { initProjects, updateProjectList as _projUpdateProjectList, renderProjectList as _projRenderProjectList, renderTopbarPresence as _projRenderTopbarPresence, switchProject as _projSwitchProject, resetClientState as _projResetClientState, confirmRemoveProject as _projConfirmRemoveProject, handleRemoveProjectCheckResult as _projHandleRemoveProjectCheckResult, handleRemoveProjectResult as _projHandleRemoveProjectResult, openAddProjectModal as _projOpenAddProjectModal, closeAddProjectModal as _projCloseAddProjectModal, handleBrowseDirResult as _projHandleBrowseDirResult, handleAddProjectResult as _projHandleAddProjectResult, handleCloneProgress as _projHandleCloneProgress, showUpdateAvailable as _projShowUpdateAvailable, getCachedProjects, setCachedProjects, getCachedProjectCount, getCachedRemovedProjects, setCachedRemovedProjects } from './modules/app-projects.js';
@@ -604,6 +605,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Panels module ---
   initPanels();
 
+  // --- Header TUI font controls (visible only when TUI session active) ---
+  initHeaderTuiFont();
+
   // --- Rendering module ---
   initRendering();
 

package/lib/public/css/menus.css

@@ -544,6 +544,27 @@
 .config-radio-item:hover { background: rgba(var(--overlay-rgb),0.05); color: var(--text); }
 .config-radio-item.active { color: var(--accent); font-weight: 600; }
 
+/* Locked picker items (Codex GUI sessions after the first message: model
+   is bound to the thread, picks would be silently ignored). Active model
+   stays slightly more legible so the user can still see which one's live. */
+.config-radio-item.locked {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+.config-radio-item.locked:hover {
+  background: transparent;
+  color: var(--text-secondary);
+}
+.config-radio-item.locked.active {
+  opacity: 0.85;
+}
+.config-model-hint {
+  padding: 4px 14px 10px;
+  font-size: 11px;
+  color: var(--text-dimmer);
+  font-style: italic;
+}
+
 /* Segmented control for effort */
 .config-segmented {
   display: flex;

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

@@ -358,6 +358,42 @@
     background: rgba(var(--overlay-rgb), 0.06);
   }
 
+  /* Vendor-split row: Claude + Codex side-by-side. Used inside
+     renderMobileSessionsInto so users can pick the vendor on mobile, the
+     same way the desktop sidebar already does. */
+  .mobile-session-new-row {
+    display: flex;
+    gap: 6px;
+    padding: 6px 8px 8px;
+    border-bottom: 1px solid var(--border-subtle);
+  }
+
+  .mobile-session-new-row .mobile-session-new-vendor {
+    flex: 1 1 0;
+    width: auto;
+    margin-bottom: 0;
+    padding: 10px 12px;
+    border: 1px solid var(--border-subtle);
+    border-radius: 8px;
+    background: rgba(var(--overlay-rgb), 0.03);
+    color: var(--text);
+    justify-content: center;
+    gap: 8px;
+  }
+  .mobile-session-new-row .mobile-session-new-vendor:last-of-type {
+    border-bottom: 1px solid var(--border-subtle);
+  }
+  .mobile-session-new-row .mobile-session-new-vendor:active {
+    background: rgba(var(--overlay-rgb), 0.1);
+  }
+  .mobile-session-new-icon {
+    width: 18px;
+    height: 18px;
+    flex-shrink: 0;
+    border-radius: 4px;
+    object-fit: cover;
+  }
+
   /* --- Chat filter bar (horizontal scroll chips) --- */
   .mobile-chat-filter-bar {
     display: flex;

package/lib/public/css/user-settings.css

@@ -860,45 +860,157 @@
   }
 }
 
-/* Terminal font picker row */
-.us-term-font-row {
+/* Header TUI font icon button - single trigger that opens a popover
+   with the full font picker + size stepper. Visible only when a TUI
+   session is active. Matches the title-bar icon button tone used by
+   #terminal-toggle-btn / #find-in-session-btn / #debate-pdf-btn so
+   it blends into the toolbar instead of looking like a raw button. */
+.header-tui-font-btn {
   display: flex;
   align-items: center;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-.us-term-font-family {
-  flex: 1 1 auto;
-  min-width: 180px;
-  padding: 7px 10px;
-  border: 1px solid var(--border);
+  justify-content: center;
+  background: none;
+  border: 1px solid transparent;
   border-radius: 8px;
-  background: var(--input-bg);
+  color: var(--text-dimmer);
+  cursor: pointer;
+  padding: 4px;
+  transition: color 0.15s, background 0.15s, border-color 0.15s;
+}
+.header-tui-font-btn .lucide { width: 15px; height: 15px; }
+.header-tui-font-btn:hover {
+  color: var(--text-secondary);
+  background: rgba(var(--overlay-rgb), 0.04);
+  border-color: var(--border);
+}
+.header-tui-font-btn.active {
   color: var(--text);
-  font-size: 13px;
+  background: rgba(var(--overlay-rgb), 0.06);
+  border-color: var(--border);
 }
-.us-term-font-custom {
-  flex: 1 1 100%;
-  padding: 7px 10px;
+.header-tui-font-btn.hidden { display: none; }
+
+/* Floating popover that holds the font menu + size row. Anchored
+   under the title-bar button via JS positioning. */
+.header-tui-font-popover {
+  position: fixed;
+  min-width: 220px;
+  max-height: 70vh;
+  overflow-y: auto;
+  padding: 8px;
+  background: var(--bg-alt);
   border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--input-bg);
-  color: var(--text);
-  font-size: 13px;
-  font-family: "Roboto Mono", monospace;
+  border-radius: 10px;
+  box-shadow: 0 8px 28px rgba(var(--shadow-rgb), 0.45);
+  z-index: 200;
+  opacity: 0;
+  transform: translateY(-4px);
+  pointer-events: none;
+  transition: opacity 0.12s ease, transform 0.12s ease;
+}
+.header-tui-font-popover.visible {
+  opacity: 1;
+  transform: translateY(0);
+  pointer-events: auto;
+}
+.header-tui-font-popover-label {
+  padding: 4px 8px 6px;
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--text-dimmer);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
 }
-.us-term-font-custom.hidden { display: none; }
-.us-term-font-size {
-  width: 64px;
+.header-tui-font-popover-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+}
+.header-tui-font-popover-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
   padding: 7px 10px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--input-bg);
+  border: none;
+  background: transparent;
   color: var(--text);
   font-size: 13px;
-  text-align: center;
+  text-align: left;
+  cursor: pointer;
+  border-radius: 6px;
+}
+.header-tui-font-popover-item:hover {
+  background: rgba(var(--overlay-rgb), 0.06);
+}
+.header-tui-font-popover-check {
+  display: inline-flex;
+  width: 14px;
+  height: 14px;
+  align-items: center;
+  justify-content: center;
+  color: var(--accent);
+  opacity: 0;
+  flex-shrink: 0;
+}
+.header-tui-font-popover-item.active .header-tui-font-popover-check { opacity: 1; }
+.header-tui-font-popover-item-label {
+  flex: 1 1 auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.header-tui-font-popover-divider {
+  height: 1px;
+  background: var(--border-subtle);
+  margin: 6px 4px;
+}
+.header-tui-font-popover-size {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 4px 10px 4px;
 }
-.us-term-font-unit {
+.header-tui-font-popover-size-label {
   font-size: 13px;
-  color: var(--text-dimmer);
+  color: var(--text-secondary);
+}
+.header-tui-font-popover-size-stepper {
+  display: inline-flex;
+  align-items: center;
+  height: 26px;
+  border: 1px solid var(--border-subtle);
+  border-radius: 6px;
+  overflow: hidden;
+}
+.header-tui-font-popover-size-stepper button {
+  width: 26px;
+  height: 24px;
+  border: none;
+  background: transparent;
+  color: var(--text-secondary);
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+}
+.header-tui-font-popover-size-stepper button:hover {
+  background: rgba(var(--overlay-rgb), 0.06);
+  color: var(--text);
+}
+.header-tui-font-popover-size-stepper button:disabled {
+  opacity: 0.35;
+  cursor: default;
+}
+.header-tui-font-popover-size-val {
+  min-width: 28px;
+  text-align: center;
+  font-size: 12px;
+  color: var(--text);
+  font-variant-numeric: tabular-nums;
+  user-select: none;
 }

package/lib/public/index.html

@@ -18,6 +18,10 @@
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@400;500;700&family=Nunito:wght@700;800&display=swap" rel="stylesheet">
+<!-- Monospace web fonts used by the TUI font picker in the title bar.
+     SF Mono is Apple-system-only (no Google Fonts entry) and
+     ui-monospace is a system keyword - both rely on the user's OS. -->
+<link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;700&family=Fira+Code:wght@400;500;700&family=Cascadia+Code:wght@400;500;700&family=IBM+Plex+Mono:wght@400;500;700&family=Source+Code+Pro:wght@400;500;700&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@xterm/xterm@5/css/xterm.min.css">
 <script>
 (function(){try{var k="clay-theme-vars",v=localStorage.getItem(k),r=document.documentElement;if(v){var o=JSON.parse(v),p;for(p in o)r.style.setProperty(p,o[p]);var vt=localStorage.getItem(k.replace("-vars","-variant"));if(vt==="light"){r.classList.add("light-theme");r.classList.remove("dark-theme")}else{r.classList.add("dark-theme");r.classList.remove("light-theme")}var m=document.querySelector('meta[name="theme-color"]');if(m&&o["--bg"])m.setAttribute("content",o["--bg"])}else{var sl=window.matchMedia&&window.matchMedia("(prefers-color-scheme: light)").matches;if(sl){r.classList.add("light-theme");r.classList.remove("dark-theme")}}}catch(e){}})();
@@ -367,6 +371,9 @@
         <div id="ralph-sticky" class="hidden"></div>
         <div id="debate-sticky" class="hidden"></div>
         <div class="status">
+          <button type="button" id="header-tui-font-btn" class="header-tui-font-btn hidden" title="Terminal font" aria-label="Terminal font">
+            <i data-lucide="type"></i>
+          </button>
           <button id="debate-pdf-btn" class="hidden" title="Export debate as PDF"><i data-lucide="download"></i></button>
           <button id="find-in-session-btn" title="Search in session (Ctrl+F)"><i data-lucide="search"></i></button>
           <button id="terminal-toggle-btn" title="Terminal"><i data-lucide="square-terminal"></i><span id="terminal-count" class="hidden"></span></button>
@@ -1001,25 +1008,6 @@
         <!-- Appearance section -->
         <div class="us-section" data-section="us-appearance">
           <h2>Appearance</h2>
-          <div class="settings-card">
-            <div class="settings-label" style="margin-bottom:10px;">Terminal font</div>
-            <div class="us-term-font-row">
-              <select id="us-term-font-family" class="us-term-font-family">
-                <option value="'SF Mono', Menlo, Monaco, 'Courier New', monospace">SF Mono / Menlo (default)</option>
-                <option value="'JetBrains Mono', 'SF Mono', Menlo, monospace">JetBrains Mono</option>
-                <option value="'Fira Code', 'SF Mono', Menlo, monospace">Fira Code</option>
-                <option value="'Cascadia Code', 'SF Mono', Menlo, monospace">Cascadia Code</option>
-                <option value="'IBM Plex Mono', 'SF Mono', Menlo, monospace">IBM Plex Mono</option>
-                <option value="'Source Code Pro', 'SF Mono', Menlo, monospace">Source Code Pro</option>
-                <option value="'Roboto Mono', 'SF Mono', Menlo, monospace">Roboto Mono</option>
-                <option value="ui-monospace, monospace">System monospace</option>
-                <option value="__custom__">Custom...</option>
-              </select>
-              <input type="text" id="us-term-font-family-custom" class="us-term-font-custom hidden" placeholder="e.g. 'My Font', monospace" maxlength="200">
-              <input type="number" id="us-term-font-size" class="us-term-font-size" min="9" max="32" step="1">
-              <span class="us-term-font-unit">px</span>
-            </div>
-          </div>
           <div class="settings-card">
             <div class="settings-label" style="margin-bottom:10px;">Chat layout</div>
             <div class="layout-switcher" id="us-layout-switcher">

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

@@ -168,10 +168,17 @@ export function processMessage(msg) {
         if (!store.get('sessionIsProcessing')) {
           applyDeadSessionTodoCompaction();
         }
-        // Hide vendor toggle if session has history (vendor already locked)
+        // Show the locked vendor toggle only when history exists AND the
+        // vendor isn't already committed. With a committed vendor,
+        // session_switched has already hidden the toggle and shown the
+        // small #active-vendor-indicator; re-showing the locked toggle
+        // here would duplicate the avatar next to the indicator.
         var _hTotal = store.get('historyTotal') || 0;
         var _vtw2 = document.getElementById("vendor-toggle-wrap");
-        if (_vtw2 && _hTotal > 0) { _vtw2.classList.remove("hidden"); _vtw2.classList.add("locked"); }
+        if (_vtw2 && _hTotal > 0 && !store.get('currentVendor')) {
+          _vtw2.classList.remove("hidden");
+          _vtw2.classList.add("locked");
+        }
         // Restore cached rich context usage BEFORE updateContextPanel runs
         if (msg.contextUsage) {
           store.set({ richContextUsage: msg.contextUsage });

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

@@ -108,6 +108,7 @@ var CODEX_WEBSEARCH_OPTIONS = [
 var KNOWN_CONTEXT_WINDOWS = {
   "opus-4-6": 1000000,
   "claude-sonnet-4": 1000000,
+  "gpt-5.5": 1048576,
   "gpt-5.4": 1048576,
   "gpt-5.3": 1048576,
   "gpt-5.2": 1048576,
@@ -176,16 +177,27 @@ function hasBeta(name) {
 
 function rebuildModelList() {
   if (!configModelList) return;
-  // GUI chat sessions have their model bound at creation time (picked from
-  // the new-session config before the first message). Showing a picker
-  // inside the chat is misleading: changing it mid-thread breaks tool
-  // schemas and cache reuse. Hide the entire MODEL section in GUI mode.
+  // Picker visibility by vendor+mode:
+  //   Claude TUI -> shown (Claude TUI accepts mid-thread model swaps).
+  //   Claude GUI -> hidden (Agent SDK binds model at session creation;
+  //                 changing mid-thread breaks tool schemas and cache reuse).
+  //   Codex GUI  -> shown but locked after the first message (Codex protocol
+  //                 binds model at thread creation; sdk-bridge setModel
+  //                 already stores into sm.currentModel when there's no
+  //                 active queryInstance, so picks made before the first
+  //                 message do take effect on thread start).
   var modelSection = configModelList.parentElement;
   var s = store.snap();
-  var hideModelPicker = s.activeSessionMode === "gui";
+  var vendor = s.currentVendor || "claude";
+  var hideModelPicker = s.activeSessionMode === "gui" && vendor === "claude";
   if (modelSection) modelSection.style.display = hideModelPicker ? "none" : "";
   configModelList.innerHTML = "";
   if (hideModelPicker) return;
+
+  var lockedForCodex = vendor === "codex"
+    && s.activeSessionMode === "gui"
+    && !!s.sessionHasHistory;
+
   var list = s.currentModels.length > 0 ? s.currentModels : (s.currentModel ? [{ value: s.currentModel, displayName: s.currentModel }] : []);
   for (var i = 0; i < list.length; i++) {
     var item = list[i];
@@ -195,19 +207,32 @@ function rebuildModelList() {
     var btn = document.createElement("button");
     btn.className = "config-radio-item";
     if (value === s.currentModel) btn.classList.add("active");
+    if (lockedForCodex) btn.classList.add("locked");
     btn.dataset.model = value;
     btn.textContent = label;
-    btn.addEventListener("click", function () {
-      var model = this.dataset.model;
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify({ type: "set_model", model: model }));
-      }
-      configPopover.classList.add("hidden");
-      configChip.classList.remove("active");
-    });
+    if (lockedForCodex) {
+      btn.disabled = true;
+      btn.title = "Model is locked after the first message in a Codex session. Start a new session to change it.";
+    } else {
+      btn.addEventListener("click", function () {
+        var model = this.dataset.model;
+        var ws = getWs();
+        if (ws && ws.readyState === 1) {
+          ws.send(JSON.stringify({ type: "set_model", model: model }));
+        }
+        configPopover.classList.add("hidden");
+        configChip.classList.remove("active");
+      });
+    }
     configModelList.appendChild(btn);
   }
+
+  if (lockedForCodex) {
+    var hint = document.createElement("div");
+    hint.className = "config-model-hint";
+    hint.textContent = "Locked after first message — start a new session to change.";
+    configModelList.appendChild(hint);
+  }
 }
 
 function rebuildModeList() {

package/lib/public/modules/header-tui-font.js

@@ -0,0 +1,233 @@
+// header-tui-font.js
+//
+// Single icon button in the title bar (visible only while a TUI session
+// is active) that opens a popover with terminal font settings: family
+// picker (with per-item font preview) + size stepper. Values live in
+// terminal-prefs.js and persist server-side via
+// PUT /api/user/terminal-font.
+
+import {
+  applyTerminalFont,
+  getTerminalFontFamily,
+  getTerminalFontSize,
+  onTerminalFontChange,
+} from './terminal-prefs.js';
+
+var FONT_OPTIONS = [
+  { label: "SF Mono",         family: "'SF Mono', Menlo, Monaco, 'Courier New', monospace" },
+  { label: "JetBrains Mono",  family: "'JetBrains Mono', 'SF Mono', Menlo, monospace" },
+  { label: "Fira Code",       family: "'Fira Code', 'SF Mono', Menlo, monospace" },
+  { label: "Cascadia Code",   family: "'Cascadia Code', 'SF Mono', Menlo, monospace" },
+  { label: "IBM Plex Mono",   family: "'IBM Plex Mono', 'SF Mono', Menlo, monospace" },
+  { label: "Source Code Pro", family: "'Source Code Pro', 'SF Mono', Menlo, monospace" },
+  { label: "Roboto Mono",     family: "'Roboto Mono', 'SF Mono', Menlo, monospace" },
+  { label: "System mono",     family: "ui-monospace, monospace" },
+];
+
+var MIN_SIZE = 9;
+var MAX_SIZE = 32;
+
+var btnEl = null;
+var popoverEl = null;
+var sizeValEl = null;
+var sizeDecEl = null;
+var sizeIncEl = null;
+var menuItemEls = [];
+var popoverOpen = false;
+var outsideHandler = null;
+var keyHandler = null;
+var initialized = false;
+
+function escapeHtml(s) {
+  return String(s)
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;');
+}
+
+function persistTermFont(family, size) {
+  fetch('/api/user/terminal-font', {
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ family: family, size: size }),
+  }).catch(function () {});
+}
+
+function syncSize() {
+  if (!sizeValEl) return;
+  var sz = getTerminalFontSize();
+  sizeValEl.textContent = String(sz);
+  if (sizeDecEl) sizeDecEl.disabled = sz <= MIN_SIZE;
+  if (sizeIncEl) sizeIncEl.disabled = sz >= MAX_SIZE;
+}
+
+function syncActiveFamily() {
+  var fam = getTerminalFontFamily();
+  for (var i = 0; i < menuItemEls.length; i++) {
+    var el = menuItemEls[i];
+    el.classList.toggle('active', el.dataset.family === fam);
+  }
+}
+
+function buildPopover() {
+  if (popoverEl) return popoverEl;
+  popoverEl = document.createElement('div');
+  popoverEl.className = 'header-tui-font-popover';
+
+  var label = document.createElement('div');
+  label.className = 'header-tui-font-popover-label';
+  label.textContent = 'Font';
+  popoverEl.appendChild(label);
+
+  var list = document.createElement('div');
+  list.className = 'header-tui-font-popover-list';
+  for (var i = 0; i < FONT_OPTIONS.length; i++) {
+    var opt = FONT_OPTIONS[i];
+    var item = document.createElement('button');
+    item.type = 'button';
+    item.className = 'header-tui-font-popover-item';
+    item.dataset.family = opt.family;
+    item.style.fontFamily = opt.family;
+    item.innerHTML =
+      '<span class="header-tui-font-popover-check"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"></polyline></svg></span>' +
+      '<span class="header-tui-font-popover-item-label">' + escapeHtml(opt.label) + '</span>';
+    (function (family) {
+      item.addEventListener('click', function (e) {
+        e.stopPropagation();
+        applyTerminalFont(family, undefined);
+        persistTermFont(family, undefined);
+      });
+    })(opt.family);
+    list.appendChild(item);
+    menuItemEls.push(item);
+  }
+  popoverEl.appendChild(list);
+
+  var divider = document.createElement('div');
+  divider.className = 'header-tui-font-popover-divider';
+  popoverEl.appendChild(divider);
+
+  var sizeRow = document.createElement('div');
+  sizeRow.className = 'header-tui-font-popover-size';
+  sizeRow.innerHTML =
+    '<span class="header-tui-font-popover-size-label">Size</span>' +
+    '<div class="header-tui-font-popover-size-stepper">' +
+      '<button type="button" data-step="-1" title="Smaller">−</button>' +
+      '<span class="header-tui-font-popover-size-val">13</span>' +
+      '<button type="button" data-step="1" title="Larger">+</button>' +
+    '</div>';
+  popoverEl.appendChild(sizeRow);
+
+  sizeValEl = sizeRow.querySelector('.header-tui-font-popover-size-val');
+  var stepBtns = sizeRow.querySelectorAll('button');
+  sizeDecEl = stepBtns[0];
+  sizeIncEl = stepBtns[1];
+  sizeDecEl.addEventListener('click', function (e) {
+    e.stopPropagation();
+    var next = Math.max(MIN_SIZE, getTerminalFontSize() - 1);
+    applyTerminalFont(undefined, next);
+    persistTermFont(undefined, next);
+  });
+  sizeIncEl.addEventListener('click', function (e) {
+    e.stopPropagation();
+    var next = Math.min(MAX_SIZE, getTerminalFontSize() + 1);
+    applyTerminalFont(undefined, next);
+    persistTermFont(undefined, next);
+  });
+
+  document.body.appendChild(popoverEl);
+  return popoverEl;
+}
+
+function positionPopover() {
+  if (!popoverEl || !btnEl) return;
+  var r = btnEl.getBoundingClientRect();
+  popoverEl.style.left = '0px';
+  popoverEl.style.top = '0px';
+  var pw = popoverEl.offsetWidth || 220;
+  var ph = popoverEl.offsetHeight || 340;
+  var vw = window.innerWidth;
+  var vh = window.innerHeight;
+  var left = r.right - pw;
+  if (left < 8) left = 8;
+  if (left + pw > vw - 8) left = vw - pw - 8;
+  var top = r.bottom + 8;
+  if (top + ph > vh - 8) {
+    var flipped = r.top - ph - 8;
+    if (flipped >= 8) top = flipped;
+    else top = Math.max(8, vh - ph - 8);
+  }
+  popoverEl.style.left = left + 'px';
+  popoverEl.style.top = top + 'px';
+}
+
+function openPopover() {
+  if (popoverOpen) return;
+  buildPopover();
+  syncActiveFamily();
+  syncSize();
+  popoverEl.classList.add('visible');
+  positionPopover();
+  popoverOpen = true;
+  if (btnEl) btnEl.classList.add('active');
+
+  outsideHandler = function (ev) {
+    if (!popoverEl) return;
+    if (popoverEl.contains(ev.target)) return;
+    if (btnEl && btnEl.contains(ev.target)) return;
+    closePopover();
+  };
+  document.addEventListener('mousedown', outsideHandler, true);
+
+  keyHandler = function (ev) {
+    if (ev.key === 'Escape') closePopover();
+  };
+  document.addEventListener('keydown', keyHandler, true);
+}
+
+function closePopover() {
+  if (!popoverOpen) return;
+  if (popoverEl) popoverEl.classList.remove('visible');
+  if (btnEl) btnEl.classList.remove('active');
+  popoverOpen = false;
+  if (outsideHandler) {
+    document.removeEventListener('mousedown', outsideHandler, true);
+    outsideHandler = null;
+  }
+  if (keyHandler) {
+    document.removeEventListener('keydown', keyHandler, true);
+    keyHandler = null;
+  }
+}
+
+export function initHeaderTuiFont() {
+  if (initialized) return;
+  btnEl = document.getElementById('header-tui-font-btn');
+  if (!btnEl) return;
+  btnEl.addEventListener('click', function (e) {
+    e.stopPropagation();
+    if (popoverOpen) closePopover();
+    else openPopover();
+  });
+  // Reflect external changes back into the popover (re-renders only if
+  // it's currently open).
+  onTerminalFontChange(function () {
+    if (popoverOpen) {
+      syncActiveFamily();
+      syncSize();
+    }
+  });
+  initialized = true;
+}
+
+export function showHeaderTuiFont() {
+  if (!btnEl) return;
+  btnEl.classList.remove('hidden');
+}
+
+export function hideHeaderTuiFont() {
+  closePopover();
+  if (!btnEl) return;
+  btnEl.classList.add('hidden');
+}

package/lib/public/modules/input.js

@@ -260,10 +260,36 @@ export function sendMessage() {
   if (_selVendor) payload.vendor = _selVendor;
   ctx.ws.send(JSON.stringify(payload));
 
-  // Hide vendor toggle after first message (vendor is locked to this session)
+  // First message commits the vendor and bumps the session into
+  // has-history state. The server won't re-fire session_switched after a
+  // message, so mirror the vendor-toggle/active-indicator swap locally:
+  // hide the picker, show the small avatar next to the config chip.
+  // Bumping sessionHasHistory drives in-session lock states (e.g. the
+  // Codex model picker that becomes informational once the thread is
+  // bound to a model).
+  var _committedVendor = store.get('currentVendor');
   var _vtw2 = document.getElementById("vendor-toggle-wrap");
-  if (_vtw2) { _vtw2.classList.remove("hidden"); _vtw2.classList.add("locked"); }
-  store.set({ vendorSelectionLocked: false });
+  var _avi = document.getElementById("active-vendor-indicator");
+  var _avIcon = document.getElementById("active-vendor-icon");
+  if (_committedVendor) {
+    if (_vtw2) {
+      _vtw2.classList.add("hidden");
+      _vtw2.classList.remove("locked");
+    }
+    if (_avi && _avIcon) {
+      _avIcon.src = _committedVendor === "codex" ? "/codex-avatar.png" : "/claude-code-avatar.png";
+      _avIcon.alt = _committedVendor === "codex" ? "Codex" : "Claude";
+      _avi.title = (_committedVendor === "codex" ? "Codex" : "Claude") + " session";
+      _avi.classList.remove("hidden");
+    }
+  } else if (_vtw2) {
+    // No committed vendor (defensive — shouldn't happen because the
+    // input is otherwise gated on a vendor pick). Fall back to the
+    // locked toggle so the running vendor is still visible.
+    _vtw2.classList.remove("hidden");
+    _vtw2.classList.add("locked");
+  }
+  store.set({ vendorSelectionLocked: false, sessionHasHistory: true });
 
   // Show pre-thinking dots before server responds
   if (ctx.isMateDm && ctx.isMateDm()) {

package/lib/public/modules/profile.js

@@ -6,6 +6,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { setSTTLang } from './stt.js';
 import { avatarUrl, mateAvatarUrl, AVATAR_STYLES } from './avatar.js';
 import { store } from './store.js';
+import { applyTerminalFont } from './terminal-prefs.js';
 
 var ctx;
 var profile = { name: '', lang: 'en-US', avatarStyle: 'thumbs', avatarSeed: '', avatarColor: '#7c3aed', avatarCustom: '' };
@@ -579,6 +580,14 @@ export function initProfile(_ctx) {
       setSTTLang(profile.lang);
     }
 
+    // Hydrate terminal font prefs at boot. Previously this only happened
+    // when the user opened the Settings modal (user-settings.js's
+    // populateAccount), so a hard refresh would drop persisted picks back
+    // to defaults until the modal was visited.
+    if (data.terminalFont && typeof data.terminalFont === "object") {
+      applyTerminalFont(data.terminalFont.family, data.terminalFont.size);
+    }
+
     // Apply Mates UI gate at boot so the sidebar avatars / DM picker
     // entry / home-hub strip are hidden before the user opens settings.
     // Default true: only flip the body class off when explicitly false.

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

@@ -18,6 +18,7 @@ import { getWs } from './ws-ref.js';
 import { store } from './store.js';
 import { getTerminalTheme } from './theme.js';
 import { getTerminalFontFamily, getTerminalFontSize, onTerminalFontChange } from './terminal-prefs.js';
+import { showHeaderTuiFont, hideHeaderTuiFont } from './header-tui-font.js';
 import { openArticle as openWhatsNewArticle } from './whats-new-article.js';
 
 // Stable id of the canonical "Why TUI mode?" article in
@@ -303,7 +304,10 @@ function fitNow() {
   if (!xterm || !fitAddon || !hostEl) return;
   syncHostBounds();
   try {
+    var prevCols = xterm.cols;
+    var prevRows = xterm.rows;
     fitAddon.fit();
+    var dimsChanged = (xterm.cols !== prevCols || xterm.rows !== prevRows);
     // Inform the server so its PTY's idea of cols/rows matches what xterm
     // just rendered. Without this, claude TUI redraws using stale dims.
     if (currentTermId != null && getWs() && getWs().readyState === 1) {
@@ -314,6 +318,14 @@ function fitNow() {
         rows: xterm.rows,
       }));
     }
+    // After cols/rows change, the previous frame in xterm's buffer is now
+    // reflowed/truncated against the new geometry. Claude TUI (ink) repaints
+    // using absolute cursor positioning and only writes cells it considers
+    // dirty - cells outside the old bounding box stay showing stale or empty
+    // content (the "right half is blank after window enlarges" symptom).
+    // Wipe the screen here so the next SIGWINCH-driven redraw lands on a
+    // clean canvas.
+    if (dimsChanged) xterm.write("\x1b[2J\x1b[H");
   } catch (e) {}
 }
 
@@ -377,6 +389,7 @@ export function attachTuiView(terminalId) {
   if (currentTermId === terminalId && xterm) {
     if (hostEl) hostEl.style.display = "flex";
     hideGuiChrome(true);
+    showHeaderTuiFont();
     fitNow();
     try { xterm.focus(); } catch (e) {}
     return;
@@ -388,6 +401,7 @@ export function attachTuiView(terminalId) {
   if (!ensureHostEl()) return;
   hostEl.style.display = "flex";
   hideGuiChrome(true);
+  showHeaderTuiFont();
   syncHostBounds();
 
   currentTermId = terminalId;
@@ -437,6 +451,7 @@ export function detachTuiView() {
   teardownXterm();
   if (hostEl) hostEl.style.display = "none";
   hideGuiChrome(false);
+  hideHeaderTuiFont();
 }
 
 // Route a term_output frame to the embedded xterm if it belongs to the

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

@@ -698,16 +698,35 @@ function renderMateMobileActions(container) {
 
 // Helper: render sorted sessions into a container with date groups (with loop session grouping)
 function renderMobileSessionsInto(container) {
-  var newBtn = document.createElement("button");
-  newBtn.className = "mobile-session-new";
-  newBtn.innerHTML = '<i data-lucide="plus" style="width:16px;height:16px"></i> New session';
-  newBtn.addEventListener("click", function () {
+  // Vendor-aware new-session row. Mirrors the desktop sidebar's two-button
+  // pattern (Claude defaults to TUI, Codex always GUI) so mobile users can
+  // pick the vendor instead of being silently routed to Claude TUI.
+  var newRow = document.createElement("div");
+  newRow.className = "mobile-session-new-row";
+
+  var claudeBtn = document.createElement("button");
+  claudeBtn.className = "mobile-session-new mobile-session-new-vendor";
+  claudeBtn.innerHTML = '<img src="/claude-code-avatar.png" class="mobile-session-new-icon" alt=""><span>Claude</span>';
+  claudeBtn.addEventListener("click", function () {
     if (getWs() && store.get('connected')) {
-      getWs().send(JSON.stringify({ type: "new_session" }));
+      getWs().send(JSON.stringify({ type: "new_session", vendor: "claude", mode: "tui" }));
     }
     closeMobileSheet();
   });
-  container.appendChild(newBtn);
+  newRow.appendChild(claudeBtn);
+
+  var codexBtn = document.createElement("button");
+  codexBtn.className = "mobile-session-new mobile-session-new-vendor";
+  codexBtn.innerHTML = '<img src="/codex-avatar.png" class="mobile-session-new-icon" alt=""><span>Codex</span>';
+  codexBtn.addEventListener("click", function () {
+    if (getWs() && store.get('connected')) {
+      getWs().send(JSON.stringify({ type: "new_session", vendor: "codex" }));
+    }
+    closeMobileSheet();
+  });
+  newRow.appendChild(codexBtn);
+
+  container.appendChild(newRow);
 
   // Partition: loop sessions vs normal sessions (same logic as desktop renderSessionList)
   var sessions = getCachedSessions();

package/lib/public/modules/user-settings.js

@@ -4,7 +4,7 @@
 import { refreshIcons } from './icons.js';
 import { showToast } from './utils.js';
 import { getChatLayout, setChatLayout } from './theme.js';
-import { applyTerminalFont, getTerminalFontFamily, getTerminalFontSize } from './terminal-prefs.js';
+import { applyTerminalFont } from './terminal-prefs.js';
 import { showEmailSetupModal, getEmailAccountListCache } from './context-sources.js';
 import { setSTTLang } from './stt.js';
 import { userAvatarUrl } from './avatar.js';
@@ -234,47 +234,10 @@ export function initUserSettings(appCtx) {
   // Theme picker lives on the user island button now (palette icon).
   // No appearance-section mount required.
 
-  // Terminal font: family select + optional custom input + size number.
-  // Saves to server on change and immediately applies to every open
-  // xterm via applyTerminalFont (terminal-prefs.js fanout).
-  var tfSelect = document.getElementById('us-term-font-family');
-  var tfCustom = document.getElementById('us-term-font-family-custom');
-  var tfSize = document.getElementById('us-term-font-size');
-
-  function persistTermFont(family, size) {
-    fetch('/api/user/terminal-font', {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ family: family, size: size }),
-    }).catch(function () {});
-  }
-
-  if (tfSelect && tfCustom && tfSize) {
-    tfSelect.addEventListener('change', function () {
-      if (tfSelect.value === '__custom__') {
-        tfCustom.classList.remove('hidden');
-        tfCustom.focus();
-        return;
-      }
-      tfCustom.classList.add('hidden');
-      applyTerminalFont(tfSelect.value, undefined);
-      persistTermFont(tfSelect.value, undefined);
-    });
-    tfCustom.addEventListener('change', function () {
-      var v = tfCustom.value.trim();
-      if (!v) return;
-      applyTerminalFont(v, undefined);
-      persistTermFont(v, undefined);
-    });
-    tfSize.addEventListener('change', function () {
-      var n = Number(tfSize.value);
-      if (!isFinite(n)) return;
-      n = Math.max(9, Math.min(32, Math.round(n)));
-      tfSize.value = String(n);
-      applyTerminalFont(undefined, n);
-      persistTermFont(undefined, n);
-    });
-  }
+  // Terminal font picker lives in the title bar (visible only while a
+  // TUI session is active). See lib/public/modules/header-tui-font.js.
+  // We still seed terminal-prefs from /api/profile below so the
+  // controls populate correctly when they appear.
 
   // Layout switcher (Bubble / Channel)
   var layoutSwitcher = document.getElementById('us-layout-switcher');
@@ -489,32 +452,12 @@ function populateAccount() {
     // Hide account section in single-user mode (no username)
     var accountNav = settingsEl.querySelector('[data-section="us-account"]');
     if (accountNav) accountNav.style.display = data.username ? '' : 'none';
-    // Terminal font: seed in-memory prefs from server, populate inputs.
+    // Terminal font: seed in-memory prefs from server. Header-mounted
+    // controls (header-tui-font.js) listen to applyTerminalFont and
+    // sync their UI - we don't touch any DOM here.
     if (data.terminalFont && typeof data.terminalFont === "object") {
       applyTerminalFont(data.terminalFont.family, data.terminalFont.size);
     }
-    var tfSelectEl = document.getElementById('us-term-font-family');
-    var tfCustomEl = document.getElementById('us-term-font-family-custom');
-    var tfSizeEl = document.getElementById('us-term-font-size');
-    if (tfSelectEl && tfCustomEl) {
-      var fam = getTerminalFontFamily();
-      var matched = false;
-      for (var oi = 0; oi < tfSelectEl.options.length; oi++) {
-        if (tfSelectEl.options[oi].value === fam) {
-          tfSelectEl.value = fam;
-          matched = true;
-          break;
-        }
-      }
-      if (!matched) {
-        tfSelectEl.value = '__custom__';
-        tfCustomEl.value = fam;
-        tfCustomEl.classList.remove('hidden');
-      } else {
-        tfCustomEl.classList.add('hidden');
-      }
-    }
-    if (tfSizeEl) tfSizeEl.value = String(getTerminalFontSize());
     // Auto-continue toggle
     var acToggle = document.getElementById('us-auto-continue');
     if (acToggle) acToggle.checked = !!data.autoContinueOnRateLimit;

package/lib/yoke/adapters/codex.js

@@ -586,7 +586,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
     done: false,
     aborted: false,
     loopStarted: false,
-    model: queryOpts.model || "gpt-5.4",
+    model: queryOpts.model || "gpt-5.5",
     // Track incremental text deltas
     textBlocks: {},     // itemId -> true (text_start sent)
     textLengths: {},    // itemId -> last sent length
@@ -831,7 +831,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
       // Start or resume thread
       var threadParams = {
-        model: queryOpts.model || "gpt-5.4",
+        model: queryOpts.model || "gpt-5.5",
         sandbox: queryOpts.sandboxMode || "workspace-write",
         approvalPolicy: queryOpts.approvalPolicy || "on-failure",
         cwd: queryOpts.cwd,
@@ -1085,7 +1085,7 @@ function createCodexAdapter(opts) {
   function buildReadyResponse(skillNames) {
     return {
       models: _cachedModels,
-      defaultModel: "gpt-5.4",
+      defaultModel: "gpt-5.5",
       skills: skillNames || [],
       slashCommands: skillNames || [],
       fastModeState: null,
@@ -1297,9 +1297,10 @@ function createCodexAdapter(opts) {
           throw createShutdownError();
         }
 
-        console.log("[codex] App-server initialized, models: gpt-5.4, gpt-5.4-mini, gpt-5.3-codex, gpt-5.3-codex-spark, gpt-5.2");
+        console.log("[codex] App-server initialized, models: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.3-codex, gpt-5.3-codex-spark, gpt-5.2");
 
         _cachedModels = [
+          "gpt-5.5",
           "gpt-5.4",
           "gpt-5.4-mini",
           "gpt-5.3-codex",
@@ -1387,7 +1388,7 @@ function createCodexAdapter(opts) {
         throw new Error("[yoke/codex] Adapter not initialized. Call init() first.");
       }
 
-      var model = queryOpts.model || "gpt-5.4";
+      var model = queryOpts.model || "gpt-5.5";
       var ac = queryOpts.abortController || new AbortController();
       var activeEntry = {
         abort: function() {

package/package.json

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