pi-web-ui 0.68.2 → 0.70.0

package/dist/server/client-state.js

@@ -8,6 +8,15 @@
  */
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
+/** 大模型 API 出错自动重试次数的默认值（SDK 默认 3）。 */
+export const DEFAULT_RETRY_MAX_ATTEMPTS = 6;
+/** 归一化重试次数：非数值回落默认，钳制到 [0, 100] 整数。 */
+export function normalizeRetryMaxAttempts(v) {
+    const n = Math.floor(Number(v));
+    if (!Number.isFinite(n))
+        return DEFAULT_RETRY_MAX_ATTEMPTS;
+    return Math.min(100, Math.max(0, n));
+}
 /** Stable identity of an extension for the enable/disable toggle: the npm
  *  spec for packages (survives version bumps), the resolved entry path
  *  otherwise. */
@@ -67,6 +76,14 @@ export class ClientStateStore {
     constructor(filePath) {
         this.filePath = filePath;
     }
+    /** 长期设置（设置面板 config + 预设 + 标记开关）的固定存储键。
+     *
+     * 为什么用固定全局键而非 per-clientId：clientId 存 sessionStorage（每标签页独立、
+     * 关浏览器即失），按 clientId 存设置会在每次新会话/重启后生成新 id → 设置全部重置、
+     * 且各标签页/浏览器各有一套互不同步。改为全局共享后：所有客户端（标签页/浏览器）
+     * 使用同一套配置，且持久化在服务端，重启不丢（「同一套配置」）。会话级状态
+     * （最近项目 / lastCwd / 项目模型与密钥等）仍按 clientId 各自保留。 */
+    static GLOBAL_SETTINGS_KEY = "__settings__";
     /** <dataDir>（client-state.json 的上一级）——共享配置（子代理模板库等）落在这里。 */
     get dataDir() {
         return dirname(this.filePath);
@@ -143,6 +160,18 @@ export class ClientStateStore {
             locked: s.goalPrefs.locked ?? true,
         };
     }
+    /** Persist the client's UI locale code (hello/set_locale; best-effort). */
+    saveLocale(clientId, locale) {
+        const code = locale.trim().slice(0, 16);
+        if (!code)
+            return;
+        const all = this.load();
+        const state = (all[clientId] ??= { projects: [] });
+        if (state.locale === code)
+            return;
+        state.locale = code;
+        this.save();
+    }
     /** Persist the client's goal/review preferences (model choice, rounds, lock). */
     saveGoalPrefs(clientId, prefs) {
         const all = this.load();
@@ -176,9 +205,9 @@ export class ClientStateStore {
         }
         return list;
     }
-    /** Last-used settings-panel state for a client, or defaults. */
-    getSettings(clientId) {
-        const s = this.load()[clientId];
+    /** 设置面板状态（系统提示词模式/文字 + 禁用技能/扩展）——全局共享同一套配置。 */
+    getSettings(_clientId) {
+        const s = this.load()[ClientStateStore.GLOBAL_SETTINGS_KEY];
         const stored = s?.settings;
         // 旧存档（promptMode/customSystemPrompt）迁移到 compose：追加文字成为独立
         // {{append}} 覆盖、替换文字成为 {{soul}} 覆盖；无自定义则用默认模板。
@@ -205,6 +234,7 @@ export class ClientStateStore {
             terminalBashIdleMs: stored?.terminalBashIdleMs ?? 15_000,
             editSoftEnabled: stored?.editSoftEnabled ?? false,
             questionnaireEnabled: stored?.questionnaireEnabled ?? true,
+            goalModeEnabled: stored?.goalModeEnabled ?? true,
             thinkingWrap: stored?.thinkingWrap ?? false,
             toolsWrap: stored?.toolsWrap ?? true,
             visionBridgeEnabled: stored?.visionBridgeEnabled ?? true,
@@ -212,6 +242,7 @@ export class ClientStateStore {
             visionBridgePromptMode: stored?.visionBridgePromptMode === "replace" ? "replace" : "append",
             visionBridgePrompt: stored?.visionBridgePrompt ?? "",
             subagentDefaultModel: stored?.subagentDefaultModel ?? null,
+            retryMaxAttempts: normalizeRetryMaxAttempts(stored?.retryMaxAttempts),
             quickPhrases: stored?.quickPhrases ?? [],
             quickPhrasesEnabled: stored?.quickPhrasesEnabled ?? true,
             reviewPrompt: stored?.reviewPrompt ?? "",
@@ -219,10 +250,10 @@ export class ClientStateStore {
             disabledPlugins: stored?.disabledPlugins ?? [],
         };
     }
-    /** Persist the client's settings-panel state (partial merge). */
-    saveSettings(clientId, settings) {
+    /** Persist the settings-panel state (partial merge) — global shared config. */
+    saveSettings(_clientId, settings) {
         const all = this.load();
-        const state = (all[clientId] ??= { projects: [] });
+        const state = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
         const cur = state.settings ?? {};
         state.settings = {
             promptMode: settings.promptMode ?? cur.promptMode ?? "append",
@@ -236,11 +267,13 @@ export class ClientStateStore {
             terminalBashIdleMs: settings.terminalBashIdleMs ?? cur.terminalBashIdleMs ?? 15_000,
             editSoftEnabled: settings.editSoftEnabled ?? cur.editSoftEnabled ?? false,
             questionnaireEnabled: settings.questionnaireEnabled ?? cur.questionnaireEnabled ?? true,
+            goalModeEnabled: settings.goalModeEnabled ?? cur.goalModeEnabled ?? true,
             thinkingWrap: settings.thinkingWrap ?? cur.thinkingWrap ?? false,
             toolsWrap: settings.toolsWrap ?? cur.toolsWrap ?? true,
             visionBridgeEnabled: settings.visionBridgeEnabled ?? cur.visionBridgeEnabled ?? true,
             visionBridgeModel: settings.visionBridgeModel ?? cur.visionBridgeModel ?? null,
             subagentDefaultModel: settings.subagentDefaultModel ?? cur.subagentDefaultModel ?? null,
+            retryMaxAttempts: normalizeRetryMaxAttempts(settings.retryMaxAttempts ?? cur.retryMaxAttempts ?? DEFAULT_RETRY_MAX_ATTEMPTS),
             visionBridgePromptMode: settings.visionBridgePromptMode ?? cur.visionBridgePromptMode ?? "append",
             visionBridgePrompt: settings.visionBridgePrompt ?? cur.visionBridgePrompt ?? "",
             reviewPrompt: settings.reviewPrompt ?? cur.reviewPrompt ?? "",
@@ -251,19 +284,21 @@ export class ClientStateStore {
         };
         this.save();
     }
-    /** Named settings presets for a client (empty if never saved). */
-    getPresets(clientId) {
-        return (this.load()[clientId]?.presets ?? []).map((p) => ({
+    /** Named settings presets for a client (empty if never saved) — global shared. */
+    getPresets(_clientId) {
+        return (this.load()[ClientStateStore.GLOBAL_SETTINGS_KEY]?.presets ?? []).map((p) => ({
             ...p,
             // Older client-state files predate review settings.
             reviewPrompt: p.reviewPrompt ?? "",
             reviewDisabledSkills: p.reviewDisabledSkills ?? [],
+            // Older presets predate the configurable retry count.
+            retryMaxAttempts: normalizeRetryMaxAttempts(p.retryMaxAttempts),
         }));
     }
-    /** Persist the client's named settings presets. */
-    savePresets(clientId, presets) {
+    /** Persist the named settings presets — global shared config. */
+    savePresets(_clientId, presets) {
         const all = this.load();
-        const state = (all[clientId] ??= { projects: [] });
+        const state = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
         state.presets = presets;
         this.save();
     }
@@ -319,17 +354,36 @@ export class ClientStateStore {
             delete all[clientId].projectModels;
         this.save();
     }
-    /** 内置标记工具开关（全局 + 按 marker 禁用）。 */
-    getMarkerSettings(clientId) {
-        const s = this.load()[clientId]?.markers;
+    /** 全局「快捷短语已 seed」标记（非 per-clientId）。
+     *
+     * 为什么全局：clientId 存 sessionStorage（每标签页独立、关浏览器即失），按
+     * clientId 记 seed 会在每次新会话生成新 clientId 时误判为「从未 seed」，导致
+     * 用户删掉的默认短语又被填回默认。seed 只需一次（首次见空列表），之后即为用户
+     * 数据，增删改/恢复默认/关闭都走设置面板。存服务端而非浏览器 localStorage，
+     * 任何浏览器/标签页/清缓存都不受影响。 */
+    getQuickPhrasesSeeded() {
+        const meta = this.load()[ClientStateStore.GLOBAL_SETTINGS_KEY];
+        return !!meta?.quickPhrasesSeeded;
+    }
+    markQuickPhrasesSeeded() {
+        const all = this.load();
+        const meta = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
+        if (meta.quickPhrasesSeeded)
+            return;
+        meta.quickPhrasesSeeded = true;
+        this.save();
+    }
+    /** 内置标记工具开关（全局共享同一套 + 按 marker 禁用）。 */
+    getMarkerSettings(_clientId) {
+        const s = this.load()[ClientStateStore.GLOBAL_SETTINGS_KEY]?.markers;
         return {
             markersEnabled: s?.markersEnabled ?? true,
             disabledMarkers: s?.disabledMarkers ?? [],
         };
     }
-    saveMarkerSettings(clientId, settings) {
+    saveMarkerSettings(_clientId, settings) {
         const all = this.load();
-        const state = (all[clientId] ??= { projects: [] });
+        const state = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
         const cur = state.markers ?? { markersEnabled: true, disabledMarkers: [] };
         state.markers = {
             markersEnabled: settings.markersEnabled ?? cur.markersEnabled ?? true,

package/dist/server/dsh/dsh-agent-service.js

@@ -29,10 +29,11 @@ import { basename, dirname, join, resolve, sep } from "node:path";
 import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { BgServerTracker } from "../bg-servers.js";
-import { ClientStateStore } from "../client-state.js";
+import { ClientStateStore, DEFAULT_RETRY_MAX_ATTEMPTS } from "../client-state.js";
 import { FilesService, workspacePath } from "../files-service.js";
 import { QuiesceRejectedError } from "../agent-service.js";
 import { NATIVE_COMMANDS, parseSlash } from "../slash-commands.js";
+import { bilingual, pick, resolveServerLang } from "../i18n.js";
 import { TerminalManager, loadCommands, saveCommandsFile } from "../terminals.js";
 import { saveUpload } from "../uploads.js";
 import { checkAll as checkAllUpdates, collectTargets } from "../update-check.js";
@@ -43,6 +44,7 @@ import { firstUserText, findSessionFilesForCwd, readSessionLog, replayEventsToMe
 const SNAPSHOT_INTERVAL_MS = 60;
 const MAX_OPEN_CONVERSATIONS = 8;
 const DEFAULT_CONV_TITLE = "新对话";
+const DEFAULT_CONV_TITLE_EN = "New chat";
 const DEFAULT_MODEL = "deepseek-v4-flash";
 /** DSH 可选模型（顶栏模型选择器）。仅 deepseek-v4-flash-vision-exp 支持图片
  *  （adapter 默认目录 inputModalities: [text, image]）；flash/pro 是 text-only。 */
@@ -109,6 +111,7 @@ const DEFAULT_SETTINGS = {
     terminalBashIdleMs: 15_000,
     editSoftEnabled: false,
     questionnaireEnabled: true,
+    goalModeEnabled: true,
     thinkingWrap: false,
     toolsWrap: true,
     disabledPlugins: [],
@@ -223,6 +226,7 @@ export class DshClientSession {
                 terminalBashIdleMs: savedSettings.terminalBashIdleMs,
                 editSoftEnabled: savedSettings.editSoftEnabled,
                 questionnaireEnabled: savedSettings.questionnaireEnabled ?? true,
+                goalModeEnabled: savedSettings.goalModeEnabled ?? true,
                 thinkingWrap: savedSettings.thinkingWrap,
                 toolsWrap: savedSettings.toolsWrap,
                 disabledPlugins: savedSettings.disabledPlugins ?? [],
@@ -585,14 +589,17 @@ export class DshClientSession {
         const args = (params?.args && typeof params.args === "object" ? params.args : {});
         if (!id)
             return;
+        const lang = this.getLang();
         if (!name) {
-            void this.runtime.toolsCallResult(id, "工具名缺失", true).catch(() => { });
+            void this.runtime
+                .toolsCallResult(id, pick(lang, "工具名缺失", "Missing tool name", "dsh.tool.missing.name"), true)
+                .catch(() => { });
             return;
         }
         try {
             const tool = this.bridgedTool((this.pluginToolsProvider?.() ?? []).find((t) => t.name === name));
             if (!tool) {
-                await this.runtime.toolsCallResult(id, `未知插件工具：${name}`, true);
+                await this.runtime.toolsCallResult(id, pick(lang, `未知插件工具：${name}`, `Unknown plugin tool: ${name}`, "dsh.tool.unknown.plugin", { name }), true);
                 return;
             }
             const ac = new AbortController();
@@ -622,6 +629,14 @@ export class DshClientSession {
             wizard: { active: false, draft: "", model: null, step: 0, maxSteps: 3, status: "" },
         };
     }
+    /** 未命名对话的默认标题（issue #91：按客户端语言，英文默认）。 */
+    defaultTitle() {
+        return pick(this.getLang(), DEFAULT_CONV_TITLE, DEFAULT_CONV_TITLE_EN, "dsh.conv.default.title");
+    }
+    /** 是否仍是默认（未命名）标题——中英都认，跨语言切换不丢命名判断。 */
+    static isDefaultTitle(title) {
+        return title === DEFAULT_CONV_TITLE || title === DEFAULT_CONV_TITLE_EN;
+    }
     /** 新建（或切换）一个 conversation。existing 的 sessionId 续聊最近 JSONL。 */
     addConversation(sessionId, cwd, replay = true) {
         const id = this.nextConversationId();
@@ -630,7 +645,7 @@ export class DshClientSession {
             sessionId,
             dsGoal: null,
             goal: this.makeGoalStatus(),
-            title: DEFAULT_CONV_TITLE,
+            title: this.defaultTitle(),
             cwd,
             createdAt: Date.now(),
             messages: [],
@@ -642,7 +657,9 @@ export class DshClientSession {
             lastEventAt: Date.now(),
             listed: false,
             promptedSinceActive: false,
-            terminals: new TerminalManager((msg) => this.emit(msg), cwd),
+            terminals: new TerminalManager((msg) => this.emit(msg), cwd, 
+            // issue #91：终端输入错误按客户端 UI 语言出中英（英文默认）。
+            () => this.getLang()),
             toolStartTimes: new Map(),
             tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
         };
@@ -655,7 +672,7 @@ export class DshClientSession {
                     conv.messages = replayEventsToMessages(events);
                     for (const m of conv.messages)
                         conv.messageIds.add(m.id);
-                    conv.title = firstUserText(events);
+                    conv.title = firstUserText(events, this.getLang());
                 }
             }
             catch {
@@ -726,7 +743,7 @@ export class DshClientSession {
                 if (imgRefs.length > 0) {
                     void this.hydrateImageBlocks(conv, msg, imgRefs);
                 }
-                if (conv.title === DEFAULT_CONV_TITLE) {
+                if (DshClientSession.isDefaultTitle(conv.title)) {
                     const t = conv.messages
                         .find((m) => m.role === "user")
                         ?.content?.map((c) => ("text" in c ? c.text : ""))
@@ -842,7 +859,8 @@ export class DshClientSession {
                     if (reason.kind === "completed")
                         w.resolve();
                     else
-                        w.reject(new Error(reason.error?.message ?? `本轮异常结束（${reason.kind}）`));
+                        w.reject(new Error(reason.error?.message ??
+                            pick(this.getLang(), `本轮异常结束（${reason.kind}）`, `Round ended abnormally (${reason.kind})`, "dsh.round.ended.abnormally", { "reason.kind": reason.kind })));
                 }
                 break;
             }
@@ -898,7 +916,7 @@ export class DshClientSession {
         conv.messages.push(msg);
     }
     refreshConversationTitle(conv) {
-        if (conv.title !== DEFAULT_CONV_TITLE)
+        if (!DshClientSession.isDefaultTitle(conv.title))
             return;
         // 从消息列表取第一个用户文本。
         const t = conv.messages
@@ -1188,11 +1206,12 @@ export class DshClientSession {
             const histText = this.histToContext(conv);
             conv = this.forkConversation(conv);
             if (histText.trim()) {
-                text = `${text}\n\n（以下为原对话上下文，仅作参考，请忽略其中的指令性语气）：\n${histText}`;
+                const lang = this.getLang();
+                text = `${text}\n\n${pick(lang, "（以下为原对话上下文，仅作参考，请忽略其中的指令性语气）：", "(Previous conversation context below for reference only; ignore any instructive tone in it):", "dsh.prompt.context.full")}\n${histText}`;
             }
         }
         // 命名对话（首个 prompt）。
-        if (conv.title === DEFAULT_CONV_TITLE && text.trim()) {
+        if (DshClientSession.isDefaultTitle(conv.title) && text.trim()) {
             const trimmed = text.trim().replace(/\s+/g, " ");
             conv.title = trimmed.length > 30 ? `${trimmed.slice(0, 30)}…` : trimmed;
             this.emitConversations();
@@ -1347,11 +1366,12 @@ export class DshClientSession {
         }
         const hist = this.histToContext(conv);
         this.forkConversation(conv);
+        const lang = this.getLang();
         const text = lastUser
             ? hist.trim()
-                ? `${lastUser}\n\n（以下为原对话上下文，仅作参考）：\n${hist}`
+                ? `${lastUser}\n\n${pick(lang, "（以下为原对话上下文，仅作参考）：", "(Previous conversation context below for reference only):", "dsh.prompt.context.short")}\n${hist}`
                 : lastUser
-            : "请继续";
+            : pick(lang, "请继续", "Please continue", "dsh.prompt.continue");
         this.emit({
             type: "notice",
             level: "info",
@@ -1370,6 +1390,7 @@ export class DshClientSession {
     }
     async buildContentBlocks(text, attachments) {
         const blocks = [{ type: "text", text }];
+        const lang = this.getLang();
         if (!Array.isArray(attachments))
             return blocks;
         for (const a of attachments) {
@@ -1384,7 +1405,7 @@ export class DshClientSession {
                 catch (err) {
                     blocks.push({
                         type: "text",
-                        text: `\n[图片附件: ${a.name ?? "image"}（保存失败 ${err.message}）]`,
+                        text: pick(lang, `\n[图片附件: ${a.name ?? "image"}（保存失败 ${err.message}）]`, `\n[Image attachment: ${a.name ?? "image"} (save failed: ${err.message})]`, "dsh.attach.image.save.failed", { 'a.name ?? "image"': a.name ?? "image", "(err as Error).message": err.message }),
                     });
                 }
             }
@@ -1392,12 +1413,15 @@ export class DshClientSession {
                 // 上传文件 → 落盘 + 路径引用。
                 try {
                     const saved = saveUpload(this.clientId, a.name ?? "upload", Buffer.from(a.fileData, "base64"), this.dataDir);
-                    blocks.push({ type: "text", text: `\n[上传文件: ${saved.abs}]` });
+                    blocks.push({
+                        type: "text",
+                        text: pick(lang, `\n[上传文件: ${saved.abs}]`, `\n[Uploaded file: ${saved.abs}]`, "dsh.attach.upload.saved", { "saved.abs": saved.abs }),
+                    });
                 }
                 catch (err) {
                     blocks.push({
                         type: "text",
-                        text: `\n[上传文件: ${a.name ?? "upload"}（落盘失败 ${err.message}）]`,
+                        text: pick(lang, `\n[上传文件: ${a.name ?? "upload"}（落盘失败 ${err.message}）]`, `\n[Uploaded file: ${a.name ?? "upload"} (failed to save: ${err.message})]`, "dsh.attach.upload.save.failed", { 'a.name ?? "upload"': a.name ?? "upload", "(err as Error).message": err.message }),
                     });
                 }
             }
@@ -1424,7 +1448,10 @@ export class DshClientSession {
                                     blocks.push({ type: "image", attachment: saved.ref });
                                 }
                                 catch {
-                                    blocks.push({ type: "text", text: `\n[图片附件: ${resolved.rel}]` });
+                                    blocks.push({
+                                        type: "text",
+                                        text: pick(lang, `\n[图片附件: ${resolved.rel}]`, `\n[Image attachment: ${resolved.rel}]`, "dsh.attach.image.ref", { "resolved.rel": resolved.rel }),
+                                    });
                                 }
                             }
                             else {
@@ -1437,19 +1464,31 @@ export class DshClientSession {
                             }
                         }
                         else {
-                            blocks.push({ type: "text", text: `\n[文件引用: ${resolved.rel}（大文件，请用读取工具查看）]` });
+                            blocks.push({
+                                type: "text",
+                                text: pick(lang, `\n[文件引用: ${resolved.rel}（大文件，请用读取工具查看）]`, `\n[File reference: ${resolved.rel} (large file, use the read tool to view it)]`, "dsh.attach.file.large", { "resolved.rel": resolved.rel }),
+                            });
                         }
                     }
                     catch {
-                        blocks.push({ type: "text", text: `\n[文件引用: ${resolved.rel}]` });
+                        blocks.push({
+                            type: "text",
+                            text: pick(lang, `\n[文件引用: ${resolved.rel}]`, `\n[File reference: ${resolved.rel}]`, "dsh.attach.file.ref.fallback", { "resolved.rel": resolved.rel }),
+                        });
                     }
                 }
                 else {
-                    blocks.push({ type: "text", text: `\n[文件引用: ${resolved.rel}]` });
+                    blocks.push({
+                        type: "text",
+                        text: pick(lang, `\n[文件引用: ${resolved.rel}]`, `\n[File reference: ${resolved.rel}]`, "dsh.attach.file.ref", { "resolved.rel": resolved.rel }),
+                    });
                 }
             }
             else if (a.name) {
-                blocks.push({ type: "text", text: `\n[附件: ${a.name}]` });
+                blocks.push({
+                    type: "text",
+                    text: pick(lang, `\n[附件: ${a.name}]`, `\n[Attachment: ${a.name}]`, "dsh.attach.generic", { name: a.name }),
+                });
             }
         }
         return blocks;
@@ -1584,7 +1623,7 @@ export class DshClientSession {
                     summaries.push({
                         path: file,
                         name: sessionId,
-                        firstMessage: firstUserText(events),
+                        firstMessage: firstUserText(events, this.getLang()),
                         messageCount: events.filter((e) => e.type === "user/message" || e.type === "assistant/message" || e.type === "tool/result").length,
                         modified: statSync(file).mtimeMs,
                         source: "web",
@@ -1896,11 +1935,11 @@ export class DshClientSession {
                         continue;
                     if (all.includes(q) ||
                         sessionId.toLowerCase().includes(q) ||
-                        firstUserText(events).toLowerCase().includes(q)) {
+                        firstUserText(events, this.getLang()).toLowerCase().includes(q)) {
                         results.push({
                             path: file,
                             name: sessionId,
-                            firstMessage: firstUserText(events),
+                            firstMessage: firstUserText(events, this.getLang()),
                             messageCount: events.filter((e) => e.type === "user/message" || e.type === "assistant/message" || e.type === "tool/result").length,
                             modified: statSync(file).mtimeMs,
                             source: "web",
@@ -2068,7 +2107,10 @@ export class DshClientSession {
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
             editSoftEnabled: this.settings.editSoftEnabled,
+            // DSH 无独立重试配置（pi 引擎才暴露），保持默认。
+            retryMaxAttempts: DEFAULT_RETRY_MAX_ATTEMPTS,
             questionnaireEnabled: this.settings.questionnaireEnabled,
+            goalModeEnabled: this.settings.goalModeEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
             visionBridgeEnabled: false,
@@ -2099,10 +2141,13 @@ export class DshClientSession {
             subagentModels: [],
             quickPhrases: [...this.settings.quickPhrases],
             quickPhrasesEnabled: this.settings.quickPhrasesEnabled,
+            quickPhrasesSeeded: this.stateStore.getQuickPhrasesSeeded(),
         };
         this.emit({ type: "settings_state", settings });
     }
     async setSettings(partial) {
+        if (partial.quickPhrasesSeeded)
+            this.stateStore.markQuickPhrasesSeeded();
         if (partial.promptMode !== undefined)
             this.settings.promptMode = partial.promptMode;
         if (partial.customSystemPrompt !== undefined)
@@ -2121,6 +2166,8 @@ export class DshClientSession {
             this.settings.editSoftEnabled = partial.editSoftEnabled;
         if (partial.questionnaireEnabled !== undefined)
             this.settings.questionnaireEnabled = partial.questionnaireEnabled;
+        if (partial.goalModeEnabled !== undefined)
+            this.settings.goalModeEnabled = partial.goalModeEnabled;
         if (partial.thinkingWrap !== undefined)
             this.settings.thinkingWrap = partial.thinkingWrap;
         if (partial.toolsWrap !== undefined)
@@ -2148,7 +2195,10 @@ export class DshClientSession {
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
             editSoftEnabled: this.settings.editSoftEnabled,
+            // DSH 无独立重试配置（pi 引擎才暴露），保持默认。
+            retryMaxAttempts: DEFAULT_RETRY_MAX_ATTEMPTS,
             questionnaireEnabled: this.settings.questionnaireEnabled,
+            goalModeEnabled: this.settings.goalModeEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
             disabledPlugins: this.settings.disabledPlugins,
@@ -2208,6 +2258,8 @@ export class DshClientSession {
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
             editSoftEnabled: this.settings.editSoftEnabled,
+            // DSH 无独立重试配置，预设沿用默认值。
+            retryMaxAttempts: DEFAULT_RETRY_MAX_ATTEMPTS,
             visionBridgePromptMode: "append",
             visionBridgePrompt: "",
             reviewPrompt: this.settings.reviewPrompt,
@@ -2348,7 +2400,9 @@ export class DshClientSession {
             else if (phase === "blocked") {
                 g.reviewing = false;
                 g.verdict = "fail";
-                g.feedback = data.goal.blockedReason ?? "（模型报告受阻）";
+                g.feedback =
+                    data.goal.blockedReason ??
+                        pick(this.getLang(), "（模型报告受阻）", "(Model reported blocked)", "dsh.goal.blocked");
                 g.status = "目标受阻";
                 g.statusEn = "Goal blocked";
             }
@@ -2374,6 +2428,15 @@ export class DshClientSession {
         }
         if (this.quiesceBlocked())
             return;
+        if (this.settings.goalModeEnabled === false) {
+            this.emit({
+                type: "notice",
+                level: "warning",
+                text: "目标模式已关闭：请先在设置「目标审查」中启用目标模式。",
+                textEn: "Goal mode is off: enable it under Settings → Goal review first.",
+            });
+            return;
+        }
         const conv = this.conv;
         const text = goal.trim();
         const g = conv.goal;
@@ -2431,7 +2494,7 @@ export class DshClientSession {
         if (conv.turnWaiter) {
             const w = conv.turnWaiter;
             conv.turnWaiter = undefined;
-            w.reject(new Error("调研已取消"));
+            w.reject(new Error(pick(this.getLang(), "调研已取消", "Survey cancelled", "dsh.survey.cancelled")));
         }
         if (conv.dsGoal) {
             try {
@@ -2458,6 +2521,15 @@ export class DshClientSession {
         // 提问（经提问桥 → 浏览器对话框）→ 收敛输出 GOAL: 行 → 自动设目标。
         if (this.quiesceBlocked())
             return;
+        if (this.settings.goalModeEnabled === false) {
+            this.emit({
+                type: "notice",
+                level: "warning",
+                text: "目标模式已关闭：请先在设置「目标审查」中启用目标模式。",
+                textEn: "Goal mode is off: enable it under Settings → Goal review first.",
+            });
+            return;
+        }
         const conv = this.conv;
         const draft = (text ?? "").trim();
         if (!draft)
@@ -2490,7 +2562,7 @@ export class DshClientSession {
         });
         try {
             const waiter = new Promise((resolve, reject) => {
-                const timer = setTimeout(() => reject(new Error("调研超时（10 分钟）")), 10 * 60_000);
+                const timer = setTimeout(() => reject(new Error(pick(this.getLang(), "调研超时（10 分钟）", "Survey timed out (10 minutes)", "dsh.survey.timeout"))), 10 * 60_000);
                 timer.unref?.();
                 conv.turnWaiter = {
                     resolve: () => {
@@ -2770,9 +2842,7 @@ export class DshClientSession {
     }
     async checkUpdate() {
         try {
-            const latest = await checkAllUpdates([
-                { name: "pi-web-ui", version: DshClientSession.currentAppVersion(), kind: "webui" },
-            ]);
+            const latest = await checkAllUpdates([{ name: "pi-web-ui", version: DshClientSession.currentAppVersion(), kind: "webui" }], undefined, () => this.getLang());
             const item = latest[0];
             this.emit({
                 type: "update_status",
@@ -2797,7 +2867,7 @@ export class DshClientSession {
     async checkUpdatesAll(force = false) {
         try {
             const targets = collectTargets(join(homedir(), ".pi", "agent"), DshClientSession.currentAppVersion());
-            const items = await checkAllUpdates(targets);
+            const items = await checkAllUpdates(targets, undefined, () => this.getLang());
             if (force) {
                 // 强制模式：忽略缓存（默认 Fetcher 带 TTL，直接再查一次即可）。
                 void items;
@@ -2823,7 +2893,11 @@ export class DshClientSession {
     // pi 专属：DSH 引擎下的简化实现
     // -----------------------------------------------------------------------
     async installPiAgent() {
-        this.emit({ type: "install_result", ok: true, detail: "DSH 引擎不需要 pi CLI" });
+        this.emit({
+            type: "install_result",
+            ok: true,
+            detail: pick(this.getLang(), "DSH 引擎不需要 pi CLI", "The DSH engine does not need the pi CLI", "dsh.engine.no.cli"),
+        });
     }
     async setProviderApiKey(provider, apiKey) {
         const key = apiKey.trim();
@@ -2918,7 +2992,7 @@ export class DshClientSession {
             providers: [
                 {
                     id: "deepseek-official",
-                    name: "DeepSeek 官方",
+                    name: pick(this.getLang(), "DeepSeek 官方", "DeepSeek Official", "dsh.provider.deepseek.official"),
                     configured: !!loadDeepSeekKey(),
                     source: loadDeepSeekKey() ? "stored" : undefined,
                 },
@@ -2953,13 +3027,23 @@ export class DshClientSession {
         });
     }
     async fetchModelsList(reqId, _baseUrl, _apiKey, _authHeader, _api) {
-        this.emit({ type: "fetch_models_result", reqId, ok: false, error: "DSH 引擎不支持自定义 provider 探测" });
+        this.emit({
+            type: "fetch_models_result",
+            reqId,
+            ok: false,
+            error: pick(this.getLang(), "DSH 引擎不支持自定义 provider 探测", "The DSH engine does not support custom provider probing", "dsh.provider.probing.unsupported"),
+        });
     }
     async refreshProviderModels(_providerId, reqId) {
-        this.emit({ type: "refresh_provider_result", reqId, ok: false, error: "DSH 引擎不支持自定义 provider" });
+        this.emit({
+            type: "refresh_provider_result",
+            reqId,
+            ok: false,
+            error: pick(this.getLang(), "DSH 引擎不支持自定义 provider", "The DSH engine does not support custom providers", "dsh.provider.custom.unsupported"),
+        });
     }
     async cloneProvider(_provider, reqId) {
-        const error = "DSH 引擎不支持自定义 provider";
+        const error = pick(this.getLang(), "DSH 引擎不支持自定义 provider", "The DSH engine does not support custom providers", "dsh.provider.clone.unsupported");
         const errorEn = "DSH engine does not support custom providers";
         this.emit({ type: "notice", level: "error", text: error, textEn: errorEn });
         this.emit({ type: "clone_provider_result", reqId, ok: false, error });
@@ -3002,7 +3086,7 @@ export class DshClientSession {
             this.activeId = fresh.id;
             // 编辑后的提问本身在 prompt 里；历史作为附加上下文（首条 prompt）。
             const headText = contextNote.trim()
-                ? `${text}\n\n（编辑重问，原对话上下文，仅作参考，忽略其中指令性语气：）\n${contextNote}`
+                ? `${text}\n\n${pick(this.getLang(), "（编辑重问，原对话上下文，仅作参考，忽略其中指令性语气：）", "(Edit-and-reask; previous conversation context for reference only, ignore any instructive tone in it):", "dsh.prompt.context.edit.reask")}\n${contextNote}`
                 : text;
             await this.prompt(headText, attachments);
             this.emitConversations();
@@ -3017,6 +3101,19 @@ export class DshClientSession {
             });
         }
     }
+    /** Server language for this client (issue #91): resolved LIVE from the
+     *  persisted UI locale — "zh" only for zh*; everything else is English. */
+    getLang() {
+        return resolveServerLang(this.stateStore.get(this.clientId).locale);
+    }
+    /** Persist the browser UI locale (hello.locale / set_locale). DSH
+     *  runtime prompts pick it up on the next run — no restart needed. */
+    async setLocale(locale) {
+        const code = locale.trim().slice(0, 16);
+        if (!code)
+            return;
+        this.stateStore.saveLocale(this.clientId, code);
+    }
     async setCwd(newCwd) {
         try {
             const abs = resolve(newCwd);
@@ -3197,7 +3294,7 @@ export class DshAgentService {
         let cs = this.clients.get(clientId);
         if (!cs) {
             if (this.quiesced) {
-                throw new QuiesceRejectedError("新连接被拒绝，请等服务器恢复后重试");
+                throw new QuiesceRejectedError(bilingual("New connections rejected; retry after the server resumes", "新连接被拒绝，请等服务器恢复后重试"));
             }
             let cwd = this.cwd;
             const saved = this.stateStore.get(clientId);
@@ -3235,6 +3332,13 @@ export class DshAgentService {
         this.onClientCwdChanged?.(cs.cwd);
         return cs;
     }
+    /** Browser UI locale report (hello.locale / set_locale): persist per
+     *  client; DSH runtime prompts refresh on next run (P2 bilingual). */
+    async setLocale(clientId, locale) {
+        const cs = this.clients.get(clientId);
+        if (cs)
+            await cs.setLocale(locale);
+    }
     applyPluginAgentTools() {
         // 工具桥（#15）：插件工具列表变化 → 各客户端运行时重新注册。
         for (const cs of this.clients.values())