pi-web-ui 0.92.0 → 0.94.0

package/dist/server/auth-cookie.js

@@ -21,3 +21,29 @@ export function isTlsRequest(req) {
 export function buildPiWebTokenCookie(encodedValue, maxAge, secure) {
     return `pi_web_token=${encodedValue}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${maxAge}${secure ? "; Secure" : ""}`;
 }
+/**
+ * `pi_web_token` cookie 值 → 原始口令。
+ *
+ * 下发时按 `encodeURIComponent` 编码（RFC 6265 的 cookie-value 只允许 ASCII，
+ * `=` / `+` / 空格 / 非 ASCII 都必须转义），所以**比对前必须先解码** —— 否则
+ * 含这些字符的口令永远匹配不上，表现为「`?token=` 那一次 200，之后所有资源与
+ * WS 全 401」（issue #261：base64 口令尾巴上的 `=` 被存成 `%3D`，服务端却拿
+ * `%3D` 去和 `=` 比）。
+ *
+ * 浏览器回来的一定是编码值，但手写 cookie / 旧客户端可能是明文（`=` 在值里
+ * 合法，我们按首个 `=` 切分），所以调用方应把「原样」与「解码后」两种候选都
+ * 试一遍（见 index.ts 的 requestTokens）。
+ *
+ * 不是合法百分号编码时原样返回：`decodeURIComponent` 会抛 `URIError`，
+ * 而一个手写的脏 cookie 绝不该把请求打成 500。
+ */
+export function decodeCookieToken(raw) {
+    if (!raw)
+        return "";
+    try {
+        return decodeURIComponent(raw);
+    }
+    catch {
+        return raw;
+    }
+}

package/dist/server/claim-files-tool.js

@@ -6,18 +6,17 @@
 // 强制锁会死锁（见 claim-store.ts 文件头）。先到先得；自己的可刷新，
 // 别人的动不了；过期自动释放 + 发 prompt 心跳续期 + 对话关闭释放。
 //
-// 常驻工具、不进 AGENT_TOOL_CATALOG（例外，理由见下）：目录里的每个工具都
-// 必须在设置页有行（settings-tool-rows.test.ts 强制），而 web/src 正被并行
-// 任务占用。认领是纯 advisory（关掉只会少提醒），常驻默认开可接受；目录项 +
-// 设置行等 web/src 空出来后补（follow-up）。DSH 引擎无 customTool 注册面，
-// 只有 pi 引擎对话能认领（提醒是服务端算的，DSH 照样能看到别人的认领）。
+// 开关走统一工具 tab（AGENT_TOOL_CATALOG 目录 + 设置页开关行；ActiveSet 门控，
+// live 生效）：认领是纯 advisory（关掉只会少提醒），默认开。DSH 引擎无 customTool
+// 注册面，只有 pi 引擎对话能认领（提醒是服务端算的，DSH 照样能看到别人的认领）。
 // ---------------------------------------------------------------------------
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { bilingual, pick } from "./i18n.js";
+import { CLAIM_FILES_TOOL_NAME } from "./tool-manager.js";
 import { CLAIM_TTL_MS, resolveClaimPath } from "./claim-store.js";
-/** 工具名（改名需同步改 agent-service 注册处注释与单测）。 */
-export const CLAIM_FILES_TOOL_NAME = "claim_files";
+/** 工具名（唯一定义在 tool-manager.ts，本模块 re-export 供单测沿用，模式同 present-files-tool.ts）。 */
+export { CLAIM_FILES_TOOL_NAME };
 function fmtTtl(ms) {
     const m = Math.round(ms / 60000);
     return m >= 60 ? `${Math.floor(m / 60)}h${m % 60 ? `${m % 60}m` : ""}` : `${m}m`;

package/dist/server/client-state.js

@@ -12,6 +12,40 @@ import { normalizeSoftCapByModel, normalizeSoftCapTokens } from "./soft-cap.js";
 import { deriveLegacy, legacyToDisabled, normalizeDisabledAgentTools } from "./tool-manager.js";
 /** 大模型 API 出错自动重试次数的默认值（SDK 默认 3）。 */
 export const DEFAULT_RETRY_MAX_ATTEMPTS = 6;
+/** 工具执行看门狗超时的默认值（默认 20 分钟；环境变量 PI_WEB_TOOL_TIMEOUT_MS 覆盖）。 */
+export const DEFAULT_TOOL_WATCHDOG_TIMEOUT_MS = (() => {
+    const v = Number(process.env.PI_WEB_TOOL_TIMEOUT_MS);
+    return Number.isFinite(v) && v >= 0 ? v : 20 * 60_000;
+})();
+/** 归一化工具看门狗超时（毫秒）：0 = 禁用；非数值、负数或空值回落默认值，非负整数保留。 */
+export function normalizeToolWatchdogTimeoutMs(v) {
+    if (v === null || v === undefined || v === "")
+        return DEFAULT_TOOL_WATCHDOG_TIMEOUT_MS;
+    const n = Math.floor(Number(v));
+    if (!Number.isFinite(n) || n < 0)
+        return DEFAULT_TOOL_WATCHDOG_TIMEOUT_MS;
+    return n;
+}
+/** 工具自己声明超时时留给它的余量（毫秒）：让工具先自己超时并返回错误，
+ *  而不是看门狗先下手把整轮对话 abort 掉。 */
+export const TOOL_WATCHDOG_EXPLICIT_GRACE_MS = 5_000;
+/** 计算单次工具调用的有效看门狗超时（毫秒；≤0 = 不布看门狗）。
+ *  基础值来自设置/环境变量（见 DEFAULT_TOOL_WATCHDOG_TIMEOUT_MS）；**若工具调用
+ *  自己声明了更长的超时**（目前只有 bash 的 `args.timeout`，单位秒），自动顺延到
+ *  「工具超时 + 余量」—— 否则 AI 明确要求跑 90 分钟的命令，会被 20 分钟的看门狗
+ *  连同整轮对话一起剁掉。纯函数，可单测。 */
+export function effectiveToolWatchdogMs(baseMs, toolName, args) {
+    if (!Number.isFinite(baseMs) || baseMs <= 0)
+        return 0;
+    let ms = baseMs;
+    if (toolName === "bash" && args && typeof args === "object") {
+        const raw = args.timeout;
+        const sec = typeof raw === "number" ? raw : Number(raw);
+        if (Number.isFinite(sec) && sec > 0)
+            ms = Math.max(ms, sec * 1000 + TOOL_WATCHDOG_EXPLICIT_GRACE_MS);
+    }
+    return ms;
+}
 /** 归一化插件 AI 工具禁用名单：只收非空字符串（去重，上限 256 个）。
  *  与 disabledAgentTools 不同——插件工具名是动态的（注册才知道），不能按
  *  固定目录校验；未知/已卸载插件的条目刻意保留（重装后仍保持关闭）。
@@ -285,15 +319,20 @@ export class ClientStateStore {
         state.lastCwd = cwd;
         const now = Date.now();
         state.projects = [{ path: cwd, lastUsed: now }, ...state.projects.filter((p) => p.path !== cwd)].slice(0, 30);
-        // Opening the workspace again clears its removal tombstone.
-        if (state.removedProjects?.length) {
-            state.removedProjects = state.removedProjects.filter((p) => p !== cwd);
+        // Opening the workspace again clears its removal tombstone across all clients and global settings.
+        for (const cState of Object.values(all)) {
+            if (cState.removedProjects?.length) {
+                cState.removedProjects = cState.removedProjects.filter((p) => p !== cwd);
+            }
         }
         this.save();
     }
     /** Drop one workspace from the recent-project list (user-requested removal).
      *  Records a tombstone too: pushProjects() re-discovers cwds from session
-     *  files on every listing, so without it the entry would instantly reappear. */
+     *  files on every listing, so without it the entry would instantly reappear.
+     *  Recorded in both the requesting client and GLOBAL_SETTINGS_KEY so the
+     *  removal stays across all browser tabs and server restarts until the user
+     *  explicitly opens that project again. */
     removeProject(clientId, cwd) {
         const all = this.load();
         const state = (all[clientId] ??= { projects: [] });
@@ -303,12 +342,28 @@ export class ClientStateStore {
         const removed = new Set(state.removedProjects ?? []);
         removed.add(cwd);
         state.removedProjects = [...removed];
+        const globalState = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
+        const globalRemoved = new Set(globalState.removedProjects ?? []);
+        globalRemoved.add(cwd);
+        globalState.removedProjects = [...globalRemoved];
+        for (const [id, cState] of Object.entries(all)) {
+            if (id !== ClientStateStore.GLOBAL_SETTINGS_KEY && cState.projects) {
+                cState.projects = cState.projects.filter((p) => p.path !== cwd);
+            }
+        }
         this.save();
     }
     /** Tombstoned projects (explicitly removed by the user) for filtering the
-     *  merged recent-project list. */
+     *  merged recent-project list across clients. */
     getRemovedProjects(clientId) {
-        return this.load()[clientId]?.removedProjects ?? [];
+        const all = this.load();
+        const clientRemoved = all[clientId]?.removedProjects ?? [];
+        const globalRemoved = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.removedProjects ?? [];
+        if (globalRemoved.length === 0)
+            return clientRemoved;
+        if (clientRemoved.length === 0)
+            return globalRemoved;
+        return [...new Set([...clientRemoved, ...globalRemoved])];
     }
     /** Last-used goal/review prefs for a client, or undefined if never set. */
     getGoalPrefs(clientId) {
@@ -419,6 +474,7 @@ export class ClientStateStore {
                 : (stored?.terminalToolsEnabled ?? false),
             terminalBash: stored?.terminalBash ?? false,
             terminalBashIdleMs: stored?.terminalBashIdleMs ?? 15_000,
+            toolWatchdogTimeoutMs: normalizeToolWatchdogTimeoutMs(stored?.toolWatchdogTimeoutMs),
             readDirEnabled: stored?.readDirEnabled ?? true,
             editSoftEnabled: stored?.disabledAgentTools !== undefined
                 ? deriveLegacy(legacyToDisabled(stored)).editSoftEnabled
@@ -432,6 +488,7 @@ export class ClientStateStore {
             devNoCache: stored?.devNoCache,
             autoReload: stored?.autoReload,
             toolsWrap: stored?.toolsWrap ?? true,
+            toolImagesEnabled: stored?.toolImagesEnabled ?? true,
             skillsFullText: normalizeSkillList(stored?.skillsFullText),
             visionBridgeEnabled: stored?.visionBridgeEnabled ?? true,
             visionBridgeModel: stored?.visionBridgeModel ?? null,
@@ -474,6 +531,7 @@ export class ClientStateStore {
             terminalToolsEnabled: settings.terminalToolsEnabled ?? cur.terminalToolsEnabled ?? false,
             terminalBash: settings.terminalBash ?? cur.terminalBash ?? false,
             terminalBashIdleMs: settings.terminalBashIdleMs ?? cur.terminalBashIdleMs ?? 15_000,
+            toolWatchdogTimeoutMs: normalizeToolWatchdogTimeoutMs(settings.toolWatchdogTimeoutMs ?? cur.toolWatchdogTimeoutMs ?? DEFAULT_TOOL_WATCHDOG_TIMEOUT_MS),
             readDirEnabled: settings.readDirEnabled ?? cur.readDirEnabled ?? true,
             editSoftEnabled: settings.editSoftEnabled ?? cur.editSoftEnabled ?? false,
             questionnaireEnabled: settings.questionnaireEnabled ?? cur.questionnaireEnabled ?? true,
@@ -483,6 +541,7 @@ export class ClientStateStore {
             devNoCache: settings.devNoCache ?? cur.devNoCache,
             autoReload: settings.autoReload ?? cur.autoReload,
             toolsWrap: settings.toolsWrap ?? cur.toolsWrap ?? true,
+            toolImagesEnabled: settings.toolImagesEnabled ?? cur.toolImagesEnabled ?? true,
             skillsFullText: normalizeSkillList(settings.skillsFullText ?? cur.skillsFullText),
             visionBridgeEnabled: settings.visionBridgeEnabled ?? cur.visionBridgeEnabled ?? true,
             visionBridgeModel: settings.visionBridgeModel ?? cur.visionBridgeModel ?? null,
@@ -532,11 +591,28 @@ export class ClientStateStore {
     }
     /** Get a single provider's saved key for a project. */
     getProjectProviderKey(clientId, cwd, provider) {
-        return this.load()[clientId]?.projectProviderKeys?.[cwd]?.[provider];
+        const all = this.load();
+        const globalHit = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectProviderKeys?.[cwd]?.[provider];
+        if (globalHit)
+            return globalHit;
+        const direct = all[clientId]?.projectProviderKeys?.[cwd]?.[provider];
+        if (direct)
+            return direct;
+        for (const [id, state] of Object.entries(all)) {
+            if (id === clientId || id === ClientStateStore.GLOBAL_SETTINGS_KEY)
+                continue;
+            const hit = state.projectProviderKeys?.[cwd]?.[provider];
+            if (hit)
+                return hit;
+        }
+        return undefined;
     }
     /** Remember which key was last used for a provider in a project. */
     saveProjectProviderKey(clientId, cwd, provider, keyName) {
         const all = this.load();
+        const globalState = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
+        const gMap = (globalState.projectProviderKeys ??= {});
+        (gMap[cwd] ??= {})[provider] = keyName;
         const state = (all[clientId] ??= { projects: [] });
         const map = (state.projectProviderKeys ??= {});
         const inner = (map[cwd] ??= {});
@@ -546,6 +622,13 @@ export class ClientStateStore {
     /** Delete a per-project provider key (e.g. when the key is removed). */
     deleteProjectProviderKey(clientId, cwd, provider) {
         const all = this.load();
+        const gInner = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectProviderKeys?.[cwd];
+        if (gInner && provider in gInner) {
+            delete gInner[provider];
+            if (Object.keys(gInner).length === 0) {
+                delete all[ClientStateStore.GLOBAL_SETTINGS_KEY].projectProviderKeys[cwd];
+            }
+        }
         const inner = all[clientId]?.projectProviderKeys?.[cwd];
         if (!inner || !(provider in inner))
             return;
@@ -613,11 +696,39 @@ export class ClientStateStore {
     }
     /** Get the model the user last selected in a project, or undefined. */
     getProjectModel(clientId, cwd) {
-        return this.load()[clientId]?.projectModels?.[cwd];
+        const all = this.load();
+        // 1. 全局项目模型记忆（跨标签页、跨客户端、重启浏览器共享，优先级最高）
+        const globalHit = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectModels?.[cwd];
+        if (globalHit)
+            return globalHit;
+        // 2. 本客户端记忆
+        const direct = all[clientId]?.projectModels?.[cwd];
+        if (direct)
+            return direct;
+        // 3. 其他客户端按最近活跃时间倒序查找兜底
+        const candidates = [];
+        for (const [id, state] of Object.entries(all)) {
+            if (id === clientId || id === ClientStateStore.GLOBAL_SETTINGS_KEY)
+                continue;
+            const m = state.projectModels?.[cwd];
+            if (m) {
+                const p = state.projects?.find((proj) => proj.path === cwd);
+                candidates.push({ model: m, lastUsed: p?.lastUsed ?? 0 });
+            }
+        }
+        if (candidates.length > 0) {
+            candidates.sort((a, b) => b.lastUsed - a.lastUsed);
+            return candidates[0].model;
+        }
+        return undefined;
     }
     /** Remember the model last selected in a project (immediate, not after a turn). */
     saveProjectModel(clientId, cwd, modelId) {
         const all = this.load();
+        // 写入全局项目记忆（保证新标签页/重启浏览器时确定可用）
+        const globalState = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
+        (globalState.projectModels ??= {})[cwd] = modelId;
+        // 同时写入本客户端
         const state = (all[clientId] ??= { projects: [] });
         (state.projectModels ??= {})[cwd] = modelId;
         this.save();
@@ -626,6 +737,12 @@ export class ClientStateStore {
      *  removed from the catalog). */
     deleteProjectModel(clientId, cwd) {
         const all = this.load();
+        const gMap = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectModels;
+        if (gMap && cwd in gMap) {
+            delete gMap[cwd];
+            if (Object.keys(gMap).length === 0)
+                delete all[ClientStateStore.GLOBAL_SETTINGS_KEY].projectModels;
+        }
         const map = all[clientId]?.projectModels;
         if (!map || !(cwd in map))
             return;

package/dist/server/conversation-read-tool.js

@@ -22,6 +22,7 @@
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { bilingual, pick } from "./i18n.js";
+import { CONVERSATION_READ_TOOL_NAME } from "./tool-manager.js";
 import { extractTouches, formatTouchEntry, formatTouchesCompact, toolCallRefsOfContent, unionTouchLists, } from "./conversation-touches.js";
 /** 由 content 块提 toolCalls 字段（additive；格式化输出不受影响，见接口注释）。 */
 function fillToolCalls(target, content) {
@@ -366,7 +367,7 @@ export function makeConversationReadTool(host, lang, extras) {
         details,
     });
     return defineTool({
-        name: "conversation_read",
+        name: CONVERSATION_READ_TOOL_NAME,
         label: "Read another conversation",
         description: bilingual('Read ANOTHER conversation: a running conversation of this client (including subagents — use its conversation id like "c3", see action=list) or a persisted history session transcript (use its file path). ' +
             'Use it when the user references another chat (a quoted conversation, a pasted conversation id, or "see the other chat about X"). ' +

package/dist/server/delegate-task.js

@@ -17,9 +17,10 @@
 import { Type } from "typebox";
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { bilingual, pick } from "./i18n.js";
+import { DELEGATE_TASK_TOOL_NAME } from "./tool-manager.js";
 import { subagentTitle } from "./subagents.js";
-/** 工具名（前端 ToolCallBlock 派单卡片靠它识别；改名需同步改前端）。 */
-export const DELEGATE_TOOL_NAME = "delegate_task";
+/** 工具名（唯一值在 tool-manager.ts；本别名保留：前端派单卡片与旧导入沿用它）。 */
+export const DELEGATE_TOOL_NAME = DELEGATE_TASK_TOOL_NAME;
 /** 各段最小长度（trim 后字符数）：TASK 必须具体，OUTCOME 必须可验收，其余段不许空着。 */
 const MIN_TASK = 20;
 const MIN_OUTCOME = 10;
@@ -40,6 +41,7 @@ export function normalizeDelegation(params) {
         must_not_do: str(p.must_not_do),
         context: str(p.context),
         model: str(p.model).trim() || undefined,
+        persist: typeof p.persist === "boolean" ? p.persist : undefined,
     };
 }
 /**
@@ -122,6 +124,11 @@ const delegateSchema = Type.Object({
     model: Type.Optional(Type.String({
         description: bilingual('Optional model "provider/id" for this delegation; omit = template model → panel default → follow the main conversation model.', "可选：本次派单的子代理模型（provider/id）；不传 = 模板模型 → 面板默认 → 跟随主对话模型。"),
     })),
+    persist: Type.Optional(Type.Boolean({
+        description: bilingual("Optional: persist this conversation to disk as a regular session (saved in history, resumable). " +
+            "Default false (lightweight in-memory subagent). Use true for tasks that need long-term retention.", "可选：是否将该对话持久化落盘为普通对话（保存在历史会话中，可随时回顾与继续）。" +
+            "默认 false（轻量内存子代理）。需要长期留存的任务建议设为 true。"),
+    })),
 });
 /** 结构化派单工具：校验六段 → 拼装标准 prompt → 走 host.spawnSubagent 真子代理。 */
 export function makeDelegateTaskTool(host, lang) {
@@ -163,7 +170,7 @@ export function makeDelegateTaskTool(host, lang) {
             // 创建失败都经由 host 抛错），转成返回文本让 AI 能读到原因并修正重试。
             let convId;
             try {
-                convId = await host.spawnSubagent(prompt, "delegate", ctx.cwd, input.agent, input.model);
+                convId = await host.spawnSubagent(prompt, "delegate", ctx.cwd, input.agent, input.model, undefined, input.persist);
             }
             catch (err) {
                 const msg = err instanceof Error ? err.message : String(err);

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

@@ -29,12 +29,14 @@ 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, DEFAULT_RETRY_MAX_ATTEMPTS } from "../client-state.js";
+import { ClientStateStore, DEFAULT_RETRY_MAX_ATTEMPTS, normalizeToolWatchdogTimeoutMs } from "../client-state.js";
 import { normalizeUiLayout } from "../client-state.js";
 import { FilesService, workspacePath, desktopDirWire } 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";
+// 工具定义说明的归一化（工具卡右键 → 「显示工具详细信息」，见 getToolInfo）。
+import { normalizeToolInfo, unsupportedToolInfo } from "../tool-info.js";
 import { TerminalManager, loadCommands, saveCommandsFile } from "../terminals.js";
 import { saveUpload } from "../uploads.js";
 import { checkAll as checkAllUpdates, collectTargets, resolveNpmRegistry } from "../update-check.js";
@@ -122,12 +124,14 @@ const DEFAULT_SETTINGS = {
     terminalToolsEnabled: false,
     terminalBash: false,
     terminalBashIdleMs: 15_000,
+    toolWatchdogTimeoutMs: 20 * 60_000,
     editSoftEnabled: false,
     questionnaireEnabled: true,
     goalModeEnabled: true,
     parallelReminderEnabled: true,
     thinkingWrap: false,
     toolsWrap: true,
+    toolImagesEnabled: true,
     disabledPlugins: [],
     uiLayout: {},
     reviewPrompt: "",
@@ -267,12 +271,14 @@ export class DshClientSession {
                 terminalToolsEnabled: savedSettings.terminalToolsEnabled,
                 terminalBash: savedSettings.terminalBash,
                 terminalBashIdleMs: savedSettings.terminalBashIdleMs,
+                toolWatchdogTimeoutMs: savedSettings.toolWatchdogTimeoutMs ?? 20 * 60_000,
                 editSoftEnabled: savedSettings.editSoftEnabled,
                 questionnaireEnabled: savedSettings.questionnaireEnabled ?? true,
                 goalModeEnabled: savedSettings.goalModeEnabled ?? true,
                 parallelReminderEnabled: savedSettings.parallelReminderEnabled ?? true,
                 thinkingWrap: savedSettings.thinkingWrap,
                 toolsWrap: savedSettings.toolsWrap,
+                toolImagesEnabled: savedSettings.toolImagesEnabled ?? true,
                 disabledPlugins: savedSettings.disabledPlugins ?? [],
                 uiLayout: normalizeUiLayout(savedSettings.uiLayout),
                 reviewPrompt: savedSettings.reviewPrompt,
@@ -563,16 +569,22 @@ export class DshClientSession {
                     // 记下待答问卷：`question_pending` 只推给「当时在线」的连接，刷新页面
                     // /WS 重连后靠快照（UiState.pendingQuestion）把对话框恢复出来。
                     // DSH 的提问桥是 runtime 级的（无 conversationId），故不分对话。
+                    const dshConv = this.convs.get(this.activeId);
+                    const conversationTitle = dshConv?.title;
                     this.pendingQuestion = {
                         id: params0.id,
                         ...(typeof params0.deadline === "number" ? { deadline: params0.deadline } : {}),
                         questions: mapped,
+                        ...(this.activeId ? { conversationId: this.activeId } : {}),
+                        ...(conversationTitle ? { conversationTitle } : {}),
                     };
                     this.emit({
                         type: "question_pending",
                         id: params0.id,
                         ...(typeof params0.deadline === "number" ? { deadline: params0.deadline } : {}),
                         questions: mapped,
+                        ...(this.activeId ? { conversationId: this.activeId } : {}),
+                        ...(conversationTitle ? { conversationTitle } : {}),
                     });
                 }
                 else if (method === "tools.call.request") {
@@ -658,6 +670,28 @@ export class DshClientSession {
             console.error(`[dsh] syncPluginTools 失败 (client=${this.clientId}):`, err);
         }
     }
+    /**
+     * 取一条工具的**定义说明**（工具卡右键 → 「显示工具详细信息」）→ `tool_info`。
+     *
+     * DSH 侧的定义来自运行时（`tools/list`：DSH 原生工具 + 桥接进来的插件工具）。
+     * 拿不到（运行时没起来 / RPC 报错）回 `unsupported`，让前端说「当前引擎不支持」
+     * 而不是「未找到工具定义」—— 后者会让用户以为工具名写错了。
+     */
+    async getToolInfo(name) {
+        if (!this.runtime.alive) {
+            this.emit({ type: "tool_info", ...unsupportedToolInfo(name) });
+            return;
+        }
+        try {
+            const res = await this.runtime.listTools();
+            const found = (res.tools ?? []).find((t) => t.name === name);
+            this.emit({ type: "tool_info", ...normalizeToolInfo(name, found) });
+        }
+        catch (err) {
+            console.error(`[dsh] listTools 失败 (client=${this.clientId}):`, err);
+            this.emit({ type: "tool_info", ...unsupportedToolInfo(name) });
+        }
+    }
     /** 从运行时拉取技能清单 → 缓存 → 重推 settings_state（enabled 由 disabledSkills 推导）。 */
     async refreshSkillsFromRuntime() {
         if (!this.runtime.alive)
@@ -2590,6 +2624,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            toolWatchdogTimeoutMs: this.settings.toolWatchdogTimeoutMs,
             // DSH 引擎无 customTool 注册面（工具来自 shipped preset），read 目录覆盖面不存在。
             readDirEnabled: true,
             editSoftEnabled: this.settings.editSoftEnabled,
@@ -2603,6 +2638,7 @@ export class DshClientSession {
             parallelReminderEnabled: this.settings.parallelReminderEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
+            toolImagesEnabled: this.settings.toolImagesEnabled,
             // DSH 无 skill 全文注入概念，给空保协议完整。
             skillsFullText: [],
             visionBridgeEnabled: false,
@@ -2659,6 +2695,8 @@ export class DshClientSession {
             this.settings.terminalBash = partial.terminalBash;
         if (partial.terminalBashIdleMs !== undefined)
             this.settings.terminalBashIdleMs = partial.terminalBashIdleMs;
+        if (partial.toolWatchdogTimeoutMs !== undefined)
+            this.settings.toolWatchdogTimeoutMs = normalizeToolWatchdogTimeoutMs(partial.toolWatchdogTimeoutMs);
         if (partial.editSoftEnabled !== undefined)
             this.settings.editSoftEnabled = partial.editSoftEnabled;
         if (partial.questionnaireEnabled !== undefined)
@@ -2671,6 +2709,8 @@ export class DshClientSession {
             this.settings.thinkingWrap = partial.thinkingWrap;
         if (partial.toolsWrap !== undefined)
             this.settings.toolsWrap = partial.toolsWrap;
+        if (partial.toolImagesEnabled !== undefined)
+            this.settings.toolImagesEnabled = partial.toolImagesEnabled;
         if (partial.disabledPlugins !== undefined)
             this.settings.disabledPlugins = partial.disabledPlugins;
         if (partial.uiLayout !== undefined)
@@ -2706,6 +2746,7 @@ export class DshClientSession {
             parallelReminderEnabled: this.settings.parallelReminderEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
+            toolImagesEnabled: this.settings.toolImagesEnabled,
             disabledPlugins: this.settings.disabledPlugins,
             uiLayout: normalizeUiLayout(this.settings.uiLayout),
             reviewPrompt: this.settings.reviewPrompt,
@@ -3071,6 +3112,7 @@ export class DshClientSession {
             editSoftEnabled: this.settings.editSoftEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
+            toolImagesEnabled: this.settings.toolImagesEnabled,
             disabledPlugins: this.settings.disabledPlugins,
             uiLayout: normalizeUiLayout(this.settings.uiLayout),
             reviewPrompt: this.settings.reviewPrompt,