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

package/packages/lsp-daemon/dist/index.js

@@ -23,7 +23,6 @@ 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;
@@ -616,7 +615,6 @@ 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;
   }
@@ -638,12 +636,6 @@ class LspClientTransport {
   isDiagnosticPullSupported() {
     return this.diagnosticPullSupported;
   }
-  setDocumentFormattingSupported(supported) {
-    this.documentFormattingSupported = supported;
-  }
-  isDocumentFormattingSupported() {
-    return this.documentFormattingSupported;
-  }
   handlePublishDiagnostics(params) {
     this.diagnosticsStore.set(params.uri, [...params.diagnostics]);
   }
@@ -857,14 +849,6 @@ 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() {
@@ -881,7 +865,6 @@ class LspClientConnection extends LspClientTransport {
           references: {},
           documentSymbol: { hierarchicalDocumentSymbolSupport: true },
           publishDiagnostics: {},
-          formatting: { dynamicRegistration: false },
           rename: {
             prepareSupport: true,
             prepareSupportDefaultBehavior: 1
@@ -923,7 +906,6 @@ 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 } } }
@@ -2518,18 +2500,6 @@ 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);
@@ -2782,7 +2752,6 @@ 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, server) => new LspClient(root, server));
     this.now = options.now ?? (() => Date.now());
@@ -2816,26 +2785,6 @@ 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);
@@ -2882,7 +2831,6 @@ class LspManager {
       managed.lastUsedAt = this.now();
       return managed.client;
     }
-    this.evictForAdmission();
     const client = this.clientFactory(root, server);
     const initStartedAt = this.now();
     const initPromise = (async () => {
@@ -2945,7 +2893,6 @@ class LspManager {
     const key = this.getKey(root, server.id);
     if (this.clients.has(key))
       return;
-    this.evictForAdmission();
     const client = this.clientFactory(root, server);
     const initStartedAt = this.now();
     const initPromise = (async () => {
@@ -4174,7 +4121,7 @@ function createIdleTimer(idleTimeoutMs, log, onTimeout) {
 }
 // ../lsp-core/src/lsp/client-wrapper.ts
 import { existsSync as existsSync11, realpathSync as realpathSync5, statSync as statSync4 } from "node:fs";
-import { basename as basename3, dirname as dirname10, join as join5, resolve as resolve8 } from "node:path";
+import { basename as basename3, dirname as dirname9, join as join5, resolve as resolve7 } from "node:path";
 
 // ../lsp-core/src/lsp/outside-context-workspace.ts
 import { existsSync as existsSync7, realpathSync as realpathSync4 } from "node:fs";
@@ -4213,6 +4160,57 @@ function nearestExistingAncestor(directory) {
   return current;
 }
 
+// ../lsp-core/src/lsp/server-install-state.ts
+import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname as dirname8 } from "node:path";
+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);
+}
+
+// ../lsp-core/src/lsp/config-loader.ts
+import { existsSync as existsSync9, readFileSync as readFileSync5 } from "node:fs";
+
 // ../lsp-core/src/lsp/server-definitions.ts
 var LSP_INSTALL_HINTS = {
   typescript: "npm install -g typescript-language-server typescript",
@@ -4258,26 +4256,6 @@ 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"],
@@ -4380,56 +4358,7 @@ var BUILTIN_SERVERS = {
   }
 };
 
-// ../lsp-core/src/lsp/server-install-state.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname8 } from "node:path";
-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);
-}
-
 // ../lsp-core/src/lsp/config-loader.ts
-import { existsSync as existsSync9, readFileSync as readFileSync5 } from "node:fs";
 function getProjectConfigPaths() {
   return lspRequestContext().projectConfigPaths;
 }
@@ -4626,154 +4555,53 @@ function getDisabledServerIds() {
 
 // ../lsp-core/src/lsp/server-installation.ts
 import { existsSync as existsSync10 } from "node:fs";
-import { delimiter as delimiter3, dirname as dirname9, isAbsolute as isAbsolute5, join as join4, resolve as resolve7 } from "node:path";
-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;
+import { delimiter as delimiter3, join as join4 } from "node:path";
+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;
   }
-  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;
-      }
+  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"];
     }
-    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;
   }
