pi-web-ui 0.94.0 → 0.95.0

package/dist/server/dsh/dsh-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,
@@ -1803,62 +1807,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 +1858,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)
@@ -2624,6 +2599,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 +2610,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 +2675,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 +2719,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 +2727,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,
@@ -3059,6 +3045,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 +3086,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 +3098,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,

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

@@ -12,7 +12,11 @@
  *   在文件里找一段连续行，其核心序列与 oldText 完全一致（仅唯一匹配才写）。
  * - 命中后按「整行替换」写入 newText **原样**（AI 给的缩进就是最终缩进），
  *   只做必要的行尾换行平衡。
- * - 若不支持片段（oldText 不是完整行）会在严格匹配阶段返回错误提示。
+ * - 若不支持片段（oldText 不是完整行）会返回错误提示：
+ *     • 多行 oldText 跨行但首/尾未对齐行边界 → 直接拒绝（否则会吃掉行首/行尾残留、
+ *       写出粘连内容）；
+ *     • 宽松阶段整块对不上、且首/尾行只是某行的一部分 → 报「片段」错而非笼统的「找不到」；
+ *     • 单行片段（如 `b();`）不改变行结构，仍照旧支持。
  *
  * 开关：设置面板「编辑」页 `editSoftEnabled`（默认关）。关闭时该工具从活跃集移除。
  */
@@ -142,6 +146,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 +206,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 +239,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 +278,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) {