pi-web-ui 0.94.1 → 0.96.0

package/dist/server/mcp-bridge.js

@@ -16,8 +16,12 @@
 import { spawn } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
-import { bilingual } from "./i18n.js";
 const PROTOCOL_VERSION = "2025-03-26"; // 广泛支持的工具版本
+/** 单行（一条 JSON-RPC 消息）的长度上限（1MB）：失控服务器一行永不换行会顶爆内存。 */
+const MCP_MAX_LINE_CHARS = 1024 * 1024;
+/** 未换行数据的总缓冲上限（4MB）：服务器只吐垃圾不吐换行时按协议错误杀进程。
+ *  上限按 JS 字符串长度计（UTF-16 码元 ≤ UTF-8 字节），内存放大有界。 */
+const MCP_MAX_BUFFER_CHARS = 4 * 1024 * 1024;
 let rpcSeq = 0;
 /**
  * 单个 MCP 服务器的客户端：管理子进程、请求/响应按 id 关联、握手与工具调用。
@@ -245,12 +249,22 @@ export class McpClient {
     }
     onData(chunk) {
         this.buffer += chunk;
+        // 总缓冲上限：服务器一直输出却不换行（或极慢地换行）时，缓冲会无限涨，
+        // 宿主内存被一个失控子进程吃光。超限按协议错误处理：杀进程 + 拒绝在途请求。
+        if (this.buffer.length > MCP_MAX_BUFFER_CHARS) {
+            this.killForProtocolError(new Error(`[mcp:${this.name}] stdout 缓冲超过 ${Math.round(MCP_MAX_BUFFER_CHARS / 1024 / 1024)}MB 上限，按协议错误关闭`));
+            return;
+        }
         let nl;
         while ((nl = this.buffer.indexOf("\n")) >= 0) {
             const line = this.buffer.slice(0, nl).trim();
             this.buffer = this.buffer.slice(nl + 1);
             if (!line)
                 continue;
+            if (line.length > MCP_MAX_LINE_CHARS) {
+                this.killForProtocolError(new Error(`[mcp:${this.name}] 单行超过 ${Math.round(MCP_MAX_LINE_CHARS / 1024 / 1024)}MB 上限，按协议错误关闭`));
+                return;
+            }
             let msg;
             try {
                 msg = JSON.parse(line);
@@ -262,6 +276,24 @@ export class McpClient {
             this.handleMessage(msg);
         }
     }
+    /** 协议错误（stdout 缓冲超限）：杀掉子进程、拒绝全部在途请求、清空缓冲。
+     *  与进程自然退出共用自愈语义 —— 下一次工具调用会重新拉起并重新握手
+     *  （失控服务器重启后再次超限就再次杀，不会永久占用宿主内存）。 */
+    killForProtocolError(err) {
+        this.log(err.message);
+        this.buffer = "";
+        const child = this.child;
+        this.child = null;
+        this.rejectAll(err);
+        if (child) {
+            try {
+                child.kill();
+            }
+            catch {
+                /* 已退出 */
+            }
+        }
+    }
     handleMessage(msg) {
         if (msg.id !== undefined) {
             const pending = this.pending.get(String(msg.id));
@@ -360,8 +392,7 @@ function adaptMcpTool(serverName, mcpTool, client) {
     return {
         name,
         label: `${serverName} · ${mcpTool.name}`,
-        description: mcpTool.description ??
-            bilingual(`Tool ${mcpTool.name} provided by MCP server "${serverName}"`, `从 MCP 服务器「${serverName}」提供的工具 ${mcpTool.name}`),
+        description: mcpTool.description ?? `Tool ${mcpTool.name} provided by MCP server "${serverName}"`,
         parameters: mcpTool.inputSchema ?? {},
         execute: async (_toolCallId, params, _signal) => {
             return client.call(mcpTool.name, params ?? {});
@@ -380,6 +411,8 @@ export class McpBridge {
     opts;
     clients = [];
     tools = [];
+    /** reload 串行化链：重入的 reload 排在前一个之后，杜绝交叠留下的孤儿进程。 */
+    reloadChain = Promise.resolve();
     constructor(dataDir, log = () => { }, opts = {}) {
         this.dataDir = dataDir;
         this.log = log;
@@ -411,6 +444,12 @@ export class McpBridge {
     }
     /**
      * 按磁盘上的最新配置**整体换入**服务器集合（`mcp.json` 热加载用），可重复调用。
+     *
+     * 并发互斥：watch + 轮询 + 手动 apply 可能同时触发 reload，两个 reload 交叠跑
+     * 会各自 startOne/close —— 同一服务器起两个子进程、或把别人刚换入的实例当
+     * stale 关掉（孤儿/误杀）。这里用一条 promise 链把重入排成队，每个 reload
+     * 看到的是前一个完成后的最新状态；热加载的防抖窗口之外再兜一道。
+     *
      * 三步的顺序都有讲究：
      *  1. 规格没变的服务器**沿用原实例** —— 改一个服务器不该连带重启其它服务器（子进程、
      *     浏览器会话、在途调用全都不动）；
@@ -419,6 +458,11 @@ export class McpBridge {
      *  3. 最后才 close 掉被移除/被替换的旧实例，并按新集合重建工具表。
      */
     async reload() {
+        const run = this.reloadChain.then(() => this.reloadOnce(), () => this.reloadOnce());
+        this.reloadChain = run.then(() => undefined, () => undefined);
+        return run;
+    }
+    async reloadOnce() {
         const cfg = optsOverrideOrRead(this.opts.specOverride, this.dataDir);
         const next = new Map();
         let kept = 0;

package/dist/server/model-admin.js

@@ -11,7 +11,7 @@
  * 经 ModelAdminHost 与 ClientSession 解耦（同 settings/goal/slash 服务模式）。
  * UI 文案直接中文（服务端 notice 约定）。apiKey/headers 绝不下发浏览器。
  */
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { enrichBatch } from "./model-enrich.js";
 import { pick } from "./i18n.js";
@@ -65,6 +65,13 @@ export function graduateOverlayModels(providers, official) {
     }
     return graduated;
 }
+/** 原子写 JSON（tmp + rename）：进程崩溃不留半截文件——裸 writeFileSync 中途被
+ *  杀会把整份配置截断，下次读盘即空表。tmp 名带 pid，避免同机多进程互踩。 */
+function atomicWriteJson(path, data) {
+    const tmp = `${path}.${process.pid}.tmp`;
+    writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n");
+    renameSync(tmp, path);
+}
 /** Strip // and /* *\/ comments without touching string literals (URLs contain //). */
 function stripJsonComments(src) {
     let out = "";
@@ -111,7 +118,7 @@ function stripJsonComments(src) {
 /** Merge a UI-submitted provider config into the existing models.json entry.
  *
  * 表单（`UiProviderConfig`）只承载 UI 认识的字段：provider 级 name/api/baseUrl/
- * apiKey/authHeader，模型级 id/name/reasoning/input/contextWindow/maxTokens。
+ * hasApiKey/authHeader，模型级 id/name/reasoning/input/contextWindow/maxTokens。
  * models.json 里还可能有 UI 不认识的字段——provider 级 headers（浏览器拿不到，
  * 见 listModelsConfig）、模型级 api/baseUrl/cost/compat/thinkingLevelMap（手写或
  * 脚本写入，pi-ai 靠它们决定请求地址与推理格式）。按表单整体重建条目会把这些字段
@@ -120,6 +127,10 @@ function stripJsonComments(src) {
  *
  * 所以这里以已有条目为底、表单字段覆盖：表单没提到的字段原样保留，表单清空的可选
  * 字段才真正删除；`models` 仍是「表单即全集」——表单里删掉的 id 会被移除。
+ *
+ * apiKey 例外：浏览器不再持有明文（只见 hasApiKey），**缺字段 = 保留旧值**；显式
+ * 空串才清除（协议级"空=清除"语义保留，但 Web 表单留空时整字段不传）。这样
+ * refresh_provider_models 等不带 apiKey 的内部保存路径也绝不会把密钥抹掉。
  */
 export function mergeProviderConfigEntry(prevEntry, config, models) {
     const prevModels = new Map();
@@ -134,7 +145,7 @@ export function mergeProviderConfigEntry(prevEntry, config, models) {
     }
     const mergedModels = models.map((model) => {
         // 旧条目同 id 的字段（api/baseUrl/cost/compat/…）先铺底，表单字段覆盖。
-        const merged = { ...(prevModels.get(model.id) ?? {}), id: model.id };
+        const merged = { ...prevModels.get(model.id), id: model.id };
         if (model.name?.trim())
             merged.name = model.name.trim();
         else
@@ -167,7 +178,12 @@ export function mergeProviderConfigEntry(prevEntry, config, models) {
     apply("name", config.name?.trim() || undefined);
     apply("api", config.api?.trim() || undefined);
     apply("baseUrl", config.baseUrl?.trim() || undefined);
-    apply("apiKey", config.apiKey?.trim() || undefined);
+    if (config.apiKey === undefined) {
+        // 表单没带 apiKey（留空/内部路径）→ 保留旧值，绝不清除。
+    }
+    else {
+        apply("apiKey", config.apiKey.trim() || undefined);
+    }
     apply("authHeader", config.authHeader ? true : undefined);
     mergedEntry.models = mergedModels;
     return mergedEntry;
@@ -331,29 +347,55 @@ export class ModelAdminService {
     }
     /** Read + parse provider-keys.json. */
     readProviderKeys() {
+        let raw;
         try {
-            const parsed = JSON.parse(readFileSync(this.providerKeysPath(), "utf8"));
-            const out = {};
-            for (const [pid, entry] of Object.entries(parsed)) {
-                const keys = Array.isArray(entry?.keys) ? entry.keys.filter((k) => k?.name && k?.apiKey) : [];
-                if (!pid || keys.length === 0)
-                    continue;
-                const activeKeyName = entry.activeKeyName === null
-                    ? null
-                    : entry.activeKeyName && keys.some((k) => k.name === entry.activeKeyName)
-                        ? entry.activeKeyName
-                        : keys[0].name;
-                out[pid] = { activeKeyName, keys };
-            }
-            return out;
+            raw = readFileSync(this.providerKeysPath(), "utf8");
         }
         catch {
+            return {}; // 文件不存在 = 首次引导
+        }
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch (err) {
+            // 坏文件改名留存：里面可能有全部备用密钥，绝不能被后续种子/空表整份覆盖。
+            this.quarantineCorruptFile(this.providerKeysPath(), err);
             return {};
         }
+        const out = {};
+        for (const [pid, entry] of Object.entries(parsed)) {
+            const keys = Array.isArray(entry?.keys) ? entry.keys.filter((k) => k?.name && k?.apiKey) : [];
+            if (!pid || keys.length === 0)
+                continue;
+            const activeKeyName = entry.activeKeyName === null
+                ? null
+                : entry.activeKeyName && keys.some((k) => k.name === entry.activeKeyName)
+                    ? entry.activeKeyName
+                    : keys[0].name;
+            out[pid] = { activeKeyName, keys };
+        }
+        return out;
     }
     writeProviderKeys(data) {
         mkdirSync(this.host.agentDir, { recursive: true });
-        writeFileSync(this.providerKeysPath(), JSON.stringify(data, null, 2) + "\n");
+        // 原子写（tmp+rename）：崩溃不留半截 JSON；0o600 限权防本机其他用户读密钥
+        //（Windows 忽略 mode 无害，POSIX 生效）。
+        const path = this.providerKeysPath();
+        const tmp = `${path}.${process.pid}.tmp`;
+        writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n", { mode: 0o600 });
+        renameSync(tmp, path);
+    }
+    /** 解析失败的配置文件改名留存为 <name>.corrupt-<timestamp>。改名失败（占用/
+     *  跨盘等）也不抛——留存是尽力而为，绝不能阻塞主流程。 */
+    quarantineCorruptFile(path, err) {
+        try {
+            renameSync(path, `${path}.corrupt-${Date.now()}`);
+            console.warn(`[model-admin] 配置文件解析失败，已改名留存：${path}（${err.message}）`);
+        }
+        catch {
+            console.warn(`[model-admin] 配置文件解析失败且无法留存：${path}（${err.message}）`);
+        }
     }
     /** Default name "密钥 N" for a provider's Nth key. */
     defaultKeyName(keys) {
@@ -421,12 +463,17 @@ export class ModelAdminService {
         }
     }
     /** Push the masked provider-keys map to the client. Seeds the store from any
-     *  auth.json credentials so legacy single-key setups show up immediately. */
+     *  auth.json credentials so legacy single-key setups show up immediately.
+     *  只在文件不存在（首次引导）时才落盘种子；文件存在（含空表）绝不整份写回
+     *  ——写回的来源永远是读盘结果，避免任何竞态把用户密钥覆盖掉。 */
     listProviderKeys() {
+        const path = this.providerKeysPath();
         const data = this.readProviderKeys();
-        for (const pid of this.builtinProviderIds())
-            this.seedProviderKeysFromAuth(pid, data);
-        this.writeProviderKeys(data);
+        if (!existsSync(path)) {
+            for (const pid of this.builtinProviderIds())
+                this.seedProviderKeysFromAuth(pid, data);
+            this.writeProviderKeys(data);
+        }
         this.host.emit({ type: "provider_keys", ...this.providerKeysInfo(data) });
         this.host.flushSnapshot();
     }
@@ -458,7 +505,7 @@ export class ModelAdminService {
             // no file yet / unparsable — start fresh
         }
         data[pid] = { type: "api_key", key: apiKey };
-        writeFileSync(authPath, JSON.stringify(data, null, 2) + "\n");
+        atomicWriteJson(authPath, data);
         const mr = this.host.modelRuntime();
         await mr.setRuntimeApiKey(pid, apiKey);
         await mr.refresh({ allowNetwork: true, providers: [pid] });
@@ -689,7 +736,7 @@ export class ModelAdminService {
                     // no file yet — nothing to clean
                 }
                 delete auth[pid];
-                writeFileSync(authPath, JSON.stringify(auth, null, 2) + "\n");
+                atomicWriteJson(authPath, auth);
                 const mr = this.host.modelRuntime();
                 await mr.removeRuntimeApiKey(pid);
                 await mr.refresh({ providers: [pid] });
@@ -780,7 +827,7 @@ export class ModelAdminService {
                 return;
             }
             delete data[pid];
-            writeFileSync(authPath, JSON.stringify(data, null, 2) + "\n");
+            atomicWriteJson(authPath, data);
             // Clear every stored key so the provider returns to unconfigured.
             delete keyData[pid];
             this.writeProviderKeys(keyData);
@@ -1131,7 +1178,8 @@ export class ModelAdminService {
                 name: p.name,
                 api: p.api,
                 baseUrl: p.baseUrl,
-                apiKey: p.apiKey,
+                // apiKey 明文绝不下发浏览器，只报有无；表单留空 = 保持不变。
+                hasApiKey: typeof p.apiKey === "string" && p.apiKey.trim() !== "",
                 authHeader: p.authHeader,
                 // headers are intentionally NOT sent to the browser — they may
                 // contain Authorization / API-key values; kept server-side only.
@@ -1232,18 +1280,50 @@ export class ModelAdminService {
      *  because the baseUrl is often a LAN/loopback host the browser can't reach
      *  cross-origin) and return the advertised models. reqId is echoed back
      *  in fetch_models_result so the UI can match concurrent requests. */
+    /** 编辑表单的探测（fetch_models / test_model_connection）没带明文 apiKey 时，
+     *  按 providerId 回落到 models.json 里已保存的密钥——编辑存量服务商时表单
+     *  一律留空（明文不再回传浏览器），没有这个回落「测试连接」就会 401。 */
+    savedProviderApiKey(providerId) {
+        const pid = providerId?.trim();
+        if (!pid)
+            return undefined;
+        const saved = this.readModelsConfig().providers[pid];
+        return typeof saved?.apiKey === "string" && saved.apiKey.trim() ? saved.apiKey : undefined;
+    }
     async fetchModelsList(reqId, baseUrl, apiKey, authHeader, api, 
     /** 探测抛错文案语言（默认英文）；调用方可传 () => getLang() 实现跟随。 */
-    lang) {
+    lang, providerId) {
         const emitError = (error) => this.host.emit({ type: "fetch_models_result", reqId, ok: false, error });
         try {
-            const models = await ModelAdminService.probeModelsEndpoint(baseUrl, apiKey, authHeader, api, undefined, lang);
+            const key = apiKey?.trim() || this.savedProviderApiKey(providerId);
+            const models = await ModelAdminService.probeModelsEndpoint(baseUrl, key, authHeader, api, undefined, lang);
             this.host.emit({ type: "fetch_models_result", reqId, ok: true, models });
         }
         catch (err) {
             emitError(err.message);
         }
     }
+    /**
+     * Lightweight connectivity and auth probe for a provider endpoint.
+     * Measures latency in ms and returns ok/error.
+     */
+    async testConnection(reqId, baseUrl, apiKey, authHeader, api, lang, providerId) {
+        const start = Date.now();
+        try {
+            const key = apiKey?.trim() || this.savedProviderApiKey(providerId);
+            await ModelAdminService.probeModelsEndpoint(baseUrl, key, authHeader, api, undefined, lang);
+            const latencyMs = Date.now() - start;
+            this.host.emit({ type: "test_model_connection_result", reqId, ok: true, latencyMs });
+        }
+        catch (err) {
+            this.host.emit({
+                type: "test_model_connection_result",
+                reqId,
+                ok: false,
+                error: err.message,
+            });
+        }
+    }
     /**
      * Probe a custom provider's model-list endpoint (OpenAI-compatible /models
      * with a /v1 retry; Google {models:[…]} shape supported). Throws Error with
@@ -1525,7 +1605,7 @@ export class ModelAdminService {
         if (graduated.length === 0)
             return graduated;
         try {
-            writeFileSync(this.modelsConfigPath(), JSON.stringify({ providers }, null, 2) + "\n");
+            atomicWriteJson(this.modelsConfigPath(), { providers });
         }
         catch {
             return [];
@@ -1562,7 +1642,7 @@ export class ModelAdminService {
      *  config list + the picker. Callers emit their own notice. */
     async writeModelsConfigAndReload(providers, pid) {
         mkdirSync(this.host.agentDir, { recursive: true });
-        writeFileSync(this.modelsConfigPath(), JSON.stringify({ providers }, null, 2) + "\n");
+        atomicWriteJson(this.modelsConfigPath(), { providers });
         // Allow a models.json entry to reuse the provider credential already
         // stored in auth.json. Seed the shared runtime too, because older pi-ai
         // versions did not always fall back to stored credentials for a
@@ -1719,7 +1799,7 @@ export class ModelAdminService {
                 return;
             }
             delete providers[providerId];
-            writeFileSync(this.modelsConfigPath(), JSON.stringify({ providers }, null, 2) + "\n");
+            atomicWriteJson(this.modelsConfigPath(), { providers });
             await this.host.modelRuntime().refresh();
             this.host.invalidatePiConfig();
             await this.listModelsConfig();