tavern-harness 0.1.15 → 0.1.17

package/CHANGELOG.md

@@ -3,6 +3,52 @@
 > 本文件由 `scripts/changelog.mjs` 从 `changelog/v*.md` 生成，请勿手动编辑。
 > 版本对比链接见文末；源文件位于仓库 `changelog/` 目录。
 
+## [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
+
+### 中文
+
+#### 修复
+
+- 修复工作区文件管理器在触屏设备上删除按钮不可见、文件夹无法删除的问题：删除按钮现在始终显示，文件夹及其内容可以一并删除，`public` 共享链接仍不可删除
+
+#### 内部
+
+- 工作区删除接口支持递归删除目录并拒绝删除 `public` 软链接，补充对应测试
+
+### English
+
+#### Fixed
+
+- Fixed the delete button staying hidden on touch devices and folders not being deletable in the workspace file manager: the button is now always visible, folders and their contents can be removed together, and the `public` shared link remains protected
+
+#### Internal
+
+- The workspace delete endpoint now removes directories recursively and refuses to delete the `public` symlink, with tests
+
 ## [0.1.15] - 2026-10-25
 
 ### 中文
@@ -444,6 +490,8 @@
 - Vite + React + Zustand + Dexie stack with browser-side local persistence
 
 <!-- 链接定义 -->
+[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
 [0.1.13]: https://github.com/Rannichan/Tavern-Harness/compare/v0.1.12...v0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tavern-harness",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "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 */ }
     }
   }
@@ -670,11 +678,20 @@ const server = createServer(async (req, res) => {
           throw new Error('Path is outside the workspace');
         }
         const fp = resolve(base, rel);
-        if (!existsSync(fp) || !lstatSync(fp).isFile()) throw new Error('File not found');
+        if (!existsSync(fp)) throw new Error('File or directory not found');
+        const entry = lstatSync(fp);
+        if (entry.isSymbolicLink() && rel === 'public') {
+          throw new Error('The public workspace link cannot be deleted');
+        }
+        if (!entry.isFile() && !entry.isDirectory()) throw new Error('Path is not a file or directory');
         if (!deletingPublicLink) assertInside(base, realpathSync(fp));
-        await new Promise((resolveDelete, rejectDelete) => {
-          unlink(fp, (err) => (err ? rejectDelete(err) : resolveDelete()));
-        });
+        if (entry.isDirectory()) {
+          rmSync(fp, { recursive: true, force: false });
+        } else {
+          await new Promise((resolveDelete, rejectDelete) => {
+            unlink(fp, (err) => (err ? rejectDelete(err) : resolveDelete()));
+          });
+        }
         res.end(JSON.stringify({ ok: true, path: rel }));
       } else {
         // file_list：返回会话工作目录内的相对路径（分组目录）

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/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';
@@ -11,7 +10,7 @@ import { useStore } from '../store/store';
 //  - 会话头部的工作目录标签点击打开
 //  - 只展示当前会话专属磁盘工作区（sandbox_workspace/）
 //  - 目录点击进入、支持返回上级与面包屑；文件点击复用 file_display 弹窗预览
-//  - 可在确认后删除文件（不删除目录）
+//  - 可在确认后删除文件或目录（public 软链接除外）
 // ============================================================
 
 function extOf(path: string): string {
@@ -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,20 +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) => 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 () => {
@@ -197,44 +206,58 @@ export function WorkspaceFileManagerModal({ sessionId, onClose }: { sessionId: n
                 <span className="ws-fm-name">..</span>
               </div>
             )}
-            {visible.map((n) =>
-              n.isDir ? (
-                <div key={n.path} className="ws-fm-row" role="button" onClick={() => setDir(n.path)} title={n.path}>
+            {visible.map((n) => {
+              const isPublicLink = n.isDir && n.path === 'public/';
+              return (
+                <div
+                  key={n.path}
+                  className="ws-fm-row"
+                  role="button"
+                  onClick={() => n.isDir ? setDir(n.path) : openFile(n)}
+                  title={n.path}
+                >
                   <span className="ws-fm-arrow" />
-                  <Icon name="folder" size={14} />
-                  <span className="ws-fm-name">{n.name}/</span>
+                  <Icon name={n.isDir ? 'folder' : 'file'} size={14} />
+                  <span className={`ws-fm-name${n.isDir ? '' : ' mono'}`}>{n.name}{n.isDir ? '/' : ''}</span>
+                  {!isPublicLink && (
+                    <span className="ws-fm-actions">
+                      <button
+                        className="icon-btn ws-fm-delete"
+                        title={t('common.delete')}
+                        aria-label={t('common.delete')}
+                        onClick={(event) => {
+                          event.stopPropagation();
+                          setPendingDelete(n);
+                        }}
+                      ><Icon name="trash" size={13} /></button>
+                    </span>
+                  )}
                 </div>
-              ) : (
-                <div key={n.path} className="ws-fm-row" role="button" onClick={() => openFile(n)} title={n.path}>
-                  <span className="ws-fm-arrow" />
-                  <Icon name="file" size={14} />
-                  <span className="ws-fm-name mono">{n.name}</span>
-                  <span className="ws-fm-actions">
-                    <span className="ws-fm-open"><Icon name="eye" size={12} /></span>
-                    <button
-                      className="icon-btn ws-fm-delete"
-                      title={t('common.delete')}
-                      aria-label={t('common.delete')}
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        setPendingDelete(n);
-                      }}
-                    ><Icon name="trash" size={13} /></button>
-                  </span>
-                </div>
-              )
-            )}
+              );
+            })}
             {visible.length === 0 && <div className="ws-fm-empty">{t('header.fileManagerEmpty')}</div>}
           </div>
         )}
       </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/core/tools/generatedSkillExecutor.ts

