pi-web-ui 0.96.1 → 0.98.0

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

@@ -15,39 +15,13 @@ function parseId(raw) {
     const n = Number(raw);
     return Number.isInteger(n) && n > 0 ? n : null;
 }
-function formatStatus(s) {
-    switch (s) {
-        case "pending":
-            return "pending";
-        case "in_progress":
-            return "in_progress";
-        case "completed":
-            return "completed";
-        default:
-            return s;
-    }
-}
-export function describeTodos(state, includeDeleted = false, lang = "en") {
-    const visible = state.tasks.filter((t) => includeDeleted || t.status !== "deleted");
-    if (visible.length === 0)
-        return pick(lang, "[todo] （空）", "[todo] (empty)", "markers.todo.list.empty");
-    return visible
-        .map((t) => {
-        const form = t.status === "in_progress" && t.activeForm ? ` (${t.activeForm})` : "";
-        const deps = t.blockedBy.length ? ` ⛓ ${t.blockedBy.join(",")}` : "";
-        return `[${formatStatus(t.status)}] #${t.id} ${t.subject}${form}${deps}`;
-    })
-        .join("\n");
-}
 const TODO_GUIDANCE_ZH = [
-    "# 内联标记工具（状态类操作请写在回答正文，不要调用工具）",
     "- 标记语法：[[todo:new:<主题>]] 新建；[[todo:set:<id>,completed|in_progress|pending]] 状态；[[todo:remove:<id>]] 删除；[[todo:dep:<id>,blocks=<依赖id,逗号分隔>]] 设依赖。",
     "- 状态变化全部用上面的 [[todo:...]] 内联标记表达，不会中断回答，无需等待返回。",
     "- 想查看/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 `todo_list` tool (the read path goes through the tool) when you want to list the current tasks.",
@@ -66,7 +40,9 @@ export const todoMarker = {
         const op = token.op;
         switch (op) {
             case "new": {
-                const subject = token.args[0]?.trim();
+                // #499：subject 是唯一「整段自由文本」参数——args.join 还原含逗号的主题，
+                // 否则 `[[todo:new:修复登录页,同步改注册页]]` 的后半段被静默丢弃。
+                const subject = token.args.join(",").trim();
                 if (!subject)
                     return {
                         applied: false,
@@ -181,7 +157,9 @@ export const todoMarker = {
                 const depsText = deps.length ? deps.join(",") : lang === "zh" ? "（无）" : "(none)";
                 return {
                     applied: true,
-                    feedback: pick(lang, `#${id} 依赖：${depsText}`, `#${id} blocks: ${depsText}`, "markers.todo.dep.blocks.updated", { id: id, depsText: depsText }),
+                    feedback: pick(lang, `#${id} 依赖：${depsText}`, 
+                    // #499：实现是 blockedBy（deps 先完成）——原英文 "blocks" 把依赖方向说反了。
+                    `#${id} is blocked by: ${depsText}`, "markers.todo.dep.blocks.updated", { id: id, depsText: depsText }),
                 };
             }
             default:

package/dist/server/markers/marker.js

@@ -2,8 +2,6 @@
  * marker.ts — 通用内联标记核心抽象（内置版）。
  * 复刻自 pi-marker-tools，保持相同解析语义，便于 AI 无缝迁移。
  */
-export const MARKER_OPEN = "[[";
-export const MARKER_CLOSE = "]]";
 // ---------------------------------------------------------------------------
 // 解析器
 // ---------------------------------------------------------------------------
@@ -38,16 +36,3 @@ export function parseMarkers(text) {
     }
     return tokens;
 }
-export function stripMarkers(text) {
-    return text.replace(TOKEN_RE, () => "");
-}
-export function replaceToken(text, raw, replacement) {
-    return text.split(raw).join(replacement);
-}
-export function serializeToken(token) {
-    const parts = [token.tool, token.op, ...token.args];
-    const kwargs = Object.entries(token.kwargs)
-        .sort(([a], [b]) => (a < b ? -1 : 1))
-        .map(([k, v]) => `${k}=${v}`);
-    return `${MARKER_OPEN}${[...parts, ...kwargs].join(":")}${MARKER_CLOSE}`;
-}

package/dist/server/markers/registry.js

@@ -11,9 +11,6 @@ export function getMarker(name) {
 export function allMarkers() {
     return [...registry.values()];
 }
-export function lookupToken(name) {
-    return registry.get(name);
-}
 export function collectGuidance(disabled = new Set(), lang = "en") {
     const out = [];
     for (const m of allMarkers()) {

package/dist/server/markers/store.js

@@ -23,9 +23,6 @@ export function loadStateFromBranch(branch, namespace) {
     }
     return latest?.state;
 }
-export function hasStateInBranch(branch, namespace) {
-    return loadStateFromBranch(branch, namespace) !== undefined;
-}
 /** 追加快照：优先走 sessionManager.appendCustomEntry，否则回退到回调。 */
 export function appendSnapshot(mgr, namespace, state, fallbackSave) {
     const snapshot = {

package/dist/server/mcp-bridge.js

@@ -393,12 +393,25 @@ function adaptMcpTool(serverName, mcpTool, client) {
         name,
         label: `${serverName} · ${mcpTool.name}`,
         description: mcpTool.description ?? `Tool ${mcpTool.name} provided by MCP server "${serverName}"`,
+        // 无 snippet 的工具不会进系统提示词的「Available tools」清单（SDK 只列有
+        // snippet 的工具），MCP 工具会变成 schema-only：模型读清单以为自己没有
+        // 这个能力（#403）。这里从 description 提取首句做极简 snippet。
+        promptSnippet: firstSentenceSnippet(mcpTool.description) ?? `MCP tool ${mcpTool.name} (server: ${serverName})`,
         parameters: mcpTool.inputSchema ?? {},
         execute: async (_toolCallId, params, _signal) => {
             return client.call(mcpTool.name, params ?? {});
         },
     };
 }
+/** 从 MCP 工具 description 提取首句做 promptSnippet（≤100 字符）；空描述返回 undefined。 */
+function firstSentenceSnippet(description) {
+    const text = (description ?? "").replace(/\s+/g, " ").trim();
+    if (!text)
+        return undefined;
+    const cut = text.search(/[.。!?！?]/);
+    const head = cut > 0 ? text.slice(0, cut + 1) : text;
+    return head.length > 100 ? `${head.slice(0, 99)}…` : head;
+}
 /** 工具名必须是 [A-Za-z0-9_-]+（与插件工具同规则），MCP 可能含冒号/斜杠 — 归一化。 */
 function sanitizeToolName(name) {
     const cleaned = (name || "").replace(/[^A-Za-z0-9_-]/g, "_");

package/dist/server/mcp-hot-reload.js

@@ -31,15 +31,22 @@ export function createMcpHotReload(deps) {
     let debounce = null;
     let poller = null;
     let watcher = null;
-    /** 读一次磁盘：指纹 + 清单（`servers` 为 null = 坏配置）。文件不在按「没有服务器」算。 */
+    /** 读一次磁盘：指纹 + 清单（`servers` 为 null = 坏配置/读失败）。文件不在按「没有服务器」算。 */
     function readOnce() {
         let raw;
         try {
             raw = readFileSync(file, "utf8");
         }
-        catch {
-            // 读不到（文件/目录不在）→ 空配置：删掉 mcp.json 就是「关掉全部 MCP 服务器」。
-            return { fp: "empty", servers: {} };
+        catch (err) {
+            // 不变量 3 只覆盖「文件不在」：删掉 mcp.json = 关掉全部 MCP 服务器。
+            // #497：EBUSY/EACCES 等临时读失败（OneDrive/杀毒独占、权限误改）既不是
+            // 坏配置也不是删除意图——按坏配置口径走（servers: null → 保留在跑的
+            // 服务器 + 一次性提示），否则会把在跑的 MCP 服务器全杀还报「成功 0 个」。
+            const code = err?.code;
+            if (code === "ENOENT")
+                return { fp: "empty", servers: {} };
+            log(`[mcp] mcp.json 读取失败（${code ?? String(err)}），按坏配置处理：保留在跑的 MCP 服务器`);
+            return { fp: `unreadable:${code ?? "unknown"}`, servers: null };
         }
         const parsed = parseMcpConfig(raw);
         if (!parsed)
@@ -54,7 +61,7 @@ export function createMcpHotReload(deps) {
         applied = fp;
         if (!servers) {
             log("[mcp] mcp.json 解析失败，保留在跑的 MCP 服务器");
-            deps.onNotice?.("warning", "mcp.json 解析失败，已保留当前 MCP 服务器（改好保存后会自动重载）", "Failed to parse mcp.json — keeping the running MCP servers (saving a valid file reloads automatically)");
+            deps.onNotice?.("warning", "mcp.json 解析/读取失败，已保留当前 MCP 服务器（恢复可读后会自动重载）", "Failed to parse/read mcp.json — keeping the running MCP servers (it reloads automatically once readable)");
             return "invalid";
         }
         const summary = await deps.reload();

package/dist/server/model-admin.js

@@ -11,8 +11,9 @@
  * 经 ModelAdminHost 与 ClientSession 解耦（同 settings/goal/slash 服务模式）。
  * UI 文案直接中文（服务端 notice 约定）。apiKey/headers 绝不下发浏览器。
  */
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, renameSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { writeJsonAtomicSync } from "./atomic-file.js";
 import { enrichBatch } from "./model-enrich.js";
 import { pick } from "./i18n.js";
 import { ProviderOAuthFlowManager } from "./provider-oauth-flow.js";
@@ -65,12 +66,9 @@ export function graduateOverlayModels(providers, official) {
     }
     return graduated;
 }
-/** 原子写 JSON（tmp + rename）：进程崩溃不留半截文件——裸 writeFileSync 中途被
- *  杀会把整份配置截断，下次读盘即空表。tmp 名带 pid，避免同机多进程互踩。 */
+/** 原子写 JSON（tmp + rename）：进程崩溃不留半截文件。 */
 function atomicWriteJson(path, data) {
-    const tmp = `${path}.${process.pid}.tmp`;
-    writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n");
-    renameSync(tmp, path);
+    writeJsonAtomicSync(path, data);
 }
 /** Strip // and /* *\/ comments without touching string literals (URLs contain //). */
 function stripJsonComments(src) {
@@ -378,13 +376,8 @@ export class ModelAdminService {
         return out;
     }
     writeProviderKeys(data) {
-        mkdirSync(this.host.agentDir, { recursive: true });
-        // 原子写（tmp+rename）：崩溃不留半截 JSON；0o600 限权防本机其他用户读密钥
-        //（Windows 忽略 mode 无害，POSIX 生效）。
-        const path = this.providerKeysPath();
-        const tmp = `${path}.${process.pid}.tmp`;
-        writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n", { mode: 0o600 });
-        renameSync(tmp, path);
+        // 原子写（tmp+rename）：崩溃不留半截 JSON。
+        writeJsonAtomicSync(this.providerKeysPath(), data);
     }
     /** 解析失败的配置文件改名留存为 <name>.corrupt-<timestamp>。改名失败（占用/
      *  跨盘等）也不抛——留存是尽力而为，绝不能阻塞主流程。 */
@@ -1461,7 +1454,15 @@ export class ModelAdminService {
             }
             const fetched = await ModelAdminService.probeModelsEndpoint(baseUrl, saved.apiKey, saved.authHeader === true ? true : undefined, saved.api, saved.headers, lang);
             // Merge: manual values win; fetched fills blanks and appends new ids.
-            const prev = new Map((saved.models ?? []).map((m) => [m.id, m]));
+            // #486：probe 是数秒级网络 await，期间用户可能已在设置面板编辑同一服务商——
+            // 以盘上最新条目为合并基准（旧快照 saved 只提供探测参数），否则刷新会用
+            // 旧快照整表覆盖，静默回滚并发编辑（删除的模型复活、手动新增丢失）。
+            const fresh = this.readModelsConfig().providers[pid];
+            if (!fresh) {
+                // probe 期间服务商被删除：不再写回，避免用旧快照复活已删除的条目。
+                return done(false, { error: "provider deleted during refresh" });
+            }
+            const prev = new Map((fresh.models ?? []).map((m) => [m.id, m]));
             let added = 0;
             for (const f of fetched) {
                 const cur = prev.get(f.id);
@@ -1478,11 +1479,11 @@ export class ModelAdminService {
             const merged = [...prev.values()].sort((a, b) => a.id.localeCompare(b.id));
             await this.saveModelConfig(pid, {
                 providerId: pid,
-                name: saved.name,
-                api: saved.api,
-                baseUrl: saved.baseUrl,
+                name: fresh.name,
+                api: fresh.api,
+                baseUrl: fresh.baseUrl,
                 // apiKey/headers 不回传浏览器——saveModelConfig 会保留旧值
-                authHeader: saved.authHeader === true ? true : undefined,
+                authHeader: fresh.authHeader === true ? true : undefined,
                 models: merged,
             });
             this.host.emit({

package/dist/server/model-enrich.js

@@ -159,9 +159,6 @@ async function fetchJson(fetchFn, url, maxBytes, timeoutMs, signal) {
 /** 目录抓取缓存（24h TTL，进程内；首跑后无感）。 */
 const catalogCache = new Map();
 const CATALOG_TTL_MS = 24 * 3600 * 1000;
-export function clearEnrichCache() {
-    catalogCache.clear();
-}
 export async function getOpenRouterCatalog(fetchFn = fetch, signal) {
     const hit = catalogCache.get("openrouter");
     if (hit && Date.now() - hit.at < CATALOG_TTL_MS)

package/dist/server/patch-tool.js

@@ -11,13 +11,16 @@
 import { resolve } from "node:path";
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { applyHashlinePatch, computeFileHash, formatHashlineHeader, formatNumberedLines, globalSnapshotStore, } from "./hashline-engine.js";
+import { pick } from "./i18n.js";
+import { applyHashlinePatch, formatHashlineHeader, globalSnapshotStore, } from "./hashline-engine.js";
 import { getLiveLspDiagnostics } from "./lsp-tool.js";
 export const PATCH_TOOL_NAME = "patch";
 export function makePatchTool(options) {
     const cwd = options.cwd;
+    const getLang = options.lang ?? (() => "en");
     return defineTool({
         name: PATCH_TOOL_NAME,
+        promptSnippet: "apply content-hashed, line-anchored patches to workspace files (prevents stale edits, line drift, and indentation hallucination)",
         label: "Apply Hashline patch",
         description: `Apply content-hashed, line-anchored patches to workspace files — prevents stale edits, line drift, and indentation hallucination.
 Each file section starts with \`[path#TAG]\` (or \`[path]\` if the hash is unknown yet). Operations:
@@ -33,10 +36,13 @@ On divergence the engine attempts a 3-way merge. After success the tool returns
                 description: "The complete Hashline patch text containing one or more [path#TAG] sections with PUT/CUT/REM/MV operations.",
             }),
             timeout: Type.Optional(Type.Number({
-                description: "Optional execution timeout in seconds.",
+                minimum: 1,
+                maximum: 300,
+                description: "Optional execution timeout in seconds (1-300).",
             })),
         }),
         async execute(_callId, params, _signal, _onUpdate, _ctx) {
+            const L = getLang();
             const patchText = typeof params?.patch === "string" ? params.patch : "";
             if (!patchText.trim()) {
                 const emptyReport = {
@@ -46,7 +52,12 @@ On divergence the engine attempts a 3-way merge. After success the tool returns
                     error: "Empty patch",
                 };
                 return {
-                    content: [{ type: "text", text: "Error: No patch content provided." }],
+                    content: [
+                        {
+                            type: "text",
+                            text: pick(L, "错误：未提供任何 patch 补丁内容。", "Error: No patch content provided."),
+                        },
+                    ],
                     details: emptyReport,
                 };
             }
@@ -56,7 +67,12 @@ On divergence the engine attempts a 3-way merge. After success the tool returns
             });
             if (!report.ok) {
                 return {
-                    content: [{ type: "text", text: `Patch Failed:\n${report.summary}` }],
+                    content: [
+                        {
+                            type: "text",
+                            text: pick(L, `补丁应用失败：\n${report.summary}`, `Patch Failed:\n${report.summary}`),
+                        },
+                    ],
                     details: report,
                 };
             }
@@ -65,12 +81,12 @@ On divergence the engine attempts a 3-way merge. After success the tool returns
             for (const r of report.results) {
                 if (r.op !== "deleted" && r.newHash) {
                     const targetPath = r.newPath || r.filePath;
-                    textOutput.push(`\nNext edit anchor for ${targetPath}: \`${formatHashlineHeader(targetPath, r.newHash)}\``);
+                    textOutput.push(pick(L, `\n${targetPath} 的下一处编辑锚点：\`${formatHashlineHeader(targetPath, r.newHash)}\``, `\nNext edit anchor for ${targetPath}: \`${formatHashlineHeader(targetPath, r.newHash)}\``));
                     try {
                         const fullPath = resolve(cwd, targetPath);
                         const diags = await getLiveLspDiagnostics(fullPath, cwd);
                         if (diags) {
-                            textOutput.push(`\nLive LSP diagnostics for ${targetPath}:\n${diags}`);
+                            textOutput.push(pick(L, `\n${targetPath} 的实时 LSP 诊断：\n${diags}`, `\nLive LSP diagnostics for ${targetPath}:\n${diags}`));
                         }
                     }
                     catch { }

package/dist/server/patch-turn-end-boundary.js

@@ -0,0 +1,77 @@
+/**
+ * turn_end boundary error patch for @earendil-works/pi-coding-agent (issue #411).
+ *
+ * In SDK 0.87+, when an in-flight turn is aborted or torn down before its assistant
+ * message is persisted, `_dispatchTurnEndBoundary()` in `agent-session.js` calls
+ * `this._extensionRunner.emitError({ event: "turn_end", error: "turn_end could not resolve..." })`
+ * right before returning `false`, causing false-positive extension errors to flood
+ * both the main conversation and subagents.
+ *
+ * This module idempotently patches `agent-session.js` in the installed SDK to
+ * silently skip the boundary (`return false`) without emitting an error, matching
+ * the upstream issue expectation (earendil-works/pi#10149).
+ *
+ * Same pattern as patch-remote-catalog.ts and patch-node-pty.ts: best-effort, idempotent,
+ * and skips gracefully if the SDK code structure differs or is already fixed upstream.
+ */
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { sdkCopies } from "./sdk-origin.js";
+export const TARGET_PATTERN = /if\s*\(!messageEntryId\)\s*\{\s*this\._extensionRunner\.emitError\(\{\s*extensionPath:\s*"<boundary>",\s*event:\s*"turn_end",\s*error:\s*"turn_end could not resolve the persisted assistant entry ID",\s*\}\);\s*return false;\s*\}/;
+export const PATCHED_SENTINEL = "// pi-web-ui patch (issue #411: silent turn_end on aborted turns)";
+export const REPLACEMENT = `if (!messageEntryId) {
+            ${PATCHED_SENTINEL}
+            return false;
+        }`;
+/**
+ * 纯函数：给定 agent-session.js 内容，返回打补丁后的内容。
+ * - 命中目标代码段 → 替换并返回新内容；
+ * - 已打过补丁（含 PATCHED_SENTINEL）→ 原样返回；
+ * - 目标代码段未命中（上游已修复或版本不匹配）→ 原样返回，静默跳过。
+ */
+export function patchAgentSessionSource(src) {
+    if (src.includes(PATCHED_SENTINEL)) {
+        return { patched: false, code: src };
+    }
+    if (!TARGET_PATTERN.test(src)) {
+        return { patched: false, code: src };
+    }
+    return { patched: true, code: src.replace(TARGET_PATTERN, REPLACEMENT) };
+}
+export function candidateAgentSessionFiles() {
+    const files = new Set();
+    try {
+        const entry = fileURLToPath(import.meta.resolve("@earendil-works/pi-coding-agent"));
+        files.add(join(dirname(entry), "core", "agent-session.js"));
+    }
+    catch {
+        // Ignore resolve failures
+    }
+    try {
+        for (const copy of sdkCopies()) {
+            files.add(join(dirname(copy.path), "dist", "core", "agent-session.js"));
+        }
+    }
+    catch {
+        // Ignore copy inspection failures
+    }
+    return [...files];
+}
+export function applyPatch() {
+    for (const file of candidateAgentSessionFiles()) {
+        try {
+            if (!existsSync(file))
+                continue;
+            const src = readFileSync(file, "utf8");
+            const { patched, code } = patchAgentSessionSource(src);
+            if (patched) {
+                writeFileSync(file, code, "utf8");
+            }
+        }
+        catch {
+            // best-effort
+        }
+    }
+}
+applyPatch();

package/dist/server/permission-preset.js

@@ -1,6 +1,50 @@
 /**
  * 权限预设相关辅助逻辑与会话回放。
  */
+/**
+ * 从会话 sessionManager entries 回放恢复最后设定的**计划模式**状态（同 permission/preset
+ * 的落盘口径：切会话/重载不丢）。从未设定或非布尔 → false。
+ */
+export function readPlanModeFromSession(sm) {
+    try {
+        const mgr = sm;
+        if (typeof mgr?.getEntries !== "function")
+            return false;
+        const entries = mgr.getEntries();
+        for (let i = entries.length - 1; i >= 0; i--) {
+            const e = entries[i];
+            if (e?.customType === "plan/mode" && typeof e.data?.enabled === "boolean")
+                return e.data.enabled;
+        }
+    }
+    catch {
+        // ignore
+    }
+    return false;
+}
+/**
+ * 从会话 sessionManager entries 回放恢复最后设定的**审查者模式**状态（同 plan/mode
+ * 口径：customType "delegate/mode"）。从未设定或非布尔 → false。
+ * ⚠️ 执行对话 id **不回放**：常驻执行对话是本进程内的活对象，重启后
+ * 首条请求会重新建一个（宁可多一个执行对话，也别指向一个不存在的 id）。
+ */
+export function readDelegateModeFromSession(sm) {
+    try {
+        const mgr = sm;
+        if (typeof mgr?.getEntries !== "function")
+            return false;
+        const entries = mgr.getEntries();
+        for (let i = entries.length - 1; i >= 0; i--) {
+            const e = entries[i];
+            if (e?.customType === "delegate/mode" && typeof e.data?.enabled === "boolean")
+                return e.data.enabled;
+        }
+    }
+    catch {
+        // ignore
+    }
+    return false;
+}
 /**
  * 从会话 sessionManager entries 回放恢复最后设定的权限预设（若从未设定则返回 undefined）。
  * customType 为 "permission/preset"，载荷结构为 { preset: string }。
@@ -23,3 +67,28 @@ export function readPermissionFromSession(sm) {
     }
     return undefined;
 }
+/**
+ * 从会话 sessionManager entries 回放恢复最后保存的结构化计划状态。
+ * customType 为 "plan/update" 或 "pi-web-ui/plan"，载荷结构为 { plan: PlanState }。
+ */
+export function readPlanFromSession(sm) {
+    try {
+        const mgr = sm;
+        if (typeof mgr?.getEntries !== "function")
+            return null;
+        const entries = mgr.getEntries();
+        for (let i = entries.length - 1; i >= 0; i--) {
+            const e = entries[i];
+            if (e?.type === "custom" &&
+                (e.customType === "plan/update" || e.customType === "pi-web-ui/plan") &&
+                e.data?.plan &&
+                Array.isArray(e.data.plan.steps)) {
+                return e.data.plan;
+            }
+        }
+    }
+    catch {
+        // ignore
+    }
+    return null;
+}