@trim21/personal-pi-extensions 0.0.407 → 0.0.409

package/README.md

@@ -386,7 +386,7 @@ read/edit/write 工具内置 LSP 诊断（写文件后等待并报告 ERROR 级
 
 内置默认服务器（typescript / pyright / ruff / clangd）始终存在；`servers` 以 key 为服务器 id 与默认合并——同 key 整体覆盖（整个配置替换默认）、新 key 新增、`"enabled": false` 移除（如 `"clangd": { "enabled": false }`）。executable 的发现逻辑（如 tsserver 路径、venv 里的 python）不内置，需要时用 `bin` / `args` / `settings` 自行表达。
 
-旧的 `enabled`（白名单）/ `disabled`（排除）与全局超时字段（`initializeTimeoutMs` 等）继续可用。
+旧的 `enabled`（白名单）/ `disabled`（排除）与全局超时字段（`initializeTimeoutMs` 等）继续可用。`enabled` 里的 id 必须是已注册服务器，否则视为配置错误；`disabled` 里未注册的 id 直接忽略。
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.407",
+  "version": "0.0.409",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/aft/tools.ts

@@ -157,7 +157,7 @@ export function registerOutlineTool(pi: ExtensionAPI, ctx: AftToolContext): void
   });
 }
 
-/** 构建 aft_outline pendant 的 subtitle：`target="…"`（路径过长时只显示文件名）。 */
+/** 构建 aft_outline pendant 的 subtitle：`target="…"`（路径过长时显示上一级目录加文件名）。 */
 export function buildOutlineSubtitle(cwd: string, target: string): string {
   return `target="${formatSubtitlePath(cwd, resolvePathArg(cwd, target))}"`;
 }

package/src/claude-code/files.ts

@@ -14,6 +14,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import { appendLspDiagnosticText } from "../lib/lsp/diagnostic.js";
 import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
 import { formatSubtitlePath } from "../lib/path.js";
 import { guardWriteAccess } from "../lib/write-guard.js";
@@ -394,173 +395,177 @@ export function registerFileTools(
           replaceAll: params.replace_all,
         },
       });
