@trim21/personal-pi-extensions 0.0.356 → 0.0.358

package/package.json

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

package/src/lib/lsp/client.ts

@@ -99,6 +99,7 @@ export interface LspClient {
     version: number;
     mode?: "document" | "full";
     after?: number;
+    signal?: AbortSignal;
   }): Promise<void>;
   shutdown(): Promise<void>;
 }
@@ -168,6 +169,11 @@ async function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T> {
   }
 }
 
+const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+/** pull 诊断失败后的重试间隔。 */
+const PULL_RETRY_INTERVAL_MS = 100;
+
 function stopProcess(process: LspServerHandle["process"]): Promise<void> {
   if (process.exitCode !== null) return Promise.resolve();
   try {
@@ -201,6 +207,14 @@ export async function create(input: CreateInput): Promise<LspClient> {
     new StreamMessageWriter(input.server.process.stdin),
   );
   input.server.process.stderr?.resume();
+  /** 连接或服务器进程已关闭；pull 重试循环以此终止，避免无界等待。 */
+  let connectionClosed = false;
+  input.server.process.once("exit", () => {
+    connectionClosed = true;
+  });
+  connection.onDispose(() => {
+    connectionClosed = true;
+  });
 
   // ── 连接状态 ────────────────────────────────────────────────────────────────
 
@@ -236,8 +250,11 @@ export async function create(input: CreateInput): Promise<LspClient> {
     (params: { uri: string; version?: number; diagnostics: Diagnostic[] }) => {
       const filePath = getFilePath(params.uri);
       if (!filePath) return;
-      // 服务器版本滞后于已发送版本时，该 push 对应的是旧内容（重算未完成时的
-      // 迟到结果）。忽略它，避免与 pull 通道的当前结果合并出 stale 诊断。
+      // 支持 pull 诊断的服务器：push 的结果可能来自旧内容（异步重算迟到），
+      // 直接忽略，只信任 pull 返回的当前文档结果，从源头避免 stale。
+      if (supportsPullDiagnostics()) return;
+      // 纯 push 服务器：服务器版本滞后于已发送版本时，该 push 对应的是旧内容
+      // （重算未完成时的迟到结果），同样忽略。
       const currentVersion = documentVersions.get(filePath);
       const isStalePush =
         typeof params.version === "number" &&
@@ -416,6 +433,15 @@ export async function create(input: CreateInput): Promise<LspClient> {
     return { handled: true, matched, byFile };
   }
 
+  /** 是否支持文档级 pull 诊断：静态 diagnosticProvider 或动态注册的 document 诊断。 */
+  function supportsPullDiagnostics(): boolean {
+    if (hasStaticPullDiagnostics) return true;
+    for (const registration of diagnosticRegistrations.values()) {
+      if (registration.registerOptions?.workspaceDiagnostics !== true) return true;
+    }
+    return false;
+  }
+
   function documentPullState() {
     const documentRegistrations = [...diagnosticRegistrations.values()].filter(
       (registration) => registration.registerOptions?.workspaceDiagnostics !== true,
@@ -424,7 +450,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
       documentIdentifiers: [
         ...new Set(documentRegistrations.flatMap((r) => r.registerOptions?.identifier ?? [])),
       ],
-      supported: hasStaticPullDiagnostics || documentRegistrations.length > 0,
+      supported: supportsPullDiagnostics(),
     };
   }
 
@@ -577,8 +603,20 @@ export async function create(input: CreateInput): Promise<LspClient> {
     path: string;
     version: number;
     after?: number;
+    signal?: AbortSignal;
   }): Promise<void> {
     const startedAt = request.after ?? Date.now();
+    // 支持 pull 的服务器：push 已被忽略，pull 是唯一通道。无窗口截断——
+    // 一直重试直到拿到当前文档结果（matched），确保诊断不因服务器重算慢而丢失。
+    if (supportsPullDiagnostics()) {
+      while (!connectionClosed && !request.signal?.aborted) {
+        const result = await requestDocumentDiagnostics(request.path);
+        if (result.matched) return;
+        await sleep(PULL_RETRY_INTERVAL_MS);
+      }
+      return;
+    }
+
     const pushWait = waitForFreshPush({
       path: request.path,
       version: request.version,
@@ -605,8 +643,18 @@ export async function create(input: CreateInput): Promise<LspClient> {
     path: string;
     version: number;
     after?: number;
+    signal?: AbortSignal;
   }): Promise<void> {
     const startedAt = request.after ?? Date.now();
+    if (supportsPullDiagnostics()) {
+      while (!connectionClosed && !request.signal?.aborted) {
+        const result = await requestFullDiagnostics(request.path);
+        if (result.handled || result.matched) return;
+        await sleep(PULL_RETRY_INTERVAL_MS);
+      }
+      return;
+    }
+
     const pushWait = waitForFreshPush({
       path: request.path,
       version: request.version,
@@ -708,6 +756,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
           path: normalizedPath,
           version: request.version,
           after: request.after,
+          signal: request.signal,
         });
         return;
       }
@@ -715,6 +764,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
         path: normalizedPath,
         version: request.version,
         after: request.after,
+        signal: request.signal,
       });
     },
     async shutdown() {

package/src/lib/lsp/lsp.ts

@@ -348,7 +348,13 @@ export function createLspService(
         const version = await client.notify.open({ path: file });
         if (!diagnostics) return;
         await abortable(
-          client.waitForDiagnostics({ path: file, version, mode: diagnostics, after }),
+          client.waitForDiagnostics({
+            path: file,
+            version,
+            mode: diagnostics,
+            after,
+            signal: options?.signal,
+          }),
           options?.signal,
         );
       }),