pi-web-ui 0.29.2 → 0.30.0

package/dist/server/agent-service.js

@@ -22,7 +22,7 @@ import { GoalService } from "./goal-service.js";
 import { SlashCommandsService, parseSlash } from "./slash-commands.js";
 import { ModelAdminService } from "./model-admin.js";
 import { FilesService, workspacePath } from "./files-service.js";
-import { extensionKey, ClientStateStore, } from "./client-state.js";
+import { isExtensionDisabled, ClientStateStore, } from "./client-state.js";
 import { saveUpload } from "./uploads.js";
 import { makePersistentTerminalTools } from "./terminals.js";
 import { WebUIContext } from "./webui-context.js";
@@ -528,9 +528,11 @@ export class ClientSession {
                         skills: res.skills.filter((s) => !this.settingsSvc.current.disabledSkills.includes(s.name)),
                     }),
                     // 插件开关：禁用的扩展整个卸载（工具 / 命令随之消失）。
+                    // 注意 SDK 在 extensionsOverride 之后才补 sourceInfo，包扩展此处只能靠路径
+                    // 匹配 —— isExtensionDisabled 同时比对 npm:<pkg> 候选键。
                     extensionsOverride: (res) => ({
                         ...res,
-                        extensions: res.extensions.filter((e) => !this.settingsSvc.current.disabledExtensions.includes(extensionKey(e))),
+                        extensions: res.extensions.filter((e) => !isExtensionDisabled(e, this.settingsSvc.current.disabledExtensions)),
                     }),
                 },
             });

package/dist/server/client-state.js

@@ -17,6 +17,35 @@ export function extensionKey(e) {
         return src.source;
     return src?.path ?? e.path;
 }
+/** All identities an extension may be disabled by. The SDK applies
+ *  `sourceInfo` only AFTER extensionsOverride runs (resource-loader reload():
+ *  override first, applyExtensionSourceInfo second), so inside the override a
+ *  package extension still has no sourceInfo and extensionKey() falls back to
+ *  the raw entry path — which never matches the "npm:<pkg>" id the settings
+ *  panel stores. Derive the package name from the entry path
+ *  (.../node_modules/<pkg>/... or .../node_modules/@scope/<pkg>/...) so both
+ *  sides agree. */
+export function extensionKeyCandidates(e) {
+    const keys = new Set([extensionKey(e)]);
+    const norm = e.path.replace(/\\/g, "/");
+    const marker = "/node_modules/";
+    const idx = norm.lastIndexOf(marker);
+    if (idx !== -1) {
+        const segs = norm.slice(idx + marker.length).split("/");
+        // Scoped package @scope/name spans two segments.
+        const name = segs[0]?.startsWith("@") && segs[1] ? `${segs[0]}/${segs[1]}` : segs[0];
+        if (name)
+            keys.add(`npm:${name}`);
+    }
+    return [...keys];
+}
+/** Whether an extension is covered by the disabled list (any identity match). */
+export function isExtensionDisabled(e, disabled) {
+    if (disabled.length === 0)
+        return false;
+    const keys = extensionKeyCandidates(e);
+    return disabled.some((d) => keys.includes(d));
+}
 /**
  * Persists which workspace each browser client last used + which workspaces it
  * has opened, so a server restart / page reload restores the same project and

package/dist/server/index.js

@@ -405,9 +405,11 @@ function scheduleQuit() {
     return true;
 }
 service.onQuit = scheduleQuit;
-/** 背压阈值：socket 未发送积压超过此值时丢弃 snapshot（issue #11）。
- *  1MB ≈ 两三份全量 snapshot 的量，足够吸收网络抖动，又远低于 OOM 级堆积。 */
-const SNAPSHOT_BACKPRESSURE_BYTES = 1_000_000;
+/** 背压相对倍数：socket 未发送积压超过「最近一份 snapshot 大小 × 此倍数」时丢弃
+ *  （issue #11 及其评论区的自适应建议）。固定 1MB 阈值在长会话下单份 snapshot 可达
+ *  ~10MB——连半份都没发完就丢，前端频繁跳帧；短会话又太迟钝。相对阈值语义稳定在
+ *  「缓冲堆了约 N 份快照」，不随会话长短漂移。 */
+const SNAPSHOT_BACKPRESSURE_FACTOR = 3;
 /**
  * Multi-tab serialization sharing: emit() hands the SAME message object to
  * every socket of a client, but each send() used to JSON.stringify it
@@ -430,6 +432,8 @@ wss.on("connection", (ws) => {
     service.noteSocketOpen();
     let clientId = null;
     let closed = false;
+    /** 最近一份全量 snapshot 的估算字节数（UTF-16 ×2），供背压相对阈值用（issue #11）。 */
+    let lastSnapshotBytes = 0;
     /** Commands received while the session is still being created — replayed after attach. */
     let pending = [];
     // 协议层错误（非法帧/未 masked 帧等）：不注册 handler 会作为 uncaught