-      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue<
-        [string, FileToolDetails, string, number]
-      >(filePath, async () => {
-        const oldString = params.old_string;
-        const newString = params.new_string;
-        if (oldString === newString) {
-          throw new Error("No changes to make: old_string and new_string are exactly the same.");
-        }
-        // 空 old_string：创建新文件或填充空文件（不需要先 Read，对齐 Claude Code）
-        if (oldString === "") {
-          let exists = true;
-          try {
-            const value = await stat(filePath);
-            if (value.isFile()) {
-              const content = await readFile(filePath, "utf8");
-              if (content.trim() !== "") {
-                throw new Error("Cannot create new file - file already exists.");
+      const [message, details, diagnosticText, errorCount, warningCount] =
+        await withFileMutationQueue<[string, FileToolDetails, string, number, number]>(
+          filePath,
+          async () => {
+            const oldString = params.old_string;
+            const newString = params.new_string;
+            if (oldString === newString) {
+              throw new Error(
+                "No changes to make: old_string and new_string are exactly the same.",
+              );
+            }
+            // 空 old_string：创建新文件或填充空文件（不需要先 Read，对齐 Claude Code）
+            if (oldString === "") {
+              let exists = true;
+              try {
+                const value = await stat(filePath);
+                if (value.isFile()) {
+                  const content = await readFile(filePath, "utf8");
+                  if (content.trim() !== "") {
+                    throw new Error("Cannot create new file - file already exists.");
+                  }
+                }
+              } catch (error) {
+                if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+                  exists = false;
+                } else {
+                  throw error;
+                }
+              }
+              if (!exists) await mkdir(dirname(filePath), { recursive: true });
+              await writeFile(filePath, newString, "utf8");
+              const snapshot = snapshotOf(newString);
+              const key = await readStateKey(filePath);
+              state.reads.set(key, snapshot);
+              const diff = generateDiffString("", convertLeadingTabsToSpaces(newString));
+              throwIfAborted(signal);
+              const {
+                text: diagnosticText,
+                errorCount,
+                warningCount,
+              } = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
+                notify: (message, level) => ctx.ui.notify(message, level),
+                signal,
+              });
+              return [
+                `The file ${filePath} has been updated successfully.`,
+                {
+                  diff: diff.diff,
+                  patch: generateUnifiedPatch(filePath, "", convertLeadingTabsToSpaces(newString)),
+                  firstChangedLine: diff.firstChangedLine,
+                  reads: { [key]: snapshot },
+                },
+                diagnosticText,
+                errorCount,
+                warningCount,
+              ];
+            }
+            const replaceAll = params.replace_all ?? false;
+            // 防止 OOM 的大文件检查（对齐 Claude Code）
+            try {
+              const { size } = await stat(filePath);
+              if (size > MAX_EDIT_FILE_SIZE) {
+                throw new Error(
+                  `File is too large to edit (${formatFileSize(size)}). Maximum editable file size is ${formatFileSize(MAX_EDIT_FILE_SIZE)}.`,
+                );
+              }
+            } catch (error) {
+              if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
+                throw error;
               }
             }
-          } catch (error) {
-            if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-              exists = false;
-            } else {
+            let content: Buffer;
+            try {
+              content = await readFile(filePath);
+            } catch (error) {
+              if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+                const suggestion = await didYouMean(filePath, ctx.cwd);
+                throw new Error(
+                  `File does not exist. Note: your current working directory is ${ctx.cwd}.${suggestion ? ` Did you mean ${suggestion}?` : ""}`,
+                  { cause: error },
+                );
+              }
               throw error;
             }
-          }
-          if (!exists) await mkdir(dirname(filePath), { recursive: true });
-          await writeFile(filePath, newString, "utf8");
-          const snapshot = snapshotOf(newString);
-          const key = await readStateKey(filePath);
-          state.reads.set(key, snapshot);
-          const diff = generateDiffString("", convertLeadingTabsToSpaces(newString));
-          throwIfAborted(signal);
-          const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
-            filePath,
-            ctx.cwd,
-            {
-              notify: (message, level) => ctx.ui.notify(message, level),
-              signal,
-            },
-          );
-          return [
-            `The file ${filePath} has been updated successfully.`,
-            {
-              diff: diff.diff,
-              patch: generateUnifiedPatch(filePath, "", convertLeadingTabsToSpaces(newString)),
-              firstChangedLine: diff.firstChangedLine,
-              reads: { [key]: snapshot },
-            },
-            diagnosticText,
-            errorCount,
-          ];
-        }
-        const replaceAll = params.replace_all ?? false;
-        // 防止 OOM 的大文件检查（对齐 Claude Code）
-        try {
-          const { size } = await stat(filePath);
-          if (size > MAX_EDIT_FILE_SIZE) {
-            throw new Error(
-              `File is too large to edit (${formatFileSize(size)}). Maximum editable file size is ${formatFileSize(MAX_EDIT_FILE_SIZE)}.`,
-            );
-          }
-        } catch (error) {
-          if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
-            throw error;
-          }
-        }
-        let content: Buffer;
-        try {
-          content = await readFile(filePath);
-        } catch (error) {
-          if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-            const suggestion = await didYouMean(filePath, ctx.cwd);
-            throw new Error(
-              `File does not exist. Note: your current working directory is ${ctx.cwd}.${suggestion ? ` Did you mean ${suggestion}?` : ""}`,
-              { cause: error },
-            );
-          }
-          throw error;
-        }
-        if (extname(filePath).toLowerCase() === ".ipynb") {
-          throw new Error(
-            "File is a Jupyter Notebook. Use the NotebookEditTool to edit this file.",
-          );
-        }
-        const key = await readStateKey(filePath);
-        requireCurrentRead(state, key, filePath, content);
-        await access(filePath, constants.R_OK | constants.W_OK);
-        throwIfAborted(signal);
-        const original = content.toString("utf8");
-
-        // CRLF 规范化后匹配（old_string 不需要带 \r），写回时恢复原行尾
-        const crlfCount = (original.match(/\r\n/g) ?? []).length;
-        const lfCount = (original.match(/(?<!\r)\n/g) ?? []).length;
-        const lineEnding = crlfCount > lfCount ? "\r\n" : "\n";
-        const normalized = original.replaceAll("\r\n", "\n");
-        const actualOldString = findActualString(normalized, oldString) ?? oldString;
-        const matches = normalized.split(actualOldString).length - 1;
-        if (matches === 0) {
-          throw new Error(`String to replace not found in file.\nString: ${oldString}`);
-        }
-        if (!replaceAll && matches > 1) {
-          throw new Error(
-            `Found ${matches} matches of the string to replace, but replace_all is false. To replace all occurrences, set replace_all to true. To replace only one occurrence, please provide more context to uniquely identify the instance.\nString: ${oldString}`,
-          );
-        }
-        const actualNewString = preserveQuoteStyle(oldString, actualOldString, newString);
-        // 删除场景（new_string 为空）：old_string 不以换行结尾且文件里是
-        // "old_string\n" 时连换行一起删，避免留下空行（对齐 Claude Code
-        // applyEditToFile 的 stripTrailingNewline 语义）
-        let searchString = actualOldString;
-        if (
-          actualNewString === "" &&
-          !actualOldString.endsWith("\n") &&
-          normalized.includes(actualOldString + "\n")
-        ) {
-          searchString = actualOldString + "\n";
-        }
-        // split/join 与函数替换：replacement 含 $ 时不会触发 $& 等特殊语义
-        const updated = replaceAll
-          ? normalized.split(searchString).join(actualNewString)
-          : normalized.replace(searchString, () => actualNewString);
-        const restored = lineEnding === "\r\n" ? updated.replaceAll("\n", "\r\n") : updated;
-        await writeFile(filePath, restored, "utf8");
-        const snapshot = snapshotOf(restored);
-        state.reads.set(key, snapshot);
-        // patch/diff 仅供显示：前导 tab 转空格，避免 UI 渲染错位（对齐 Claude Code）
-        const diff = generateDiffString(
-          convertLeadingTabsToSpaces(original),
-          convertLeadingTabsToSpaces(restored),
-        );
-        const text = replaceAll
-          ? `The file ${filePath} has been updated. All occurrences were successfully replaced.`
-          : `The file ${filePath} has been updated successfully.`;
-        throwIfAborted(signal);
-        const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
-          filePath,
-          ctx.cwd,
-          {
-            notify: (message, level) => ctx.ui.notify(message, level),
-          },
-        );
-        return [
-          text,
-          {
-            diff: diff.diff,
-            patch: generateUnifiedPatch(
-              filePath,
+            if (extname(filePath).toLowerCase() === ".ipynb") {
+              throw new Error(
+                "File is a Jupyter Notebook. Use the NotebookEditTool to edit this file.",
+              );
+            }
+            const key = await readStateKey(filePath);
+            requireCurrentRead(state, key, filePath, content);
+            await access(filePath, constants.R_OK | constants.W_OK);
+            throwIfAborted(signal);
+            const original = content.toString("utf8");
+
+            // CRLF 规范化后匹配（old_string 不需要带 \r），写回时恢复原行尾
+            const crlfCount = (original.match(/\r\n/g) ?? []).length;
+            const lfCount = (original.match(/(?<!\r)\n/g) ?? []).length;
+            const lineEnding = crlfCount > lfCount ? "\r\n" : "\n";
+            const normalized = original.replaceAll("\r\n", "\n");
+            const actualOldString = findActualString(normalized, oldString) ?? oldString;
+            const matches = normalized.split(actualOldString).length - 1;
+            if (matches === 0) {
+              throw new Error(`String to replace not found in file.\nString: ${oldString}`);
+            }
+            if (!replaceAll && matches > 1) {
+              throw new Error(
+                `Found ${matches} matches of the string to replace, but replace_all is false. To replace all occurrences, set replace_all to true. To replace only one occurrence, please provide more context to uniquely identify the instance.\nString: ${oldString}`,
+              );
+            }
+            const actualNewString = preserveQuoteStyle(oldString, actualOldString, newString);
+            // 删除场景（new_string 为空）：old_string 不以换行结尾且文件里是
+            // "old_string\n" 时连换行一起删，避免留下空行（对齐 Claude Code
+            // applyEditToFile 的 stripTrailingNewline 语义）
+            let searchString = actualOldString;
+            if (
+              actualNewString === "" &&
+              !actualOldString.endsWith("\n") &&
+              normalized.includes(actualOldString + "\n")
+            ) {
+              searchString = actualOldString + "\n";
+            }
+            // split/join 与函数替换：replacement 含 $ 时不会触发 $& 等特殊语义
+            const updated = replaceAll
+              ? normalized.split(searchString).join(actualNewString)
+              : normalized.replace(searchString, () => actualNewString);
+            const restored = lineEnding === "\r\n" ? updated.replaceAll("\n", "\r\n") : updated;
+            await writeFile(filePath, restored, "utf8");
+            const snapshot = snapshotOf(restored);
+            state.reads.set(key, snapshot);
+            // patch/diff 仅供显示：前导 tab 转空格，避免 UI 渲染错位（对齐 Claude Code）
+            const diff = generateDiffString(
               convertLeadingTabsToSpaces(original),
               convertLeadingTabsToSpaces(restored),
-            ),
-            firstChangedLine: diff.firstChangedLine,
-            reads: { [key]: snapshot },
+            );
+            const text = replaceAll
+              ? `The file ${filePath} has been updated. All occurrences were successfully replaced.`
+              : `The file ${filePath} has been updated successfully.`;
+            throwIfAborted(signal);
+            const {
+              text: diagnosticText,
+              errorCount,
+              warningCount,
+            } = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
+              notify: (message, level) => ctx.ui.notify(message, level),
+            });
+            return [
+              text,
+              {
+                diff: diff.diff,
+                patch: generateUnifiedPatch(
+                  filePath,
+                  convertLeadingTabsToSpaces(original),
+                  convertLeadingTabsToSpaces(restored),
+                ),
+                firstChangedLine: diff.firstChangedLine,
+                reads: { [key]: snapshot },
+              },
+              diagnosticText,
+              errorCount,
+              warningCount,
+            ];
           },
