@trim21/personal-pi-extensions 0.0.406 → 0.0.407

package/package.json

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

package/src/aft/tools.ts

@@ -8,7 +8,7 @@
 import { readFileSync } from "node:fs";
 import { stat } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename, isAbsolute, join, resolve } from "node:path";
+import { isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import {
@@ -23,7 +23,7 @@ import {
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
-import { formatDisplayPath } from "../lib/path.js";
+import { formatDisplayPath, formatSubtitlePath } from "../lib/path.js";
 import { type ToolPendant } from "../lib/pendant.js";
 import { callAftTool, SEMANTIC_INDEX_WAIT_TIMEOUT_MS } from "./bridge.js";
 
@@ -51,16 +51,6 @@ export function resolvePathArg(cwd: string, input: string): string {
   return isAbsolute(input) ? input : resolve(cwd, input);
 }
 
-/** subtitle 中路径的最大显示长度，超过时退化为仅文件名。 */
-export const MAX_SUBTITLE_PATH_LENGTH = 20;
-
-/** subtitle 用的显示路径：优先 `./…` / `~/…` / 绝对路径，结果过长时只显示文件名。 */
-export function formatSubtitlePath(cwd: string, filePath: string): string {
-  const display = formatDisplayPath(cwd, filePath);
-  if (display.length <= MAX_SUBTITLE_PATH_LENGTH) return display;
-  return basename(filePath);
-}
-
 export interface AftToolContext {
   cwd: string;
   pool: AftTransportPool;

package/src/claude-code/files.ts

@@ -15,6 +15,7 @@ import {
 import { Type } from "typebox";
 
 import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
+import { formatSubtitlePath } from "../lib/path.js";
 import { guardWriteAccess } from "../lib/write-guard.js";
 import {
   type ClaudeCodeState,
@@ -295,7 +296,13 @@ export function registerFileTools(
         const snapshot = snapshotOf(image, false);
         const key = await readStateKey(filePath);
         state.reads.set(key, snapshot);
-        return { content, details: { reads: { [key]: snapshot } } };
+        return {
+          content,
+          details: {
+            reads: { [key]: snapshot },
+            pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath) },
+          },
+        };
       }
 
       const offset = params.offset ?? 1;
@@ -313,7 +320,10 @@ export function registerFileTools(
         previous.limit === limit &&
         snapshotsEqual(previous, snapshotOf(buffer))
       ) {
-        return { content: [{ type: "text", text: FILE_UNCHANGED_STUB }], details: {} };
+        return {
+          content: [{ type: "text", text: FILE_UNCHANGED_STUB }],
+          details: { pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath) } },
+        };
       }
       if (isBinary(buffer.subarray(0, SAMPLE_BYTES)))
         throw new Error(`Cannot read binary file: ${filePath}`);
@@ -340,7 +350,10 @@ export function registerFileTools(
       });
       return {
         content: [{ type: "text", text: formatted.text }],
-        details: { reads: { [key]: snapshot } },
+        details: {
+          reads: { [key]: snapshot },
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath) },
+        },
       };
     },
   });
@@ -381,8 +394,8 @@ export function registerFileTools(
           replaceAll: params.replace_all,
         },
       });
