@ashx-j/lunr 0.2.26 → 0.2.27

package/dist/builtin-extensions/pi-lsp-extension/src/lsp-manager.d.ts

@@ -44,6 +44,10 @@ export declare class LspManager {
     private _sessionId;
     private _lombokJarPath;
     private _shuttingDown;
+    private readonly stop;
+    private readonly pendingClients;
+    private readonly restartTimers;
+    private shutdownPromise;
     private _restartAttempts;
     private _restartBackoff;
     private static readonly MAX_RESTART_ATTEMPTS;
@@ -108,6 +112,9 @@ export declare class LspManager {
      */
     startEagerly(languageIds: string[]): void;
     private ensureWorkspace;
+    /** Keep starts registered until their owned clients have either attached or closed. */
+    private trackStart;
+    private waitForStart;
     private startServer;
     /**
      * Post-initialization hook for language-specific setup.
@@ -129,6 +136,7 @@ export declare class LspManager {
     private handleUnexpectedExit;
     /** Shut down all clients (disconnect from daemons, kill direct servers) */
     shutdownAll(): Promise<void>;
+    private shutdownClients;
     /**
      * Restart a specific language server. Shuts down the existing client
      * (and kills the daemon if shared), then starts a fresh server.

package/dist/builtin-extensions/pi-lsp-extension/src/lsp-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-manager.d.ts","sourceRoot":"","sources":["../../../../src/builtin-extensions/pi-lsp-extension/src/lsp-manager.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\n/**\n * LSP Manager — manages multiple LSP server instances, one per language.\n *\n * Lazily starts servers on first use. Auto-detects language from file extension.\n * Uses a WorkspaceProvider for workspace detection, multi-root folders, and daemon state.\n */\n\nimport { resolve, join, dirname } from \"node:path\";\nimport { pathToFileURL } from \"node:url\";\nimport { existsSync, readFileSync, readdirSync, unlinkSync } from \"node:fs\";\nimport { spawn as spawnChild } from \"node:child_process\";\nimport { LspClient } from \"./lsp-client.js\";\nimport { type WorkspaceProvider, DefaultWorkspaceProvider } from \"./workspace-provider.js\";\nimport { getLanguageIdFromPath } from \"./shared/language-map.js\";\nimport { DAEMON_SOCKET_READY_DELAY_MS, DAEMON_RETRY_INTERVAL_MS, DAEMON_MAX_RETRIES } from \"./shared/timing.js\";\n\nexport interface ServerConfig {\n  command: string;\n  args: string[];\n  env?: Record<string, string>;\n  /** LSP initializationOptions passed during the initialize handshake */\n  initializationOptions?: Record<string, unknown>;\n  /** Settings returned by workspace/configuration handler (keyed by section) */\n  settings?: Record<string, unknown>;\n}\n\n/** Lifecycle callbacks for UI notifications */\nexport interface LspManagerCallbacks {\n  onWorkspaceSetupStart?: () => void;\n  onWorkspaceSetupEnd?: (success: boolean, duration: number) => void;\n  onServerStart?: (languageId: string, command: string) => void;\n  onServerReady?: (languageId: string) => void;\n  onServerError?: (languageId: string, error: string) => void;\n  onServerCrash?: (languageId: string, restarting: boolean, attempt: number) => void;\n}\n\n/** Default server configurations for common languages */\nconst DEFAULT_SERVERS: Record<string, ServerConfig> = {\n  typescript: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  javascript: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  typescriptreact: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  javascriptreact: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  rust: { command: \"rust-analyzer\", args: [] },\n  python: { command: \"pyright-langserver\", args: [\"--stdio\"] },\n  go: { command: \"gopls\", args: [\"serve\"] },\n  java: { command: \"jdtls\", args: [] },\n};\n\n// File extension → language ID mapping is in shared/language-map.ts\n\nexport interface ServerStatus {\n  languageId: string;\n  command: string;\n  running: boolean;\n  diagnosticsCount: number;\n  /** True if using a shared daemon (vs direct spawn) */\n  shared: boolean;\n}\n\nexport class LspManager {\n  private clients: Map<string, LspClient> = new Map();\n  private serverConfigs: Map<string, ServerConfig>;\n  private rootDir: string;\n  private startingServers: Map<string, Promise<LspClient>> = new Map();\n  private _workspace: WorkspaceProvider;\n  private _workspaceReady = false;\n  private _workspaceReadying: Promise<boolean> | null = null;\n  private _callbacks: LspManagerCallbacks;\n  private _sessionId: string;\n  private _lombokJarPath: string | null = null;\n  private _shuttingDown = false;\n  private _restartAttempts: Map<string, number> = new Map();\n  private _restartBackoff: Map<string, number> = new Map();\n\n  private static readonly MAX_RESTART_ATTEMPTS = 3;\n  private static readonly INITIAL_BACKOFF_MS = 1000;\n  private static readonly MAX_BACKOFF_MS = 30000;\n\n  constructor(rootDir: string, customConfigs?: Record<string, ServerConfig>, callbacks?: LspManagerCallbacks, sessionId?: string, workspace?: WorkspaceProvider) {\n    this.rootDir = resolve(rootDir);\n    this.serverConfigs = new Map(Object.entries({\n      ...DEFAULT_SERVERS,\n      ...customConfigs,\n    }));\n    this._workspace = workspace ?? new DefaultWorkspaceProvider();\n    this._callbacks = callbacks ?? {};\n    this._sessionId = sessionId ?? `${process.pid}-${Date.now()}`;\n  }\n\n  /** Get the workspace provider */\n  get workspace(): WorkspaceProvider {\n    return this._workspace;\n  }\n\n  /** Replace the workspace provider (e.g. when an external extension registers one) */\n  setWorkspaceProvider(provider: WorkspaceProvider): void {\n    this._workspace = provider;\n    this._workspaceReady = false;\n    this._workspaceReadying = null;\n  }\n\n  /** Update or add a server configuration */\n  setServerConfig(languageId: string, config: ServerConfig): void {\n    this.serverConfigs.set(languageId, config);\n  }\n\n  /** Set an explicit path to a Lombok jar for Java/jdtls support */\n  setLombokJar(jarPath: string): void {\n    this._lombokJarPath = resolve(this.rootDir, jarPath);\n  }\n\n  /** Get the currently configured Lombok jar path (if any) */\n  getLombokJar(): string | null {\n    return this.findLombokJar();\n  }\n\n  /**\n   * Auto-detect Lombok jar.\n   * Searches: explicit path, LOMBOK_JAR env var, workspace root env/ directories.\n   */\n  private findLombokJar(): string | null {\n    // 1. Explicit path set via setLombokJar()\n    if (this._lombokJarPath) {\n      if (existsSync(this._lombokJarPath)) return this._lombokJarPath;\n    }\n\n    // 2. LOMBOK_JAR environment variable\n    const envJar = process.env.LOMBOK_JAR;\n    if (envJar) {\n      const resolved = resolve(this.rootDir, envJar);\n      if (existsSync(resolved)) return resolved;\n    }\n\n    // 3. Auto-detect from workspace root (e.g. Brazil workspace env/ directory)\n    //    Search both workspace root and cwd in case they differ\n    const searchRoots = [this.rootDir];\n    const wsRoot = this._workspace.workspaceRoot;\n    if (wsRoot && wsRoot !== this.rootDir) {\n      searchRoots.unshift(wsRoot);\n    }\n\n    for (const root of searchRoots) {\n      const envDir = join(root, \"env\");\n      if (!existsSync(envDir)) continue;\n\n      // env/Lombok-{version}/runtime/lib/lombok-*.jar\n      try {\n        const lombokDirs = readdirSync(envDir).filter(d => d.startsWith(\"Lombok-\"));\n        for (const dir of lombokDirs) {\n          const libDir = join(envDir, dir, \"runtime\", \"lib\");\n          if (existsSync(libDir)) {\n            const jars = readdirSync(libDir).filter(f => f.startsWith(\"lombok-\") && f.endsWith(\".jar\"));\n            if (jars.length > 0) return join(libDir, jars[0]);\n          }\n        }\n      } catch { /* ignore */ }\n\n      // env/gradle-cache-2/org/projectlombok/lombok/{version}/lombok-{version}.jar\n      const gradleLombok = join(envDir, \"gradle-cache-2\", \"org\", \"projectlombok\", \"lombok\");\n      if (existsSync(gradleLombok)) {\n        try {\n          const versions = readdirSync(gradleLombok);\n          for (const ver of versions) {\n            const jarPath = join(gradleLombok, ver, `lombok-${ver}.jar`);\n            if (existsSync(jarPath)) return jarPath;\n          }\n        } catch { /* ignore */ }\n      }\n    }\n\n    return null;\n  }\n\n  /** Build initializationOptions for Java (jdtls) with Lombok support */\n  private getJavaInitializationOptions(): Record<string, unknown> | undefined {\n    const lombokJar = this.findLombokJar();\n    if (!lombokJar) return undefined;\n\n    // jdtls expects flat dotted keys in settings, not nested objects\n    return {\n      settings: {\n        \"java.jdt.ls.vmargs\": `-javaagent:${lombokJar}`,\n      },\n    };\n  }\n\n  /** Get all configured languages */\n  getConfiguredLanguages(): string[] {\n    return [...this.serverConfigs.keys()];\n  }\n\n  /** Resolve a file path to a language ID */\n  getLanguageId(filePath: string): string | undefined {\n    return getLanguageIdFromPath(filePath);\n  }\n\n  /** Get a file URI from a path */\n  getFileUri(filePath: string): string {\n    const abs = resolve(this.rootDir, filePath);\n    return pathToFileURL(abs).toString();\n  }\n\n  /** Resolve an absolute path from potentially relative input */\n  resolvePath(filePath: string): string {\n    return resolve(this.rootDir, filePath);\n  }\n\n  /**\n   * Get the LSP client for a language ONLY if it's already running.\n   * Does not start a new server. Returns null if no client is active.\n   */\n  getRunningClient(languageId: string): LspClient | null {\n    const existing = this.clients.get(languageId);\n    if (existing && existing.initialized && !existing.disposed) {\n      return existing;\n    }\n    return null;\n  }\n\n  /**\n   * Get the LSP client for a file, starting the server if needed.\n   * Returns null if no server is configured for this file type.\n   */\n  async getClientForFile(filePath: string): Promise<LspClient | null> {\n    const languageId = this.getLanguageId(filePath);\n    if (!languageId) return null;\n    return this.getClientForLanguage(languageId);\n  }\n\n  /**\n   * Get a user-friendly message about why no client is available for a file.\n   */\n  getUnavailableReason(filePath: string): string {\n    const languageId = this.getLanguageId(filePath);\n    if (!languageId) return `No LSP server configured for file type: ${filePath}`;\n    const waitHint = this.getExpectedStartTime(languageId);\n    if (this.startingServers.has(languageId)) {\n      return `LSP server for ${languageId} is starting. ${waitHint} Retry shortly.`;\n    }\n    const existing = this.clients.get(languageId);\n    if (existing && !existing.initialized && !existing.disposed) {\n      return `LSP server for ${languageId} is initializing. ${waitHint} Retry shortly.`;\n    }\n    return `No LSP server available for: ${filePath}. If you just opened this project, call any LSP tool on a file to trigger server startup.`;\n  }\n\n  /** Estimated startup time hint for a language server */\n  private getExpectedStartTime(languageId: string): string {\n    switch (languageId) {\n      case \"java\":\n        return \"This typically takes 1-5 minutes for Java (project indexing).\";\n      case \"rust\":\n        return \"This typically takes 30s-2min for Rust (cargo metadata + indexing).\";\n      case \"typescript\":\n      case \"javascript\":\n      case \"typescriptreact\":\n      case \"javascriptreact\":\n        return \"This typically takes 10-30s for TypeScript/JavaScript.\";\n      case \"python\":\n        return \"This typically takes 10-30s for Python.\";\n      case \"go\":\n        return \"This typically takes 10-30s for Go.\";\n      default:\n        return \"This may take a few seconds to a minute.\";\n    }\n  }\n\n  /**\n   * Get the LSP client for a language, starting the server if needed.\n   * In Brazil workspaces, connects to a shared daemon (or spawns one).\n   * Returns null if no server is configured for this language.\n   */\n  async getClientForLanguage(languageId: string): Promise<LspClient | null> {\n    // Already running?\n    const existing = this.clients.get(languageId);\n    if (existing && existing.initialized && !existing.disposed) {\n      return existing;\n    }\n\n    // Already starting? Don't block — return null so tools can show \"starting\" message\n    const starting = this.startingServers.get(languageId);\n    if (starting) return null;\n\n    const config = this.serverConfigs.get(languageId);\n    if (!config) return null;\n\n    // Kick off server start in the background — don't await\n    const startPromise = this.startServer(languageId, config);\n    this.startingServers.set(languageId, startPromise);\n\n    // Fire-and-forget: clean up on completion or failure\n    startPromise.catch((err) => {\n      this.startingServers.delete(languageId);\n      const message = `Failed to start LSP server for ${languageId}: ${err.message}`;\n      this._callbacks.onServerError?.(languageId, message);\n    });\n\n    return null; // Server not ready yet\n  }\n\n  /**\n   * Check if a server is currently starting up for a language.\n   */\n  isServerStarting(languageId: string): boolean {\n    return this.startingServers.has(languageId);\n  }\n\n  /**\n   * Eagerly start LSP servers for the given languages in the background.\n   * Unlike getClientForLanguage (which returns null immediately), this method\n   * is fire-and-forget — intended for session_start auto-start.\n   */\n  startEagerly(languageIds: string[]): void {\n    for (const languageId of languageIds) {\n      // Skip if already running or starting\n      const existing = this.clients.get(languageId);\n      if (existing && existing.initialized && !existing.disposed) continue;\n      if (this.startingServers.has(languageId)) continue;\n\n      const config = this.serverConfigs.get(languageId);\n      if (!config) continue;\n\n      const startPromise = this.startServer(languageId, config);\n      this.startingServers.set(languageId, startPromise);\n\n      startPromise.catch((err) => {\n        this.startingServers.delete(languageId);\n        this._callbacks.onServerError?.(languageId, `Auto-start failed: ${err.message}`);\n      });\n    }\n  }\n\n  /**\n   * Ensure workspace provider is ready (one-time per session).\n   * Deduplicates concurrent calls.\n   */\n  private async ensureWorkspace(): Promise<void> {\n    if (this._workspaceReady) return;\n    if (this._workspaceReadying) {\n      await this._workspaceReadying;\n      return;\n    }\n    this._callbacks.onWorkspaceSetupStart?.();\n    const start = Date.now();\n    this._workspaceReadying = this._workspace.ensureReady(this._sessionId);\n    try {\n      const success = await this._workspaceReadying;\n      this._callbacks.onWorkspaceSetupEnd?.(success, Date.now() - start);\n    } finally {\n      this._workspaceReady = true;\n      this._workspaceReadying = null;\n    }\n  }\n\n  private async startServer(languageId: string, config: ServerConfig): Promise<LspClient> {\n    // Ensure workspace provider is ready (one-time setup)\n    await this.ensureWorkspace();\n\n    const stateDir = this._workspace.stateDir;\n    const folders = this._workspace.getWorkspaceFolders();\n    const workspaceFolders = folders.length > 0 ? folders : undefined;\n\n    // Build language-specific initializationOptions (e.g. Lombok for Java)\n    // Use config-level initializationOptions if provided, otherwise fall back to language-specific defaults\n    const initializationOptions = config.initializationOptions\n      ?? (languageId === \"java\" ? this.getJavaInitializationOptions() : undefined);\n\n    // For Java with Lombok, inject --jvm-arg so jdtls launches with -javaagent\n    let effectiveArgs = config.args;\n    if (languageId === \"java\") {\n      const lombokJar = this.findLombokJar();\n      if (lombokJar) {\n        effectiveArgs = [`--jvm-arg=-javaagent:${lombokJar}`, ...config.args];\n      }\n    }\n\n    // Callback for auto-restart on unexpected exit\n    const onUnexpectedExit = (code: number | null) => this.handleUnexpectedExit(languageId, code);\n    // Try connecting to an existing daemon socket first\n    const socketPath = this.getSocketPath(languageId);\n    if (socketPath && this.isDaemonAlive(languageId)) {\n      this._callbacks.onServerStart?.(languageId, `${config.command} (shared)`);\n      try {\n        const client = new LspClient({\n          command: config.command,\n          args: effectiveArgs,\n          rootDir: this.rootDir,\n          languageId,\n          socketPath,\n          initializationOptions,\n          settings: config.settings,\n          onUnexpectedExit,\n        });\n        await client.start();\n        this.clients.set(languageId, client);\n        this.startingServers.delete(languageId);\n        this._callbacks.onServerReady?.(languageId);\n        this._restartAttempts.delete(languageId);\n        this._restartBackoff.delete(languageId);\n        this.triggerPostInit(languageId, client);\n        return client;\n      } catch {\n        // Daemon may be stale — fall through to spawn new one\n      }\n    }\n\n    // No existing daemon — spawn one (or start direct if no state directory)\n    this._callbacks.onServerStart?.(languageId, config.command);\n\n    if (stateDir) {\n      // Spawn daemon and connect via socket\n      try {\n        await this.spawnDaemon(languageId, config, effectiveArgs, workspaceFolders, initializationOptions);\n        // Small delay to let daemon start listening\n        await new Promise((r) => setTimeout(r, DAEMON_SOCKET_READY_DELAY_MS));\n\n        const daemonSocket = this.getSocketPath(languageId)!;\n\n        // Retry connection (daemon may still be initializing jdtls which can take minutes)\n        let lastErr: Error | null = null;\n        for (let attempt = 0; attempt < DAEMON_MAX_RETRIES; attempt++) {\n          try {\n            const client = new LspClient({\n              command: config.command,\n              args: effectiveArgs,\n              rootDir: this.rootDir,\n              languageId,\n              socketPath: daemonSocket,\n              initializationOptions,\n              settings: config.settings,\n              onUnexpectedExit,\n            });\n            await client.start();\n            this.clients.set(languageId, client);\n            this.startingServers.delete(languageId);\n            this._callbacks.onServerReady?.(languageId);\n            this._restartAttempts.delete(languageId);\n            this._restartBackoff.delete(languageId);\n            this.triggerPostInit(languageId, client);\n            return client;\n          } catch (err: any) {\n            lastErr = err;\n            // Check if daemon is still alive before retrying\n            if (!this.isDaemonAlive(languageId)) {\n              throw new Error(`Daemon for ${languageId} died during startup: ${err.message}`);\n            }\n            await new Promise((r) => setTimeout(r, DAEMON_RETRY_INTERVAL_MS));\n          }\n        }\n        throw lastErr ?? new Error(\"Failed to connect to daemon\");\n      } catch (err: any) {\n        // Fall back to direct mode — log the daemon failure\n        this._callbacks.onServerError?.(languageId, `Daemon mode failed, falling back to direct: ${err.message}`);\n        this.startingServers.delete(languageId);\n        // Don't throw — try direct mode below\n      }\n    }\n\n    // Direct mode (no state directory for daemon, or daemon failed)\n    const client = new LspClient({\n      command: config.command,\n      args: effectiveArgs,\n      rootDir: this.rootDir,\n      languageId,\n      env: config.env,\n      workspaceFolders,\n      initializationOptions,\n      settings: config.settings,\n      onUnexpectedExit,\n    });\n\n    try {\n      await client.start();\n      this.clients.set(languageId, client);\n      this.startingServers.delete(languageId);\n      this._callbacks.onServerReady?.(languageId);\n      this._restartAttempts.delete(languageId);\n      this._restartBackoff.delete(languageId);\n      this.triggerPostInit(languageId, client);\n      return client;\n    } catch (err: any) {\n      this.startingServers.delete(languageId);\n      const message = `Failed to start LSP server for ${languageId} (${config.command}): ${err.message}`;\n      this._callbacks.onServerError?.(languageId, message);\n      throw new Error(message);\n    }\n  }\n\n  /**\n   * Post-initialization hook for language-specific setup.\n   * For Java/jdtls: triggers a workspace build so diagnostics refresh\n   * after Lombok annotation processing completes.\n   */\n  private triggerPostInit(languageId: string, client: LspClient): void {\n    if (languageId === \"java\") {\n      // java/buildWorkspace forces jdtls to rebuild and re-publish diagnostics.\n      // The boolean parameter means \"full build\" (true) vs incremental (false).\n      client.sendRequest(\"java/buildWorkspace\", true).catch(() => {\n        // Not critical — diagnostics will just be stale until a file changes\n      });\n    }\n  }\n\n  /** Get the socket path for a language's daemon */\n  private getSocketPath(languageId: string): string | null {\n    const stateDir = this._workspace.stateDir;\n    if (!stateDir) return null;\n    return join(stateDir, \"sockets\", `lsp-${languageId}.sock`);\n  }\n\n  /** Check if a daemon is alive for this language */\n  private isDaemonAlive(languageId: string): boolean {\n    const stateDir = this._workspace.stateDir;\n    if (!stateDir) return false;\n    const pidPath = join(stateDir, \"sockets\", `lsp-${languageId}.pid`);\n    try {\n      if (!existsSync(pidPath)) return false;\n      const pid = parseInt(readFileSync(pidPath, \"utf-8\").trim(), 10);\n      if (isNaN(pid)) return false;\n      process.kill(pid, 0); // throws if not alive\n      return true;\n    } catch {\n      return false;\n    }\n  }\n\n  /** Spawn an LSP daemon as a detached background process */\n  private async spawnDaemon(\n    languageId: string,\n    config: ServerConfig,\n    effectiveArgs: string[],\n    workspaceFolders?: { uri: string; name: string }[],\n    initializationOptions?: Record<string, unknown>,\n  ): Promise<void> {\n    const socketPath = this.getSocketPath(languageId)!;\n    const daemonScript = new URL(\"./lsp-daemon.ts\", import.meta.url).pathname;\n    const launcherScript = new URL(\"./lsp-daemon-launcher.cjs\", import.meta.url).pathname;\n\n    // Resolve jiti from the running process's module context\n    let jitiPath: string;\n    try {\n      jitiPath = require.resolve(\"jiti\");\n    } catch {\n      try {\n        jitiPath = require.resolve(\"@mariozechner/jiti\");\n      } catch {\n        throw new Error(\"Cannot resolve jiti for daemon spawn — jiti not found in module path\");\n      }\n    }\n\n    const env: Record<string, string> = {\n      ...process.env as Record<string, string>,\n      ...(config.env ?? {}),\n      LSP_ROOT_DIR: this.rootDir,\n      LSP_LANGUAGE_ID: languageId,\n    };\n\n    if (workspaceFolders && workspaceFolders.length > 0) {\n      env.LSP_WORKSPACE_FOLDERS = JSON.stringify(workspaceFolders);\n    }\n\n    if (initializationOptions) {\n      env.LSP_INITIALIZATION_OPTIONS = JSON.stringify(initializationOptions);\n    }\n\n    if (config.settings) {\n      env.LSP_SETTINGS = JSON.stringify(config.settings);\n    }\n\n    const child = spawnChild(\n      process.execPath, // node\n      [launcherScript, jitiPath, daemonScript, socketPath, config.command, ...effectiveArgs],\n      {\n        cwd: this.rootDir,\n        env,\n        detached: true,\n        stdio: \"ignore\",\n      },\n    );\n\n    child.unref(); // let daemon outlive this process\n  }\n\n  /** Get status of all configured/running servers */\n  getStatus(): ServerStatus[] {\n    const statuses: ServerStatus[] = [];\n    for (const [languageId, config] of this.serverConfigs) {\n      const client = this.clients.get(languageId);\n      let diagnosticsCount = 0;\n      if (client) {\n        for (const diags of client.getAllDiagnostics().values()) {\n          diagnosticsCount += diags.length;\n        }\n      }\n      const daemonAlive = this.isDaemonAlive(languageId);\n      statuses.push({\n        languageId,\n        command: config.command,\n        running: client?.initialized === true && !client.disposed,\n        diagnosticsCount,\n        shared: daemonAlive,\n      });\n    }\n    return statuses;\n  }\n\n  /**\n   * Handle an unexpected server exit. Attempts auto-restart with exponential backoff.\n   * Gives up after MAX_RESTART_ATTEMPTS failures per language per session.\n   */\n  private handleUnexpectedExit(languageId: string, code: number | null): void {\n    if (this._shuttingDown) return;\n\n    // Clean up the dead client\n    this.clients.delete(languageId);\n    this.startingServers.delete(languageId);\n\n    const attempts = this._restartAttempts.get(languageId) ?? 0;\n    if (attempts >= LspManager.MAX_RESTART_ATTEMPTS) {\n      this._callbacks.onServerError?.(languageId, `LSP server for ${languageId} crashed ${attempts} times — giving up auto-restart`);\n      this._callbacks.onServerCrash?.(languageId, false, attempts);\n      return;\n    }\n\n    const backoff = this._restartBackoff.get(languageId) ?? LspManager.INITIAL_BACKOFF_MS;\n    this._restartAttempts.set(languageId, attempts + 1);\n    this._restartBackoff.set(languageId, Math.min(backoff * 2, LspManager.MAX_BACKOFF_MS));\n\n    this._callbacks.onServerCrash?.(languageId, true, attempts + 1);\n\n    setTimeout(() => {\n      if (this._shuttingDown) return;\n      const config = this.serverConfigs.get(languageId);\n      if (!config) return;\n\n      const startPromise = this.startServer(languageId, config);\n      this.startingServers.set(languageId, startPromise);\n      startPromise.catch((err) => {\n        this.startingServers.delete(languageId);\n        this._callbacks.onServerError?.(languageId, `Auto-restart failed for ${languageId}: ${err.message}`);\n        // Trigger another restart attempt (recursive backoff)\n        this.handleUnexpectedExit(languageId, null);\n      });\n    }, backoff);\n  }\n\n  /** Shut down all clients (disconnect from daemons, kill direct servers) */\n  async shutdownAll(): Promise<void> {\n    this._workspace.shutdown();\n    this._shuttingDown = true;\n    const shutdowns = [...this.clients.values()].map((client) =>\n      client.shutdown().catch(() => {})\n    );\n    await Promise.all(shutdowns);\n    this.clients.clear();\n    this.startingServers.clear();\n  }\n\n  /**\n   * Restart a specific language server. Shuts down the existing client\n   * (and kills the daemon if shared), then starts a fresh server.\n   * Returns once the new server is initialized, or throws on failure.\n   */\n  async restartServer(languageId: string): Promise<void> {\n    // Shut down existing client\n    const existing = this.clients.get(languageId);\n    if (existing) {\n      await existing.shutdown().catch(() => {});\n      this.clients.delete(languageId);\n    }\n\n    // Kill the daemon if one is running (so we get a fresh server with new config)\n    this.killDaemon(languageId);\n\n    // Wait for pending starts to clear\n    const pending = this.startingServers.get(languageId);\n    if (pending) {\n      await pending.catch(() => {});\n      this.startingServers.delete(languageId);\n    }\n\n    // Start fresh\n    const config = this.serverConfigs.get(languageId);\n    if (!config) throw new Error(`No server configured for ${languageId}`);\n\n    await this.startServer(languageId, config);\n  }\n\n  /** Kill a running daemon for a language (if any) */\n  private killDaemon(languageId: string): void {\n    const stateDir = this._workspace.stateDir;\n    if (!stateDir) return;\n    const pidPath = join(stateDir, \"sockets\", `lsp-${languageId}.pid`);\n    try {\n      if (!existsSync(pidPath)) return;\n      const pid = parseInt(readFileSync(pidPath, \"utf-8\").trim(), 10);\n      if (isNaN(pid)) return;\n      process.kill(pid, \"SIGTERM\");\n      // Clean up socket and pid files\n      const socketPath = join(stateDir, \"sockets\", `lsp-${languageId}.sock`);\n      try { unlinkSync(socketPath); } catch {}\n      try { unlinkSync(pidPath); } catch {}\n    } catch {\n      // Process may already be dead\n    }\n  }\n}\n"]}
+{"version":3,"file":"lsp-manager.d.ts","sourceRoot":"","sources":["../../../../src/builtin-extensions/pi-lsp-extension/src/lsp-manager.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\n/**\n * LSP Manager — manages multiple LSP server instances, one per language.\n *\n * Lazily starts servers on first use. Auto-detects language from file extension.\n * Uses a WorkspaceProvider for workspace detection, multi-root folders, and daemon state.\n */\n\nimport { resolve, join, dirname } from \"node:path\";\nimport { pathToFileURL } from \"node:url\";\nimport { existsSync, readFileSync, readdirSync, unlinkSync } from \"node:fs\";\nimport { setTimeout as delay } from \"node:timers/promises\";\nimport { spawn as spawnChild } from \"node:child_process\";\nimport { LspClient } from \"./lsp-client.js\";\nimport { type WorkspaceProvider, DefaultWorkspaceProvider } from \"./workspace-provider.js\";\nimport { getLanguageIdFromPath } from \"./shared/language-map.js\";\nimport { DAEMON_SOCKET_READY_DELAY_MS, DAEMON_RETRY_INTERVAL_MS, DAEMON_MAX_RETRIES } from \"./shared/timing.js\";\n\nexport interface ServerConfig {\n  command: string;\n  args: string[];\n  env?: Record<string, string>;\n  /** LSP initializationOptions passed during the initialize handshake */\n  initializationOptions?: Record<string, unknown>;\n  /** Settings returned by workspace/configuration handler (keyed by section) */\n  settings?: Record<string, unknown>;\n}\n\n/** Lifecycle callbacks for UI notifications */\nexport interface LspManagerCallbacks {\n  onWorkspaceSetupStart?: () => void;\n  onWorkspaceSetupEnd?: (success: boolean, duration: number) => void;\n  onServerStart?: (languageId: string, command: string) => void;\n  onServerReady?: (languageId: string) => void;\n  onServerError?: (languageId: string, error: string) => void;\n  onServerCrash?: (languageId: string, restarting: boolean, attempt: number) => void;\n}\n\n/** Default server configurations for common languages */\nconst DEFAULT_SERVERS: Record<string, ServerConfig> = {\n  typescript: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  javascript: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  typescriptreact: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  javascriptreact: { command: \"typescript-language-server\", args: [\"--stdio\"] },\n  rust: { command: \"rust-analyzer\", args: [] },\n  python: { command: \"pyright-langserver\", args: [\"--stdio\"] },\n  go: { command: \"gopls\", args: [\"serve\"] },\n  java: { command: \"jdtls\", args: [] },\n};\n\n// File extension → language ID mapping is in shared/language-map.ts\n\nexport interface ServerStatus {\n  languageId: string;\n  command: string;\n  running: boolean;\n  diagnosticsCount: number;\n  /** True if using a shared daemon (vs direct spawn) */\n  shared: boolean;\n}\n\nexport class LspManager {\n  private clients: Map<string, LspClient> = new Map();\n  private serverConfigs: Map<string, ServerConfig>;\n  private rootDir: string;\n  private startingServers: Map<string, Promise<LspClient>> = new Map();\n  private _workspace: WorkspaceProvider;\n  private _workspaceReady = false;\n  private _workspaceReadying: Promise<boolean> | null = null;\n  private _callbacks: LspManagerCallbacks;\n  private _sessionId: string;\n  private _lombokJarPath: string | null = null;\n  private _shuttingDown = false;\n  private readonly stop = new AbortController();\n  private readonly pendingClients = new Set<LspClient>();\n  private readonly restartTimers = new Set<ReturnType<typeof setTimeout>>();\n  private shutdownPromise: Promise<void> | null = null;\n  private _restartAttempts: Map<string, number> = new Map();\n  private _restartBackoff: Map<string, number> = new Map();\n\n  private static readonly MAX_RESTART_ATTEMPTS = 3;\n  private static readonly INITIAL_BACKOFF_MS = 1000;\n  private static readonly MAX_BACKOFF_MS = 30000;\n\n  constructor(rootDir: string, customConfigs?: Record<string, ServerConfig>, callbacks?: LspManagerCallbacks, sessionId?: string, workspace?: WorkspaceProvider) {\n    this.rootDir = resolve(rootDir);\n    this.serverConfigs = new Map(Object.entries({\n      ...DEFAULT_SERVERS,\n      ...customConfigs,\n    }));\n    this._workspace = workspace ?? new DefaultWorkspaceProvider();\n    this._callbacks = callbacks ?? {};\n    this._sessionId = sessionId ?? `${process.pid}-${Date.now()}`;\n  }\n\n  /** Get the workspace provider */\n  get workspace(): WorkspaceProvider {\n    return this._workspace;\n  }\n\n  /** Replace the workspace provider (e.g. when an external extension registers one) */\n  setWorkspaceProvider(provider: WorkspaceProvider): void {\n    this._workspace = provider;\n    this._workspaceReady = false;\n    this._workspaceReadying = null;\n  }\n\n  /** Update or add a server configuration */\n  setServerConfig(languageId: string, config: ServerConfig): void {\n    this.serverConfigs.set(languageId, config);\n  }\n\n  /** Set an explicit path to a Lombok jar for Java/jdtls support */\n  setLombokJar(jarPath: string): void {\n    this._lombokJarPath = resolve(this.rootDir, jarPath);\n  }\n\n  /** Get the currently configured Lombok jar path (if any) */\n  getLombokJar(): string | null {\n    return this.findLombokJar();\n  }\n\n  /**\n   * Auto-detect Lombok jar.\n   * Searches: explicit path, LOMBOK_JAR env var, workspace root env/ directories.\n   */\n  private findLombokJar(): string | null {\n    // 1. Explicit path set via setLombokJar()\n    if (this._lombokJarPath) {\n      if (existsSync(this._lombokJarPath)) return this._lombokJarPath;\n    }\n\n    // 2. LOMBOK_JAR environment variable\n    const envJar = process.env.LOMBOK_JAR;\n    if (envJar) {\n      const resolved = resolve(this.rootDir, envJar);\n      if (existsSync(resolved)) return resolved;\n    }\n\n    // 3. Auto-detect from workspace root (e.g. Brazil workspace env/ directory)\n    //    Search both workspace root and cwd in case they differ\n    const searchRoots = [this.rootDir];\n    const wsRoot = this._workspace.workspaceRoot;\n    if (wsRoot && wsRoot !== this.rootDir) {\n      searchRoots.unshift(wsRoot);\n    }\n\n    for (const root of searchRoots) {\n      const envDir = join(root, \"env\");\n      if (!existsSync(envDir)) continue;\n\n      // env/Lombok-{version}/runtime/lib/lombok-*.jar\n      try {\n        const lombokDirs = readdirSync(envDir).filter(d => d.startsWith(\"Lombok-\"));\n        for (const dir of lombokDirs) {\n          const libDir = join(envDir, dir, \"runtime\", \"lib\");\n          if (existsSync(libDir)) {\n            const jars = readdirSync(libDir).filter(f => f.startsWith(\"lombok-\") && f.endsWith(\".jar\"));\n            if (jars.length > 0) return join(libDir, jars[0]);\n          }\n        }\n      } catch { /* ignore */ }\n\n      // env/gradle-cache-2/org/projectlombok/lombok/{version}/lombok-{version}.jar\n      const gradleLombok = join(envDir, \"gradle-cache-2\", \"org\", \"projectlombok\", \"lombok\");\n      if (existsSync(gradleLombok)) {\n        try {\n          const versions = readdirSync(gradleLombok);\n          for (const ver of versions) {\n            const jarPath = join(gradleLombok, ver, `lombok-${ver}.jar`);\n            if (existsSync(jarPath)) return jarPath;\n          }\n        } catch { /* ignore */ }\n      }\n    }\n\n    return null;\n  }\n\n  /** Build initializationOptions for Java (jdtls) with Lombok support */\n  private getJavaInitializationOptions(): Record<string, unknown> | undefined {\n    const lombokJar = this.findLombokJar();\n    if (!lombokJar) return undefined;\n\n    // jdtls expects flat dotted keys in settings, not nested objects\n    return {\n      settings: {\n        \"java.jdt.ls.vmargs\": `-javaagent:${lombokJar}`,\n      },\n    };\n  }\n\n  /** Get all configured languages */\n  getConfiguredLanguages(): string[] {\n    return [...this.serverConfigs.keys()];\n  }\n\n  /** Resolve a file path to a language ID */\n  getLanguageId(filePath: string): string | undefined {\n    return getLanguageIdFromPath(filePath);\n  }\n\n  /** Get a file URI from a path */\n  getFileUri(filePath: string): string {\n    const abs = resolve(this.rootDir, filePath);\n    return pathToFileURL(abs).toString();\n  }\n\n  /** Resolve an absolute path from potentially relative input */\n  resolvePath(filePath: string): string {\n    return resolve(this.rootDir, filePath);\n  }\n\n  /**\n   * Get the LSP client for a language ONLY if it's already running.\n   * Does not start a new server. Returns null if no client is active.\n   */\n  getRunningClient(languageId: string): LspClient | null {\n    const existing = this.clients.get(languageId);\n    if (existing && existing.initialized && !existing.disposed) {\n      return existing;\n    }\n    return null;\n  }\n\n  /**\n   * Get the LSP client for a file, starting the server if needed.\n   * Returns null if no server is configured for this file type.\n   */\n  async getClientForFile(filePath: string): Promise<LspClient | null> {\n    const languageId = this.getLanguageId(filePath);\n    if (!languageId) return null;\n    return this.getClientForLanguage(languageId);\n  }\n\n  /**\n   * Get a user-friendly message about why no client is available for a file.\n   */\n  getUnavailableReason(filePath: string): string {\n    const languageId = this.getLanguageId(filePath);\n    if (!languageId) return `No LSP server configured for file type: ${filePath}`;\n    const waitHint = this.getExpectedStartTime(languageId);\n    if (this.startingServers.has(languageId)) {\n      return `LSP server for ${languageId} is starting. ${waitHint} Retry shortly.`;\n    }\n    const existing = this.clients.get(languageId);\n    if (existing && !existing.initialized && !existing.disposed) {\n      return `LSP server for ${languageId} is initializing. ${waitHint} Retry shortly.`;\n    }\n    return `No LSP server available for: ${filePath}. If you just opened this project, call any LSP tool on a file to trigger server startup.`;\n  }\n\n  /** Estimated startup time hint for a language server */\n  private getExpectedStartTime(languageId: string): string {\n    switch (languageId) {\n      case \"java\":\n        return \"This typically takes 1-5 minutes for Java (project indexing).\";\n      case \"rust\":\n        return \"This typically takes 30s-2min for Rust (cargo metadata + indexing).\";\n      case \"typescript\":\n      case \"javascript\":\n      case \"typescriptreact\":\n      case \"javascriptreact\":\n        return \"This typically takes 10-30s for TypeScript/JavaScript.\";\n      case \"python\":\n        return \"This typically takes 10-30s for Python.\";\n      case \"go\":\n        return \"This typically takes 10-30s for Go.\";\n      default:\n        return \"This may take a few seconds to a minute.\";\n    }\n  }\n\n  /**\n   * Get the LSP client for a language, starting the server if needed.\n   * In Brazil workspaces, connects to a shared daemon (or spawns one).\n   * Returns null if no server is configured for this language.\n   */\n  async getClientForLanguage(languageId: string): Promise<LspClient | null> {\n    if (this._shuttingDown) return null;\n    // Already running?\n    const existing = this.clients.get(languageId);\n    if (existing && existing.initialized && !existing.disposed) {\n      return existing;\n    }\n\n    // Already starting? Don't block — return null so tools can show \"starting\" message\n    const starting = this.startingServers.get(languageId);\n    if (starting) return null;\n\n    const config = this.serverConfigs.get(languageId);\n    if (!config) return null;\n\n    // Kick off server start in the background — don't await\n    const startPromise = this.trackStart(languageId, config);\n\n    // Fire-and-forget: clean up on completion or failure\n    startPromise.catch((err) => {\n      if (this._shuttingDown) return;\n      const message = `Failed to start LSP server for ${languageId}: ${err.message}`;\n      this._callbacks.onServerError?.(languageId, message);\n    });\n\n    return null; // Server not ready yet\n  }\n\n  /**\n   * Check if a server is currently starting up for a language.\n   */\n  isServerStarting(languageId: string): boolean {\n    return this.startingServers.has(languageId);\n  }\n\n  /**\n   * Eagerly start LSP servers for the given languages in the background.\n   * Unlike getClientForLanguage (which returns null immediately), this method\n   * is fire-and-forget — intended for session_start auto-start.\n   */\n  startEagerly(languageIds: string[]): void {\n    if (this._shuttingDown) return;\n    for (const languageId of languageIds) {\n      // Skip if already running or starting\n      const existing = this.clients.get(languageId);\n      if (existing && existing.initialized && !existing.disposed) continue;\n      if (this.startingServers.has(languageId)) continue;\n\n      const config = this.serverConfigs.get(languageId);\n      if (!config) continue;\n\n      const startPromise = this.trackStart(languageId, config);\n\n      startPromise.catch((err) => {\n        if (this._shuttingDown) return;\n        this._callbacks.onServerError?.(languageId, `Auto-start failed: ${err.message}`);\n      });\n    }\n  }\n\n  /**\n   * Ensure workspace provider is ready (one-time per session).\n   * Deduplicates concurrent calls.\n   */\n  private async ensureWorkspace(): Promise<void> {\n    if (this._workspaceReady) return;\n    if (this._workspaceReadying) {\n      await this.waitForStart(this._workspaceReadying);\n      return;\n    }\n    this._callbacks.onWorkspaceSetupStart?.();\n    this.stop.signal.throwIfAborted();\n    const start = Date.now();\n    this._workspaceReadying = this._workspace.ensureReady(this._sessionId);\n    try {\n      const success = await this.waitForStart(this._workspaceReadying);\n      this._callbacks.onWorkspaceSetupEnd?.(success, Date.now() - start);\n    } finally {\n      this._workspaceReady = true;\n      this._workspaceReadying = null;\n    }\n  }\n\n  /** Keep starts registered until their owned clients have either attached or closed. */\n  private trackStart(languageId: string, config: ServerConfig): Promise<LspClient> {\n    this.stop.signal.throwIfAborted();\n    const existing = this.startingServers.get(languageId);\n    if (existing) return existing;\n    const pending = Promise.resolve().then(() => this.startServer(languageId, config)).finally(() => {\n      if (this.startingServers.get(languageId) === pending) this.startingServers.delete(languageId);\n    });\n    this.startingServers.set(languageId, pending);\n    return pending;\n  }\n\n  private waitForStart<T>(pending: Promise<T>): Promise<T> {\n    const signal = this.stop.signal;\n    signal.throwIfAborted();\n    return new Promise<T>((resolve, reject) => {\n      const aborted = () => reject(signal.reason);\n      signal.addEventListener(\"abort\", aborted, { once: true });\n      pending.then(resolve, reject).finally(() => signal.removeEventListener(\"abort\", aborted));\n    });\n  }\n\n  private async startServer(languageId: string, config: ServerConfig): Promise<LspClient> {\n    this.stop.signal.throwIfAborted();\n    await this.ensureWorkspace();\n    this.stop.signal.throwIfAborted();\n\n    const stateDir = this._workspace.stateDir;\n    const folders = this._workspace.getWorkspaceFolders();\n    const workspaceFolders = folders.length > 0 ? folders : undefined;\n\n    // Build language-specific initializationOptions (e.g. Lombok for Java)\n    // Use config-level initializationOptions if provided, otherwise fall back to language-specific defaults\n    const initializationOptions = config.initializationOptions\n      ?? (languageId === \"java\" ? this.getJavaInitializationOptions() : undefined);\n\n    // For Java with Lombok, inject --jvm-arg so jdtls launches with -javaagent\n    let effectiveArgs = config.args;\n    if (languageId === \"java\") {\n      const lombokJar = this.findLombokJar();\n      if (lombokJar) {\n        effectiveArgs = [`--jvm-arg=-javaagent:${lombokJar}`, ...config.args];\n      }\n    }\n\n    const onUnexpectedExit = (code: number | null) => this.handleUnexpectedExit(languageId, code);\n    const connectClient = async (socketPath?: string): Promise<LspClient> => {\n      this.stop.signal.throwIfAborted();\n      const client = new LspClient({\n        command: config.command,\n        args: effectiveArgs,\n        rootDir: this.rootDir,\n        languageId,\n        socketPath,\n        env: config.env,\n        workspaceFolders,\n        initializationOptions,\n        settings: config.settings,\n        onUnexpectedExit,\n      });\n      this.pendingClients.add(client);\n      try {\n        await this.waitForStart(client.start());\n        this.stop.signal.throwIfAborted();\n        if (!client.initialized || client.disposed) throw new Error(\"LSP client closed during startup\");\n        this.clients.set(languageId, client);\n        this._callbacks.onServerReady?.(languageId);\n        this._restartAttempts.delete(languageId);\n        this._restartBackoff.delete(languageId);\n        this.triggerPostInit(languageId, client);\n        return client;\n      } catch (error) {\n        await client.shutdown();\n        throw error;\n      } finally {\n        this.pendingClients.delete(client);\n      }\n    };\n\n    const socketPath = this.getSocketPath(languageId);\n    if (socketPath && this.isDaemonAlive(languageId)) {\n      this._callbacks.onServerStart?.(languageId, `${config.command} (shared)`);\n      try {\n        return await connectClient(socketPath);\n      } catch {\n        // A stale daemon can fall back, but session cancellation cannot.\n        this.stop.signal.throwIfAborted();\n      }\n    }\n\n    this.stop.signal.throwIfAborted();\n    this._callbacks.onServerStart?.(languageId, config.command);\n    if (stateDir) {\n      try {\n        await this.spawnDaemon(languageId, config, effectiveArgs, workspaceFolders, initializationOptions);\n        await delay(DAEMON_SOCKET_READY_DELAY_MS, undefined, { signal: this.stop.signal });\n        const daemonSocket = this.getSocketPath(languageId)!;\n        let lastErr: unknown;\n        for (let attempt = 0; attempt < DAEMON_MAX_RETRIES; attempt++) {\n          this.stop.signal.throwIfAborted();\n          try {\n            return await connectClient(daemonSocket);\n          } catch (error) {\n            this.stop.signal.throwIfAborted();\n            lastErr = error;\n            if (!this.isDaemonAlive(languageId)) throw error;\n            await delay(DAEMON_RETRY_INTERVAL_MS, undefined, { signal: this.stop.signal });\n          }\n        }\n        throw lastErr ?? new Error(\"Failed to connect to daemon\");\n      } catch (error) {\n        this.stop.signal.throwIfAborted();\n        const message = error instanceof Error ? error.message : String(error);\n        this._callbacks.onServerError?.(languageId, `Daemon mode failed, falling back to direct: ${message}`);\n      }\n    }\n    return connectClient();\n  }\n\n  /**\n   * Post-initialization hook for language-specific setup.\n   * For Java/jdtls: triggers a workspace build so diagnostics refresh\n   * after Lombok annotation processing completes.\n   */\n  private triggerPostInit(languageId: string, client: LspClient): void {\n    if (languageId === \"java\") {\n      // java/buildWorkspace forces jdtls to rebuild and re-publish diagnostics.\n      // The boolean parameter means \"full build\" (true) vs incremental (false).\n      client.sendRequest(\"java/buildWorkspace\", true).catch(() => {\n        // Not critical — diagnostics will just be stale until a file changes\n      });\n    }\n  }\n\n  /** Get the socket path for a language's daemon */\n  private getSocketPath(languageId: string): string | null {\n    const stateDir = this._workspace.stateDir;\n    if (!stateDir) return null;\n    return join(stateDir, \"sockets\", `lsp-${languageId}.sock`);\n  }\n\n  /** Check if a daemon is alive for this language */\n  private isDaemonAlive(languageId: string): boolean {\n    const stateDir = this._workspace.stateDir;\n    if (!stateDir) return false;\n    const pidPath = join(stateDir, \"sockets\", `lsp-${languageId}.pid`);\n    try {\n      if (!existsSync(pidPath)) return false;\n      const pid = parseInt(readFileSync(pidPath, \"utf-8\").trim(), 10);\n      if (isNaN(pid)) return false;\n      process.kill(pid, 0); // throws if not alive\n      return true;\n    } catch {\n      return false;\n    }\n  }\n\n  /** Spawn an LSP daemon as a detached background process */\n  private async spawnDaemon(\n    languageId: string,\n    config: ServerConfig,\n    effectiveArgs: string[],\n    workspaceFolders?: { uri: string; name: string }[],\n    initializationOptions?: Record<string, unknown>,\n  ): Promise<void> {\n    this.stop.signal.throwIfAborted();\n    const socketPath = this.getSocketPath(languageId)!;\n    const daemonScript = new URL(\"./lsp-daemon.ts\", import.meta.url).pathname;\n    const launcherScript = new URL(\"./lsp-daemon-launcher.cjs\", import.meta.url).pathname;\n\n    // Resolve jiti from the running process's module context\n    let jitiPath: string;\n    try {\n      jitiPath = require.resolve(\"jiti\");\n    } catch {\n      try {\n        jitiPath = require.resolve(\"@mariozechner/jiti\");\n      } catch {\n        throw new Error(\"Cannot resolve jiti for daemon spawn — jiti not found in module path\");\n      }\n    }\n\n    const env: Record<string, string> = {\n      ...process.env as Record<string, string>,\n      ...(config.env ?? {}),\n      LSP_ROOT_DIR: this.rootDir,\n      LSP_LANGUAGE_ID: languageId,\n    };\n\n    if (workspaceFolders && workspaceFolders.length > 0) {\n      env.LSP_WORKSPACE_FOLDERS = JSON.stringify(workspaceFolders);\n    }\n\n    if (initializationOptions) {\n      env.LSP_INITIALIZATION_OPTIONS = JSON.stringify(initializationOptions);\n    }\n\n    if (config.settings) {\n      env.LSP_SETTINGS = JSON.stringify(config.settings);\n    }\n\n    const child = spawnChild(\n      process.execPath, // node\n      [launcherScript, jitiPath, daemonScript, socketPath, config.command, ...effectiveArgs],\n      {\n        cwd: this.rootDir,\n        env,\n        detached: true,\n        stdio: \"ignore\",\n      },\n    );\n\n    // The launcher becomes shared infrastructure after spawn. Own its startup\n    // error event, but do not kill a daemon when this session disconnects.\n    child.unref(); // let daemon outlive this process\n    await this.waitForStart(new Promise<void>((resolve, reject) => {\n      child.on(\"error\", (error) => {\n        reject(error);\n        if (!this._shuttingDown) this._callbacks.onServerError?.(languageId, error.message);\n      });\n      child.once(\"spawn\", resolve);\n    }));\n  }\n\n  /** Get status of all configured/running servers */\n  getStatus(): ServerStatus[] {\n    const statuses: ServerStatus[] = [];\n    for (const [languageId, config] of this.serverConfigs) {\n      const client = this.clients.get(languageId);\n      let diagnosticsCount = 0;\n      if (client) {\n        for (const diags of client.getAllDiagnostics().values()) {\n          diagnosticsCount += diags.length;\n        }\n      }\n      const daemonAlive = this.isDaemonAlive(languageId);\n      statuses.push({\n        languageId,\n        command: config.command,\n        running: client?.initialized === true && !client.disposed,\n        diagnosticsCount,\n        shared: daemonAlive,\n      });\n    }\n    return statuses;\n  }\n\n  /**\n   * Handle an unexpected server exit. Attempts auto-restart with exponential backoff.\n   * Gives up after MAX_RESTART_ATTEMPTS failures per language per session.\n   */\n  private handleUnexpectedExit(languageId: string, code: number | null): void {\n    if (this._shuttingDown) return;\n\n    // Clean up the dead client\n    this.clients.delete(languageId);\n\n    const attempts = this._restartAttempts.get(languageId) ?? 0;\n    if (attempts >= LspManager.MAX_RESTART_ATTEMPTS) {\n      this._callbacks.onServerError?.(languageId, `LSP server for ${languageId} crashed ${attempts} times — giving up auto-restart`);\n      this._callbacks.onServerCrash?.(languageId, false, attempts);\n      return;\n    }\n\n    const backoff = this._restartBackoff.get(languageId) ?? LspManager.INITIAL_BACKOFF_MS;\n    this._restartAttempts.set(languageId, attempts + 1);\n    this._restartBackoff.set(languageId, Math.min(backoff * 2, LspManager.MAX_BACKOFF_MS));\n\n    this._callbacks.onServerCrash?.(languageId, true, attempts + 1);\n\n    const timer = setTimeout(() => {\n      this.restartTimers.delete(timer);\n      if (this._shuttingDown) return;\n      const config = this.serverConfigs.get(languageId);\n      if (!config) return;\n\n      const startPromise = this.trackStart(languageId, config);\n      startPromise.catch((err) => {\n        if (this._shuttingDown) return;\n        this._callbacks.onServerError?.(languageId, `Auto-restart failed for ${languageId}: ${err.message}`);\n        // Trigger another restart attempt (recursive backoff)\n        this.handleUnexpectedExit(languageId, null);\n      });\n    }, backoff);\n    this.restartTimers.add(timer);\n  }\n\n  /** Shut down all clients (disconnect from daemons, kill direct servers) */\n  shutdownAll(): Promise<void> {\n    if (this.shutdownPromise) return this.shutdownPromise;\n    this._shuttingDown = true;\n    this.stop.abort(new Error(\"LSP manager shut down\"));\n    for (const timer of this.restartTimers) clearTimeout(timer);\n    this.restartTimers.clear();\n    this.shutdownPromise = this.shutdownClients();\n    return this.shutdownPromise;\n  }\n\n  private async shutdownClients(): Promise<void> {\n    try {\n      this._workspace.shutdown();\n    } finally {\n      const clients = new Set([...this.clients.values(), ...this.pendingClients]);\n      await Promise.allSettled([...clients].map((client) => client.shutdown()));\n      await Promise.allSettled([...this.startingServers.values()]);\n      this.clients.clear();\n      this.startingServers.clear();\n    }\n  }\n\n  /**\n   * Restart a specific language server. Shuts down the existing client\n   * (and kills the daemon if shared), then starts a fresh server.\n   * Returns once the new server is initialized, or throws on failure.\n   */\n  async restartServer(languageId: string): Promise<void> {\n    this.stop.signal.throwIfAborted();\n    // A pending start can attach while we wait. Close that client before replacement.\n    const pending = this.startingServers.get(languageId);\n    if (pending) await pending.catch(() => {});\n    this.stop.signal.throwIfAborted();\n\n    const existing = this.clients.get(languageId);\n    if (existing) {\n      await existing.shutdown().catch(() => {});\n      if (this.clients.get(languageId) === existing) this.clients.delete(languageId);\n    }\n    this.stop.signal.throwIfAborted();\n\n    // Explicit restart retains its existing daemon replacement behavior.\n    this.killDaemon(languageId);\n\n    // Start fresh\n    const config = this.serverConfigs.get(languageId);\n    if (!config) throw new Error(`No server configured for ${languageId}`);\n\n    await this.trackStart(languageId, config);\n  }\n\n  /** Kill a running daemon for a language (if any) */\n  private killDaemon(languageId: string): void {\n    const stateDir = this._workspace.stateDir;\n    if (!stateDir) return;\n    const pidPath = join(stateDir, \"sockets\", `lsp-${languageId}.pid`);\n    try {\n      if (!existsSync(pidPath)) return;\n      const pid = parseInt(readFileSync(pidPath, \"utf-8\").trim(), 10);\n      if (isNaN(pid)) return;\n      process.kill(pid, \"SIGTERM\");\n      // Clean up socket and pid files\n      const socketPath = join(stateDir, \"sockets\", `lsp-${languageId}.sock`);\n      try { unlinkSync(socketPath); } catch {}\n      try { unlinkSync(pidPath); } catch {}\n    } catch {\n      // Process may already be dead\n    }\n  }\n}\n"]}