-          diagnosticText,
-          errorCount,
-        ];
-      });
+        );
 
-      const text = diagnosticText
-        ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
-        : message;
+      const text = appendLspDiagnosticText(message, diagnosticText, errorCount);
       return {
         content: [{ type: "text" as const, text }],
         details: {
           ...details,
-          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount) },
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount, warningCount) },
         },
       };
     },
@@ -593,65 +598,66 @@ export function registerFileTools(
         absolutePath: filePath,
         change: { oldText: "", newText: params.content },
       });
-      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue<
-        [string, FileToolDetails, string, number]
-      >(filePath, async () => {
-        let original: string | undefined;
-        let key: string | undefined;
-        try {
-          const value = await stat(filePath);
-          if (value.isFile()) {
-            const content = await readFile(filePath);
-            key = await readStateKey(filePath);
-            requireCurrentRead(state, key, filePath, content);
-            original = content.toString("utf8");
-          }
-        } catch (error) {
-          if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
-            throw error;
-          }
-        }
-        throwIfAborted(signal);
-        await mkdir(dirname(filePath), { recursive: true });
-        await writeFile(filePath, params.content, "utf8");
-        const snapshot = snapshotOf(params.content);
-        // 新建文件：writeFile 之后 realpath 才能解析；覆盖写则复用上面的 key
-        const resolvedKey = key ?? (await readStateKey(filePath));
-        state.reads.set(resolvedKey, snapshot);
-        const diff = generateDiffString(original ?? "", params.content);
-        const text =
-          original === undefined
-            ? `File created successfully at: ${filePath}`
-            : `The file ${filePath} has been updated successfully.`;
-        throwIfAborted(signal);
-        const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
+      const [message, details, diagnosticText, errorCount, warningCount] =
+        await withFileMutationQueue<[string, FileToolDetails, string, number, number]>(
           filePath,
-          ctx.cwd,
-          {
-            notify: (message, level) => ctx.ui.notify(message, level),
+          async () => {
+            let original: string | undefined;
+            let key: string | undefined;
+            try {
+              const value = await stat(filePath);
+              if (value.isFile()) {
+                const content = await readFile(filePath);
+                key = await readStateKey(filePath);
+                requireCurrentRead(state, key, filePath, content);
+                original = content.toString("utf8");
+              }
+            } catch (error) {
+              if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
+                throw error;
+              }
+            }
+            throwIfAborted(signal);
+            await mkdir(dirname(filePath), { recursive: true });
+            await writeFile(filePath, params.content, "utf8");
+            const snapshot = snapshotOf(params.content);
+            // 新建文件：writeFile 之后 realpath 才能解析；覆盖写则复用上面的 key
+            const resolvedKey = key ?? (await readStateKey(filePath));
+            state.reads.set(resolvedKey, snapshot);
+            const diff = generateDiffString(original ?? "", params.content);
+            const text =
+              original === undefined
+                ? `File created successfully at: ${filePath}`
+                : `The file ${filePath} has been updated successfully.`;
+            throwIfAborted(signal);
+            const {
+              text: diagnosticText,
+              errorCount,
+              warningCount,
+            } = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
+              notify: (message, level) => ctx.ui.notify(message, level),
+            });
+            return [
+              text,
+              {
+                diff: diff.diff,
+                patch: generateUnifiedPatch(filePath, original ?? "", params.content),
+                firstChangedLine: diff.firstChangedLine,
+                reads: { [resolvedKey]: snapshot },
+              },
+              diagnosticText,
+              errorCount,
+              warningCount,
+            ];
           },
         );
