pi-web-ui 0.76.0 → 0.77.0

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

@@ -134,6 +134,9 @@ export class DshClientSession {
     convs = new Map();
     activeId = "";
     convSeq = 0;
+    /** 待答问卷快照（见 attachRuntimeEvents 的 question.pending 与
+     *  UiState.pendingQuestion）：重连/刷新后由快照恢复对话框。 */
+    pendingQuestion = null;
     /** 客户端级目标/审查偏好（跨会话共享的默认值，per-conversation goal 用它初始化）。 */
     goalPrefs = { reviewModel: null, maxRounds: 2, locked: false };
     sinks = new Set();
@@ -454,30 +457,39 @@ export class DshClientSession {
                         void this.answerQuestion(params0.id, [], true);
                         return;
                     }
+                    const mapped = (params0.questions ?? []).map((q) => ({
+                        id: String(q.id ?? ""),
+                        question: String(q.question ?? ""),
+                        ...(typeof q.detail === "string"
+                            ? { detail: q.detail }
+                            : {}),
+                        ...(typeof q.header === "string"
+                            ? { header: q.header }
+                            : {}),
+                        ...(Array.isArray(q.options)
+                            ? {
+                                options: q.options.map((o) => ({
+                                    label: String(o.label ?? ""),
+                                    ...(typeof o.description === "string" ? { description: o.description } : {}),
+                                    ...(typeof o.preview === "string" ? { preview: o.preview } : {}),
+                                })),
+                            }
+                            : {}),
+                        ...(q.multiSelect ? { multiSelect: true } : {}),
+                    }));
+                    // 记下待答问卷：`question_pending` 只推给「当时在线」的连接，刷新页面
+                    // /WS 重连后靠快照（UiState.pendingQuestion）把对话框恢复出来。
+                    // DSH 的提问桥是 runtime 级的（无 conversationId），故不分对话。
+                    this.pendingQuestion = {
+                        id: params0.id,
+                        ...(typeof params0.deadline === "number" ? { deadline: params0.deadline } : {}),
+                        questions: mapped,
+                    };
                     this.emit({
                         type: "question_pending",
                         id: params0.id,
                         ...(typeof params0.deadline === "number" ? { deadline: params0.deadline } : {}),
-                        questions: (params0.questions ?? []).map((q) => ({
-                            id: String(q.id ?? ""),
-                            question: String(q.question ?? ""),
-                            ...(typeof q.detail === "string"
-                                ? { detail: q.detail }
-                                : {}),
-                            ...(typeof q.header === "string"
-                                ? { header: q.header }
-                                : {}),
-                            ...(Array.isArray(q.options)
-                                ? {
-                                    options: q.options.map((o) => ({
-                                        label: String(o.label ?? ""),
-                                        ...(typeof o.description === "string" ? { description: o.description } : {}),
-                                        ...(typeof o.preview === "string" ? { preview: o.preview } : {}),
-                                    })),
-                                }
-                                : {}),
-                            ...(q.multiSelect ? { multiSelect: true } : {}),
-                        })),
+                        questions: mapped,
                     });
                 }
                 else if (method === "tools.call.request") {
@@ -490,8 +502,24 @@ export class DshClientSession {
             }
         });
     }