@@ -462,7 +462,7 @@ export async function writeWorkspaceFileTextFor(
   return diskFileWrite(normalizedPath, content, false, workspaceDir);
 }
 
-/** 删除工作区中的单个文件。 */
+/** 删除工作区中的文件或目录。 */
 export async function deleteWorkspaceFile(path: string, workspaceDir: string): Promise<void> {
   const normalizedPath = normalizePath(path);
   if (!normalizedPath) throw new Error('Invalid path');

package/src/generated/changelog.json

@@ -1,7 +1,81 @@
 {
-  "latest": "0.1.15",
+  "latest": "0.1.17",
   "repo": "https://github.com/Rannichan/Tavern-Harness",
   "entries": [
+    {
+      "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",
+      "breaking": false,
+      "compare": "v0.1.15...v0.1.16",
+      "groups": {
+        "zh-CN": [
+          {
+            "kind": "fixed",
+            "items": [
+              "修复工作区文件管理器在触屏设备上删除按钮不可见、文件夹无法删除的问题：删除按钮现在始终显示，文件夹及其内容可以一并删除，`public` 共享链接仍不可删除"
+            ]
+          },
+          {
+            "kind": "internal",
+            "items": [
+              "工作区删除接口支持递归删除目录并拒绝删除 `public` 软链接，补充对应测试"
+            ]
+          }
+        ],
+        "en": [
+          {
+            "kind": "fixed",
+            "items": [
+              "Fixed the delete button staying hidden on touch devices and folders not being deletable in the workspace file manager: the button is now always visible, folders and their contents can be removed together, and the `public` shared link remains protected"
+            ]
+          },
+          {
+            "kind": "internal",
+            "items": [
+              "The workspace delete endpoint now removes directories recursively and refuses to delete the `public` symlink, with tests"
+            ]
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.15",
       "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';
 }
 
 /** 启动阶段：加载中 / 数据就绪 / 核心数据加载失败（可重试） */

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;
@@ -1769,21 +1773,10 @@
   align-items: center;
   gap: 4px;
 }
-.ws-fm-open {
-  display: inline-flex;
-  align-items: center;
-  opacity: 0.55;
-}
 .ws-fm-delete {
   width: 26px;
   height: 26px;
   color: var(--text-faint);
-  opacity: 0;
-}
-.ws-fm-row:hover .ws-fm-open,
-.ws-fm-row:hover .ws-fm-delete,
-.ws-fm-delete:focus-visible {
-  opacity: 1;
 }
 .ws-fm-delete:hover {
   color: var(--danger);
@@ -1799,6 +1792,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 {