@trim21/personal-pi-extensions 0.0.315 → 0.0.317

package/package.json

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

package/src/claude-code/files.ts

@@ -14,8 +14,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
-import { createLspService, initLsp, type LspService } from "../lib/lsp/lsp.js";
-import { type ToolPendant } from "../lib/pendant.js";
+import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
 import { guardWriteAccess } from "../lib/write-guard.js";
 import {
   type ClaudeCodeState,
@@ -46,43 +45,6 @@ function formatFileSize(bytes: number): string {
   return `${(bytes / 1024 / 1024 / 1024).toFixed(1)} GB`;
 }
 
-/** Edit/Write 结果的可折叠面板：diff（```diff 代码块）+ LSP errors（有则显示）。 */
-export function buildEditPendant(options: {
-  filePath: string;
-  diff: string;
-  diagnosticText: string;
-}): ToolPendant {
-  const lines = [`## Diff — \`${options.filePath}\``, "", "```diff", options.diff, "```"];
-  if (options.diagnosticText !== "") {
-    lines.push("", "## LSP errors", "", "```text", options.diagnosticText, "```");
-  }
-  return { markdown: lines.join("\n"), expanded: true };
-}
-
-/** Read 结果的可折叠面板：路径、总行数、读取范围与文件大小。 */
-export function buildReadPendant(options: {
-  filePath: string;
-  byteSize: number;
-  offset?: number;
-  limit?: number;
-  totalLines?: number;
-  type?: string;
-}): ToolPendant {
-  const lines = ["## Read", "", `- **Path**: \`${options.filePath}\``];
-  if (options.type) lines.push(`- **Type**: ${options.type}`);
-  if (options.totalLines !== undefined) {
-    const start = options.offset ?? 1;
-    const end = Math.min(
-      options.limit === undefined ? options.totalLines : start + options.limit - 1,
-      options.totalLines,
-    );
-    lines.push(`- **Total lines**: ${options.totalLines}`);
-    if (start <= end) lines.push(`- **Range**: ${start}-${end}`);
-  }
-  lines.push(`- **Size**: ${formatFileSize(options.byteSize)}`);
-  return { markdown: lines.join("\n"), expanded: false };
-}
-
 /** Tool guidance, kept in markdown so it reads like documentation. */
 const READ_PROMPT = readFileSync(fileURLToPath(new URL("read.md", import.meta.url)), "utf8").trim();
 const EDIT_PROMPT = readFileSync(fileURLToPath(new URL("edit.md", import.meta.url)), "utf8").trim();
@@ -107,8 +69,6 @@ export interface FileToolDetails {
    * session 文件，resume 后由 session_start 重建 reads state。
    */
   reads?: Record<string, FileSnapshot>;
-  /** 可折叠的 diff / LSP 结果面板（pi TUI 渲染）。 */
-  pendant?: ToolPendant;
 }
 
 function snapshotOf(content: Uint8Array | string, textEditable = true): FileSnapshot {
@@ -326,17 +286,7 @@ export function registerFileTools(
         const snapshot = snapshotOf(image, false);
         const key = await readStateKey(filePath);
         state.reads.set(key, snapshot);
-        return {
-          content,
-          details: {
-            reads: { [key]: snapshot },
-            pendant: buildReadPendant({
-              filePath,
-              byteSize: image.length,
-              type: imageMime,
-            }),
-          },
-        };
+        return { content, details: { reads: { [key]: snapshot } } };
       }
 
       const buffer = await readFile(filePath);
@@ -366,16 +316,7 @@ export function registerFileTools(
       });
       return {
         content: [{ type: "text", text: formatted.text }],
-        details: {
-          reads: { [key]: snapshot },
-          pendant: buildReadPendant({
-            filePath,
-            byteSize: buffer.length,
-            offset: params.offset ?? 1,
-            limit: params.limit,
-            totalLines: formatted.totalLines,
-          }),
-        },
+        details: { reads: { [key]: snapshot } },
       };
     },
   });
@@ -449,7 +390,9 @@ export function registerFileTools(
           state.reads.set(key, snapshot);
           const diff = generateDiffString("", newString);
           throwIfAborted(signal);
-          const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd);
+          const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
+            notify: (message, level) => ctx.ui.notify(message, level),
+          });
           return [
             `The file ${filePath} has been updated successfully.`,
             {
@@ -528,7 +471,9 @@ 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);
+        const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
+          notify: (message, level) => ctx.ui.notify(message, level),
+        });
         return [
           text,
           {
@@ -544,17 +489,7 @@ export function registerFileTools(
       const text = diagnosticText
         ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
         : message;
-      return {
-        content: [{ type: "text" as const, text }],
-        details: {
-          ...details,
-          pendant: buildEditPendant({
-            filePath,
-            diff: details.diff ?? "",
-            diagnosticText,
-          }),
-        },
-      };
+      return { content: [{ type: "text" as const, text }], details };
     },
   });
 
