pi-web-ui 0.68.1 → 0.69.0

package/dist/server/agent-service.js

@@ -14,7 +14,7 @@ import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, rmSync, statSync, mkdirSync, watch } from "node:fs";
-import { basename, dirname, join, resolve, sep } from "node:path";
+import { basename, delimiter, dirname, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createBashTool, createLocalBashOperations, getAgentDir, SessionManager, VERSION, } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
@@ -28,14 +28,15 @@ import { MarkerService } from "./marker-service.js";
 import { SlashCommandsService, parseSlash } from "./slash-commands.js";
 import { ModelAdminService } from "./model-admin.js";
 import { FilesService, MACHINE_ROOT, workspacePath } from "./files-service.js";
-import { isExtensionDisabled, isExtensionEnabled, ClientStateStore } from "./client-state.js";
-import { SubagentTemplatesStore } from "./subagent-templates.js";
+import { isExtensionDisabled, isExtensionEnabled, normalizeRetryMaxAttempts, ClientStateStore, } from "./client-state.js";
+import { pick, resolveServerLang } from "./i18n.js";
+import { SubagentTemplatesStore, pickTemplatePrompt } from "./subagent-templates.js";
 import { applyHeadTail, makePersistentTerminalTools, makeTerminalBashTool, stripAnsi, TERMINAL_TOOLS_GUIDANCE, TERMINAL_TOOL_NAMES, } from "./terminals.js";
 import { WebUIContext, mockThemeProxy } from "./webui-context.js";
 import { makeEditSoftTool, SOFT_EDIT_TOOL_NAME } from "./edit-soft-tool.js";
-import { makeSubagentTools, subagentTitle, } from "./subagents.js";
+import { makeSubagentTools, subagentTitle, withSubagentOwner, } from "./subagents.js";
 import { buildAttachmentMessages } from "./attachments.js";
-import { BUILTIN_SOUL, DEFAULT_PROMPT_TEMPLATE, renderPromptTemplate, resolveSectionTexts, } from "./prompt-composer.js";
+import { BUILTIN_SOUL, DEFAULT_PROMPT_TEMPLATE, buildToolsSchemaText, renderPromptTemplate, resolveSectionTexts, } from "./prompt-composer.js";
 import { serializeMessage, serializeStreamingMessage, stripTransientRetryErrors, } from "./serialize.js";
 import { loadCommands, saveCommandsFile, TerminalManager } from "./terminals.js";
 const SNAPSHOT_INTERVAL_MS = 60;
