@trim21/personal-pi-extensions 0.1.624 → 0.1.627

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.624",
+  "version": "0.1.627",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -106,8 +106,8 @@
     "octokit": "^5.0.5",
     "turndown": "^7.2.0",
     "undici": "^8.0.0",
-    "vscode-jsonrpc": "^9.0.1",
-    "vscode-languageserver-types": "^3.18.0",
+    "vscode-languageserver-protocol": "^3.18.4",
+    "vscode-languageserver-types": "^3.18.4",
     "web-tree-sitter": "^0.27.0"
   },
   "optionalDependencies": {

package/src/lib/lsp/client.ts

@@ -15,58 +15,79 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 
 import {
   CancellationTokenSource,
-  createMessageConnection,
-  type MessageConnection,
+  ConfigurationRequest,
+  createProtocolConnection,
+  DefinitionRequest,
+  type Diagnostic as VSCodeDiagnostic,
+  DiagnosticRefreshRequest,
+  type DiagnosticRegistrationOptions,
+  DidChangeConfigurationNotification,
+  DidChangeTextDocumentNotification,
+  DidChangeWatchedFilesNotification,
+  type DidChangeWatchedFilesRegistrationOptions,
+  DidCloseTextDocumentNotification,
+  DidOpenTextDocumentNotification,
+  DocumentDiagnosticReportKind,
+  DocumentDiagnosticRequest,
+  ErrorCodes,
+  FileChangeType as LspFileChangeType,
+  type FileEvent,
+  type Hover,
+  HoverRequest,
+  InitializedNotification,
+  InitializeRequest,
+  type Location as LspLocation,
+  type LocationLink,
+  LSPErrorCodes,
+  PrepareRenameRequest,
+  type PrepareRenameResult,
+  type ProtocolConnection,
+  type ProtocolRequestType,
+  PublishDiagnosticsNotification,
+  type Range,
+  ReferencesRequest,
+  type Registration,
+  RegistrationRequest,
+  RenameRequest,
+  type RequestParam,
   ResponseError,
+  type ServerCapabilities,
   StreamMessageReader,
   StreamMessageWriter,
-} from "vscode-jsonrpc/node";
-import type {
-  Diagnostic as VSCodeDiagnostic,
-  Hover,
-  Location as LspLocation,
-  LocationLink,
-  Range,
-  WorkspaceEdit,
-} from "vscode-languageserver-types";
+  TextDocumentSyncKind,
+  UnregistrationRequest,
+  WatchKind,
+  WorkDoneProgressCreateRequest,
+  WorkspaceDiagnosticRequest,
+  type WorkspaceEdit,
+  WorkspaceFoldersRequest,
+} from "vscode-languageserver-protocol/node";
 
 import type { LspServerHandle } from "./adapter.js";
 import { LANGUAGE_EXTENSIONS } from "./language.js";
 import { editFilePaths, stabilityAcceptable, trackStability } from "./rename.js";
 import type { FileChange, FileChangeType } from "./watcher.js";
 
-// LSP spec 常量
-const FILE_CHANGE_CREATED = 1;
-const FILE_CHANGE_CHANGED = 2;
-const FILE_CHANGE_DELETED = 3;
-const TEXT_DOCUMENT_SYNC_INCREMENTAL = 2;
-
 /** LSP WatchKind 位掩码（FileSystemWatcher.kind，缺省 create|change|delete）。 */
-export const WATCH_KIND_CREATE = 1;
-export const WATCH_KIND_CHANGE = 2;
-export const WATCH_KIND_DELETE = 4;
-const WATCH_KIND_ALL = WATCH_KIND_CREATE | WATCH_KIND_CHANGE | WATCH_KIND_DELETE;
+export const WATCH_KIND_CREATE = WatchKind.Create;
+export const WATCH_KIND_CHANGE = WatchKind.Change;
+export const WATCH_KIND_DELETE = WatchKind.Delete;
+const WATCH_KIND_ALL = WatchKind.Create | WatchKind.Change | WatchKind.Delete;
 
 /** 服务器通过 client/registerCapability 注册的单个 watcher。 */
