oh-my-opencode 5.0.0-beta.21 → 5.0.0-beta.23

package/packages/omo-codex/plugin/components/lsp/dist/cli.js

@@ -8,11 +8,13 @@ import { argv, execPath as execPath2, stderr } from "node:process";
 import { stdin as processStdin } from "node:process";
 
 // src/codex-hook.ts
-import { readFileSync as readFileSync9, realpathSync as realpathSync8 } from "node:fs";
+import { readFileSync as readFileSync10, realpathSync as realpathSync8 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join12, resolve as resolve11 } from "node:path";
+import { join as join12, resolve as resolve12 } from "node:path";
 
 // ../../../../lsp-daemon/dist/client.js
+import { statSync as statSync5 } from "node:fs";
+import { isAbsolute as isAbsolute6 } from "node:path";
 import { connect } from "node:net";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { existsSync, realpathSync, statSync } from "node:fs";
@@ -43,7 +45,7 @@ import { fileURLToPath } from "node:url";
 import { statSync as statSync2 } from "node:fs";
 import { isAbsolute as isAbsolute2 } from "node:path";
 import { existsSync as existsSync11, realpathSync as realpathSync5, statSync as statSync4 } from "node:fs";
-import { basename as basename3, dirname as dirname9, join as join5, resolve as resolve7 } from "node:path";
+import { basename as basename3, dirname as dirname10, join as join5, resolve as resolve8 } from "node:path";
 import { basename as basename2, extname } from "node:path";
 import { resolve as resolve6 } from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
@@ -68,14 +70,13 @@ import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as rea
 import { dirname as dirname8 } from "node:path";
 import { existsSync as existsSync9, readFileSync as readFileSync5 } from "node:fs";
 import { existsSync as existsSync10 } from "node:fs";
-import { delimiter as delimiter3, join as join4 } from "node:path";
+import { delimiter as delimiter3, dirname as dirname9, isAbsolute as isAbsolute5, join as join4, resolve as resolve7 } from "node:path";
 import { existsSync as existsSync12, lstatSync as lstatSync5, readdirSync as readdirSync3 } from "node:fs";
