@trim21/personal-pi-extensions 0.1.20261103084002 → 0.1.20261104043713

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.20261103084002",
+  "version": "0.1.20261104043713",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -54,7 +54,7 @@
     "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-promise": "7.3.0",
     "eslint-plugin-simple-import-sort": "14.0.0",
-    "eslint-plugin-unicorn": "77.0.0",
+    "eslint-plugin-unicorn": "79.0.0",
     "eslint-plugin-unused-imports": "4.4.1",
     "husky": "^9.1.7",
     "jiti": "^2.7.0",

package/src/claude-code/shell.ts

@@ -79,7 +79,6 @@ function formatBashSuccess(result: Awaited<ReturnType<BwrapRuntime["execute"]>>)
   content: { type: "text"; text: string }[];
   details: BashToolDetails | undefined;
 } {
-  // eslint-disable-next-line unicorn/prefer-default-parameters -- output 是 string，空输出需显示 "(no output)"，默认参数只覆盖 undefined
   const { output, truncation, fullOutputPath } = result;
   const text = appendTruncationNotice(output || "(no output)", truncation, fullOutputPath);
   return {

package/src/lib/lsp/lsp.ts

@@ -438,6 +438,39 @@ async function abortable<T>(promise: Promise<T>, signal?: AbortSignal): Promise<
   await Promise.race([promise, abort]);
 }
 
+/**
+ * 打开文档让服务器索引 / 产出诊断。diagnostics 传 "document" 时最多等 5s，
+ * "full" 最多等 10s；不传则只 didOpen 不等待。
+ */
+async function openAndWaitForDiagnostics(
+  clients: LspClient[],
+  file: string,
+  diagnostics?: "document" | "full",
+  options?: LspRequestOptions,
+): Promise<void> {
+  await Promise.all(
+    clients.map(async (client) => {
+      const after = Date.now();
+      const version = await client.notify.open({ path: file });
+      if (!diagnostics) {
+        return;
+      }
+      await abortable(
+        client.waitForDiagnostics({
+          path: file,
+          version,
+          mode: diagnostics,
+          after,
+          signal: options?.signal,
+        }),
+        options?.signal,
+      );
+    }),
+  ).catch(() => {
+    // 诊断等待失败不影响读 / 写操作本身
+  });
+}
+
 export interface LspService {
   touchFile(
     file: string,
@@ -1034,10 +1067,6 @@ export function createLspService(
     return result;
   }
 
-  /**
-   * 打开文档让服务器索引 / 产出诊断。diagnostics 传 "document" 时最多等 5s，
-   * "full" 最多等 10s；不传则只 didOpen 不等待。
-   */
   async function touchFile(
     file: string,
     cwd: string,
@@ -1045,34 +1074,21 @@ export function createLspService(
     options?: LspRequestOptions,
   ): Promise<void> {
     const clients = await getClients(file, cwd, options?.notify);
-    await Promise.all(
-      clients.map(async (client) => {
-        const after = Date.now();
-        const version = await client.notify.open({ path: file });
-        if (!diagnostics) {
-          return;
-        }
-        await abortable(
-          client.waitForDiagnostics({
-            path: file,
-            version,
-            mode: diagnostics,
-            after,
-            signal: options?.signal,
-          }),
-          options?.signal,
-        );
-      }),
-    ).catch(() => {
-      // 诊断等待失败不影响写操作本身
-    });
+    await openAndWaitForDiagnostics(clients, file, diagnostics, options);
   }
 
-  /** 聚合所有 client 的当前诊断（path → diagnostics）。 */
+  /** 聚合活跃工作区内的当前诊断（path → diagnostics）。 */
   function diagnostics(): Promise<Record<string, Diagnostic[]>> {
     const results: Record<string, Diagnostic[]> = {};
     for (const client of state.clients) {
       for (const [filePath, diags] of client.diagnostics) {
+        // 服务器可以为 root 外或 cwd 外的路径推送 / pull 诊断：只保留活跃工作区内的
+        if (state.cwd !== undefined && !containsPath(filePath, state.cwd)) {
+          continue;
+        }
+        if (!containsPath(filePath, client.root)) {
+          continue;
+        }
         (results[filePath] ??= []).push(...diags);
       }
     }
@@ -1081,7 +1097,8 @@ export function createLspService(
 
   /**
    * read / edit / write 用：等待文档诊断并返回该文件的 ERROR / WARN 报告（text 空串表示无此类诊断）
-   * 与数量。内部所有 LSP 失败都会被吞掉，不干扰读取或写操作本身。
+   * 与数量。诊断只取拥有该文件的 client（见 getClients），不属于活跃工作区的文件报告为空。
+   * 内部所有 LSP 失败都会被吞掉，不干扰读取或写操作本身。
    */
   async function lspDiagnosticsForFile(
     file: string,
@@ -1091,10 +1108,14 @@ export function createLspService(
     if (options?.signal?.aborted) {
       return EMPTY_DIAGNOSTIC_REPORT;
     }
-    await touchFile(file, cwd, "document", options);
-    const all = await diagnostics();
+    const clients = await getClients(file, cwd, options?.notify);
+    if (clients.length === 0) {
+      return EMPTY_DIAGNOSTIC_REPORT;
+    }
+    await openAndWaitForDiagnostics(clients, file, "document", options);
     const normalized = normalize(file);
-    return report(normalized, all[normalized] ?? []);
+    const collected = clients.flatMap((client) => client.diagnostics.get(normalized) ?? []);
+    return report(normalized, collected);
   }
 
   /** 符号重命名：只面向 language 类服务器；按配置顺序取第一个成功结果。 */

package/src/lib/lsp/rename-tool.ts

@@ -229,9 +229,9 @@ export function registerLspRenameTool(
       }
 
       const renamed =
-        result.placeholder !== undefined && result.placeholder !== params.new_name
-          ? `'${result.placeholder}' -> '${params.new_name}'`
-          : `to '${params.new_name}'`;
+        result.placeholder === undefined || result.placeholder === params.new_name
+          ? `to '${params.new_name}'`
+          : `'${result.placeholder}' -> '${params.new_name}'`;
       const summary = `Renamed ${renamed} across ${applied.length} file(s).`;
       const text =
         diagnosticText === ""

package/src/lib/lsp/server-config.ts

@@ -123,7 +123,7 @@ function interpolateEnvVars(value: string, env: NodeJS.ProcessEnv): string {
   // eslint-disable-next-line unicorn/prefer-default-parameters -- replaceAll 回调参数被上下文的 ...args: any[] 定成 any，默认参数无法保留 string 注解
   return value.replaceAll(envVarPattern, (_match, name: string, fallback?: string) => {
     const resolved = env[name];
-    return resolved !== undefined && resolved !== "" ? resolved : (fallback ?? "");
+    return resolved === undefined || resolved === "" ? (fallback ?? "") : resolved;
   });
 }
 

package/src/opencode/files.ts

@@ -446,7 +446,6 @@ function registerReadTool(bus: ToolBus, getService: () => LspService, state: Rea
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       signal?.throwIfAborted();
 
-      // eslint-disable-next-line unicorn/prefer-default-parameters -- params.offset || 1：0 视为 1，默认参数只覆盖 undefined
       const { filePath: rawPath, offset, limit } = params;
 
       const absolutePath = isAbsolute(rawPath) ? rawPath : resolvePath(ctx.cwd, rawPath);