-interface WatcherGlob {
+export interface WatcherGlob {
   pattern: string;
   kind: number;
 }
 
-const FILE_CHANGE_TYPE: Record<FileChangeType, number> = {
-  created: FILE_CHANGE_CREATED,
-  changed: FILE_CHANGE_CHANGED,
-  deleted: FILE_CHANGE_DELETED,
+const FILE_CHANGE_TYPE: Record<FileChangeType, LspFileChangeType> = {
+  created: LspFileChangeType.Created,
+  changed: LspFileChangeType.Changed,
+  deleted: LspFileChangeType.Deleted,
 };
 
 export type Diagnostic = VSCodeDiagnostic;
 
-/** LSP MethodNotFound（-32601）：服务器未实现 prepareRename / rename 请求。 */
-const LSP_METHOD_NOT_FOUND = -32601;
-
-/** LSP ContentModified（-32801）：服务器处理请求期间内容被修改，重发请求即可。 */
-const LSP_CONTENT_MODIFIED = -32801;
-
 /**
  * 位置不可 rename 或服务器不具备 rename 能力；与传输失败等意外错误区分，
  * 供调用方在多候选探测时跳过该 client 而不是中断整个操作。
@@ -151,7 +172,7 @@ async function retryOnContentModified<T>(fn: () => Promise<T>): Promise<T> {
     try {
       return await fn();
     } catch (error) {
-      if (!(error instanceof ResponseError && error.code === LSP_CONTENT_MODIFIED)) {
+      if (!(error instanceof ResponseError && error.code === LSPErrorCodes.ContentModified)) {
         throw error;
       }
       if (attempt >= renameVerificationTiming.contentModifiedRetries) {
@@ -161,14 +182,8 @@ async function retryOnContentModified<T>(fn: () => Promise<T>): Promise<T> {
   }
 }
 
-interface PrepareRenameResponse {
-  range?: unknown;
-  placeholder?: string;
-  defaultBehavior?: boolean;
-}
-
 /** renameSymbol 的请求与结果（line / character 为 0-based LSP position）。 */
-interface RenameSymbolRequest {
+export interface RenameSymbolRequest {
   path: string;
   line: number;
   character: number;
@@ -177,14 +192,14 @@ interface RenameSymbolRequest {
   signal?: AbortSignal;
 }
 
-interface RenameSymbolResult {
+export interface RenameSymbolResult {
   edit: WorkspaceEdit;
   /** prepareRename 返回的符号当前名；服务器未提供 prepare 时缺省。 */
   placeholder?: string;
 }
 
 /** definition / references / hover 请求的输入（line / character 为 0-based LSP position）。 */
-interface InspectPositionRequest {
+export interface InspectPositionRequest {
   path: string;
   line: number;
   character: number;
@@ -272,7 +287,7 @@ function describeStartupFailure(
   return parts.join("; ");
 }
 
-class InitializeError extends Error {
+export class InitializeError extends Error {
   readonly serverID: string;
   constructor(serverID: string, cause: unknown, detail?: string) {
     super(`Failed to initialize LSP server ${serverID}${detail ? `: ${detail}` : ""}`, { cause });
@@ -280,15 +295,6 @@ class InitializeError extends Error {
   }
 }
 
-interface DocumentDiagnosticReport {
-  items?: Diagnostic[];
-  relatedDocuments?: Record<string, DocumentDiagnosticReport>;
-}
-
-interface WorkspaceDiagnosticReport {
-  items?: { uri?: string; items?: Diagnostic[] }[];
-}
-
 interface DiagnosticRequestResult {
   handled: boolean;
   matched: boolean;
@@ -304,27 +310,6 @@ interface PullResult {
   timedOut: boolean;
 }
 
-interface CapabilityRegistration {
-  id: string;
-  method: string;
-  registerOptions?: {
-    identifier?: string;
-    workspaceDiagnostics?: boolean;
-    watchers?: { globPattern?: string; kind?: number }[];
-  };
-}
-
-interface ServerCapabilities {
-  textDocumentSync?:
-    | number
-    | {
-        change?: number;
-      };
-  diagnosticProvider?: unknown;
-  renameProvider?: boolean | { prepareProvider?: boolean };
-  [key: string]: unknown;
-}
-
 /**
  * create 的直连缺省（单一来源）：lsp.ts 的 resolveConfig 解析超时/LRU 时引用
  * 同一组数值，保证配置层缺省与直连调用方取值一致。
@@ -368,7 +353,7 @@ export interface CreateInput {
 export interface LspClient {
   readonly root: string;
   readonly serverID: string;
-  readonly connection: MessageConnection;
+  readonly connection: ProtocolConnection;
   readonly notify: {
     open(request: { path: string }): Promise<number>;
     /** 把工作区文件事件批量通知服务器；驻留文档不在此通道（走 didOpen/didChange/退场）。 */
@@ -589,7 +574,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
   const initializeTimeoutMs = input.initializeTimeoutMs ?? clientDefaults.initializeTimeoutMs;
   const maxOpenDocuments = input.maxOpenDocuments ?? clientDefaults.maxOpenDocuments;
 
-  const connection = createMessageConnection(
+  const connection = createProtocolConnection(
     new StreamMessageReader(input.server.process.stdout),
     new StreamMessageWriter(input.server.process.stdin),
   );
@@ -616,7 +601,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
   const pushDiagnostics = new Map<string, Diagnostic[]>();
   const pullDiagnostics = new Map<string, Diagnostic[]>();
   const published = new Map<string, { at: number; version?: number }>();
-  const diagnosticRegistrations = new Map<string, CapabilityRegistration>();
+  const diagnosticRegistrations = new Map<string, Registration>();
   /** registration id → workspace/didChangeWatchedFiles watchers（pattern + WatchKind 位）。 */
   const watcherRegistrations = new Map<string, WatcherGlob[]>();
   const registrationListeners = new Set<() => void>();
@@ -645,56 +630,54 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
   // ── LSP 连接处理器 ─────────────────────────────────────────────────────────
 
-  connection.onNotification(
-    "textDocument/publishDiagnostics",
-    (params: { uri: string; version?: number; diagnostics: Diagnostic[] }) => {
-      const filePath = getFilePath(params.uri);
-      if (!filePath) {
-        return;
-      }
-      // 服务器版本滞后于已发送版本时，该 push 对应的是旧内容（异步重算未完成
-      // 时的迟到结果）。忽略，避免与当前版本结果混淆。
-      const currentVersion = documentVersions.get(filePath);
-      const isStalePush =
-        typeof params.version === "number" &&
-        currentVersion !== undefined &&
-        params.version !== currentVersion;
-      if (isStalePush) {
-        return;
-      }
-      published.set(filePath, {
-        at: Date.now(),
-        version: typeof params.version === "number" ? params.version : undefined,
-      });
-      const document = files[filePath];
-      if (document !== undefined) {
-        document.lastPushEmpty = params.diagnostics.length === 0;
-      }
-      updatePushDiagnostics(filePath, params.diagnostics);
-    },
-  );
-  connection.onRequest("window/workDoneProgress/create", () => null);
-  connection.onRequest("workspace/configuration", (params) => {
-    const items = (params as { items?: { section?: string }[] }).items ?? [];
-    return items.map((item) =>
-      configurationValue(input.server.settings ?? input.server.initialization, item.section),
-    );
+  connection.onNotification(PublishDiagnosticsNotification.type, (params) => {
+    const filePath = getFilePath(params.uri);
+    if (!filePath) {
+      return;
+    }
+    // 服务器版本滞后于已发送版本时，该 push 对应的是旧内容（异步重算未完成
+    // 时的迟到结果）。忽略，避免与当前版本结果混淆。
+    const currentVersion = documentVersions.get(filePath);
+    const isStalePush =
+      typeof params.version === "number" &&
+      currentVersion !== undefined &&
+      params.version !== currentVersion;
+    if (isStalePush) {
+      return;
+    }
+    published.set(filePath, {
+      at: Date.now(),
+      version: typeof params.version === "number" ? params.version : undefined,
+    });
+    const document = files[filePath];
+    if (document !== undefined) {
+      document.lastPushEmpty = params.diagnostics.length === 0;
+    }
+    updatePushDiagnostics(filePath, params.diagnostics);
   });
-  connection.onRequest("client/registerCapability", (params) => {
-    const registrations =
-      (params as { registrations?: CapabilityRegistration[] }).registrations ?? [];
+  connection.onRequest(WorkDoneProgressCreateRequest.type, () => {
+    /* 不展示服务器进度：仍按协议接受进度条创建 */
+  });
+  connection.onRequest(ConfigurationRequest.type, (params) =>
+    params.items.map((item) =>
+      configurationValue(input.server.settings ?? input.server.initialization, item.section),
+    ),
+  );
+  connection.onRequest(RegistrationRequest.type, (params) => {
     let changed = false;
-    for (const registration of registrations) {
-      if (registration.method === "workspace/didChangeWatchedFiles") {
+    for (const registration of params.registrations) {
+      if (registration.method === DidChangeWatchedFilesNotification.method) {
+        const options = registration.registerOptions as
+          DidChangeWatchedFilesRegistrationOptions | undefined;
         const watchers =
-          registration.registerOptions?.watchers
-            ?.map((watcher) => ({
+          options?.watchers
+            .map((watcher) => ({
               pattern: watcher.globPattern,
               kind: watcher.kind ?? WATCH_KIND_ALL,
             }))
             .filter((watcher): watcher is WatcherGlob => typeof watcher.pattern === "string") ?? [];
         watcherRegistrations.set(registration.id, watchers);
-      } else if (registration.method === "textDocument/diagnostic") {
+      } else if (registration.method === DocumentDiagnosticRequest.method) {
         diagnosticRegistrations.set(registration.id, registration);
         changed = true;
       }
@@ -703,14 +686,12 @@ export async function create(input: CreateInput): Promise<LspClient> {
       emitRegistrationChange();
     }
   });
-  connection.onRequest("client/unregisterCapability", (params) => {
-    const registrations =
-      (params as { unregisterations?: { id: string; method: string }[] }).unregisterations ?? [];
+  connection.onRequest(UnregistrationRequest.type, (params) => {
     let changed = false;
-    for (const registration of registrations) {
-      if (registration.method === "workspace/didChangeWatchedFiles") {
+    for (const registration of params.unregisterations) {
+      if (registration.method === DidChangeWatchedFilesNotification.method) {
         watcherRegistrations.delete(registration.id);
-      } else if (registration.method === "textDocument/diagnostic") {
+      } else if (registration.method === DocumentDiagnosticRequest.method) {
         diagnosticRegistrations.delete(registration.id);
         changed = true;
       }
@@ -719,18 +700,20 @@ export async function create(input: CreateInput): Promise<LspClient> {
       emitRegistrationChange();
     }
   });
-  connection.onRequest("workspace/workspaceFolders", () => [
+  connection.onRequest(WorkspaceFoldersRequest.type, () => [
     { name: "workspace", uri: pathToFileURL(input.root).href },
   ]);
-  connection.onRequest("workspace/diagnostic/refresh", () => null);
+  connection.onRequest(DiagnosticRefreshRequest.type, () => {
+    /* 诊断由本客户端主动拉取，刷新请求无需额外动作 */
+  });
   connection.listen();
 
   // ── initialize 握手 ─────────────────────────────────────────────────────────
 
   const initialized = await withTimeout(
-    connection.sendRequest<{ capabilities?: ServerCapabilities }>("initialize", {
+    connection.sendRequest(InitializeRequest.type, {
       rootUri: pathToFileURL(input.root).href,
-      processId: input.server.process.pid,
+      processId: input.server.process.pid ?? null,
       workspaceFolders: [{ name: "workspace", uri: pathToFileURL(input.root).href }],
       initializationOptions: {
         ...input.server.initialization,
@@ -743,7 +726,6 @@ export async function create(input: CreateInput): Promise<LspClient> {
           diagnostics: { refreshSupport: false },
         },
         textDocument: {
-          synchronization: { didOpen: true, didChange: true },
           diagnostic: { dynamicRegistration: true, relatedDocumentSupport: true },
           publishDiagnostics: { versionSupport: false },
         },
@@ -763,18 +745,18 @@ export async function create(input: CreateInput): Promise<LspClient> {
   });
 
   const syncKind = getSyncKind(initialized.capabilities);
-  const hasStaticPullDiagnostics = Boolean(initialized.capabilities?.diagnosticProvider);
+  const hasStaticPullDiagnostics = Boolean(initialized.capabilities.diagnosticProvider);
   // prepareProvider 只在静态声明为对象且显式开启时使用；其余情况跳过 prepare
   // 直接 rename（能力可能经动态注册，静态声明缺失不代表服务器不支持）。
-  const renameProvider = initialized.capabilities?.renameProvider;
+  const renameProvider = initialized.capabilities.renameProvider;
   const hasPrepareProvider =
     typeof renameProvider === "object" && renameProvider.prepareProvider === true;
 
-  await connection.sendNotification("initialized", {});
+  await connection.sendNotification(InitializedNotification.type, {});
 
   const settings = input.server.settings ?? input.server.initialization;
   if (settings) {
-    await connection.sendNotification("workspace/didChangeConfiguration", { settings });
+    await connection.sendNotification(DidChangeConfigurationNotification.type, { settings });
   }
 
   /**
@@ -819,7 +801,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
     }
     for (const path of plan.evict) {
       lruOrder.delete(path);
-      await connection.sendNotification("textDocument/didClose", {
+      await connection.sendNotification(DidCloseTextDocumentNotification.type, {
         textDocument: { uri: pathToFileURL(path).href },
       });
       delete files[path];
@@ -864,7 +846,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
   ): Promise<DiagnosticRequestResult> {
     let timedOut = false;
     const report = await withTimeout(
-      connection.sendRequest<DocumentDiagnosticReport | null>("textDocument/diagnostic", {
+      connection.sendRequest(DocumentDiagnosticRequest.type, {
         ...(identifier && { identifier }),
         textDocument: { uri: pathToFileURL(filePath).href },
       }),
@@ -887,14 +869,14 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
     let handled = false;
     let matched = false;
-    if (Array.isArray(report.items)) {
+    if (report.kind === DocumentDiagnosticReportKind.Full) {
       push(filePath, report.items);
       handled = true;
       matched = true;
     }
     for (const [uri, related] of Object.entries(report.relatedDocuments ?? {})) {
       const relatedPath = getFilePath(uri);
-      if (!relatedPath || !Array.isArray(related.items)) {
+      if (!relatedPath || related.kind !== DocumentDiagnosticReportKind.Full) {
         continue;
       }
       push(relatedPath, related.items);
@@ -911,7 +893,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
   ): Promise<DiagnosticRequestResult> {
     let timedOut = false;
     const report = await withTimeout(
-      connection.sendRequest<WorkspaceDiagnosticReport | null>("workspace/diagnostic", {
+      connection.sendRequest(WorkspaceDiagnosticRequest.type, {
         ...(identifier && { identifier }),
         previousResultIds: [],
       }),
@@ -928,9 +910,9 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
     const byFile = new Map<string, Diagnostic[]>();
     let matched = false;
-    for (const item of report.items ?? []) {
-      const relatedPath = item.uri ? getFilePath(item.uri) : undefined;
-      if (!relatedPath || !Array.isArray(item.items)) {
+    for (const item of report.items) {
+      const relatedPath = getFilePath(item.uri);
+      if (!relatedPath || item.kind !== DocumentDiagnosticReportKind.Full) {
         continue;
       }
       const existing = byFile.get(relatedPath) ?? [];
@@ -941,13 +923,22 @@ export async function create(input: CreateInput): Promise<LspClient> {
     return { handled: true, matched, byFile, timedOut };
   }
 
+  /** 动态注册的 pull 诊断选项：Registration.registerOptions 是 any，按注册方法收窄。 */
+  function diagnosticRegistrationOptions(
+    registration: Registration,
+  ): DiagnosticRegistrationOptions | undefined {
+    return registration.registerOptions as DiagnosticRegistrationOptions | undefined;
+  }
+
   function documentPullState() {
     const documentRegistrations = [...diagnosticRegistrations.values()].filter(
-      (registration) => registration.registerOptions?.workspaceDiagnostics !== true,
+      (registration) => diagnosticRegistrationOptions(registration)?.workspaceDiagnostics !== true,
     );
     return {
       documentIdentifiers: [
-        ...new Set(documentRegistrations.flatMap((r) => r.registerOptions?.identifier ?? [])),
+        ...new Set(
+          documentRegistrations.flatMap((r) => diagnosticRegistrationOptions(r)?.identifier ?? []),
+        ),
       ],
       supported: hasStaticPullDiagnostics || documentRegistrations.length > 0,
     };
@@ -955,11 +946,13 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
   function workspacePullState() {
     const workspaceRegistrations = [...diagnosticRegistrations.values()].filter(
-      (registration) => registration.registerOptions?.workspaceDiagnostics === true,
+      (registration) => diagnosticRegistrationOptions(registration)?.workspaceDiagnostics === true,
     );
     return {
       workspaceIdentifiers: [
-        ...new Set(workspaceRegistrations.flatMap((r) => r.registerOptions?.identifier ?? [])),
+        ...new Set(
+          workspaceRegistrations.flatMap((r) => diagnosticRegistrationOptions(r)?.identifier ?? []),
+        ),
       ],
       supported: workspaceRegistrations.length > 0,
     };
@@ -1263,10 +1256,10 @@ export async function create(input: CreateInput): Promise<LspClient> {
       // 保留 lastPushEmpty：安静期判据看的是「变更前服务器最后一份结论是否为空」
       files[resolvedPath] = { ...document, version: next, text, syncedAt: Date.now() };
       documentVersions.set(resolvedPath, next);
-      await connection.sendNotification("textDocument/didChange", {
+      await connection.sendNotification(DidChangeTextDocumentNotification.type, {
         textDocument: { uri, version: next },
         contentChanges:
-          syncKind === TEXT_DOCUMENT_SYNC_INCREMENTAL
+          syncKind === TextDocumentSyncKind.Incremental
             ? [
                 {
                   range: { start: { line: 0, character: 0 }, end: endPosition(document.text) },
@@ -1282,7 +1275,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
     pushDiagnostics.delete(resolvedPath);
     pullDiagnostics.delete(resolvedPath);
-    await connection.sendNotification("textDocument/didOpen", {
+    await connection.sendNotification(DidOpenTextDocumentNotification.type, {
       textDocument: { uri, languageId, version: 0, text },
     });
     files[resolvedPath] = { version: 0, text, syncedAt: Date.now() };
@@ -1311,13 +1304,13 @@ export async function create(input: CreateInput): Promise<LspClient> {
    * （$/cancelRequest），也立刻以 signal.reason（默认 AbortError）拒绝本地
    * promise——服务器可能永远不回应，工具调用不能就这么挂着。
    */
-  async function sendAbortableRequest<T>(
-    method: string,
-    params: object,
+  async function sendAbortableRequest<P, R, PR, E, RO>(
+    type: ProtocolRequestType<P, R, PR, E, RO>,
+    params: RequestParam<P>,
     signal: AbortSignal | undefined,
-  ): Promise<T> {
+  ): Promise<R> {
     if (!signal) {
-      return await connection.sendRequest<T>(method, params);
+      return await connection.sendRequest(type, params);
     }
     if (signal.aborted) {
       throw abortReason(signal);
@@ -1337,7 +1330,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
     signal.addEventListener("abort", onAbort, { once: true });
     try {
       return await Promise.race([
-        connection.sendRequest<T>(method, params, source.token),
+        connection.sendRequest(type, params, source.token),
         aborted.promise,
       ]);
     } finally {
@@ -1346,16 +1339,16 @@ export async function create(input: CreateInput): Promise<LspClient> {
     }
   }
 
-  const sendInspectRequest = async <T>(
-    method: string,
-    message: object,
+  const sendInspectRequest = async <P, R, PR, E, RO>(
+    type: ProtocolRequestType<P, R, PR, E, RO>,
+    message: RequestParam<P>,
     signal?: AbortSignal,
-  ): Promise<T> => {
+  ): Promise<R> => {
     try {
-      return await retryOnContentModified(() => sendAbortableRequest<T>(method, message, signal));
+      return await retryOnContentModified(() => sendAbortableRequest(type, message, signal));
     } catch (error) {
-      if (error instanceof ResponseError && error.code === LSP_METHOD_NOT_FOUND) {
-        throw new LspMethodNotSupportedError(input.serverID, method);
+      if (error instanceof ResponseError && error.code === ErrorCodes.MethodNotFound) {
+        throw new LspMethodNotSupportedError(input.serverID, type.method);
       }
       throw error;
     }
@@ -1382,7 +1375,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
     notify: {
       open: openDocument,
       async watchedFiles(changes: FileChange[]): Promise<void> {
-        const notified: { uri: string; type: number }[] = [];
+        const notified: FileEvent[] = [];
         for (const change of changes) {
           const resolvedPath = normalize(
             isAbsolute(change.path) ? change.path : resolve(input.directory, change.path),
@@ -1406,7 +1399,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
                 continue;
               }
             }
-            await connection.sendNotification("textDocument/didClose", {
+            await connection.sendNotification(DidCloseTextDocumentNotification.type, {
               textDocument: { uri: pathToFileURL(resolvedPath).href },
             });
             delete files[resolvedPath];
@@ -1420,7 +1413,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
         if (notified.length === 0) {
           return;
         }
-        await connection.sendNotification("workspace/didChangeWatchedFiles", {
+        await connection.sendNotification(DidChangeWatchedFilesNotification.type, {
           changes: notified,
         });
       },
@@ -1469,8 +1462,8 @@ export async function create(input: CreateInput): Promise<LspClient> {
       // 与编辑器行为一致。
       const referencesRequest = () =>
         retryOnContentModified(() =>
-          sendAbortableRequest<{ uri: string }[] | null>(
-            "textDocument/references",
+          sendAbortableRequest(
+            ReferencesRequest.type,
             {
               textDocument: { uri },
               position,
@@ -1490,8 +1483,8 @@ export async function create(input: CreateInput): Promise<LspClient> {
       const sendRename = async (): Promise<WorkspaceEdit | null> => {
         try {
           return await retryOnContentModified(() =>
-            sendAbortableRequest<WorkspaceEdit | null>(
-              "textDocument/rename",
+            sendAbortableRequest(
+              RenameRequest.type,
               {
                 textDocument: { uri },
                 position,
@@ -1501,7 +1494,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
             ),
           );
         } catch (error) {
-          if (error instanceof ResponseError && error.code === LSP_METHOD_NOT_FOUND) {
+          if (error instanceof ResponseError && error.code === ErrorCodes.MethodNotFound) {
             throw notRenameable();
           }
           throw error;
@@ -1510,17 +1503,17 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
       let placeholder: string | undefined;
       if (hasPrepareProvider) {
-        let prepared: PrepareRenameResponse | null;
+        let prepared: PrepareRenameResult | null;
         try {
           prepared = await retryOnContentModified(() =>
-            sendAbortableRequest<PrepareRenameResponse | null>(
-              "textDocument/prepareRename",
+            sendAbortableRequest(
+              PrepareRenameRequest.type,
               { textDocument: { uri }, position },
               request.signal,
             ),
           );
         } catch (error) {
-          if (error instanceof ResponseError && error.code === LSP_METHOD_NOT_FOUND) {
+          if (error instanceof ResponseError && error.code === ErrorCodes.MethodNotFound) {
             throw notRenameable();
           }
           throw error;
@@ -1528,7 +1521,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
         if (!prepared) {
           throw notRenameable();
         }
-        if (typeof prepared.placeholder === "string") {
+        if ("placeholder" in prepared && typeof prepared.placeholder === "string") {
           placeholder = prepared.placeholder;
         }
       }
@@ -1537,7 +1530,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
       try {
         locations = await referencesRequest();
       } catch (error) {
-        if (!(error instanceof ResponseError && error.code === LSP_METHOD_NOT_FOUND)) {
+        if (!(error instanceof ResponseError && error.code === ErrorCodes.MethodNotFound)) {
           throw error;
         }
         const edit = await sendRename();
@@ -1608,8 +1601,8 @@ export async function create(input: CreateInput): Promise<LspClient> {
     async definition(request: InspectPositionRequest): Promise<InspectLocation[]> {
       const { uri, position } = await preparePositionRequest(request);
       return toInspectLocations(
-        await sendInspectRequest<DefinitionResult>(
-          "textDocument/definition",
+        await sendInspectRequest(
+          DefinitionRequest.type,
           { textDocument: { uri }, position },
           request.signal,
         ),
@@ -1617,8 +1610,8 @@ export async function create(input: CreateInput): Promise<LspClient> {
     },
     async references(request: InspectPositionRequest): Promise<InspectLocation[]> {
       const { uri, position } = await preparePositionRequest(request);
-      const locations = await sendInspectRequest<LspLocation[] | null>(
-        "textDocument/references",
+      const locations = await sendInspectRequest(
+        ReferencesRequest.type,
         {
           textDocument: { uri },
           position,
@@ -1630,8 +1623,8 @@ export async function create(input: CreateInput): Promise<LspClient> {
     },
     async hover(request: InspectPositionRequest): Promise<Hover | null> {
       const { uri, position } = await preparePositionRequest(request);
-      return await sendInspectRequest<Hover | null>(
-        "textDocument/hover",
+      return await sendInspectRequest(
+        HoverRequest.type,
         { textDocument: { uri }, position },
         request.signal,
       );

package/src/spawn-agent.ts

@@ -16,9 +16,11 @@
  * `MAX_PROGRESS_LINES` lines. Consecutive tool calls are merged into a
  * single `tool:` line (`read x 2, glob`) and over-long line content is
  * folded to the first/last 9 chars joined by `…`, so a burst of tool calls
- * or a long text block does not flood the window; any text block starts a
- * new line. Line content is sanitized first: markdown marker characters are
- * stripped and whitespace (including newlines) is collapsed to single spaces,
+ * or a long text block does not flood the window; only a text block starts
+ * a new line — thinking is a transient status line, so it does not break the
+ * merge across turn boundaries. Line content is sanitized first: markdown
+ * marker characters are stripped and whitespace (including newlines) is
+ * collapsed to single spaces,
  * so one log entry is always exactly one rendered line. The final line is
  * always the subagent name as a code span (`` `scout` ``), followed by the
  * live usage stats when there are any; it rides outside the rolling window so
@@ -91,8 +93,11 @@ export const SUBAGENT_DEFAULT_SANDBOX: BwrapConfig = completeBwrapConfig({
   fs: { mode: "readonly" },
   network: { mode: "block" },
 });
-/** Progress log keeps only the most recent lines (rolling window). */
-const MAX_PROGRESS_LINES = 5;
+/**
+ * Progress log keeps only the most recent lines (rolling window).
+ * 展开后面板最多 6 行内容：4 行日志 + 可能的一行瞬态 thinking + 固定的 metadata 行。
+ */
+const MAX_PROGRESS_LINES = 4;
 /** Progress line content (without the `tool:` / `text:` prefix) is capped at 21 chars; longer text is folded to the first/last 9 chars joined by ` … `. */
 const MAX_PROGRESS_CHARS_PER_LINE = 21;
 /**
@@ -464,7 +469,8 @@ export async function runAgent(
   let logLines: string[] = [];
   // 工具调用行合并:连续的 tool_execution_start 事件合并在同一 `tool:` 行
   // (如 `tool: read x 2, glob`),相同工具名连续出现时计为 `name x N`,
-  // 不同名按调用顺序罗列;任何非工具行都会打断合并。
+  // 不同名按调用顺序罗列;只有写入日志行的事件(text 块)打断合并,thinking
+  // 不写日志行、也不打断合并。
   let toolLineSegments: string[] = [];
   let toolLine: { name: string; count: number } | undefined;
   // 思考中状态：thinking_start 打开、thinking_delta 累计字符数、thinking_end
@@ -476,7 +482,7 @@ export async function runAgent(
     if (logLines.length > MAX_PROGRESS_LINES) {
       logLines = logLines.slice(-MAX_PROGRESS_LINES);
     }
-    // 任何非工具行都会打断工具调用合并,下一批调用另起一行。
+    // 写进日志的新行都会打断工具调用合并,下一批调用另起一行。
     toolLine = undefined;
   };
 
@@ -537,8 +543,8 @@ export async function runAgent(
             break;
           }
           case "thinking_start": {
-            // 思考横跨轮次边界：打断工具行合并，下一批工具调用另起一行。
-            toolLine = undefined;
+            // thinking 不产生日志行，因此不打断工具行合并：跨轮次的连续工具调用
+            // 仍累加到同一 `tool:` 行。
             thinkingChars = 0;
             emitUpdate();
             break;