-        return [
-          text,
-          {
-            diff: diff.diff,
-            patch: generateUnifiedPatch(filePath, original ?? "", params.content),
-            firstChangedLine: diff.firstChangedLine,
-            reads: { [resolvedKey]: snapshot },
-          },
-          diagnosticText,
-          errorCount,
-        ];
-      });
 
-      const text = diagnosticText
-        ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
-        : message;
+      const text = appendLspDiagnosticText(message, diagnosticText, errorCount);
       return {
         content: [{ type: "text" as const, text }],
         details: {
           ...details,
-          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount) },
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount, warningCount) },
         },
       };
     },

package/src/lib/lsp/diagnostic.ts

@@ -1,6 +1,5 @@
 /**
- * 诊断报告格式化（移植自 opencode lsp/diagnostic.ts）：只报告 ERROR
- * 级诊断，每个文件最多 20 条。
+ * 诊断报告格式化：报告 ERROR 与 WARN，每个文件最多 20 条。
  */
 
 import type { Diagnostic } from "./client.js";
@@ -14,8 +13,12 @@ const SEVERITY_LABELS: Record<number, string> = {
   4: "HINT",
 };
 
+function severityOf(diagnostic: Diagnostic): number {
+  return diagnostic.severity ?? 1;
+}
+
 export function prettyDiagnostic(diagnostic: Diagnostic): string {
-  const severity = SEVERITY_LABELS[diagnostic.severity || 1] ?? "ERROR";
+  const severity = SEVERITY_LABELS[severityOf(diagnostic)] ?? "ERROR";
   const line = diagnostic.range.start.line + 1;
   const col = diagnostic.range.start.character + 1;
   // 3.18 起 message 可能是 MarkupContent（客户端未声明 markupMessageSupport 时不会出现）
@@ -24,12 +27,25 @@ export function prettyDiagnostic(diagnostic: Diagnostic): string {
   return `${severity} [${line}:${col}] ${message}`;
 }
 
-/** 返回空字符串表示没有 ERROR 级诊断。 */
+/** 返回空字符串表示没有 ERROR / WARN。ERROR 在前，WARN 在后。 */
 export function report(file: string, issues: Diagnostic[]): string {
-  const errors = issues.filter((item) => item.severity === 1);
-  if (errors.length === 0) return "";
-  const limited = errors.slice(0, MAX_PER_FILE);
-  const more = errors.length - MAX_PER_FILE;
+  const errors = issues.filter((item) => severityOf(item) === 1);
+  const warnings = issues.filter((item) => item.severity === 2);
+  const relevant = [...errors, ...warnings];
+  if (relevant.length === 0) return "";
+  const limited = relevant.slice(0, MAX_PER_FILE);
+  const more = relevant.length - MAX_PER_FILE;
   const suffix = more > 0 ? `\n... and ${more} more` : "";
   return `<diagnostics file="${file}">\n${limited.map((d) => prettyDiagnostic(d)).join("\n")}${suffix}\n</diagnostics>`;
 }
+
+/** 把 LSP 诊断块接到工具成功文案后面；无诊断时原样返回。 */
+export function appendLspDiagnosticText(
+  message: string,
+  diagnosticText: string,
+  errorCount: number,
+): string {
+  if (!diagnosticText) return message;
+  const kind = errorCount > 0 ? "errors" : "warnings";
+  return `${message}\n\nLSP ${kind} detected in this file:\n${diagnosticText}`;
+}

package/src/lib/lsp/lsp.ts

@@ -7,9 +7,10 @@
  *   （本地覆盖全局）：`servers` 按 id 合并（同名 id 整体覆盖、新增 id，全局
  *   其余服务器保留），`enabled`/`disabled` 白名单与各超时参数继续生效；
  *   没有内置默认服务器，所有服务器均须在配置里定义；
- *   配置在每个工具的调用 cwd 下惰性读取；enabled/disabled 引用不存在的
- *   服务器 id 是配置错误：全局配置在扩展加载（createLspService）时抛错，
- *   本地配置在 session 开始预加载时通知，工具调用时校验抛错兜底；
+ *   配置在每个工具的调用 cwd 下惰性读取；enabled 引用不存在的服务器 id
+ *   是配置错误：全局配置在扩展加载（createLspService）时抛错，本地配置在
+ *   session 开始预加载时通知，工具调用时校验抛错兜底。disabled 中未注册
+ *   的 id 直接忽略；
  * - client 按 (root, serverID) 缓存，并发 spawn 去重，启动失败记入 broken
  *   集合（服务实例生命周期内不再重试）；
  * - 工具只与 touchFile / diagnostics / lspDiagnosticsForFile 三个方法打交道；通知回调按请求传入。
@@ -114,20 +115,19 @@ function readConfigFileSync(filePath: string): LspConfig {
 }
 
 /**
- * enabled/disabled 引用的 id 必须存在于实际生效的服务器集合（注入的 adapters
- * 或默认 + 配置 servers），否则抛配置错误（避免静默失效）。
+ * enabled 引用的 id 必须存在于实际生效的服务器集合（注入的 adapters 或配置
+ * servers），否则抛配置错误（避免白名单静默失效）。disabled 中未注册的 id
+ * 直接忽略。
  */
 function validateConfig(config: LspConfig, adapters?: LspServerAdapter[]): void {
   const available = new Set(
     adapters ? adapters.map((adapter) => adapter.id) : Object.keys(config.servers ?? {}),
   );
-  const unknown = [...(config.enabled ?? []), ...(config.disabled ?? [])].filter(
-    (id) => !available.has(id),
-  );
+  const unknown = (config.enabled ?? []).filter((id) => !available.has(id));
   if (unknown.length > 0) {
     const list = [...available].toSorted().join(", ") || "none";
     throw new Error(
-      `lsp.json: unknown server id in enabled/disabled: ${unknown.join(", ")} (available: ${list})`,
+      `lsp.json: unknown server id in enabled: ${unknown.join(", ")} (available: ${list})`,
     );
   }
 }
@@ -155,8 +155,8 @@ export async function loadLspConfig(
 }
 
 /**
- * 按配置过滤 adapter 列表。enabled/disabled 引用了实际生效集合中不存在的
- * 服务器 id 时抛错（配置错误，避免静默失效）。
+ * 按配置过滤 adapter 列表。enabled 引用了实际生效集合中不存在的服务器 id
+ * 时抛错（配置错误，避免白名单静默失效）；disabled 中未注册的 id 忽略。
  */
 export function filterAdapters(
   adapters: LspServerAdapter[],
@@ -212,7 +212,7 @@ export interface LspService {
     file: string,
     cwd: string,
     options?: LspRequestOptions,
-  ): Promise<{ text: string; errorCount: number }>;
+  ): Promise<{ text: string; errorCount: number; warningCount: number }>;
   shutdownAll(): Promise<void>;
   /** 注入 status 渲染回调；传入 undefined 表示不再渲染。 */
   attachStatus(render: StatusRenderer | undefined): void;
@@ -408,21 +408,22 @@ export function createLspService(
   }
 
   /**
-   * edit/write 用：等待文档诊断并返回该文件的 ERROR 报告（text 空串表示无错误）
-   * 与 ERROR 数量。内部所有 LSP 失败都会被吞掉，不干扰写操作本身。
+   * edit/write 用：等待文档诊断并返回该文件的 ERROR / WARN 报告（text 空串表示无此类诊断）
+   * 与数量。内部所有 LSP 失败都会被吞掉，不干扰写操作本身。
    */
   async function lspDiagnosticsForFile(
     file: string,
     cwd: string,
     options?: LspRequestOptions,
-  ): Promise<{ text: string; errorCount: number }> {
-    if (options?.signal?.aborted) return { text: "", errorCount: 0 };
+  ): Promise<{ text: string; errorCount: number; warningCount: number }> {
+    if (options?.signal?.aborted) return { text: "", errorCount: 0, warningCount: 0 };
     await touchFile(file, cwd, "document", options);
     const all = await diagnostics();
     const normalized = normalize(file);
     const issues = all[normalized] ?? [];
-    const errorCount = issues.filter((item) => item.severity === 1).length;
-    return { text: report(normalized, issues), errorCount };
+    const errorCount = issues.filter((item) => (item.severity ?? 1) === 1).length;
+    const warningCount = issues.filter((item) => item.severity === 2).length;
+    return { text: report(normalized, issues), errorCount, warningCount };
   }
 
   /** 终止全部服务器进程（session_shutdown 时调用）。 */

package/src/lib/path.ts

@@ -4,7 +4,7 @@
 
 import { stat } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename, isAbsolute, join, relative, resolve } from "node:path";
