pi-web-ui 0.94.1 → 0.96.0

package/dist/server/serialize.js

@@ -31,21 +31,21 @@ function truncate(s, cap) {
  */
 function imageBlockToUi(b, cap = Number.POSITIVE_INFINITY) {
     const img = b;
+    const src = img.source;
+    if (typeof src?.url === "string" && src.url)
+        return { type: "image", dataUrl: src.url };
     if (typeof img.data === "string" && img.data.length > 0) {
         const dataUrl = `data:${img.mimeType ?? "image/png"};base64,${img.data}`;
         if (dataUrl.length > cap)
             return undefined;
         return { type: "image", dataUrl, mimeType: img.mimeType };
     }
-    const src = img.source;
     if (src?.type === "base64" && src.data) {
         const dataUrl = `data:${src.mediaType ?? "image/png"};base64,${src.data}`;
         if (dataUrl.length > cap)
             return undefined;
         return { type: "image", dataUrl, mimeType: src.mediaType };
     }
-    if (typeof src?.url === "string" && src.url)
-        return { type: "image", dataUrl: src.url };
     return undefined;
 }
 function serializeUserContent(content) {
@@ -65,7 +65,11 @@ function serializeAssistantContent(content) {
             return { type: "text", text, truncated };
         }
         if (b.type === "thinking") {
-            return { type: "thinking", thinking: b.thinking };
+            // thinking 也走 TEXT_CAP：思维链没有长度保证（长任务能刷出远超正文的
+            // 体量），不截断会把快照推送撑爆。UiThinkingBlock 没有 truncated 字段
+            // （protocol 不动），截断语义靠 truncate 自带的 "… [truncated]" 尾标。
+            const { text } = truncate(b.thinking, TEXT_CAP);
+            return { type: "thinking", thinking: text };
         }
         if (b.type === "toolCall") {
             if (b.arguments === undefined) {
@@ -107,18 +111,98 @@ export function stripTransientRetryErrors(messages, retryActive) {
     }
     return end === messages.length ? messages : messages.slice(0, end);
 }
+/**
+ * Single source for rendered message ids. Both serializeMessage (下发) and
+ * resolveMessageEntry (解析) must derive ids through this function — recomputing
+ * the format anywhere else is how the two sides drifted apart and fork/rollback
+ * on assistant bubbles stopped resolving (issue #381).
+ */
+export function uiMessageId(m, seq) {
+    switch (m.role) {
+        case "user":
+            return `u-${m.timestamp}-${seq}`;
+        case "assistant":
+            return `a-${m.timestamp}-${seq}`;
+        case "toolResult":
+            return `t-${m.toolCallId}`;
+        case "bashExecution":
+            return `b-${m.timestamp}-${seq}`;
+        case "custom":
+            return `c-${m.timestamp}-${seq}`;
+        case "branchSummary":
+            return `bs-${m.timestamp}-${seq}`;
+        case "compactionSummary":
+            return `cs-${m.timestamp}-${seq}`;
+        default:
+            return `x-${seq}`;
+    }
+}
+/**
+ * Find the session entry a rendered message id points at, by re-deriving each
+ * entry's rendered id through uiMessageId() — the same function serializeMessage
+ * used to hand ids to the browser. `seqOf` supplies the per-message seq; the
+ * caller injects its counter there (agent-service passes uiMessageKey().n, which
+ * is exactly the counter serialization drew from — issue #381).
+ */
+export function findEntryByUiId(entries, messageId, seqOf) {
+    const userSeqByTs = new Map();
+    for (const entry of entries) {
+        if (entry.id === messageId)
+            return entry;
+        if (entry.type === "message" && entry.message) {
+            const m = entry.message;
+            let seq;
+            if (m.role === "user") {
+                // User ids count messages sharing a timestamp — mirrors the
+                // special-case in serializeCachedFor() (see its comment).
+                const ts = m.timestamp ?? 0;
+                seq = (userSeqByTs.get(ts) ?? 0) + 1;
+                userSeqByTs.set(ts, seq);
+            }
+            else {
+                seq = seqOf(m);
+            }
+            if (uiMessageId(m, seq) === messageId)
+                return entry;
+        }
+        else if (entry.type === "custom_message" && entry.display !== false) {
+            // Custom messages carry content/timestamp on the entry itself (no
+            // message object); rebuild the shape uiMessageId()/seqOf() key on —
+            // the same conversion createCustomMessage() uses on reload.
+            const m = {
+                role: "custom",
+                content: entry.content,
+                timestamp: entry.timestamp ? new Date(entry.timestamp).getTime() : 0,
+            };
+            if (uiMessageId(m, seqOf(m)) === messageId)
+                return entry;
+        }
+    }
+    return null;
+}
 export function serializeMessage(m, seq) {
+    // SDK 的 system 消息是 prompt sections 的内部差量
+    // (content 空串 + sections 结构化内存)、compaction 的
+    // systemMessage 等——从来不面向用户。不过滤的话
+    // 会掉进 default 分支被序列化成 content: []
+    // 的空气泡、前端顶着 system 标题白显示一条
+    // (对话结束后底部冒出的空 SYSTEM 气泡就是它)。
+    // LLM 上下文不受影响——这里只决定浏览器看到什么。
+    if (m.role === "system") {
+        return null;
+    }
+    const id = uiMessageId(m, seq);
     switch (m.role) {
         case "user":
             return {
-                id: `u-${m.timestamp}-${seq}`,
+                id,
                 role: "user",
                 content: serializeUserContent(m.content),
                 timestamp: m.timestamp,
             };
         case "assistant":
             return {
-                id: `a-${m.timestamp}-${seq}`,
+                id,
                 role: "assistant",
                 content: serializeAssistantContent(m.content),
                 timestamp: m.timestamp,
@@ -152,7 +236,7 @@ export function serializeMessage(m, seq) {
             const { text, truncated } = truncate(raw, TOOL_OUTPUT_CAP);
             const content = raw || images.length === 0 ? [{ type: "text", text, truncated }, ...images] : [...images];
             const msg = {
-                id: `t-${m.toolCallId}`,
+                id,
                 role: "toolResult",
                 content,
                 toolCallId: m.toolCallId,
@@ -177,7 +261,7 @@ export function serializeMessage(m, seq) {
         case "bashExecution": {
             const { text, truncated } = truncate(m.output, TOOL_OUTPUT_CAP);
             return {
-                id: `b-${m.timestamp}-${seq}`,
+                id,
                 role: "bashExecution",
                 content: [
                     {
@@ -199,19 +283,32 @@ export function serializeMessage(m, seq) {
                 return null;
             }
             const content = serializeUserContent(m.content);
-            return {
-                id: `c-${m.timestamp}-${seq}`,
+            const msg = {
+                id,
                 role: "custom",
                 content,
                 customType: m.customType,
-                details: m.details,
                 timestamp: m.timestamp,
             };
+            // custom details 与 toolResult 的 details 同一闸门（TOOL_DETAILS_CAP）：
+            // details 随每 60ms 一发的快照推送，扩展塞进来的大对象不能无节制；
+            // 超限/序列化失败整丢（截断后的 JSON 不可解析，前端还得写容错）。
+            const rawDetails = m.details;
+            if (rawDetails !== undefined) {
+                try {
+                    if (JSON.stringify(rawDetails).length <= TOOL_DETAILS_CAP)
+                        msg.details = rawDetails;
+                }
+                catch {
+                    // 循环引用等序列化不了的值：details 是附加信息，丢掉不影响消息本体。
+                }
+            }
+            return msg;
         }
         case "branchSummary": {
             const { text, truncated } = truncate(m.summary, TEXT_CAP);
             return {
-                id: `bs-${m.timestamp}-${seq}`,
+                id,
                 role: "branchSummary",
                 content: [{ type: "text", text, truncated }],
                 timestamp: m.timestamp,
@@ -220,7 +317,7 @@ export function serializeMessage(m, seq) {
         case "compactionSummary": {
             const { text, truncated } = truncate(m.summary, TEXT_CAP);
             return {
-                id: `cs-${m.timestamp}-${seq}`,
+                id,
                 role: "compactionSummary",
                 content: [{ type: "text", text, truncated }],
                 timestamp: m.timestamp,
@@ -229,7 +326,7 @@ export function serializeMessage(m, seq) {
         }
         default:
             return {
-                id: `x-${seq}`,
+                id,
                 role: String(m.role ?? "unknown"),
                 content: [],
                 timestamp: m.timestamp,

package/dist/server/settings-service.js

@@ -18,6 +18,7 @@ import { deriveLegacy, foldLegacyIntoDisabled, normalizeDisabledAgentTools } fro
 export class SettingsService {
     host;
     templates;
+    approvalRules;
     settings;
     presets;
     knownSkills = new Map();
@@ -26,9 +27,12 @@ export class SettingsService {
     pendingReload = false;
     constructor(host, 
     /** 全局子代理模板库（所有客户端共享；模板改动无需 reload runtime）。 */
-    templates) {
+    templates, 
+    /** 全局审批规则库（所有客户端共享；修改实时生效无需 reload runtime）。 */
+    approvalRules) {
         this.host = host;
         this.templates = templates;
+        this.approvalRules = approvalRules;
         this.settings = host.stateStore.getSettings(host.clientId);
         this.presets = host.stateStore.getPresets(host.clientId);
     }
@@ -289,8 +293,12 @@ export class SettingsService {
                 terminalToolsEnabled: legacyTools.terminalToolsEnabled,
                 terminalBash: this.settings.terminalBash,
                 terminalBashIdleMs: this.settings.terminalBashIdleMs,
+                terminalBashMaxForegroundMs: this.settings.terminalBashMaxForegroundMs,
                 toolWatchdogTimeoutMs: this.settings.toolWatchdogTimeoutMs,
                 readDirEnabled: this.settings.readDirEnabled !== false,
+                toolApprovalEnabled: this.settings.toolApprovalEnabled !== false,
+                approvalPolicy: this.host.getApprovalPolicy?.() ?? { allowAll: false, categories: [] },
+                approvalRules: this.approvalRules?.list() ?? [],
                 editSoftEnabled: legacyTools.editSoftEnabled,
                 questionnaireEnabled: legacyTools.questionnaireEnabled,
                 parallelReminderEnabled: this.settings.parallelReminderEnabled ?? true,
@@ -461,6 +469,9 @@ export class SettingsService {
         if (partial.terminalBashIdleMs !== undefined) {
             this.settings.terminalBashIdleMs = Math.max(0, Math.floor(partial.terminalBashIdleMs) || 0);
         }
+        if (partial.terminalBashMaxForegroundMs !== undefined) {
+            this.settings.terminalBashMaxForegroundMs = Math.max(0, Math.floor(partial.terminalBashMaxForegroundMs) || 0);
+        }
         if (partial.toolWatchdogTimeoutMs !== undefined) {
             this.settings.toolWatchdogTimeoutMs = normalizeToolWatchdogTimeoutMs(partial.toolWatchdogTimeoutMs);
         }
@@ -468,6 +479,10 @@ export class SettingsService {
         if (partial.readDirEnabled !== undefined) {
             this.settings.readDirEnabled = partial.readDirEnabled;
         }
+        // 工具执行审批总开关：审批入口每次实时读取（askApproval 顶部门禁），无需 reload。
+        if (partial.toolApprovalEnabled !== undefined) {
+            this.settings.toolApprovalEnabled = partial.toolApprovalEnabled;
+        }
         // 目标模式总开关：运行时无需重载（goal bar / 服务端入口实时读取）。
         if (partial.goalModeEnabled !== undefined) {
             this.settings.goalModeEnabled = partial.goalModeEnabled;
@@ -554,13 +569,15 @@ export class SettingsService {
         if (partial.quickPhrasesEnabled !== undefined) {
             this.settings.quickPhrasesEnabled = partial.quickPhrasesEnabled;
         }
-        this.host.stateStore.saveSettings(this.host.clientId, this.settings);
-        this.push();
         // 统一工具开关 live 生效（ActiveSet 加减；失败静默，下次创建/reload 重放）。
+        // 必须在 this.push() 前生效，保证 promptSnapshot 收集到的是最新的活跃工具集与完整提示词！
         if (toolGatingChanged)
             this.host.applyToolGating();
         if (needsReload)
             await this.applyRuntime();
+        this.host.stateStore.saveSettings(this.host.clientId, this.settings);
+        this.push();
+        this.host.flushSnapshot();
     }
     /** Save the CURRENT settings as a named preset (overwrites if exists). */
     async savePreset(name) {
@@ -587,6 +604,7 @@ export class SettingsService {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            terminalBashMaxForegroundMs: this.settings.terminalBashMaxForegroundMs,
             editSoftEnabled: this.settings.editSoftEnabled,
             retryMaxAttempts: this.settings.retryMaxAttempts,
             softCapTokens: this.settings.softCapTokens,
@@ -636,8 +654,11 @@ export class SettingsService {
             // 终端接管偏好随预设走；旧预设缺字段时保留当前值。
             terminalBash: p.terminalBash ?? this.settings.terminalBash,
             terminalBashIdleMs: p.terminalBashIdleMs ?? this.settings.terminalBashIdleMs,
+            terminalBashMaxForegroundMs: p.terminalBashMaxForegroundMs ?? this.settings.terminalBashMaxForegroundMs,
             // read 读目录是纯运行行为开关，不进预设——保留当前值。
             readDirEnabled: this.settings.readDirEnabled !== false,
+            // 工具审批总开关同样是纯运行开关，不进预设——保留当前值。
+            toolApprovalEnabled: this.settings.toolApprovalEnabled !== false,
             // toolWatchdogTimeoutMs 是纯运行行为参数，不进预设——保留当前值。
             toolWatchdogTimeoutMs: this.settings.toolWatchdogTimeoutMs,
             editSoftEnabled: presetLegacy.editSoftEnabled,
@@ -725,6 +746,94 @@ export class SettingsService {
             textEn: `Subagent template deleted: ${name}`,
         });
     }
+    /** Upsert 一条审批规则（全局共享）。 */
+    async saveApprovalRule(rule) {
+        if (!this.approvalRules)
+            return;
+        const err = this.approvalRules.upsert(rule);
+        if (err) {
+            this.host.emit({
+                type: "notice",
+                level: "error",
+                text: `审批规则保存失败：${err}`,
+                textEn: `Failed to save approval rule: ${err}`,
+            });
+            return;
+        }
+        this.push();
+        this.host.emit({
+            type: "notice",
+            level: "info",
+            text: `审批规则已保存：${rule.label}`,
+            textEn: `Approval rule saved: ${rule.labelEn || rule.label}`,
+        });
+    }
+    /** 批量更新审批规则列表（重排或批量保存，全局共享）。 */
+    async saveApprovalRules(rules) {
+        if (!this.approvalRules)
+            return;
+        const err = this.approvalRules.saveAll(rules);
+        if (err) {
+            this.host.emit({
+                type: "notice",
+                level: "error",
+                text: `审批规则列表保存失败：${err}`,
+                textEn: `Failed to save approval rules: ${err}`,
+            });
+            return;
+        }
+        this.push();
+        this.host.emit({
+            type: "notice",
+            level: "info",
+            text: "审批规则列表已更新",
+            textEn: "Approval rules updated",
+        });
+    }
+    /** 删除一条自定义审批规则。 */
+    async deleteApprovalRule(id) {
+        if (!this.approvalRules)
+            return;
+        const ok = this.approvalRules.remove(id);
+        if (!ok) {
+            this.host.emit({
+                type: "notice",
+                level: "error",
+                text: "审批规则删除失败（内置规则不可删除）",
+                textEn: "Failed to delete approval rule (built-in rules cannot be deleted)",
+            });
+            return;
+        }
+        this.push();
+        this.host.emit({
+            type: "notice",
+            level: "info",
+            text: "审批规则已删除",
+            textEn: "Approval rule deleted",
+        });
+    }
+    /** 恢复某条内置审批规则到系统默认设定。 */
+    async resetBuiltinApprovalRule(id) {
+        if (!this.approvalRules)
+            return;
+        const ok = this.approvalRules.resetBuiltin(id);
+        if (!ok) {
+            this.host.emit({
+                type: "notice",
+                level: "error",
+                text: "恢复默认失败：未找到对应内置规则",
+                textEn: "Failed to reset: built-in rule not found",
+            });
+            return;
+        }
+        this.push();
+        this.host.emit({
+            type: "notice",
+            level: "info",
+            text: "内置规则已恢复默认",
+            textEn: "Built-in rule reset to default",
+        });
+    }
     /**
      * Make settings changes effective in the running runtime. The resource-loader
      * overrides read this.settings at call time, so a reload re-applies them.

package/dist/server/skill-tool.js

@@ -14,13 +14,13 @@
 //     查不到被禁用的技能；
 //   - 与 SDK 同名工具撞名时 customTools 按 name 覆盖（bash 本体是先例）。
 //
-// 双语约定（issue #91）：definition 走 bilingual(en, zh) 内联双语；per-call
+// 文案约定：工具 definition（description/promptSnippet/promptGuidelines）为纯英文；per-call
 // 返回文本按 lang 取 pick(lang, zh, en, key)，缺表回落英文内联。
 // ---------------------------------------------------------------------------
 import { statSync, readFileSync } from "node:fs";
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { bilingual, pick } from "./i18n.js";
+import { pick } from "./i18n.js";
 import { SKILL_TOOL_NAME } from "./tool-manager.js";
 import { decodeText } from "./text-sniff.js";
 /** 单文件正文上限（与 agent-service fillSkillContents 同口径：8KB）。 */
@@ -61,12 +61,10 @@ export function makeSkillTool(host, lang) {
     return defineTool({
         name: SKILL_TOOL_NAME,
         label: "Load a skill",
-        description: bilingual("Load a skill's full text by its exact name (see the <available_skills> catalog in the system prompt). " +
+        description: "Load a skill's full text by its exact name (see the <available_skills> catalog in the system prompt). " +
             "Prefer this over reading the skill file with the read tool — no path guessing needed. " +
-            "Call without a name to list the current catalog.", "按技能精确名加载其全文（名录见系统提示词里的 <available_skills>）。" +
-            "优先用它，不要自己拼路径调 read 工具读技能文件。" +
-            "不给名则返回当前名录。"),
-        promptSnippet: bilingual("load a skill's full text by name (skill tool, preferred over read)", "按名加载技能全文（skill 工具，优先于 read）"),
+            "Call without a name to list the current catalog.",
+        promptSnippet: "load a skill's full text by name (skill tool, preferred over read)",
         parameters: Type.Object({
             name: Type.Optional(Type.String({
                 description: "Exact skill name from the catalog. Omit to list the current catalog.",

package/dist/server/subagent-templates.js

@@ -42,6 +42,53 @@ export function pickTemplatePrompt(t, lang) {
 }
 /** 名字去空白折叠后非空且 ≤ 60 字符（工具参数可读，允许中文）。 */
 const NAME_MAX = 60;
+/**
+ * 模板体积上限（保存期拒绝，不静默截断）：模板会整体进入设置面板快照并被
+ * subagent_templates 工具列给 AI，systemPrompt 还会拼进子代理上下文，无上限
+ * 的单条模板能把快照推送与子代理首响都拖爆。对齐常见上下文预算的保守值。
+ */
+export const TEMPLATE_LIMITS = {
+    /** 模板系统提示词上限（systemPrompt / systemPromptEn 各自计）。 */
+    systemPrompt: 32_768,
+    /** 模板简介上限（description / descriptionEn 各自计）。 */
+    description: 2_000,
+    /** 技能/扩展白名单各自最多条目数。 */
+    whitelistEntries: 64,
+    /** 白名单单条字符上限。 */
+    whitelistEntryLength: 200,
+};
+/**
+ * 保存期体积校验：超限返回明确错误文本（让设置面板能原样提示），null = 通过。
+ * 只拦新保存，不拦读盘老数据（向后兼容，与 replace 空提示词的拦截口径一致）；
+ * 拒绝而非截断——静默截断会让用户以为保存的是完整内容。
+ */
+export function validateTemplateLimits(t) {
+    if (t.systemPrompt.length > TEMPLATE_LIMITS.systemPrompt) {
+        return `模板 "${t.name}" 的系统提示词超长（${t.systemPrompt.length} > ${TEMPLATE_LIMITS.systemPrompt} 字符），请精简后再保存`;
+    }
+    if ((t.systemPromptEn ?? "").length > TEMPLATE_LIMITS.systemPrompt) {
+        return `模板 "${t.name}" 的英文系统提示词超长（${(t.systemPromptEn ?? "").length} > ${TEMPLATE_LIMITS.systemPrompt} 字符），请精简后再保存`;
+    }
+    if (t.description.length > TEMPLATE_LIMITS.description) {
+        return `模板 "${t.name}" 的简介超长（${t.description.length} > ${TEMPLATE_LIMITS.description} 字符），请精简后再保存`;
+    }
+    if ((t.descriptionEn ?? "").length > TEMPLATE_LIMITS.description) {
+        return `模板 "${t.name}" 的英文简介超长（${(t.descriptionEn ?? "").length} > ${TEMPLATE_LIMITS.description} 字符），请精简后再保存`;
+    }
+    for (const [label, list] of [
+        ["技能白名单", t.enabledSkills],
+        ["扩展白名单", t.enabledExtensions],
+    ]) {
+        if (list.length > TEMPLATE_LIMITS.whitelistEntries) {
+            return `模板 "${t.name}" 的${label}条目过多（${list.length} > ${TEMPLATE_LIMITS.whitelistEntries} 条）`;
+        }
+        const over = list.find((entry) => entry.length > TEMPLATE_LIMITS.whitelistEntryLength);
+        if (over) {
+            return `模板 "${t.name}" 的${label}有超长条目（${over.length} > ${TEMPLATE_LIMITS.whitelistEntryLength} 字符）`;
+        }
+    }
+    return null;
+}
 /**
  * 内置默认模板（第一次运行时种子进列表；用户改动后以 <dataDir> 文件为准）。
  * 文案改编自 pi-subagents 社区项目（tintinweb / nicobailon）的角色提示词,
@@ -629,6 +676,10 @@ export class SubagentTemplatesStore {
         if (t.promptMode === "replace" && !t.systemPrompt.trim() && !(t.systemPromptEn ?? "").trim()) {
             return `模板 "${t.name}" 用了 replace 模式但系统提示词为空：replace 会整体替换子代理 persona，空提示词等于模板没生效。请填写提示词（中文或英文至少一个），只想限定技能/扩展白名单请用 append 模式`;
         }
+        // 体积上限同样只在保存期拦：超限明确报错，绝不静默截断。
+        const limitError = validateTemplateLimits(t);
+        if (limitError)
+            return limitError;
         const list = this.load();
         const i = list.findIndex((x) => x.name === t.name);
         if (i >= 0)