pi-web-ui 0.94.0 → 0.95.0

package/dist/server/host-metrics.js

@@ -34,7 +34,21 @@ export function calculateHostMetrics(previous, current) {
         memoryPercent,
     };
 }
-export function createHostMetricsSampler(readSnapshot = defaultReadSnapshot) {
+/** CPU 平滑窗口：上报最近 N 次有效读数的均值。心跳 2s 一次，默认 5 次 ≈ 10s 平均
+ *  —— 单次 2s 采样的毛刺（编译/构建抖动）不再直接上底栏，观感与任务管理器的
+ *  曲线对齐。内存变化慢，不平滑，沿用瞬时值。 */
+export const CPU_SMOOTH_WINDOW = 5;
+/** 有效 CPU 读数序列的均值（空序列 → null，前端显示 —）。纯函数，可单测。 */
+export function meanCpuPercent(readings) {
+    if (readings.length === 0)
+        return null;
+    let sum = 0;
+    for (const v of readings)
+        sum += v;
+    return sum / readings.length;
+}
+export function createHostMetricsSampler(readSnapshot = defaultReadSnapshot, windowSize = CPU_SMOOTH_WINDOW) {
+    const window = Math.max(1, Math.floor(windowSize));
     let previous = null;
     try {
         previous = readSnapshot();
@@ -43,6 +57,8 @@ export function createHostMetricsSampler(readSnapshot = defaultReadSnapshot) {
         // 初始基线读取异常时不击穿服务启动，待后续心跳重试
         previous = null;
     }
+    /** 最近 window 次有效 CPU 读数（totalDelta<=0 的 null 读数不进序列，避免空洞拉低均值）。 */
+    const history = [];
     return () => {
         const current = readSnapshot();
         if (!previous) {
@@ -54,6 +70,14 @@ export function createHostMetricsSampler(readSnapshot = defaultReadSnapshot) {
         }
         const metrics = calculateHostMetrics(previous, current);
         previous = current;
-        return metrics;
+        if (metrics.cpuPercent !== null && Number.isFinite(metrics.cpuPercent)) {
+            history.push(metrics.cpuPercent);
+            if (history.length > window)
+                history.splice(0, history.length - window);
+        }
+        return {
+            cpuPercent: meanCpuPercent(history),
+            memoryPercent: metrics.memoryPercent,
+        };
     };
 }

package/dist/server/http-proxy.js

@@ -9,7 +9,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { EventEmitter } from "node:events";
-import * as undici from "undici";
+import { createRequire } from "node:module";
 /** Read proxy settings from settings.json and environment. */
 export function resolveProxySettings(agentDir) {
     let httpProxy;
@@ -49,6 +49,16 @@ export function initHttpProxy(agentDir) {
         return { active: false };
     }
     try {
+        // Lazy-load undici so a missing optional dep never crashes server startup;
+        // proxy simply stays inactive with a warning.
+        let undici;
+        try {
+            undici = createRequire(import.meta.url)("undici");
+        }
+        catch (err) {
+            console.warn("[proxy] undici not installed, HTTP proxy support disabled:", err);
+            return { active: false, proxyUrl: effectiveProxy };
+        }
         const dispatcher = withUndiciErrorListener(new undici.EnvHttpProxyAgent({
             allowH2: false,
             proxyTunnel: true,

package/dist/server/index.js

@@ -33,6 +33,7 @@ import { PROTOCOL_VERSION } from "./protocol-version.js";
 import { AgentService, workspacePath, QuiesceRejectedError } from "./agent-service.js";
 import { WS_MAX_PAYLOAD_BYTES, isAbsoluteWirePath, wireToAbs } from "./files-service.js";
 import { registerFileTransferRoutes } from "./file-transfer-routes.js";
+import { initAttachmentStore, readAttachment } from "./attachment-store.js";
 import { isAudioFile, previewKind } from "./text-sniff.js";
 import { startControlServer } from "./control-socket.js";
 import { scheduleUploadCleanup } from "./uploads.js";
@@ -44,13 +45,14 @@ import { parseTabs, tabsRefusal } from "./tabs.js";
 import { recordUnknownWsType } from "./ws-unknown-types.js";
 import { installPack, isKnownPack, listPacks, loadServerStrings, readPackFile, removePack, unloadServerStrings, } from "./locales.js";
 import { PluginManager, resolvePluginClientFile, } from "./plugins.js";
-import { PluginInstaller } from "./plugin-installer.js";
+import { inspectInstallSpec, PluginInstaller } from "./plugin-installer.js";
 import { syncPluginCatalog } from "./plugin-catalog-sync.js";
 import { McpBridge } from "./mcp-bridge.js";
 import { createMcpHotReload } from "./mcp-hot-reload.js";
 import { createHostMetricsSampler } from "./host-metrics.js";
 import { SchedulerStore } from "./scheduler-tasks.js";
 import { initHttpProxy } from "./http-proxy.js";
+import { globalLspPool } from "./lsp-tool.js";
 import { buildPiWebTokenCookie, decodeCookieToken, isTlsRequest } from "./auth-cookie.js";
 /** Strip npm-injected env (`npm start` exports `npm_config_*` / `npm_package_*` /
  *  `npm_lifecycle_*` into every child). Anything this server spawns — shells,
@@ -95,6 +97,19 @@ try {
 catch (err) {
     console.warn(`[data] 无法创建数据目录 ${DATA_DIR}: ${err.message}`);
 }
+// issue #295：工作区直接就是家目录时，SDK 初始化期的同步目录扫描会落在 $HOME 上
+// （iCloud 占位符/外部卷坏挂载 → scandir/open 内核挂起 → 事件循环假死，hello 后无
+// ready）。新装服务默认已是 ~/pi-web-ui（见 bin/pi-web-ui.mjs serviceOptions）；
+// 老服务若仍指着家目录，在此提示一次，`server install` 重装即迁移。
+try {
+    if (resolve(CWD) === resolve(homedir())) {
+        console.warn(`[ws] 工作区为用户主目录 ${CWD}：目录扫描可能因外部卷/同步盘挂载而长时间阻塞，` +
+            `建议用 \`pi-web-ui server install --cwd <项目目录>\` 重装迁移。`);
+    }
+}
+catch {
+    /* 路径比较失败不影响启动 */
+}
 // Dev-no-cache setting read without a ClientStateStore instance (the index.html
 // route runs before any client attaches). Reads the same global settings blob.
 function readDevNoCacheSetting() {
@@ -316,6 +331,27 @@ app.get("/api/health", (_req, res) => {
         engine: ENGINE,
     });
 });
+/**
+ * 基于 SHA-256 内容寻址的附件静态服务：
+ * 永久强缓存（immutable），支持图片和文件读取。
+ */
+app.get("/api/attachment/:hash", async (req, res) => {
+    try {
+        const hash = String(req.params.hash ?? "").trim();
+        const hit = await readAttachment(hash);
+        if (!hit) {
+            res.status(404).end("attachment not found");
+            return;
+        }
+        res.setHeader("Content-Type", hit.mimeType);
+        res.setHeader("Content-Length", hit.buffer.length);
+        res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+        res.end(hit.buffer);
+    }
+    catch (err) {
+        res.status(500).end(err.message);
+    }
+});
 /**
  * Stream a workspace file over HTTP.
  *
@@ -918,6 +954,7 @@ const service = ENGINE === "dsh"
     join(DATA_DIR, "client-state.json"));
 // Server-string tables (issue #91 v2): packs' `serverStrings` sections feed
 // pick() lookup for non-zh/en UI languages (missing key → English fallback).
+initAttachmentStore(DATA_DIR);
 loadServerStrings(DATA_DIR);
 // Optional UI plugins (<dataDir>/plugins/<id>/): scanned on every client
 // attach so freshly dropped plugins appear without a server restart.
@@ -1139,6 +1176,17 @@ const scheduler = new SchedulerStore(DATA_DIR, {
     },
     onChange: () => pushSchedulerTasks(),
     notify: (level, text, textEn) => pushNoticeToAll(level, text, textEn ?? text),
+    // issue #291：任务删除（含单次任务跑完自删）后回收其伪客户端，
+    // 否则 scheduler:<taskId> 会话会永久占据其他客户端的 elsewhere 列表。
+    onTaskRemoved: (taskId) => {
+        const svc = service;
+        try {
+            svc.releaseSchedulerClient?.(taskId);
+        }
+        catch {
+            // 回收失败不影响任务删除
+        }
+    },
 });
 scheduler.start();
 /** 把调度器任务列表推给所有在线客户端（设置面板展示 + 变更后刷新）。 */
@@ -1194,6 +1242,12 @@ void mcpBridge.load().then(() => {
 });
 // 插件扩展点：SDK 工具执行事件（bash/读文件等 start+end）转发给已注册的插件。
 service.onToolEvent = (ev) => pluginMgr.emitToolEvent(ev);
+// 插件扩展点（P1-5）：bash/read 执行前后的拦截（pre 拒/问即拦、post 脱敏补上下文；
+// 只覆盖已接管的这两处，DSH 引擎无 customTool 注册面不接）。
+service.toolGuard = {
+    pre: (req, lang) => pluginMgr.evaluateToolPre(req, lang),
+    post: (req, lang) => pluginMgr.evaluateToolPost(req, lang),
+};
 service.onRunEvent = (ev) => pluginMgr.emitRunEvent(ev);
 // 插件扩展点：对话切换通知（轨迹视图切会话后即重拉；dsh 引擎暂无）。
 service.onConversationChanged = () => pluginMgr.emitConversationChanged();
@@ -1384,6 +1438,10 @@ const SNAPSHOT_BACKPRESSURE_FACTOR = 3;
 const SNAPSHOT_BACKPRESSURE_MIN_BYTES = 262_144;
 /** 背压丢弃后的延迟重发间隔。 */
 const SNAPSHOT_RETRY_MS = 250;
+/** issue #295：attach（会话初始化）超过此时长未完成，先给浏览器一句可见提示，
+ *  避免界面永久停在「正在连接」而用户不知发生了什么。attach 本体继续等（不取消），
+ *  完成后照常走快照流程。 */
+const ATTACH_SLOW_NOTICE_MS = 8_000;
 /**
  * Multi-tab serialization sharing: emit() hands the SAME message object to
  * every socket of a client, but each send() used to JSON.stringify it
@@ -1509,11 +1567,17 @@ wss.on("connection", (ws) => {
                 void cs.listBgServers();
                 break;
             case "new_chat":
-                void cs.newChat(msg.preset);
+                void cs.newChat(msg.preset, msg.ephemeral);
                 break;
             case "edit_message":
                 void cs.editMessage(msg.messageId, msg.text, msg.attachments);
                 break;
+            case "fork_session":
+                void cs.forkSession?.(msg.messageId, msg.position, msg.conversationId);
+                break;
+            case "rollback_session":
+                void cs.rollbackSession?.(msg.messageId, msg.conversationId, msg.restoreWorkspace);
+                break;
             case "cycle_model":
                 void cs.cycleModel();
                 break;
@@ -1568,6 +1632,9 @@ wss.on("connection", (ws) => {
             case "dismiss_finished_subagents":
                 void cs.dismissFinishedSubagents(msg.parentId);
                 break;
+            case "subagent_handoff":
+                void cs.handoffSubagent?.(msg.fromRunId, msg.toRunId, msg.payload);
+                break;
             case "switch_session":
                 void cs.switchSession(msg.path);
                 break;
@@ -1782,6 +1849,9 @@ wss.on("connection", (ws) => {
             case "fetch_models":
                 void cs.fetchModelsList(msg.reqId, msg.baseUrl, msg.apiKey, msg.authHeader, msg.api);
                 break;
+            case "test_model_connection":
+                void cs.testModelConnection?.(msg.reqId, msg.baseUrl, msg.apiKey, msg.authHeader, msg.api);
+                break;
             case "refresh_provider_models":
                 void cs.refreshProviderModels(msg.providerId, msg.reqId);
                 break;
@@ -1887,8 +1957,10 @@ wss.on("connection", (ws) => {
                     terminalToolsEnabled: msg.terminalToolsEnabled,
                     terminalBash: msg.terminalBash,
                     terminalBashIdleMs: msg.terminalBashIdleMs,
+                    terminalBashMaxForegroundMs: msg.terminalBashMaxForegroundMs,
                     toolWatchdogTimeoutMs: msg.toolWatchdogTimeoutMs,
                     readDirEnabled: msg.readDirEnabled,
+                    toolApprovalEnabled: msg.toolApprovalEnabled,
                     editSoftEnabled: msg.editSoftEnabled,
                     questionnaireEnabled: msg.questionnaireEnabled,
                     parallelReminderEnabled: msg.parallelReminderEnabled,
@@ -2000,6 +2072,36 @@ wss.on("connection", (ws) => {
             case "plugin_job_cancel":
                 pluginInstaller.cancel(String(msg.jobId ?? ""));
                 break;
+            // 注册面目录（DSH P2-7）：只读装配（slot/工具/宿主方法表+当前占用者），按需拉取。
+            case "plugin_api_catalog": {
+                const requestId = String(msg.requestId ?? "");
+                send({ type: "plugin_api_catalog_result", requestId, catalog: pluginMgr.getApiCatalog() });
+                break;
+            }
+            // 安装前先读 spec（DSH P0-3）：不联网也能查（形状/已装），GitHub 源再探一次
+            // raw manifest。结果只作引导（UI 把 problem 渲染成输入框下的一句话），不阻塞安装。
+            case "plugin_install_inspect": {
+                const requestId = String(msg.requestId ?? "");
+                const source = String(msg.source ?? "");
+                void inspectInstallSpec(source, {
+                    pluginsDir: pluginMgr.pluginsDir,
+                    ...(typeof msg.explicitId === "string" && msg.explicitId.trim() ? { explicitId: msg.explicitId.trim() } : {}),
+                    force: msg.force === true,
+                }).then((r) => {
+                    send({
+                        type: "plugin_install_inspect_result",
+                        requestId,
+                        source,
+                        kind: r.spec.kind,
+                        suggestedId: r.suggestedId,
+                        installed: r.installed,
+                        ...(r.problem ? { problem: r.problem } : {}),
+                        ...(r.detail ? { detail: r.detail } : {}),
+                        ...(r.manifest ? { manifest: r.manifest } : {}),
+                    });
+                });
+                break;
+            }
             // -- 插件目录授权（issue #146）------------------------------------------
             case "plugin_path_response": {
                 const pending = pendingPathRequests.get(String(msg.id ?? ""));
@@ -2075,7 +2177,8 @@ wss.on("connection", (ws) => {
                     customCatalogPath: pluginMgr.customCatalogPath,
                     pluginsDir: join(DATA_DIR, "plugins"),
                     installer: pluginInstaller,
-                    afterWrite: () => reloadPluginsAndPush(syncLang),
+                    // 只更新市场列表时无需重启已激活插件，避免重复广播工作目录。
+                    afterWrite: () => (msg.install === true ? reloadPluginsAndPush(syncLang) : pluginMgr.pushCatalog()),
                     lang: syncLang,
                 }).then((r) => {
                     send({
@@ -2129,6 +2232,19 @@ wss.on("connection", (ws) => {
                     void cs.answerQuestion?.(msg.id, msg.answers, msg.cancelled);
                 }
                 break;
+            case "tool_approval_response":
+                cs.resolveToolApproval?.(msg.id, msg.decision, msg.editedParams, msg.reason, msg.scope);
+                break;
+            case "set_approval_policy":
+                cs.setApprovalPolicy?.({
+                    conversationId: msg.conversationId,
+                    allowAll: msg.allowAll,
+                    categories: msg.categories,
+                });
+                break;
+            case "plan_update":
+                cs.updatePlan?.(msg.steps, msg.activeStepId, msg.conversationId);
+                break;
             case "page_response":
                 // 浏览器（page-picker 扩展经前端）对 browser_page 的回包：恢复挂起的
                 // pageCall；id 不匹配（超时后迟到/页面刷新）由 resolvePageCall 静默忽略。
@@ -2143,6 +2259,18 @@ wss.on("connection", (ws) => {
             case "delete_subagent_template":
                 void cs.deleteSubagentTemplate(msg.name);
                 break;
+            case "save_approval_rule":
+                void cs.saveApprovalRule?.(msg.rule);
+                break;
+            case "save_approval_rules":
+                void cs.saveApprovalRules?.(msg.rules);
+                break;
+            case "delete_approval_rule":
+                void cs.deleteApprovalRule?.(msg.id);
+                break;
+            case "reset_builtin_approval_rule":
+                void cs.resetBuiltinApprovalRule?.(msg.id);
+                break;
             case "apply_preset":
                 void cs.applyPreset(msg.name);
                 break;
@@ -2229,11 +2357,10 @@ wss.on("connection", (ws) => {
         if (msg.type === "hello") {
             const cid = msg.clientId || randomUUID();
             clientId = cid;
-            service
-                .attach(cid, send)
-                .then((cs) => {
-                if (closed)
-                    return;
+            // issue #295：ready 先行 —— 传输握手不等待会话初始化。attach 会进 SDK 的
+            // resourceLoader.reload 等同步目录扫描，坏挂载/家目录下可能阻塞数十秒；
+            // ready 在握手里先发，前端立刻离开「正在连接」（快照随后到）。
+            if (!closed) {
                 send({
                     type: "ready",
                     clientId: cid,
@@ -2249,6 +2376,24 @@ wss.on("connection", (ws) => {
                     tabs: TABS ? [...TABS] : undefined,
                     service: SERVICE_INFO ?? undefined,
                 });
+            }
+            // attach 慢提示：本体继续等，不取消；完成后照常走快照流程。
+            const slowTimer = setTimeout(() => {
+                if (closed)
+                    return;
+                send({
+                    type: "notice",
+                    level: "warning",
+                    text: "会话初始化耗时较长（可能在扫描工作区目录），请稍候…",
+                    textEn: "Session init is taking a while (possibly scanning the workspace) — hang on…",
+                });
+            }, ATTACH_SLOW_NOTICE_MS);
+            service
+                .attach(cid, send)
+                .then((cs) => {
+                clearTimeout(slowTimer);
+                if (closed)
+                    return;
                 // Plugin catalog: re-scan + activate new dirs on every attach so
                 // freshly dropped plugins show up without a server restart.
                 pluginMgr
@@ -2306,6 +2451,7 @@ wss.on("connection", (ws) => {
                 // Admission refused (quiesce): close the socket so the browser
                 // reconnect loop keeps retrying until admission reopens. Do NOT
                 // leave a half-alive connection that can only show an error.
+                clearTimeout(slowTimer);
                 if (err instanceof QuiesceRejectedError) {
                     closed = true;
                     if (ws.readyState === WebSocket.OPEN) {
@@ -2398,7 +2544,8 @@ if (!bootCatalogDisabled) {
         customCatalogPath: pluginMgr.customCatalogPath,
         pluginsDir: join(DATA_DIR, "plugins"),
         installer: pluginInstaller,
-        afterWrite: () => reloadPluginsAndPush(),
+        // 默认仅同步市场列表；重载插件会重复触发其激活广播。
+        afterWrite: () => (autoInstall ? reloadPluginsAndPush() : pluginMgr.pushCatalog()),
     }).then((r) => {
         if (!r.ok) {
             console.warn(`[catalog] 插件目录预同步失败（不阻断启动）: ${r.error}`);
@@ -2485,6 +2632,7 @@ async function shutdown(signal = "SIGINT") {
         pluginInstaller.dispose();
         mcpHotReload.dispose();
         mcpBridge.dispose();
+        await globalLspPool.shutdownAll();
         await service.disposeAll();
         // Don't let dead browsers hold the exit open: half-open WebSocket /
         // keep-alive HTTP connections (e.g. test clients killed without