pi-web-ui 0.94.1 → 0.96.0

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

@@ -29,7 +29,7 @@ import { basename, dirname, join, resolve, sep } from "node:path";
 import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { BgServerTracker } from "../bg-servers.js";
-import { ClientStateStore, DEFAULT_RETRY_MAX_ATTEMPTS, normalizeToolWatchdogTimeoutMs } from "../client-state.js";
+import { ClientStateStore, DEFAULT_RETRY_MAX_ATTEMPTS, normalizePathKey, normalizeToolWatchdogTimeoutMs, } from "../client-state.js";
 import { normalizeUiLayout } from "../client-state.js";
 import { FilesService, workspacePath, desktopDirWire } from "../files-service.js";
 import { QuiesceRejectedError } from "../agent-service.js";
@@ -124,9 +124,11 @@ const DEFAULT_SETTINGS = {
     terminalToolsEnabled: false,
     terminalBash: false,
     terminalBashIdleMs: 15_000,
+    terminalBashMaxForegroundMs: 60_000,
     toolWatchdogTimeoutMs: 20 * 60_000,
     editSoftEnabled: false,
     questionnaireEnabled: true,
+    toolApprovalEnabled: true,
     goalModeEnabled: true,
     parallelReminderEnabled: true,
     thinkingWrap: false,
@@ -271,9 +273,11 @@ export class DshClientSession {
                 terminalToolsEnabled: savedSettings.terminalToolsEnabled,
                 terminalBash: savedSettings.terminalBash,
                 terminalBashIdleMs: savedSettings.terminalBashIdleMs,
+                terminalBashMaxForegroundMs: savedSettings.terminalBashMaxForegroundMs ?? 60_000,
                 toolWatchdogTimeoutMs: savedSettings.toolWatchdogTimeoutMs ?? 20 * 60_000,
                 editSoftEnabled: savedSettings.editSoftEnabled,
                 questionnaireEnabled: savedSettings.questionnaireEnabled ?? true,
+                toolApprovalEnabled: savedSettings.toolApprovalEnabled ?? true,
                 goalModeEnabled: savedSettings.goalModeEnabled ?? true,
                 parallelReminderEnabled: savedSettings.parallelReminderEnabled ?? true,
                 thinkingWrap: savedSettings.thinkingWrap,
@@ -364,6 +368,7 @@ export class DshClientSession {
             // 直播帧能力跟着运行时进程走：重启后重新探测（换运行时版本也能回落到持久 assistant/chunk）。
             conv.liveChunks = false;
         }
+        this.emitConversations();
         const now = Date.now();
         if (now - this.runtimeRestart.windowStart > DshClientSession.RUNTIME_RESTART_WINDOW_MS) {
             this.runtimeRestart.windowStart = now;
@@ -1131,6 +1136,7 @@ export class DshClientSession {
             conv.streaming = null;
             this.refreshConversationTitle(conv);
             this.scheduleSessionsRefresh();
+            this.emitConversations();
         }
         this.flushSnapshot();
     }
@@ -1412,8 +1418,10 @@ export class DshClientSession {
         if (active.messages.length === 0 && active.terminals.list().length === 0) {
             if (preset)
                 await this.selectAgentPreset(preset);
-            else
+            else {
+                this.pushSettings();
                 this.flushSnapshot();
+            }
             return true;
         }
         for (const conv of this.convs.values()) {
@@ -1447,6 +1455,7 @@ export class DshClientSession {
         this.emitConversations();
         this.emitGoalStatus();
         this.pushTerminals();
+        this.pushSettings();
         this.flushSnapshot();
         void this.refreshActivePermission().catch(() => { });
         return true;
@@ -1481,6 +1490,7 @@ export class DshClientSession {
         this.emitConversations();
         this.emitGoalStatus();
         this.pushTerminals();
+        this.pushSettings();
         this.flushSnapshot(true);
         // 切会话带上权限值（cwd 变化走运行时重启，onStarted 会重拉）。
         void this.refreshActivePermission().catch(() => { });
@@ -1803,62 +1813,46 @@ export class DshClientSession {
                 }
             }
             else if (resolved) {
-                if (a.mode === "inline" || a.mode === undefined) {
-                    // 内联文本（小文件直接读内容）。
+                // 一律只给路径引用：不再把文件内容注入 prompt（小文件也一样），模型用
+                // 自己的读取工具按需读。行范围模式带上行号提示。
+                // 工作区图片文件仍走 attachment store → 真 image 块（模型可看图）。
+                const refText = pick(lang, `\n[文件引用: ${resolved.rel}]`, `\n[File reference: ${resolved.rel}]`, "dsh.attach.file.ref", {
+                    "resolved.rel": resolved.rel,
+                }) +
+                    (a.mode === "lines" && a.lines
+                        ? pick(lang, `（第 ${a.lines.start}-${a.lines.end} 行）`, ` (lines ${a.lines.start}-${a.lines.end})`)
+                        : "");
+                let isImage = false;
+                try {
+                    const st = statSync(resolved.abs);
+                    isImage = st.isFile() && st.size > 0 && st.size <= 512 * 1024 && previewKind(resolved.abs) === "image";
+                }
+                catch {
+                    /* 不存在/不可读 → 照样给路径引用，读取工具会自己报错 */
+                }
+                if (isImage) {
                     try {
-                        const st = statSync(resolved.abs);
-                        if (st.size <= 512 * 1024) {
-                            const buf = readFileSync(resolved.abs);
-                            const kind = previewKind(resolved.abs);
-                            if (kind === "image") {
-                                // 工作区图片文件 → attachment store → 真 image 块。
-                                try {
-                                    const ext = (resolved.rel.match(/\.([a-z0-9]+)$/iu)?.[1] ?? "png").toLowerCase();
-                                    const mediaType = ext === "jpg" || ext === "jpeg"
-                                        ? "image/jpeg"
-                                        : ext === "webp"
-                                            ? "image/webp"
-                                            : ext === "gif"
-                                                ? "image/gif"
-                                                : "image/png";
-                                    const saved = await this.runtime.attachmentSave(mediaType, buf.toString("base64"), resolved.rel);
-                                    blocks.push({ type: "image", attachment: saved.ref });
-                                }
-                                catch {
-                                    blocks.push({
-                                        type: "text",
-                                        text: pick(lang, `\n[图片附件: ${resolved.rel}]`, `\n[Image attachment: ${resolved.rel}]`, "dsh.attach.image.ref", { "resolved.rel": resolved.rel }),
-                                    });
-                                }
-                            }
-                            else {
-                                const enc = this.decodeText(buf);
-                                const capped = enc.length > 100_000 ? `${enc.slice(0, 100_000)}\n… [truncated]` : enc;
-                                blocks.push({
-                                    type: "text",
-                                    text: `\n<file path="${resolved.rel}">\n${capped}\n</file>`,
-                                });
-                            }
-                        }
-                        else {
-                            blocks.push({
-                                type: "text",
-                                text: pick(lang, `\n[文件引用: ${resolved.rel}（大文件，请用读取工具查看）]`, `\n[File reference: ${resolved.rel} (large file, use the read tool to view it)]`, "dsh.attach.file.large", { "resolved.rel": resolved.rel }),
-                            });
-                        }
+                        const buf = readFileSync(resolved.abs);
+                        const ext = (resolved.rel.match(/\.([a-z0-9]+)$/iu)?.[1] ?? "png").toLowerCase();
+                        const mediaType = ext === "jpg" || ext === "jpeg"
+                            ? "image/jpeg"
+                            : ext === "webp"
+                                ? "image/webp"
+                                : ext === "gif"
+                                    ? "image/gif"
+                                    : "image/png";
+                        const saved = await this.runtime.attachmentSave(mediaType, buf.toString("base64"), resolved.rel);
+                        blocks.push({ type: "image", attachment: saved.ref });
                     }
                     catch {
                         blocks.push({
                             type: "text",
-                            text: pick(lang, `\n[文件引用: ${resolved.rel}]`, `\n[File reference: ${resolved.rel}]`, "dsh.attach.file.ref.fallback", { "resolved.rel": resolved.rel }),
+                            text: pick(lang, `\n[图片附件: ${resolved.rel}]`, `\n[Image attachment: ${resolved.rel}]`, "dsh.attach.image.ref", { "resolved.rel": resolved.rel }),
                         });
                     }
                 }
                 else {
-                    blocks.push({
-                        type: "text",
-                        text: pick(lang, `\n[文件引用: ${resolved.rel}]`, `\n[File reference: ${resolved.rel}]`, "dsh.attach.file.ref", { "resolved.rel": resolved.rel }),
-                    });
+                    blocks.push({ type: "text", text: refText });
                 }
             }
             else if (a.name) {
@@ -1870,19 +1864,6 @@ export class DshClientSession {
         }
         return blocks;
     }
-    decodeText(buf) {
-        try {
-            return new TextDecoder("utf-8", { fatal: true }).decode(buf);
-        }
-        catch {
-            try {
-                return new TextDecoder("gbk").decode(buf);
-            }
-            catch {
-                return buf.toString("latin1");
-            }
-        }
-    }
     /** 中止：kill 运行时进程树（所有 conversation 的运行停止）→ 自动重启保持可用。 */
     async abort() {
         if (!this.runtime.alive)
@@ -1890,6 +1871,7 @@ export class DshClientSession {
         const conv = this.conv;
         conv.isStreaming = false;
         conv.streaming = null;
+        this.emitConversations();
         // 手动停止 → 清当前会话的 DSH 原生目标（半成品运行不该继续被轮次驱动）。
         // 旧进程还活着，先 goal/clear 落盘，再重启运行时。
         if (conv.dsGoal || conv.goal.goal) {
@@ -2239,6 +2221,7 @@ export class DshClientSession {
             this.activeId = conv.id;
             this.emitConversations();
             this.pushTerminals();
+            this.pushSettings();
             this.flushSnapshot(true);
         }
         catch (err) {
@@ -2311,9 +2294,10 @@ export class DshClientSession {
     // -----------------------------------------------------------------------
     async pushProjects() {
         const saved = this.stateStore.get(this.clientId);
+        const removedKeys = new Set(this.stateStore.getRemovedProjects(this.clientId).map(normalizePathKey));
         const projects = new Map();
         for (const p of saved.projects ?? []) {
-            if (!(saved.removedProjects ?? []).includes(p.path)) {
+            if (!removedKeys.has(normalizePathKey(p.path))) {
                 projects.set(p.path, p.lastUsed);
             }
         }
@@ -2325,7 +2309,7 @@ export class DshClientSession {
             for (const e of entries) {
                 if (e.isDirectory()) {
                     const cwd = this.decodeProjectKey(e.name);
-                    if (cwd && !projects.has(cwd))
+                    if (cwd && !projects.has(cwd) && !removedKeys.has(normalizePathKey(cwd)))
                         cwdProjects.add(cwd);
                 }
             }
@@ -2335,7 +2319,9 @@ export class DshClientSession {
         }
         for (const cwd of cwdProjects)
             projects.set(cwd, Date.now());
-        projects.set(this.cwd, Date.now());
+        if (!removedKeys.has(normalizePathKey(this.cwd))) {
+            projects.set(this.cwd, Date.now());
+        }
         const list = [...projects.entries()]
             .map(([path, lastUsed]) => ({ path, lastUsed }))
             .sort((a, b) => b.lastUsed - a.lastUsed)
@@ -2624,6 +2610,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            terminalBashMaxForegroundMs: this.settings.terminalBashMaxForegroundMs,
             toolWatchdogTimeoutMs: this.settings.toolWatchdogTimeoutMs,
             // DSH 引擎无 customTool 注册面（工具来自 shipped preset），read 目录覆盖面不存在。
             readDirEnabled: true,
@@ -2634,6 +2621,10 @@ export class DshClientSession {
             softCapTokens: 0,
             softCapByModel: {},
             questionnaireEnabled: this.settings.questionnaireEnabled,
+            toolApprovalEnabled: this.settings.toolApprovalEnabled !== false,
+            // DSH 无审批弹窗，策略恒为空（保协议完整）。
+            approvalPolicy: { allowAll: false, categories: [] },
+            approvalRules: [],
             goalModeEnabled: this.settings.goalModeEnabled,
             parallelReminderEnabled: this.settings.parallelReminderEnabled,
             thinkingWrap: this.settings.thinkingWrap,
@@ -2695,12 +2686,16 @@ export class DshClientSession {
             this.settings.terminalBash = partial.terminalBash;
         if (partial.terminalBashIdleMs !== undefined)
             this.settings.terminalBashIdleMs = partial.terminalBashIdleMs;
+        if (partial.terminalBashMaxForegroundMs !== undefined)
+            this.settings.terminalBashMaxForegroundMs = partial.terminalBashMaxForegroundMs;
         if (partial.toolWatchdogTimeoutMs !== undefined)
             this.settings.toolWatchdogTimeoutMs = normalizeToolWatchdogTimeoutMs(partial.toolWatchdogTimeoutMs);
         if (partial.editSoftEnabled !== undefined)
             this.settings.editSoftEnabled = partial.editSoftEnabled;
         if (partial.questionnaireEnabled !== undefined)
             this.settings.questionnaireEnabled = partial.questionnaireEnabled;
+        if (partial.toolApprovalEnabled !== undefined)
+            this.settings.toolApprovalEnabled = partial.toolApprovalEnabled;
         if (partial.goalModeEnabled !== undefined)
             this.settings.goalModeEnabled = partial.goalModeEnabled;
         if (partial.parallelReminderEnabled !== undefined)
@@ -2735,6 +2730,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            terminalBashMaxForegroundMs: this.settings.terminalBashMaxForegroundMs,
             editSoftEnabled: this.settings.editSoftEnabled,
             // DSH 无独立重试配置（pi 引擎才暴露），保持默认。
             retryMaxAttempts: DEFAULT_RETRY_MAX_ATTEMPTS,
@@ -2742,6 +2738,7 @@ export class DshClientSession {
             softCapTokens: 0,
             softCapByModel: {},
             questionnaireEnabled: this.settings.questionnaireEnabled,
+            toolApprovalEnabled: this.settings.toolApprovalEnabled !== false,
             goalModeEnabled: this.settings.goalModeEnabled,
             parallelReminderEnabled: this.settings.parallelReminderEnabled,
             thinkingWrap: this.settings.thinkingWrap,
@@ -2902,6 +2899,7 @@ export class DshClientSession {
             }
             conv.agentPreset = res.preset ?? target;
             this.emitConversations();
+            this.pushSettings();
             this.flushSnapshot();
         }
         catch (err) {
@@ -3059,6 +3057,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            terminalBashMaxForegroundMs: this.settings.terminalBashMaxForegroundMs,
             editSoftEnabled: this.settings.editSoftEnabled,
             // DSH 无独立重试配置，预设沿用默认值。
             // DSH 无 skill 全文注入概念，给空保预设类型完整。
@@ -3099,6 +3098,8 @@ export class DshClientSession {
         this.settings.terminalToolsEnabled = preset.terminalToolsEnabled;
         this.settings.terminalBash = preset.terminalBash;
         this.settings.terminalBashIdleMs = preset.terminalBashIdleMs;
+        this.settings.terminalBashMaxForegroundMs =
+            preset.terminalBashMaxForegroundMs ?? this.settings.terminalBashMaxForegroundMs;
         this.settings.editSoftEnabled = preset.editSoftEnabled ?? this.settings.editSoftEnabled;
         this.settings.reviewPrompt = preset.reviewPrompt ?? "";
         this.stateStore.saveSettings(this.clientId, {
@@ -3109,6 +3110,7 @@ export class DshClientSession {
             terminalToolsEnabled: this.settings.terminalToolsEnabled,
             terminalBash: this.settings.terminalBash,
             terminalBashIdleMs: this.settings.terminalBashIdleMs,
+            terminalBashMaxForegroundMs: this.settings.terminalBashMaxForegroundMs,
             editSoftEnabled: this.settings.editSoftEnabled,
             thinkingWrap: this.settings.thinkingWrap,
             toolsWrap: this.settings.toolsWrap,
@@ -3457,7 +3459,7 @@ export class DshClientSession {
             `# User's raw requirement`,
             draft,
             ``,
-            `Use the ask_user_question tool to ask the user focused questions to pin down the essential, ambiguous details. Ask ONE question at a time, usually 2 to 4 questions total: what exactly to build/do, scope boundaries (what NOT to do), acceptance criteria / done-definition, and any constraints (style, performance, environment). Prefer multiple-choice questions (options) when you can offer clear choices.`,
+            `Use the ask_user_question tool to ask the user focused questions to pin down the essential, ambiguous details. Ask ONE question at a time, strictly 1 to 3 questions total: what exactly to build/do, scope boundaries (what NOT to do), acceptance criteria / done-definition, and any constraints (style, performance, environment). Prefer 2 to 4 mutually exclusive options with the recommended choice placed FIRST, and explain the tradeoff in description.`,
             `Once you have enough to write an unambiguous, reviewable goal, STOP asking and reply with EXACTLY this format and nothing else (no preamble, no bullets):`,
             `GOAL: <one concrete, verifiable sentence describing the deliverable and its acceptance criteria>`,
             `Do NOT call create_goal or update_goal — just output the GOAL: line. If the user cancels or stops answering, still produce a sensible best-effort GOAL from what you already know.`,
@@ -4078,6 +4080,7 @@ export class DshClientSession {
             // 文件树跟随新项目（服务端原生 watcher 自动重挂）。
             void this.listFiles(undefined);
             this.pushTerminals();
+            this.pushSettings();
             this.flushSnapshot(true);
         }
         catch (err) {

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

@@ -12,7 +12,11 @@
  *   在文件里找一段连续行，其核心序列与 oldText 完全一致（仅唯一匹配才写）。
  * - 命中后按「整行替换」写入 newText **原样**（AI 给的缩进就是最终缩进），
  *   只做必要的行尾换行平衡。
- * - 若不支持片段（oldText 不是完整行）会在严格匹配阶段返回错误提示。
+ * - 若不支持片段（oldText 不是完整行）会返回错误提示：
+ *     • 多行 oldText 跨行但首/尾未对齐行边界 → 直接拒绝（否则会吃掉行首/行尾残留、
+ *       写出粘连内容）；
+ *     • 宽松阶段整块对不上、且首/尾行只是某行的一部分 → 报「片段」错而非笼统的「找不到」；
+ *     • 单行片段（如 `b();`）不改变行结构，仍照旧支持。
  *
  * 开关：设置面板「编辑」页 `editSoftEnabled`（默认关）。关闭时该工具从活跃集移除。
  */
@@ -22,24 +26,26 @@ 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";
-import { bilingual, pick } from "./i18n.js";
+import { pick } from "./i18n.js";
 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.", "要替换的文本。宽松匹配：每个非空行的内容（去掉首尾空白）需与文件中对应行一致；行首缩进（空格/制表符）的差异会被忽略。建议按整行/整块提供。"),
+        description: "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.",
     }),
     newText: Type.String({
-        description: bilingual("Replacement text (written verbatim; the indentation you provide is final).", "替换后的文本（原样写入，缩进即最终缩进）。"),
+        description: "Replacement text (written verbatim; the indentation you provide is final).",
     }),
 }, {});
 const editSoftSchema = Type.Object({
     path: Type.String({
-        description: bilingual("Path of the file to edit (relative or absolute).", "要编辑的文件路径（相对或绝对）"),
+        description: "Path of the file to edit (relative or absolute).",
     }),
     edits: Type.Array(replaceEditSchema, {
-        description: bilingual("One or more targeted replacements. Each edit matches against the original file (not incrementally); do not include overlapping/nested edits; merge edits touching the same block or nearby lines into one.", "一个或多个定向替换。每个 edit 相对原文件匹配（非增量）；不要包含重叠/嵌套的 edit；同一块或相邻行请合并成一个 edit。"),
+        description: "One or more targeted replacements. Each edit matches against the original file (not incrementally); " +
+            "do not include overlapping/nested edits; merge edits touching the same block or nearby lines into one.",
     }),
 }, {});
 function isSingleEditInput(value) {
@@ -142,6 +148,50 @@ export function oldTextCores(oldTextLF) {
         parts.pop();
     return parts.map((p) => p.trim());
 }
+/**
+ * 判断 oldText 的首行/末行是否只是「片段」（某文件行的一部分）。
+ * 宽松匹配要求每行都是完整行；当整块对不上时，若首/末行的核心确实出现在文件的
+ * **行中部**（既不在行首也不在行尾），则极可能是模型漏抄了行首/行尾。
+ *
+ * 仅在「整块核心序列一次都没命中」后才调用，因此只作诊断，不影响正常匹配。
+ */
+export function fragmentLineEnds(cores, units) {
+    const isMidLineFragment = (core) => {
+        if (core === "")
+            return false;
+        // 先看有没有任意一行与它整行相同：有 → 不是片段（只是缩进/上下文不对）。
+        if (units.some((u) => u.core === core))
+            return false;
+        // 再看它是否出现在某行的中部（前后都还有内容）→ 是片段。
+        return units.some((u) => {
+            const idx = u.raw.indexOf(core);
+            return idx > 0 && idx + core.length < u.raw.length;
+        });
+    };
+    const ends = [];
+    if (cores.length > 0 && isMidLineFragment(cores[0]))
+        ends.push(0);
+    if (cores.length > 1 && isMidLineFragment(cores[cores.length - 1]))
+        ends.push(1);
+    return ends;
+}
+/**
+ * 判断一段**精确命中**是否为「跨行但未对齐整行」的非法片段。
+ *
+ * 只包含单行的 oldText（如 `const x = 1;  `）是安全的：替换不会改动行结构。
+ * 但若 oldText 跨越了换行、且首/尾没落在行边界（既不在行首/行尾，也没包含整行），
+ * 直接子串替换会吃掉行首/行尾的残留，写出粘连内容——例如在
+ * `foo(a);\nfoo(b);` 上把 `a);\nfoo(` 换成 `z();` 会得到 `foo(z();b);`。
+ * 这几乎总是模型漏抄行首/行尾所致，因此报错而不静默写坏。
+ */
+export function isMisalignedMultilineFragment(content, start, oldTextLF) {
+    if (!oldTextLF.includes("\n"))
+        return false; // 单行片段：不影响行结构，允许
+    const end = start + oldTextLF.length;
+    const startsAtLineStart = start === 0 || content[start - 1] === "\n";
+    const endsAtLineBoundary = end === content.length || content[end] === "\n" || content[end - 1] === "\n";
+    return !(startsAtLineStart && endsAtLineBoundary);
+}
 /** NOT_FOUND / NOT_UNIQUE 用异常类型区分（与内置 edit 报错风格一致）。 */
 class SoftEditMatchError extends Error {
     constructor(message) {
@@ -158,7 +208,12 @@ function locateReplacement(normalizedContent, oldTextLF, newTextLF, path, editIn
     }
     // 1) 精确子串匹配（等价普通 edit，支持片段）
     const exactIdx = normalizedContent.indexOf(oldTextLF);
-    if (exactIdx !== -1) {
+    // 非法片段防御：多行 oldText 若未对齐整行边界，精确子串替换会吃掉行首/行尾
+    // 残留、写出粘连内容（如 `foo(a);\nfoo(b);` 把 `a);\nfoo(` 换成 `z();` →
+    // `foo(z();b);`）。这种命中一律不走精确路径，改为交给下面的「整行宽松匹配」；
+    // 只有当整行也匹配不上时才报错拒绝（避免误伤「首行省略缩进」等合法情况）。
+    const exactMisaligned = exactIdx !== -1 && isMisalignedMultilineFragment(normalizedContent, exactIdx, oldTextLF);
+    if (exactIdx !== -1 && !exactMisaligned) {
         // 唯一性：精确匹配出现多次 → 报错（模型应提供更多上下文）
         const occurrences = normalizedContent.split(oldTextLF).length - 1;
         if (occurrences > 1) {
@@ -186,6 +241,14 @@ function locateReplacement(normalizedContent, oldTextLF, newTextLF, path, editIn
             starts.push(i);
     }
     if (starts.length === 0) {
+        // 非法片段诊断：宽松匹配要求 oldText 的每一行都是**完整行**。若首/尾行只是
+        // 某文件行的一部分（模型漏抄了行首/行尾，例如只给了 `a);` 而非 `foo(a);`），
+        // 逐行核心永远对不上；这里给出针对性提示，而不是笼统的「找不到」。
+        // exactMisaligned 说明精确子串能命中、但跨行且未对齐整行（会写出粘连内容），
+        // 而整行匹配又对不上 —— 这种命中绝对不能走精确路径。
+        if (exactMisaligned || fragmentLineEnds(cores, units).length > 0) {
+            throw new SoftEditMatchError(pick(lang, `在 ${path} 中找不到该文本：edits[${editIndex}].oldText 跨越多行但首/尾没有落在行边界上（首行或末行只是文件中某行的一部分），而本工具按**整行**匹配。请让 oldText 的每一行都是完整行——行首缩进可以省略，但行内容必须完整。`, `Could not find the text in ${path}: edits[${editIndex}].oldText spans multiple lines but its start/end do not fall on line boundaries (its first or last line is only part of a file line), and this tool matches whole lines. Make every line of oldText a complete line — leading indentation may be omitted, but the line content must be complete.`, "editsoft.fragment.not.supported", { path, editIndex }));
+        }
         throw new SoftEditMatchError(pick(lang, `在 ${path} 中找不到该文本（精确或忽略缩进均未命中）。oldText 必须与文件的行内容一致；行首空白差异会被忽略，但实际内容必须完全相同。`, `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.`, "editsoft.match.not.found", { path }));
     }
     if (starts.length > 1) {
@@ -217,10 +280,14 @@ export function applySoftEdits(normalizedContent, edits, path, lang = "en") {
             throw new SoftEditMatchError(pick(lang, `在 ${path} 中的 edits 重叠。请合并为一个 edit 或定位到不相交的区域。`, `edits overlap in ${path}. Merge them into one edit or target disjoint regions.`, "editsoft.edits.overlap", { path }));
         }
     }
-    // 逆序应用，保持左侧偏移稳定
+    // 逆序应用，保持左侧偏移稳定。
+    // 关键：必须按**位置升序**（前面的 `sorted`）再逆序应用，不能按 edits 的传入
+    // 顺序逆序——模型若把靠后的 edit 写在前面，未排序的逆序应用会让后面的替换先
+    // 改变长度，前面的偏移随即串位，写出错乱内容（历史 bug：protocol.ts /
+    // use-chat.ts / ChatInput.tsx 被写坏）。内置 edit 同样先按 matchIndex 排序，此为对齐语义。
     let result = normalizedContent;
-    for (let i = replacements.length - 1; i >= 0; i--) {
-        const r = replacements[i];
+    for (let i = sorted.length - 1; i >= 0; i--) {
+        const r = sorted[i];
         result = result.slice(0, r.start) + r.insertText + result.slice(r.end);
     }
     if (result === normalizedContent) {
@@ -237,13 +304,14 @@ export function makeEditSoftTool(fallbackCwd, getLang) {
     return defineTool({
         name: SOFT_EDIT_TOOL_NAME,
         label: "Edit (indentation-insensitive)",
-        description: bilingual("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.", "用对缩进不敏感的文本替换编辑单个文件。每个 edits[].oldText 按行内容与文件匹配：oldText 与文件之间的行首空白（空格/制表符）差异会被忽略，因此不会仅因缩进不同而失败。当内置 edit 工具因空白不匹配拒绝你的 oldText 时使用本工具（常见于 JS/JSON 等）。oldText 尽量按整行/整块提供。newText 按原样写入。"),
-        promptSnippet: bilingual("edit a file tolerating indentation differences (whitespace-insensitive match)", "编辑文件，容忍缩进差异（空白不敏感匹配）"),
+        description: "Edit a single file with text replacement tolerant of indentation: oldText is matched by line content, ignoring leading-whitespace differences, so edits don't fail on indentation mismatch. " +
+            "Use when the built-in edit rejects oldText due to whitespace (common in JS/JSON). Prefer whole-line/whole-block oldText; newText is written exactly as provided.",
+        promptSnippet: "edit a file tolerating indentation differences (whitespace-insensitive match)",
         promptGuidelines: [
-            bilingual("Use edit_soft when edit fails because the oldText indentation/spacing differs from the file", "当 edit 因 oldText 缩进/空白与文件不一致而失败时，使用 edit_soft"),
-            bilingual("Each edits[].oldText is matched to whole lines by trimmed content; leading whitespace is ignored", "每个 edits[].oldText 按去首尾空白后的内容匹配到整行；行首空白会被忽略"),
-            bilingual("newText is written verbatim — the indentation you provide is the final indentation in the file", "newText 按原样写入——你提供的缩进就是文件中的最终缩进"),
-            bilingual("Keep edits[].oldText as small as possible while still being unique; merge nearby changes into one edit", "edits[].oldText 在保持唯一的前提下尽量小；相邻改动合并为一个 edit"),
+            "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,