@aiti-ai/aiti-editor 1.0.9 → 1.0.11

package/README.md

@@ -1,38 +1,30 @@
 # @aiti-ai/aiti-editor
 
-> 可扩展编辑器 —— Monaco 编辑接管 + 保存（mtime 冲突 409 + 白名单/大小校验）+ 压缩包解析 + 统一图片查看器（消息图片/文件图片合一，缩放·捏合·信息面板）
+> Extensible editor — Monaco editing take over + save (mtime conflict 409 + whitelist/size checks) + archive extraction + unified image viewer (message images and file images unified, zoom · pinch · info panel)
 
-## 来源 · Origin
+English · [简体中文](./README.zh-CN.md)
 
-本包是 **aiti** 生态的组成部分——以 [pi](https://pi.dev) 为引擎的个人 AI 开发工作台与本地调试注入生态：**aiti-agent**（自托管 Web 工作台，基于开源项目 [pi-web](https://github.com/aiti-ai/pi-web) 构建，浏览器为主操作面）+ 各开发工具内的调试注入（aiti-devtools）+ 丰富的扩展体系。
+## About aiti
 
 This package is part of the **aiti** ecosystem — a personal AI development workbench powered by [pi](https://pi.dev): **aiti-agent** (a self-hosted web workbench built on the open-source [pi-web](https://github.com/aiti-ai/pi-web)) plus debug injection into mainstream dev tools (aiti-devtools) and a rich extension system.
 
-- 工作台 / workbench: <https://github.com/aiti-ai/pi-web>
-- 生态仓库 / monorepo: <https://github.com/aiti-ai/aiti-ai>
-- 官网 / site: <https://aiti.pw>
+- Workbench (aiti-agent, built on pi-web): <https://github.com/aiti-ai/pi-web>
+- Ecosystem monorepo: <https://github.com/aiti-ai/aiti-ai>
+- Site: <https://aiti.pw>
 
-## 功能定位（中文）
+Category: Developer tools · Tags: `editor` · `monaco` · `save` · `file-viewer` · `archive`
 
-可扩展编辑器 —— Monaco 编辑接管 + 保存（mtime 冲突 409 + 白名单/大小校验）+ 压缩包解析 + 统一图片查看器（消息图片/文件图片合一，缩放·捏合·信息面板）
+## Install
 
-开发工具 · tags: `editor` · `monaco` · `save` · `file-viewer` · `archive`
+Bundled with **aiti-agent** (`@aiti-ai/pi-web`) — enable it from the in-app extension manager (ExtMan / App Center).
 
-## Positioning (English)
+Manual install: place this package at `~/.pi/web/extensions/aiti-editor/` and reload pi-web.
 
-Extensible editor — Monaco editing take over + save (mtime conflict 409 + whitelist/size checks) + archive extraction + unified image viewer (message images and file images unified, zoom · pinch · info panel)
+## Documentation
 
-## 安装 / 部署
-
-```bash
-# 部署到 ~/.pi/web/extensions/aiti-editor/ 后 reload
-```
-
-## 文档 · Documentation
-
-- 中文完整文档（aiti-docs）: <https://aiti.pw/extensions/aiti-editor.html>
-- English docs: <https://aiti.pw/en/extensions/aiti-editor.html>
-- 扩展注册表 / registry: <https://aiti.pw/extensions.html> · machine-readable <https://aiti.pw/extensions.json>
+- Documentation (English): <https://aiti.pw/en/extensions/aiti-editor.html>
+- 文档（中文）: <https://aiti.pw/extensions/aiti-editor.html>
+- Extension registry: <https://aiti.pw/extensions.html> · machine-readable <https://aiti.pw/extensions.json>
 
 ## License
 

package/README.zh-CN.md

@@ -0,0 +1,31 @@
+# @aiti-ai/aiti-editor
+
+> 可扩展编辑器 —— Monaco 编辑接管 + 保存（mtime 冲突 409 + 白名单/大小校验）+ 压缩包解析 + 统一图片查看器（消息图片/文件图片合一，缩放·捏合·信息面板）
+
+[English](./README.md) · 简体中文
+
+## 关于 aiti
+
+本包是 **aiti** 生态的组成部分——以 [pi](https://pi.dev) 为引擎的个人 AI 开发工作台与本地调试注入生态：**aiti-agent**（自托管 Web 工作台，基于开源项目 [pi-web](https://github.com/aiti-ai/pi-web) 构建，浏览器为主操作面）+ 各开发工具内的调试注入（aiti-devtools）+ 丰富的扩展体系。
+
+- 工作台（aiti-agent，基于 pi-web）: <https://github.com/aiti-ai/pi-web>
+- 生态仓库: <https://github.com/aiti-ai/aiti-ai>
+- 官网: <https://aiti.pw>
+
+分类: 开发工具 · tags: `editor` · `monaco` · `save` · `file-viewer` · `archive`
+
+## 安装
+
+随 **aiti-agent**（`@aiti-ai/pi-web`）捆绑发行——在工作台内的扩展管理器（ExtMan / 应用中心）启用即可。
+
+手动安装：把本包放到 `~/.pi/web/extensions/aiti-editor/` 后 reload。
+
+## 文档
+
+- 中文文档: <https://aiti.pw/extensions/aiti-editor.html>
+- Documentation (English): <https://aiti.pw/en/extensions/aiti-editor.html>
+- 扩展注册表: <https://aiti.pw/extensions.html> · machine-readable <https://aiti.pw/extensions.json>
+
+## 许可证
+
+ISC

package/client/src/disk-refresh.test.mjs

@@ -0,0 +1,69 @@
+/**
+ * disk-refresh.ts tests — disk-change auto-refresh decision layer (pure functions).
+ *
+ * Plan: docs/aiti-editor-preview-watch-refresh-plan.md §3.4
+ * Run: node --experimental-strip-types --test pi-web-ext/aiti-editor/client/src/disk-refresh.test.mjs
+ */
+import assert from "node:assert/strict";
+import test from "node:test";
+
+const { sameDiskSig, shouldAutoReload, throttleOk, sigOfFrame } = await import("./disk-refresh.ts");
+
+// ── sameDiskSig（保存回环抑制）──
+test("sameDiskSig: identical sigs match", () => {
+  assert.equal(sameDiskSig({ mtimeMs: 1000, size: 5 }, { mtimeMs: 1000, size: 5 }), true);
+});
+
+test("sameDiskSig: mtime within ±2ms tolerance matches (float save response vs floored frame)", () => {
+  assert.equal(sameDiskSig({ mtimeMs: 1000.4, size: 5 }, { mtimeMs: 1000, size: 5 }), true);
+  assert.equal(sameDiskSig({ mtimeMs: 1002, size: 5 }, { mtimeMs: 1000, size: 5 }), true);
+});
+
+test("sameDiskSig: mtime beyond tolerance does not match", () => {
+  assert.equal(sameDiskSig({ mtimeMs: 1003, size: 5 }, { mtimeMs: 1000, size: 5 }), false);
+});
+
+test("sameDiskSig: size mismatch does not match even with same mtime", () => {
+  assert.equal(sameDiskSig({ mtimeMs: 1000, size: 6 }, { mtimeMs: 1000, size: 5 }), false);
+});
+
+test("sameDiskSig: null/undefined/missing-mtime never match", () => {
+  assert.equal(sameDiskSig(null, { mtimeMs: 1, size: 1 }), false);
+  assert.equal(sameDiskSig({ mtimeMs: 1, size: 1 }, undefined), false);
+  assert.equal(sameDiskSig({ mtimeMs: undefined, size: 1 }, { mtimeMs: 1, size: 1 }), false);
+});
+
+// ── shouldAutoReload（视图分派）──
+test("shouldAutoReload: binary views always reload", () => {
+  assert.equal(shouldAutoReload("binary", true), true);
+  assert.equal(shouldAutoReload("binary", false), true);
+});
+
+test("shouldAutoReload: text view reloads only when clean", () => {
+  assert.equal(shouldAutoReload("text", false), true);
+  assert.equal(shouldAutoReload("text", true), false);
+});
+
+// ── throttleOk（自动重载节流）──
+test("throttleOk: first reload (last=0) always allowed", () => {
+  assert.equal(throttleOk(0, 5000, 1000), true);
+});
+
+test("throttleOk: within interval denied, at/past interval allowed", () => {
+  assert.equal(throttleOk(5000, 5999, 1000), false);
+  assert.equal(throttleOk(5000, 6000, 1000), true);
+});
+
+// ── sigOfFrame（帧解析）──
+test("sigOfFrame: valid frame parsed", () => {
+  assert.deepEqual(sigOfFrame({ mtimeMs: 123, size: 7 }), { mtimeMs: 123, size: 7 });
+});
+
+test("sigOfFrame: malformed frames → null", () => {
+  assert.equal(sigOfFrame(null), null);
+  assert.equal(sigOfFrame(undefined), null);
+  assert.equal(sigOfFrame({}), null);
+  assert.equal(sigOfFrame({ mtimeMs: NaN, size: 1 }), null);
+  assert.equal(sigOfFrame({ mtimeMs: 1, size: -1 }), null);
+  assert.equal(sigOfFrame({ mtimeMs: "123", size: 1 }), null);
+});

package/client/src/disk-refresh.ts

@@ -0,0 +1,64 @@
+/**
+ * aiti-editor · disk-change auto-refresh decision layer (pure functions, zero window/ctx deps).
+ *
+ * Plan: docs/aiti-editor-preview-watch-refresh-plan.md §3.1
+ *
+ * Why a standalone module: the ed-watch frame used to be consumed only by media files
+ * (isMediaFile hardcoded in the watch effect). Generalizing watch to all file types widens
+ * the decision surface (own-save echo suppression / throttle / per-view dispatch), so the
+ * decisions live here where node --test can pin them down.
+ */
+
+/** Signature of the file on disk as seen by an ed-watch frame or a /stat response. */
+export interface DiskSig { mtimeMs: number; size: number }
+
+/**
+ * Echo suppression: does this frame signature match the last disk state we already know?
+ * Used to ignore frames caused by our own save (the /save response reports the new
+ * mtimeMs+size, which we record in diskSigRef). mtime tolerance ±2ms absorbs the
+ * float→floor conversion done server-side (`Math.floor(mtimeMs)` in the watch frame).
+ */
+export function sameDiskSig(a: DiskSig | null | undefined, b: DiskSig | null | undefined): boolean {
+  if (!a || !b) return false;
+  if (typeof a.mtimeMs !== "number" || typeof b.mtimeMs !== "number") return false;
+  return Math.abs(a.mtimeMs - b.mtimeMs) <= 2 && a.size === b.size;
+}
+
+/** Which kind of view is currently shown for this file. */
+export type ViewKind = "binary" | "text";
+
+/**
+ * Should an incoming disk-change frame trigger an automatic reload?
+ * - binary views (image / video / audio / pdf / archive): always — they are read-only,
+ *   there is no unsaved buffer to lose.
+ * - text views (edit / split / preview): only when clean. With unsaved edits we never
+ *   silently overwrite — the caller shows the existing "disk modified" bar instead
+ *   (three-way merge / load from disk / keep local).
+ */
+export function shouldAutoReload(kind: ViewKind, dirty: boolean): boolean {
+  if (kind === "binary") return true;
+  return !dirty;
+}
+
+/**
+ * Throttle gate for automatic text reloads: agents streaming into a file can produce a
+ * frame every 300ms (server debounce); reloading + re-rendering Monaco that often is
+ * wasteful, so automatic reloads keep a minimum interval. Skipped frames still update
+ * the known signature (the next frame or the manual Reload menu item catches up).
+ */
+export function throttleOk(lastReloadAt: number, now: number, minIntervalMs = 1000): boolean {
+  return now - lastReloadAt >= minIntervalMs;
+}
+
+/**
+ * Parse an ed-watch frame into a DiskSig. Returns null for malformed frames
+ * (missing/NaN fields) and for "gone" frames — the caller handles gone separately.
+ */
+export function sigOfFrame(frame: { mtimeMs?: unknown; size?: unknown } | null | undefined): DiskSig | null {
+  if (!frame) return null;
+  const mtimeMs = frame.mtimeMs;
+  const size = frame.size;
+  if (typeof mtimeMs !== "number" || !isFinite(mtimeMs)) return null;
+  if (typeof size !== "number" || !isFinite(size) || size < 0) return null;
+  return { mtimeMs, size };
+}

package/client/src/editor-app.tsx

@@ -11,6 +11,7 @@ import { ENCODINGS, encDisplay, formatSize, mdSlug, sourceLinesForText, isDarkTh
 import { detectLanguage, mdFenceDescriptors } from "./registry";
 import { markdownPreviewHtml, markdownRenderHtml } from "./markdown";
 import { previewKindOf, defaultViewModeOf, previewModeItems } from "./preview";
+import { sameDiskSig, shouldAutoReload, throttleOk, sigOfFrame, type DiskSig } from "./disk-refresh";
 import { getPopover, previewClickInfo, closePreviewPopover, mdSmartEnabled } from "./md-smart";
 import { openViewerWindow } from "../../../_shared/open-viewer-window";
 import { openNewSessionWithExtSvc } from "../../../_shared/new-session-cwd";
@@ -171,12 +172,20 @@ export function EditorApp(props: Record<string, any>) {
     return () => { alive = false; };
   }, [filePath]);
   // watch 走 pi-web 页面事件流（globalThis.__piPageEvents 广播的 ed-watch 帧，帧带
-  // 随机 watchId，浏览器按 id 过滤；路径/句柄不进 URL）。仅播放中启用（连接池保护）；
-  // 页面事件流客户端缺席（core 过旧）→ 静态预览降级。
+  // 随机 watchId，浏览器按 id 过滤；路径/句柄不进 URL）。全类型文件打开期间常开
+  // （总线共享连接，零新增 socket；服务端 30min 无事件自动停兜底）。
+  // 页面事件流客户端缺席（core 过旧）→ 静态预览降级 + ⋯菜单「重新加载」手动兜底。
+  // 帧分派决策（回环抑制/节流/视图路由）见 ./disk-refresh（方案 §3.1）。
+  const diskSigRef = useRef<DiskSig | null>(null);      // 最近已知磁盘签名（自己保存的回声抑制）
+  const lastDiskReloadRef = useRef(0);                   // 文本自动重载节流游标
+  const archiveTickRef = useRef(0);                      // 压缩包列表刷新 tick（帧到 → 重拉列表）
+  const [archiveTick, setArchiveTick] = useState(0);
   useEffect(() => {
     setMediaBust(0);
     setMediaDuration(null);
-    if (!isMediaFile || props.watchEnabled === false) return; // 总线共享连接，不占额外 socket——媒体打开期间常开
+    diskSigRef.current = null;
+    lastDiskReloadRef.current = 0;
+    if (props.watchEnabled === false) return;
     let dead = false;
     let unsub: (() => void) | null = null;
     let watchId: string | null = null;
@@ -199,14 +208,74 @@ export function EditorApp(props: Record<string, any>) {
         if (!watchId) return;
         unsub = client.subscribePageFrames((frame: any) => {
           if (dead || frame.type !== "ed-watch" || frame.id !== watchId) return;
-          setMediaBust((v: number) => v + 1);
+          try { diskFrameRef.current(frame); } catch { /* 帧处理异常不扩散 */ }
         });
         setWatchLive(true);
       } catch { /* 静默降级为静态预览 */ }
     };
     open();
     return () => { dead = true; setWatchLive(false); stop(); try { unsub?.(); } catch { /* noop */ } };
-  }, [filePath, isMediaFile, props.watchEnabled]);
+  }, [filePath, props.watchEnabled]);
+
+  // 从磁盘重读文本并重置编辑缓冲（watch 帧 clean 自动刷新 / ⋯菜单「重新加载」共用）。
+  // setValue → onDidChangeModelContent → bumpPreview 自动联动预览刷新；基线签名同步
+  // diskSigRef（下一次自己保存前的帧不再误报）。
+  const reloadFromDisk = useCallback((sig?: DiskSig | null) => {
+    const encU = meta && meta.encoding ? "&encoding=" + encodeURIComponent(meta.encoding) : "";
+    const statP = api("/stat?filePath=" + encodeURIComponent(filePath)).then((r) => r.json()).catch(() => null);
+    const rawP = api("/raw?filePath=" + encodeURIComponent(filePath) + encU).then((r) => r.json());
+    Promise.all([statP, rawP]).then(([m, d]) => {
+      if (d.error) { setNotice({ kind: "warn", text: "刷新失败：" + d.error }); return; }
+      const content = d.content || "";
+      const mtimeMs = (m && m.ok && typeof m.mtimeMs === "number") ? m.mtimeMs : (sig ? sig.mtimeMs : Date.now());
+      const size = (m && m.ok && typeof m.size === "number") ? m.size : (sig ? sig.size : content.length);
+      const ed = editorRef.current;
+      if (ed) ed.setValue(content);
+      initialContentRef.current = content;
+      setMeta((prev: any) => (prev ? { ...prev, content, size } : prev));
+      const cache = (window as any).__aitiEditor._cacheGet(filePath);
+      if (cache) { cache.content = content; cache.original = content; cache.baseMtimeMs = mtimeMs; cache.size = size; }
+      baseMtimeRef.current = mtimeMs;
+      diskSigRef.current = { mtimeMs, size };
+      setDirty(false);
+      (window as any).__aitiEditor._setDirty(filePath, false);
+      setExtChange(null);
+    }).catch(() => { /* 下一次帧/渲染期磁盘检查兜底 */ });
+  }, [filePath, meta, bumpPreview]);
+
+  // ⋯菜单「重新加载」：clean 直接重读磁盘；dirty 不丢编辑 → 拉真实磁盘签名后弹
+  // 「磁盘已修改」条（三路合并/加载磁盘版/保留当前）；二进制 → bust 强制重载。
+  const doReload = useCallback(() => {
+    if (fileType !== "text") { setMediaBust((v: number) => v + 1); if (fileType === "archive") { archiveTickRef.current += 1; setArchiveTick(archiveTickRef.current); } return; }
+    if (dirty) {
+      api("/stat?filePath=" + encodeURIComponent(filePath)).then((r) => r.json())
+        .then((m) => setExtChange({ diskMtimeMs: (m && m.ok && typeof m.mtimeMs === "number") ? m.mtimeMs : Date.now(), diskSize: (m && m.ok && typeof m.size === "number") ? m.size : 0 }))
+        .catch(() => setExtChange({ diskMtimeMs: Date.now(), diskSize: 0 }));
+      return;
+    }
+    reloadFromDisk(null);
+  }, [filePath, fileType, dirty, reloadFromDisk]);
+
+  // 帧分派（每渲染重挂 ref——闭包始终拿最新 dirty/meta/fileType；订阅本身不随渲染重启）
+  const diskFrameRef = useRef<(frame: any) => void>(() => {});
+  useEffect(() => {
+    diskFrameRef.current = (frame: any) => {
+      if (frame.gone) { setNotice({ kind: "warn", text: "磁盘上的文件已不存在（可能被移动或删除）" }); return; }
+      const sig = sigOfFrame(frame);
+      if (!sig) return;
+      if (sameDiskSig(sig, diskSigRef.current)) return; // 自己保存的回声 / 已知状态，忽略
+      diskSigRef.current = sig;
+      if (fileType !== "text") {
+        setMediaBust((v: number) => v + 1); // 图片/PDF/媒体：bust 换缓存指纹重载
+        if (fileType === "archive") { archiveTickRef.current += 1; setArchiveTick(archiveTickRef.current); } // 压缩包列表重拉
+        return;
+      }
+      if (!shouldAutoReload("text", dirty)) { setExtChange({ diskMtimeMs: sig.mtimeMs, diskSize: sig.size }); return; }
+      if (!throttleOk(lastDiskReloadRef.current, Date.now(), 1000)) return; // 高频写节流，下一帧/菜单兜底
+      lastDiskReloadRef.current = Date.now();
+      reloadFromDisk(sig);
+    };
+  }); // 无依赖数组：每渲染更新
   const isMarkdown = language === "markdown";
   // 预览面能力判定（方案 §3.1）：`isMarkdown` 此后只管 markdown 专属功能（md-smart 弹层、TOC
   // 滚动同步、表格格式化、导出 HTML/PDF），预览壳/分栏/模式切换器一律看 canPreview