@@ -196,11 +197,13 @@ function makeMarkersListTool(getActiveId, markerSvc) {
     return {
         name: "markers_list",
         label: "List marker state",
-        description: "只读查询内联标记状态。状态【写】操作请一律用内联标记（[[todo:new:...]] 等）写在回答正文里，不要调用本工具做写操作。",
+        description: "Read-only query of inline marker state. All WRITE operations must use inline markers ([[todo:new:...]] etc.) in the reply body — never use this tool for writes.\n只读查询内联标记状态。状态【写】操作请一律用内联标记（[[todo:new:...]] 等）写在回答正文里，不要调用本工具做写操作。",
         parameters: Type.Object({
             action: Type.Unsafe({ enum: ["list"] }),
             tool: Type.Optional(Type.Literal("todo")),
-            includeDeleted: Type.Optional(Type.Boolean({ description: "是否包含已删除任务（tombstone，仅 todo）" })),
+            includeDeleted: Type.Optional(Type.Boolean({
+                description: "Whether to include deleted tasks (tombstones, todo only).\n是否包含已删除任务（tombstone，仅 todo）。",
+            })),
         }),
         execute: async (_id, params) => {
             const p = params;
@@ -215,6 +218,67 @@ function makeMarkersListTool(getActiveId, markerSvc) {
         },
     };
 }
+/**
+ * 标准 pi 引擎的 ask_user_question 工具：模型调用时把问题桥到浏览器（复用 DSH
+ * 引擎的 question_pending/question_answer 协议，前端 DshQuestionDialog 富渲染），
+ * 阻塞 agent 循环直到用户在浏览器回答或取消。
+ *
+ * 标准 SDK 没有内建 ask_user_question，故由 pi-web-ui 以 customTool 注册（与
+ * bash/edit 同机制）。DSH 引擎走 goal-rpc 的 userQuestions provider，两者互不
+ * 冲突（各引擎各走各的）。
+ *
+ * askUser 签名带 {aborted} 快照而非完整 AbortSignal：customTool 的 execute 信号
+ * 服务于整个 agent 生命周期，这里按「已中止即拒绝」的最小语义处理，避免与其它
+ * 工具的取消逻辑纠缠。
+ */
+export function makeAskUserQuestionTool(clientSession) {
+    const QuestionOptionSchema = Type.Object({
+        label: Type.String({ description: "Display label for the option" }),
+        description: Type.Optional(Type.String({ description: "Optional description shown below label" })),
+        preview: Type.Optional(Type.String({
+            description: "Optional preview rendered below when this option is selected (markdown or HTML — use for mockups/code/config).",
+        })),
+    });
+    const QuestionSchema = Type.Object({
+        id: Type.String({ description: "Unique identifier for this question" }),
+        question: Type.String({ description: "The full question text to display (markdown/HTML ok)" }),
+        detail: Type.Optional(Type.String({ description: "Optional detail/context shown under the question" })),
+        header: Type.Optional(Type.String({ description: "Optional short header for this question" })),
+        options: Type.Optional(Type.Array(QuestionOptionSchema, { description: "Available options to choose from" })),
+        multiSelect: Type.Optional(Type.Boolean({ description: "Allow selecting multiple options (default: false)" })),
+    });
+    return {
+        name: "ask_user_question",
+        label: "Ask the user",
+        description: "Ask the user focused questions to pin down ambiguous requirements. Use for clarifying the task, confirming decisions, or getting preferences. Each question renders a browser dialog with markdown/HTML rich text; options may carry a `preview`. Submit or cancel to resume.",
+        parameters: Type.Object({
+            questions: Type.Array(QuestionSchema, { description: "Questions to ask the user" }),
+        }),
+        execute: async (_id, params, signal) => {
+            const qs = params.questions;
+            if (!Array.isArray(qs) || qs.length === 0) {
+                throw new Error("ask_user_question requires at least one question");
+            }
+            const answers = await clientSession.askUser(qs, {
+                aborted: signal?.aborted,
+            });
+            if (answers === null) {
+                throw new Error("User cancelled the question.\n用户取消了提问。");
+            }
+            // 工具结果：把每道题的回答拼成简洁文本给模型，同时留 details 供 UI 展示。
+            const lines = answers.map((a) => {
+                const q = qs.find((q) => q.id === a.id);
+                const label = a.selected.join(", ");
+                const custom = a.custom?.trim() ? ` (wrote: ${a.custom.trim()})` : "";
+                return `${q?.header ?? q?.id ?? a.id}: ${label || "(no selection)"}${custom}`;
+            });
+            return {
+                content: [{ type: "text", text: lines.join("\n") }],
+                details: { answers },
+            };
+        },
+    };
+}
 /**
  * 插件结构化工具 → SDK ToolDefinition。
  * execute 返回值宽容处理：{content,details} 原样收编；字符串/对象包成文本块。
@@ -514,6 +578,8 @@ export class ClientSession {
         isDisposed: () => this.disposed,
         getCwd: () => this.cwd,
         getActiveCwd: () => this.conv?.cwd ?? this.cwd,
+        // issue #91：文件服务错误文案按客户端 UI 语言出中英（英文默认）。
+        getLang: () => this.getLang(),
     });
     bg = new BgServerTracker({
         emit: (msg) => this.emit(msg),
@@ -568,7 +634,9 @@ export class ClientSession {
         return (conversationId ? this.convs.get(conversationId) : this.conv)?.cwd ?? this.cwd;
     }
     makeTerminalManager(conversationId, cwd) {
-        const mgr = new TerminalManager((msg) => this.emitTerminal(conversationId, msg), cwd);
+        const mgr = new TerminalManager((msg) => this.emitTerminal(conversationId, msg), cwd, 
+        // issue #91：终端输入错误按客户端 UI 语言出中英（英文默认）。
+        () => this.getLang());
         // 终端活力检测：AI 触碰过的终端静默 ≥ 阈值（PI_WEB_TERMINAL_IDLE_MS，
         // 默认 15s）且该对话正在运行时，注入一条 steer 消息唤醒 AI 去检查。
         mgr.onAgentIdle = (terminalId, idleMs, title, lastLines) => this.notifyTerminalIdle(conversationId, terminalId, idleMs, title, lastLines);
@@ -638,18 +706,20 @@ export class ClientSession {
      *  `model`（可选）："provider/id"，显式指定子代理模型。不传时由调用方决定是否
      *  回退到模板模型 / 设置面板默认模型；null = 跟随主对话当前模型（默认行为，
      *  runtime 重建时会继承共享 ModelRuntime 的当前默认）。 */
-    async spawnSubagentConversation(prompt, type, cwd, apply, model) {
+    async spawnSubagentConversation(prompt, type, cwd, apply, model, parentId) {
         const conversationId = `sa-${randomUUID().slice(0, 8)}`;
         const terminals = this.makeTerminalManager(conversationId, cwd);
-        const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals, apply), {
+        const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals, apply, conversationId), {
             cwd,
             agentDir: this.agentDir,
             sessionManager: SessionManager.inMemory(cwd),
         });
         const conv = this.makeConversation(runtime, conversationId, terminals);
         conv.isSubagent = true;
-        // 派发时刻的 active 即父对话（子代理也可再派发，自然嵌套）。
-        conv.parentId = this.activeId || undefined;
+        // 父对话 = 真正派发它的会话（按会话归属的 host 包装填入）。直接用 active
+        // 会错：后台对话运行时用户可能正看着别的项目对话，孩子会被记到无关
+        // 对话名下、沉到别的项目组底部（issue #95）。缺省才回退到 active。
+        conv.parentId = parentId ?? this.activeId ?? undefined;
         conv.subagentType = type;
         conv.listed = true;
         conv.title = subagentTitle(prompt);
@@ -842,6 +912,8 @@ export class ClientSession {
             windowsPersona: process.platform === "win32" ? WINDOWS_PERSONA : "",
             terminalGuidance: this.settingsSvc.current.terminalToolsEnabled !== false ? TERMINAL_TOOLS_GUIDANCE : "",
             markersGuidance: this.markerSvc.buildGuidance(),
+            // issue #91：组合模板各来源段按客户端 UI 语言渲染（英文默认）。
+            lang: this.getLang(),
             contextFiles: src.contextFiles,
             skills: src.skills,
         };
@@ -868,6 +940,7 @@ export class ClientSession {
             const active = sess.getActiveToolNames();
             const snippets = {};
             const guidelines = [];
+            const schemaEntries = [];
             for (const name of active) {
                 const def = sess.getToolDefinition(name);
                 if (!def)
@@ -876,6 +949,11 @@ export class ClientSession {
                     snippets[name] = def.promptSnippet;
                 if (def.promptGuidelines)
                     guidelines.push(...def.promptGuidelines);
+                schemaEntries.push({
+                    name,
+                    description: def.description,
+                    parameters: def.parameters,
+                });
             }
             const loader = sess.resourceLoader;
             const texts = resolveSectionTexts(this.composeInputs({
@@ -895,7 +973,7 @@ export class ClientSession {
             const ovs = this.settingsSvc.current.promptOverrides ?? {};
             const hasOverride = Object.values(ovs).some((v) => typeof v === "string" && v.trim());
             const rendered = !tpl && !hasOverride ? undefined : renderPromptTemplate(tpl || DEFAULT_PROMPT_TEMPLATE, texts, ovs);
-            return { texts, full: rendered ?? sess.systemPrompt };
+            return { texts, full: rendered ?? sess.systemPrompt, toolsSchema: buildToolsSchemaText(schemaEntries) };
         }
         catch {
             // Session not ready yet.
@@ -905,7 +983,7 @@ export class ClientSession {
     /** 设置面板预览用的 host 回调（见 SettingsHost.promptSnapshot）：完整生效提示词
      *  + 各来源默认（自动）内容。会话未就绪时给空值，面板保持可编辑但不预览。 */
     promptSnapshot() {
-        return this.sessionPromptSnapshot() ?? { full: "", texts: {} };
+        return this.sessionPromptSnapshot() ?? { full: "", texts: {}, toolsSchema: "" };
     }
     /** Web-facing extension UI context (widgets, notifications). */
     webUi = new WebUIContext((msg) => this.emit(msg));
@@ -916,14 +994,14 @@ export class ClientSession {
      * 切换查看 / 输入补充（steer）/ 中止（abort）/ 移出全部复用现有对话机制。
      */
     subagentHost = {
-        spawnSubagent: (prompt, type, cwd, templateName, model) => {
+        spawnSubagent: (prompt, type, cwd, templateName, model, parentId) => {
             // 模板：存在且启用时应用；传了名字但不可用 → 抛错让工具转给 AI。
             const tpl = templateName ? this.subagentTemplates.get(templateName) : undefined;
             if (templateName && (!tpl || !tpl.enabled)) {
-                throw new Error(`子代理模板不可用：${templateName}（不存在或已停用）`);
+                throw new Error(pick(this.getLang(), `子代理模板不可用：${templateName}（不存在或已停用）`, `Subagent template unavailable: ${templateName} (missing or disabled)`, "agent.subagent.template.unavailable", { templateName: templateName }));
             }
             // 模型优先级：显式 model 参数 > 模板自带模型 > 设置面板默认模型；都不给 = 跟随主对话。
-            return this.spawnSubagentConversation(prompt, type, cwd, tpl, model);
+            return this.spawnSubagentConversation(prompt, type, cwd, tpl, model, parentId);
         },
         getSubagent: (convId) => this.getSubagentSnapshot(convId),
         listSubagents: () => this.listSubagentSnapshots(),
@@ -936,14 +1014,16 @@ export class ClientSession {
         stopSubagent: async (convId) => {
             const conv = this.convs.get(convId);
             if (conv && (conv.session.isStreaming || !conv.session.isIdle)) {
-                await this.interruptRun(conv, "用户停止子代理");
+                await this.interruptRun(conv, pick(this.getLang(), "用户停止子代理", "User stopped the subagent", "agent.subagent.stop.user"));
             }
         },
+        // issue #91：子代理工具返回按客户端 UI 语言出中英（英文默认）。
+        lang: () => this.getLang(),
         // 只向 AI 暴露 enabled 的模板（停用的对 AI 不可见）。
         listTemplates: () => this.subagentTemplates
             .list()
             .filter((t) => t.enabled)
-            .map((t) => ({ name: t.name, description: t.description, model: t.model })),
+            .map((t) => ({ name: t.name, description: t.description, descriptionEn: t.descriptionEn, model: t.model })),
         isTemplateUsable: (name) => {
             const t = this.subagentTemplates.get(name);
             return !!t && t.enabled;
@@ -1000,6 +1080,14 @@ export class ClientSession {
     subagentTemplates;
     /** 内置标记服务（todo/notify/svc/rename 等，可全局/分组开关）。 */
     markerSvc;
+    // -----------------------------------------------------------------------
+    // 用户提问桥（标准 pi 引擎的 ask_user_question customTool）：与 DSH 引擎的
+    // question_pending/question_answer 同协议。模型调 ask_user_question 工具 →
+    // 本桥发 question_pending 给浏览器 → 等 question_answer → resolve/reject
+    // 工具结果（agent 循环阻塞）。一次只展示一个提问（agent 阻塞在工具执行）。
+    // -----------------------------------------------------------------------
+    questionSeq = 0;
+    pendingQuestions = new Map();
     constructor(clientId, cwd, agentDir, stateStore) {
         this.clientId = clientId;
         this.cwd = cwd;
@@ -1022,6 +1110,8 @@ export class ClientSession {
                 // 复用现有重命名路径（内存标题 + 磁盘 session_info）
                 void this.renameConversation(convId, title);
             },
+            // issue #91：标记引导/错误按客户端 UI 语言出中英（英文默认）。
+            lang: () => this.getLang(),
         });
         this.settingsSvc = new SettingsService({
             clientId,
@@ -1035,10 +1125,14 @@ export class ClientSession {
             isStreaming: () => this.session.isStreaming,
             reloadSession: async () => {
                 await this.session.reload();
+                // reload() 重读磁盘 settings.json，会丢掉内存 applyOverrides
+                // （含重试次数覆盖）——依次重放：重试覆盖 → 终端门控。
+                this.applyRetryOverrides();
                 // reload() 会把 custom 工具重新加回活跃集——重放终端开关。
                 this.applyToolGating(this.session);
                 await this.pushSlashCommands();
             },
+            applyRetryOverrides: () => this.applyRetryOverrides(),
             promptSnapshot: () => this.promptSnapshot(),
             getMarkerState: () => ({
                 markersEnabled: this.markerSvc.current.markersEnabled,
@@ -1055,6 +1149,10 @@ export class ClientSession {
             flushSnapshot: () => this.flushSnapshot(),
             isDisposed: () => this.disposed,
             quiesceBlocked: () => this.quiesceBlocked(),
+            // issue #91：目标/审查文案按客户端 UI 语言出中英（英文默认）。
+            lang: () => this.getLang(),
+            // 目标模式总开关（设置面板「目标审查」页）：关 → 目标入口一律拒绝。
+            goalModeEnabled: () => this.settingsSvc.current.goalModeEnabled !== false,
             activeConvId: () => this.activeId,
             activeConv: () => this.conv,
             getConv: (id) => this.convs.get(id),
@@ -1082,7 +1180,7 @@ export class ClientSession {
         const cs = new ClientSession(clientId, cwd, agentDir, stateStore);
         const conversationId = cs.nextConversationId();
         const terminals = cs.makeTerminalManager(conversationId, cwd);
-        const runtime = await createAgentSessionRuntime(cs.makeRuntimeFactory(terminals), {
+        const runtime = await createAgentSessionRuntime(cs.makeRuntimeFactory(terminals, undefined, conversationId), {
             cwd,
             agentDir,
             // Resume the most recent session for this project — the SDK default
@@ -1120,7 +1218,7 @@ export class ClientSession {
      * 应用（prompt replace/append + 白名单），其余（终端接管、Windows persona
      * 等）仍跟随主会话设置。undefined = 按主会话设置（普通对话/不选模板的子代理）。
      */
-    makeRuntimeFactory(terminals, apply) {
+    makeRuntimeFactory(terminals, apply, ownerId) {
         return async ({ cwd: effectiveCwd, sessionManager }) => {
             const services = await createAgentSessionServices({
                 cwd: effectiveCwd,
@@ -1143,8 +1241,8 @@ export class ClientSession {
                     systemPromptOverride: (base) => {
                         if (typeof base === "string" && base) {
                             this.lastBaseSystemPrompt = base;
-                            if (apply && apply.promptMode === "replace" && apply.systemPrompt.trim()) {
-                                return apply.systemPrompt;
+                            if (apply && apply.promptMode === "replace" && pickTemplatePrompt(apply, this.getLang()).trim()) {
+                                return pickTemplatePrompt(apply, this.getLang());
                             }
                         }
                         return undefined;
@@ -1154,8 +1252,8 @@ export class ClientSession {
                         if (!apply)
                             this.lastSdkAppendFiles = base.slice();
                         const out = [...base];
-                        if (apply && apply.promptMode === "append" && apply.systemPrompt.trim()) {
-                            out.push(apply.systemPrompt);
+                        if (apply && apply.promptMode === "append" && pickTemplatePrompt(apply, this.getLang()).trim()) {
+                            out.push(pickTemplatePrompt(apply, this.getLang()));
                         }
                         // 主会话自定义「追加」已并入组合模板的 {{append}} 覆盖，不再在此注入。
                         if (process.platform === "win32") {
@@ -1219,12 +1317,12 @@ export class ClientSession {
                                     // 把灵魂段换成模板提示词，自动段保留；SYSTEM.md 情形已在
                                     // systemPromptOverride 整体替换，此处边界不存在会自然跳过。
                                     if (apply) {
-                                        if (apply.promptMode !== "replace" || !apply.systemPrompt.trim())
+                                        if (apply.promptMode !== "replace" || !pickTemplatePrompt(apply, this.getLang()).trim())
                                             return undefined;
                                         const boundary = event.systemPrompt.indexOf("\n\nAvailable tools:");
                                         if (boundary === -1)
                                             return undefined;
-                                        const swapped = apply.systemPrompt.trimEnd() + event.systemPrompt.slice(boundary);
+                                        const swapped = pickTemplatePrompt(apply, this.getLang()).trimEnd() + event.systemPrompt.slice(boundary);
                                         return swapped === event.systemPrompt ? undefined : { systemPrompt: swapped };
                                     }
                                     // 主会话：组合模板渲染（模板为空且无覆盖时返回 undefined = 用 SDK 默认）。
@@ -1262,20 +1360,32 @@ export class ClientSession {
                         idleMs: () => Math.max(0, Math.floor(this.settingsSvc.current.terminalBashIdleMs) || 0),
                         kills: this.bashKills,
                         notifyBackgroundDone: (info) => this.notifyTerminalBashDone(terminals, info),
+                        // issue #91：bash 返回按客户端 UI 语言出中英（英文默认）。
+                        lang: () => this.getLang(),
                     }), 
                     // 设置关 → 原生 bash；开 → 终端 bash。
                     () => this.settingsSvc.current.terminalBash),
-                    ...makePersistentTerminalTools(terminals, effectiveCwd),
+                    ...makePersistentTerminalTools(terminals, effectiveCwd, () => this.getLang()),
                     // 不覆盖内置 edit 的独立宽松编辑工具（缩进不敏感匹配；开关看设置）。
-                    makeEditSoftTool(effectiveCwd),
+                    makeEditSoftTool(effectiveCwd, () => this.getLang()),
                     // 插件注册的 AI 工具（创建时刻的实时快照；后续注册经
                     // refreshPluginTools 动态补入已有会话）。
                     ...(this.pluginToolsProvider?.() ?? []).map(pluginToolToDefinition),
                     // 第一方子代理工具（spawn/get_result/steer/list/stop）。子代理会话
-                    // 也注册了它们，因此可自然嵌套派发。
-                    ...makeSubagentTools(this.subagentHost),
+                    // 也注册了它们，因此可自然嵌套派发。host 按 ownerId 包装：子代理的
+                    // 父对话 = 真正调用 spawn 的那个会话（本 runtime 所属会话），而不是
+                    // 派发瞬间的 active——后台对话继续产出时用户可能已切到别的项目，用
+                    // activeId 会把孩子记到无关会话名下、沉到别的组/底部（issue #95）。
+                    // ownerId 即本 runtime 所属会话（创建时就已知，见各调用点）。
+                    ...(ownerId
+                        ? makeSubagentTools(withSubagentOwner(this.subagentHost, ownerId))
+                        : makeSubagentTools(this.subagentHost)),
                     // 内置标记只读查询工具（todo/svc 状态查询，写操作走内联标记）。
                     makeMarkersListTool(() => this.activeId, this.markerSvc),
+                    // 标准引擎的 ask_user_question：模型调用 → 浏览器富渲染问卷（复用 DSH
+                    // 的 question_pending/question_answer 协议，前端 DshQuestionDialog）。
+                    // DSH 引擎不经此（它走 goal-rpc 的 userQuestions provider）。
+                    makeAskUserQuestionTool(this),
                 ],
             });
             // 终端工具开关从创建起就生效（工具始终注册进注册表，只调活跃集）。
@@ -1697,18 +1807,17 @@ export class ClientSession {
                 conv.queueSteering = [...event.steering];
                 conv.queueFollowUp = [...event.followUp];
                 break;
-            // 手动 /compact 或阈值/溢出自动压缩开始——立即反馈，避免「没反应」
-            // （此前 compaction_start/end 事件被 switch 静默丢弃，issue #33）。
+            // 手动 /compact 或阈值/溢出自动压缩开始——常驻进度条（快照 compaction
+            // 字段），而不是一次性 toast（toast 几秒就消失，而摘要生成可能持续
+            // 数十秒，用户会以为「没反应」）。立即 flush 让进度条第一时间出现。
             case "compaction_start": {
-                this.emit({
-                    type: "notice",
-                    level: "info",
-                    text: "正在压缩上下文…（压缩摘要将显示在消息区）",
-                    textEn: "Compacting context… (the summary will appear in the message list)",
-                });
+                conv.compactionState = { reason: event.reason, startedAt: Date.now() };
+                conv.lastCompactionTokens = null;
+                this.flushSnapshot();
                 break;
             }
             case "compaction_end": {
+                conv.compactionState = null;
                 if (event.errorMessage) {
                     this.emit({
                         type: "notice",
@@ -1728,6 +1837,8 @@ export class ClientSession {
                 else if (event.result) {
                     const { tokensBefore, estimatedTokensAfter } = event.result;
                     const after = estimatedTokensAfter ?? tokensBefore;
+                    // 记住压缩后大小：SDK 在下轮响应前报 null，快照用此回填底栏。
+                    conv.lastCompactionTokens = estimatedTokensAfter ?? null;
                     this.emit({
                         type: "notice",
                         level: "info",
@@ -2065,13 +2176,25 @@ export class ClientSession {
                 totalMessages: s.totalMessages,
                 tokens: s.tokens,
                 cost: s.cost,
-                contextUsage: s.contextUsage
-                    ? {
-                        tokens: s.contextUsage.tokens,
-                        contextWindow: s.contextUsage.contextWindow,
-                        percent: s.contextUsage.percent,
+                contextUsage: (() => {
+                    const cu = s.contextUsage;
+                    if (!cu)
+                        return stats.contextUsage;
+                    // 压缩刚结束、下轮响应未到：SDK 报 null，用压缩结果回填约数。
+                    if (cu.tokens == null && conv.lastCompactionTokens != null && cu.contextWindow > 0) {
+                        return {
+                            tokens: conv.lastCompactionTokens,
+                            contextWindow: cu.contextWindow,
+                            percent: (conv.lastCompactionTokens / cu.contextWindow) * 100,
+                            estimated: true,
+                        };
                     }
-                    : stats.contextUsage,
+                    return {
+                        tokens: cu.tokens,
+                        contextWindow: cu.contextWindow,
+                        percent: cu.percent,
+                    };
+                })(),
             };
         }
         catch {
@@ -2108,6 +2231,7 @@ export class ClientSession {
             queue: { steering: conv.queueSteering, followUp: conv.queueFollowUp },
             errorMessage: state.errorMessage,
             retry: conv.retryState ?? null,
+            compaction: conv.compactionState ?? null,
             tools: state.tools.map((t) => t.name),
             version: ++this.version,
             piConfigured: this.isPiConfigured(),
@@ -2168,6 +2292,55 @@ export class ClientSession {
     resolveDialog(id, value) {
         this.webUi.resolveDialog(id, value);
     }
+    // -----------------------------------------------------------------------
+    // 用户提问桥（标准 pi 引擎 ask_user_question customTool）
+    // -----------------------------------------------------------------------
+    /** 标准引擎模型调 ask_user_question：发 question_pending 给浏览器并阻塞等待
+     *  question_answer。sig 为工具执行信号的当前状态（aborted → 立即 reject）。
+     *  返回 answers（用户选中/自定义），或 null（用户取消）。 */
+    askUser(questions, sig) {
+        return new Promise((resolve, reject) => {
+            if (sig?.aborted || this.disposed) {
+                reject(new Error("ask_user_question 已中止"));
+                return;
+            }
+            // 问卷开关（默认开）：关 → 不弹对话框，立即报错让模型得知已禁用。
+            if (this.settingsSvc.current.questionnaireEnabled === false) {
+                reject(new Error("问卷功能已关闭，可在设置中重新开启"));
+                return;
+            }
+            const id = `q-${++this.questionSeq}`;
+            this.pendingQuestions.set(id, resolve);
+            this.emit({
+                type: "question_pending",
+                id,
+                questions,
+            });
+        });
+    }
+    /** 前端回答模型提问（question_answer → 恢复 askUser 的 Promise）。id 需匹配
+     *  pendingQuestions 中键；cancelled 或未匹配（例如用户早已切走）时按「取消」处理
+     *  —— 把挂起的提问全部 reject，让模型知道用户离开了。 */
+    resolveQuestion(id, answers, cancelled) {
+        const resolve = this.pendingQuestions.get(id);
+        if (resolve) {
+            this.pendingQuestions.delete(id);
+            resolve(cancelled ? null : answers);
+        }
+    }
+    /** 标准引擎的 question_answer 路由入口（index.ts 经 cs.answerQuestion?. 转发）。
+     *  DSH 引擎的 AgentService 也实现了同名方法，此处为 ClientSession 的转发。 */
+    answerQuestion(id, answers, cancelled) {
+        this.resolveQuestion(id, answers, cancelled);
+        return Promise.resolve();
+    }
+    /** 关闭所有挂起提问（切对话 / dispose 时清理）：以「取消」解析，避免模型挂死。 */
+    cancelPendingQuestions() {
+        for (const [, resolve] of this.pendingQuestions) {
+            resolve(null);
+        }
+        this.pendingQuestions.clear();
+    }
     /**
      * Whether the pi agent has at least one usable model. ModelRuntime's
      * available snapshot already accounts for models.json, auth.json, env-var
@@ -2188,65 +2361,32 @@ export class ClientSession {
      * probe). Cached machine-wide (same binary for every client) for 10s —
      * the check is only rerun after install or when the cache expires.
      *
-     * The probe runs ASYNCHRONOUSLY in the background: this getter serves the
-     * last known value and never blocks the event loop. It previously used
-     * spawnSync here, which could deadlock the whole server on Android/Termux:
-     * fork() inside a multi-threaded process (websocket handlers + snapshot
-     * serialization are active) occasionally left the forked child stuck
-     * between fork and exec (futex_wait) while the blocked main thread sat in
-     * spawnSync's pipe_read — the server kept running but stopped accepting
-     * connections. Observed reproducibly on Android/Termux (Node 26).
+     * The probe is FORK-FREE: it scans PATH for the pi executable instead of
+     * spawning `pi --version`. Do not reintroduce a spawn here — ANY fork on
+     * the main thread of this multi-threaded server can deadlock the whole
+     * process on Android/Termux (issue #78): libuv's uv_spawn blocks its
+     * caller reading the child's error pipe, and that pipe never closes when
+     * the forked child deadlocks between fork and exec. This applies to
+     * asynchronous spawns too — the previous async probe reproduced the hang.
      */
     static piCliProbe = null;
-    static piCliProbePending = false;
     static PI_CLI_PROBE_TTL_MS = 10_000;
     isPiCliInstalled() {
         const now = Date.now();
         const cached = ClientSession.piCliProbe;
         if (cached && now - cached.at < ClientSession.PI_CLI_PROBE_TTL_MS)
             return cached.installed;
-        ClientSession.refreshPiCliProbe();
-        return cached?.installed ?? false;
+        const installed = ClientSession.piCliOnPath();
+        ClientSession.piCliProbe = { at: now, installed };
+        return installed;
     }
-    static refreshPiCliProbe() {
-        if (ClientSession.piCliProbePending)
-            return;
-        ClientSession.piCliProbePending = true;
-        let proc;
-        try {
-            proc = spawn("pi", ["--version"], {
-                stdio: "ignore",
-                // Windows: `pi` resolves to a pi.cmd shim — spawn can only
-                // exec those through a shell (else ENOENT).
-                shell: process.platform === "win32",
-            });
+    static piCliOnPath() {
+        const dirs = (process.env.PATH ?? "").split(delimiter);
+        for (const dir of dirs) {
+            if (dir && existsSync(join(dir, "pi")))
+                return true;
         }
-        catch {
-            ClientSession.piCliProbe = { at: Date.now(), installed: false };
-            ClientSession.piCliProbePending = false;
-            return;
-        }
-        const finish = (installed) => {
-            ClientSession.piCliProbe = { at: Date.now(), installed };
-            ClientSession.piCliProbePending = false;
-        };
-        const timer = setTimeout(() => {
-            try {
-                proc.kill();
-            }
-            catch {
-                /* already exited */
-            }
-            finish(false);
-        }, 5000);
-        proc.on("error", () => {
-            clearTimeout(timer);
-            finish(false);
-        });
-        proc.on("close", (code) => {
-            clearTimeout(timer);
-            finish(code === 0);
-        });
+        return false;
     }
     static invalidatePiCliProbe() {
         ClientSession.piCliProbe = null;
@@ -2371,7 +2511,7 @@ export class ClientSession {
         }
         try {
             const targets = collectTargets(this.agentDir, ClientSession.currentAppVersion());
-            const items = await checkAllUpdates(targets);
+            const items = await checkAllUpdates(targets, undefined, () => this.getLang());
             this.updatesAllCache = { at: Date.now(), items };
             this.emit({ type: "update_status_all", items });
         }
@@ -2486,7 +2626,11 @@ export class ClientSession {
             this.flushSnapshot();
         },
         refreshSessions: () => this.refreshSessions(),
-        afterReload: () => this.applyToolGating(this.session),
+        afterReload: () => {
+            // /reload 同样重读磁盘 settings.json——重放重试覆盖 + 终端门控。
+            this.applyRetryOverrides();
+            this.applyToolGating(this.session);
+        },
         pluginCommands: () => this.pluginCommandsProvider?.() ?? [],
         execPluginCommand: async (name, args) => {
             const def = this.pluginCommandsProvider?.().find((c) => c.name === name);
@@ -2531,10 +2675,10 @@ export class ClientSession {
         return this.modelAdmin.listModelsConfig();
     }
     fetchModelsList(reqId, baseUrl, apiKey, authHeader, api) {
-        return this.modelAdmin.fetchModelsList(reqId, baseUrl, apiKey, authHeader, api);
+        return this.modelAdmin.fetchModelsList(reqId, baseUrl, apiKey, authHeader, api, () => this.getLang());
     }
     refreshProviderModels(providerId, reqId) {
-        return this.modelAdmin.refreshProviderModels(providerId, reqId);
+        return this.modelAdmin.refreshProviderModels(providerId, reqId, () => this.getLang());
     }
     /** Copy a built-in provider into an editable custom-provider draft
      *  (clone_provider_result) — lets the user run a second API key without
@@ -2671,6 +2815,22 @@ export class ClientSession {
     pushSettings() {
         this.settingsSvc.push();
     }
+    /** 把设置面板的出错重试次数注入全部存活会话的 SDK SettingsManager。
+     *  applyOverrides 只改内存合并视图（不碰 ~/.pi/agent/settings.json），
+     *  且 SDK 每次退避前都重读 getRetrySettings()——即时生效、无需 reload。
+     *  但 session.reload() 会重读磁盘丢掉覆盖，每次 reload 后必须重放
+     *  （reloadSession / afterReload / 标记开关直载路径均已接）。 */
+    applyRetryOverrides() {
+        const n = normalizeRetryMaxAttempts(this.settingsSvc.current.retryMaxAttempts);
+        for (const c of this.convs.values()) {
+            try {
+                c.session.settingsManager.applyOverrides({ retry: { maxRetries: n } });
+            }
+            catch {
+                // 会话未就绪或已释放 → 其 runtime 创建时统一注入。
+            }
+        }
+    }
     /** Extensions/skills changed externally (e.g. `pi remove` finished in the
      *  terminal): re-run session.reload() and re-push state. Streaming-safe —
      *  deferred to agent_end, same as settings reloads. */
@@ -2697,6 +2857,7 @@ export class ClientSession {
             if (!this.session.isStreaming) {
                 try {
                     await this.session.reload();
+                    this.applyRetryOverrides();
                     this.applyToolGating(this.session);
                     await this.pushSlashCommands();
                     this.pushSettings();
@@ -2775,6 +2936,26 @@ export class ClientSession {
         // 兼容旧入口：reload + 刷目录在宿主回调里完成
         return this.settingsSvc.applyRuntime();
     }
+    /** Server language for this client (issue #91): resolved LIVE from the
+     *  persisted UI locale — "zh" only for zh*; everything else (including
+     *  never-reported) is English. Per-call tool return values read this on
+     *  every invocation, so they follow language switches with no rebuild. */
+    getLang() {
+        return resolveServerLang(this.stateStore.get(this.clientId).locale);
+    }
+    /** Persist the browser UI locale (hello.locale / set_locale) and refresh
+     *  lang-aware prompt segments. Reuses the settings reload path, so it is
+     *  streaming-safe (deferred to agent_end mid-run, same as settings). */
+    async setLocale(locale) {
+        const code = locale.trim().slice(0, 16);
+        if (!code)
+            return;
+        const prev = this.getLang();
+        this.stateStore.saveLocale(this.clientId, code);
+        if (this.getLang() === prev)
+            return; // same server language — nothing to re-render
+        await this.applySettingsReload();
+    }
     // ---------------------------------------------------------------------------
     // Commands
     // ---------------------------------------------------------------------------
@@ -2868,6 +3049,8 @@ export class ClientSession {
                 emit: (msg) => this.emit(msg),
                 settings: this.settingsSvc.current,
                 session: this.session,
+                // issue #91：附件/视觉桥文案按客户端 UI 语言出中英（英文默认）。
+                getLang: () => this.getLang(),
             }, attachments);
             for (const aside of asides) {
                 await s.sendCustomMessage(aside.message, { deliverAs: "nextTurn" });
@@ -3129,7 +3312,7 @@ export class ClientSession {
             this.clearAllToolWatchdogs(conv);
             conv.toolStartTimes.clear();
             await conv.runtime.dispose();
-            const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(conv.terminals), {
+            const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(conv.terminals, undefined, conv.id), {
                 cwd: conv.cwd,
                 agentDir: this.agentDir,
                 sessionManager: SessionManager.continueRecent(conv.cwd),
@@ -3208,7 +3391,7 @@ export class ClientSession {
         try {
             const conversationId = this.nextConversationId();
             const terminals = this.makeTerminalManager(conversationId, this.cwd);
-            const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals), {
+            const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals, undefined, conversationId), {
                 cwd: this.cwd,
                 agentDir: this.agentDir,
                 sessionManager: SessionManager.create(this.cwd),
@@ -3762,7 +3945,7 @@ export class ClientSession {
             const targetCwd = sessionManager.getCwd();
             const conversationId = this.nextConversationId();
             openedTerminals = this.makeTerminalManager(conversationId, targetCwd);
-            openedRuntime = await createAgentSessionRuntime(this.makeRuntimeFactory(openedTerminals), {
+            openedRuntime = await createAgentSessionRuntime(this.makeRuntimeFactory(openedTerminals, undefined, conversationId), {
                 cwd: targetCwd,
                 agentDir: this.agentDir,
                 sessionManager,
@@ -4114,7 +4297,7 @@ export class ClientSession {
                 // First visit to this project: resume its most recent session.
                 const conversationId = this.nextConversationId();
                 const terminals = this.makeTerminalManager(conversationId, abs);
-                const newRuntime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals), {
+                const newRuntime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals, undefined, conversationId), {
                     cwd: abs,
                     agentDir: this.agentDir,
                     sessionManager: SessionManager.continueRecent(abs),
@@ -4327,6 +4510,8 @@ export class ClientSession {
         this.files.unwatchDir();
         this.files.unwatchGit();
         this.webUi.dispose();
+        // 关闭所有挂起的用户提问（dispose 时以「取消」解析，避免模型挂死）。
+        this.cancelPendingQuestions();
         this.bg.stop();
         for (const conv of this.convs.values()) {
             this.clearAllToolWatchdogs(conv);
@@ -4518,6 +4703,25 @@ export class AgentService {
         for (const cs of this.clients.values())
             cs.refreshPluginTools();
     }
+    /** Browser UI locale report (hello.locale / set_locale): persist per client
+     *  and refresh lang-aware prompts (streaming-safe via ClientSession). */
+    async setLocale(clientId, locale) {
+        const cs = this.clients.get(clientId);
+        if (cs) {
+            await cs.setLocale(locale);
+            return;
+        }
+        // hello race: session still being created — wait for it, then apply.
+        const inflight = this.pending.get(clientId);
+        if (inflight) {
+            try {
+                await (await inflight).setLocale(locale);
+            }
+            catch {
+                /* attach failed — nothing to apply to */
+            }
+        }
+    }
     /** 插件斜杠命令集合变化时由 index.ts 触发：重推各客户端的命令目录。 */
     applyPluginCommandCatalog() {
         for (const cs of this.clients.values())