+    /** 快照侧的待答问卷（UiState.pendingQuestion）：重连/刷新后靠它恢复对话框。
+     *  DSH 的提问自带超时（goal-rpc 到点 reject），deadline 已过的不再下发——
+     *  否则已经没人等的问卷会被重连的客户端当成活的弹出来。标准引擎不限时，
+     *  没有 deadline，生命周期由回答/取消/dispose 精确终止。 */
+    pendingQuestionForSnapshot() {
+        const p = this.pendingQuestion;
+        if (!p)
+            return null;
+        if (p.deadline !== undefined && p.deadline <= Date.now())
+            return null;
+        return p;
+    }
     /** 前端回答模型提问（question/answer → runtime 恢复工具结果）。 */
     async answerQuestion(id, answers, cancelled) {
+        // 无论成功失败都清掉待答快照：同 id 不会再有下一次，留着会让重连的客户端
+        // 恢复到一张已经没人在等的问卷。
+        if (this.pendingQuestion?.id === id)
+            this.pendingQuestion = null;
         try {
             await this.runtime.answerQuestion(id, answers, cancelled);
         }
@@ -1028,6 +1056,7 @@ export class DshClientSession {
             thinkingLevel: this.thinkingLevel,
             availableThinkingLevels: ["high"],
             queue: { steering: conv.queue.steering, followUp: conv.queue.followUp },
+            pendingQuestion: this.pendingQuestionForSnapshot(),
             tools: [],
             version: ++this.version,
             piConfigured: !!loadDeepSeekKey(),
@@ -2191,6 +2220,8 @@ export class DshClientSession {
             customSystemPrompt: this.settings.customSystemPrompt,
             disabledSkills: this.settings.disabledSkills,
             disabledExtensions: this.settings.disabledExtensions,
+            // DSH engine: no unified tool gating (no subagent/edit_soft); empty keeps protocol complete.
+            disabledAgentTools: [],
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
@@ -2201,6 +2232,8 @@ export class DshClientSession {
             goalModeEnabled: this.settings.goalModeEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
+            // DSH 无 skill 全文注入概念，给空保协议完整。
+            skillsFullText: [],
             visionBridgeEnabled: false,
             visionBridgeModel: null,
             visionBridgePromptMode: "append",
@@ -2342,11 +2375,15 @@ export class DshClientSession {
             promptOverrides: {},
             disabledSkills: this.settings.disabledSkills,
             disabledExtensions: this.settings.disabledExtensions,
+            // DSH engine: no unified tool gating (no subagent/edit_soft); empty keeps protocol complete.
+            disabledAgentTools: [],
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
             editSoftEnabled: this.settings.editSoftEnabled,
             // DSH 无独立重试配置，预设沿用默认值。
+            // DSH 无 skill 全文注入概念，给空保预设类型完整。
+            skillsFullText: [],
             retryMaxAttempts: DEFAULT_RETRY_MAX_ATTEMPTS,
             visionBridgePromptMode: "append",
             visionBridgePrompt: "",

package/dist/server/edit-soft-tool.js

@@ -23,7 +23,9 @@ import { isAbsolute, join, resolve as nodeResolve } from "node:path";
 import { Type } from "typebox";
 import { defineTool, generateDiffString, generateUnifiedPatch, withFileMutationQueue, } from "@earendil-works/pi-coding-agent";
 import { bilingual, pick } from "./i18n.js";
-export const SOFT_EDIT_TOOL_NAME = "edit_soft";
+import { EDIT_SOFT_TOOL_NAME } from "./tool-manager.js";
+/** 独立宽松编辑工具名（唯一登记见 tool-manager.ts；此处别名保兼容）。 */
+export const SOFT_EDIT_TOOL_NAME = EDIT_SOFT_TOOL_NAME;
 const replaceEditSchema = Type.Object({
     oldText: Type.String({
         description: bilingual("Text to replace. Loose matching: the content of each non-empty line (trimmed of leading/trailing whitespace) must match the corresponding file lines; leading-indentation (spaces/tabs) differences are ignored. Prefer whole lines/blocks.", "要替换的文本。宽松匹配：每个非空行的内容（去掉首尾空白）需与文件中对应行一致；行首缩进（空格/制表符）的差异会被忽略。建议按整行/整块提供。"),

package/dist/server/index.js

@@ -402,6 +402,21 @@ if (existsSync(webDist)) {
             }
         },
     }));
+    // 缺失的静态文件必须 404（不能落进下面的 SPA catch-all）：缺少的 hash 产物若
+    // 回 index.html（200），浏览器会把 HTML 当 JS/CSS 执行失败黑屏，SW 还会把
+    // 它按 200 缓进 STATIC_CACHE，之后即使文件恢复也要清缓存才能好。
+    app.use((req, res, next) => {
+        const p = req.path;
+        if (p.startsWith("/assets/") ||
+            p.startsWith("/icons/") ||
+            p === "/favicon.svg" ||
+            p === "/icon.ico" ||
+            p === "/manifest.webmanifest") {
+            res.status(404).end();
+            return;
+        }
+        next();
+    });
     app.get(/^\/(?!api\/|ws).*/, (_req, res) => {
         // Callback form: a failed stat here (npm i -g is mid-replacement of the
         // package dir) responds 503 instead of crashing the request pipeline
@@ -936,6 +951,7 @@ wss.on("connection", (ws) => {
                     promptOverrides: msg.promptOverrides,
                     disabledSkills: msg.disabledSkills,
                     disabledExtensions: msg.disabledExtensions,
+                    disabledAgentTools: msg.disabledAgentTools,
                     disabledPlugins: msg.disabledPlugins,
                     terminalToolsEnabled: msg.terminalToolsEnabled,
                     terminalBash: msg.terminalBash,
@@ -945,6 +961,7 @@ wss.on("connection", (ws) => {
                     goalModeEnabled: msg.goalModeEnabled,
                     thinkingWrap: msg.thinkingWrap,
                     toolsWrap: msg.toolsWrap,
+                    skillsFullText: msg.skillsFullText,
                     visionBridgeEnabled: msg.visionBridgeEnabled,
                     visionBridgeModel: msg.visionBridgeModel,
                     visionBridgePromptMode: msg.visionBridgePromptMode,

package/dist/server/markers/builtins/todo.js

@@ -43,14 +43,14 @@ const TODO_GUIDANCE_ZH = [
     "# 内联标记工具（状态类操作请写在回答正文，不要调用工具）",
     "- 标记语法：[[todo:new:<主题>]] 新建；[[todo:set:<id>,completed|in_progress|pending]] 状态；[[todo:remove:<id>]] 删除；[[todo:dep:<id>,blocks=<依赖id,逗号分隔>]] 设依赖。",
     "- 状态变化全部用上面的 [[todo:...]] 内联标记表达，不会中断回答，无需等待返回。",
-    "- 想查看/list 当前任务列表时，才用 `markers_list` 工具（读操作走工具）。",
+    "- 想查看/list 当前任务列表时，才用 `todo_list` 工具（读操作走工具）。",
     "- 不要编造不存在的任务 id；id 由 [[todo:new:...]] 分配，首次分配是自增整数。",
 ];
 const TODO_GUIDANCE_EN = [
     "# Inline marker tools (express state changes inline in your reply text — never call a tool for them)",
     "- Marker syntax: [[todo:new:<subject>]] to create; [[todo:set:<id>,completed|in_progress|pending]] for status; [[todo:remove:<id>]] to delete; [[todo:dep:<id>,blocks=<dep ids, comma-separated>]] to set dependencies.",
     "- Express all status changes with the [[todo:...]] inline markers above; they never interrupt your reply and need no waiting for a result.",
-    "- Only use the `markers_list` tool (the read path goes through the tool) when you want to list the current tasks.",
+    "- Only use the `todo_list` tool (the read path goes through the tool) when you want to list the current tasks.",
     "- Never invent task ids; ids are assigned by [[todo:new:...]], starting from incrementing integers.",
 ];
 /** 语言感知的 todo guidance（issue #91）：en 用英译、zh 用中文，默认英文。 */

package/dist/server/orchestrator.js

@@ -0,0 +1,109 @@
+const EN = [
+    "<orchestrator>",
+    "You are an orchestrator, not just an implementer. Your value is decomposition,",
+    "delegation, and quality control. Default bias: DELEGATE. Work directly only when",
+    "the task is trivially small (single file, known location, direct answer).",
+    "",
+    "## Intent gate (every message)",
+    "- Check skills FIRST: if the request matches a skill trigger, read that skill file",
+    "  before classifying or acting. Skills handle their tasks better than ad-hoc work.",
+    "- Verbalize routing BEFORE acting: state the detected intent (research /",
+    "  implementation / investigation / evaluation / fix / open-ended) and your approach",
+    "  (e.g. explore recon first, then answer; plan then delegate).",
+    "- Implement ONLY when the current message explicitly asks for implementation",
+    "  (implement/add/create/fix/change/write), the scope is concrete, and no pending",
+    "  specialist result blocks you. Otherwise research/clarify and wait.",
+    "- Reclassify intent from the CURRENT message only; never auto-carry",
+    "  implementation mode from prior turns.",
+    "",
+    "## Delegation protocol",
+    "Available specialist templates (subagent_spawn template=):",
+    "- oracle: architecture decisions, hard debugging, multi-system tradeoffs",
+    "- metis: pre-planning analysis when scope is unclear",
+    "- momus: review a work plan for gaps before implementing",
+    "- explore: codebase recon (where is X, which file has Y)",
+    "- librarian: external docs / library usage / open-source examples",
+    "- sisyphus-junior: well-defined single-scope implementation (already researched)",
+    "- multimodal-looker: PDFs, images, diagrams needing interpretation",
+    "- review / implement / research / scout / audit: built-in execution and review roles",
+    "Match the task domain to the template. Visual work goes to frontend-capable",
+    "execution; hard logic and architecture go to oracle; unclear scope goes to metis first.",
+    "BEFORE each delegation, declare: which template, WHY its description matches the",
+    "task domain, and the expected outcome. Then call subagent_spawn.",
+    "Delegation prompts MUST include all six sections:",
+    "1. TASK (atomic, one action) 2. EXPECTED OUTCOME (concrete deliverables +",
+    "done criteria) 3. REQUIRED TOOLS (explicit whitelist) 4. MUST DO (leave nothing",
+    "implicit) 5. MUST NOT DO (forbidden actions) 6. CONTEXT (file paths, patterns,",
+    "constraints). Vague prompts fail; if your prompt is shorter than 5 lines it is too vague.",
+    "For follow-ups continue the SAME subagent session instead of starting fresh.",
+    "After delegation ALWAYS verify: does it work, does it follow codebase patterns,",
+    "did it respect MUST DO / MUST NOT DO. Never start implementing work that a",
+    "pending oracle/momus result was asked to decide.",
+    "Anti-duplication: once explore/librarian are tasked, do NOT redo their search yourself.",
+    "",
+    "## Task management",
+    "Multi-step task (2+ steps) -> create a todo list IMMEDIATELY, in detail.",
+    "Mark exactly ONE item in_progress before starting it; mark completed IMMEDIATELY",
+    "after (never batch). If scope changes, update todos before proceeding.",
+    "No todos on non-trivial work = incomplete work.",
+    "",
+    "## Constraints",
+    "NEVER: suppress type errors (as any, @ts-ignore); commit without an explicit",
+    "request; speculate about unread code; leave code broken after failures;",
+    "use empty catch blocks; delete failing tests to pass.",
+    "Prefer existing libraries, small focused changes, and minimal bugfixes",
+    "(never refactor while fixing). Run diagnostics/build/tests on changed files",
+    "before reporting completion.",
+    "</orchestrator>",
+].join("\n");
+const ZH = [
+    "<orchestrator>",
+    "你是编排者（orchestrator），而不只是一个执行者。你的价值在于任务分解、",
+    "委派和质量把关。默认倾向：能委派就委派。只有任务极小（单文件、位置明确、",
+    "直接可答）时才亲自动手。",
+    "",
+    "## 意图门（每条消息先过这一关）",
+    "- 先查技能：请求命中某技能触发条件时，先用 read 读该技能文件，再分类或动手。",
+    "  技能覆盖的任务，照技能流程做比临场发挥更可靠。",
+    "- 先说路由再动手：明确本轮意图（调研 / 实现 / 排查 / 评估 / 修 bug / 开放式），",
+    "  并说出你的路线（例如先 explore 摸底再回答、先计划再委派）。",
+    "- 只有同时满足才实现：本轮消息有明确的实现动词（实现/加/创建/修/改/写）、",
+    "  范围足够具体、不依赖尚未返回的 specialist 结果。否则只做调研/澄清然后等待。",
+    "- 每轮只按当前消息重判意图，不把上一轮的“实现模式”自动带过来。",
+    "",
+    "## 委派协议",
+    "可用 specialist 模板（subagent_spawn 的 template 参数）：",
+    "- oracle：架构决策、难调的 bug、多系统权衡",
+    "- metis：范围不清时先做预分析",
+    "- momus：实现前先评审计划查缺补漏",
+    "- explore：代码库侦察（X 在哪、Y 在哪个文件）",
+    "- librarian：外部文档 / 第三方库用法 / 开源实现参考",
+    "- sisyphus-junior：已调研清楚的单点实现任务",
+    "- multimodal-looker：需要解读的 PDF / 图片 / 图表",
+    "- review / implement / research / scout / audit：内置的执行与审查角色",
+    "按任务领域选模板：界面视觉走前端执行、硬逻辑与架构走 oracle、范围不清先走 metis。",
+    "每次委派前必须声明：选哪个模板、它的简介与任务哪里匹配、期望产出，然后再调 subagent_spawn。",
+    "派单词必须包含六段：1. TASK（原子目标） 2. EXPECTED OUTCOME（交付物+完成标准）",
+    "3. REQUIRED TOOLS（可用工具白名单） 4. MUST DO（要求写尽） 5. MUST NOT DO（禁区）",
+    "6. CONTEXT（文件路径、既有模式、约束）。派单词短于 5 行就是太含糊，一定失败。",
+    "追问要在同一个子代理会话里继续，不要另起炉灶。",
+    "委派后必须验证：能跑吗、符合代码库既有模式吗、遵守 MUST DO / MUST NOT DO 了吗。",
+    "oracle/momus 还没回来之前，不准先把它们要定的实现写了。",
+    "禁重复劳动：explore/librarian 已经在查的东西，自己不要再查一遍。",
+    "",
+    "## 任务管理",
+    "多步任务（2 步以上）→ 立刻建 todo 列表，越细越好。",
+    "一次只把一项标 in_progress，做完立刻标 completed（不批量）。范围变了先更新 todo 再动手。",
+    "复杂任务没有 todo = 没做完。",
+    "",
+    "## 禁区",
+    "绝不：压类型错误（as any、@ts-ignore）；未经明确要求就 commit；臆测没读过的代码；",
+    "失败后留下一堆 broken 代码；空 catch；删掉失败的测试来“通过”。",
+    "优先用现成库、小而聚焦的改动、最小化修 bug（修 bug 时不顺手重构）。",
+    "汇报完成前，先对改动过的文件跑一遍诊断/构建/测试。",
+    "</orchestrator>",
+].join("\n");
+/** 编排指导块（按语言选；Oh-my-pi Behavior/Delegation/Task/Constraints 的原生改写版）。 */
+export function buildOrchestratorText(lang = "en") {
+    return lang === "zh" ? ZH : EN;
+}

package/dist/server/prompt-composer.js

@@ -140,8 +140,10 @@ function escapeXml(s) {
         .replace(/"/g, """)
         .replace(/'/g, "'");
 }
-/** 技能段文本（不含前导空行）。与 SDK formatSkillsForPrompt 一致。 */
-export function buildSkillsText(skills, lang = "en") {
+/** 技能段文本（不含前导空行）。与 SDK formatSkillsForPrompt 一致。
+ * fullText = true 全员全文注入（oh-my-pi 式：标题 + 引用描述 + body 全文）；
+ * 传技能名数组 = 只注入名单里的；content 缺失的条目回落列表行，不中断渲染。 */
+export function buildSkillsText(skills, lang = "en", fullText = false) {
     const visible = skills.filter((s) => !s.disableModelInvocation);
     if (visible.length === 0)
         return "";
@@ -153,6 +155,15 @@ export function buildSkillsText(skills, lang = "en") {
         "<available_skills>",
     ];
     for (const skill of visible) {
+        // 全文模式且有内容：oh-my-pi 注入格式（### Skill: 名 / > 描述 / 全文）。
+        const inject = fullText === true || (Array.isArray(fullText) && fullText.includes(skill.name));
+        if (inject && skill.content?.trim()) {
+            lines.push(`### Skill: ${skill.name}`);
+            if (skill.description.trim())
+                lines.push(`> ${skill.description.trim()}`);
+            lines.push("", skill.content.trim(), "");
+            continue;
+        }
         lines.push("  <skill>");
         lines.push(`    <name>${escapeXml(skill.name)}</name>`);
         lines.push(`    <description>${escapeXml(skill.description)}</description>`);
@@ -220,7 +231,7 @@ export function resolveSectionTexts(inputs) {
         terminal: inputs.terminalGuidance,
         markers: inputs.markersGuidance,
         context: buildContextText(inputs.contextFiles, lang),
-        skills: buildSkillsText(inputs.skills, lang),
+        skills: buildSkillsText(inputs.skills, lang, inputs.skillsFullText ?? false),
         cwd: `Current working directory: ${cwd}`,
     };
 }

package/dist/server/queue-utils.js

@@ -0,0 +1,18 @@
+/**
+ * 排队消息（插队 steer / 排队 followUp）纯函数 —— 独立成模块是为了可单测
+ * （`AgentService` 依赖 SDK 与运行时，不适合在单测里 import）。
+ *
+ * 背景：pi SDK 没有「按条操作队列」的 API，服务端移除一条排队消息的做法是
+ * `clearQueue()` 之后把幸存者按原顺序重新入队（见 `AgentService.removeQueued`）。
+ * 重建时若用值过滤（`list.filter((t) => t !== text)`），会把**所有**同文本项一起删掉；
+ * 而气泡上的 ✕ 只对应一条消息、本地显示镜像也只移除一条 → 同一条文本被排队两次时
+ * 「点一次 ✕ 删两条」，且显示与真实队列在下次 `queue_update` 之前不一致。
+ * 因此统一按「只移除第一处匹配」处理。
+ */
+/** 移除列表中第一处等于 `text` 的项；找不到时返回入参的拷贝（不修改入参）。 */
+export function removeFirstOccurrence(list, text) {
+    const index = list.indexOf(text);
+    if (index < 0)
+        return [...list];
+    return [...list.slice(0, index), ...list.slice(index + 1)];
+}

package/dist/server/settings-service.js

@@ -8,9 +8,10 @@
  */
 import { existsSync, readdirSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
-import { extensionKey, normalizeRetryMaxAttempts, } from "./client-state.js";
+import { extensionKey, normalizeRetryMaxAttempts, normalizeSkillList, } from "./client-state.js";
 import { findVisionModels, SYSTEM_PROMPT } from "./vision-bridge.js";
 import { DEFAULT_TEMPLATES } from "./subagent-templates.js";
+import { deriveLegacy, foldLegacyIntoDisabled, normalizeDisabledAgentTools } from "./tool-manager.js";
 export class SettingsService {
     host;
     templates;
@@ -141,13 +142,21 @@ export class SettingsService {
         // 推送都会把已删除的 skill 以灰条形式永恒地补回面板（“关闭过的
         // skill 被一直记录”）。session 未就绪时保守跳过。
         if (loadedSkillNames !== null) {
-            const stale = [...new Set([...this.settings.disabledSkills, ...this.settings.reviewDisabledSkills])].filter((name) => !loadedSkillNames.has(name) && !this.skillStillOnDisk(name));
+            const stale = [
+                ...new Set([
+                    ...this.settings.disabledSkills,
+                    ...this.settings.reviewDisabledSkills,
+                    ...normalizeSkillList(this.settings.skillsFullText),
+                ]),
+            ].filter((name) => !loadedSkillNames.has(name) && !this.skillStillOnDisk(name));
             if (stale.length > 0) {
                 this.settings.disabledSkills = this.settings.disabledSkills.filter((n) => !stale.includes(n));
                 this.settings.reviewDisabledSkills = this.settings.reviewDisabledSkills.filter((n) => !stale.includes(n));
+                this.settings.skillsFullText = normalizeSkillList(this.settings.skillsFullText).filter((n) => !stale.includes(n));
                 this.host.stateStore.saveSettings(this.host.clientId, {
                     disabledSkills: this.settings.disabledSkills,
                     reviewDisabledSkills: this.settings.reviewDisabledSkills,
+                    skillsFullText: this.settings.skillsFullText,
                 });
             }
         }
@@ -180,6 +189,8 @@ export class SettingsService {
         const extensions = [...this.knownExtensions.values()]
             .map((e) => ({ ...e, enabled: !disabledExts.has(e.id) }))
             .sort((a, b) => a.name.localeCompare(b.name));
+        // 统一工具开关是单源（disabledAgentTools），遗留三开关推送时推导，保证面板一致。
+        const legacyTools = deriveLegacy(this.settings.disabledAgentTools ?? []);
         // 当前会话提示词快照：完整生效文本 + 各来源默认（自动）内容（只读预览）。
         const promptSnap = this.host.promptSnapshot();
         this.host.emit({
@@ -189,11 +200,12 @@ export class SettingsService {
                 customSystemPrompt: this.settings.customSystemPrompt,
                 promptTemplate: this.settings.promptTemplate ?? "",
                 promptOverrides: { ...this.settings.promptOverrides },
-                terminalToolsEnabled: this.settings.terminalToolsEnabled,
+                disabledAgentTools: [...normalizeDisabledAgentTools(this.settings.disabledAgentTools)],
+                terminalToolsEnabled: legacyTools.terminalToolsEnabled,
                 terminalBash: this.settings.terminalBash,
                 terminalBashIdleMs: this.settings.terminalBashIdleMs,
-                editSoftEnabled: this.settings.editSoftEnabled,
-                questionnaireEnabled: this.settings.questionnaireEnabled,
+                editSoftEnabled: legacyTools.editSoftEnabled,
+                questionnaireEnabled: legacyTools.questionnaireEnabled,
                 goalModeEnabled: this.settings.goalModeEnabled,
                 thinkingWrap: this.settings.thinkingWrap,
                 toolsWrap: this.settings.toolsWrap,
@@ -204,6 +216,7 @@ export class SettingsService {
                 reviewPrompt: this.settings.reviewPrompt,
                 reviewDisabledSkills: [...this.settings.reviewDisabledSkills],
                 disabledPlugins: [...(this.settings.disabledPlugins ?? [])],
+                skillsFullText: [...normalizeSkillList(this.settings.skillsFullText)],
                 // The composed system prompt actually in effect (read-only view).
                 effectiveSystemPrompt: promptSnap.full,
                 // 每个来源未覆盖时的默认（自动）内容（「各来源」行预览用）。
@@ -282,9 +295,12 @@ export class SettingsService {
             partial.promptTemplate !== undefined ||
             partial.promptOverrides !== undefined ||
             partial.disabledSkills !== undefined ||
-            partial.disabledExtensions !== undefined ||
+            partial.disabledExtensions !== undefined;
+        // 统一工具开关 live 生效（ActiveSet 加减，无需 reload），见末尾 applyToolGating。
+        const toolGatingChanged = partial.disabledAgentTools !== undefined ||
             partial.terminalToolsEnabled !== undefined ||
-            partial.editSoftEnabled !== undefined;
+            partial.editSoftEnabled !== undefined ||
+            partial.questionnaireEnabled !== undefined;
         if (partial.promptMode !== undefined)
             this.settings.promptMode = partial.promptMode;
         if (partial.customSystemPrompt !== undefined) {
@@ -314,8 +330,25 @@ export class SettingsService {
         if (partial.disabledPlugins !== undefined) {
             this.settings.disabledPlugins = partial.disabledPlugins;
         }
-        if (partial.terminalToolsEnabled !== undefined) {
-            this.settings.terminalToolsEnabled = partial.terminalToolsEnabled;
+        // 统一工具开关：新字段优先；只给遗留单开关时折回新字段。两边写完再由
+        // deriveLegacy 回填遗留别名，保证内存/推送/落盘三处一致。
+        if (partial.disabledAgentTools !== undefined) {
+            this.settings.disabledAgentTools = normalizeDisabledAgentTools(partial.disabledAgentTools);
+        }
+        if (partial.terminalToolsEnabled !== undefined ||
+            partial.editSoftEnabled !== undefined ||
+            partial.questionnaireEnabled !== undefined) {
+            this.settings.disabledAgentTools = foldLegacyIntoDisabled(this.settings.disabledAgentTools ?? [], {
+                terminalToolsEnabled: partial.terminalToolsEnabled,
+                editSoftEnabled: partial.editSoftEnabled,
+                questionnaireEnabled: partial.questionnaireEnabled,
+            });
+        }
+        {
+            const legacy = deriveLegacy(this.settings.disabledAgentTools ?? []);
+            this.settings.terminalToolsEnabled = legacy.terminalToolsEnabled;
+            this.settings.editSoftEnabled = legacy.editSoftEnabled;
+            this.settings.questionnaireEnabled = legacy.questionnaireEnabled;
         }
         if (partial.terminalBash !== undefined) {
             this.settings.terminalBash = partial.terminalBash;
@@ -323,13 +356,6 @@ export class SettingsService {
         if (partial.terminalBashIdleMs !== undefined) {
             this.settings.terminalBashIdleMs = Math.max(0, Math.floor(partial.terminalBashIdleMs) || 0);
         }
-        if (partial.editSoftEnabled !== undefined) {
-            this.settings.editSoftEnabled = partial.editSoftEnabled;
-        }
-        // 问卷开关：运行时无需重载（bridge 处实时读取）。
-        if (partial.questionnaireEnabled !== undefined) {
-            this.settings.questionnaireEnabled = partial.questionnaireEnabled;
-        }
         // 目标模式总开关：运行时无需重载（goal bar / 服务端入口实时读取）。
         if (partial.goalModeEnabled !== undefined) {
             this.settings.goalModeEnabled = partial.goalModeEnabled;
@@ -340,6 +366,11 @@ export class SettingsService {
         if (partial.toolsWrap !== undefined) {
             this.settings.toolsWrap = partial.toolsWrap;
         }
+        // 编排模式 / skill 全文注入：before_agent_start 逐 run 实时读取（agent-service
+        // composeInputs + 指导块追加），开关下一轮即生效，无需 reload runtime。
+        if (partial.skillsFullText !== undefined) {
+            this.settings.skillsFullText = normalizeSkillList(partial.skillsFullText);
+        }
         if (partial.visionBridgeEnabled !== undefined) {
             this.settings.visionBridgeEnabled = partial.visionBridgeEnabled;
         }
@@ -382,6 +413,9 @@ export class SettingsService {
         }
         this.host.stateStore.saveSettings(this.host.clientId, this.settings);
         this.push();
+        // 统一工具开关 live 生效（ActiveSet 加减；失败静默，下次创建/reload 重放）。
+        if (toolGatingChanged)
+            this.host.applyToolGating();
         if (needsReload)
             await this.applyRuntime();
     }
@@ -405,6 +439,7 @@ export class SettingsService {
             promptOverrides: { ...this.settings.promptOverrides },
             disabledSkills: [...this.settings.disabledSkills],
             disabledExtensions: [...this.settings.disabledExtensions],
+            disabledAgentTools: [...normalizeDisabledAgentTools(this.settings.disabledAgentTools)],
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
@@ -412,6 +447,7 @@ export class SettingsService {
             retryMaxAttempts: this.settings.retryMaxAttempts,
             reviewPrompt: this.settings.reviewPrompt,
             reviewDisabledSkills: [...this.settings.reviewDisabledSkills],
+            skillsFullText: [...normalizeSkillList(this.settings.skillsFullText)],
         };
         const existing = this.presets.findIndex((p) => p.name === n);
         if (existing >= 0)
@@ -433,6 +469,14 @@ export class SettingsService {
             });
             return;
         }
+        // 统一工具开关随预设走；旧预设缺新字段时按遗留两开关折算（问卷不进预设，
+        // 从当前禁用名单继承，即保留当前问卷状态）。
+        const presetDisabled = normalizeDisabledAgentTools(p.disabledAgentTools ??
+            foldLegacyIntoDisabled(this.settings.disabledAgentTools ?? [], {
+                terminalToolsEnabled: p.terminalToolsEnabled,
+                editSoftEnabled: p.editSoftEnabled,
+            }));
+        const presetLegacy = deriveLegacy(presetDisabled);
         this.settings = {
             promptMode: p.promptMode,
             customSystemPrompt: p.customSystemPrompt,
@@ -440,12 +484,12 @@ export class SettingsService {
             promptOverrides: { ...(p.promptOverrides ?? this.settings.promptOverrides) },
             disabledSkills: [...p.disabledSkills],
             disabledExtensions: [...p.disabledExtensions],
-            // 旧版持久化的预设可能没有该字段——保留当前值。
-            terminalToolsEnabled: p.terminalToolsEnabled ?? this.settings.terminalToolsEnabled,
+            disabledAgentTools: presetDisabled,
+            terminalToolsEnabled: presetLegacy.terminalToolsEnabled,
             // 终端接管偏好随预设走；旧预设缺字段时保留当前值。
             terminalBash: p.terminalBash ?? this.settings.terminalBash,
             terminalBashIdleMs: p.terminalBashIdleMs ?? this.settings.terminalBashIdleMs,
-            editSoftEnabled: p.editSoftEnabled ?? this.settings.editSoftEnabled,
+            editSoftEnabled: presetLegacy.editSoftEnabled,
             // 重试次数随预设走；旧预设缺字段时保留当前值，应用后即时注入各会话。
             retryMaxAttempts: p.retryMaxAttempts ?? this.settings.retryMaxAttempts,
             // 问卷开关不进预设——保留当前值。
@@ -454,6 +498,8 @@ export class SettingsService {
             goalModeEnabled: this.settings.goalModeEnabled,
             reviewPrompt: p.reviewPrompt ?? this.settings.reviewPrompt,
             reviewDisabledSkills: [...(p.reviewDisabledSkills ?? this.settings.reviewDisabledSkills)],
+            // 全文注入名单随预设走；旧预设缺字段时保留当前值。
+            skillsFullText: normalizeSkillList(p.skillsFullText ?? this.settings.skillsFullText),
             // 纯 UI 偏好不进预设——保留当前值。
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
@@ -472,6 +518,8 @@ export class SettingsService {
         // 预设可能改了重试次数：即时注入（流式中延迟的 reload 之后还会由调用方重放）。
         this.host.applyRetryOverrides();
         this.push();
+        // 预设带了工具开关：live 应用（reload 路径会重放，流式中延迟到 agent_end）。
+        this.host.applyToolGating();
         await this.applyRuntime();
     }
     /** Remove a named preset. */