agentgui 1.0.943 → 1.0.945

package/AGENTS.md

@@ -6,9 +6,11 @@ One surface. `server.js` serves `site/app/` under `BASE_URL` (default `/gm`) and
 
 When `PASSWORD` env var is set, every HTTP route is gated by `lib/http-handler.js` accepting **Basic auth**, **`Authorization: Bearer <pwd>`**, OR **`?token=<pwd>`** query param (added 2026-05-26 so `EventSource` and direct deep-links work — neither can set headers). WS `/sync` requires `?token=` only. The HTML head script injects `window.__BASE_URL`, `window.__SERVER_VERSION`, and `window.__WS_TOKEN`; `site/app/js/backend.js` reads `__WS_TOKEN` and threads it onto every fetch (Bearer header) / EventSource (qs) / WebSocket (qs).
 
-- `site/app/index.html` — shell + CSS, imports `anentrypoint-design` from unpkg
-- `site/app/js/backend.js` — same-origin client (`DEFAULT_BACKEND = ''`); `?backend=` query override for cross-origin debugging
-- `site/app/js/app.js` — webjsx view + state, kits-only rendering (PageHeader, SearchInput, TextField, EventList, Panel, Row, Section); exposes `window.__agentgui`
+- `site/app/index.html` — shell + CSS; imports `anentrypoint-design` from `https://unpkg.com/anentrypoint-design@latest` at runtime (always-latest; requires network — the prior offline guarantee is intentionally dropped)
+- `site/app/js/backend.js` — same-origin WS/HTTP client (`DEFAULT_BACKEND = ''`); the transport glue that wires the kit; `?backend=` query override for cross-origin debugging
+- `site/app/js/app.js` — webjsx view + state; renders the `AgentChat` kit (from `anentrypoint-design`) for the chat surface and wires agentgui's WS/ccsniff state as kit callbacks; history/settings remain agentgui-local. Exposes `window.__agentgui`
+
+The chat GUI lives in the design kit, not in agentgui. The reusable multi-agent chat surface is the `AgentChat` component in `anentrypoint-design` (`src/components/agent-chat.js`); agentgui keeps only the transport glue (WS `backend.js`, ccsniff history wiring, agent orchestration) and passes state + callbacks into the kit. To change chat UI, edit the kit and push it (CI publishes to npm → unpkg `@latest`), not agentgui.
 - `server.js` — boots ACP/agents/websocket plugins, mounts `createHistoryRouter()` from `ccsniff` at `/`, serves `site/app/` as static root
 - Plugins kept (lib/plugins/): acp, agents, database, files, stream, websocket, workflow
 
@@ -145,9 +147,9 @@ Throttle renders via `requestAnimationFrame` to avoid event storm during burst l
 
 The endpoints are served by ccsniff's Express router mounted in-process from `server.js`. No external proxy.
 
-## Zero-runtime-CDN: vendored DS deps (2026-05-28)
+## Runtime CDN: GUI loaded from unpkg (2026-05-29)
 
