pi-web-ui 0.66.0 → 0.68.0

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

@@ -107,10 +107,13 @@ const DEFAULT_SETTINGS = {
     terminalToolsEnabled: true,
     terminalBash: false,
     terminalBashIdleMs: 15_000,
+    editSoftEnabled: false,
     thinkingWrap: false,
     toolsWrap: true,
     disabledPlugins: [],
     reviewPrompt: "",
+    quickPhrases: [],
+    quickPhrasesEnabled: true,
 };
 // ---------------------------------------------------------------------------
 // DshClientSession — 一个浏览器客户端
@@ -217,10 +220,13 @@ export class DshClientSession {
                 terminalToolsEnabled: savedSettings.terminalToolsEnabled,
                 terminalBash: savedSettings.terminalBash,
                 terminalBashIdleMs: savedSettings.terminalBashIdleMs,
+                editSoftEnabled: savedSettings.editSoftEnabled,
                 thinkingWrap: savedSettings.thinkingWrap,
                 toolsWrap: savedSettings.toolsWrap,
                 disabledPlugins: savedSettings.disabledPlugins ?? [],
                 reviewPrompt: savedSettings.reviewPrompt,
+                quickPhrases: savedSettings.quickPhrases ?? [],
+                quickPhrasesEnabled: savedSettings.quickPhrasesEnabled ?? true,
             };
         }
         // 第一个 conversation = 新会话（每客户端独立 sessionId，避免多标签页/多
@@ -2053,6 +2059,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            editSoftEnabled: this.settings.editSoftEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
             visionBridgeEnabled: false,
@@ -2062,8 +2069,10 @@ export class DshClientSession {
             reviewPrompt: this.settings.reviewPrompt,
             reviewDisabledSkills: [],
             disabledPlugins: this.settings.disabledPlugins,
-            defaultSystemPrompt: "",
+            promptTemplate: "",
+            promptOverrides: {},
             effectiveSystemPrompt: this.settings.customSystemPrompt,
+            promptSourceDefaults: {},
             visionBridgeDefaultPrompt: "",
             visionModels: [],
             skills: this.skillsCache,
@@ -2077,6 +2086,8 @@ export class DshClientSession {
             subagentDefaultTemplates: [],
             subagentDefaultModel: null,
             subagentModels: [],
+            quickPhrases: [...this.settings.quickPhrases],
+            quickPhrasesEnabled: this.settings.quickPhrasesEnabled,
         };
         this.emit({ type: "settings_state", settings });
     }