@@ -447,14 +451,20 @@ wss.on("connection", (ws) => {
         if (closed || ws.readyState !== WebSocket.OPEN)
             return;
         // 发送背压（issue #11）：socket 消费不过来时（前端慢/网络差），堆里会堆积
-        // 每份 ~10MB 的全量 snapshot 字符串，低内存主机直接 OOM。snapshot 是全量
+        // 每份可达 ~10MB 的全量 snapshot 字符串，低内存主机直接 OOM。snapshot 是全量
         // 幂等的且 60ms 后必有更新的一份，可以安全丢弃——在序列化之前丢，连
         // stringify 的分配都省掉。ready/notice/error/tool_delta 等消息必须送达。
+        // 阈值相对化（评论区建议）：用「最近一份 snapshot 的字节数 × 倍数」做基准，
+        // 首份无基准不丢（首次必达）。wire.length 是 UTF-16 字符数，×2 估算字节。
         if ((msg.type === "snapshot" || msg.type === "snapshot_delta") &&
-            ws.bufferedAmount > SNAPSHOT_BACKPRESSURE_BYTES) {
+            lastSnapshotBytes > 0 &&
+            ws.bufferedAmount > SNAPSHOT_BACKPRESSURE_FACTOR * lastSnapshotBytes) {
             return;
         }
-        ws.send(serializeShared(msg));
+        const wire = serializeShared(msg);
+        if (msg.type === "snapshot")
+            lastSnapshotBytes = wire.length * 2;
+        ws.send(wire);
     };
     const dispatch = (msg) => {
         if (!clientId) {

package/dist/server/webui-context.js

@@ -1,4 +1,11 @@
 const WIDGET_WIDTH = 80;
+/** ANSI 转义序列（CSI + OSC 两类）：扩展 widget/status 文本里常混有 TUI 颜色码
+ *  （如 pi-powerline-footer），浏览器会把它渲染成字面 `[38;5;244m` 乱码（issue #16）。 */
+const ANSI_RE = /\[[0-9:;<=>?]*[ -/]*[@-~]|\][^\u0007\u001b]*(?:\u0007|\u001b\\)/g;
+/** Strip all ANSI escape sequences (CSI/OSC) from a string. */
+export function stripAnsi(s) {
+    return s.replace(ANSI_RE, "");
+}
 /** Mock theme: TUI color functions degrade to identity so widget text survives. */
 const mockTheme = new Proxy({
     fg: (_color, text) => text,
@@ -101,8 +108,10 @@ export class WebUIContext {
             catch {
                 lines = undefined;
             }
-            this.lastLines.set(key, lines ?? []);
-            return { key, lines: lines ?? [] };
+            // 浏览器不是终端：ANSI 颜色码剥掉再下发/比对（issue #16）。
+            const clean = lines?.map(stripAnsi) ?? undefined;
+            this.lastLines.set(key, clean ?? []);
+            return { key, lines: clean ?? [] };
         });
     }
     // -- notifications --------------------------------------------------------
@@ -116,7 +125,12 @@ export class WebUIContext {
             this.statuses.delete(key);
         }
         else {
-            this.statuses.set(key, text);
+            // 入口处剥 ANSI：pushStatuses / statusSnapshot 两条路径都拿到干净文本。
+            const clean = stripAnsi(text);
+            if (clean === "")
+                this.statuses.delete(key);
+            else
+                this.statuses.set(key, clean);
         }
         this.pushStatuses();
     }

package/package.json

@@ -1,96 +1,96 @@
-{
-  "name": "pi-web-ui",
-  "version": "0.29.2",
-  "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",
-  "type": "module",
-  "bin": {
-    "pi-web-ui": "bin/pi-web-ui.mjs"
-  },
-  "main": "dist/server/index.js",
-  "files": [
-    "bin/",
-    "dist/",
-    "web/dist/",
-    "web/public/",
-    "themes/",
-    "deploy/",
-    "extensions/",
-    "README.md",
-    "LICENSE"
-  ],
-  "keywords": [
-    "pi",
-    "pi-package",
-    "coding-agent",
-    "ai",
-    "chat",
-    "web-ui",
-    "terminal",
-    "llm"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xing-shuyin/pi-web-ui.git"
-  },
-  "pi": {
-    "extensions": [
-      "./extensions"
-    ]
-  },
-  "engines": {
-    "node": ">=22.19.0"
-  },
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "dev": "concurrently -k -n server,web -c blue,green \"npm:dev:server\" \"npm:dev:web\"",
-    "dev:server": "cross-env PORT=8788 PI_WEB_ALLOW_ORIGINS=http://localhost:5173,http://127.0.0.1:5173 node --watch --import tsx server/index.ts",
-    "dev:web": "vite --config web/vite.config.ts",
-    "build": "npm run build:web && npm run build:server",
-    "build:web": "vite build --config web/vite.config.ts",
-    "build:server": "tsc -p tsconfig.server.json",
-    "typecheck": "tsc -p tsconfig.server.json --noEmit && tsc -p web/tsconfig.json --noEmit && tsc -p tsconfig.tests.json --noEmit",
-    "test": "vitest run",
-    "test:unit": "vitest run",
-    "test:smoke": "node tests/run-smoke.mjs",
-    "check:protocol": "node scripts/check-protocol-sync.mjs",
-    "test:freeze": "node tests/freeze-test.mjs",
-    "start": "node dist/server/index.js"
-  },
-  "dependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.2",
-    "@xterm/addon-fit": "^0.11.0",
-    "@xterm/xterm": "^6.0.0",
-    "compression": "^1.8.1",
-    "express": "^4.21.2",
-    "highlight.js": "^11.10.0",
-    "node-pty": "^1.1.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-icons": "^5.7.0",
-    "react-markdown": "^9.0.1",
-    "rehype-highlight": "^7.0.1",
-    "remark-gfm": "^4.0.0",
-    "typebox": "^1.3.14",
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/compression": "^1.8.1",
-    "@types/express": "^4.17.21",
-    "@types/node": "^22.10.0",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@types/ws": "^8.5.13",
-    "@vitejs/plugin-react": "^4.3.4",
-    "concurrently": "^9.1.0",
-    "cross-env": "^10.1.0",
-    "playwright-core": "^1.62.1",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
-    "vite": "^6.0.3",
-    "vitest": "^4.1.11"
-  },
-  "allowScripts": {
-    "node-pty@1.1.0": true
-  }
-}
+{
+  "name": "pi-web-ui",
+  "version": "0.30.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",
+  "type": "module",
+  "bin": {
+    "pi-web-ui": "bin/pi-web-ui.mjs"
+  },
+  "main": "dist/server/index.js",
+  "files": [
+    "bin/",
+    "dist/",
+    "web/dist/",
+    "web/public/",
+    "themes/",
+    "deploy/",
+    "extensions/",
+    "README.md",
+    "LICENSE"
+  ],
+  "keywords": [
+    "pi",
+    "pi-package",
+    "coding-agent",
+    "ai",
+    "chat",
+    "web-ui",
+    "terminal",
+    "llm"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/xing-shuyin/pi-web-ui.git"
+  },
+  "pi": {
+    "extensions": [
+      "./extensions"
+    ]
+  },
+  "engines": {
+    "node": ">=22.19.0"
+  },
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "dev": "concurrently -k -n server,web -c blue,green \"npm:dev:server\" \"npm:dev:web\"",
+    "dev:server": "cross-env PORT=8788 PI_WEB_ALLOW_ORIGINS=http://localhost:5173,http://127.0.0.1:5173 node --watch --import tsx server/index.ts",
+    "dev:web": "vite --config web/vite.config.ts",
+    "build": "npm run build:web && npm run build:server",
+    "build:web": "vite build --config web/vite.config.ts",
+    "build:server": "tsc -p tsconfig.server.json",
+    "typecheck": "tsc -p tsconfig.server.json --noEmit && tsc -p web/tsconfig.json --noEmit && tsc -p tsconfig.tests.json --noEmit",
+    "test": "vitest run",
+    "test:unit": "vitest run",
+    "test:smoke": "node tests/run-smoke.mjs",
+    "check:protocol": "node scripts/check-protocol-sync.mjs",
+    "test:freeze": "node tests/freeze-test.mjs",
+    "start": "node dist/server/index.js"
+  },
+  "dependencies": {
+    "@earendil-works/pi-coding-agent": "^0.84.2",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "compression": "^1.8.1",
+    "express": "^4.21.2",
+    "highlight.js": "^11.10.0",
+    "node-pty": "^1.1.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-icons": "^5.7.0",
+    "react-markdown": "^9.0.1",
+    "rehype-highlight": "^7.0.1",
+    "remark-gfm": "^4.0.0",
+    "typebox": "^1.3.14",
+    "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "@types/compression": "^1.8.1",
+    "@types/express": "^4.17.21",
+    "@types/node": "^22.10.0",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "@types/ws": "^8.5.13",
+    "@vitejs/plugin-react": "^4.3.4",
+    "concurrently": "^9.1.0",
+    "cross-env": "^10.1.0",
+    "playwright-core": "^1.62.1",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2",
+    "vite": "^6.0.3",
+    "vitest": "^4.1.11"
+  },
+  "allowScripts": {
+    "node-pty@1.1.0": true
+  }
+}