+import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 
 /**
  * Expand a leading `~` to the user's home directory.
@@ -60,13 +60,33 @@ export function formatDisplayPath(cwd: string, filePath: string): string {
   return filePath;
 }
 
-/** subtitle 中路径的最大显示长度，超过时退化为仅文件名。 */
+/** subtitle 中路径的最大显示长度，超过时退化为 `parent/basename`。 */
 export const MAX_SUBTITLE_PATH_LENGTH = 20;
 
-/** subtitle 用的显示路径：优先 `./…` / `~/…` / 绝对路径，结果过长时只显示文件名。 */
-export function formatSubtitlePath(cwd: string, filePath: string, errorCount?: number): string {
-  const display = formatDisplayPath(cwd, filePath);
-  const base = display.length <= MAX_SUBTITLE_PATH_LENGTH ? display : basename(filePath);
-  if (errorCount === undefined || errorCount === 0) return base;
-  return `${base} (ⓧ ${errorCount})`;
+function shortenSubtitlePath(filePath: string, display: string): string {
+  if (display.length <= MAX_SUBTITLE_PATH_LENGTH) return display;
+  const name = basename(filePath);
+  const parentDir = dirname(filePath);
+  const parentName = basename(parentDir);
+  if (parentName === "" || parentName === "." || parentDir === parentName) return name;
+  return join(parentName, name);
+}
+
+function formatSubtitleCounts(errorCount?: number, warningCount?: number): string {
+  const parts: string[] = [];
+  if (errorCount) parts.push(`ⓧ ${errorCount}`);
+  if (warningCount) parts.push(`⚠ ${warningCount}`);
+  return parts.join(" ");
+}
+
+/** subtitle 用的显示路径：优先 `./…` / `~/…` / 绝对路径，过长时显示上一级目录加文件名。 */
+export function formatSubtitlePath(
+  cwd: string,
+  filePath: string,
+  errorCount?: number,
+  warningCount?: number,
+): string {
+  const pathText = shortenSubtitlePath(filePath, formatDisplayPath(cwd, filePath));
+  const counts = formatSubtitleCounts(errorCount, warningCount);
+  return counts ? `${pathText} (${counts})` : pathText;
 }

package/src/opencode/files.ts

@@ -29,6 +29,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import { appendLspDiagnosticText } from "../lib/lsp/diagnostic.js";
 import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
 import { formatSubtitlePath } from "../lib/path.js";
 import { guardWriteAccess } from "../lib/write-guard.js";
@@ -492,9 +493,8 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
         change: { oldText: oldString, newText: newString, replaceAll },
       });
 