-      const [message, details, diagnosticText] = await withFileMutationQueue<
-        [string, FileToolDetails, string]
+      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue<
+        [string, FileToolDetails, string, number]
       >(filePath, async () => {
         const oldString = params.old_string;
         const newString = params.new_string;
@@ -414,10 +427,14 @@ export function registerFileTools(
           state.reads.set(key, snapshot);
           const diff = generateDiffString("", convertLeadingTabsToSpaces(newString));
           throwIfAborted(signal);
-          const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
-            notify: (message, level) => ctx.ui.notify(message, level),
-            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.`,
             {
@@ -427,6 +444,7 @@ export function registerFileTools(
               reads: { [key]: snapshot },
             },
             diagnosticText,
+            errorCount,
           ];
         }
         const replaceAll = params.replace_all ?? false;
@@ -511,9 +529,13 @@ export function registerFileTools(
           ? `The file ${filePath} has been updated. All occurrences were successfully replaced.`
           : `The file ${filePath} has been updated successfully.`;
         throwIfAborted(signal);
-        const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
-          notify: (message, level) => ctx.ui.notify(message, level),
-        });
+        const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
+          filePath,
+          ctx.cwd,
+          {
+            notify: (message, level) => ctx.ui.notify(message, level),
+          },
+        );
         return [
           text,
           {
@@ -527,13 +549,20 @@ export function registerFileTools(
             reads: { [key]: snapshot },
           },
           diagnosticText,
+          errorCount,
         ];
       });
 
       const text = diagnosticText
         ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
         : message;
-      return { content: [{ type: "text" as const, text }], details };
+      return {
+        content: [{ type: "text" as const, text }],
+        details: {
+          ...details,
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount) },
+        },
+      };
     },
   });
 
@@ -564,8 +593,8 @@ export function registerFileTools(
         absolutePath: filePath,
         change: { oldText: "", newText: params.content },
       });
-      const [message, details, diagnosticText] = await withFileMutationQueue<
-        [string, FileToolDetails, string]
+      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue<
+        [string, FileToolDetails, string, number]
       >(filePath, async () => {
         let original: string | undefined;
         let key: string | undefined;
@@ -595,9 +624,13 @@ export function registerFileTools(
             ? `File created successfully at: ${filePath}`
             : `The file ${filePath} has been updated successfully.`;
         throwIfAborted(signal);
-        const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
-          notify: (message, level) => ctx.ui.notify(message, level),
-        });
+        const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
+          filePath,
+          ctx.cwd,
+          {
+            notify: (message, level) => ctx.ui.notify(message, level),
+          },
+        );
         return [
           text,
           {
@@ -607,13 +640,20 @@ export function registerFileTools(
             reads: { [resolvedKey]: snapshot },
           },
           diagnosticText,
+          errorCount,
         ];
       });
 
       const text = diagnosticText
         ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
         : message;
-      return { content: [{ type: "text" as const, text }], details };
+      return {
+        content: [{ type: "text" as const, text }],
+        details: {
+          ...details,
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount) },
+        },
+      };
     },
   });
 }

package/src/lib/lsp/lsp.ts

@@ -208,7 +208,11 @@ export interface LspService {
     options?: LspRequestOptions,
   ): Promise<void>;
   diagnostics(): Promise<Record<string, Diagnostic[]>>;
-  lspDiagnosticsForFile(file: string, cwd: string, options?: LspRequestOptions): Promise<string>;
+  lspDiagnosticsForFile(
+    file: string,
+    cwd: string,
+    options?: LspRequestOptions,
+  ): Promise<{ text: string; errorCount: number }>;
   shutdownAll(): Promise<void>;
   /** 注入 status 渲染回调；传入 undefined 表示不再渲染。 */
   attachStatus(render: StatusRenderer | undefined): void;
@@ -404,19 +408,21 @@ export function createLspService(
   }
 
   /**
-   * edit/write 用：等待文档诊断并返回该文件的 ERROR 报告（空串表示无错误）。
-   * 内部所有 LSP 失败都会被吞掉，不干扰写操作本身。
+   * edit/write 用：等待文档诊断并返回该文件的 ERROR 报告（text 空串表示无错误）
+   * 与 ERROR 数量。内部所有 LSP 失败都会被吞掉，不干扰写操作本身。
    */
   async function lspDiagnosticsForFile(
     file: string,
     cwd: string,
     options?: LspRequestOptions,
-  ): Promise<string> {
-    if (options?.signal?.aborted) return "";
+  ): Promise<{ text: string; errorCount: number }> {
+    if (options?.signal?.aborted) return { text: "", errorCount: 0 };
     await touchFile(file, cwd, "document", options);
     const all = await diagnostics();
     const normalized = normalize(file);
-    return report(normalized, all[normalized] ?? []);
+    const issues = all[normalized] ?? [];
+    const errorCount = issues.filter((item) => item.severity === 1).length;
+    return { text: report(normalized, issues), errorCount };
   }
 
   /** 终止全部服务器进程（session_shutdown 时调用）。 */

package/src/lib/path.ts

@@ -4,7 +4,7 @@
 
 import { stat } from "node:fs/promises";
 import { homedir } from "node:os";
-import { isAbsolute, join, relative, resolve } from "node:path";
+import { basename, isAbsolute, join, relative, resolve } from "node:path";
 
 /**
  * Expand a leading `~` to the user's home directory.
@@ -59,3 +59,14 @@ export function formatDisplayPath(cwd: string, filePath: string): string {
   }
   return filePath;
 }
+
+/** subtitle 中路径的最大显示长度，超过时退化为仅文件名。 */
+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})`;
+}

package/src/opencode/files.ts

@@ -30,6 +30,7 @@ import {
 import { Type } from "typebox";
 
 import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
+import { formatSubtitlePath } from "../lib/path.js";
 import { guardWriteAccess } from "../lib/write-guard.js";
 import { applyEdit, normalizeToLF, stripBom } from "./edit-engine.js";
 
@@ -356,7 +357,7 @@ function registerReadTool(pi: ExtensionAPI, service: LspService): void {
 
         return {
           content: [{ type: "text", text: output }],
-          details: undefined,
+          details: { pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath) } },
         };
       }
 
@@ -384,7 +385,10 @@ function registerReadTool(pi: ExtensionAPI, service: LspService): void {
           { type: "text", text: "Image read successfully" },
           { type: "image", data: base64, mimeType },
         ];
-        return { content, details: undefined };
+        return {
+          content,
+          details: { pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath) } },
+        };
       }
 
       if (isBinaryExtension(absolutePath) || isBinaryFileBySample(await readSample(absolutePath))) {
@@ -431,7 +435,13 @@ function registerReadTool(pi: ExtensionAPI, service: LspService): void {
         // 后台 warm-up 失败不影响读取
       });
 
