@trim21/personal-pi-extensions 0.0.359 → 0.0.360

package/package.json

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

package/src/lib/lsp/client.ts

@@ -52,6 +52,15 @@ interface DiagnosticRequestResult {
   handled: boolean;
   matched: boolean;
   byFile: Map<string, Diagnostic[]>;
+  /** 单次请求是否超时（区别于正常失败：超时意味着服务器未响应，不应重试）。 */
+  timedOut: boolean;
+}
+
+/** 一批 pull 请求的聚合结果；timedOut 表示其中至少一个请求超时。 */
+interface PullResult {
+  handled: boolean;
+  matched: boolean;
+  timedOut: boolean;
 }
 
 interface CapabilityRegistration {
@@ -350,9 +359,16 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
   // ── 诊断拉取（pull）辅助 ────────────────────────────────────────────────────
 
-  const mergeResults = (filePath: string, results: DiagnosticRequestResult[]) => {
-    if (results.every((result) => !result.handled)) return { handled: false, matched: false };
+  const mergeResults = (filePath: string, results: DiagnosticRequestResult[]): PullResult => {
+    if (results.every((result) => !result.handled)) {
+      return {
+        handled: false,
+        matched: false,
+        timedOut: results.some((result) => result.timedOut),
+      };
+    }
     const matched = results.some((result) => result.matched);
+    const timedOut = results.some((result) => result.timedOut);
 
     const merged = new Map<string, Diagnostic[]>();
     for (const result of results) {
@@ -367,21 +383,27 @@ export async function create(input: CreateInput): Promise<LspClient> {
       updatePullDiagnostics(target, dedupeDiagnostics(items));
     }
 
-    return { handled: true, matched };
+    return { handled: true, matched, timedOut };
   };
 
   async function requestDiagnosticReport(
     filePath: string,
     identifier?: string,
   ): Promise<DiagnosticRequestResult> {
+    let timedOut = false;
     const report = await withTimeout(
       connection.sendRequest<DocumentDiagnosticReport | null>("textDocument/diagnostic", {
         ...(identifier && { identifier }),
         textDocument: { uri: pathToFileURL(filePath).href },
       }),
       diagnosticsRequestTimeoutMs,
-    ).catch(() => null);
-    if (!report) return { handled: false, matched: false, byFile: new Map<string, Diagnostic[]>() };
+    ).catch((error: unknown) => {
+      if (error instanceof Error && error.message.startsWith("Timeout after")) timedOut = true;
+      return null;
+    });
+    if (!report) {
+      return { handled: false, matched: false, byFile: new Map<string, Diagnostic[]>(), timedOut };
+    }
 
     const byFile = new Map<string, Diagnostic[]>();
     const push = (target: string, items: Diagnostic[]): void => {
@@ -404,21 +426,27 @@ export async function create(input: CreateInput): Promise<LspClient> {
       matched ||= relatedPath === filePath;
     }
 
-    return { handled, matched, byFile };
+    return { handled, matched, byFile, timedOut };
   }
 
   async function requestWorkspaceDiagnosticReport(
     filePath: string,
     identifier?: string,
   ): Promise<DiagnosticRequestResult> {
+    let timedOut = false;
     const report = await withTimeout(
       connection.sendRequest<WorkspaceDiagnosticReport | null>("workspace/diagnostic", {
         ...(identifier && { identifier }),
         previousResultIds: [],
       }),
       diagnosticsRequestTimeoutMs,
-    ).catch(() => null);
-    if (!report) return { handled: false, matched: false, byFile: new Map<string, Diagnostic[]>() };
+    ).catch((error: unknown) => {
+      if (error instanceof Error && error.message.startsWith("Timeout after")) timedOut = true;
+      return null;
+    });
+    if (!report) {
+      return { handled: false, matched: false, byFile: new Map<string, Diagnostic[]>(), timedOut };
+    }
 
     const byFile = new Map<string, Diagnostic[]>();
     let matched = false;
@@ -430,7 +458,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
       matched ||= relatedPath === filePath;
     }
 
-    return { handled: true, matched, byFile };
+    return { handled: true, matched, byFile, timedOut };
   }
 
   /** 是否支持文档级 pull 诊断：静态 diagnosticProvider 或动态注册的 document 诊断。 */
@@ -470,14 +498,14 @@ export async function create(input: CreateInput): Promise<LspClient> {
     filePath: string,
     requests: Promise<DiagnosticRequestResult>[],
     done: (results: DiagnosticRequestResult[]) => boolean,
-  ): Promise<{ handled: boolean; matched: boolean }> {
-    if (requests.length === 0) return { handled: false, matched: false };
+  ): Promise<PullResult> {
+    if (requests.length === 0) return { handled: false, matched: false, timedOut: false };
 
-    return new Promise<{ handled: boolean; matched: boolean }>((resolve) => {
+    return new Promise<PullResult>((resolve) => {
       const results: DiagnosticRequestResult[] = [];
       let pending = requests.length;
       let resolved = false;
-      const finish = (merged: { handled: boolean; matched: boolean }, force = false) => {
+      const finish = (merged: PullResult, force = false) => {
         if (resolved) return;
         if (!force && !done(results)) return;
         resolved = true;
@@ -505,9 +533,9 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
   // 并发发起 identifier pull，一旦某批已产出当前文件诊断即可放行；
   // 慢的 pull 继续在后台合并，不按 identifier 串行。见 opencode PR #23771。
-  async function requestDocumentDiagnostics(filePath: string) {
+  async function requestDocumentDiagnostics(filePath: string): Promise<PullResult> {
     const state = documentPullState();
-    if (!state.supported) return { handled: false, matched: false };
+    if (!state.supported) return { handled: false, matched: false, timedOut: false };
     return requestDiagnostics(
       filePath,
       [
@@ -520,11 +548,11 @@ export async function create(input: CreateInput): Promise<LspClient> {
     );
   }
 
-  async function requestFullDiagnostics(filePath: string) {
+  async function requestFullDiagnostics(filePath: string): Promise<PullResult> {
     const documentState = documentPullState();
     const workspaceState = workspacePullState();
     if (!documentState.supported && !workspaceState.supported) {
-      return { handled: false, matched: false };
+      return { handled: false, matched: false, timedOut: false };
     }
     return mergeResults(
       filePath,
@@ -606,12 +634,13 @@ export async function create(input: CreateInput): Promise<LspClient> {
     signal?: AbortSignal;
   }): Promise<void> {
     const startedAt = request.after ?? Date.now();
-    // 支持 pull 的服务器：push 已被忽略，pull 是唯一通道。无窗口截断——
-    // 一直重试直到拿到当前文档结果（matched），确保诊断不因服务器重算慢而丢失。
+    // 支持 pull 的服务器：push 已被忽略，pull 是唯一通道。正常返回但未拿到
+    // 当前文档结果时重试；请求超时（服务器未响应）则中断，避免阻塞编辑。
     if (supportsPullDiagnostics()) {
       while (!connectionClosed && !request.signal?.aborted) {
         const result = await requestDocumentDiagnostics(request.path);
         if (result.matched) return;
+        if (result.timedOut) return;
         await sleep(PULL_RETRY_INTERVAL_MS);
       }
       return;
@@ -650,6 +679,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
       while (!connectionClosed && !request.signal?.aborted) {
         const result = await requestFullDiagnostics(request.path);
         if (result.handled || result.matched) return;
+        if (result.timedOut) return;
         await sleep(PULL_RETRY_INTERVAL_MS);
       }
       return;

package/src/lib/lsp/lsp.ts

@@ -182,8 +182,13 @@ interface LspState {
   broken: Set<string>;
   spawning: Map<string, Promise<LspClient | undefined>>;
   closing: boolean;
+  /** root+serverID → 服务器状态，用于 footer status 显示。 */
+  servers: Map<string, { serverID: string; root: string; state: "running" | "broken" }>;
 }
 
+/** 渲染 LSP status 文本的回调（传入 undefined 表示清除）。 */
+export type StatusRenderer = (text: string | undefined) => void;
+
 export interface LspRequestOptions {
   notify?: ExtensionUIContext["notify"];
   /** 中止时提前结束诊断等待（已中止时直接跳过诊断）。 */
@@ -212,6 +217,10 @@ export interface LspService {
   diagnostics(): Promise<Record<string, Diagnostic[]>>;
   lspDiagnosticsForFile(file: string, cwd: string, options?: LspRequestOptions): Promise<string>;
   shutdownAll(): Promise<void>;
+  /** 注入 status 渲染回调；传入 undefined 表示不再渲染。 */
+  attachStatus(render: StatusRenderer | undefined): void;
+  /** 用当前服务器状态主动刷新一次 status（agent start/end 等生命周期边界）。 */
+  refreshStatus(): void;
 }
 
 /** 文件必须在工作目录内才启用 LSP（对齐 opencode 的 containsPath）。 */
@@ -241,8 +250,29 @@ export function createLspService(
     broken: new Set(),
     spawning: new Map(),
     closing: false,
+    servers: new Map(),
   };
 
+  let renderStatus: StatusRenderer | undefined;
+
+  /** 汇总当前所有 LSP server 状态并渲染到 footer status。 */
+  function updateStatusText(): void {
+    if (!renderStatus) return;
+    if (state.servers.size === 0) {
+      renderStatus(undefined);
+      return;
+    }
+    const parts = Array.from(state.servers.values(), (server) => {
+      return `${server.serverID}${server.state === "broken" ? " (unavailable)" : ""}`;
+    });
+    renderStatus(`lsp: ${parts.toSorted().join(",")}`);
+  }
+
+  function attachStatus(render: StatusRenderer | undefined): void {
+    renderStatus = render;
+    updateStatusText();
+  }
+
   async function getClients(
     file: string,
     cwd: string,
@@ -281,6 +311,8 @@ export function createLspService(
           const handle = await adapter.spawn(root, cwd);
           if (!handle) {
             state.broken.add(key);
+            state.servers.set(key, { serverID: adapter.id, root, state: "broken" });
+            updateStatusText();
             notify?.(
               `LSP server "${adapter.id}" is not available for ${root} (binary not found)`,
               "error",
@@ -307,9 +339,13 @@ export function createLspService(
             return duplicate;
           }
           state.clients.push(client);
+          state.servers.set(key, { serverID: adapter.id, root, state: "running" });
+          updateStatusText();
           return client;
         } catch (error) {
           state.broken.add(key);
+          state.servers.set(key, { serverID: adapter.id, root, state: "broken" });
+          updateStatusText();
           notify?.(
             `LSP server "${adapter.id}" failed to start for ${root}: ${
               error instanceof Error ? error.message : String(error)
@@ -399,9 +435,18 @@ export function createLspService(
     });
     state.clients = [];
     state.broken.clear();
+    state.servers.clear();
+    updateStatusText();
   }
 
-  return { touchFile, diagnostics, lspDiagnosticsForFile, shutdownAll };
+  return {
+    touchFile,
+    diagnostics,
+    lspDiagnosticsForFile,
+    shutdownAll,
+    attachStatus,
+    refreshStatus: updateStatusText,
+  };
 }
 
 export interface LspServiceOptions {
@@ -420,6 +465,16 @@ export function registerLsp(pi: ExtensionAPI, options?: LspServiceOptions): LspS
       .catch((error: unknown) => {
         if (error instanceof Error) ctx.ui.notify?.(error.message, "error");
       });
+    // footer status 显示当前所有 LSP server 状态（无 UI 时不显示）
+    service.attachStatus(
+      ctx.ui?.setStatus
+        ? (text) => ctx.ui.setStatus("lsp", text ? ctx.ui.theme.fg("accent", text) : undefined)
+        : undefined,
+    );
   });
+  // agent 生命周期边界显式刷新 status：agent 运行中 LSP server 才被惰性
+  // spawn（首次工具调用），start/end 时保证 footer 反映当前实际状态。
+  pi.on?.("agent_start", () => service.refreshStatus());
+  pi.on?.("agent_end", () => service.refreshStatus());
   return service;
 }