-      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue(
-        absolutePath,
-        async () => {
+      const [message, details, diagnosticText, errorCount, warningCount] =
+        await withFileMutationQueue(absolutePath, async () => {
           signal?.throwIfAborted();
 
           // opencode: 前置校验，先于空 oldString 分支
@@ -519,16 +519,17 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
             await mkdir(dirname(absolutePath), { recursive: true });
             signal?.throwIfAborted();
             await writeFile(absolutePath, newString, "utf8");
-            const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
-              absolutePath,
-              ctx.cwd,
-              { signal },
-            );
+            const {
+              text: diagnosticText,
+              errorCount,
+              warningCount,
+            } = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, { signal });
             return [
               "Edit applied successfully.",
               { diff: "", patch: "", firstChangedLine: 0 },
               diagnosticText,
               errorCount,
+              warningCount,
             ] as const;
           }
 
@@ -560,28 +561,28 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
           const diffNew = normalizeToLF(applied.contentNew);
           const diffResult = generateDiffString(diffOld, diffNew);
           const patch = generateUnifiedPatch(filePath, diffOld, diffNew);
-          const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
-            absolutePath,
-            ctx.cwd,
-            { signal },
-          );
+          const {
+            text: diagnosticText,
+            errorCount,
+            warningCount,
+          } = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, { signal });
           return [
             "Edit applied successfully.",
             { diff: diffResult.diff, patch, firstChangedLine: diffResult.firstChangedLine },
             diagnosticText,
             errorCount,
+            warningCount,
           ] as const;
