@trim21/personal-pi-extensions 0.1.611 → 0.1.613

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

@@ -138,14 +138,19 @@ async function formatReferenceLocations(
   const byPath = new Map<string, InspectLocation[]>();
   for (const location of locations) {
     const existing = byPath.get(location.path);
-    if (existing) existing.push(location);
-    else byPath.set(location.path, [location]);
+    if (existing) {
+      existing.push(location);
+    } else {
+      byPath.set(location.path, [location]);
+    }
   }
   const paths = [...byPath.keys()];
   const sections = [`Found ${locations.length} reference(s) in ${paths.length} file(s):`];
   for (const path of paths.slice(0, MAX_FILES_LISTED)) {
     const entries = byPath.get(path);
-    if (!entries) continue;
+    if (!entries) {
+      continue;
+    }
     const shown = entries.slice(0, MAX_ENTRIES_PER_FILE);
     sections.push(`### ${path} (${entries.length})`);
     for (const entry of shown) {
@@ -177,11 +182,15 @@ function formatMarkedString(marked: MarkedString): string {
 
 /** hover contents 原样透传：仅做结构格式化（MarkedString → code fence），不改写内容。 */
 function formatHoverContents(contents: Hover["contents"]): string {
-  if (typeof contents === "string") return contents;
+  if (typeof contents === "string") {
+    return contents;
+  }
   if (Array.isArray(contents)) {
     return contents.map((marked) => formatMarkedString(marked)).join("\n\n");
   }
-  if ("language" in contents) return formatMarkedString(contents);
+  if ("language" in contents) {
+    return formatMarkedString(contents);
+  }
   return contents.value;
 }
 
@@ -217,10 +226,15 @@ async function probeSymbolCandidates(options: {
   const groups = new Map<string, { output: InspectOutput; candidates: LspPosition[] }>();
   for (const [index, candidate] of candidates.entries()) {
     const output = outputs.at(index);
-    if (!output) continue;
+    if (!output) {
+      continue;
+    }
     const group = groups.get(output.text);
-    if (group) group.candidates.push(candidate);
-    else groups.set(output.text, { output, candidates: [candidate] });
+    if (group) {
+      group.candidates.push(candidate);
+    } else {
+      groups.set(output.text, { output, candidates: [candidate] });
+    }
   }
   if (groups.size > 1) {
     const listing = [...groups.values()]
@@ -235,7 +249,9 @@ async function probeSymbolCandidates(options: {
     );
   }
   const first = [...groups.values()].at(0);
-  if (!first) throw new Error("LSP inspect returned no result");
+  if (!first) {
+    throw new Error("LSP inspect returned no result");
+  }
   return first.output;
 }
 

package/src/lib/lsp/lsp.ts

@@ -152,7 +152,9 @@ export interface ResolvedLspConfig {
 function parseTimeoutString(value: string): number {
   // 单位组永远参与匹配（缺省为空串），避免"可选捕获组在类型上不可空"的歧义
   const match = /^(\d+(?:\.\d+)?)(ms|s|m|h|)\s*$/.exec(value.trim());
-  if (!match) return NaN;
+  if (!match) {
+    return NaN;
+  }
   const amount = Number(match[1]);
   const factors: Record<string, number | undefined> = {
     "": 1,
@@ -167,7 +169,9 @@ function parseTimeoutString(value: string): number {
 
 /** 时长字段换算为 ms：number 原样、字符串按 parseTimeoutString；无效值返回 undefined。 */
 function toMs(value: number | string | undefined): number | undefined {
-  if (value === undefined) return undefined;
+  if (value === undefined) {
+    return undefined;
+  }
   const ms = typeof value === "number" ? value : parseTimeoutString(value);
   return Number.isFinite(ms) && ms > 0 ? ms : undefined;
 }
@@ -224,11 +228,15 @@ function unknownFieldWarnings(config: LspConfig, filePath: string): string[] {
   const warnings: string[] = [];
   const check = (record: object, known: Record<string, unknown>, scope: string): void => {
     for (const key of Object.keys(record)) {
-      if (!(key in known)) warnings.push(`${filePath}${scope}: unknown field "${key}" ignored`);
+      if (!(key in known)) {
+        warnings.push(`${filePath}${scope}: unknown field "${key}" ignored`);
+      }
     }
   };
   check(config, lspConfigSchema.properties, "");
-  if (config.watch) check(config.watch, watchConfigSchema.properties, " watch");
+  if (config.watch) {
+    check(config.watch, watchConfigSchema.properties, " watch");
+  }
   for (const [id, server] of Object.entries(config.servers ?? {})) {
     check(server, serverConfigSchema.properties, ` (server "${id}")`);
   }
@@ -243,10 +251,14 @@ async function readConfigFile(
   try {
     const raw = await readFile(filePath, "utf8");
     const config = Value.Parse(lspConfigSchema, JSON.parse(raw) as unknown);
-    for (const message of unknownFieldWarnings(config, filePath)) onWarning?.(message);
+    for (const message of unknownFieldWarnings(config, filePath)) {
+      onWarning?.(message);
+    }
     return config;
   } catch (error) {
-    if (isMissingFile(error)) return {};
+    if (isMissingFile(error)) {
+      return {};
+    }
     throw error;
   }
 }
@@ -256,10 +268,14 @@ function readConfigFileSync(filePath: string, onWarning?: (message: string) => v
   try {
     const raw = readFileSync(filePath, "utf8");
     const config = Value.Parse(lspConfigSchema, JSON.parse(raw) as unknown);
-    for (const message of unknownFieldWarnings(config, filePath)) onWarning?.(message);
+    for (const message of unknownFieldWarnings(config, filePath)) {
+      onWarning?.(message);
+    }
     return config;
   } catch (error) {
-    if (isMissingFile(error)) return {};
+    if (isMissingFile(error)) {
+      return {};
+    }
     throw error;
   }
 }
@@ -274,12 +290,13 @@ function validateConfig(config: ResolvedLspConfig, adapters?: LspServerAdapter[]
     adapters ? adapters.map((adapter) => adapter.id) : Object.keys(config.servers),
   );
   const unknown = config.enabled === undefined ? [] : [...config.enabled.difference(available)];
-  if (unknown.length > 0) {
-    const list = [...available].toSorted().join(", ") || "none";
-    throw new Error(
-      `lsp.json: unknown server id in enabled: ${unknown.join(", ")} (available: ${list})`,
-    );
+  if (unknown.length === 0) {
+    return;
   }
+  const list = [...available].toSorted().join(", ") || "none";
+  throw new Error(
+    `lsp.json: unknown server id in enabled: ${unknown.join(", ")} (available: ${list})`,
+  );
 }
 
 /** 合并 watch 段：全局为基底、本地逐字段覆盖；ignore 取并集去重（全局在前）。两边都未配置时返回 undefined，调用方据此省略 watch 键。 */
@@ -287,7 +304,9 @@ function mergeWatch(
   globalWatch: LspConfig["watch"],
   localWatch: LspConfig["watch"],
 ): LspConfig["watch"] {
-  if (!globalWatch && !localWatch) return undefined;
+  if (!globalWatch && !localWatch) {
+    return undefined;
+  }
   return {
     ...globalWatch,
     ...localWatch,
@@ -336,8 +355,12 @@ export function filterAdapters(
 ): LspServerAdapter[] {
   validateConfig(config, adapters);
   return adapters.filter((adapter) => {
-    if (config.enabled && !config.enabled.has(adapter.id)) return false;
-    if (config.disabled?.has(adapter.id)) return false;
+    if (config.enabled && !config.enabled.has(adapter.id)) {
+      return false;
+    }
+    if (config.disabled?.has(adapter.id)) {
+      return false;
+    }
     return true;
   });
 }
@@ -531,7 +554,9 @@ export function createLspService(
 
   /** 配置缓存：同一 cwd 内复用；cwd 变化或 reload 清缓存后重读。 */
   async function currentConfig(cwd: string): Promise<ResolvedLspConfig> {
-    if (state.config && state.configCwd === cwd) return state.config;
+    if (state.config && state.configCwd === cwd) {
+      return state.config;
+    }
     const config = await loadLspConfig(cwd, globalConfigPath, (message) =>
       sessionNotify?.(message, "warning"),
     );
@@ -552,8 +577,12 @@ export function createLspService(
    * 退化为 cwd（client 只服务 cwd 内的文件）；与 cwd 无交集时返回 undefined。
    */
   function watchDirFor(root: string, cwd: string): string | undefined {
-    if (containsPath(root, cwd)) return root;
-    if (containsPath(cwd, root)) return cwd;
+    if (containsPath(root, cwd)) {
+      return root;
+    }
+    if (containsPath(cwd, root)) {
+      return cwd;
+    }
     return undefined;
   }
 
@@ -562,7 +591,9 @@ export function createLspService(
     const dirs = new Set<string>();
     for (const client of state.clients) {
       const dir = watchDirFor(client.root, cwd);
-      if (dir && !watcherFailed.has(dir)) dirs.add(dir);
+      if (dir && !watcherFailed.has(dir)) {
+        dirs.add(dir);
+      }
     }
     return [...dirs]
       .filter((dir) => [...dirs].every((other) => other === dir || !containsPath(dir, other)))
@@ -645,7 +676,9 @@ export function createLspService(
     cwd: string,
     notify?: ExtensionUIContext["notify"],
   ): Promise<void> {
-    if (state.closing || state.disabled) return;
+    if (state.closing || state.disabled) {
+      return;
+    }
     let config: ResolvedLspConfig;
     try {
       config = await currentConfig(cwd);
@@ -662,23 +695,31 @@ export function createLspService(
     const desired = config.watch.enabled ? desiredWatchRoots(cwd) : [];
     // Map 迭代期间删除当前项是安全的
     for (const [root, watcher] of watchers) {
-      if (desired.includes(root)) continue;
+      if (desired.includes(root)) {
+        continue;
+      }
       watchers.delete(root);
       void watcher.stop().catch(() => {
         // 停止失败不影响流程
       });
     }
     for (const root of desired) {
-      if (watchers.has(root)) continue;
+      if (watchers.has(root)) {
+        continue;
+      }
       const watcher = await startWatcher(root, config.watch, notify);
-      if (watcher) watchers.set(root, watcher);
+      if (watcher) {
+        watchers.set(root, watcher);
+      }
     }
   }
 
   /** 事件按各 client 的 root 前缀 / 注册 pattern / 扩展名过滤后投递。 */
   async function fanOut(changes: FileChange[]): Promise<void> {
     const cwd = state.cwd;
-    if (!cwd) return;
+    if (!cwd) {
+      return;
+    }
     await Promise.all(
       state.clients.map(async (client) => {
         const filtered = changes.filter((change) => {
@@ -704,7 +745,9 @@ export function createLspService(
                 (minimatch(relativeCandidate, watcher.pattern) ||
                   minimatch(absoluteCandidate, watcher.pattern)),
             );
-            if (!matched) return false;
+            if (!matched) {
+              return false;
+            }
           }
           const extensions = state.clientExtensions.get(client);
           return (
@@ -713,7 +756,9 @@ export function createLspService(
             extensions.includes(extname(change.path))
           );
         });
-        if (filtered.length === 0) return;
+        if (filtered.length === 0) {
+          return;
+        }
         try {
           await client.notify.watchedFiles(filtered);
         } catch {
@@ -725,7 +770,9 @@ export function createLspService(
 
   /** 汇总当前所有 LSP server 状态并渲染到 footer status。 */
   function updateStatusText(): void {
-    if (!renderStatus) return;
+    if (!renderStatus) {
+      return;
+    }
     if (state.disabled) {
       renderStatus("lsp: disabled");
       return;
@@ -764,14 +811,17 @@ export function createLspService(
     updateStatusText();
     const reporter = sessionNotify ?? notify;
     const lastNotified = state.brokenNotifiedAt.get(key);
-    if (reporter && (lastNotified === undefined || now - lastNotified >= notifyIntervalMs)) {
-      state.brokenNotifiedAt.set(key, now);
-      reporter(
-        `LSP server "${serverID}" failed to start for ${root}: ${cause}. ` +
-          `Fix the issue or run /lsp-reload ${serverID} to retry now.`,
-        "error",
-      );
+    const due = lastNotified === undefined || now - lastNotified >= notifyIntervalMs;
+    if (!reporter || !due) {
+      return;
     }
+
+    state.brokenNotifiedAt.set(key, now);
+    reporter(
+      `LSP server "${serverID}" failed to start for ${root}: ${cause}. ` +
+        `Fix the issue or run /lsp-reload ${serverID} to retry now.`,
+      "error",
+    );
   }
 
   /**
@@ -788,7 +838,9 @@ export function createLspService(
   ): Promise<LspClient | undefined> {
     const key = root + adapter.id;
     const inflight = state.spawning.get(key);
-    if (inflight) return inflight;
+    if (inflight) {
+      return inflight;
+    }
     const task = (async () => {
       try {
         const handle = await adapter.spawn(root, cwd);
@@ -841,7 +893,9 @@ export function createLspService(
     })();
     state.spawning.set(key, task);
     void task.finally(() => {
-      if (state.spawning.get(key) === task) state.spawning.delete(key);
+      if (state.spawning.get(key) === task) {
+        state.spawning.delete(key);
+      }
     });
     return task;
   }
@@ -852,8 +906,12 @@ export function createLspService(
     notify?: ExtensionUIContext["notify"],
     adapterFilter?: (adapter: LspServerAdapter) => boolean,
   ): Promise<LspClient[]> {
-    if (state.closing || state.disabled) return [];
-    if (!containsPath(file, cwd)) return [];
+    if (state.closing || state.disabled) {
+      return [];
+    }
+    if (!containsPath(file, cwd)) {
+      return [];
+    }
     const config = await currentConfig(cwd);
     const active = filterAdapters(adapters ?? createAdapters(config.servers), config);
     const extension = extname(file) || file;
@@ -866,15 +924,25 @@ export function createLspService(
     }
 
     for (const adapter of active) {
-      if (adapterFilter && !adapterFilter(adapter)) continue;
-      if (adapter.extensions.length > 0 && !adapter.extensions.includes(extension)) continue;
+      if (adapterFilter && !adapterFilter(adapter)) {
+        continue;
+      }
+      if (adapter.extensions.length > 0 && !adapter.extensions.includes(extension)) {
+        continue;
+      }
       const root = serverRoot(adapter, file, cwd);
-      if (!containsPath(file, root)) continue;
-      if (!matchesInclude(adapter.include ?? [], file, root, cwd)) continue;
+      if (!containsPath(file, root)) {
+        continue;
+      }
+      if (!matchesInclude(adapter.include ?? [], file, root, cwd)) {
+        continue;
+      }
       const key = root + adapter.id;
       const failedAt = state.brokenFailAt.get(key);
       if (failedAt !== undefined) {
-        if (Date.now() - failedAt < retryCooldownMs) continue;
+        if (Date.now() - failedAt < retryCooldownMs) {
+          continue;
+        }
         // 冷却已过：允许重试；重试成功后下面会清除 broken 记录
         state.brokenFailAt.delete(key);
       }
@@ -886,7 +954,9 @@ export function createLspService(
       }
 
       const client = await startClient(adapter, root, cwd, config, notify);
-      if (client) result.push(client);
+      if (client) {
+        result.push(client);
+      }
     }
 
     return result;
@@ -907,7 +977,9 @@ export function createLspService(
       clients.map(async (client) => {
         const after = Date.now();
         const version = await client.notify.open({ path: file });
-        if (!diagnostics) return;
+        if (!diagnostics) {
+          return;
+        }
         await abortable(
           client.waitForDiagnostics({
             path: file,
@@ -944,7 +1016,9 @@ export function createLspService(
     cwd: string,
     options?: LspRequestOptions,
   ): Promise<DiagnosticReport> {
-    if (options?.signal?.aborted) return EMPTY_DIAGNOSTIC_REPORT;
+    if (options?.signal?.aborted) {
+      return EMPTY_DIAGNOSTIC_REPORT;
+    }
     await touchFile(file, cwd, "document", options);
     const all = await diagnostics();
     const normalized = normalize(file);
@@ -1103,7 +1177,9 @@ export function createLspService(
     running: readonly { serverID: string; root: string }[],
   ): Promise<string[]> {
     const cwd = state.cwd;
-    if (!cwd) return [];
+    if (!cwd) {
+      return [];
+    }
     let config: ResolvedLspConfig;
     try {
       config = await currentConfig(cwd);
@@ -1121,7 +1197,9 @@ export function createLspService(
     const restarted = await Promise.all(
       [...unique.values()].map(async ({ serverID, root }): Promise<string | undefined> => {
         const adapter = active.find((candidate) => candidate.id === serverID);
-        if (!adapter) return;
+        if (!adapter) {
+          return;
+        }
         const client = await startClient(adapter, root, cwd, config);
         return client ? serverID : undefined;
       }),
@@ -1140,9 +1218,13 @@ export function createLspService(
       // 个别进程退出失败不阻止清理流程
     });
     state.clients = state.clients.filter((client) => client.serverID !== serverID);
-    for (const client of targets) state.clientExtensions.delete(client);
+    for (const client of targets) {
+      state.clientExtensions.delete(client);
+    }
     for (const [key, server] of state.servers) {
-      if (server.serverID !== serverID) continue;
+      if (server.serverID !== serverID) {
+        continue;
+      }
       state.brokenFailAt.delete(key);
       state.brokenNotifiedAt.delete(key);
       state.servers.delete(key);
@@ -1151,9 +1233,13 @@ export function createLspService(
     state.disabled = false;
     // reload 是资源耗尽后的重试入口：清掉停用记录并按新配置重算监听范围
     watcherFailed.clear();
-    if (state.cwd) await reconcileWatchers(state.cwd);
+    if (state.cwd) {
+      await reconcileWatchers(state.cwd);
+    }
     updateStatusText();
-    if (running.length === 0) return [];
+    if (running.length === 0) {
+      return [];
+    }
     return respawnRunning(running);
   }
 
@@ -1176,7 +1262,9 @@ export function createLspService(
     state.closing = false;
     state.disabled = false;
     watcherFailed.clear();
-    if (state.cwd) await reconcileWatchers(state.cwd);
+    if (state.cwd) {
+      await reconcileWatchers(state.cwd);
+    }
     updateStatusText();
     return respawnRunning(running);
   }
@@ -1243,8 +1331,12 @@ function getNoopService(): LspService {
 function enabledServerCount(config: ResolvedLspConfig, adapters?: LspServerAdapter[]): number {
   const ids = adapters ? adapters.map((adapter) => adapter.id) : Object.keys(config.servers);
   return ids.filter((id) => {
-    if (config.enabled && !config.enabled.has(id)) return false;
-    if (config.disabled?.has(id)) return false;
+    if (config.enabled && !config.enabled.has(id)) {
+      return false;
+    }
+    if (config.disabled?.has(id)) {
+      return false;
+    }
     return true;
   }).length;
 }
@@ -1282,7 +1374,9 @@ export function createLspManager(
         }
       });
       validateConfig(config, options?.adapters);
-      if (enabledServerCount(config, options?.adapters) === 0) return;
+      if (enabledServerCount(config, options?.adapters) === 0) {
+        return;
+      }
       // 下面两个闭包被 service 长期持有，可能在会话被替换或 reload 后仍触发
       // （session_shutdown 清理、后台 watcher 错误、in-flight spawn 失败），
       // 而旧 ctx 已被 pi 标记 stale，ctx.ui getter 会直接抛错。UI 写入是尽力
@@ -1313,7 +1407,9 @@ export function createLspManager(
       hooks.onEnabled(pi, next);
     } catch (error) {
       service = undefined;
-      if (error instanceof Error) ctx.ui.notify(error.message, "error");
+      if (error instanceof Error) {
+        ctx.ui.notify(error.message, "error");
+      }
     }
   });
 

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

@@ -161,8 +161,11 @@ export function registerLspRenameTool(
       for (const { candidate, result: probe } of successes) {
         const key = canonicalizeEdit(probe.edit);
         const group = groups.get(key);
-        if (group) group.candidates.push(candidate);
-        else groups.set(key, { result: probe, candidates: [candidate] });
+        if (group) {
+          group.candidates.push(candidate);
+        } else {
+          groups.set(key, { result: probe, candidates: [candidate] });
+        }
       }
       if (groups.size > 1) {
         const listing = [...groups.values()]
@@ -180,7 +183,9 @@ export function registerLspRenameTool(
         );
       }
       const firstGroup = [...groups.values()].at(0);
-      if (!firstGroup) throw new Error("LSP rename returned no target");
+      if (!firstGroup) {
+        throw new Error("LSP rename returned no target");
+      }
       const { result } = firstGroup;
 
       // ── 内存展开 → 审批 → 写盘 → 诊断 ────────────────────────────────────
@@ -218,7 +223,9 @@ export function registerLspRenameTool(
           notify,
           signal,
         });
-        if (diagnostics.text !== "") diagnosticText += `${diagnostics.text}\n`;
+        if (diagnostics.text !== "") {
+          diagnosticText += `${diagnostics.text}\n`;
+        }
       }
 
       const renamed =

package/src/lib/lsp/rename.ts

@@ -55,7 +55,9 @@ function toPath(uri: string): string {
 function lineStartOffsets(text: string): number[] {
   const starts = [0];
   for (let i = 0; i < text.length; i++) {
-    if (text.codePointAt(i) === 10) starts.push(i + 1);
+    if (text.codePointAt(i) === 10) {
+      starts.push(i + 1);
+    }
   }
   return starts;
 }
@@ -64,7 +66,9 @@ function lineStartOffsets(text: string): number[] {
 function lineContentLength(text: string, starts: readonly number[], line: number): number {
   const base = starts[line];
   let end = line + 1 < starts.length ? starts[line + 1] - 1 : text.length;
-  if (end > base && text.codePointAt(end - 1) === 13) end--;
+  if (end > base && text.codePointAt(end - 1) === 13) {
+    end--;
+  }
   return end - base;
 }
 
@@ -117,8 +121,11 @@ function collectTextEdits(edit: WorkspaceEdit): Map<string, RangeLike[]> {
   const byPath = new Map<string, RangeLike[]>();
   const push = (path: string, edits: readonly RangeLike[]): void => {
     const existing = byPath.get(path);
-    if (existing) existing.push(...edits);
-    else byPath.set(path, [...edits]);
+    if (existing) {
+      existing.push(...edits);
+    } else {
+      byPath.set(path, [...edits]);
+    }
   };
   for (const [uri, edits] of Object.entries(edit.changes ?? {})) {
     push(toPath(uri), edits.filter(isRangeLike));
@@ -190,8 +197,14 @@ const WORD_PATTERN = /[\p{L}\p{N}_$]+/gu;
 
 /** 两个路径集合是否一致（用于判断 references 结果是否收敛）。 */
 export function samePathSet(a: ReadonlySet<string>, b: ReadonlySet<string>): boolean {
-  if (a.size !== b.size) return false;
-  for (const path of a) if (!b.has(path)) return false;
+  if (a.size !== b.size) {
+    return false;
+  }
+  for (const path of a) {
+    if (!b.has(path)) {
+      return false;
+    }
+  }
   return true;
 }
 
@@ -244,7 +257,9 @@ export function symbolCandidates(
   character?: number,
 ): LspPosition[] {
   const starts = lineStartOffsets(text);
-  if (line < 0 || line >= starts.length) return [];
+  if (line < 0 || line >= starts.length) {
+    return [];
+  }
   const base = starts[line];
   const length = lineContentLength(text, starts, line);
   const matches = [...text.slice(base, base + length).matchAll(WORD_PATTERN)];
@@ -264,7 +279,9 @@ export function symbolCandidates(
   }
   const candidates: LspPosition[] = [];
   for (const match of matches) {
-    if (match[0] === symbol) candidates.push({ line, character: match.index });
+    if (match[0] === symbol) {
+      candidates.push({ line, character: match.index });
+    }
   }
   return candidates;
 }