@trim21/personal-pi-extensions 0.0.315 → 0.0.316

package/package.json

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

package/src/claude-code/files.ts

@@ -15,7 +15,6 @@ import {
 import { Type } from "typebox";
 
 import { createLspService, initLsp, type LspService } from "../lib/lsp/lsp.js";
-import { type ToolPendant } from "../lib/pendant.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 } },
       };
     },
   });
@@ -544,17 +485,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 };
     },
   });
 
@@ -632,17 +563,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 };
     },
   });
 }
@@ -686,6 +607,7 @@ export default function claudeCodeFileTools(pi: ExtensionAPI): void {
   // 若文件在此期间被外部修改，Edit/Write 时的指纹对比仍会要求重新 Read，
   // 防呆语义不因重建而弱化。
   pi.on("session_start", (_event, ctx) => {
+    service.setUi(ctx.ui);
     restoreFileReads(state, ctx.sessionManager);
   });
 
@@ -693,6 +615,7 @@ export default function claudeCodeFileTools(pi: ExtensionAPI): void {
   // session_start，扩展实例也不重建。这里同样重放当前分支，丢弃被抛弃分支
   // 的记账，避免 state 与当前分支脱节。
   pi.on("session_tree", (_event, ctx) => {
+    service.setUi(ctx.ui);
     restoreFileReads(state, ctx.sessionManager);
   });
 

package/src/lib/lsp/lsp.ts

@@ -16,7 +16,7 @@ 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";
 
@@ -137,6 +137,8 @@ export interface LspService {
   diagnostics(): Promise<Record<string, Diagnostic[]>>;
   lspDiagnosticsForFile(file: string, cwd: string): Promise<string>;
   shutdownAll(): Promise<void>;
+  /** 绑定当前会话的 UI 上下文，LSP 服务器启动失败时用它发错误通知（传 undefined 解绑）。 */
+  setUi(ui?: Pick<ExtensionUIContext, "notify">): void;
 }
 
 /** 文件必须在工作目录内才启用 LSP（对齐 opencode 的 containsPath）。 */
@@ -161,6 +163,7 @@ export function createLspService(
     broken: new Set(),
     spawning: new Map(),
   };
+  let ui: Pick<ExtensionUIContext, "notify"> | undefined;
 
   async function getClients(file: string, cwd: string): Promise<LspClient[]> {
     if (!containsPath(file, cwd)) return [];
@@ -195,6 +198,10 @@ export function createLspService(
           const handle = await adapter.spawn(root, cwd);
           if (!handle) {
             state.broken.add(key);
+            ui?.notify(
+              `LSP server "${adapter.id}" is not available for ${root} (binary not found)`,
+              "error",
+            );
             return;
           }
           const client = await create({
@@ -214,8 +221,14 @@ export function createLspService(
           }
           state.clients.push(client);
           return client;
-        } catch {
+        } catch (error) {
           state.broken.add(key);
+          ui?.notify(
+            `LSP server "${adapter.id}" failed to start for ${root}: ${
+              error instanceof Error ? error.message : String(error)
+            }`,
+            "error",
+          );
           return;
         }
       })();
@@ -284,7 +297,15 @@ export function createLspService(
     state.broken.clear();
   }
 
-  return { touchFile, diagnostics, lspDiagnosticsForFile, shutdownAll };
+  return {
+    touchFile,
+    diagnostics,
+    lspDiagnosticsForFile,
+    shutdownAll,
+    setUi(nextUi) {
+      ui = nextUi;
+    },
+  };
 }
 
 /** 注册进程级生命周期：session_shutdown 时清理全部服务器进程。 */