-        },
-      );
+        });
 
-      const text = diagnosticText
-        ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
-        : message;
+      const text = appendLspDiagnosticText(message, diagnosticText, errorCount);
       return {
         content: [{ type: "text" as const, text }],
         details: {
           ...details,
-          pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath, errorCount) },
+          pendant: {
+            subtitle: formatSubtitlePath(ctx.cwd, absolutePath, errorCount, warningCount),
+          },
         },
       };
     },
@@ -636,9 +637,8 @@ function registerWriteTool(pi: ExtensionAPI, service: LspService): void {
       });
       const dir = dirname(absolutePath);
 
-      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue(
-        absolutePath,
-        async () => {
+      const [message, details, diagnosticText, errorCount, warningCount] =
+        await withFileMutationQueue(absolutePath, async () => {
           signal?.throwIfAborted();
 
           // opencode: desiredBom = source.bom || next.bom —— 保留原文件 BOM，
@@ -661,24 +661,29 @@ function registerWriteTool(pi: ExtensionAPI, service: LspService): void {
           await mkdir(dir, { recursive: true });
           signal?.throwIfAborted();
           await writeFile(absolutePath, desiredBom + nextText, "utf8");
-          const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
-            absolutePath,
-            ctx.cwd,
-            { signal },
-          );
+          const {
+            text: diagnosticText,
+            errorCount,
+            warningCount,
+          } = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, { signal });
 
-          return ["Wrote file successfully.", {}, diagnosticText, errorCount] as const;
-        },
-      );
+          return [
+            "Wrote file successfully.",
+            {},
+            diagnosticText,
+            errorCount,
+            warningCount,
+          ] as const;
+        });
 
-      const text = diagnosticText
-        ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
-        : message;
+      const text = appendLspDiagnosticText(message, diagnosticText, errorCount);
       return {
         content: [{ type: "text" as const, text }],
         details: {
           ...details,
-          pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath, errorCount) },
+          pendant: {
+            subtitle: formatSubtitlePath(ctx.cwd, absolutePath, errorCount, warningCount),
+          },
         },
       };
     },