-      return { content, details };
+      return {
+        content,
+        details: {
+          ...details,
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath) },
+        },
+      };
     },
   });
 }
@@ -482,7 +492,7 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
         change: { oldText: oldString, newText: newString, replaceAll },
       });
 
-      const [message, details, diagnosticText] = await withFileMutationQueue(
+      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue(
         absolutePath,
         async () => {
           signal?.throwIfAborted();
@@ -509,13 +519,16 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
             await mkdir(dirname(absolutePath), { recursive: true });
             signal?.throwIfAborted();
             await writeFile(absolutePath, newString, "utf8");
-            const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, {
-              signal,
-            });
+            const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
+              absolutePath,
+              ctx.cwd,
+              { signal },
+            );
             return [
               "Edit applied successfully.",
               { diff: "", patch: "", firstChangedLine: 0 },
               diagnosticText,
+              errorCount,
             ] as const;
           }
 
@@ -547,13 +560,16 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
           const diffNew = normalizeToLF(applied.contentNew);
           const diffResult = generateDiffString(diffOld, diffNew);
           const patch = generateUnifiedPatch(filePath, diffOld, diffNew);
-          const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, {
-            signal,
-          });
+          const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
+            absolutePath,
+            ctx.cwd,
+            { signal },
+          );
           return [
             "Edit applied successfully.",
             { diff: diffResult.diff, patch, firstChangedLine: diffResult.firstChangedLine },
             diagnosticText,
+            errorCount,
           ] as const;
         },
       );
@@ -561,7 +577,13 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
       const text = diagnosticText
         ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
         : message;
-      return { content: [{ type: "text" as const, text }], details };
+      return {
+        content: [{ type: "text" as const, text }],
+        details: {
+          ...details,
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath, errorCount) },
+        },
+      };
     },
   });
 }
@@ -614,7 +636,7 @@ function registerWriteTool(pi: ExtensionAPI, service: LspService): void {
       });
       const dir = dirname(absolutePath);
 
-      const [message, details, diagnosticText] = await withFileMutationQueue(
+      const [message, details, diagnosticText, errorCount] = await withFileMutationQueue(
         absolutePath,
         async () => {
           signal?.throwIfAborted();
@@ -639,18 +661,26 @@ function registerWriteTool(pi: ExtensionAPI, service: LspService): void {
           await mkdir(dir, { recursive: true });
           signal?.throwIfAborted();
           await writeFile(absolutePath, desiredBom + nextText, "utf8");
-          const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, {
-            signal,
-          });
+          const { text: diagnosticText, errorCount } = await service.lspDiagnosticsForFile(
+            absolutePath,
+            ctx.cwd,
+            { signal },
+          );
 
-          return ["Wrote file successfully.", undefined, diagnosticText] as const;
+          return ["Wrote file successfully.", {}, diagnosticText, errorCount] as const;
         },
       );
 
       const text = diagnosticText
         ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
         : message;
-      return { content: [{ type: "text" as const, text }], details };
+      return {
+        content: [{ type: "text" as const, text }],
+        details: {
+          ...details,
+          pendant: { subtitle: formatSubtitlePath(ctx.cwd, absolutePath, errorCount) },
+        },
+      };
     },
   });
 }