@@ -616,7 +551,9 @@ 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);
+        const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
+          notify: (message, level) => ctx.ui.notify(message, level),
+        });
         return [
           text,
           {
@@ -632,17 +569,7 @@ export function registerFileTools(
       const text = diagnosticText
         ? `${message}\n\nLSP errors detected in this file, please fix:\n${diagnosticText}`
         : message;
-      return {
-        content: [{ type: "text" as const, text }],
-        details: {
-          ...details,
-          pendant: buildEditPendant({
-            filePath,
-            diff: details.diff ?? "",
-            diagnosticText,
-          }),
-        },
-      };
+      return { content: [{ type: "text" as const, text }], details };
     },
   });
 }
@@ -677,8 +604,7 @@ function restoreFileReads(
  * 与主进程 index.ts 聚合加载时的行为一致。
  */
 export default function claudeCodeFileTools(pi: ExtensionAPI): void {
-  const service = createLspService();
-  initLsp(pi, service);
+  const service = registerLsp(pi);
   const state = createClaudeCodeState();
 
   // 扩展实例在进程启动 / /reload / /new / /resume / /fork 时重建，内存里的

package/src/lib/lsp/lsp.ts

@@ -1,7 +1,7 @@
 /**
  * LSP 管理器：所有语言服务器连接的注册表与统一入口。
  *
- * - state（client 缓存、broken 集合、spawning 去重）是 createLspService 的
+ * - state（client 缓存、broken 集合、spawning 去重）是 service 工厂的
  *   闭包变量，不做成模块级全局；
  * - 配置来源：全局 `~/.pi/agent/lsp.json` + 本地 `<cwd>/.pi/lsp.json`
  *   （本地逐字段覆盖全局）：`servers` 数组配置驱动地定义语言服务器
@@ -9,14 +9,14 @@
  *   参数继续生效；配置在每个工具的调用 cwd 下惰性读取；
  * - client 按 (root, serverID) 缓存，并发 spawn 去重，启动失败记入 broken
  *   集合（服务实例生命周期内不再重试）；
- * - 工具只与 touchFile / diagnostics / lspDiagnosticsForFile 三个方法打交道。
+ * - 工具只与 touchFile / diagnostics / lspDiagnosticsForFile 三个方法打交道；通知回调按请求传入。
  */
 
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { extname, join, normalize, sep } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
 import { Value } from "typebox/value";
 
@@ -130,12 +130,22 @@ interface LspState {
   clients: LspClient[];
   broken: Set<string>;
   spawning: Map<string, Promise<LspClient | undefined>>;
+  closing: boolean;
+}
+
+export interface LspRequestOptions {
+  notify?: ExtensionUIContext["notify"];
 }
 
 export interface LspService {
-  touchFile(file: string, cwd: string, diagnostics?: "document" | "full"): Promise<void>;
+  touchFile(
+    file: string,
+    cwd: string,
+    diagnostics?: "document" | "full",
+    options?: LspRequestOptions,
+  ): Promise<void>;
   diagnostics(): Promise<Record<string, Diagnostic[]>>;
-  lspDiagnosticsForFile(file: string, cwd: string): Promise<string>;
+  lspDiagnosticsForFile(file: string, cwd: string, options?: LspRequestOptions): Promise<string>;
   shutdownAll(): Promise<void>;
 }
 
@@ -160,9 +170,15 @@ export function createLspService(
     clients: [],
     broken: new Set(),
     spawning: new Map(),
+    closing: false,
   };
 
-  async function getClients(file: string, cwd: string): Promise<LspClient[]> {
+  async function getClients(
+    file: string,
+    cwd: string,
+    notify?: ExtensionUIContext["notify"],
+  ): Promise<LspClient[]> {
+    if (state.closing) return [];
     if (!containsPath(file, cwd)) return [];
     const config = await loadLspConfig(cwd, globalConfigPath);
     const timeout = timeoutOptions(config);
@@ -195,6 +211,10 @@ export function createLspService(
           const handle = await adapter.spawn(root, cwd);
           if (!handle) {
             state.broken.add(key);
+            notify?.(
+              `LSP server "${adapter.id}" is not available for ${root} (binary not found)`,
+              "error",
+            );
             return;
           }
           const client = await create({
@@ -207,6 +227,10 @@ export function createLspService(
             diagnosticsDocumentWaitTimeoutMs:
               adapter.diagnosticsWaitMs ?? timeout.diagnosticsDocumentWaitTimeoutMs,
           });
+          if (state.closing) {
+            await client.shutdown();
+            return;
+          }
           const duplicate = state.clients.find((c) => c.root === root && c.serverID === adapter.id);
           if (duplicate) {
             await client.shutdown();
@@ -214,8 +238,14 @@ export function createLspService(
           }
           state.clients.push(client);
           return client;
-        } catch {
+        } catch (error) {
           state.broken.add(key);
+          notify?.(
+            `LSP server "${adapter.id}" failed to start for ${root}: ${
+              error instanceof Error ? error.message : String(error)
+            }`,
+            "error",
+          );
           return;
         }
       })();
@@ -239,8 +269,9 @@ export function createLspService(
     file: string,
     cwd: string,
     diagnostics?: "document" | "full",
+    options?: LspRequestOptions,
   ): Promise<void> {
-    const clients = await getClients(file, cwd);
+    const clients = await getClients(file, cwd, options?.notify);
     await Promise.all(
       clients.map(async (client) => {
         const after = Date.now();
@@ -268,8 +299,12 @@ export function createLspService(
    * edit/write 用：等待文档诊断并返回该文件的 ERROR 报告（空串表示无错误）。
    * 内部所有 LSP 失败都会被吞掉，不干扰写操作本身。
    */
-  async function lspDiagnosticsForFile(file: string, cwd: string): Promise<string> {
-    await touchFile(file, cwd, "document");
+  async function lspDiagnosticsForFile(
+    file: string,
+    cwd: string,
+    options?: LspRequestOptions,
+  ): Promise<string> {
+    await touchFile(file, cwd, "document", options);
     const all = await diagnostics();
     const normalized = normalize(file);
     return report(normalized, all[normalized] ?? []);
@@ -277,6 +312,8 @@ export function createLspService(
 
   /** 终止全部服务器进程（session_shutdown 时调用）。 */
   async function shutdownAll(): Promise<void> {
+    if (state.closing) return;
+    state.closing = true;
     await Promise.all(state.clients.map((client) => client.shutdown())).catch(() => {
       // 个别进程退出失败不阻止清理流程
     });
@@ -287,10 +324,14 @@ export function createLspService(
   return { touchFile, diagnostics, lspDiagnosticsForFile, shutdownAll };
 }
 
-/** 注册进程级生命周期：session_shutdown 时清理全部服务器进程。 */
-export function initLsp(pi: ExtensionAPI, service: LspService): void {
-  // 测试里的 fake pi 没有事件订阅；生产环境 pi.on 必然存在
-  pi.on?.("session_shutdown", () => {
-    void service.shutdownAll();
-  });
+export interface LspServiceOptions {
+  adapters?: LspServerAdapter[];
+  globalConfigPath?: string;
+}
+
+/** 创建 LSP service 并注册 pi 的进程级清理生命周期。 */
+export function registerLsp(pi: ExtensionAPI, options?: LspServiceOptions): LspService {
+  const service = createLspService(options?.adapters, options?.globalConfigPath);
+  pi.on?.("session_shutdown", () => service.shutdownAll());
+  return service;
 }

package/src/opencode/files.ts

@@ -2,7 +2,7 @@
  * Opencode File Tools —— read / edit / write 统一构建点。
  *
  * 三个工具在同一个 registerFileTools(pi, service) 里注册，共享同一个 LSP
- * service 实例（createLspService 的闭包变量），与 claude-code/files.ts 共享
+ * service 实例（registerLsp 创建的闭包变量），与 claude-code/files.ts 共享
  * read-snapshot state 的方式一致；不再用模块级全局缓存。
  *
  * 各工具行为对齐 opencode commit 999be62662（v1.2.25-1672-g999be62662,
@@ -30,7 +30,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
-import { createLspService, initLsp, type LspService } from "../lib/lsp/lsp.js";
+import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
 import { guardWriteAccess } from "../lib/write-guard.js";
 import {
   detectLineEnding,
@@ -695,7 +695,6 @@ export function registerFileTools(pi: ExtensionAPI, service: LspService): void {
 
 /** 独立入口：创建 LSP service（闭包共享给三个工具）并注册。 */
 export default function opencodeFileTools(pi: ExtensionAPI): void {
-  const service = createLspService();
-  initLsp(pi, service);
+  const service = registerLsp(pi);
   registerFileTools(pi, service);
 }