tavern-harness 0.1.16 → 0.1.18

package/CHANGELOG.md

@@ -3,6 +3,68 @@
 > 本文件由 `scripts/changelog.mjs` 从 `changelog/v*.md` 生成，请勿手动编辑。
 > 版本对比链接见文末；源文件位于仓库 `changelog/` 目录。
 
+## [0.1.18] - 2026-10-25
+
+### 中文
+
+#### 新增
+
+- 聊天标题栏新增主题切换按钮，可在浅色与深色之间一键切换
+- 会话标题下方显示当前上下文用量（如 `12.3K`），方便判断何时需要重置对话
+
+#### 改进
+
+- 手机端支持左右滑动：从屏幕左边缘右滑打开侧边栏，在侧边栏内左滑关闭
+- 模型选择按钮更紧凑：名称过长时自动省略，新增展开箭头，选择面板在点击面板外任意位置时关闭
+- 提高单轮工具调用上限：每轮最多 100 次调用、最多 30 层嵌套，复杂任务不再轻易被中断
+- 群聊标题栏不再重复显示成员名单
+
+#### 修复
+
+- 修复 Android 上点击工作区、顶栏等区域时出现灰色高亮块的问题
+
+### English
+
+#### Added
+
+- Added a theme toggle to the chat header for switching between light and dark in one tap
+- The session header now shows current context usage (for example `12.3K`), making it easier to judge when to reset a conversation
+
+#### Changed
+
+- Mobile now supports swipe gestures: swipe in from the left edge to open the sidebar, and swipe left inside it to close
+- The model selector is more compact: long model names are truncated, a caret indicates it opens a panel, and the panel closes when you tap anywhere outside it
+- Raised the per-turn tool limits to 100 calls and 30 levels of nesting, so complex tasks are interrupted far less often
+- Group chat headers no longer repeat the member list
+
+#### Fixed
+
+- Fixed gray tap-highlight boxes appearing when tapping the workspace, top bar, and other areas on Android
+
+## [0.1.17] - 2026-10-25
+
+### 中文
+
+#### 改进
+
+- 在工作区文件管理器中预览文件时不再关闭管理器：预览复用管理器的遮罩层，关闭预览即可回到原来的浏览位置
+- 文件删除确认改为管理器内的弹出对话框，删除过程中按钮显示加载状态，失败时会提示原因，不再静默关闭
+
+#### 修复
+
+- 修复在 Termux / Android 环境下 shell 命令无法解析的问题：现在会从 Termux 的 `$PREFIX/bin` 中查找受信任的命令，并保留 `head` 等 applet 的原始名称
+
+### English
+
+#### Changed
+
+- Previewing a file from the workspace file manager no longer closes the manager: the preview reuses the manager's overlay, and closing it returns you to the same browsing position
+- Delete confirmation is now a dialog inside the manager; the delete button shows a loading state while the request runs, and failures surface the reason instead of closing silently
+
+#### Fixed
+
+- Fixed shell commands failing to resolve on Termux / Android: trusted commands are now looked up in Termux's `$PREFIX/bin`, and applets such as `head` keep their original name
+
 ## [0.1.16] - 2026-10-25
 
 ### 中文
@@ -466,6 +528,8 @@
 - Vite + React + Zustand + Dexie stack with browser-side local persistence
 
 <!-- 链接定义 -->
+[0.1.18]: https://github.com/Rannichan/Tavern-Harness/compare/v0.1.17...v0.1.18
+[0.1.17]: https://github.com/Rannichan/Tavern-Harness/compare/v0.1.16...v0.1.17
 [0.1.16]: https://github.com/Rannichan/Tavern-Harness/compare/v0.1.15...v0.1.16
 [0.1.15]: https://github.com/Rannichan/Tavern-Harness/compare/v0.1.14...v0.1.15
 [0.1.14]: https://github.com/Rannichan/Tavern-Harness/compare/v0.1.13...v0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tavern-harness",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Tavern Harness — 酒馆模式下的本地 AI Agent 助手（MyAgent-Android 的 Web 复刻）",
   "private": false,
   "type": "module",

package/sandbox-server.mjs

@@ -336,9 +336,12 @@ const SHELL_ALLOWLIST_GROUPS = {
 };
 const SHELL_ALLOWED_REAL = new Set(Object.values(SHELL_ALLOWLIST_GROUPS).flat());
 
+const TERMUX_BIN = process.platform === 'android' && process.env.PREFIX
+  ? join(process.env.PREFIX, 'bin')
+  : null;
 const TRUSTED_COMMAND_DIRS = (IS_WIN
   ? [GIT_USR_BIN]
-  : ['/bin', '/usr/bin', '/usr/sbin', '/sbin'])
+  : ['/bin', '/usr/bin', '/usr/sbin', '/sbin', TERMUX_BIN])
   .filter(Boolean)
   .map((dir) => {
     try {
@@ -358,10 +361,15 @@ function resolveTrustedCommand(command) {
       try {
         const resolved = realpathSync(candidate);
         if (!resolved.startsWith(trustedDir + sep)) return null;
-        if (IS_WIN) return resolved; // Windows 无 POSIX 权限位（Git usr/bin 的 exe 显示 666），跳过 uid/writable 校验
+        if (IS_WIN) return candidate; // Windows 无 POSIX 权限位（Git usr/bin 的 exe 显示 666），跳过 uid/writable 校验
         const executable = statSync(resolved);
         const writableByNonOwner = (executable.mode & 0o022) !== 0;
-        if (executable.uid === 0 && !writableByNonOwner) return resolved;
+        const trustedSystemExecutable = executable.uid === 0 && !writableByNonOwner;
+        const trustedTermuxExecutable = trustedDir === TERMUX_BIN
+          && executable.uid === process.getuid()
+          && !writableByNonOwner;
+        // Preserve the applet path: resolving /system/bin/head to toybox loses the applet name.
+        if (trustedSystemExecutable || trustedTermuxExecutable) return candidate;
       } catch { /* try next candidate */ }
     }
   }

package/src/App.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useLayoutEffect, useRef, useState, type ReactNode } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode } from 'react';
 import { useStore, type ActiveView } from './store/store';
 import { Sidebar } from './components/Sidebar';
 import { ChatView, ChatInput, MessageMenu, TurnQueuePanel } from './components/ChatView';
