pi-web-ui 0.80.1 → 0.81.0

package/deploy/nginx-subpath.conf

@@ -1,88 +1,85 @@
-# pi-web-ui behind nginx at a sub-path: http://<host>:83/pi/
-# Backend app: http://127.0.0.1:8787  (default PI_WEB_PORT env)
-#
-# IMPORTANT: pi-web-ui 0.23+ checks the WebSocket Origin against the request
-# Host (hostname AND port). Every proxied location MUST forward the original
-# Host with $http_host (keeps the port). Using $host (drops the port) or
-# leaving Host unset (defaults to 127.0.0.1:8787) makes the upgrade fail with
-# 403 — the page loads but chat/terminal keep reconnecting.
-#
-# Topology (two listeners on one port: frp + LAN coexist):
-#   frp (public)  -> <PUBLIC_IP>:<PUBLIC_PORT> -> 127.0.0.1:83 (PROXY protocol v2)
-#   LAN users     -> http://<LAN_IP>:83/pi/      (plain HTTP listener)
-#
-# frpc sends PROXY v2 to nginx (transport.proxyProtocolVersion = "v2"):
-#   * 127.0.0.1:83        proxy_protocol — only the local frp client connects
-#     here (it speaks PROXY v2; nginx then sees the real visitor IP).
-#   * <LAN_IP>:83    plain HTTP — LAN browsers, no PROXY header needed.
-#
-# Simpler alternative (no real client IPs): drop proxy_protocol entirely and
-# use a single `listen 83;` — then frpc must NOT set proxyProtocolVersion.
-#
-# The frontend uses absolute paths (/ws WebSocket, /assets/*, /favicon.svg,
-# /api/file…) so those get their own proxied locations next to /pi/.
-
-# Reuse for Upgrade/Connection headers (WebSocket).
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    ''      close;
-}
-
-server {
-    listen 127.0.0.1:83 proxy_protocol;
-    listen <LAN_IP>:83;
-
-    server_name _;
-
-    # Trust PROXY-protocol headers only from the local frp client; plain
-    # (LAN) connections keep their real $remote_addr untouched.
-    set_real_ip_from 127.0.0.1;
-    real_ip_header proxy_protocol;
-
-    # ---- main entry: strip /pi/ and forward to the app root ----
-    location /pi/ {
-        proxy_pass http://127.0.0.1:8787/;
-        proxy_http_version 1.1;
-        # $http_host keeps the port — origin check compares hostname AND port.
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-    }
-
-    # ---- WebSocket (the frontend connects to ws://<host>/ws) ----
-    location /ws {
-        proxy_pass http://127.0.0.1:8787;
-        proxy_http_version 1.1;
-        proxy_set_header Host $http_host;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_read_timeout 3600s;
-        proxy_send_timeout 3600s;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
-    # ---- absolute asset paths baked into index.html ----
-    location /assets/ {
-        proxy_pass http://127.0.0.1:8787;
-    }
-    location = /favicon.svg {
-        proxy_pass http://127.0.0.1:8787;
-    }
-    location = /favicon-streaming.svg {
-        proxy_pass http://127.0.0.1:8787;
-    }
-
-    # ---- media preview / download / health API ----
-    location /api/ {
-        proxy_pass http://127.0.0.1:8787;
-    }
-
-    # bare root → app entry
-    location = / {
-        return 302 /pi/;
-    }
-}
+# pi-web-ui behind nginx at a sub-path: http://<host>:83/pi/
+# Backend app: http://127.0.0.1:8787  (default PI_WEB_PORT env)
+#
+# IMPORTANT: pi-web-ui 0.23+ checks the WebSocket Origin against the request
+# Host (hostname AND port). Every proxied location MUST forward the original
+# Host with $http_host (keeps the port). Using $host (drops the port) or
+# leaving Host unset (defaults to 127.0.0.1:8787) makes the upgrade fail with
+# 403 — the page loads but chat/terminal keep reconnecting.
+#
+# Topology (two listeners on one port: frp + LAN coexist):
+#   frp (public)  -> <PUBLIC_IP>:<PUBLIC_PORT> -> 127.0.0.1:83 (PROXY protocol v2)
+#   LAN users     -> http://<LAN_IP>:83/pi/      (plain HTTP listener)
+#
+# frpc sends PROXY v2 to nginx (transport.proxyProtocolVersion = "v2"):
+#   * 127.0.0.1:83        proxy_protocol — only the local frp client connects
+#     here (it speaks PROXY v2; nginx then sees the real visitor IP).
+#   * <LAN_IP>:83    plain HTTP — LAN browsers, no PROXY header needed.
+#
+# Simpler alternative (no real client IPs): drop proxy_protocol entirely and
+# use a single `listen 83;` — then frpc must NOT set proxyProtocolVersion.
+#
+# The frontend uses absolute paths (/ws WebSocket, /assets/*, /favicon.svg,
+# /api/file…) so those get their own proxied locations next to /pi/.
+
+# Reuse for Upgrade/Connection headers (WebSocket).
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
+server {
+    listen 127.0.0.1:83 proxy_protocol;
+    listen <LAN_IP>:83;
+
+    server_name _;
+
+    # Trust PROXY-protocol headers only from the local frp client; plain
+    # (LAN) connections keep their real $remote_addr untouched.
+    set_real_ip_from 127.0.0.1;
+    real_ip_header proxy_protocol;
+
+    # ---- main entry: strip /pi/ and forward to the app root ----
+    location /pi/ {
+        proxy_pass http://127.0.0.1:8787/;
+        proxy_http_version 1.1;
+        # $http_host keeps the port — origin check compares hostname AND port.
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+    }
+
+    # ---- WebSocket (the frontend connects to ws://<host>/ws) ----
+    location /ws {
+        proxy_pass http://127.0.0.1:8787;
+        proxy_http_version 1.1;
+        proxy_set_header Host $http_host;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 3600s;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    # ---- absolute asset paths baked into index.html ----
+    location /assets/ {
+        proxy_pass http://127.0.0.1:8787;
+    }
+    location = /favicon.svg {
+        proxy_pass http://127.0.0.1:8787;
+    }
+
+    # ---- media preview / download / health API ----
+    location /api/ {
+        proxy_pass http://127.0.0.1:8787;
+    }
+
+    # bare root → app entry
+    location = / {
+        return 302 /pi/;
+    }
+}

package/dist/server/mcp-bridge.js

@@ -80,7 +80,10 @@ export class McpClient {
     getTools() {
         return this.tools.map((t) => ({ ...t }));
     }
-    /** 调用一个工具，返回结果文本（多 content 拼接为 JSON 字符串保真）。 */
+    /**
+     * 调用一个工具，返回其结果。
+     * 纯文本块拼接成字符串（老形状，向后兼容）；出现非文本块（image/resource/audio 等）时按序透传或退化提示，不再静默丢弃。
+     */
     async call(name, args, timeoutMs = 60000) {
         const res = (await this.request("tools/call", { name, arguments: args }, timeoutMs));
         if (res?.isError) {
@@ -90,14 +93,49 @@ export class McpClient {
                 .trim() || "MCP 工具错误";
             throw new Error(msg);
         }
-        // 结构化结果优先，其次文本内容。
+        // 结构化结果优先，其次内容块。
         if (res?.structuredContent !== undefined)
             return res.structuredContent;
-        const text = (res.content ?? [])
-            .map((c) => c.text ?? "")
-            .filter((x) => x)
-            .join("\n");
-        return { content: text, isError: !!res.isError };
+        const blocks = [];
+        let hasNonText = false;
+        for (const c of res.content ?? []) {
+            if (c.type === "image" && typeof c.data === "string" && c.data) {
+                // MCP image 块字段（type/data/mimeType）与 SDK 的 ImageContent 完全一致，原样透传；
+                // 超大图由 SDK 的 normalizeToolResultImages 统一缩放（afterToolCall 钩子，默认 autoResize）。
+                blocks.push({ type: "image", data: c.data, mimeType: c.mimeType?.trim() || "image/png" });
+                hasNonText = true;
+                continue;
+            }
+            if (c.type && c.type !== "text") {
+                const r = typeof c.resource === "object" && c.resource !== null ? c.resource : {};
+                // MCP 的 EmbeddedResource 有两种承载：TextResourceContents（resource.text）与
+                // BlobResourceContents（resource.blob）。文本型带真实正文（filesystem 类 MCP 的
+                // read_text_file 就走这条），当文本透传 —— 退化成「已跳过」等于把文件内容吞掉。
+                if (typeof r.text === "string" && r.text) {
+                    blocks.push({ type: "text", text: r.text });
+                    continue;
+                }
+                // resource(blob)/audio 等块在 SDK 内容联合里没有载体（只有 text|image|thinking|toolCall），
+                // 退化为文本提示，让模型至少知道工具返回了什么，而不是看到一个空串。
+                const mime = (c.mimeType ?? r.mimeType ?? "").trim();
+                const blob = typeof r.blob === "string" && r.blob ? r.blob : c.data;
+                const size = typeof blob === "string" && blob ? `，约 ${Math.max(1, Math.round((blob.length * 3) / 4))} 字节` : "";
+                blocks.push({
+                    type: "text",
+                    text: `[MCP 工具返回了非文本内容块（${mime || c.type || "未知类型"}${size}），当前会话无法内联，已跳过。]`,
+                });
+                hasNonText = true;
+                continue;
+            }
+            const text = c.text ?? "";
+            if (text)
+                blocks.push({ type: "text", text });
+        }
+        if (!hasNonText) {
+            // 纯文本结果保持旧形状（拼接字符串），不破坏既有调用方。
+            return { content: blocks.map((b) => (b.type === "text" ? b.text : "")).join("\n"), isError: !!res.isError };
+        }
+        return { content: blocks, isError: !!res.isError };
     }
     /** 关闭：kill 子进程，拒绝所有在途请求。 */
     close() {

package/dist/server/plugins.js

@@ -402,7 +402,17 @@ export class PluginManager {
             return;
         }
         try {
-            handler(req, res);
+            // 异步 handler（`async (req, res) => …`）的 rejection 不会被这里的 try 接住，
+            // 会变成 unhandledRejection 直接杀掉整个服务（插件读文件失败、host.fs 越界
+            // 拒绝、上游超时…都会走到这条路上）——用 Promise.resolve().catch 兜住，
+            // 与同步抛错同样转 500。
+            void Promise.resolve(handler(req, res)).catch((err) => {
+                console.error(`[plugin:${pluginId}] http ${method} ${path} failed:`, err);
+                if (!res.headersSent)
+                    res.status(500).end("internal error");
+                else
+                    res.end();
+            });
         }
         catch (err) {
             console.error(`[plugin:${pluginId}] http ${method} ${path} failed:`, err);
@@ -646,7 +656,13 @@ export class PluginManager {
         }
         return found.map((f) => this.loaded.get(f.id)?.info ?? f);
     }
-    /** 反激活单个插件：deactivate + 注销 AI 工具 + 清缓存。 */
+    /** 反激活单个插件：deactivate + 注销 AI 工具 + 清缓存。
+     *
+     *  注意这里必须把 id 从 attempted 里摘掉：目录一时不在（`pi-web-ui install --force`
+     *  先 rm 再 cp，扫描正好撞上窗口期）只是「暂时看成卸载」，目录回来后还要能重新激活；
+     *  留在 attempted 里 = 本进程内永远不再激活，插件的 HTTP 路由 / AI 工具全没了，
+     *  前端只会看到「代理请求失败 404 <url>」（插件的 /proxy 路由不存在），且 CLI 承诺的
+     *  「刷新浏览器即可加载」失效，必须重启服务才能恢复。 */
     deactivateEntry(id, p) {
         try {
             p.deactivate?.();
@@ -665,6 +681,11 @@ export class PluginManager {
         }
         this.loaded.delete(id);
         this.messageHandlers.delete(id);
+        this.attempted.delete(id);
+        // 重新激活时会 import 磁盘上的 index.mjs：Node 的 ESM 缓存按 URL（含 ?e=）
+        // 命中，epoch 不变就会拿到旧模块（更新插件后还是旧代码）——所以这里也 +1，
+        // 顺带让浏览器端 ?e= 变化、重拉插件的 client bundle。
+        this.epochCounter += 1;
         console.log(`[plugin:${id}] removed`);
     }
     /** 关机时反激活全部插件。 */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-web-ui",
-	"version": "0.80.1",
+	"version": "0.81.0",
 	"description": "Web chat interface for the pi coding agent, powered by the pi SDK (@earendil-works/pi-coding-agent) — one-command run, Docker/systemd/launchd deployable",
 	"license": "MIT",
 	"author": {
@@ -59,8 +59,10 @@
 		"build:server": "tsc -p tsconfig.server.json",
 		"build:dsh-runtime": "node scripts/copy-dsh-runtime.mjs",
 		"build:mermaid-vendor": "node scripts/build-mermaid-vendor.mjs",
+		"build:extension": "node plugins/page-picker/extension/build.mjs",
+		"pack:extension": "node plugins/page-picker/extension/pack.mjs",
 		"build:runtrace-vendor": "node scripts/build-runtrace-vendor.mjs",
-		"typecheck": "tsc -p tsconfig.server.json --noEmit && tsc -p web/tsconfig.json --noEmit && tsc -p tsconfig.tests.json --noEmit && tsc -p desktop/tsconfig.json --noEmit",
+		"typecheck": "tsc -p tsconfig.server.json --noEmit && tsc -p web/tsconfig.json --noEmit && tsc -p tsconfig.tests.json --noEmit && tsc -p desktop/tsconfig.json --noEmit && tsc -p plugins/page-picker/extension/tsconfig.json --noEmit",
 		"test": "vitest run",
 		"test:unit": "vitest run",
 		"test:smoke": "node tests/run-smoke.mjs",
@@ -81,7 +83,7 @@
 	"dependencies": {
 		"@deepseek-ai/dsh-sdk-jsonrpc-server": "^0.1.1-rc.2",
 		"@deepseek-ai/dsh-sdk-protocol": "^0.1.1-rc.2",
-		"@earendil-works/pi-coding-agent": "^0.84.4",
+		"@earendil-works/pi-coding-agent": "^0.85.1",
 		"@xterm/addon-fit": "^0.11.0",
 		"@xterm/xterm": "^6.0.0",
 		"compression": "^1.8.1",

package/plugins/catalog.json

@@ -43,5 +43,23 @@
 		"descriptionEn": "Run trajectory: task → thinking → tools → file changes → result timeline with replay and node details.",
 		"source": "xing-shuyin/pi-web-ui/plugins/run-trace",
 		"homepage": "https://github.com/xing-shuyin/pi-web-ui/tree/main/plugins/run-trace"
+	},
+	{
+		"id": "legado-web",
+		"name": "legado-web",
+		"icon": "📖",
+		"description": "Legado 阅读（文本源）：搜索 / 发现 / 详情 / 目录 / 正文，书源 JSON 与安卓版兼容，可导入、检测、删废源；内置跨域+GBK 代理与本地存储，并给 AI 配了修源接口（读规则、读书源文件、逐步诊断链路、试规则验证）。",
+		"descriptionEn": "Legado reader (text book sources): search / explore / info / TOC / content with Android-compatible book source JSON, plus source import and health checking. Ships its own CORS+GBK proxy, local store, and AI tools to diagnose and repair book sources.",
+		"source": "xing-shuyin/pi-web-ui/plugins/legado-web",
+		"homepage": "https://github.com/xing-shuyin/pi-web-ui/tree/main/plugins/legado-web"
+	},
+	{
+		"id": "image-toolkit",
+		"name": "image-toolkit",
+		"icon": "🖼",
+		"description": "图片处理工作台：压缩（可按目标体积二分逼近）、裁剪、缩放、旋转/翻转、格式转换（PNG/JPEG/WebP/AVIF）、批量导出 ZIP、水印、滤镜调色、图片信息与 EXIF，可直接读写工作区图片；另给 AI 配了 4 个工具，让 agent 自己压缩/裁剪/缩放/加水印工作区里的图。",
+		"descriptionEn": "Image workbench: compress (with target-size binary search), crop, resize, rotate/flip, format conversion (PNG/JPEG/WebP/AVIF), batch ZIP export, watermark, filters, image info + EXIF, and direct workspace read/write. Ships 4 AI tools so the agent can compress/crop/resize/watermark workspace images itself.",
+		"source": "xing-shuyin/pi-web-ui/plugins/image-toolkit",
+		"homepage": "https://github.com/xing-shuyin/pi-web-ui/tree/main/plugins/image-toolkit"
 	}
 ]

package/web/dist/assets/{TerminalPanel-DrYGGZSV.js → TerminalPanel-GQZf9XvH.js}

@@ -1,4 +1,4 @@
-import{a as l,j as n}from"./markdown-D3PKeHAZ.js";import{u as P,b as O,T as M,a as p,c as W,F as Y,d as z,e as Z,f as H,g as ee,h as ne,i as te,j as se,r as ae}from"./index-BFA8Pn_5.js";import{D as re,o as ie}from"./xterm-B96xOxS9.js";import"./react-w24rH0km.js";function le(t){let c=null;return{clean:t.replace(/\r?\n?\[pi-term-exit:(-?\d+)\]\r?\n?/g,(h,u)=>(c=Number(u),`\r
+import{a as l,j as n}from"./markdown-D3PKeHAZ.js";import{u as P,b as O,T as M,a as p,c as W,F as Y,d as z,e as Z,f as H,g as ee,h as ne,i as te,j as se,r as ae}from"./index-CiRSpf3e.js";import{D as re,o as ie}from"./xterm-B96xOxS9.js";import"./react-w24rH0km.js";function le(t){let c=null;return{clean:t.replace(/\r?\n?\[pi-term-exit:(-?\d+)\]\r?\n?/g,(h,u)=>(c=Number(u),`\r
 `)).replace(/\r?\n?\x1b\[90m\[(?:进程已退出，退出码 |Process exited with code )-?\d+\]\x1b\[0m\r?\n?/g,`\r
 `),exitCode:c}}function ce({conversationId:t,terminalId:c,command:s,cwd:h,title:u,active:w,running:f,exitCode:k,register:g}){const C=l.useRef(null),j=l.useRef(null),{locale:o}=P(),y=l.useRef(o);y.current=o;const E=s?JSON.stringify(s):"";l.useEffect(()=>{const m=C.current;if(!m)return;const r=new re({theme:O(),fontFamily:'"SF Mono", "JetBrains Mono", ui-monospace, Menlo, Consolas, monospace',fontSize:13,cursorBlink:!0,scrollback:8e3}),v=new ie;r.loadAddon(v),r.open(m),j.current={term:r,fit:v},w&&r.focus();const b=()=>{r.options.theme=O()};window.addEventListener(M,b),r.attachCustomKeyEventHandler(d=>{if(d.type!=="keydown")return!0;const S=d.key?.toLowerCase();if((d.ctrlKey||d.metaKey)&&S==="v")return!1;if(d.ctrlKey&&!d.shiftKey&&!d.altKey&&S==="c"&&r.hasSelection()){const D=r.textarea;return D&&(D.value=r.getSelection(),D.select()),!1}return!0});const _=g(t,c,{write:d=>r.write(le(d).clean),dispose:()=>r.dispose()}),$=()=>{try{v.fit(),p({type:"terminal_resize",terminalId:c,conversationId:t,cols:r.cols,rows:r.rows})}catch{}},B=requestAnimationFrame(()=>{try{v.fit()}catch{}s?p({type:"run_command",terminalId:c,conversationId:t,command:s,cols:r.cols,rows:r.rows}):p({type:"terminal_create",terminalId:c,title:u,locale:y.current,conversationId:t,cwd:h,cols:r.cols,rows:r.rows})}),R=r.onData(d=>{p({type:"terminal_input",terminalId:c,conversationId:t,data:d})});let T=null;return typeof ResizeObserver<"u"&&(T=new ResizeObserver(()=>{m.offsetWidth>0&&m.offsetHeight>0&&$()}),T.observe(m)),()=>{cancelAnimationFrame(B),R.dispose(),window.removeEventListener(M,b),T?.disconnect(),_(),r.dispose(),j.current=null}},[t,c,E,g]),l.useEffect(()=>{if(!w)return;const m=requestAnimationFrame(()=>{const r=j.current;if(r){try{r.fit.fit(),p({type:"terminal_resize",terminalId:c,conversationId:t,cols:r.term.cols,rows:r.term.rows})}catch{}r.term.focus()}});return()=>cancelAnimationFrame(m)},[w]);const{t:F}=P(),x=l.useRef(void 0);return l.useEffect(()=>{if(f===x.current||(x.current=f,f!==!1))return;const m=j.current;m&&m.term.write(`\r
 \x1B[90m${F("exitBanner",{code:k??""})}\x1B[0m\r