package/dist/builtin-extensions/pi-lsp-extension/src/lsp-manager.js

@@ -8,6 +8,7 @@
 import { resolve, join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { existsSync, readFileSync, readdirSync, unlinkSync } from "node:fs";
+import { setTimeout as delay } from "node:timers/promises";
 import { spawn as spawnChild } from "node:child_process";
 import { LspClient } from "./lsp-client.js";
 import { DefaultWorkspaceProvider } from "./workspace-provider.js";
@@ -36,6 +37,10 @@ export class LspManager {
     _sessionId;
     _lombokJarPath = null;
     _shuttingDown = false;
+    stop = new AbortController();
+    pendingClients = new Set();
+    restartTimers = new Set();
+    shutdownPromise = null;
     _restartAttempts = new Map();
     _restartBackoff = new Map();
     static MAX_RESTART_ATTEMPTS = 3;
@@ -223,6 +228,8 @@ export class LspManager {
      * Returns null if no server is configured for this language.
      */
     async getClientForLanguage(languageId) {
+        if (this._shuttingDown)
+            return null;
         // Already running?
         const existing = this.clients.get(languageId);
         if (existing && existing.initialized && !existing.disposed) {
@@ -236,11 +243,11 @@ export class LspManager {
         if (!config)
             return null;
         // Kick off server start in the background — don't await
-        const startPromise = this.startServer(languageId, config);
-        this.startingServers.set(languageId, startPromise);
+        const startPromise = this.trackStart(languageId, config);
         // Fire-and-forget: clean up on completion or failure
         startPromise.catch((err) => {
-            this.startingServers.delete(languageId);
+            if (this._shuttingDown)
+                return;
             const message = `Failed to start LSP server for ${languageId}: ${err.message}`;
             this._callbacks.onServerError?.(languageId, message);
         });
@@ -258,6 +265,8 @@ export class LspManager {
      * is fire-and-forget — intended for session_start auto-start.
      */
     startEagerly(languageIds) {
+        if (this._shuttingDown)
+            return;
         for (const languageId of languageIds) {
             // Skip if already running or starting
             const existing = this.clients.get(languageId);
@@ -268,10 +277,10 @@ export class LspManager {
             const config = this.serverConfigs.get(languageId);
             if (!config)
                 continue;
-            const startPromise = this.startServer(languageId, config);
-            this.startingServers.set(languageId, startPromise);
+            const startPromise = this.trackStart(languageId, config);
             startPromise.catch((err) => {
-                this.startingServers.delete(languageId);
+                if (this._shuttingDown)
+                    return;
                 this._callbacks.onServerError?.(languageId, `Auto-start failed: ${err.message}`);
             });
         }
@@ -284,14 +293,15 @@ export class LspManager {
         if (this._workspaceReady)
             return;
         if (this._workspaceReadying) {
-            await this._workspaceReadying;
+            await this.waitForStart(this._workspaceReadying);
             return;
         }
         this._callbacks.onWorkspaceSetupStart?.();
+        this.stop.signal.throwIfAborted();
         const start = Date.now();
         this._workspaceReadying = this._workspace.ensureReady(this._sessionId);
         try {
-            const success = await this._workspaceReadying;
+            const success = await this.waitForStart(this._workspaceReadying);
             this._callbacks.onWorkspaceSetupEnd?.(success, Date.now() - start);
         }
         finally {
@@ -299,9 +309,32 @@ export class LspManager {
             this._workspaceReadying = null;
         }
     }
+    /** Keep starts registered until their owned clients have either attached or closed. */
+    trackStart(languageId, config) {
+        this.stop.signal.throwIfAborted();
+        const existing = this.startingServers.get(languageId);
+        if (existing)
+            return existing;
+        const pending = Promise.resolve().then(() => this.startServer(languageId, config)).finally(() => {
+            if (this.startingServers.get(languageId) === pending)
+                this.startingServers.delete(languageId);
+        });
+        this.startingServers.set(languageId, pending);
+        return pending;
+    }
+    waitForStart(pending) {
+        const signal = this.stop.signal;
+        signal.throwIfAborted();
+        return new Promise((resolve, reject) => {
+            const aborted = () => reject(signal.reason);
+            signal.addEventListener("abort", aborted, { once: true });
+            pending.then(resolve, reject).finally(() => signal.removeEventListener("abort", aborted));
+        });
+    }
     async startServer(languageId, config) {
-        // Ensure workspace provider is ready (one-time setup)
+        this.stop.signal.throwIfAborted();
         await this.ensureWorkspace();
+        this.stop.signal.throwIfAborted();
         const stateDir = this._workspace.stateDir;
         const folders = this._workspace.getWorkspaceFolders();
         const workspaceFolders = folders.length > 0 ? folders : undefined;
@@ -317,114 +350,83 @@ export class LspManager {
                 effectiveArgs = [`--jvm-arg=-javaagent:${lombokJar}`, ...config.args];
             }
         }
-        // Callback for auto-restart on unexpected exit
         const onUnexpectedExit = (code) => this.handleUnexpectedExit(languageId, code);
-        // Try connecting to an existing daemon socket first
-        const socketPath = this.getSocketPath(languageId);
-        if (socketPath && this.isDaemonAlive(languageId)) {
-            this._callbacks.onServerStart?.(languageId, `${config.command} (shared)`);
+        const connectClient = async (socketPath) => {
+            this.stop.signal.throwIfAborted();
+            const client = new LspClient({
+                command: config.command,
+                args: effectiveArgs,
+                rootDir: this.rootDir,
+                languageId,
+                socketPath,
+                env: config.env,
+                workspaceFolders,
+                initializationOptions,
+                settings: config.settings,
+                onUnexpectedExit,
+            });
+            this.pendingClients.add(client);
             try {
-                const client = new LspClient({
-                    command: config.command,
-                    args: effectiveArgs,
-                    rootDir: this.rootDir,
-                    languageId,
-                    socketPath,
-                    initializationOptions,
-                    settings: config.settings,
-                    onUnexpectedExit,
-                });
-                await client.start();
+                await this.waitForStart(client.start());
+                this.stop.signal.throwIfAborted();
+                if (!client.initialized || client.disposed)
+                    throw new Error("LSP client closed during startup");
                 this.clients.set(languageId, client);
-                this.startingServers.delete(languageId);
                 this._callbacks.onServerReady?.(languageId);
                 this._restartAttempts.delete(languageId);
                 this._restartBackoff.delete(languageId);
                 this.triggerPostInit(languageId, client);
                 return client;
             }
+            catch (error) {
+                await client.shutdown();
+                throw error;
+            }
+            finally {
+                this.pendingClients.delete(client);
+            }
+        };
+        const socketPath = this.getSocketPath(languageId);
+        if (socketPath && this.isDaemonAlive(languageId)) {
+            this._callbacks.onServerStart?.(languageId, `${config.command} (shared)`);
+            try {
+                return await connectClient(socketPath);
+            }
             catch {
-                // Daemon may be stale — fall through to spawn new one
+                // A stale daemon can fall back, but session cancellation cannot.
+                this.stop.signal.throwIfAborted();
             }
         }
-        // No existing daemon — spawn one (or start direct if no state directory)
+        this.stop.signal.throwIfAborted();
         this._callbacks.onServerStart?.(languageId, config.command);
         if (stateDir) {
-            // Spawn daemon and connect via socket
             try {
                 await this.spawnDaemon(languageId, config, effectiveArgs, workspaceFolders, initializationOptions);
-                // Small delay to let daemon start listening
-                await new Promise((r) => setTimeout(r, DAEMON_SOCKET_READY_DELAY_MS));
+                await delay(DAEMON_SOCKET_READY_DELAY_MS, undefined, { signal: this.stop.signal });
                 const daemonSocket = this.getSocketPath(languageId);
-                // Retry connection (daemon may still be initializing jdtls which can take minutes)
-                let lastErr = null;
+                let lastErr;
                 for (let attempt = 0; attempt < DAEMON_MAX_RETRIES; attempt++) {
+                    this.stop.signal.throwIfAborted();
                     try {
-                        const client = new LspClient({
-                            command: config.command,
-                            args: effectiveArgs,
-                            rootDir: this.rootDir,
-                            languageId,
-                            socketPath: daemonSocket,
-                            initializationOptions,
-                            settings: config.settings,
-                            onUnexpectedExit,
-                        });
-                        await client.start();
-                        this.clients.set(languageId, client);
-                        this.startingServers.delete(languageId);
-                        this._callbacks.onServerReady?.(languageId);
-                        this._restartAttempts.delete(languageId);
-                        this._restartBackoff.delete(languageId);
-                        this.triggerPostInit(languageId, client);
-                        return client;
+                        return await connectClient(daemonSocket);
                     }
-                    catch (err) {
-                        lastErr = err;
-                        // Check if daemon is still alive before retrying
-                        if (!this.isDaemonAlive(languageId)) {
-                            throw new Error(`Daemon for ${languageId} died during startup: ${err.message}`);
-                        }
-                        await new Promise((r) => setTimeout(r, DAEMON_RETRY_INTERVAL_MS));
+                    catch (error) {
+                        this.stop.signal.throwIfAborted();
+                        lastErr = error;
+                        if (!this.isDaemonAlive(languageId))
+                            throw error;
+                        await delay(DAEMON_RETRY_INTERVAL_MS, undefined, { signal: this.stop.signal });
                     }
                 }
                 throw lastErr ?? new Error("Failed to connect to daemon");
             }
-            catch (err) {
-                // Fall back to direct mode — log the daemon failure
-                this._callbacks.onServerError?.(languageId, `Daemon mode failed, falling back to direct: ${err.message}`);
-                this.startingServers.delete(languageId);
-                // Don't throw — try direct mode below
+            catch (error) {
+                this.stop.signal.throwIfAborted();
+                const message = error instanceof Error ? error.message : String(error);
+                this._callbacks.onServerError?.(languageId, `Daemon mode failed, falling back to direct: ${message}`);
             }
         }
-        // Direct mode (no state directory for daemon, or daemon failed)
-        const client = new LspClient({
-            command: config.command,
-            args: effectiveArgs,
-            rootDir: this.rootDir,
-            languageId,
-            env: config.env,
-            workspaceFolders,
-            initializationOptions,
-            settings: config.settings,
-            onUnexpectedExit,
-        });
-        try {
-            await client.start();
-            this.clients.set(languageId, client);
-            this.startingServers.delete(languageId);
-            this._callbacks.onServerReady?.(languageId);
-            this._restartAttempts.delete(languageId);
-            this._restartBackoff.delete(languageId);
-            this.triggerPostInit(languageId, client);
-            return client;
-        }
-        catch (err) {
-            this.startingServers.delete(languageId);
-            const message = `Failed to start LSP server for ${languageId} (${config.command}): ${err.message}`;
-            this._callbacks.onServerError?.(languageId, message);
-            throw new Error(message);
-        }
+        return connectClient();
     }
     /**
      * Post-initialization hook for language-specific setup.
@@ -468,6 +470,7 @@ export class LspManager {
     }
     /** Spawn an LSP daemon as a detached background process */
     async spawnDaemon(languageId, config, effectiveArgs, workspaceFolders, initializationOptions) {
+        this.stop.signal.throwIfAborted();
         const socketPath = this.getSocketPath(languageId);
         const daemonScript = new URL("./lsp-daemon.ts", import.meta.url).pathname;
         const launcherScript = new URL("./lsp-daemon-launcher.cjs", import.meta.url).pathname;
@@ -506,7 +509,17 @@ export class LspManager {
             detached: true,
             stdio: "ignore",
         });
+        // The launcher becomes shared infrastructure after spawn. Own its startup
+        // error event, but do not kill a daemon when this session disconnects.
         child.unref(); // let daemon outlive this process
+        await this.waitForStart(new Promise((resolve, reject) => {
+            child.on("error", (error) => {
+                reject(error);
+                if (!this._shuttingDown)
+                    this._callbacks.onServerError?.(languageId, error.message);
+            });
+            child.once("spawn", resolve);
+        }));
     }
     /** Get status of all configured/running servers */
     getStatus() {
@@ -539,7 +552,6 @@ export class LspManager {
             return;
         // Clean up the dead client
         this.clients.delete(languageId);
-        this.startingServers.delete(languageId);
         const attempts = this._restartAttempts.get(languageId) ?? 0;
         if (attempts >= LspManager.MAX_RESTART_ATTEMPTS) {
             this._callbacks.onServerError?.(languageId, `LSP server for ${languageId} crashed ${attempts} times — giving up auto-restart`);
@@ -550,30 +562,47 @@ export class LspManager {
         this._restartAttempts.set(languageId, attempts + 1);
         this._restartBackoff.set(languageId, Math.min(backoff * 2, LspManager.MAX_BACKOFF_MS));
         this._callbacks.onServerCrash?.(languageId, true, attempts + 1);
-        setTimeout(() => {
+        const timer = setTimeout(() => {
+            this.restartTimers.delete(timer);
             if (this._shuttingDown)
                 return;
             const config = this.serverConfigs.get(languageId);
             if (!config)
                 return;
-            const startPromise = this.startServer(languageId, config);
-            this.startingServers.set(languageId, startPromise);
+            const startPromise = this.trackStart(languageId, config);
             startPromise.catch((err) => {
-                this.startingServers.delete(languageId);
+                if (this._shuttingDown)
+                    return;
                 this._callbacks.onServerError?.(languageId, `Auto-restart failed for ${languageId}: ${err.message}`);
                 // Trigger another restart attempt (recursive backoff)
                 this.handleUnexpectedExit(languageId, null);
             });
         }, backoff);
+        this.restartTimers.add(timer);
     }
     /** Shut down all clients (disconnect from daemons, kill direct servers) */
-    async shutdownAll() {
-        this._workspace.shutdown();
+    shutdownAll() {
+        if (this.shutdownPromise)
+            return this.shutdownPromise;
         this._shuttingDown = true;
-        const shutdowns = [...this.clients.values()].map((client) => client.shutdown().catch(() => { }));
-        await Promise.all(shutdowns);
-        this.clients.clear();
-        this.startingServers.clear();
+        this.stop.abort(new Error("LSP manager shut down"));
+        for (const timer of this.restartTimers)
+            clearTimeout(timer);
+        this.restartTimers.clear();
+        this.shutdownPromise = this.shutdownClients();
+        return this.shutdownPromise;
+    }
+    async shutdownClients() {
+        try {
+            this._workspace.shutdown();
+        }
+        finally {
+            const clients = new Set([...this.clients.values(), ...this.pendingClients]);
+            await Promise.allSettled([...clients].map((client) => client.shutdown()));
+            await Promise.allSettled([...this.startingServers.values()]);
+            this.clients.clear();
+            this.startingServers.clear();
+        }
     }
     /**
      * Restart a specific language server. Shuts down the existing client
@@ -581,25 +610,26 @@ export class LspManager {
      * Returns once the new server is initialized, or throws on failure.
      */
     async restartServer(languageId) {
-        // Shut down existing client
+        this.stop.signal.throwIfAborted();
+        // A pending start can attach while we wait. Close that client before replacement.
+        const pending = this.startingServers.get(languageId);
+        if (pending)
+            await pending.catch(() => { });
+        this.stop.signal.throwIfAborted();
         const existing = this.clients.get(languageId);
         if (existing) {
             await existing.shutdown().catch(() => { });
-            this.clients.delete(languageId);
+            if (this.clients.get(languageId) === existing)
+                this.clients.delete(languageId);
         }
-        // Kill the daemon if one is running (so we get a fresh server with new config)
+        this.stop.signal.throwIfAborted();
+        // Explicit restart retains its existing daemon replacement behavior.
         this.killDaemon(languageId);
-        // Wait for pending starts to clear
-        const pending = this.startingServers.get(languageId);
-        if (pending) {
-            await pending.catch(() => { });
-            this.startingServers.delete(languageId);
-        }
         // Start fresh
         const config = this.serverConfigs.get(languageId);
         if (!config)
             throw new Error(`No server configured for ${languageId}`);
-        await this.startServer(languageId, config);
+        await this.trackStart(languageId, config);
     }
     /** Kill a running daemon for a language (if any) */
     killDaemon(languageId) {