@@ -20,6 +20,10 @@ import { useT } from './core/i18n';
 import './theme/chat.css';
 import './theme/views.css';
 
+function formatContextTokens(tokens: number): string {
+  return `${(tokens / 1_000).toFixed(1)}K`;
+}
+
 export default function App() {
   const [takingControl, setTakingControl] = useState(false);
   const initStatus = useStore((s) => s.initStatus);
@@ -280,6 +284,8 @@ function SessionHeader({
   const addToast = useStore((s) => s.addToast);
   const deleteSession = useStore((s) => s.deleteSession);
   const resetSessionConversation = useStore((s) => s.resetSessionConversation);
+  const themeMode = useStore((s) => s.settings?.themeMode ?? 'system');
+  const setSettings = useStore((s) => s.setSettings);
   const t = useT();
   const [showEdit, setShowEdit] = useState(false);
   const [confirmReset, setConfirmReset] = useState(false);
@@ -288,6 +294,16 @@ function SessionHeader({
   const [showWorkspace, setShowWorkspace] = useState(false);
 
   const modeLabel = session.mode === 'STANDARD' ? t('header.modeStandard') : session.mode === 'NPC' ? t('header.modeNpc') : t('header.modeGroup');
+  const messages = useStore((s) => s.messages[session.id!] ?? []);
+  const contextTokens = useMemo(() => {
+    const assistantMessages = messages.filter((message) => message.role === 'assistant' && message.totalTokens > 0);
+    if (assistantMessages.length === 0) return null;
+    if (session.mode !== 'GROUP') return assistantMessages.at(-1)!.totalTokens;
+    const latestLoopIndex = assistantMessages.at(-1)!.loopIndex;
+    return Math.max(...assistantMessages
+      .filter((message) => message.loopIndex === latestLoopIndex)
+      .map((message) => message.totalTokens));
+  }, [messages, session.mode]);
   const npcRef = session.associatedId ? npcs.find((n) => n.id === session.associatedId) : null;
   const usesPublicWorkspace = session.mode === 'NPC' && npcRef?.isBuiltIn === true;
   const groupNpcs = participants.filter((p) => p.kind === 'NPC').map((p) => npcs.find((n) => n.id === p.npcId)).filter(Boolean);
@@ -296,6 +312,9 @@ function SessionHeader({
     colorOrdinal: n.avatarColorOrdinal,
     imageUrl: n.avatarDataUrl,
   }));
+  const isDarkTheme = themeMode === 'dark'
+    || (themeMode === 'system' && document.documentElement.dataset.theme === 'dark');
+  const toggleTheme = () => void setSettings({ themeMode: isDarkTheme ? 'light' : 'dark' });
 
   return (
     <div className="chat-header">
@@ -304,9 +323,10 @@ function SessionHeader({
         <div className="ttitle">{session.title}</div>
         <div className="tsub">
           <span className="tsub-mode">{modeLabel}</span>
-          {session.mode === 'GROUP' && (
-            <span className="tsub-members">
-              {groupNpcs.map((n) => n!.name).join(' · ')}
+          {contextTokens != null && (
+            <span className="tsub-context-group">
+              <span>·</span>
+              <span className="tsub-mode">{t('nav.contextUsage', { tokens: formatContextTokens(contextTokens) })}</span>
             </span>
           )}
         </div>
@@ -327,6 +347,15 @@ function SessionHeader({
         <button className="btn-ghost icon-tooltip danger" title={t('header.deleteTip')} onClick={() => setConfirmDelete(true)}>
           <Icon name="trash" size={17} />
         </button>
+        <button
+          className="btn-ghost icon-tooltip"
+          type="button"
+          title={t(isDarkTheme ? 'header.switchToLightTip' : 'header.switchToDarkTip')}
+          aria-label={t(isDarkTheme ? 'header.switchToLightTip' : 'header.switchToDarkTip')}
+          onClick={toggleTheme}
+        >
+          <Icon name={isDarkTheme ? 'sun' : 'moon'} size={17} />
+        </button>
       </div>
 
       {showEdit && <NewSessionMenu editingSession={session} onClose={() => setShowEdit(false)} />}

package/src/components/ChatView.tsx

@@ -787,8 +787,22 @@ export function ChatInput({ sessionId }: { sessionId: number }) {
   const providers = useStore((s) => s.providers);
   const defaultModel = useStore((s) => s.settings?.defaultModel?.trim() || '');
   const defaultProviderId = useStore((s) => s.settings?.defaultProviderId ?? null);
+  const modelLabelRef = useRef<HTMLSpanElement>(null);
+  const [isModelLabelTruncated, setIsModelLabelTruncated] = useState(false);
+  const displayedModelName = defaultModel ? displayModelName(providers, defaultModel, defaultProviderId) : t('chat.chooseModel');
   const composerPlaceholder = session?.mode === 'GROUP' ? t('chat.phGroup') : t('chat.phSingle');
 
+  useLayoutEffect(() => {
+    const label = modelLabelRef.current;
+    if (!label) return;
+
+    const updateTruncation = () => setIsModelLabelTruncated(label.scrollWidth > label.clientWidth);
+    updateTruncation();
+    const observer = new ResizeObserver(updateTruncation);
+    observer.observe(label);
+    return () => observer.disconnect();
+  }, [displayedModelName]);
+
   const canSend = text.trim().length > 0 || attachments.length > 0;
 
   const doSend = () => {
@@ -983,10 +997,18 @@ export function ChatInput({ sessionId }: { sessionId: number }) {
           <button
             className={`composer-model-btn ${showModels ? 'open' : ''}`}
             title={t('chat.selectModel')}
+            aria-expanded={showModels}
             disabled={streaming}
             onClick={() => setShowModels(!showModels)}
           >
-            <span className="composer-model-label" title={defaultModel}>{defaultModel ? displayModelName(providers, defaultModel, defaultProviderId) : t('chat.chooseModel')}</span>
+            <span
+              ref={modelLabelRef}
+              className={`composer-model-label ${isModelLabelTruncated ? 'truncated' : ''}`}
+              title={defaultModel}
+            >
+              {displayedModelName}
+            </span>
+            <span className="composer-model-caret" aria-hidden="true" />
           </button>
           {showModels && (
             <ModelPickerPanel onClose={() => setShowModels(false)} />
@@ -1156,7 +1178,8 @@ function ModelPickerPanel({ onClose }: { onClose: () => void }) {
 
   useEffect(() => {
     const onDocClick = (e: MouseEvent) => {
-      if (ref.current && !ref.current.contains(e.target as Node)) onClose();
+      if (e.target instanceof Element && e.target.closest('.composer-model')) return;
+      onClose();
     };
     const onEsc = (e: KeyboardEvent) => {
       if (e.key === 'Escape') onClose();

package/src/components/FileDisplayModal.tsx

@@ -128,7 +128,7 @@ export function FileDisplayModal() {
     setTextWrap(true);
     if (isNewDisplay) {
       setPipRect(createPipRect());
-      setIsPictureInPicture(active.presentation !== 'modal');
+      setIsPictureInPicture(active.presentation === 'pip' || active.presentation == null);
     }
   }, [active]);
 
@@ -263,6 +263,7 @@ export function FileDisplayModal() {
 
   const title = active?.title?.trim() || (active ? basenameOf(active.path) : '');
   const ext = active ? extensionOf(active.path) : '';
+  const isWorkspacePreview = active?.presentation === 'workspace';
 
   const close = () => setActiveDisplay(null);
 
@@ -485,10 +486,10 @@ export function FileDisplayModal() {
 
   return createPortal(
     <>
-      {!isPictureInPicture && <div key="overlay" className="overlay" />}
+      {!isPictureInPicture && !isWorkspacePreview && <div key="overlay" className="overlay" />}
       <div
         key="display-container"
-        className={isPictureInPicture ? 'display-pip card' : 'modal-root'}
+        className={isPictureInPicture ? 'display-pip card' : 'modal-root display-modal-root'}
         style={isPictureInPicture
           ? { left: pipRect.x, top: pipRect.y, width: pipRect.width, height: pipRect.height }
           : undefined}

package/src/components/Sidebar.tsx

@@ -28,6 +28,7 @@ function openGlobalGameplayExport(sessionId: number, includeHistory: boolean) {
 
 export function Sidebar() {
   const [mobileOpen, setMobileOpen] = useState(false);
+  const sidebarRef = useRef<HTMLElement>(null);
   const sessions = useStore((s) => s.sessions);
   const npcs = useStore((s) => s.npcs);
   const activeSessionId = useStore((s) => s.activeSessionId);
@@ -121,6 +122,42 @@ export function Sidebar() {
     };
   }, []);
 
+  useEffect(() => {
+    const isMobile = () => window.matchMedia('(max-width: 680px)').matches;
+    let startX = 0;
+    let startY = 0;
+    let tracking = false;
+
+    const onTouchStart = (event: TouchEvent) => {
+      if (!isMobile() || event.touches.length !== 1) return;
+      const touch = event.touches[0];
+      const startedInSidebar = sidebarRef.current?.contains(event.target as Node) ?? false;
+      if (!mobileOpen && touch.clientX > 24) return;
+      if (mobileOpen && !startedInSidebar) return;
+      startX = touch.clientX;
+      startY = touch.clientY;
+      tracking = true;
+    };
+
+    const onTouchEnd = (event: TouchEvent) => {
+      if (!tracking || !isMobile() || event.changedTouches.length !== 1) return;
+      tracking = false;
+      const touch = event.changedTouches[0];
+      const deltaX = touch.clientX - startX;
+      const deltaY = touch.clientY - startY;
+      if (Math.abs(deltaX) < 56 || Math.abs(deltaX) <= Math.abs(deltaY)) return;
+      if (!mobileOpen && deltaX > 0) setMobileOpen(true);
+      if (mobileOpen && deltaX < 0) setMobileOpen(false);
+    };
+
+    window.addEventListener('touchstart', onTouchStart, { passive: true });
+    window.addEventListener('touchend', onTouchEnd, { passive: true });
+    return () => {
+      window.removeEventListener('touchstart', onTouchStart);
+      window.removeEventListener('touchend', onTouchEnd);
+    };
+  }, [mobileOpen]);
+
   const npcById = (id: number | null) => (id != null ? npcs.find((n) => n.id === id) : null);
 
   const handleDelete = async () => {
@@ -251,7 +288,7 @@ export function Sidebar() {
         >
           <Icon name={mobileOpen ? 'x' : 'menu'} size={22} />
         </button>
-        <nav className="mobile-topbar-nav" aria-label={t('nav.chat')}>
+        <nav className="mobile-topbar-nav" data-hscroll aria-label={t('nav.chat')}>
           <button
             className="mobile-home-button"
             type="button"
@@ -277,7 +314,7 @@ export function Sidebar() {
         </nav>
       </div>
       {mobileOpen && <button className="mobile-sidebar-backdrop" type="button" aria-label={t('common.close')} onClick={() => setMobileOpen(false)} />}
-      <aside className={`sidebar ${mobileOpen ? 'mobile-open' : ''}`}>
+      <aside ref={sidebarRef} className={`sidebar ${mobileOpen ? 'mobile-open' : ''}`}>
       <div className="sidebar-head">
         <div
           className="brand"

package/src/components/WorkspaceFileManagerModal.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
 import { Modal, Icon } from './shared';
-import { DeleteConfirmDialog } from './DeleteConfirmDialog';
 import { useT } from '../core/i18n';
 import { applySessionWorkspace } from '../core/tools/toolExecutor';
 import { deleteWorkspaceFile, listSessionWorkspaceFiles, openSessionWorkspace } from '../core/tools/generatedSkillExecutor';
@@ -59,6 +58,7 @@ export function WorkspaceFileManagerModal({ sessionId, onClose }: { sessionId: n
   const [files, setFiles] = useState<string[] | null>(null);
   const [loadState, setLoadState] = useState<'loading' | 'ok' | 'empty' | 'error'>('loading');
   const [pendingDelete, setPendingDelete] = useState<Node | null>(null);
+  const [deleting, setDeleting] = useState(false);
   const [openingLocation, setOpeningLocation] = useState(false);
   // 当前浏览目录（'' = 根；否则为以 / 结尾的会话内相对路径）
   const [dir, setDir] = useState('');
@@ -111,22 +111,29 @@ export function WorkspaceFileManagerModal({ sessionId, onClose }: { sessionId: n
       kind: kindFromPath(node.path),
       title: node.name,
       sessionId,
-      presentation: 'modal',
+      presentation: 'workspace',
     });
-    onClose();
   };
 
   const confirmDelete = async () => {
-    if (!pendingDelete) return;
-    const workspaceDir = await applySessionWorkspace(sessionId);
-    await deleteWorkspaceFile(pendingDelete.path, workspaceDir);
-    setFiles((current) => {
-      const next = (current ?? []).filter((path) => (
-        pendingDelete.isDir ? !path.startsWith(pendingDelete.path) : path !== pendingDelete.path
-      ));
-      setLoadState(next.length === 0 ? 'empty' : 'ok');
-      return next;
-    });
+    if (!pendingDelete || deleting) return;
+    setDeleting(true);
+    try {
+      const workspaceDir = await applySessionWorkspace(sessionId);
+      await deleteWorkspaceFile(pendingDelete.path, workspaceDir);
+      setFiles((current) => {
+        const next = (current ?? []).filter((path) => (
+          pendingDelete.isDir ? !path.startsWith(pendingDelete.path) : path !== pendingDelete.path
+        ));
+        setLoadState(next.length === 0 ? 'empty' : 'ok');
+        return next;
+      });
+      setPendingDelete(null);
+    } catch (error) {
+      addToast((error as Error).message, 'error');
+    } finally {
+      setDeleting(false);
+    }
   };
 
   const openWorkspaceLocation = async () => {
@@ -233,12 +240,24 @@ export function WorkspaceFileManagerModal({ sessionId, onClose }: { sessionId: n
         )}
       </div>
       {pendingDelete && (
-        <DeleteConfirmDialog
-          title={t('header.fileManagerDeleteTitle')}
-          itemName={pendingDelete.path}
-          onCancel={() => setPendingDelete(null)}
-          onConfirm={confirmDelete}
-        />
+        <div className="ws-fm-delete-layer" role="dialog" aria-modal="true" aria-labelledby="ws-fm-delete-title">
+          <div className="ws-fm-delete-dialog card fade-up">
+            <div className="modal-head">
+              <span id="ws-fm-delete-title" style={{ fontWeight: 800, fontSize: 15 }}>{t('header.fileManagerDeleteTitle')}</span>
+              <button className="icon-btn" onClick={() => setPendingDelete(null)} disabled={deleting} title={t('common.close')}>
+                <Icon name="x" />
+              </button>
+            </div>
+            <div className="modal-body">{t('common.confirmDelete', { name: pendingDelete.path })}</div>
+            <div className="modal-foot">
+              <button className="btn" onClick={() => setPendingDelete(null)} disabled={deleting}>{t('common.cancel')}</button>
+              <button className="btn btn-danger" onClick={() => void confirmDelete()} disabled={deleting}>
+                {deleting ? <span className="spinner" style={{ width: 13, height: 13 }} /> : <Icon name="trash" size={13} />}
+                {t('common.delete')}
+              </button>
+            </div>
+          </div>
+        </div>
       )}
     </Modal>
   );

package/src/components/shared.tsx

@@ -415,6 +415,8 @@ const ICONS: Record<string, React.ReactNode> = {
   'pip-exit': <><rect x="3" y="5" width="18" height="14" rx="2" /><path d="m14 14 5-5M15 9h4v4" /></>,
   'text-wrap': <><path d="M4 6h13a4 4 0 0 1 0 8H9" /><path d="m12 11-3 3 3 3M4 18h3" /></>,
   eye: <><path d="M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7-10-7-10-7z" /><circle cx="12" cy="12" r="3" /></>,
+  sun: <><circle cx="12" cy="12" r="4" /><path d="M12 2v2M12 20v2M4.93 4.93l1.41 1.41M17.66 17.66l1.41 1.41M2 12h2M20 12h2M4.93 19.07l1.41-1.41M17.66 6.34l1.41-1.41" /></>,
+  moon: <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z" />,
   folder: <><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z" /></>,
   copy: <><rect x="8" y="8" width="13" height="13" rx="2" /><path d="M5 16V6a2 2 0 0 1 2-2h10" /></>,
 };

package/src/core/i18n.ts

@@ -62,6 +62,7 @@ const MESSAGES: Record<LangKey, Record<string, string>> = {
     'nav.empty': '还没有会话，先去找酒馆老板聊聊？',
     'nav.noMatch': '没有匹配的会话',
     'nav.newConversation': '开始新对话…',
+    'nav.contextUsage': '上下文占用 {tokens}',
     'nav.deleteSession': '删除会话',
     'nav.editSession': '编辑会话',
     'nav.pinSession': '置顶对话',
@@ -89,6 +90,8 @@ const MESSAGES: Record<LangKey, Record<string, string>> = {
     'header.deleteTip': '删除对话',
     'header.deleteTitle': '删除对话',
     'header.deleteConfirm': '确定删除对话「{title}」？该操作不可恢复。',
+    'header.switchToLightTip': '切换到浅色模式',
+    'header.switchToDarkTip': '切换到深色模式',
     'header.workspaceHint': '本对话的专属工作目录。文件工具限制在该目录内；本地命令以此为起始目录，但不具备 OS 隔离。点击可浏览目录文件（只读）。',
     'header.workspaceRootHint': '酒馆老板的单人对话固定使用公共工作目录。文件工具限制在该目录内；本地命令不具备 OS 隔离。点击可浏览文件（只读）。',
     'header.fileManagerTitle': '工作区文件',
@@ -573,6 +576,7 @@ const MESSAGES: Record<LangKey, Record<string, string>> = {
     'nav.empty': '還沒有會話，先去找酒館老闆聊聊？',
     'nav.noMatch': '沒有符合的會話',
     'nav.newConversation': '開始新對話…',
+    'nav.contextUsage': '上下文佔用 {tokens}',
     'nav.deleteSession': '刪除會話',
     'nav.editSession': '編輯會話',
     'nav.pinSession': '置頂對話',
@@ -599,6 +603,8 @@ const MESSAGES: Record<LangKey, Record<string, string>> = {
     'header.deleteTip': '刪除對話',
     'header.deleteTitle': '刪除對話',
     'header.deleteConfirm': '確定刪除對話「{title}」？此操作無法復原。',
+    'header.switchToLightTip': '切換到淺色模式',
+    'header.switchToDarkTip': '切換到深色模式',
     'header.workspaceHint': '本對話的專屬工作目錄。檔案工具限制在該目錄內；本地指令以此為起始目錄，但不具備 OS 隔離。點擊可瀏覽目錄檔案（唯讀）。',
     'header.workspaceRootHint': '酒館老闆的單人對話固定使用公共工作目錄。檔案工具限制在該目錄內；本地指令不具備 OS 隔離。點擊可瀏覽檔案（唯讀）。',
     'header.fileManagerTitle': '工作區檔案',
@@ -1071,6 +1077,7 @@ const MESSAGES: Record<LangKey, Record<string, string>> = {
     'nav.empty': 'No sessions yet — go chat with the Tavern Keeper?',
     'nav.noMatch': 'No matching sessions',
     'nav.newConversation': 'Start a new conversation…',
+    'nav.contextUsage': 'Context usage {tokens}',
     'nav.deleteSession': 'Delete session',
     'nav.editSession': 'Edit conversation',
     'nav.pinSession': 'Pin conversation',
@@ -1097,6 +1104,8 @@ const MESSAGES: Record<LangKey, Record<string, string>> = {
     'header.deleteTip': 'Delete conversation',
     'header.deleteTitle': 'Delete conversation',
     'header.deleteConfirm': 'Delete conversation "{title}"? This cannot be undone.',
+    'header.switchToLightTip': 'Switch to light mode',
+    'header.switchToDarkTip': 'Switch to dark mode',
     'header.workspaceHint': 'This conversation\'s private workspace. File tools are restricted to it; local commands start here but are not OS-isolated. Click to browse its files (read-only).',
     'header.workspaceRootHint': 'A one-on-one conversation with the Tavern Keeper always uses the public workspace. File tools are restricted to it; local commands are not OS-isolated. Click to browse files (read-only).',
     'header.fileManagerTitle': 'Workspace files',

package/src/core/toolDefinitions.ts

@@ -1,7 +1,7 @@
 import type { ChatCompletionTool } from '../types/models';
 
-export const MAX_TOOL_CALL_DEPTH = 10;
-export const MAX_TOOL_CALLS_PER_TURN = 20;
+export const MAX_TOOL_CALL_DEPTH = 30;
+export const MAX_TOOL_CALLS_PER_TURN = 100;
 export const MAX_IDENTICAL_TOOL_CALLS = 3;
 export const MAX_CONSECUTIVE_TOOL_FAILURES = 3;
 export const NEW_TOPIC_MARKER = '开始新话题';

package/src/generated/changelog.json

@@ -1,7 +1,101 @@
 {
-  "latest": "0.1.16",
+  "latest": "0.1.18",
   "repo": "https://github.com/Rannichan/Tavern-Harness",
   "entries": [
+    {
+      "version": "0.1.18",
+      "date": "2026-10-25",
+      "breaking": false,
+      "compare": "v0.1.17...v0.1.18",
+      "groups": {
+        "zh-CN": [
+          {
+            "kind": "added",
+            "items": [
+              "聊天标题栏新增主题切换按钮，可在浅色与深色之间一键切换",
+              "会话标题下方显示当前上下文用量（如 `12.3K`），方便判断何时需要重置对话"
+            ]
+          },
+          {
+            "kind": "changed",
+            "items": [
+              "手机端支持左右滑动：从屏幕左边缘右滑打开侧边栏，在侧边栏内左滑关闭",
+              "模型选择按钮更紧凑：名称过长时自动省略，新增展开箭头，选择面板在点击面板外任意位置时关闭",
+              "提高单轮工具调用上限：每轮最多 100 次调用、最多 30 层嵌套，复杂任务不再轻易被中断",
+              "群聊标题栏不再重复显示成员名单"
+            ]
+          },
+          {
+            "kind": "fixed",
+            "items": [
+              "修复 Android 上点击工作区、顶栏等区域时出现灰色高亮块的问题"
+            ]
+          }
+        ],
+        "en": [
+          {
+            "kind": "added",
+            "items": [
+              "Added a theme toggle to the chat header for switching between light and dark in one tap",
+              "The session header now shows current context usage (for example `12.3K`), making it easier to judge when to reset a conversation"
+            ]
+          },
+          {
+            "kind": "changed",
+            "items": [
+              "Mobile now supports swipe gestures: swipe in from the left edge to open the sidebar, and swipe left inside it to close",
+              "The model selector is more compact: long model names are truncated, a caret indicates it opens a panel, and the panel closes when you tap anywhere outside it",
+              "Raised the per-turn tool limits to 100 calls and 30 levels of nesting, so complex tasks are interrupted far less often",
+              "Group chat headers no longer repeat the member list"
+            ]
+          },
+          {
+            "kind": "fixed",
+            "items": [
+              "Fixed gray tap-highlight boxes appearing when tapping the workspace, top bar, and other areas on Android"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.1.17",
+      "date": "2026-10-25",
+      "breaking": false,
+      "compare": "v0.1.16...v0.1.17",
+      "groups": {
+        "zh-CN": [
+          {
+            "kind": "changed",
+            "items": [
+              "在工作区文件管理器中预览文件时不再关闭管理器：预览复用管理器的遮罩层，关闭预览即可回到原来的浏览位置",
+              "文件删除确认改为管理器内的弹出对话框，删除过程中按钮显示加载状态，失败时会提示原因，不再静默关闭"
+            ]
+          },
+          {
+            "kind": "fixed",
+            "items": [
+              "修复在 Termux / Android 环境下 shell 命令无法解析的问题：现在会从 Termux 的 `$PREFIX/bin` 中查找受信任的命令，并保留 `head` 等 applet 的原始名称"
+            ]
+          }
+        ],
+        "en": [
+          {
+            "kind": "changed",
+            "items": [
+              "Previewing a file from the workspace file manager no longer closes the manager: the preview reuses the manager's overlay, and closing it returns you to the same browsing position",
+              "Delete confirmation is now a dialog inside the manager; the delete button shows a loading state while the request runs, and failures surface the reason instead of closing silently"
+            ]
+          },
+          {
+            "kind": "fixed",
+            "items": [
+              "Fixed shell commands failing to resolve on Termux / Android: trusted commands are now looked up in Termux's `$PREFIX/bin`, and applets such as `head` keep their original name"
+            ]
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.16",
       "date": "2026-10-25",

package/src/store/store.ts

@@ -90,8 +90,8 @@ export interface ActiveDisplay {
   title?: string;
   /** 产生该展示的会话 id（读取文件时按其专属工作目录解析，null = 共享工作区） */
   sessionId: number | null;
-  /** 初始展示方式；文件管理器使用大弹窗，file_display 默认使用小窗 */
-  presentation?: 'pip' | 'modal';
+  /** 初始展示方式；文件管理器预览复用其遮罩层，file_display 默认使用小窗 */
+  presentation?: 'pip' | 'modal' | 'workspace';
 }
 
 /** 启动阶段：加载中 / 数据就绪 / 核心数据加载失败（可重试） */
@@ -281,6 +281,23 @@ function sortNpcs(npcs: NpcCharacter[]): NpcCharacter[] {
   return [...npcs].sort((a, b) => Number(b.isBuiltIn) - Number(a.isBuiltIn) || a.createdAt - b.createdAt);
 }
 
+async function updateSessionContextTokens(
+  sessionId: number,
+  totalTokens: number,
+  loopIndex: number | null,
+): Promise<Partial<Pick<ChatSession, 'contextTokens' | 'contextTokensLoopIndex'>>> {
+  const session = await db.sessions.get(sessionId);
+  if (!session) return {};
+  if (session.mode !== 'GROUP') {
+    return { contextTokens: totalTokens, contextTokensLoopIndex: null };
+  }
+  const isCurrentLoop = session.contextTokensLoopIndex === loopIndex;
+  return {
+    contextTokens: isCurrentLoop ? Math.max(session.contextTokens ?? 0, totalTokens) : totalTokens,
+    contextTokensLoopIndex: loopIndex,
+  };
+}
+
 /** 单回合生成结果：ok 成功 / failed 失败（应回退） / stopped 用户主动停止（不回退） */
 type TurnResult = 'ok' | 'failed' | 'stopped';
 
@@ -686,6 +703,8 @@ export const useStore = create<AppState>((set, get) => ({
       turnQueueHistoryJson: session.turnQueueHistoryJson,
       loopIndex: session.loopIndex,
       lastMessage: session.lastMessage,
+      contextTokens: session.contextTokens,
+      contextTokensLoopIndex: session.contextTokensLoopIndex,
       updatedAt: session.updatedAt,
     };
 
@@ -703,6 +722,8 @@ export const useStore = create<AppState>((set, get) => ({
     await db.sessions.update(sessionId, {
       updatedAt: Date.now(),
       lastMessage: lastVisible ? sessionPreviewText(lastVisible.content) || '…' : '',
+      contextTokens: null,
+      contextTokensLoopIndex: null,
     });
 
     let result: TurnResult;
@@ -757,6 +778,8 @@ export const useStore = create<AppState>((set, get) => ({
       turnQueueHistoryJson: originalSession.turnQueueHistoryJson,
       loopIndex: originalSession.loopIndex,
       lastMessage: originalSession.lastMessage,
+      contextTokens: originalSession.contextTokens,
+      contextTokensLoopIndex: originalSession.contextTokensLoopIndex,
       updatedAt: originalSession.updatedAt,
     };
     // 编辑该消息，删除它之后的所有消息（不含自身）
@@ -1085,6 +1108,8 @@ export const useStore = create<AppState>((set, get) => ({
       turnQueueHistoryJson: queueHistoryJson([queue]),
       loopIndex: 0,
       lastMessage,
+      contextTokens: null,
+      contextTokensLoopIndex: null,
       updatedAt: Date.now(),
     });
     await get().loadMessages(sessionId);
@@ -2110,7 +2135,7 @@ async function performAssistantTurn(
     if (errorMsg) {
       const preserved = await persistPartialDraft(
         draftId, sessionId, content, thinking, request, rawLines, promptTokens, completionTokens,
-        startTime, model, !roundCounted, npc,
+        startTime, model, !roundCounted, npc, turnLoopIndex,
       );
       finishSessionActivity(sessionId);
       useStore.getState().addToast(translate('toast.genFailed', { msg: errorMsg }), 'error');
@@ -2121,7 +2146,7 @@ async function performAssistantTurn(
     if (stopped || abortController.signal.aborted) {
       await persistPartialDraft(
         draftId, sessionId, content, thinking, request, rawLines, promptTokens, completionTokens,
-        startTime, model, !roundCounted, npc,
+        startTime, model, !roundCounted, npc, turnLoopIndex,
       );
       break;
     }
@@ -2181,11 +2206,13 @@ async function performAssistantTurn(
       null
     );
 
-    // 更新会话预览
+    // 更新会话预览与本轮上下文占用。群聊同一轮保留各角色请求中的最大值。
     const preview = sessionPreviewText(normalizedContent);
+    const contextTokens = await updateSessionContextTokens(sessionId, promptTokens + finalTokens, turnLoopIndex);
     await db.sessions.update(sessionId, {
       updatedAt: Date.now(),
       lastMessage: preview || '…',
+      ...contextTokens,
     });
 
     if (finalToolCalls.length === 0 && session.mode !== 'GROUP') {
@@ -2400,7 +2427,8 @@ async function persistPartialDraft(
   startTime: number,
   model: string,
   countRound: boolean,
-  npc: NpcCharacter | null
+  npc: NpcCharacter | null,
+  loopIndex: number | null,
 ): Promise<boolean> {
   const latencyMs = Date.now() - startTime;
   const normalizedContent = trimEdgeNewlines(content);
@@ -2436,9 +2464,11 @@ async function persistPartialDraft(
     null
   );
   const preview = sessionPreviewText(normalizedContent);
+  const contextTokens = await updateSessionContextTokens(sessionId, promptTokens + finalTokens, loopIndex);
   await db.sessions.update(sessionId, {
     updatedAt: Date.now(),
     lastMessage: preview || '…',
+    ...contextTokens,
   });
   return true;
 }

package/src/theme/chat.css

@@ -465,7 +465,7 @@
   z-index: 1;
   display: flex;
   align-items: flex-end;
-  gap: 8px;
+  gap: 4px;
   max-width: 820px;
   margin: 0 auto;
   background: var(--surface);
@@ -509,37 +509,50 @@
 .composer-box .composer-model-btn {
   display: inline-flex;
   align-items: center;
-  gap: 5px;
+  gap: 4px;
   height: 40px;
   max-width: 180px;
-  padding: 0 10px;
+  padding: 0 4px;
+  border: 1px solid transparent;
   border-radius: 12px;
   flex-shrink: 0;
   background: var(--surface-2);
-  border: 1px solid var(--border-soft);
-  color: var(--primary);
+  color: var(--text-dim);
   font-size: 12px;
   font-weight: 600;
-  transition: background 0.32s cubic-bezier(0.16, 1, 0.3, 1), border-color 0.32s cubic-bezier(0.16, 1, 0.3, 1), box-shadow 0.32s cubic-bezier(0.16, 1, 0.3, 1);
+  transition: background 0.15s ease, color 0.15s ease;
 }
-.composer-box .composer-model-btn:hover {
-  background: color-mix(in srgb, var(--primary) 8%, transparent);
-  border-color: color-mix(in srgb, var(--primary) 28%, transparent);
-}
-/* 弹层打开（激活态）才显示辉光 */
+.composer-box .composer-model-btn:hover,
+.composer-box .composer-model-btn:active,
 .composer-box .composer-model-btn.open {
-  background: var(--primary-soft);
-  border-color: color-mix(in srgb, var(--primary) 44%, transparent);
-  box-shadow:
-    0 0 0 1px color-mix(in srgb, var(--primary) 22%, transparent),
-    0 0 8px color-mix(in srgb, var(--glow) 38%, transparent),
-    0 0 16px color-mix(in srgb, var(--glow) 16%, transparent);
+  background: var(--surface-2);
+  border-color: transparent;
+  box-shadow: 0 0 0 1px color-mix(in srgb, var(--primary) 24%, transparent);
+  color: var(--primary);
 }
 .composer-model-label {
+  min-width: 0;
+  flex: 1;
   white-space: nowrap;
   overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 120px;
+  max-width: 170px;
+}
+.composer-model-caret {
+  width: 0;
+  height: 0;
+  flex: 0 0 auto;
+  border-bottom: 4px solid currentColor;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  opacity: 0.7;
+  transition: transform 0.15s ease;
+}
+.composer-model-btn.open .composer-model-caret {
+  transform: rotate(180deg);
+}
+.composer-model-label.truncated {
+  -webkit-mask-image: linear-gradient(to right, #000 calc(100% - 16px), transparent);
+  mask-image: linear-gradient(to right, #000 calc(100% - 16px), transparent);
 }
 .composer-model {
   position: relative;
@@ -1269,12 +1282,12 @@
   .composer-box .composer-model-btn {
     width: auto;
     max-width: 104px;
-    padding: 0 8px;
+    padding: 0 4px;
   }
 
   .composer-model-label {
     display: block;
-    max-width: 86px;
+    max-width: 84px;
   }
 
   .composer-box textarea {

package/src/theme/global.css

@@ -83,6 +83,13 @@ button {
   font-family: inherit;
   cursor: pointer;
   white-space: nowrap;
+}
+
+/* Android WebView adds a blue overlay to non-button controls such as switch labels. */
+button,
+a,
+label,
+[role='button'] {
   -webkit-tap-highlight-color: transparent;
 }
 
@@ -1065,6 +1072,12 @@ body.resizing .sidebar-resizer {
   font-weight: 700;
   color: var(--primary);
 }
+.chat-header .tsub-context-group {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  margin-left: -6px;
+}
 
 /* ---------- 聊天头部右侧动作按钮 ---------- */
 .chat-actions {
@@ -1666,6 +1679,22 @@ hr.sep {
     display: none;
   }
 
+  /* 与桌面导航一致：仅在相应方向仍有内容被遮挡时淡出边缘。 */
+  .mobile-topbar-nav.has-overflow.hidden-left {
+    -webkit-mask-image: linear-gradient(to right, transparent 0, #000 18px);
+    mask-image: linear-gradient(to right, transparent 0, #000 18px);
+  }
+
+  .mobile-topbar-nav.has-overflow.hidden-right {
+    -webkit-mask-image: linear-gradient(to left, transparent 0, #000 18px);
+    mask-image: linear-gradient(to left, transparent 0, #000 18px);
+  }
+
+  .mobile-topbar-nav.has-overflow.hidden-left.hidden-right {
+    -webkit-mask-image: linear-gradient(to right, transparent 0, #000 18px, #000 calc(100% - 18px), transparent 100%);
+    mask-image: linear-gradient(to right, transparent 0, #000 18px, #000 calc(100% - 18px), transparent 100%);
+  }
+
   .mobile-home-button {
     display: inline-flex;
     align-items: center;

package/src/theme/views.css

@@ -1409,9 +1409,13 @@
   font-size: 13px;
 }
 /* ---------- 文件展示弹窗（file_display） ---------- */
+.display-modal-root {
+  z-index: 902;
+}
 .display-modal {
   width: min(880px, calc(100vw - 32px));
   height: min(82%, 720px);
+  overflow: hidden;
 }
 .display-pip {
   position: fixed;
@@ -1748,6 +1752,7 @@
   color: var(--text-dim);
   font-size: 13px;
   user-select: none;
+  -webkit-tap-highlight-color: transparent;
 }
 .ws-fm-row:hover {
   background: color-mix(in srgb, var(--primary) 10%, transparent);
@@ -1788,6 +1793,20 @@
   gap: 10px;
   flex: 1;
 }
+.ws-fm-delete-layer {
+  position: fixed;
+  inset: 0;
+  z-index: 902;
+  display: grid;
+  place-items: center;
+  padding: 16px;
+  pointer-events: auto;
+}
+.ws-fm-delete-dialog {
+  width: min(420px, 100%);
+  background: var(--surface);
+  box-shadow: var(--shadow-lg);
+}
 
 /* ---------- 版本记录（设置 → 关于） ---------- */
 .settings-about-section {

package/src/types/models.ts

@@ -151,6 +151,10 @@ export interface ChatSession {
   turnQueueHistoryJson: string;
   loopIndex: number;
   lastMessage: string;
+  /** 最近完成请求的上下文总 Token；群聊中为最新轮次所有请求的最大值。 */
+  contextTokens?: number | null;
+  /** contextTokens 对应的群聊轮次；单人会话为 null。 */
+  contextTokensLoopIndex?: number | null;
   /** 置顶标记：1 = 置顶（侧边栏会话列表置顶区），0 = 未置顶。默认 0（false） */
   pinned: number;
   updatedAt: number;