-import { join as join6, resolve as resolve8 } from "node:path";
+import { join as join6, resolve as resolve9 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { lstatSync as lstatSync6, readdirSync as readdirSync4 } from "node:fs";
 import { join as join7 } from "node:path";
-import { statSync as statSync5 } from "node:fs";
-import { isAbsolute as isAbsolute5 } from "node:path";
+import { readFileSync as readFileSync6, renameSync as renameSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
 
 class LspRequestContextParseError extends Error {
   constructor(code, message) {
@@ -762,6 +763,7 @@ var DEFAULT_MAX_DIRECTORY_FILES = 50;
 var REQUEST_TIMEOUT_MS = 15000;
 var INIT_TIMEOUT_MS = 60000;
 var IDLE_TIMEOUT_MS = 5 * 60000;
+var MAX_RESIDENT_CLIENTS = 6;
 var REAPER_INTERVAL_MS = 60000;
 var STOP_HARD_KILL_TIMEOUT_MS = 5000;
 var STOP_SIGKILL_GRACE_MS = 1000;
@@ -1277,6 +1279,7 @@ class LspClientTransport {
     this.diagnosticsStore = new Map;
     this.workspaceApplyEditHandler = null;
     this.diagnosticPullSupported = false;
+    this.documentFormattingSupported = false;
     this.requestTimeoutMs = timeouts.requestTimeoutMs ?? REQUEST_TIMEOUT_MS;
     this.initializeTimeoutMs = timeouts.initializeTimeoutMs ?? INIT_TIMEOUT_MS;
   }
@@ -1298,6 +1301,12 @@ class LspClientTransport {
   isDiagnosticPullSupported() {
     return this.diagnosticPullSupported;
   }
+  setDocumentFormattingSupported(supported) {
+    this.documentFormattingSupported = supported;
+  }
+  isDocumentFormattingSupported() {
+    return this.documentFormattingSupported;
+  }
   handlePublishDiagnostics(params) {
     this.diagnosticsStore.set(params.uri, [...params.diagnostics]);
   }
@@ -1509,6 +1518,14 @@ function supportsDiagnosticPull(capabilities) {
     return false;
   return Object.hasOwn(capabilities, "diagnosticProvider");
 }
+function supportsDocumentFormatting(capabilities) {
+  if (capabilities === undefined)
+    return false;
+  const provider = capabilities.documentFormattingProvider;
+  if (provider === undefined || provider === null || provider === false)
+    return false;
+  return provider === true || typeof provider === "object";
+}
 
 class LspClientConnection extends LspClientTransport {
   async initialize() {
@@ -1525,6 +1542,7 @@ class LspClientConnection extends LspClientTransport {
           references: {},
           documentSymbol: { hierarchicalDocumentSymbolSupport: true },
           publishDiagnostics: {},
+          formatting: { dynamicRegistration: false },
           rename: {
             prepareSupport: true,
             prepareSupportDefaultBehavior: 1
@@ -1566,6 +1584,7 @@ class LspClientConnection extends LspClientTransport {
       initializationOptions: this.server.initialization
     }, { timeoutMs: this.initializeTimeoutMs });
     this.setDiagnosticPullSupported(supportsDiagnosticPull(result?.capabilities));
+    this.setDocumentFormattingSupported(supportsDocumentFormatting(result?.capabilities));
     await this.sendNotification("initialized", {});
     await this.sendNotification("workspace/didChangeConfiguration", {
       settings: { json: { validate: { enable: true } } }
@@ -3104,6 +3123,18 @@ class LspClient extends LspClientConnection {
       textDocument: { uri: pathToFileURL3(absPath).href }
     }, options);
   }
+  async formatDocument(filePath, options, signal) {
+    if (!this.isDocumentFormattingSupported())
+      return null;
+    const absPath = this.resolveWorkspacePath(filePath);
+    await this.openFile(absPath);
+    const requestOptions = signal === undefined ? {} : { signal };
+    const edits = await this.sendRequest("textDocument/formatting", {
+      textDocument: { uri: pathToFileURL3(absPath).href },
+      options
+    }, requestOptions);
+    return edits ?? [];
+  }
   async workspaceSymbols(query, signal) {
     const options = signal === undefined ? {} : { signal };
     return this.sendRequest("workspace/symbol", { query }, options);
@@ -3352,6 +3383,7 @@ class LspManager {
     this.disposed = false;
     this.idleTimeoutMs = options.idleTimeoutMs ?? IDLE_TIMEOUT_MS;
     this.initTimeoutMs = options.initTimeoutMs ?? INIT_TIMEOUT_MS;
+    this.maxResidentClients = options.maxResidentClients ?? MAX_RESIDENT_CLIENTS;
     this.reaperIntervalMs = options.reaperIntervalMs ?? REAPER_INTERVAL_MS;
     this.clientFactory = options.clientFactory ?? ((root, server2) => new LspClient(root, server2));
     this.now = options.now ?? (() => Date.now());
@@ -3385,6 +3417,26 @@ class LspManager {
       }
     }
   }
+  evictForAdmission() {
+    while (this.clients.size >= this.maxResidentClients) {
+      const victim = this.leastRecentlyUsedIdleClient();
+      if (!victim)
+        return;
+      this.clients.delete(victim.key);
+      stopClientBestEffort(victim.managed.client);
+    }
+  }
+  leastRecentlyUsedIdleClient() {
+    let candidate = null;
+    for (const [key, managed] of this.clients) {
+      if (managed.refCount > 0 || managed.pendingWaiters > 0 || managed.isInitializing)
+        continue;
+      if (candidate === null || managed.lastUsedAt < candidate.managed.lastUsedAt) {
+        candidate = { key, managed };
+      }
+    }
+    return candidate;
+  }
   async tryDeleteIfOrphaned(key, managed) {
     if (managed.refCount === 0 && managed.pendingWaiters === 0 && !managed.isInitializing && this.clients.get(key) === managed) {
       this.clients.delete(key);
@@ -3431,6 +3483,7 @@ class LspManager {
       managed.lastUsedAt = this.now();
       return managed.client;
     }
+    this.evictForAdmission();
     const client = this.clientFactory(root, server2);
     const initStartedAt = this.now();
     const initPromise = (async () => {
@@ -3493,6 +3546,7 @@ class LspManager {
     const key = this.getKey(root, server2.id);
     if (this.clients.has(key))
       return;
+    this.evictForAdmission();
     const client = this.clientFactory(root, server2);
     const initStartedAt = this.now();
     const initPromise = (async () => {
@@ -3602,50 +3656,6 @@ function nearestExistingAncestor(directory) {
   }
   return current;
 }
-function getInstallDecisionsPath() {
-  return lspRequestContext().installDecisionsPath;
-}
-function loadInstallDecisions() {
-  const path2 = getInstallDecisionsPath();
-  if (!existsSync8(path2))
-    return {};
-  try {
-    const parsed = JSON.parse(readFileSync4(path2, "utf8"));
-    return isInstallDecisions(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-function loadInstallDecision(serverId) {
-  return loadInstallDecisions()[serverId];
-}
-function recordInstallDecision(serverId, decision, decidedAt = new Date().toISOString()) {
-  const decisions = loadInstallDecisions();
-  decisions[serverId] = { decision, decidedAt };
-  writeInstallDecisions(decisions);
-}
-function isInstallDecision(value) {
-  return value === "declined" || value === "allowed";
-}
-function writeInstallDecisions(decisions) {
-  const path2 = getInstallDecisionsPath();
-  mkdirSync3(dirname8(path2), { recursive: true });
-  const tmpPath = `${path2}.tmp`;
-  writeFileSync2(tmpPath, `${JSON.stringify(decisions, null, 2)}
-`, "utf8");
-  renameSync2(tmpPath, path2);
-}
-function isInstallDecisions(value) {
-  return isRecord5(value) && Object.values(value).every(isInstallDecisionRecord);
-}
-function isInstallDecisionRecord(value) {
-  if (!isRecord5(value))
-    return false;
-  return isInstallDecision(value["decision"]) && typeof value["decidedAt"] === "string";
-}
-function isRecord5(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 var LSP_INSTALL_HINTS = {
   typescript: "npm install -g typescript-language-server typescript",
   deno: "Install Deno from https://deno.land",
@@ -3690,6 +3700,26 @@ var LSP_INSTALL_HINTS = {
   julials: `julia -e 'using Pkg; Pkg.add("LanguageServer")'`,
   razor: "Razor runs through the Roslyn language server (cohosting). " + "Install: dotnet tool install -g roslyn-language-server --prerelease (requires v5.8.0+). See https://github.com/dotnet/razor"
 };
+var LSP_LOCAL_INSTALL_HINTS = {
+  typescript: "bun add -d typescript-language-server typescript",
+  vue: "bun add -d @vue/language-server",
+  eslint: "bun add -d vscode-langservers-extracted",
+  oxlint: "bun add -d oxlint",
+  biome: "bun add -d @biomejs/biome",
+  svelte: "bun add -d svelte-language-server",
+  astro: "bun add -d @astrojs/language-server",
+  bash: "bun add -d bash-language-server",
+  "bash-ls": "bun add -d bash-language-server",
+  "yaml-ls": "bun add -d yaml-language-server",
+  php: "bun add -d intelephense",
+  prisma: "bun add -d prisma",
+  dockerfile: "bun add -d dockerfile-language-server-nodejs",
+  pyright: "uv add --dev pyright",
+  basedpyright: "uv add --dev basedpyright",
+  ruff: "uv add --dev ruff",
+  ty: "uv add --dev ty",
+  "ruby-lsp": "bundle add ruby-lsp --group development"
+};
 var BUILTIN_SERVERS = {
   typescript: {
     command: ["typescript-language-server", "--stdio"],
@@ -3791,6 +3821,50 @@ var BUILTIN_SERVERS = {
     extensions: [".razor", ".cshtml"]
   }
 };
+function getInstallDecisionsPath() {
+  return lspRequestContext().installDecisionsPath;
+}
+function loadInstallDecisions() {
+  const path2 = getInstallDecisionsPath();
+  if (!existsSync8(path2))
+    return {};
+  try {
+    const parsed = JSON.parse(readFileSync4(path2, "utf8"));
+    return isInstallDecisions(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function loadInstallDecision(serverId) {
+  return loadInstallDecisions()[serverId];
+}
+function recordInstallDecision(serverId, decision, decidedAt = new Date().toISOString()) {
+  const decisions = loadInstallDecisions();
+  decisions[serverId] = { decision, decidedAt };
+  writeInstallDecisions(decisions);
+}
+function isInstallDecision(value) {
+  return value === "declined" || value === "allowed";
+}
+function writeInstallDecisions(decisions) {
+  const path2 = getInstallDecisionsPath();
+  mkdirSync3(dirname8(path2), { recursive: true });
+  const tmpPath = `${path2}.tmp`;
+  writeFileSync2(tmpPath, `${JSON.stringify(decisions, null, 2)}
+`, "utf8");
+  renameSync2(tmpPath, path2);
+}
+function isInstallDecisions(value) {
+  return isRecord5(value) && Object.values(value).every(isInstallDecisionRecord);
+}
+function isInstallDecisionRecord(value) {
+  if (!isRecord5(value))
+    return false;
+  return isInstallDecision(value["decision"]) && typeof value["decidedAt"] === "string";
+}
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function getProjectConfigPaths() {
   return lspRequestContext().projectConfigPaths;
 }
@@ -3984,50 +4058,151 @@ function getDisabledServerIds() {
   }
   return disabled;
 }
-function isServerInstalled(command, _workingDirectory) {
-  if (command.length === 0)
-    return false;
-  const [cmd] = command;
-  if (!cmd)
-    return false;
-  if (cmd.includes("/") || cmd.includes("\\")) {
-    if (existsSync10(cmd))
-      return true;
+var LOCAL_BIN_RULES = [
+  {
+    markers: ["package.json", "bun.lock", "bun.lockb", "package-lock.json", "yarn.lock", "pnpm-lock.yaml"],
+    binDirs: [join4("node_modules", ".bin")]
+  },
+  {
+    markers: [
+      "pyproject.toml",
+      "ty.toml",
+      "requirements.txt",
+      "setup.py",
+      "setup.cfg",
+      "Pipfile",
+      "pyrightconfig.json",
+      "ruff.toml",
+      ".ruff.toml"
+    ],
+    binDirs: [
+      join4(".venv", "bin"),
+      join4(".venv", "Scripts"),
+      join4("venv", "bin"),
+      join4("venv", "Scripts"),
+      join4(".env", "bin"),
+      join4(".env", "Scripts")
+    ]
+  },
+  {
+    markers: ["Gemfile", "Gemfile.lock"],
+    binDirs: [join4("vendor", "bundle", "bin"), "bin"]
+  },
+  {
+    markers: ["go.mod", "go.sum", "go.work"],
+    binDirs: ["bin"]
+  }
+];
+var resolutionCache = new Map;
+var probeCount = 0;
+function probe(path2) {
+  probeCount += 1;
+  return existsSync10(path2);
+}
+function executableSuffixes(platform, pathExt) {
+  if (platform !== "win32")
+    return [""];
+  const configured = pathExt ?? process.env["PATHEXT"] ?? "";
+  const systemExts = configured.split(";").filter((entry) => entry.length > 0).map((entry) => entry.toLowerCase());
+  return [...new Set(["", ...systemExts, ".exe", ".cmd", ".bat", ".ps1"])];
+}
+function probeWithSuffixes(directory, command, suffixes) {
+  for (const suffix of suffixes) {
+    const candidate = join4(directory, command + suffix);
+    if (probe(candidate))
+      return candidate;
   }
-  const isWindows = process.platform === "win32";
-  let exts = [""];
-  if (isWindows) {
-    const pathExt = process.env["PATHEXT"] ?? "";
-    if (pathExt) {
-      const systemExts = pathExt.split(";").filter(Boolean);
-      exts = [...new Set([...exts, ...systemExts, ".exe", ".cmd", ".bat", ".ps1"])];
-    } else {
-      exts = ["", ".exe", ".cmd", ".bat", ".ps1"];
+  return null;
+}
+function resolveLocal(command, workingDirectory, suffixes, stopAt) {
+  const boundary = stopAt === undefined ? undefined : resolve7(stopAt);
+  let current = resolve7(workingDirectory);
+  while (true) {
+    for (const rule of LOCAL_BIN_RULES) {
+      if (!rule.markers.some((marker) => probe(join4(current, marker))))
+        continue;
+      for (const binDir of rule.binDirs) {
+        const found = probeWithSuffixes(join4(current, binDir), command, suffixes);
+        if (found !== null)
+          return found;
+      }
     }
+    if (probe(join4(current, ".git")))
+      return null;
+    if (boundary !== undefined && current === boundary)
+      return null;
+    const parent = dirname9(current);
+    if (parent === current)
+      return null;
+    current = parent;
   }
-  let pathEnv = process.env["PATH"] ?? "";
-  if (isWindows && !pathEnv) {
+}
+function resolveFromPath(command, suffixes, platform, pathEnvOverride) {
+  let pathEnv = pathEnvOverride ?? process.env["PATH"] ?? "";
+  if (platform === "win32" && !pathEnv) {
     pathEnv = process.env["Path"] ?? "";
   }
-  const paths = pathEnv.split(delimiter3);
-  for (const p of paths) {
-    for (const suffix of exts) {
-      if (existsSync10(join4(p, cmd + suffix))) {
-        return true;
-      }
-    }
+  for (const entry of pathEnv.split(delimiter3)) {
+    if (entry.length === 0)
+      continue;
+    const found = probeWithSuffixes(entry, command, suffixes);
+    if (found !== null)
+      return found;
   }
-  if (cmd === "node")
-    return true;
-  return false;
+  return null;
+}
+function resolveServerBinary(command, workingDirectory, options = {}) {
+  if (command.length === 0)
+    return null;
+  const [cmd] = command;
+  if (cmd === undefined || cmd.length === 0)
+    return null;
+  const platform = options.platform ?? process.platform;
+  const suffixes = executableSuffixes(platform, options.pathExt);
+  if (cmd.includes("/") || cmd.includes("\\")) {
+    const explicit = isAbsolute5(cmd) ? cmd : resolve7(workingDirectory ?? process.cwd(), cmd);
+    return probe(explicit) ? explicit : null;
+  }
+  const cacheKey = JSON.stringify([
+    workingDirectory ?? "",
+    cmd,
+    platform,
+    options.stopAt ?? "",
+    options.pathExt ?? "",
+    options.pathEnv ?? process.env["PATH"] ?? ""
+  ]);
+  const cached = resolutionCache.get(cacheKey);
+  if (cached !== undefined)
+    return cached;
+  let resolved = null;
+  if (workingDirectory !== undefined && workingDirectory.length > 0) {
+    resolved = resolveLocal(cmd, workingDirectory, suffixes, options.stopAt);
+  }
+  resolved ??= resolveFromPath(cmd, suffixes, platform, options.pathEnv);
+  if (resolved === null && cmd === "node")
+    resolved = cmd;
+  resolutionCache.set(cacheKey, resolved);
+  return resolved;
+}
+function isServerInstalled(command, workingDirectory, options = {}) {
+  if (command.length === 0)
+    return false;
+  return resolveServerBinary(command, workingDirectory, options) !== null;
+}
+function withResolvedCommand(command, binaryPath) {
+  return [binaryPath, ...command.slice(1)];
 }
 function findServerForExtension(ext) {
   const servers = getMergedServers();
+  const workingDirectory = contextCwd();
   for (const server2 of servers) {
-    if (server2.extensions.includes(ext) && isServerInstalled(server2.command)) {
+    if (!server2.extensions.includes(ext))
+      continue;
+    const binaryPath = resolveServerBinary(server2.command, workingDirectory);
+    if (binaryPath !== null) {
       const resolvedServer = {
         id: server2.id,
-        command: server2.command,
+        command: withResolvedCommand(server2.command, binaryPath),
         extensions: server2.extensions,
         priority: server2.priority
       };
@@ -4074,6 +4249,7 @@ function findServerForExtension(ext) {
 function getAllServers() {
   const servers = getMergedServers();
   const disabled = getDisabledServerIds();
+  const workingDirectory = contextCwd();
   const result = [];
   const seen = new Set;
   for (const server2 of servers) {
@@ -4081,7 +4257,7 @@ function getAllServers() {
       continue;
     result.push({
       id: server2.id,
-      installed: isServerInstalled(server2.command),
+      installed: isServerInstalled(server2.command, workingDirectory),
       extensions: server2.extensions,
       disabled: false,
       source: server2.source,
@@ -4095,7 +4271,7 @@ function getAllServers() {
     const builtin = BUILTIN_SERVERS[id];
     result.push({
       id,
-      installed: builtin ? isServerInstalled(builtin.command) : false,
+      installed: builtin ? isServerInstalled(builtin.command, workingDirectory) : false,
       extensions: builtin?.extensions ?? [],
       disabled: true,
       source: "disabled",
@@ -4116,7 +4292,7 @@ function findWorkspaceRoot(filePath) {
   const abs = resolveReadablePathInsideContext(filePath);
   let dir = abs;
   if (!isDirectoryPath(dir)) {
-    dir = dirname9(dir);
+    dir = dirname10(dir);
   }
   if (!isPathInside(cwd, abs))
     return findWorkspaceRootOutsideContext(dir);
@@ -4132,13 +4308,13 @@ function findWorkspaceRoot(filePath) {
     }
     if (dir === cwd)
       break;
-    dir = dirname9(dir);
+    dir = dirname10(dir);
   }
   return fallbackRoot;
 }
 function resolveReadablePathInsideContext(filePath) {
   const cwd = contextCwd();
-  const abs = resolve7(cwd, filePath);
+  const abs = resolve8(cwd, filePath);
   if (isPathInside(cwd, abs))
     return abs;
   const rebased = rebaseThroughCanonicalAncestor(abs, cwd);
@@ -4164,7 +4340,7 @@ function rebaseThroughCanonicalAncestor(path2, cwd) {
       if (isPathInside(cwd, canonical))
         return suffix.length === 0 ? canonical : join5(canonical, ...suffix);
     }
-    const parent = dirname9(current);
+    const parent = dirname10(current);
     if (parent === current)
       return;
     suffix.unshift(basename3(current));
@@ -4187,7 +4363,7 @@ function nearestExistingDirectoryInsideContext(directory, cwd) {
       return canonical;
     if (current === cwd)
       return;
-    current = dirname9(current);
+    current = dirname10(current);
   }
   return;
 }
@@ -4214,6 +4390,19 @@ function formatServerLookupError(result) {
   ].join(`
 `);
 }
+function formatInstallOptions(serverId, installHint) {
+  const localHint = LSP_LOCAL_INSTALL_HINTS[serverId];
+  if (localHint === undefined) {
+    return ["To install, run:", `  ${installHint}`];
+  }
+  return [
+    "To install in THIS repository (preferred — no global install needed):",
+    `  ${localHint}`,
+    "",
+    "Or install it globally:",
+    `  ${installHint}`
+  ];
+}
 function formatNotInstalled(result) {
   const { server: server2, installHint } = result;
   const extensions = server2.extensions.join(", ");
@@ -4228,19 +4417,19 @@ function formatNotInstalled(result) {
     `Command not found: ${server2.command[0]}`,
     ""
   ];
+  const installOptions = formatInstallOptions(server2.id, installHint);
   if (decision === "allowed") {
     return [
       ...header,
       "The user has pre-authorized LSP installation. Run the install command, then retry this tool:",
-      `  ${installHint}`
+      ...installOptions.slice(1)
     ].join(`
 `);
   }
   if (!context.capabilities.installDecisionTool) {
     return [
       ...header,
-      "To install, run:",
-      `  ${installHint}`,
+      ...installOptions,
       "",
       "ACTION REQUIRED — ASK THE USER whether to install this LSP server.",
       "Install-decision recording is unavailable in this harness; proceed without LSP if the user declines."
@@ -4249,8 +4438,7 @@ function formatNotInstalled(result) {
   }
   return [
     ...header,
-    "To install, run:",
-    `  ${installHint}`,
+    ...installOptions,
     "",
     "ACTION REQUIRED — ASK THE USER whether to install this LSP server.",
     "- If the user agrees: run the install command above, then retry this tool.",
@@ -4452,7 +4640,7 @@ async function aggregateDiagnosticsForDirectory(directory, extension, severity,
   if (!extension.startsWith(".")) {
     throw new LspInvalidPathError(`Extension must start with a dot (e.g., ".ts", not "${extension}"). Use ".${extension}" instead.`);
   }
-  const absDir = resolve8(options.workspaceRoot ?? contextCwd(), directory);
+  const absDir = resolve9(options.workspaceRoot ?? contextCwd(), directory);
   if (!existsSync12(absDir)) {
     throw new LspInvalidPathError(`Directory does not exist: ${absDir}`);
   }
@@ -4793,6 +4981,91 @@ async function executeLspDiagnostics(params, signal) {
     throw error;
   }
 }
+var DEFAULT_FORMATTING_OPTIONS = {
+  tabSize: 4,
+  insertSpaces: false,
+  trimTrailingWhitespace: true,
+  insertFinalNewline: true,
+  trimFinalNewlines: true
+};
+var UNCHANGED = { status: "unchanged", linesAdded: 0, linesRemoved: 0 };
+async function formatDocumentWithClient(client, filePath, options = {}) {
+  const edits = await client.formatDocument(filePath, options.formattingOptions ?? DEFAULT_FORMATTING_OPTIONS, options.signal);
+  if (edits === null)
+    return { status: "unavailable", reason: "capability_not_advertised" };
+  if (edits.length === 0)
+    return UNCHANGED;
+  const before = readFileSync6(filePath, "utf-8");
+  const normalized = normalizeTextEdits(before, edits, 0);
+  if (normalized.text === before)
+    return UNCHANGED;
+  writeAtomically(filePath, normalized.text);
+  await client.openFile(filePath);
+  return {
+    status: "formatted",
+    ...lineDelta(normalized.edits)
+  };
+}
+function lineDelta(edits) {
+  let linesAdded = 0;
+  let linesRemoved = 0;
+  for (const edit of edits) {
+    linesRemoved += edit.range.end.line - edit.range.start.line + 1;
+    linesAdded += edit.newText.split(`
+`).length;
+  }
+  return { linesAdded, linesRemoved };
+}
+function writeAtomically(filePath, content) {
+  const tempPath = `${filePath}.omo-format.tmp`;
+  writeFileSync3(tempPath, content, "utf-8");
+  try {
+    renameSync3(tempPath, filePath);
+  } catch (error) {
+    try {
+      unlinkSync2(tempPath);
+    } catch {}
+    throw error;
+  }
+}
+async function executeLspFormat(params, signal) {
+  const filePath = requireString(params, "filePath");
+  try {
+    const result = await withLspClient(filePath, async (client, _workspaceRoot, resolvedFilePath) => formatDocumentWithClient(client, resolvedFilePath, signal === undefined ? {} : { signal }), "format", clientOptions(signal));
+    return text(describeResult(filePath, result), formatDetails(filePath, result));
+  } catch (error) {
+    const missingDependency = missingDependencyResult(error, {
+      filePath,
+      status: "unavailable",
+      reason: "server_unavailable",
+      linesAdded: 0,
+      linesRemoved: 0
+    });
+    if (missingDependency)
+      return missingDependency;
+    throw error;
+  }
+}
+function formatDetails(filePath, result) {
+  if (result.status === "unavailable") {
+    return { filePath, status: "unavailable", reason: result.reason, linesAdded: 0, linesRemoved: 0 };
+  }
+  return {
+    filePath,
+    status: result.status,
+    linesAdded: result.linesAdded,
+    linesRemoved: result.linesRemoved
+  };
+}
+function describeResult(filePath, result) {
+  if (result.status === "unavailable") {
+    return `Formatting unavailable for ${filePath}: the language server does not advertise documentFormattingProvider.`;
+  }
+  if (result.status === "unchanged") {
+    return `Already formatted: ${filePath}`;
+  }
+  return `Formatted ${filePath} (+${result.linesAdded}/-${result.linesRemoved} lines)`;
+}
 async function executeLspInstallDecision(params) {
   const serverId = requireString(params, "server_id");
   const decision = params["decision"];
@@ -5112,6 +5385,16 @@ var LSP_MCP_TOOLS = [
     }, ["filePath", "line", "character", "newName"]),
     execute: executeLspRename
   },
+  {
+    name: "format",
+    aliases: ["lsp_format"],
+    title: "LSP Format",
+    description: "Format a source file with its language server and write the returned edits to disk.",
+    inputSchema: objectSchema({
+      filePath: { type: "string", description: "Source file path to format." }
+    }, ["filePath"]),
+    execute: executeLspFormat
+  },
   {
     name: "install_decision",
     aliases: ["lsp_install_decision"],
@@ -5178,7 +5461,7 @@ function withContext(args, context) {
 function ensureDaemonAvailable(paths, ensure, signal) {
   if (!signal)
     return ensure(paths);
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const finish = (run) => {
       if (settled)
@@ -5193,11 +5476,11 @@ function ensureDaemonAvailable(paths, ensure, signal) {
       return;
     }
     signal.addEventListener("abort", onAbort, { once: true });
-    Promise.resolve().then(() => ensure(paths, signal)).then(() => finish(() => resolve9()), (error) => finish(() => reject(signal.aborted ? new DaemonRequestCancelledError(false) : error)));
+    Promise.resolve().then(() => ensure(paths, signal)).then(() => finish(() => resolve10()), (error) => finish(() => reject(signal.aborted ? new DaemonRequestCancelledError(false) : error)));
   });
 }
 function sendToolCall(paths, token, name, args, options) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const socket = connect(paths.socket);
     const requestId = allocateProxyRequestId();
     let settled = false;
@@ -5250,7 +5533,7 @@ function sendToolCall(paths, token, name, args, options) {
       }
       const result = toToolResult(message, requestId);
       if (result)
-        finish(() => resolve9(result));
+        finish(() => resolve10(result));
       else
         finish(() => reject(new DaemonRequestError("invalid daemon response", requestWritten)));
     });
@@ -5321,12 +5604,12 @@ function resolveDaemonRuntime2(env, defaults) {
     throw new InvalidRuntimeOverrideError2("paired_values_required", `${OMO_LSP_DAEMON_CLI2} and ${OMO_LSP_DAEMON_VERSION2} must be set together`);
   }
   if (!hasCliOverride || !hasVersionOverride) {
-    if (!isAbsolute5(defaults.cliPath)) {
+    if (!isAbsolute6(defaults.cliPath)) {
       throw new InvalidRuntimeOverrideError2("packaged_cli_must_be_absolute", "Packaged LSP daemon CLI path must be absolute");
     }
     return { cliPath: defaults.cliPath, version: validateDaemonVersion2(defaults.version) };
   }
-  if (!isAbsolute5(cliOverride)) {
+  if (!isAbsolute6(cliOverride)) {
     throw new InvalidRuntimeOverrideError2("cli_must_be_absolute", `${OMO_LSP_DAEMON_CLI2} must be an absolute path to an existing regular file`);
   }
   const stat = statSync5(cliOverride, { throwIfNoEntry: false });
@@ -5448,7 +5731,7 @@ function extensionKey(filePath) {
 // ../../../../lsp-core/src/request-context.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 import { existsSync as existsSync13, realpathSync as realpathSync6, statSync as statSync6 } from "node:fs";
-import { basename as basename4, delimiter as delimiter4, dirname as dirname2, isAbsolute as isAbsolute6, join as join8, relative as relative5, resolve as resolve9 } from "node:path";
+import { basename as basename4, delimiter as delimiter4, dirname as dirname2, isAbsolute as isAbsolute7, join as join8, relative as relative5, resolve as resolve10 } from "node:path";
 
 class LspRequestContextParseError2 extends Error {
   constructor(code, message) {
@@ -5489,14 +5772,14 @@ function parseLspRequestContext2(value) {
   };
 }
 function canonicalCwd2(cwd) {
-  const resolved = resolve9(cwd);
+  const resolved = resolve10(cwd);
   if (!existsSync13(resolved) || !statSync6(resolved).isDirectory()) {
     throw new LspRequestContextParseError2("invalid_cwd", `LSP request cwd must be an existing directory: ${cwd}`);
   }
   return realpathSync6(resolved);
 }
 function canonicalizeExistingOrNearestAncestor2(path2) {
-  let current = resolve9(path2);
+  let current = resolve10(path2);
   const suffix = [];
   while (true) {
     try {
@@ -5539,14 +5822,14 @@ function stringArrayField2(value, field) {
   return fieldValue;
 }
 function requireAbsolutePath2(path2, field) {
-  if (!isAbsolute6(path2)) {
+  if (!isAbsolute7(path2)) {
     throw new LspRequestContextParseError2("relative_path", `LSP request context.${field} must be absolute: ${path2}`);
   }
 }
 function isPathInside2(parent, child) {
-  const childPath = resolve9(child);
+  const childPath = resolve10(child);
   const relativePath = relative5(parent, childPath);
-  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute6(relativePath);
+  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute7(relativePath);
 }
 function isMissingPathError2(error) {
   const code = errorCode2(error);
@@ -5569,9 +5852,9 @@ function errorCode2(error) {
 }
 
 // src/daemon-cli-path.ts
-import { existsSync as existsSync15, readFileSync as readFileSync6 } from "node:fs";
+import { existsSync as existsSync15, readFileSync as readFileSync7 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
-import { dirname as dirname10, join as join10 } from "node:path";
+import { dirname as dirname11, join as join10 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 var requireFromHere2 = createRequire2(import.meta.url);
 var PACKAGE_LSP_DAEMON_CLI = "@code-yeongyu/lsp-daemon/cli";
@@ -5618,7 +5901,7 @@ function resolveConfiguredLspDaemonCli(cliPath) {
 }
 function readDaemonPackageVersion(cliPath) {
   try {
-    const parsed = JSON.parse(readFileSync6(join10(dirname10(cliPath), "package.json"), "utf8"));
+    const parsed = JSON.parse(readFileSync7(join10(dirname11(cliPath), "package.json"), "utf8"));
     if (isRecord9(parsed) && typeof parsed["version"] === "string" && parsed["version"].length > 0) {
       return parsed["version"];
     }
@@ -5633,9 +5916,9 @@ function isRecord9(value) {
 }
 
 // src/lsp-session-state.ts
-import { mkdirSync as mkdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync9, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir } from "node:os";
-import { dirname as dirname12, join as join11 } from "node:path";
+import { dirname as dirname13, join as join11 } from "node:path";
 function sessionIdFrom(input) {
   return typeof input.session_id === "string" && input.session_id.length > 0 ? input.session_id : undefined;
 }
@@ -5666,7 +5949,7 @@ function sessionStatePath(sessionId) {
 }
 function readSessionState(path2) {
   try {
-    const parsed = JSON.parse(readFileSync8(path2, "utf8"));
+    const parsed = JSON.parse(readFileSync9(path2, "utf8"));
     if (isRecord10(parsed) && isLspSessionState(parsed))
       return normalizeSessionState(parsed);
     return emptyState();
@@ -5677,8 +5960,8 @@ function readSessionState(path2) {
   }
 }
 function writeSessionState(path2, state) {
-  mkdirSync4(dirname12(path2), { recursive: true });
-  writeFileSync3(path2, `${JSON.stringify(state)}
+  mkdirSync4(dirname13(path2), { recursive: true });
+  writeFileSync4(path2, `${JSON.stringify(state)}
 `);
 }
 function emptyState() {
@@ -5821,8 +6104,8 @@ function notConfiguredAvailability(details) {
   return typeof extension === "string" && extension.length > 0 ? { extension } : undefined;
 }
 function codexLspRequestContext(env = process.env, cwd = process.cwd()) {
-  const canonicalCwd3 = realpathSync8(resolve11(cwd));
-  const codexHome = resolve11(env["CODEX_HOME"]?.trim() || join12(homedir3(), ".codex"));
+  const canonicalCwd3 = realpathSync8(resolve12(cwd));
+  const codexHome = resolve12(env["CODEX_HOME"]?.trim() || join12(homedir3(), ".codex"));
   return parseLspRequestContext2({
     cwd: canonicalCwd3,
     projectConfigPaths: [join12(canonicalCwd3, ".codex", "lsp-client.json")],
@@ -5921,7 +6204,7 @@ function isContextPressureTranscript(transcriptPath) {
   if (typeof transcriptPath !== "string")
     return false;
   try {
-    return hasContextPressureMarker(readFileSync9(transcriptPath, "utf8"));
+    return hasContextPressureMarker(readFileSync10(transcriptPath, "utf8"));
   } catch (error) {
     if (error instanceof Error)
       return false;
@@ -6004,14 +6287,14 @@ main().catch((error) => {
 async function runPackageLspMcpCli() {
   const cliPath = resolveLspDaemonCliPath();
   const child = spawn3(execPath2, [cliPath, "mcp"], { stdio: "inherit", windowsHide: true });
-  await new Promise((resolve10, reject) => {
+  await new Promise((resolve11, reject) => {
     child.once("error", reject);
     child.once("exit", (code, signal) => {
       if (code !== null && code !== 0)
         process.exitCode = code;
       if (code === null && signal !== null)
         process.exitCode = 1;
-      resolve10();
+      resolve11();
     });
   });
 }