pi-web-ui 0.97.0 → 0.99.0

package/dist/server/prompt-composer.js

@@ -55,9 +55,6 @@ export function isReadonlyPromptSource(token) {
  *  SDK 默认拼装的完整提示词。 */
 export const DEFAULT_PROMPT_TEMPLATE = PROMPT_TOKENS.map((t) => `{{${t}}}`).join("\n\n");
 const TOKEN_RE = /\{\{\s*([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g;
-export function isKnownToken(name) {
-    return PROMPT_TOKENS.includes(name);
-}
 /** 模板里出现的全部 token（含未知名，供 UI 提示）。 */
 export function collectTemplateTokens(template) {
     const out = [];
@@ -258,3 +255,15 @@ export function estimatePromptTokens(text) {
     const cjk = text.match(CJK_RE)?.length ?? 0;
     return Math.ceil(cjk + (text.length - cjk) / 4);
 }
+/** 把「早前扩展改过的提示词」拆成 SDK 原始提示词 + 扩展的首尾增补。
+ *  before_agent_start 是链式的：我们是最后一个 handler，返回 systemPrompt 等于
+ *  forceSystemPrompt 整体替换，会把别的扩展（如注入 <invoked_skill> 的）写进去的
+ *  内容一起丢掉。只要原始提示词还原样嵌在里面（纯前置/后置增补），就能把增补摘出来
+ *  重新套回我们的渲染结果上。摘不出来（中间插入 / 被整体替换）时返回 pre/post 为空、
+ *  core 为当前文本 —— 调用方退回今天的行为，绝不把整段提示词翻倍。 */
+export function splitExtensionWrap(baseline, current) {
+    const at = baseline ? current.indexOf(baseline) : -1;
+    if (at === -1)
+        return { pre: "", core: current, post: "" };
+    return { pre: current.slice(0, at), core: baseline, post: current.slice(at + baseline.length) };
+}

package/dist/server/protocol-version.js

@@ -8,4 +8,4 @@
  * its own copy in web/src/protocol-version.ts; scripts/check-protocol-sync.mjs
  * verifies the two never drift.
  */
-export const PROTOCOL_VERSION = 21;
+export const PROTOCOL_VERSION = 22;

package/dist/server/resolve-global-sdk.js

@@ -26,6 +26,7 @@
  * 或前台启动时在 import 服务入口之前先 import 它）。
  */
 import { registerHooks } from "node:module";
+import { dirname } from "node:path";
 import { pathToFileURL } from "node:url";
 import { compareVersions, sdkCopies } from "./sdk-origin.js";
 const PKG = "@earendil-works/pi-coding-agent";
@@ -40,6 +41,13 @@ export function pickGlobalSdk(copies, mode) {
     if (BUNDLED_MODES.has((mode ?? "global").trim().toLowerCase()))
         return null;
     const bundled = copies[0];
+    // 显式透传的宿主 SDK 路径（如 extensions/webui.ts 宿主传递，issue #482）：若不降级优先选用
+    if (process.env.PI_WEB_SDK_DIR) {
+        const hostCopy = copies.find((c) => dirname(c.path) === process.env.PI_WEB_SDK_DIR);
+        if (hostCopy && (!bundled || compareVersions(hostCopy.version, bundled.version) >= 0)) {
+            return hostCopy;
+        }
+    }
     // 只考虑祖先链上**严格更新**的副本，多份取版本最高的（旧的/同版本的都不折腾）。
     let best = null;
     for (const copy of copies.slice(1)) {

package/dist/server/schedule-agent-tool.js

@@ -20,7 +20,7 @@ import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { pick } from "./i18n.js";
 import { SCHEDULE_CANCEL_TOOL_NAME, SCHEDULE_LIST_TOOL_NAME, SCHEDULE_TASK_TOOL_NAME } from "./tool-manager.js";
-import { computeNextFire, describeIntervalMs, SCHEDULER_MIN_INTERVAL_MS, } from "./scheduler-tasks.js";
+import { computeNextFire, describeIntervalMs, SCHEDULER_MIN_INTERVAL_MS, SchedulerValidationError, } from "./scheduler-tasks.js";
 import { parseCronSpec } from "./plugin-schedule.js";
 /** 用户写法 → 调度规格。纯函数，可单测。
  *  收：5 字段 cron（"0 * * * *"）、相对时间（"in 30m" / "in 1h" / "in 2d"）、
@@ -180,6 +180,10 @@ export function makeScheduleTools(host, ownerConversationId, lang) {
                 });
             }
             catch (err) {
+                const L = getLang();
+                if (err instanceof SchedulerValidationError) {
+                    return text(L === "zh" ? err.messageZh : err.messageEn);
+                }
                 return text(String(err?.message ?? err));
             }
             const L = getLang();

package/dist/server/scheduler-tasks.js

@@ -10,9 +10,10 @@
  * 定时策略：单个 10s ticker 检查到期任务（cron 下次触发 / 间隔毫秒），
  * running 集合防重叠；catchUp "once" 在启动时补跑一次漏掉的触发。
  */
-import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { nextCronFire, parseCronSpec } from "./plugin-schedule.js";
+import { writeJsonAtomicSync } from "./atomic-file.js";
 export const SCHEDULER_FILE = "scheduler-tasks.json";
 /** 持久间隔底线 60s（与 host.schedule 持久任务同口径，防 token 烧穿）。 */
 export const SCHEDULER_MIN_INTERVAL_MS = 60_000;
@@ -30,50 +31,72 @@ function randomTaskId() {
         s += abc[Math.floor(Math.random() * abc.length)];
     return `task-${s}`;
 }
-/** 归一化 + 校验用户输入；非法抛 Error（中文信息，直接面向 UI）。纯函数，可单测。 */
+export class SchedulerValidationError extends Error {
+    code;
+    messageZh;
+    messageEn;
+    constructor(code, messageZh, messageEn) {
+        super(messageZh);
+        this.code = code;
+        this.messageZh = messageZh;
+        this.messageEn = messageEn;
+        this.name = "SchedulerValidationError";
+    }
+}
+/** 归一化 + 校验用户输入；非法抛 SchedulerValidationError。纯函数，可单测。 */
 export function normalizeSchedulerInput(input, now = Date.now()) {
     const idRaw = String(input.id ?? "").trim();
     const id = idRaw || randomTaskId();
-    if (!SCHEDULER_ID_RE.test(id))
-        throw new Error("任务 id 非法（只收字母/数字/下划线/连字符，≤64 字）");
+    if (!SCHEDULER_ID_RE.test(id)) {
+        throw new SchedulerValidationError("invalid_id", "任务 id 非法（只收字母/数字/下划线/连字符，≤64 字）", "Invalid task id (letters/numbers/underscores/hyphens only, <= 64 chars)");
+    }
     const name = String(input.name ?? "")
         .trim()
         .slice(0, 80);
-    if (!name)
-        throw new Error("任务名称不能为空");
+    if (!name) {
+        throw new SchedulerValidationError("empty_name", "任务名称不能为空", "Task name cannot be empty");
+    }
     const description = String(input.description ?? "")
         .trim()
         .slice(0, 500);
     const cwd = String(input.cwd ?? "").trim();
-    if (!cwd)
-        throw new Error("执行目标项目（cwd）不能为空");
+    if (!cwd) {
+        throw new SchedulerValidationError("empty_cwd", "执行目标项目（cwd）不能为空", "Target project directory (cwd) cannot be empty");
+    }
     const kind = input.kind === "interval" ? "interval" : "cron";
     let spec;
     if (kind === "cron") {
         spec = String(input.spec ?? "")
             .trim()
             .replace(/\s+/g, " ");
-        if (!parseCronSpec(spec))
-            throw new Error("cron 表达式非法（要 5 字段：分 时 日 月 周，如 0 9 * * *）");
+        if (!parseCronSpec(spec)) {
+            throw new SchedulerValidationError("invalid_cron", "cron 表达式非法（要 5 字段：分 时 日 月 周，如 0 9 * * *）", "Invalid cron expression (requires 5 fields: min hour day month weekday, e.g. 0 9 * * *)");
+        }
     }
     else {
         const ms = Math.floor(Number(input.spec));
-        if (!Number.isFinite(ms) || ms <= 0)
-            throw new Error("间隔毫秒数非法");
-        if (ms < SCHEDULER_MIN_INTERVAL_MS)
-            throw new Error(`间隔太短（最短 ${SCHEDULER_MIN_INTERVAL_MS / 1000}s，防 token 烧穿）`);
-        if (ms > SCHEDULER_MAX_INTERVAL_MS)
-            throw new Error("间隔太长（最长 30 天）");
+        if (!Number.isFinite(ms) || ms <= 0) {
+            throw new SchedulerValidationError("invalid_interval", "间隔毫秒数非法", "Invalid interval milliseconds");
+        }
+        if (ms < SCHEDULER_MIN_INTERVAL_MS) {
+            throw new SchedulerValidationError("interval_too_short", `间隔太短（最短 ${SCHEDULER_MIN_INTERVAL_MS / 1000}s，防 token 烧穿）`, `Interval too short (minimum ${SCHEDULER_MIN_INTERVAL_MS / 1000}s)`);
+        }
+        if (ms > SCHEDULER_MAX_INTERVAL_MS) {
+            throw new SchedulerValidationError("interval_too_long", "间隔太长（最长 30 天）", "Interval too long (maximum 30 days)");
+        }
         spec = String(ms);
     }
     const prompt = String(input.prompt ?? "").trim();
-    if (!prompt)
-        throw new Error("触发指令（prompt）不能为空");
-    if (prompt.length > 8000)
-        throw new Error("触发指令超长（>8000 字），请裁剪后重试");
+    if (!prompt) {
+        throw new SchedulerValidationError("empty_prompt", "触发指令（prompt）不能为空", "Trigger instruction (prompt) cannot be empty");
+    }
+    if (prompt.length > 8000) {
+        throw new SchedulerValidationError("prompt_too_long", "触发指令超长（>8000 字），请裁剪后重试", "Trigger instruction too long (>8000 characters), please shorten and retry");
+    }
     const model = String(input.model ?? "").trim();
-    if (model && !model.includes("/"))
-        throw new Error("模型格式非法（应为 provider/id）");
+    if (model && !model.includes("/")) {
+        throw new SchedulerValidationError("invalid_model", "模型格式非法（应为 provider/id）", "Invalid model format (expected provider/id)");
+    }
     const thinkingLevel = String(input.thinkingLevel ?? "").trim();
     const catchUp = input.catchUp === "once" ? "once" : "skip";
     const conversationId = String(input.conversationId ?? "")
@@ -267,14 +290,10 @@ export class SchedulerStore {
     }
     save() {
         try {
-            mkdirSync(this.dataDir, { recursive: true });
-            const file = schedulerFile(this.dataDir);
-            const tmp = `${file}.tmp-${process.pid}`;
             const tasks = {};
             for (const [id, t] of this.tasks)
                 tasks[id] = t;
-            writeFileSync(tmp, JSON.stringify({ v: 1, tasks }));
-            renameSync(tmp, file);
+            writeJsonAtomicSync(schedulerFile(this.dataDir), { v: 1, tasks });
         }
         catch (err) {
             console.error("[scheduler] persist failed:", err);

package/dist/server/sdk-origin.js

@@ -37,6 +37,33 @@ export function sdkCopies(fromFile = import.meta.url) {
             break;
         dir = parent;
     }
+    // 显式透传的宿主 SDK 路径（如 extensions/webui.ts 宿主传递，issue #482）
+    if (process.env.PI_WEB_SDK_DIR) {
+        const pj = join(process.env.PI_WEB_SDK_DIR, "package.json");
+        if (existsSync(pj) && !out.some((c) => c.path === pj)) {
+            try {
+                const version = JSON.parse(readFileSync(pj, "utf8")).version;
+                if (typeof version === "string" && version) {
+                    out.push({ path: pj, version });
+                }
+            }
+            catch { }
+        }
+    }
+    // 宿主 Pi Node 路径探测（~/.local/share/pi-node/current/...，issue #482）
+    const home = process.env.HOME || process.env.USERPROFILE;
+    if (home) {
+        const hostPj = join(home, ".local", "share", "pi-node", "current", "lib", "node_modules", PKG, "package.json");
+        if (existsSync(hostPj) && !out.some((c) => c.path === hostPj)) {
+            try {
+                const version = JSON.parse(readFileSync(hostPj, "utf8")).version;
+                if (typeof version === "string" && version) {
+                    out.push({ path: hostPj, version });
+                }
+            }
+            catch { }
+        }
+    }
     return out;
 }
 /** 点分版本号比较（够用即可：只比数字段，缺位当 0）。 */

package/dist/server/serialize.js

@@ -1,6 +1,7 @@
-const TEXT_CAP = 200_000;
-const TOOL_OUTPUT_CAP = 100_000;
-const ARGS_CAP = 20_000;
+import { splitQuotedPrompt } from "./text-quote.js";
+export const TEXT_CAP = 200_000;
+export const TOOL_OUTPUT_CAP = 100_000;
+export const ARGS_CAP = 20_000;
 /**
  * toolResult 里单张图片进快照的上限（dataUrl 字符数 ≈ 1.5MB 二进制）。
  * 视口/元素截图随便过；超大整页截图回落成占位文本（模型侧不受影响 —— 图它
@@ -17,10 +18,11 @@ const TOOL_RESULT_IMAGE_MAX = 8;
  * 前端还得写容错）；工具作者应自己封顶（见 present-files-tool.ts 的摘录预算）。
  */
 const TOOL_DETAILS_CAP = 64_000;
-function truncate(s, cap) {
-    if (s.length <= cap)
-        return { text: s, truncated: false };
-    return { text: `${s.slice(0, cap)}\n\n… [truncated]`, truncated: true };
+export function truncate(s, cap) {
+    const str = typeof s === "string" ? s : String(s ?? "");
+    if (str.length <= cap)
+        return { text: str, truncated: false };
+    return { text: `${str.slice(0, cap)}\n\n… [truncated]`, truncated: true };
 }
 /**
  * SDK/工具的图片块 → 前端可直接 <img> 的 UiImageBlock。
@@ -204,13 +206,24 @@ export function serializeMessage(m, seq) {
     }
     const id = uiMessageId(m, seq);
     switch (m.role) {
-        case "user":
+        case "user": {
+            const quotes = [];
+            const raw = typeof m.content === "string" ? [{ type: "text", text: m.content }] : m.content;
+            const content = raw.map((block) => {
+                if (block.type !== "text")
+                    return block;
+                const parsed = splitQuotedPrompt(block.text);
+                quotes.push(...parsed.quotes);
+                return { ...block, text: parsed.text };
+            });
             return {
                 id,
                 role: "user",
-                content: serializeUserContent(m.content),
+                content: serializeUserContent(content),
+                ...(quotes.length ? { details: { quotes } } : {}),
                 timestamp: m.timestamp,
             };
+        }
         case "assistant":
             return {
                 id,

package/dist/server/slash-commands.js

@@ -38,6 +38,13 @@ export const NATIVE_COMMANDS = [
         argumentHint: "<路径>",
         argumentHintEn: "<path>",
     },
+    {
+        name: "plan",
+        description: "开启或关闭计划模式（/plan [on|off]）",
+        descriptionEn: "Toggle plan mode (/plan [on|off])",
+        argumentHint: "[on|off]",
+        argumentHintEn: "[on|off]",
+    },
     {
         name: "thinking",
         description: "设置思考强度",
@@ -249,6 +256,15 @@ export class SlashCommandsService {
                     await this.host.setCwd(args);
                 }
                 return true;
+            case "plan": {
+                const trimmed = args.trim().toLowerCase();
+                const current = this.host.getPlanMode ? this.host.getPlanMode() : false;
+                const next = trimmed === "on" ? true : trimmed === "off" ? false : !current;
+                if (this.host.setPlanMode) {
+                    await this.host.setPlanMode(next);
+                }
+                return true;
+            }
             case "thinking": {
                 const ALIAS = {
                     off: "off",

package/dist/server/subagent-templates.js

@@ -19,8 +19,8 @@
  * systemPromptEn 为英文（en 用，缺失回落中文）；调用方用 pickTemplateDescription/
  * pickTemplatePrompt 按语言选用。
  */
-import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { readFileSync } from "node:fs";
+import { writeJsonAtomicSync } from "./atomic-file.js";
 /**
  * 思考强度取值：与 SDK 的 THINKING_LEVEL_OPTIONS（前端 ModelThinking 的 THINKING_VALUES）
  * 一致。SDK 未从包根导出该常量，这里照抄一份作输入校验（写错的值一律当未配置）。
@@ -608,10 +608,7 @@ export class SubagentTemplatesStore {
     }
     persist() {
         try {
-            mkdirSync(dirname(this.filePath), { recursive: true });
-            const tmp = `${this.filePath}.${process.pid}.tmp`;
-            writeFileSync(tmp, JSON.stringify(this.templates, null, 2) + "\n");
-            renameSync(tmp, this.filePath);
+            writeJsonAtomicSync(this.filePath, this.templates);
         }
         catch {
             // best effort
@@ -644,10 +641,7 @@ export class SubagentTemplatesStore {
     saveSeeded(names) {
         this.seededNames = names;
         try {
-            mkdirSync(dirname(this.seededPath()), { recursive: true });
-            const tmp = `${this.seededPath()}.tmp`;
-            writeFileSync(tmp, JSON.stringify([...names].sort(), null, 2));
-            renameSync(tmp, this.seededPath());
+            writeJsonAtomicSync(this.seededPath(), [...names].sort());
         }
         catch {
             // best effort

package/dist/server/subagents.js

@@ -31,14 +31,22 @@ import { pick } from "./i18n.js";
 /**
  * subagent_wait_all 的最长阻塞时间：必须短暂低于工具看门狗（默认 20 分钟，
  * PI_WEB_TOOL_TIMEOUT_MS 可调），否则看门狗会先中止整个会话而不是让 wait
- * 干净地超时返回。取 0.8×看门狗并以 60s 封顶、5s 兜底：看门狗调小（如 <75s）
- * 时 60s 下限会反超看门狗造成本末倒置，此时随看门狗缩短，但不低于 5s。
+ * 干净地超时返回。取 0.8×看门狗（默认 ~16min，支持 PI_WEB_SUBAGENT_WAIT_CAP_SECONDS 覆盖），
+ * 兜底不低于 5s。
  */
-const WAIT_CAP_MS = (() => {
-    const v = Number(process.env.PI_WEB_TOOL_TIMEOUT_MS);
-    const watchdog = Number.isFinite(v) && v > 0 ? v : 20 * 60_000;
-    return Math.max(Math.min(60_000, Math.floor(watchdog * 0.8)), 5_000);
-})();
+export function computeWaitCapMs(watchdogMs) {
+    const customSecs = Number(process.env.PI_WEB_SUBAGENT_WAIT_CAP_SECONDS);
+    if (Number.isFinite(customSecs) && customSecs > 0) {
+        return Math.max(Math.floor(customSecs * 1000), 5_000);
+    }
+    const envWatchdog = Number(process.env.PI_WEB_TOOL_TIMEOUT_MS);
+    const watchdog = typeof watchdogMs === "number" && Number.isFinite(watchdogMs) && watchdogMs > 0
+        ? watchdogMs
+        : Number.isFinite(envWatchdog) && envWatchdog > 0
+            ? envWatchdog
+            : 20 * 60_000;
+    return Math.max(Math.floor(watchdog * 0.8), 5_000);
+}
 /** 子代理是否已到终态（运行结束、被中止或出错）。wait 工具据此判断
  * 是否可以取结果；streaming=false 即可（error/canceled 都在快照里带标记）。 */
 export function isSubagentTerminal(r) {
@@ -93,8 +101,8 @@ export function makeSubagentTool(host, lang, selfConvId) {
         details,
     });
     const currentWaitCapMs = typeof host.getWatchdogTimeoutMs === "function"
-        ? Math.max(Math.min(60_000, Math.floor(host.getWatchdogTimeoutMs() * 0.8)), 5_000)
-        : WAIT_CAP_MS;
+        ? computeWaitCapMs(host.getWatchdogTimeoutMs())
+        : computeWaitCapMs();
     const capSeconds = Math.floor(currentWaitCapMs / 1000);
     return defineTool({
         name: SUBAGENT_TOOL_NAME,
@@ -361,7 +369,10 @@ export function makeSubagentTool(host, lang, selfConvId) {
                         }
                         const allDone = Array.from(wanted).every((id) => {
                             const r = host.getSubagent(id);
-                            return isSubagentTerminal(r);
+                            // #488：getSubagent 返回 undefined = 已被移出（强行关闭/收尾清理）
+                            // ——视为终态，与下方报告段「已移出或不存在」口径一致；否则等待
+                            // 集合含被移出子代理时 allDone 恒 false，必然白等满 timeoutMs。
+                            return r === undefined || isSubagentTerminal(r);
                         });
                         if (allDone)
                             break;
@@ -534,5 +545,5 @@ function promptRemaining(remaining, lang = "en") {
     if (remaining.length === 0)
         return "";
     const pendingIds = remaining.map(shortId).join(", ");
-    return pick(lang, `\n未完成：${pendingIds}。可再次调用 subagent_wait_all（或 subagent_steer 补充指令 / subagent_stop 中止）。`, `\nPending: ${pendingIds}. You may call subagent_wait_all again (or subagent_steer to add instructions / subagent_stop to abort).`, "subagents.wait.pending", { pendingIds: pendingIds });
+    return pick(lang, `\n未完成：${pendingIds}。可再次调用 subagent（action="wait_all"）继续等待耗时任务，或使用 steer 补充指令 / stop 中止。`, `\nPending: ${pendingIds}. You may call subagent (action="wait_all") again to continue waiting for long tasks, or use steer to add instructions / stop to abort.`, "subagents.wait.pending", { pendingIds: pendingIds });
 }

package/dist/server/terminals.js

@@ -1580,28 +1580,35 @@ function cleanBashOutput(raw) {
 /** 一次性 bash 终端序号：非持久调用每次新建一个终端，进程结束后退出、输出
  *  保留在 history 供查阅——故每调用独立 id，避免复用覆盖旧输出。 */
 let oneShotBashSeq = 0;
+/** head / tail 的运行时上限，与 bash 工具参数 schema 的 maximum 5000 一致
+ *  （agent-service.ts）——schema 只影响提示不拦运行时（issue #462）。 */
+const MAX_HEAD_TAIL_LINES = 5000;
 /** 应用 head / tail 参数到输出顶层行（替代 `| head` / `| tail` 管道——管道会
  *  缓冲输出、让可见终端全程哑火，还容易白白触发静默解阻）。两者同时给时先
  *  截头再截尾。 */
 export function applyHeadTail(text, head, tail, lang = "en") {
+    // 入口钳到 schema 上限：此前只判 >0，传 1e9 会把整段缓冲灌进单条工具结果
+    // 并持久化进转录。
+    const headN = head && head > 0 ? Math.min(Math.floor(head), MAX_HEAD_TAIL_LINES) : 0;
+    const tailN = tail && tail > 0 ? Math.min(Math.floor(tail), MAX_HEAD_TAIL_LINES) : 0;
     // 只对真实数据行切片；省略提示行单独存，最后再包回输出，避免提示行在
     // head+tail 组合时被当成数据行参与第二次截取（导致尾部少截一行）。
     let data = text.split("\n");
     let headNote = null;
     let tailNote = null;
-    if (head && head > 0 && data.length > head) {
-        const n = data.length - head;
+    if (headN && data.length > headN) {
+        const n = data.length - headN;
         headNote = pick(lang, `…（后 ${n} 行已省略）`, `…[${n} lines omitted below]…`, "terminals.headtail.omitted.below", {
             n,
         });
-        data = data.slice(0, head);
+        data = data.slice(0, headN);
     }
-    if (tail && tail > 0 && data.length > tail) {
-        const n = data.length - tail;
+    if (tailN && data.length > tailN) {
+        const n = data.length - tailN;
         tailNote = pick(lang, `…（前 ${n} 行已省略）`, `…[${n} lines omitted above]…`, "terminals.headtail.omitted.above", {
             n,
         });
-        data = data.slice(-tail);
+        data = data.slice(-tailN);
     }
     const parts = [];
     if (tailNote)
@@ -1889,7 +1896,9 @@ lang, options) {
             }),
             execute: async (_id, p) => {
                 const lang = getLang();
-                const info = terminals.create(p.terminalId, p.cwd ?? cwd, p.cols ?? 120, p.rows ?? 40, cwd, p.terminalId);
+                const safeCols = Math.max(2, Math.min(500, Math.floor(p.cols ?? 120)));
+                const safeRows = Math.max(2, Math.min(200, Math.floor(p.rows ?? 40)));
+                const info = terminals.create(p.terminalId, p.cwd ?? cwd, safeCols, safeRows, cwd, p.terminalId);
                 const infoJson = JSON.stringify(info);
                 if (!info)
                     throw new Error(pick(lang, `创建终端失败：${p.terminalId}`, `Failed to create terminal: ${p.terminalId}`, "terminals.create.failed", { "p.terminalId": p.terminalId }));
@@ -1977,10 +1986,12 @@ lang, options) {
             }),
             execute: async (_id, p, signal) => {
                 const lang = getLang();
-                const cursor = p.cursor ?? 0;
-                if (p.waitMs)
-                    await terminals.waitForOutput(p.terminalId, cursor, p.waitMs, signal);
-                const read = terminals.read(p.terminalId, cursor, p.maxBytes ?? 20000);
+                const cursor = Math.max(0, Math.floor(p.cursor ?? 0));
+                const waitMs = p.waitMs !== undefined ? Math.max(0, Math.min(120_000, Math.floor(p.waitMs))) : undefined;
+                const maxBytes = Math.max(1, Math.min(100_000, Math.floor(p.maxBytes ?? 20000)));
+                if (waitMs)
+                    await terminals.waitForOutput(p.terminalId, cursor, waitMs, signal);
+                const read = terminals.read(p.terminalId, cursor, maxBytes);
                 if (!read)
                     throw new Error(pick(lang, `终端不存在：${p.terminalId}`, `Terminal not found: ${p.terminalId}`, "terminals.read.not.found", { "p.terminalId": p.terminalId }));
                 return result(JSON.stringify(read), read);
@@ -2019,7 +2030,8 @@ lang, options) {
                     return result(JSON.stringify({ applicable: false, reason: why }), { applicable: false });
                 }
                 const cursor = p.cursor ?? terminals.endCursor(p.terminalId) ?? 0;
-                const wait = await terminals.waitForCompletion(p.terminalId, p.maxWaitMs ?? 300_000, signal, cursor);
+                const maxWait = Math.max(100, Math.min(600_000, Math.floor(p.maxWaitMs ?? 300_000)));
+                const wait = await terminals.waitForCompletion(p.terminalId, maxWait, signal, cursor);
                 const read = terminals.read(p.terminalId, cursor, 20_000);
                 const outputTail = read?.data ? stripAnsi(read.data).slice(-4000) : "";
                 return result(JSON.stringify({ ...wait, outputTail }), {

package/dist/server/text-quote.js

@@ -0,0 +1,59 @@
+/** 校验引用元数据，保留原文的换行和缩进。 */
+export function readTextQuote(value) {
+    if (!value || typeof value !== "object")
+        return null;
+    const q = value;
+    if (typeof q.text !== "string" ||
+        !q.text.trim() ||
+        typeof q.messageId !== "string" ||
+        !q.messageId ||
+        typeof q.role !== "string" ||
+        !q.role)
+        return null;
+    return {
+        text: q.text,
+        messageId: q.messageId,
+        role: q.role,
+        ...(typeof q.sessionId === "string" && q.sessionId ? { sessionId: q.sessionId } : {}),
+    };
+}
+/** JSON 字符串保留原文边界，引用中的换行不参与外层标记解析。 */
+export function formatTextQuote(quote) {
+    return `<quoted-text>\n${JSON.stringify(quote)}\n</quoted-text>`;
+}
+export function parseTextQuote(text) {
+    const match = /^<quoted-text>\n([^\n]*)\n<\/quoted-text>$/.exec(text);
+    if (!match)
+        return null;
+    try {
+        return readTextQuote(JSON.parse(match[1]));
+    }
+    catch {
+        return null;
+    }
+}
+export function formatQuotedPrompt(text, quotes) {
+    return [text, ...quotes.map(formatTextQuote)].join("\n\n");
+}
+/** 排队项把引用与提问一起保存；展示时只拆分末尾的完整引用块。 */
+export function splitQuotedPrompt(value) {
+    let text = value;
+    const quotes = [];
+    while (true) {
+        const match = /(?:^|\n\n)(<quoted-text>\n[^\n]*\n<\/quoted-text>)$/.exec(text);
+        const quote = match ? parseTextQuote(match[1]) : null;
+        if (!match || !quote)
+            break;
+        quotes.unshift(quote);
+        text = text.slice(0, match.index);
+    }
+    return { text, quotes };
+}
+export function messageTextWithQuotes(message) {
+    const text = message.content
+        .map((block) => (block.type === "text" && typeof block.text === "string" ? block.text : ""))
+        .join("\n");
+    const values = message.details?.quotes;
+    const quotes = Array.isArray(values) ? values.map(readTextQuote).filter((q) => q !== null) : [];
+    return formatQuotedPrompt(text, quotes);
+}

package/dist/server/tool-manager.js

@@ -345,10 +345,19 @@ export function applyAgentToolsGating(session, disabled, preset) {
         const allNames = session.getAllTools().map((t) => t.name);
         const names = new Set(allNames);
         for (const t of AGENT_TOOL_CATALOG) {
-            if (off.has(t.name))
-                names.delete(t.name);
-            else
+            if (off.has(t.name)) {
+                // issue #481: 若第三方扩展注册了同名工具（如 nicobailon/pi-subagents 的 subagent），
+                // 关闭内置工具时允许扩展工具透传，不从活跃名单删除
+                const hasExtensionTool = Boolean(session?.extensionRunner
+                    ?.getAllRegisteredTools?.()
+                    ?.some((tool) => tool.definition?.name === t.name));
+                if (!hasExtensionTool) {
+                    names.delete(t.name);
+                }
+            }
+            else {
                 names.add(t.name);
+            }
         }
         for (const core of CORE_BUILTIN_TOOL_NAMES) {
             if (off.has(core))

package/dist/server/tool-overrides.js

@@ -57,3 +57,27 @@ export function installToolOverrides(session, specs) {
     session._refreshToolRegistry();
     return [...names];
 }
+/**
+ * 同步 subagent 工具与第三方扩展的同名工具共存（issue #481）：
+ * 当第三方扩展注册了同名 subagent 时，若用户在设置中关闭/禁用了内置 subagent，
+ * 则自动从 session._customTools 中移除内置 subagent，让扩展的同名工具透传生效；
+ * 重新启用时则重新注入内置 subagent。
+ */
+export function syncSubagentOverride(session, subagentDisabled, builtinSubagentTool) {
+    if (!Array.isArray(session._customTools) || typeof session._refreshToolRegistry !== "function")
+        return;
+    const hasExtensionTool = Boolean(extensionToolDefinition(session, "subagent"));
+    if (!hasExtensionTool)
+        return;
+    const idx = session._customTools.findIndex((t) => t.name === "subagent");
+    if (subagentDisabled) {
+        if (idx !== -1) {
+            session._customTools = session._customTools.filter((t) => t.name !== "subagent");
+            session._refreshToolRegistry();
+        }
+    }
+    else if (idx === -1 && builtinSubagentTool) {
+        session._customTools = [builtinSubagentTool(), ...session._customTools];
+        session._refreshToolRegistry();
+    }
+}