@@ -221,7 +290,7 @@ export function EditorApp(props: Record<string, any>) {
       .then((r) => r.json())
       .then((d) => { if (d.ok) setArchiveFiles(d.files); else setArchiveErr(d.error || "解析失败"); })
       .catch((e) => setArchiveErr(String(e)));
-  }, [filePath, fileType]);
+  }, [filePath, fileType, archiveTick]); // archiveTick：ed-watch 帧到 → 重拉列表（磁盘上包被换了）
 
   // ── 同目录文件遍历（‹ ›）：服务端深度遍历（DFS、按名排序），仅文件不含文件夹 ──
   // 遍历根：优先项目根 cwd（子树走到头自然接上父级的下一个子树，不会卡在叶节点）；
@@ -349,6 +418,7 @@ export function EditorApp(props: Record<string, any>) {
         .then((m) => {
           if (m && m.ok && typeof m.mtimeMs === "number") {
             baseMtimeRef.current = m.mtimeMs;
+            diskSigRef.current = { mtimeMs: m.mtimeMs, size: m.size || 0 };
             if (Math.abs(m.mtimeMs - cache.baseMtimeMs) > 1) {
               // 磁盘变了，静默合并
               const original = cache.original || "";
@@ -400,6 +470,10 @@ export function EditorApp(props: Record<string, any>) {
       return;
     }
     const u = new URLSearchParams({ encoding: openEncoding });
+    // stat 与 /raw 并行：缓存基线（baseMtimeMs）必须是【磁盘真实 mtime】而非 Date.now()——
+    // 否则服务端缓存的基线永远「比磁盘新」，磁盘新鲜度门卫（下方 stale 判定）永远失效。
+    const diskStatP = api("/stat?filePath=" + encodeURIComponent(filePath), { method: "GET" })
+      .then((r) => r.json()).catch(() => null);
     api("/raw?filePath=" + encodeURIComponent(filePath) + "&" + u.toString())
       .then((r) => r.json())
       .then((d) => {
@@ -408,13 +482,31 @@ export function EditorApp(props: Record<string, any>) {
         // 先检查服务端缓存（多开恢复）：必须早于 setMeta/setStatus——否则 Monaco create
         // 触发 onDidChangeModelContent 写回原版覆盖服务端编辑
         let _recoveredSrv: any = null;
-        (window as any).__aitiEditor._cacheFetchFromServer(filePath, true).then((srv: any) => {
+        (window as any).__aitiEditor._cacheFetchFromServer(filePath, true).then(async (srv: any) => {
           _recoveredSrv = srv;
           if (srv && srv.contentHash && srv.contentHash !== (window as any).__aitiEditor._hashContent(next.content)) {
-            next.content = srv.content;
-            next.encoding = srv.encoding || next.encoding;
+            // 磁盘新鲜度门卫（重开显示最新版）：用【基线内容 hash】而非 mtime——
+            // 缓存的 original = 上次会话看到的磁盘版；它与当前磁盘内容不一致 = 文件已被
+            // 外部更新（agent/shell），旧「未保存编辑」不再值得恢复 → 放弃恢复（磁盘版为准）
+            // 并清掉过期服务端缓存，避免下次打开再误判 dirty。（mtime 维度不可靠：精度/回拨/旧版污染）
+            try {
+              const stale = srv && srv.original != null
+                && (window as any).__aitiEditor._hashContent(String(srv.original))
+                  !== (window as any).__aitiEditor._hashContent(d.content || "");
+              if (stale) {
+                _recoveredSrv = null;
+                api("/cache-delete", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ filePath }) }).catch(() => {});
+                next.content = d.content || "";
+                next.encoding = d.encoding || "utf-8";
+                next.hasBOM = d.hasBOM === true;
+                next.size = d.size || next.content.length;
+              } else {
+                next.content = srv.content;
+                next.encoding = srv.encoding || next.encoding;
+              }
+            } catch { next.content = srv.content; next.encoding = srv.encoding || next.encoding; }
           }
-        }).finally(() => {
+        }).finally(async () => {
           const isRecovered = _recoveredSrv && _recoveredSrv.contentHash && _recoveredSrv.contentHash !== (window as any).__aitiEditor._hashContent(d.content || "");
           const baseline = isRecovered ? (_recoveredSrv.original || _recoveredSrv.content) : next.content;
           initialContentRef.current = baseline;
@@ -422,10 +514,13 @@ export function EditorApp(props: Record<string, any>) {
           setStatus({ phase: "ready", error: null });
           (window as any).__aitiEditor._setDirty(filePath, isRecovered);
           setDirty(isRecovered);
-          // 建缓存：恢复时 original=服务端基线（磁盘原版）→ dirty 判定正确
+          // 建缓存：恢复时 original=服务端基线（磁盘原版）→ dirty 判定正确；
+          // baseMtimeMs = 磁盘真实 mtime（新鲜度门卫的基线信号，绝不能用 Date.now()）
+          const _ds: any = await diskStatP.catch(() => null);
+          const _diskMtime = _ds && _ds.ok && typeof _ds.mtimeMs === "number" ? _ds.mtimeMs : Date.now();
           (window as any).__aitiEditor._cacheSet(filePath, {
             content: next.content, original: baseline,
-            baseMtimeMs: Date.now(), language: next.language, size: next.size,
+            baseMtimeMs: _diskMtime, language: next.language, size: next.size,
             encoding: next.encoding, hasBOM: next.hasBOM,
           });
           if (isRecovered) {
@@ -437,6 +532,7 @@ export function EditorApp(props: Record<string, any>) {
           .then((m) => {
             const mtimeMs = m && m.ok && typeof m.mtimeMs === "number" ? m.mtimeMs : Date.now();
             baseMtimeRef.current = mtimeMs;
+            diskSigRef.current = { mtimeMs, size: (m && m.ok && typeof m.size === "number") ? m.size : 0 };
             // 缓存已建 → 只更新 baseMtime，不覆盖 content/original
             const ec = (window as any).__aitiEditor._cacheGet(filePath);
             if (ec) { ec.baseMtimeMs = mtimeMs; }
@@ -993,6 +1089,7 @@ export function EditorApp(props: Record<string, any>) {
           }
           if (!r.ok) { setNotice({ kind: "err", text: d.error || "\u4FDD\u5B58\u5931\u8D25 (" + r.status + ")" }); return; }
           baseMtimeRef.current = d.mtimeMs;
+          diskSigRef.current = { mtimeMs: d.mtimeMs, size: typeof d.size === "number" ? d.size : editor.getValue().length }; // 回环抑制：自己保存触发的帧不再误报
           if (encOverride) {
             const c2 = (window as any).__aitiEditor._cacheGet(filePath);
             if (c2) { c2.encoding = encOverride.encoding; c2.hasBOM = encOverride.hasBOM === true; }
@@ -1789,7 +1886,7 @@ useEffect(() => {
   ) : null;
 
   const renderBinaryBar = (typeLabel: string) => {
-    const live = isMediaFile && watchLive;
+    const live = watchLive; // 全类型二进制视图都显示「实时」徽标（watch 已泛化到所有文件）
     const info = (
       <span style={{ display: "inline-flex", alignItems: "center", gap: 6, minWidth: 0, flexShrink: 1, overflow: "hidden",
         color: "var(--text-dim,#888)", fontSize: 11, fontFamily: "var(--font-mono, ui-monospace, monospace)" }}>
@@ -1821,6 +1918,7 @@ useEffect(() => {
         onMove={doMove}
         onNewWindow={openInNewWindow}
         onTerminal={openTerminal}
+        onReload={doReload}
         menuTop={[...extMenuTop, ...menuTopExtra]}
         infoAfterNav={info}
       />
@@ -1928,8 +2026,8 @@ useEffect(() => {
         <div style={{ display: "flex", flexDirection: "column", height: "100%", overflow: "hidden", background: "var(--bg,#fff)", position: "relative" }}>
           {renderBinaryBar(typeLabel)}
           <div style={{ flex: 1, minHeight: 0, minWidth: 0, position: "relative" }}>
-            {fileUrl
-              ? <ImageViewer src={fileUrl} filePath={filePath} fileSize={meta ? meta.size : undefined} mtimeMs={meta ? meta.mtimeMs : undefined} onSrcError={recoverMedia} />
+            {mediaSrc
+              ? <ImageViewer src={mediaSrc} filePath={filePath} fileSize={meta ? meta.size : undefined} mtimeMs={meta ? meta.mtimeMs : undefined} onSrcError={recoverMedia} />
               : <div style={{ position: "absolute", inset: 0, display: "flex", alignItems: "center", justifyContent: "center", color: "var(--text-dim,#888)", fontSize: 13 }}>正在加载…</div>}
             {hasNav && (
               <>
@@ -1950,7 +2048,7 @@ useEffect(() => {
       // 调用会抛 ReferenceError 使整个视频/音频预览崩溃（2026-09-06 实测）。
       : fileType === "video" ? <video key={mediaSrc} src={mediaSrc} controls playsInline preload="metadata" onPlay={() => { mediaErrRef.current = 0; }} onLoadedMetadata={(e: any) => { mediaErrRef.current = 0; setMediaDuration(e.currentTarget.duration); }} onError={recoverMedia} style={{ maxWidth: "100%", maxHeight: "100%" }} />
       : fileType === "audio" ? <audio key={mediaSrc} src={mediaSrc} controls preload="metadata" onPlay={() => { mediaErrRef.current = 0; }} onLoadedMetadata={(e: any) => { mediaErrRef.current = 0; setMediaDuration(e.currentTarget.duration); }} onError={recoverMedia} style={{ width: "90%", maxWidth: 480 }} />
-      : fileType === "pdf" ? <iframe src={fileUrl} style={{ width: "100%", height: "100%", border: "none" }} />
+      : fileType === "pdf" ? <iframe key={mediaSrc} src={mediaSrc} style={{ width: "100%", height: "100%", border: "none" }} />
       : <div style={{ color: "var(--text-dim,#888)", fontSize: 14, textAlign: "center", padding: 40 }}>暂不支持预览此类型文件</div>;
     return (
       <div style={{ display: "flex", flexDirection: "column", height: "100%", overflow: "hidden", background: "var(--bg,#fff)", position: "relative" }}>
@@ -1974,6 +2072,7 @@ useEffect(() => {
         about={aboutProp}
         onSave={!isReadOnly ? () => doSave(false) : undefined}
         onSaveAs={!isReadOnly ? () => doSaveAsText() : undefined}
+        onReload={doReload}
         dot={{ title: dirty ? "\u6709\u672A\u4FDD\u5B58\u4FEE\u6539" : "\u5DF2\u540C\u6B65", color: dirty ? "var(--warn, #f59e0b)" : "var(--border,#e0e0e0)" }}
         nav={navProps}
         closeActions={closeActions}
@@ -2224,6 +2323,7 @@ useEffect(() => {
                         const c = (window as any).__aitiEditor._cacheGet(filePath);
                         if (c) { c.content = merged; c.original = merged; c.baseMtimeMs = (extChange && extChange.diskMtimeMs) || Date.now(); }
                         baseMtimeRef.current = (extChange && extChange.diskMtimeMs) || Date.now();
+                        diskSigRef.current = { mtimeMs: baseMtimeRef.current, size: (extChange && extChange.diskSize) || merged.length };
                         setDirty(false); (window as any).__aitiEditor._setDirty(filePath, false);
                         setExtChange(null);
                         const msg = failCount > 0 ? "\u5408\u5E76\u5B8C\u6210\uFF08" + (results.length - failCount) + "/" + results.length + " \u6210\u529F\uFF09" : "\u5DF2\u5408\u5E76\uFF08\u7528\u6237\u6539\u52A8\u5DF2\u5E94\u7528\u4E8E\u65B0\u7248\u672C\uFF09";
@@ -2247,6 +2347,7 @@ useEffect(() => {
                           const cache = (window as any).__aitiEditor._cacheGet(filePath);
                           if (cache) { cache.content = content; cache.original = content; cache.baseMtimeMs = (extChange && extChange.diskMtimeMs) || Date.now(); }
                           baseMtimeRef.current = (extChange && extChange.diskMtimeMs) || Date.now();
+                          diskSigRef.current = { mtimeMs: baseMtimeRef.current, size: (extChange && extChange.diskSize) || content.length };
                           setDirty(false); (window as any).__aitiEditor._setDirty(filePath, false);
                           setExtChange(null); setNotice({ kind: "ok", text: "\u5DF2\u52A0\u8F7D\u78C1\u76D8\u7248\u672C" });
                         })

package/client/src/file-toolbar.tsx

@@ -55,6 +55,7 @@ export const MiCloseRight = mkMenuIcon(() => <><line x1="21" y1="4" x2="21" y2="
 export const MiCloseAll = mkMenuIcon(() => <><circle cx="12" cy="12" r="10"/><path d="m15 9-6 6"/><path d="m9 9 6 6"/></>);
 export const MiSave = mkMenuIcon(() => <><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></>);
 export const MiSaveAs = mkMenuIcon(() => <><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><line x1="12" y1="16" x2="12" y2="10"/></>);
+export const MiRefresh = mkMenuIcon(() => <><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/></>);
 
 const S: Record<string, any> = {
   bar: { display: "flex", alignItems: "center", gap: 8, padding: "5px 12px",
@@ -129,6 +130,8 @@ export function FileToolbar(props: {
   onMove?: () => void;
   /** 在独立窗口打开（pi-web /viewer：只含文件查看器的浏览器窗口）；不传则不显示 */
   onNewWindow?: () => void;
+  /** 重新加载（⋯ 菜单项）：从磁盘重读最新内容；不传则不显示（aiti-folder 等其他使用方零影响） */
+  onReload?: () => void;
   /** 关闭动作组（2026-09-15 拍板）：提供即渲染一排 4 图标（关闭左侧/自己/右侧/全部）；
    *  大屏在工具条右端常驻，compact 收进 ⋯ 菜单（同款图标排，名称+图标右对齐）。 */
   closeActions?: { left?: () => void; self?: () => void; right?: () => void; all?: () => void };
@@ -251,10 +254,11 @@ export function FileToolbar(props: {
           {divider}
         </>
       )}
-      {/* 保存组：保存 / 另存为 / 下载 */}
+      {/* 保存组：保存 / 另存为 / 下载 / 重新加载 */}
       {onSave && menuItem({ label: "保存", title: "保存当前编辑内容（Ctrl+S）", icon: <MiSave />, onClick: onSave })}
       {onSaveAs && menuItem({ label: "另存为…", title: "把当前内容保存为新文件", icon: <MiSaveAs />, onClick: onSaveAs })}
       {props.onDownload && menuItem({ label: "下载文件", icon: <MiDownload />, onClick: props.onDownload })}
+      {props.onReload && menuItem({ label: "重新加载", title: "从磁盘重读最新内容（有未保存编辑时会先询问：合并/加载磁盘/保留）", icon: <MiRefresh />, onClick: props.onReload })}
       {(onSave || onSaveAs || props.onDownload) && divider}
       {/* @ 组：当前会话 / 新会话 */}
       {onMention && menuItem({ label: "@ 提及", title: mentionTitle || "提及文件——将当前文件写入聊天输入框", icon: <MiAt />, onClick: onMention })}