-}
-function resolveFromPath(command, suffixes, platform, pathEnvOverride) {
-  let pathEnv = pathEnvOverride ?? process.env["PATH"] ?? "";
-  if (platform === "win32" && !pathEnv) {
+  let pathEnv = process.env["PATH"] ?? "";
+  if (isWindows && !pathEnv) {
     pathEnv = process.env["Path"] ?? "";
   }
-  for (const entry of pathEnv.split(delimiter3)) {
-    if (entry.length === 0)
-      continue;
-    const found = probeWithSuffixes(entry, command, suffixes);
-    if (found !== null)
-      return found;
+  const paths = pathEnv.split(delimiter3);
+  for (const p of paths) {
+    for (const suffix of exts) {
+      if (existsSync10(join4(p, cmd + suffix))) {
+        return true;
+      }
+    }
   }
-  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;
+  if (cmd === "node")
+    return true;
+  return false;
 }
 
 // ../lsp-core/src/lsp/server-resolution.ts
-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))
-      continue;
-    const binaryPath = resolveServerBinary(server2.command, workingDirectory);
-    if (binaryPath !== null) {
+    if (server2.extensions.includes(ext) && isServerInstalled(server2.command)) {
       const resolvedServer = {
         id: server2.id,
-        command: withResolvedCommand(server2.command, binaryPath),
+        command: server2.command,
         extensions: server2.extensions,
         priority: server2.priority
       };
@@ -4820,7 +4648,6 @@ 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) {
@@ -4828,7 +4655,7 @@ function getAllServers() {
       continue;
     result.push({
       id: server2.id,
-      installed: isServerInstalled(server2.command, workingDirectory),
+      installed: isServerInstalled(server2.command),
       extensions: server2.extensions,
       disabled: false,
       source: server2.source,
@@ -4842,7 +4669,7 @@ function getAllServers() {
     const builtin = BUILTIN_SERVERS[id];
     result.push({
       id,
-      installed: builtin ? isServerInstalled(builtin.command, workingDirectory) : false,
+      installed: builtin ? isServerInstalled(builtin.command) : false,
       extensions: builtin?.extensions ?? [],
       disabled: true,
       source: "disabled",
@@ -4865,7 +4692,7 @@ function findWorkspaceRoot(filePath) {
   const abs = resolveReadablePathInsideContext(filePath);
   let dir = abs;
   if (!isDirectoryPath(dir)) {
-    dir = dirname10(dir);
+    dir = dirname9(dir);
   }
   if (!isPathInside(cwd, abs))
     return findWorkspaceRootOutsideContext(dir);
@@ -4881,13 +4708,13 @@ function findWorkspaceRoot(filePath) {
     }
     if (dir === cwd)
       break;
-    dir = dirname10(dir);
+    dir = dirname9(dir);
   }
   return fallbackRoot;
 }
 function resolveReadablePathInsideContext(filePath) {
   const cwd = contextCwd();
-  const abs = resolve8(cwd, filePath);
+  const abs = resolve7(cwd, filePath);
   if (isPathInside(cwd, abs))
     return abs;
   const rebased = rebaseThroughCanonicalAncestor(abs, cwd);
@@ -4913,7 +4740,7 @@ function rebaseThroughCanonicalAncestor(path2, cwd) {
       if (isPathInside(cwd, canonical))
         return suffix.length === 0 ? canonical : join5(canonical, ...suffix);
     }
-    const parent = dirname10(current);
+    const parent = dirname9(current);
     if (parent === current)
       return;
     suffix.unshift(basename3(current));
@@ -4936,7 +4763,7 @@ function nearestExistingDirectoryInsideContext(directory, cwd) {
       return canonical;
     if (current === cwd)
       return;
-    current = dirname10(current);
+    current = dirname9(current);
   }
   return;
 }
@@ -4963,19 +4790,6 @@ 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(", ");
@@ -4990,19 +4804,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:",
-      ...installOptions.slice(1)
+      `  ${installHint}`
     ].join(`
 `);
   }
   if (!context.capabilities.installDecisionTool) {
     return [
       ...header,
-      ...installOptions,
+      "To install, run:",
+      `  ${installHint}`,
       "",
       "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."
@@ -5011,7 +4825,8 @@ function formatNotInstalled(result) {
   }
   return [
     ...header,
-    ...installOptions,
+    "To install, run:",
+    `  ${installHint}`,
     "",
     "ACTION REQUIRED — ASK THE USER whether to install this LSP server.",
     "- If the user agrees: run the install command above, then retry this tool.",
@@ -5067,7 +4882,7 @@ async function withLspClient(filePath, fn, toolName, options = {}) {
 
 // ../lsp-core/src/lsp/directory-diagnostics.ts
 import { existsSync as existsSync12, lstatSync as lstatSync5, readdirSync as readdirSync3 } from "node:fs";
-import { join as join6, resolve as resolve9 } from "node:path";
+import { join as join6, resolve as resolve8 } from "node:path";
 
 // ../lsp-core/src/lsp/formatters.ts
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -5222,7 +5037,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 = resolve9(options.workspaceRoot ?? contextCwd(), directory);
+  const absDir = resolve8(options.workspaceRoot ?? contextCwd(), directory);
   if (!existsSync12(absDir)) {
     throw new LspInvalidPathError(`Directory does not exist: ${absDir}`);
   }
@@ -5579,96 +5394,6 @@ async function executeLspDiagnostics(params, signal) {
     throw error;
   }
 }
-// ../lsp-core/src/lsp/format-document.ts
-import { readFileSync as readFileSync6, renameSync as renameSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
-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;
-  }
-}
-
-// ../lsp-core/src/tools/format.ts
-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)`;
-}
-
 // ../lsp-core/src/tools/install-decision.ts
 async function executeLspInstallDecision(params) {
   const serverId = requireString(params, "server_id");
@@ -6001,16 +5726,6 @@ 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"],
@@ -6230,9 +5945,6 @@ async function callToolViaDaemon(name, args, options) {
 function callDiagnosticsViaDaemon(filePath, options) {
   return callToolViaDaemon("diagnostics", { filePath, severity: "error" }, options);
 }
-function callFormatViaDaemon(filePath, options) {
-  return callToolViaDaemon("format", { filePath }, options);
-}
 function currentRequestContext(env = process.env) {
   const cwd = process.cwd();
   const home = env["HOME"] ?? homedir3();
@@ -6255,7 +5967,7 @@ function withContext(args, context) {
 function ensureDaemonAvailable(paths, ensure, signal) {
   if (!signal)
     return ensure(paths);
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve9, reject) => {
     let settled = false;
     const finish = (run) => {
       if (settled)
@@ -6270,11 +5982,11 @@ function ensureDaemonAvailable(paths, ensure, signal) {
       return;
     }
     signal.addEventListener("abort", onAbort, { once: true });
-    Promise.resolve().then(() => ensure(paths, signal)).then(() => finish(() => resolve10()), (error) => finish(() => reject(signal.aborted ? new DaemonRequestCancelledError(false) : error)));
+    Promise.resolve().then(() => ensure(paths, signal)).then(() => finish(() => resolve9()), (error) => finish(() => reject(signal.aborted ? new DaemonRequestCancelledError(false) : error)));
   });
 }
 function sendToolCall(paths, token, name, args, options) {
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve9, reject) => {
     const socket = connect(paths.socket);
     const requestId = allocateProxyRequestId();
     let settled = false;
@@ -6327,7 +6039,7 @@ function sendToolCall(paths, token, name, args, options) {
       }
       const result = toToolResult(message, requestId);
       if (result)
-        finish(() => resolve10(result));
+        finish(() => resolve9(result));
       else
         finish(() => reject(new DaemonRequestError("invalid daemon response", requestWritten)));
     });
@@ -6373,7 +6085,7 @@ function isRetryableTool(name) {
 }
 // src/proxy.ts
 import { existsSync as existsSync13, realpathSync as realpathSync6 } from "node:fs";
-import { basename as basename4, delimiter as delimiter4, dirname as dirname11, isAbsolute as isAbsolute6 } from "node:path";
+import { basename as basename4, delimiter as delimiter4, dirname as dirname10, isAbsolute as isAbsolute5 } from "node:path";
 var DEFAULT_STARTUP_TIMEOUT_MS = 1e4;
 async function runMcpStdioProxy(options = {}) {
   const input = options.input ?? process.stdin;
@@ -6496,18 +6208,18 @@ function canonicalizePathList(value) {
   return value.split(delimiter4).map((entry) => canonicalizePath(entry) ?? entry).join(delimiter4);
 }
 function canonicalizePath(value) {
-  if (value === undefined || !isAbsolute6(value) || !existsSync13(value))
+  if (value === undefined || !isAbsolute5(value) || !existsSync13(value))
     return value;
   return realpathSync6(value);
 }
 function projectRootFromOpenCodeConfigPath(path2) {
   if (basename4(path2) !== "lsp.json" && basename4(path2) !== "lsp-client.json")
     return;
-  const configDir = dirname11(path2);
+  const configDir = dirname10(path2);
   const configDirName = basename4(configDir);
   if (configDirName !== ".opencode" && configDirName !== ".omo")
     return;
-  return dirname11(configDir);
+  return dirname10(configDir);
 }
 export {
   InvalidDaemonDirectoryError,