-The GUI runs fully offline. `site/app/vendor/cdn/` holds marked, dompurify, prismjs components, and JetBrains+Space Grotesk woff2. The DS bundle (`anentrypoint-design/247420.js`) had its CDN string constants rewritten to local paths, AND its gzip+base64-embedded CSS blob (`Ha`) regenerated to point at local fonts. Full mechanism is in rs-learn (recall "DS bundle gzip Ha vendoring"). Witness offline by browser route-abort of non-origin hosts.
+The GUI loads `anentrypoint-design` from `https://unpkg.com/anentrypoint-design@latest` at runtime (import map + CSS link in `index.html`) so agentgui always tracks the latest published kit with no hand-maintained vendored copy. This **requires a network connection** — the earlier offline guarantee was intentionally dropped in favour of always-latest. The DS itself fetches its fonts from `unpkg.com/anentrypoint-design@latest/dist/fonts/` (set in the kit's `scripts/build.mjs` `FONT_BASE`). The `site/app/vendor/` tree is no longer imported; the old vendored DS bundle + `vendor/cdn/` assets are dead and may be removed. Witness the live GUI by confirming the import map resolves to unpkg and `.agentchat` renders with 0 console errors.
 
 ## Agent/model/session management (2026-05-28)
 

package/CHANGELOG.md

@@ -1,4 +1,16 @@
-## [Unreleased] - Antigravity (agy) orchestration + glyph-to-ASCII sweep + spawn-injection fix
+## [Unreleased] - GUI moved into the anentrypoint-design kit, loaded from unpkg
+
+- the chat GUI now lives in the design kit: added a reusable `AgentChat` component to anentrypoint-design (agent-then-model picker + AICat auto-scroll/thinking + tool parts + cwd bar + caret-stable composer), pure props-in/vnode-out with all transport as host callbacks. Published via the kit's CI to npm -> unpkg.
+- site/app/index.html: imports anentrypoint-design from https://unpkg.com/anentrypoint-design@latest at runtime (always-latest), replacing the vendored bundle. Trades the offline guarantee for always-latest, per project decision.
+- site/app/js/app.js: chatMain renders the AgentChat kit and wires agentgui state + WS/ccsniff glue as callbacks; the agent/model picker, cwd bar, and composer moved out of agentgui into the kit. backend.js (WS client) stays as the transport glue.
+- verified end-to-end in a real browser: GUI sourced from unpkg, AgentChat renders, chat round-trips (reply streams into the kit's transcript), 0 console errors.
+
+## [Unreleased] - live e2e chat verified + composer caret fix + ccsniff memory cap
+
+- verified the full GUI chat round-trip end-to-end in a real browser: compose -> WS chat.sendMessage -> claude-code -> streaming_progress -> transcript renders the streamed reply (not just the runner harness).
+- site/app/js/app.js: composer onInput re-renders only on the empty<->non-empty draft transition (the only change that toggles the send button), not on every keystroke. Why: a synchronous re-render per character fought the caret on the controlled textarea.
+- vendored anentrypoint-design DS rebuilt: ChatComposer reads the live textarea value on send and syncs the controlled value into the DOM only when it differs, so a mid-type re-render no longer resets the caret or drops keystrokes. Why: DS override belongs in the kit; the composer is shared.
+- ccsniff (sibling repo, pushed): bounded the in-memory history store (event cap + eviction + per-event text cap) and bounded loadOnce to read newest events first up to the cap. Why: the store grew unbounded to 6GB+ (OOM) and parsed the entire JSONL backlog at load (~2.4GB transient peak); heap now settles ~47MB and load peak ~570MB.
 
 - lib/agent-discovery.js + lib/claude-runner-agents.js + lib/agent-descriptors.js: added `agy` (Antigravity) as a direct-protocol CLI agent — `agy --print "<prompt>" --dangerously-skip-permissions [--continue]`, plain-text parseOutput, no model picker. Completes the four flagship orchestration targets (Claude Code, OpenCode, Kilo, Antigravity). Why: the GUI could not drive Antigravity at all.
 - lib/claude-runner.js + lib/claude-runner-direct.js: SECURITY — the direct runner now spawns a resolved binary with `shell:false`. Previously `shell:true` on Windows concatenated argv unescaped, so a prompt containing `&`/`|`/`>`/backticks executed as shell commands (verified injection). Why: arbitrary command execution from chat input.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.943",
+  "version": "1.0.945",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/site/app/index.html

@@ -5,9 +5,13 @@
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <title>agentgui</title>
   <meta name="description" content="agentgui — multi-agent client with same-origin server, in-process ccsniff history, and ACP chat.">
-  <link rel="stylesheet" href="vendor/anentrypoint-design/247420.css">
+  <!-- The GUI lives in the anentrypoint-design kit and is loaded from unpkg at
+       its latest published version, so agentgui always tracks the kit without a
+       hand-maintained vendored copy. (This trades the prior offline guarantee for
+       always-latest, per project decision; a network connection is required.) -->
+  <link rel="stylesheet" href="https://unpkg.com/anentrypoint-design@latest/dist/247420.css">
   <script type="importmap">
-    { "imports": { "anentrypoint-design": "./vendor/anentrypoint-design/247420.js" } }
+    { "imports": { "anentrypoint-design": "https://unpkg.com/anentrypoint-design@latest/dist/247420.js" } }
   </script>
   <style>
     :root {

package/site/app/js/app.js

@@ -3,7 +3,7 @@ import * as B from './backend.js';
 
 installStyles().catch(() => {});
 
-const { AppShell, Topbar, Crumb, Side, Status, Chat, ChatComposer, Row, Panel, PageHeader, SearchInput, TextField, Select, Btn, EventList, Spinner, Alert } = C;
+const { AppShell, Topbar, Crumb, Side, Status, Chat, ChatComposer, AgentChat, Row, Panel, PageHeader, SearchInput, TextField, Select, Btn, EventList, Spinner, Alert } = C;
 
 const state = {
   backend: B.getBackend(),
@@ -135,6 +135,27 @@ function selectModel(id) {
 function agentById(id) { return state.agents.find(a => a.id === id); }
 function agentAvailable(id) { const a = agentById(id); return !a || a.available !== false; }
 
+// The four flagship orchestration targets surface first, then other available
+// agents, then npx-installable, then not-installed — so the agents the GUI
+// exists to drive are reachable without scanning a flat 17-item list. This
+// ordering is agentgui's orchestration priority, so it stays in the host and is
+// passed pre-sorted to the (app-agnostic) AgentChat kit.
+const PRIMARY_AGENTS = ['claude-code', 'opencode', 'kilo', 'agy'];
+function sortedAgents() {
+  const rank = (a) => {
+    const primary = PRIMARY_AGENTS.indexOf(a.id);
+    const avail = a.available !== false;
+    if (primary !== -1 && avail) return primary;
+    if (avail) return 10;
+    if (a.npxInstallable) return 20;
+    return 30;
+  };
+  return state.agents
+    .map(a => ({ a, rank: rank(a) }))
+    .sort((x, y) => x.rank - y.rank || x.a.name.localeCompare(y.a.name))
+    .map(({ a }) => a);
+}
+
 function navTo(tab) {
   const prev = state.tab;
   state.tab = tab;
@@ -287,55 +308,9 @@ function view() {
     onNav: (label) => navTo(label),
   });
 
-  // The four flagship orchestration targets surface first, then the rest of the
-  // available agents, then unavailable ones — so the agents the GUI exists to
-  // drive are reachable without scanning a flat 17-item list. Ordering only;
-  // the DS Select renders a plain option list.
-  const PRIMARY_AGENTS = ['claude-code', 'opencode', 'kilo', 'agy'];
-  const agentRank = (a) => {
-    const primary = PRIMARY_AGENTS.indexOf(a.id);
-    const avail = a.available !== false;
-    if (primary !== -1 && avail) return primary;           // 0..3 flagship + available
-    if (avail) return 10;                                   // other available
-    if (a.npxInstallable) return 20;                        // installable via npx
-    return 30;                                              // not installed
-  };
-  const agentOptions = state.agents
-    .map(a => ({ a, rank: agentRank(a) }))
-    .sort((x, y) => x.rank - y.rank || x.a.name.localeCompare(y.a.name))
-    .map(({ a }) => ({
-      value: a.id,
-      label: a.name + (a.available === false ? (a.npxInstallable ? ' (via npx)' : ' (not installed)') : ''),
-      disabled: a.available === false && !a.npxInstallable,
-    }));
-  const showModelPicker = state.tab === 'chat' && state.agentModels.length > 0;
-
-  const crumbRight = state.tab === 'chat'
-    ? [h('div', { key: 'cc', class: 'chat-controls' },
-        Select({
-          key: 'agentsel',
-          value: state.selectedAgent,
-          placeholder: '— agent —',
-          title: 'Select coding agent',
-          options: agentOptions,
-          onChange: (v) => { selectAgent(v); },
-        }),
-        showModelPicker
-          ? Select({
-              key: 'modelsel',
-              value: state.selectedModel,
-              placeholder: '— model —',
-              title: 'Select model for this agent',
-              options: state.agentModels.map(m => ({ value: m.id, label: m.name || m.id })),
-              onChange: (v) => { selectModel(v); },
-            })
-          : null,
-        state.chat.busy
-          ? Btn({ key: 'stop', onClick: cancelChat, children: 'stop', title: 'Stop streaming' })
-          : Btn({ key: 'new',  onClick: newChat,    children: '+ new', title: 'Start new chat (clears history)' }),
-        dot,
-      )]
-    : [dot];
+  // The agent/model picker + new/stop now live inside the AgentChat kit (chat
+  // tab), so the crumb carries only the status dot on every tab.
+  const crumbRight = [dot];
 
   // Topbar already shows "agentgui / <tab>"; the crumb is reserved for contextual
   // controls (model picker, new/stop, live status) so it doesn't duplicate the path.
@@ -407,37 +382,11 @@ function errText(e) {
 }
 
 function chatMain() {
-  const lastIdx = state.chat.messages.length - 1;
   const agentName = agentById(state.selectedAgent)?.name || state.selectedAgent || 'agent';
-  const msgs = state.chat.messages.map((m, i) => {
-    const isAssistant = m.role === 'assistant';
-    const isStreaming = state.chat.busy && i === lastIdx && isAssistant;
-    const hasParts = Array.isArray(m.parts) && m.parts.length > 0;
-    const isEmptyStreaming = isStreaming && !m.content && !hasParts;
-    const parts = [];
-    if (m.content) parts.push({ kind: isAssistant ? 'md' : 'text', text: m.content });
-    if (hasParts) for (const p of m.parts) parts.push({ kind: 'text', text: p });
-    return {
-      key: m.id || String(i),
-      who: isAssistant ? 'them' : 'you',
-      name: isAssistant ? agentName : 'you',
-      time: m.time || '',
-      typing: isEmptyStreaming,
-      parts: isEmptyStreaming ? undefined : (parts.length ? parts : [{ kind: 'text', text: '' }]),
-    };
-  });
-
-  const placeholder = !state.selectedAgent
-    ? 'choose an agent first'
-    : (!agentAvailable(state.selectedAgent) ? agentName + ' is not installed' : 'message…');
-  const composer = ChatComposer({
-    value: state.chat.draft,
-    disabled: !canSend(),
-    placeholder,
-    onInput: (v) => { state.chat.draft = v; render(); },
-    onSend: (v) => { state.chat.draft = v; sendChat(); },
-  });
 
+  // Banners agentgui owns (resume, agent-switched, unavailable, confirm-clear,
+  // stream error) are pre-built here and handed to the kit, which renders them
+  // above the thread. The kit holds no agentgui-specific banner logic.
   const banners = [];
   if (state.chat.resumeSid) {
     banners.push(h('div', { key: 'rb', class: 'resume-banner', role: 'status' },
@@ -447,7 +396,6 @@ function chatMain() {
       banners.push(Alert({ key: 'rnote', kind: 'info', title: 'Agent switched', children: state.chat.resumeNote }));
     }
   }
-  banners.push(cwdBanner());
   if (state.selectedAgent && !agentAvailable(state.selectedAgent)) {
     banners.push(Alert({ key: 'unavail', kind: 'warn', title: agentName + ' is not installed',
       children: 'This agent\'s CLI was not found on the server. Pick another agent or install it.' }));
@@ -459,26 +407,59 @@ function chatMain() {
         Btn({ key: 'cnyes', danger: true, onClick: newChat, children: 'clear' }),
         Btn({ key: 'cnno', onClick: () => { state.confirmingNewChat = false; render(); }, children: 'cancel' })] }));
   }
-  // Last stream error surfaced as a proper Alert instead of raw JSON in the bubble.
   const lastErr = state.chat.messages.length ? state.chat.messages[state.chat.messages.length - 1].error : null;
   if (lastErr && !state.chat.busy) {
     banners.push(Alert({ key: 'chaterr', kind: 'error', title: 'Stream error', children: lastErr }));
   }
+
+  const placeholder = !state.selectedAgent
+    ? 'choose an agent first'
+    : (!agentAvailable(state.selectedAgent) ? agentName + ' is not installed' : 'message…');
+
+  // The reusable AgentChat kit owns the agent/model picker, cwd bar, transcript
+  // (with AICat-style auto-scroll + thinking), and the caret-stable composer.
+  // agentgui supplies state and wires every server interaction as a callback.
   return [
     offlineBanner(),
-    ...banners,
-    Chat({
-      title: agentName + (state.selectedModel ? ' · ' + state.selectedModel : '') + (state.chat.resumeSid ? ' · resume' : ''),
-      // Explicit human-readable sub; the DS default ("NN msgs", zero-padded)
-      // leaks an event-list style into chat. Hide it when there are no messages
-      // (the empty-state already says "no messages yet").
-      sub: state.chat.busy
-        ? 'streaming…'
-        : (state.chat.messages.length
-            ? state.chat.messages.length + (state.chat.messages.length === 1 ? ' message' : ' messages')
-            : ''),
-      messages: msgs,
-      composer,
+    AgentChat({
+      agents: sortedAgents(),
+      selectedAgent: state.selectedAgent,
+      models: state.agentModels,
+      selectedModel: state.selectedModel,
+      messages: state.chat.messages,
+      busy: state.chat.busy,
+      draft: state.chat.draft,
+      status: state.chat.busy ? 'streaming…' : (state.chat.resumeSid ? 'resume' : 'ready'),
+      agentName,
+      placeholder,
+      canSend: canSend(),
+      banners,
+      cwd: state.chatCwd,
+      cwdEditing: !!state.cwdEditing,
+      cwdDraft: state.cwdDraft,
+      onSelectAgent: (v) => selectAgent(v),
+      onSelectModel: (v) => selectModel(v),
+      onNewChat: newChat,
+      onStop: cancelChat,
+      onInput: (v) => {
+        // The kit's textarea is controlled and reads its live DOM value on send,
+        // so re-render only when the draft crosses empty<->non-empty (the only
+        // transition that toggles the send button's disabled state).
+        const was = !!(state.chat.draft && state.chat.draft.trim());
+        const now = !!(v && v.trim());
+        state.chat.draft = v;
+        if (was !== now) render();
+      },
+      onSend: (v) => { state.chat.draft = v; sendChat(); },
+      onCwdEdit: () => { state.cwdEditing = true; state.cwdDraft = state.chatCwd || ''; render(); },
+      onCwdSave: () => {
+        state.chatCwd = (state.cwdDraft ?? '').trim();
+        if (state.chatCwd) lsSet('agentgui.cwd', state.chatCwd); else lsRemove('agentgui.cwd');
+        state.cwdEditing = false; state.cwdDraft = undefined; render();
+      },
+      onCwdCancel: () => { state.cwdEditing = false; state.cwdDraft = undefined; render(); },
+      onCwdClear: () => { state.chatCwd = ''; lsRemove('agentgui.cwd'); render(); },
+      onCwdDraft: (v) => { state.cwdDraft = v; },
     }),
   ].filter(Boolean);
 }
@@ -489,24 +470,8 @@ function offlineBanner() {
     children: 'agentgui can\'t reach the server (' + (state.health.error || state.health.status) + '). Chat and history actions will fail until it reconnects.' });
 }
 
-function cwdBanner() {
-  if (state.cwdEditing) {
-    return h('div', { key: 'cwdb', class: 'resume-banner', role: 'group', 'aria-label': 'Set working directory' },
-      TextField({ key: 'cwdfield', label: 'working directory (blank = server default)', value: state.cwdDraft ?? state.chatCwd ?? '',
-        placeholder: 'absolute path', onInput: (v) => { state.cwdDraft = v; } }),
-      Btn({ key: 'cwdsave', primary: true, onClick: () => {
-        state.chatCwd = (state.cwdDraft ?? '').trim();
-        if (state.chatCwd) lsSet('agentgui.cwd', state.chatCwd); else lsRemove('agentgui.cwd');
-        state.cwdEditing = false; state.cwdDraft = undefined; render();
-      }, children: 'save' }),
-      Btn({ key: 'cwdcancel', onClick: () => { state.cwdEditing = false; state.cwdDraft = undefined; render(); }, children: 'cancel' }));
-  }
-  return h('div', { key: 'cwdb', class: 'cwd-bar', role: 'group', 'aria-label': 'Working directory' },
-    h('span', { key: 'cwdtxt', class: 'lede cwd-bar-text', title: state.chatCwd || 'server default working directory' },
-      state.chatCwd ? 'cwd: ' + truncate(state.chatCwd, 28, 60) : 'cwd: server default'),
-    h('button', { key: 'cwdset', type: 'button', class: 'cwd-bar-btn', onClick: () => { state.cwdEditing = true; state.cwdDraft = state.chatCwd || ''; render(); } }, state.chatCwd ? 'change' : 'set'),
-    state.chatCwd ? h('button', { key: 'cwdclr', type: 'button', class: 'cwd-bar-btn', onClick: () => { state.chatCwd = ''; lsRemove('agentgui.cwd'); render(); } }, 'use default') : null);
-}
+// (The working-directory bar now lives in the AgentChat kit; agentgui wires its
+// cwd state + handlers as kit callbacks in chatMain.)
 
 function newChat() {
   if (state.chat.messages.length && !state.confirmingNewChat) {

package/site/app/vendor/anentrypoint-design/247420.css

@@ -518,14 +518,43 @@
 
 .ds-247420 .app-topbar {
   position: sticky; top: 0; z-index: var(--z-header);
-  display: grid; grid-template-columns: auto 1fr auto;
+  display: flex; flex-wrap: wrap;
   align-items: center; gap: var(--space-4);
   min-height: var(--app-topbar-h);
   padding: 10px var(--pad-x);
   background: color-mix(in oklab, var(--bg) 88%, transparent);
   backdrop-filter: blur(10px); -webkit-backdrop-filter: blur(10px);
 }
-.ds-247420 .app-topbar nav { display: flex; gap: 4px; font-size: var(--fs-sm); }
+
+/* Merged chrome: when AppShell gets both a topbar and a crumb it wraps them
+   in .app-chrome and they share ONE sticky band instead of stacking as two
+   bars. The breadcrumb provides the left identity (it already begins with the
+   brand), so the topbar's standalone brand is hidden to avoid showing the name
+   twice; nav and the crumb's right slot sit together on the right. */
+.ds-247420 .app-chrome {
+  position: sticky; top: 0; z-index: var(--z-header);
+  display: flex; flex-wrap: wrap; align-items: center;
+  gap: var(--space-2) var(--space-4);
+  padding: 8px var(--pad-x);
+  background: color-mix(in oklab, var(--bg) 88%, transparent);
+  backdrop-filter: blur(10px); -webkit-backdrop-filter: blur(10px);
+}
+.ds-247420 .app-chrome > .app-topbar,
+.ds-247420 .app-chrome > .app-crumb {
+  position: static; background: none; backdrop-filter: none;
+  -webkit-backdrop-filter: none; padding: 0; min-height: 0;
+  flex: 1 1 auto;
+}
+.ds-247420 .app-chrome > .app-crumb { order: 1; flex: 1 1 auto; }
+.ds-247420 .app-chrome > .app-topbar { order: 2; flex: 0 0 auto; }
+.ds-247420 .app-chrome > .app-topbar > .brand { display: none; }
+.ds-247420 .app-chrome > .app-topbar > nav { margin-left: 0; }
+.ds-247420 .app-chrome > .app-crumb > .crumb-right { margin-left: auto; }
+.ds-247420 .app-topbar > .brand { flex: 0 0 auto; }
+.ds-247420 .app-topbar > .app-search { flex: 1 1 auto; }
+.ds-247420 .app-topbar > nav { margin-left: auto; }
+.ds-247420 .app-topbar nav { display: flex; gap: 4px; font-size: var(--fs-sm); flex-wrap: wrap; }
+.ds-247420 .app-topbar nav a { flex: 0 0 auto; }
 .ds-247420 .app-topbar nav a {
   color: var(--fg-2);
   padding: 12px 14px;
@@ -1083,25 +1112,21 @@
   /* App Layout: single-column + drawer is handled once in the ≤900px block;
      no need to re-declare grid-template-columns here (was a redundant !important). */
 
-  /* Topbar Navigation */
+  /* Topbar Navigation: stack the nav onto its own full-width row below the
+     brand and let it scroll horizontally. The brand stays on the first row;
+     nav wraps to a second row at 100% width (flex-wrap on .app-topbar). */
   .ds-247420 .app-topbar {
-    grid-template-columns: 1fr auto;
     gap: var(--space-2); padding: 12px var(--space-3);
   }
-  .ds-247420 .app-topbar nav a {
-    padding: 12px 10px;
-    min-height: 44px;
-  }
-  /* Keep primary nav reachable on small screens (apps without a sidebar have
-     no other entry point). Compact it and let it scroll horizontally rather
-     than hiding it entirely. */
-  .ds-247420 .app-topbar nav {
-    display: flex; gap: 2px;
+  .ds-247420 .app-topbar > nav {
+    flex: 1 1 100%; margin-left: 0; order: 3;
+    display: flex; gap: 2px; flex-wrap: nowrap;
     overflow-x: auto; scrollbar-width: none; -webkit-overflow-scrolling: touch;
-    max-width: 60vw;
   }
   .ds-247420 .app-topbar nav::-webkit-scrollbar { display: none; }
-  .ds-247420 .app-topbar nav a { padding: 10px 8px; white-space: nowrap; }
+  .ds-247420 .app-topbar nav a {
+    flex: 0 0 auto; padding: 10px 12px; min-height: 44px; white-space: nowrap;
+  }
   .ds-247420 .brand { font-size: var(--fs-tiny); font-weight: 600; }
 
   /* Search */