@@ -2095,6 +2106,8 @@ export class DshClientSession {
             this.settings.terminalBash = partial.terminalBash;
         if (partial.terminalBashIdleMs !== undefined)
             this.settings.terminalBashIdleMs = partial.terminalBashIdleMs;
+        if (partial.editSoftEnabled !== undefined)
+            this.settings.editSoftEnabled = partial.editSoftEnabled;
         if (partial.thinkingWrap !== undefined)
             this.settings.thinkingWrap = partial.thinkingWrap;
         if (partial.toolsWrap !== undefined)
@@ -2103,6 +2116,15 @@ export class DshClientSession {
             this.settings.disabledPlugins = partial.disabledPlugins;
         if (partial.reviewPrompt !== undefined)
             this.settings.reviewPrompt = partial.reviewPrompt;
+        if (partial.quickPhrases !== undefined) {
+            const seen = new Set();
+            this.settings.quickPhrases = (Array.isArray(partial.quickPhrases) ? partial.quickPhrases : [])
+                .map((p) => String(p).trim().slice(0, 200))
+                .filter((p) => p && !seen.has(p) && (seen.add(p), true))
+                .slice(0, 30);
+        }
+        if (partial.quickPhrasesEnabled !== undefined)
+            this.settings.quickPhrasesEnabled = partial.quickPhrasesEnabled;
         // 持久化（跨重连存活）。
         this.stateStore.saveSettings(this.clientId, {
             promptMode: this.settings.promptMode,
@@ -2112,10 +2134,13 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            editSoftEnabled: this.settings.editSoftEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
             disabledPlugins: this.settings.disabledPlugins,
             reviewPrompt: this.settings.reviewPrompt,
+            quickPhrases: this.settings.quickPhrases,
+            quickPhrasesEnabled: this.settings.quickPhrasesEnabled,
         });
         // 仅系统提示词变化才重启运行时（DSH_PERSONA 由 launcher env 注入）；
         // 其他设置（开关/隐藏插件等）只存不回写运行时。
@@ -2161,11 +2186,14 @@ export class DshClientSession {
             name,
             promptMode: this.settings.promptMode,
             customSystemPrompt: this.settings.customSystemPrompt,
+            promptTemplate: "",
+            promptOverrides: {},
             disabledSkills: this.settings.disabledSkills,
             disabledExtensions: this.settings.disabledExtensions,
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            editSoftEnabled: this.settings.editSoftEnabled,
             visionBridgePromptMode: "append",
             visionBridgePrompt: "",
             reviewPrompt: this.settings.reviewPrompt,
@@ -2198,6 +2226,7 @@ export class DshClientSession {
         this.settings.terminalToolsEnabled = preset.terminalToolsEnabled;
         this.settings.terminalBash = preset.terminalBash;
         this.settings.terminalBashIdleMs = preset.terminalBashIdleMs;
+        this.settings.editSoftEnabled = preset.editSoftEnabled ?? this.settings.editSoftEnabled;
         this.settings.reviewPrompt = preset.reviewPrompt ?? "";
         this.stateStore.saveSettings(this.clientId, {
             promptMode: this.settings.promptMode,
@@ -2207,6 +2236,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            editSoftEnabled: this.settings.editSoftEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
             disabledPlugins: this.settings.disabledPlugins,

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

@@ -0,0 +1,289 @@
+/**
+ * edit_soft —— 一个「不严格要求缩进」的独立编辑工具（不覆盖内置 edit）。
+ *
+ * 背景：内置 `edit` 的 oldText 必须与文件恰好匹配（含缩进/空白）。某些语言
+ * （如 JS/JSON）缩进不是语法的一部分，模型给出 oldText 时常常在缩进上与文件
+ * 差几个空格/制表符，导致编辑失败。edit_soft 用「逐行核心 = 去掉行首+行尾空白」
+ * 做宽松匹配：只要每行的内容一致、缩进不同也能命中。
+ *
+ * 语义约定：
+ * - 先试精确子串匹配（与 edit 相同）。
+ * - 精确失败后再按行宽松匹配：oldText 拆成若干行、每行取 trim 后的核心，
+ *   在文件里找一段连续行，其核心序列与 oldText 完全一致（仅唯一匹配才写）。
+ * - 命中后按「整行替换」写入 newText **原样**（AI 给的缩进就是最终缩进），
+ *   只做必要的行尾换行平衡。
+ * - 若不支持片段（oldText 不是完整行）会在严格匹配阶段返回错误提示。
+ *
+ * 开关：设置面板「编辑」页 `editSoftEnabled`（默认关）。关闭时该工具从活跃集移除。
+ */
+import { constants } from "node:fs";
+import { access, readFile, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve as nodeResolve } from "node:path";
+import { Type } from "typebox";
+import { defineTool, generateDiffString, generateUnifiedPatch, withFileMutationQueue, } from "@earendil-works/pi-coding-agent";
+export const SOFT_EDIT_TOOL_NAME = "edit_soft";
+const replaceEditSchema = Type.Object({
+    oldText: Type.String({
+        description: "要替换的文本。宽松匹配：每个非空行的内容（去掉首尾空白）需与文件中对应行一致；行首缩进（空格/制表符）的差异会被忽略。建议按整行/整块提供。",
+    }),
+    newText: Type.String({ description: "替换后的文本（原样写入，缩进即最终缩进）。" }),
+}, {});
+const editSoftSchema = Type.Object({
+    path: Type.String({ description: "要编辑的文件路径（相对或绝对）" }),
+    edits: Type.Array(replaceEditSchema, {
+        description: "一个或多个定向替换。每个 edit 相对原文件匹配（非增量）；不要包含重叠/嵌套的 edit；同一块或相邻行请合并成一个 edit。",
+    }),
+}, {});
+function isSingleEditInput(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const e = value;
+    return typeof e.oldText === "string" && typeof e.newText === "string";
+}
+/** 兼容几种模型把 edits 传成 JSON 字符串 / 单个对象的写法 + 遗留顶层 oldText/newText。 */
+function prepareSoftEditArguments(input) {
+    if (!input || typeof input !== "object")
+        return input;
+    const args = input;
+    if (typeof args.edits === "string") {
+        try {
+            const parsed = JSON.parse(args.edits);
+            if (Array.isArray(parsed))
+                args.edits = parsed;
+            else if (isSingleEditInput(parsed))
+                args.edits = [parsed];
+        }
+        catch {
+            /* 保留原值，交给校验报错 */
+        }
+    }
+    else if (isSingleEditInput(args.edits)) {
+        args.edits = [args.edits];
+    }
+    const legacy = args;
+    if (typeof legacy.oldText === "string" && typeof legacy.newText === "string") {
+        const edits = Array.isArray(legacy.edits) ? [...legacy.edits] : [];
+        edits.push({ oldText: legacy.oldText, newText: legacy.newText });
+        const { oldText: _o, newText: _n, ...rest } = legacy;
+        return { ...rest, edits };
+    }
+    return args;
+}
+// ---------------------------------------------------------------------------
+// 轻量 helpers（SDK 未导出，这里按等价语义重现）
+// ---------------------------------------------------------------------------
+function splitBom(content) {
+    return content.startsWith("\uFEFF") ? { bom: "\uFEFF", text: content.slice(1) } : { bom: "", text: content };
+}
+function detectLineEnding(content) {
+    const crlfIdx = content.indexOf("\r\n");
+    const lfIdx = content.indexOf("\n");
+    if (lfIdx === -1)
+        return "\n";
+    if (crlfIdx === -1)
+        return "\n";
+    return crlfIdx < lfIdx ? "\r\n" : "\n";
+}
+function normalizeToLF(text) {
+    return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+}
+function restoreLineEndings(text, ending) {
+    return ending === "\r\n" ? text.replace(/\n/g, "\r\n") : text;
+}
+const UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
+function normalizeShellPath(p) {
+    if (!p.startsWith("/") || p.startsWith("//") || p.includes("\\"))
+        return p;
+    const m = p.match(/^\/(?:mnt\/|cygdrive\/)?([a-z])(?:\/(.*))?$/i);
+    if (!m)
+        return p;
+    return `${m[1].toUpperCase()}:\\${(m[2] ?? "").replaceAll("/", "\\")}`;
+}
+/** 与 SDK resolveToCwd 等价：处理 ~、@ 前缀、Unicode 空格、Windows shell 路径。 */
+function resolveToCwd(filePath, cwd) {
+    let p = filePath.replace(UNICODE_SPACES, " ");
+    if (p.startsWith("@"))
+        p = p.slice(1);
+    if (process.platform === "win32")
+        p = normalizeShellPath(p);
+    const home = homedir();
+    if (p === "~")
+        return home;
+    if (p.startsWith("~/"))
+        return join(home, p.slice(2));
+    return isAbsolute(p) ? nodeResolve(p) : nodeResolve(cwd, p);
+}
+function splitLineUnits(text) {
+    const units = [];
+    const re = /[^\n]*\n|[^\n]+/g;
+    let offset = 0;
+    let m;
+    while ((m = re.exec(text)) !== null) {
+        const chunk = m[0];
+        const newline = chunk.endsWith("\n") ? "\n" : "";
+        const raw = newline ? chunk.slice(0, -1) : chunk;
+        units.push({ raw, newline, start: offset, end: offset + chunk.length, core: raw.trim() });
+        offset += chunk.length;
+    }
+    return units;
+}
+/** oldText 拆成「各行核心」：去掉尾部空行（模型常带尾 \n），每行取 trim。 */
+export function oldTextCores(oldTextLF) {
+    const parts = oldTextLF.split("\n");
+    if (parts.length > 0 && parts[parts.length - 1] === "")
+        parts.pop();
+    return parts.map((p) => p.trim());
+}
+/** NOT_FOUND / NOT_UNIQUE 用异常类型区分（与内置 edit 报错风格一致）。 */
+class SoftEditMatchError extends Error {
+    constructor(message) {
+        super(message);
+    }
+}
+/**
+ * 命中一个 edit：先精确，后行核心宽松。返回原文件字符区间 + 待写入文本。
+ * spans 全部相对 LF 归一化后的原文件正文。
+ */
+function locateReplacement(normalizedContent, oldTextLF, newTextLF, path, editIndex) {
+    if (oldTextLF.length === 0) {
+        throw new SoftEditMatchError(`edits[${editIndex}].oldText must not be empty in ${path}.`);
+    }
+    // 1) 精确子串匹配（等价普通 edit，支持片段）
+    const exactIdx = normalizedContent.indexOf(oldTextLF);
+    if (exactIdx !== -1) {
+        // 唯一性：精确匹配出现多次 → 报错（模型应提供更多上下文）
+        const occurrences = normalizedContent.split(oldTextLF).length - 1;
+        if (occurrences > 1) {
+            throw new SoftEditMatchError(`Found ${occurrences} occurrences of edits[${editIndex}].oldText in ${path}. Each oldText must be unique. Please provide more context to make it unique.`);
+        }
+        return { start: exactIdx, end: exactIdx + oldTextLF.length, insertText: newTextLF };
+    }
+    // 2) 行核心宽松匹配：逐行 trim 后序列一致（忽略缩进差异）
+    const cores = oldTextCores(oldTextLF);
+    if (cores.length === 0) {
+        throw new SoftEditMatchError(`edits[${editIndex}].oldText is effectively empty in ${path}.`);
+    }
+    const units = splitLineUnits(normalizedContent);
+    const k = cores.length;
+    const starts = [];
+    for (let i = 0; i + k <= units.length; i++) {
+        let ok = true;
+        for (let j = 0; j < k; j++) {
+            if (units[i + j].core !== cores[j]) {
+                ok = false;
+                break;
+            }
+        }
+        if (ok)
+            starts.push(i);
+    }
+    if (starts.length === 0) {
+        throw new SoftEditMatchError(`Could not find the text (exact or indentation-insensitive) in ${path}. The oldText must match the file's line content; leading-whitespace differences are ignored, but the actual content must be identical.`);
+    }
+    if (starts.length > 1) {
+        throw new SoftEditMatchError(`Found ${starts.length} indentation-insensitive occurrences of edits[${editIndex}].oldText in ${path}. The text must be unique. Please provide more context to make it unique.`);
+    }
+    const li = starts[0];
+    const ri = li + k;
+    const spanStart = units[li].start;
+    const spanEnd = units[ri - 1].end;
+    // 行尾换行平衡：若最后一行原本带 \n 而 newText 没带，补一个，避免与下一行粘连。
+    const lastNewline = units[ri - 1].newline;
+    let insertText = newTextLF;
+    if (lastNewline === "\n" && !insertText.endsWith("\n"))
+        insertText += "\n";
+    return { start: spanStart, end: spanEnd, insertText };
+}
+/** 对 LF 归一化内容应用一组 edit（含重叠检测），返回 {base,next}。 */
+export function applySoftEdits(normalizedContent, edits, path) {
+    const replacements = [];
+    for (let i = 0; i < edits.length; i++) {
+        const oldTextLF = normalizeToLF(edits[i].oldText);
+        const newTextLF = normalizeToLF(edits[i].newText);
+        replacements.push(locateReplacement(normalizedContent, oldTextLF, newTextLF, path, i));
+    }
+    // 重叠检测
+    const sorted = [...replacements].sort((a, b) => a.start - b.start);
+    for (let i = 1; i < sorted.length; i++) {
+        if (sorted[i - 1].end > sorted[i].start) {
+            throw new SoftEditMatchError(`edits overlap in ${path}. Merge them into one edit or target disjoint regions.`);
+        }
+    }
+    // 逆序应用，保持左侧偏移稳定
+    let result = normalizedContent;
+    for (let i = replacements.length - 1; i >= 0; i--) {
+        const r = replacements[i];
+        result = result.slice(0, r.start) + r.insertText + result.slice(r.end);
+    }
+    if (result === normalizedContent) {
+        throw new SoftEditMatchError(`No changes made to ${path}. The replacement produced identical content.`);
+    }
+    return { baseContent: normalizedContent, newContent: result };
+}
+/**
+ * 生成 edit_soft 工具定义。与内置 edit 同结构执行体，但用宽松缩进匹配 + 原样 newText。
+ * cwd 仅供创建时固定；执行时优先 ctx.cwd（会话工作区）。
+ */
+export function makeEditSoftTool(fallbackCwd) {
+    return defineTool({
+        name: SOFT_EDIT_TOOL_NAME,
+        label: "Edit (indentation-insensitive)",
+        description: "Edit a single file using text replacement that is tolerant of indentation. Every edits[].oldText is matched to the file by line content: leading whitespace (spaces/tabs) differences between your oldText and the file are ignored, so an edit does not fail just because the indentation differs. Use this when the built-in edit tool rejects your oldText due to a whitespace mismatch (common in JS/JSON/etc.). Prefer whole-line/whole-block oldText. newText is written exactly as provided.",
+        promptSnippet: "edit a file tolerating indentation differences (whitespace-insensitive match)",
+        promptGuidelines: [
+            "Use edit_soft when edit fails because the oldText indentation/spacing differs from the file",
+            "Each edits[].oldText is matched to whole lines by trimmed content; leading whitespace is ignored",
+            "newText is written verbatim — the indentation you provide is the final indentation in the file",
+            "Keep edits[].oldText as small as possible while still being unique; merge nearby changes into one edit",
+        ],
+        parameters: editSoftSchema,
+        prepareArguments: prepareSoftEditArguments,
+        async execute(_toolCallId, input, signal, _onUpdate, ctx) {
+            const { path, edits } = input;
+            if (!Array.isArray(edits) || edits.length === 0) {
+                throw new Error("edit_soft input is invalid. edits must contain at least one replacement.");
+            }
+            const cwd = typeof ctx?.cwd === "string" ? ctx.cwd : fallbackCwd;
+            const absolutePath = resolveToCwd(path, cwd);
+            return withFileMutationQueue(absolutePath, async () => {
+                const throwIfAborted = () => {
+                    if (signal?.aborted)
+                        throw new Error("Operation aborted");
+                };
+                throwIfAborted();
+                try {
+                    await access(absolutePath, constants.R_OK | constants.W_OK);
+                }
+                catch (error) {
+                    throwIfAborted();
+                    const errorMessage = error instanceof Error && "code" in error ? `Error code: ${error.code}` : String(error);
+                    throw new Error(`Could not edit file: ${path}. ${errorMessage}.`);
+                }
+                throwIfAborted();
+                const buffer = await readFile(absolutePath);
+                const rawContent = buffer.toString("utf-8");
+                throwIfAborted();
+                const { bom, text: content } = splitBom(rawContent);
+                const originalEnding = detectLineEnding(content);
+                const normalizedContent = normalizeToLF(content);
+                const { baseContent, newContent } = applySoftEdits(normalizedContent, edits, path);
+                throwIfAborted();
+                const finalContent = bom + restoreLineEndings(newContent, originalEnding);
+                await writeFile(absolutePath, finalContent, "utf-8");
+                throwIfAborted();
+                const diffResult = generateDiffString(baseContent, newContent);
+                const patch = generateUnifiedPatch(path, baseContent, newContent);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: `Successfully replaced ${edits.length} block(s) in ${path} (indentation-insensitive).`,
+                        },
+                    ],
+                    details: { diff: diffResult.diff, patch, firstChangedLine: diffResult.firstChangedLine },
+                };
+            });
+        },
+    });
+}

package/dist/server/index.js

@@ -811,12 +811,15 @@ wss.on("connection", (ws) => {
                 void cs.setSettings({
                     promptMode: msg.promptMode,
                     customSystemPrompt: msg.customSystemPrompt,
+                    promptTemplate: msg.promptTemplate,
+                    promptOverrides: msg.promptOverrides,
                     disabledSkills: msg.disabledSkills,
                     disabledExtensions: msg.disabledExtensions,
                     disabledPlugins: msg.disabledPlugins,
                     terminalToolsEnabled: msg.terminalToolsEnabled,
                     terminalBash: msg.terminalBash,
                     terminalBashIdleMs: msg.terminalBashIdleMs,
+                    editSoftEnabled: msg.editSoftEnabled,
                     thinkingWrap: msg.thinkingWrap,
                     toolsWrap: msg.toolsWrap,
                     visionBridgeEnabled: msg.visionBridgeEnabled,
@@ -828,6 +831,8 @@ wss.on("connection", (ws) => {
                     reviewDisabledSkills: msg.reviewDisabledSkills,
                     markersEnabled: msg.markersEnabled,
                     disabledMarkers: msg.disabledMarkers,
+                    quickPhrases: msg.quickPhrases,
+                    quickPhrasesEnabled: msg.quickPhrasesEnabled,
                 });
                 break;
             case "extensions_reload":

package/dist/server/marker-service.js

@@ -4,7 +4,6 @@
 import { ensureMarkersRegistered, parseMarkers, getMarker, allMarkers, collectGuidance, listMarkerNames, } from "./markers/index.js";
 import { loadStateFromBranch, appendSnapshot } from "./markers/store.js";
 import { TODO_NAMESPACE, initTodoState, describeTodos } from "./markers/builtins/todo.js";
-import { SVC_NAMESPACE, initServiceState, describeServices } from "./markers/builtins/services.js";
 ensureMarkersRegistered();
 const DEFAULT_MARKERS = {
     markersEnabled: true,
@@ -31,11 +30,6 @@ export class MarkerService {
     isMarkerEnabled(name) {
         if (!this.settings.markersEnabled)
             return false;
-        if ((name === "rename" || name === "title") && this.settings.disabledMarkers.includes("conv"))
-            return false;
-        if (name === "conv" &&
-            (this.settings.disabledMarkers.includes("rename") || this.settings.disabledMarkers.includes("title")))
-            return false;
         return !this.settings.disabledMarkers.includes(name);
     }
     buildGuidance() {
@@ -57,13 +51,10 @@ export class MarkerService {
     }
     toggleMarker(name, enabled) {
         const set = new Set(this.settings.disabledMarkers);
-        const group = name === "conv" || name === "rename" || name === "title" ? ["conv", "rename", "title"] : [name];
-        for (const n of group) {
-            if (enabled)
-                set.delete(n);
-            else
-                set.add(n);
-        }
+        if (enabled)
+            set.delete(name);
+        else
+            set.add(name);
         this.settings.disabledMarkers = [...set];
         this.host.stateStore.saveMarkerSettings(this.host.clientId, this.settings);
     }
@@ -71,14 +62,7 @@ export class MarkerService {
         if (settings.markersEnabled !== undefined)
             this.settings.markersEnabled = !!settings.markersEnabled;
         if (settings.disabledMarkers !== undefined) {
-            // 归一化 rename 别名：若 conv 被禁用则同步禁用别名
-            const s = new Set(settings.disabledMarkers);
-            if (s.has("conv") || s.has("rename") || s.has("title")) {
-                s.add("conv");
-                s.add("rename");
-                s.add("title");
-            }
-            this.settings.disabledMarkers = [...s];
+            this.settings.disabledMarkers = [...new Set(settings.disabledMarkers)];
         }
         else {
             this.host.stateStore.saveMarkerSettings(this.host.clientId, this.settings);
@@ -122,7 +106,25 @@ export class MarkerService {
         appendSnapshot(mgr, namespace, state);
     }
     // -- parse & execute --
-    async handleAssistantText(conversationId, text) {
+    /**
+     * 解析执行一条 assistant 终稿文本中的内联标记。
+     *
+     * 多个气泡（同一轮内前一段文本 + 后一段文本）的 message_end 事件会先后到达，
+     * 而 apply 是异步的——若并发执行会同时读到旧快照、分配重叠 id、后存覆盖前存。
+     * 因此按会话串行化：每个 conv 的处理链式排队，保证状态严格按文本顺序累积。
+     */
+    chains = new Map();
+    handleAssistantText(conversationId, text) {
+        const prev = this.chains.get(conversationId) ?? Promise.resolve();
+        const next = prev
+            .then(() => this.processAssistantText(conversationId, text))
+            .catch((e) => {
+            console.error("[markers] handleAssistantText failed:", e);
+        });
+        this.chains.set(conversationId, next);
+        return next;
+    }
+    async processAssistantText(conversationId, text) {
         if (!text || !this.settings.markersEnabled)
             return;
         const tokens = parseMarkers(text);
@@ -136,8 +138,6 @@ export class MarkerService {
                 return st;
             if (ns === TODO_NAMESPACE)
                 st = this.getState(conversationId, ns, initTodoState);
-            else if (ns === SVC_NAMESPACE)
-                st = this.getState(conversationId, ns, initServiceState);
             else {
                 const marker = getMarker(ns);
                 st = marker?.init ? marker.init() : {};
@@ -170,17 +170,10 @@ export class MarkerService {
                 result = { applied: false, error: `执行异常: ${e?.message ?? String(e)}` };
             }
             if (result.applied) {
-                if (token.tool !== "notify" && token.tool !== "conv" && token.tool !== "rename" && token.tool !== "title") {
+                // todo 落库；notify/conv 即时生效（通知已发 / 对话已重命名），无需快照。
+                if (token.tool !== "notify" && token.tool !== "conv") {
                     dirty.add(token.tool);
                 }
-                else if (token.tool === "conv" || token.tool === "rename" || token.tool === "title") {
-                    // rename 不落库，已直接重命名
-                }
-                else if (token.tool === "notify") {
-                    // 通知不落库
-                }
-                if (token.tool === "todo" || token.tool === "svc")
-                    dirty.add(token.tool);
             }
             else if (result.error) {
                 this.host.emit({
@@ -208,8 +201,6 @@ export class MarkerService {
             let state;
             if (m.name === TODO_NAMESPACE)
                 state = this.getState(conversationId, m.name, initTodoState);
-            else if (m.name === SVC_NAMESPACE)
-                state = this.getState(conversationId, m.name, initServiceState);
             else {
                 state = this.getState(conversationId, m.name, () => m.init?.() ?? {});
                 if (state === undefined)
@@ -240,10 +231,6 @@ export class MarkerService {
         }
     }
     describe(conversationId, tool, includeDeleted = false) {
-        if (tool === "svc") {
-            const st = this.getState(conversationId, SVC_NAMESPACE, initServiceState);
-            return describeServices(st);
-        }
         const st = this.getState(conversationId, TODO_NAMESPACE, initTodoState);
         const visible = st.tasks.filter((t) => includeDeleted || t.status !== "deleted");
         if (visible.length === 0)
@@ -253,8 +240,6 @@ export class MarkerService {
     getRawState(conversationId, namespace) {
         if (namespace === TODO_NAMESPACE)
             return this.getState(conversationId, namespace, initTodoState);
-        if (namespace === SVC_NAMESPACE)
-            return this.getState(conversationId, namespace, initServiceState);
         const m = getMarker(namespace);
         return this.getState(conversationId, namespace, () => m?.init?.() ?? {});
     }
@@ -264,8 +249,6 @@ export class MarkerService {
         const seen = new Set();
         const out = [];
         for (const m of allMarkers()) {
-            if (m.name === "rename" || m.name === "title")
-                continue;
             if (seen.has(m.name))
                 continue;
             seen.add(m.name);

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

@@ -3,15 +3,8 @@
  *
  * 需求：加个重命名当前对话 marker。
  *
- * 语法：
+ * 语法（唯一写法）：
  *   [[conv:rename:<新标题>]]        重命名当前对话
- *   [[rename:set:<新标题>]]         同上（兼容别名）
- *   [[title:rename:<新标题>]]       同上
- *   [[rename:new:<新标题>]]         同上
- *
- * 兼容：rename 前缀的任意 op 都会被视为重命名，例如 [[rename:set:My Chat]]、
- *       [[rename:to:My Chat]]。标题来自 args[0] + kwargs[text/name/title] 的
- *       拼接，未提供则报错。
  *
  * 持久化：通过宿主回调直接改对话标题（内存 + 磁盘 transcript session_info），
  *         不需要额外状态。
@@ -27,9 +20,7 @@ function extractTitle(token) {
 }
 export const renameMarker = {
     name: "conv",
-    guidance: [
-        "- 重命名当前对话：[[conv:rename:<新标题>]]（或 [[rename:set:<标题>]]）。标题尽量简短、能概括本次任务。首次回复用户问题后根据情况重命名当前会话",
-    ],
+    guidance: ["- 重命名当前对话：[[conv:rename:<新标题>]]（在了解了用户需求后尽早重命名对话）"],
     async apply(token, ctx) {
         if (token.op !== "rename") {
             return { applied: false, error: `conv 未知操作: ${token.op}（当前仅支持 conv:rename）` };
@@ -53,48 +44,3 @@ export const renameMarker = {
     overlay: undefined,
     init: () => undefined,
 };
-/** 别名：[[rename:set:标题]] 等同 [[conv:rename:标题]]，方便模型直觉书写。 */
-export const renameAliasMarker = {
-    name: "rename",
-    guidance: ["- [[rename:set:<新标题>]] 同 [[conv:rename:<新标题>]]：重命名当前对话。"],
-    async apply(token, ctx) {
-        // 兼容任意 op：只要能取到标题就重命名
-        const title = extractTitle(token) || token.op?.trim() || "";
-        // 若 token 是 [[rename:My Title:]] 形式，op=My Title, args 空 —— 用 op 当标题
-        const effective = title || token.op;
-        if (!effective?.trim())
-            return { applied: false, error: "rename 需要标题参数 [[rename:set:<新标题>]]" };
-        const trimmed = effective.trim().slice(0, 80);
-        if (!ctx.renameConversation)
-            return { applied: false, error: "当前环境不支持重命名" };
-        try {
-            ctx.renameConversation(trimmed);
-            ctx.notify(`已重命名为：${trimmed}`, "info", `Renamed to: ${trimmed}`);
-            return { applied: true, feedback: `renamed to "${trimmed}"` };
-        }
-        catch (e) {
-            return { applied: false, error: `重命名失败: ${e.message ?? String(e)}` };
-        }
-    },
-    overlay: undefined,
-    init: () => undefined,
-};
-/** title 前缀别名：[[title:rename:标题]] */
-export const titleAliasMarker = {
-    name: "title",
-    guidance: [],
-    async apply(token, ctx) {
-        if (token.op !== "rename")
-            return { applied: false, error: `title 未知操作: ${token.op}` };
-        const title = extractTitle(token);
-        if (!title)
-            return { applied: false, error: "title:rename 需要标题" };
-        if (!ctx.renameConversation)
-            return { applied: false, error: "当前环境不支持重命名" };
-        ctx.renameConversation(title.slice(0, 80));
-        ctx.notify(`已重命名为：${title.slice(0, 80)}`, "info", `Renamed to: ${title.slice(0, 80)}`);
-        return { applied: true, feedback: `renamed` };
-    },
-    overlay: undefined,
-    init: () => undefined,
-};