oh-my-opencode 5.0.0-beta.3 → 5.0.0-beta.31

package/packages/lsp-core/src/lsp/server-installation.ts

@@ -1,45 +1,218 @@
 import { existsSync } from "node:fs";
-import { delimiter, join } from "node:path";
+import { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 
-export function isServerInstalled(command: string[], _workingDirectory?: string): boolean {
-	if (command.length === 0) return false;
+/**
+ * Project markers that authorize probing a set of repo-local binary directories.
+ *
+ * A local bin directory is only trusted when the sibling marker proves the directory
+ * belongs to a project of that ecosystem. An unmarked `node_modules/.bin` is ignored so
+ * that a stray directory cannot inject an executable into the resolution order.
+ */
+interface LocalBinRule {
+	readonly markers: readonly string[];
+	readonly binDirs: readonly string[];
+}
 
-	const [cmd] = command;
-	if (!cmd) return false;
+const LOCAL_BIN_RULES: readonly LocalBinRule[] = [
+	{
+		markers: ["package.json", "bun.lock", "bun.lockb", "package-lock.json", "yarn.lock", "pnpm-lock.yaml"],
+		binDirs: [join("node_modules", ".bin")],
+	},
+	{
+		markers: [
+			"pyproject.toml",
+			"ty.toml",
+			"requirements.txt",
+			"setup.py",
+			"setup.cfg",
+			"Pipfile",
+			"pyrightconfig.json",
+			"ruff.toml",
+			".ruff.toml",
+		],
+		binDirs: [
+			join(".venv", "bin"),
+			join(".venv", "Scripts"),
+			join("venv", "bin"),
+			join("venv", "Scripts"),
+			join(".env", "bin"),
+			join(".env", "Scripts"),
+		],
+	},
+	{
+		markers: ["Gemfile", "Gemfile.lock"],
+		binDirs: [join("vendor", "bundle", "bin"), "bin"],
+	},
+	{
+		markers: ["go.mod", "go.sum", "go.work"],
+		binDirs: ["bin"],
+	},
+];
 
-	if (cmd.includes("/") || cmd.includes("\\")) {
-		if (existsSync(cmd)) return true;
+export interface ResolveServerBinaryOptions {
+	/**
+	 * Upward walk boundary. The walk never ascends above this directory, which lets callers
+	 * confine resolution to a trusted request cwd.
+	 */
+	readonly stopAt?: string;
+	readonly platform?: NodeJS.Platform;
+	readonly pathExt?: string;
+	readonly pathEnv?: string;
+}
+
+const resolutionCache = new Map<string, string | null>();
+let probeCount = 0;
+
+/** Test seam: clears the per-process resolution cache. */
+export function __resetServerBinaryResolutionCacheForTests(): void {
+	resolutionCache.clear();
+	probeCount = 0;
+}
+
+/** Test seam: counts filesystem probes so cache hits are observable. */
+export function __serverBinaryProbeCountForTests(): number {
+	return probeCount;
+}
+
+function probe(path: string): boolean {
+	probeCount += 1;
+	return existsSync(path);
+}
+
+function executableSuffixes(platform: NodeJS.Platform, pathExt: string | undefined): readonly string[] {
+	if (platform !== "win32") return [""];
+	const configured = pathExt ?? process.env["PATHEXT"] ?? "";
+	// PATHEXT is conventionally uppercase, but the on-disk shims npm/bun write are lowercase.
+	// Probe lowercase first so the returned path matches the real filename on case-sensitive
+	// filesystems; the resolved path is spawned, so its casing has to be exact.
+	const systemExts = configured
+		.split(";")
+		.filter((entry) => entry.length > 0)
+		.map((entry) => entry.toLowerCase());
+	return [...new Set(["", ...systemExts, ".exe", ".cmd", ".bat", ".ps1"])];
+}
+
+function probeWithSuffixes(directory: string, command: string, suffixes: readonly string[]): string | null {
+	for (const suffix of suffixes) {
+		const candidate = join(directory, command + suffix);
+		if (probe(candidate)) return candidate;
 	}
+	return null;
+}
 
-	const isWindows = process.platform === "win32";
+function resolveLocal(
+	command: string,
+	workingDirectory: string,
+	suffixes: readonly string[],
+	stopAt: string | undefined,
+): string | null {
+	const boundary = stopAt === undefined ? undefined : resolve(stopAt);
+	let current = resolve(workingDirectory);
 
-	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"];
+	while (true) {
+		for (const rule of LOCAL_BIN_RULES) {
+			if (!rule.markers.some((marker) => probe(join(current, marker)))) continue;
+			for (const binDir of rule.binDirs) {
+				const found = probeWithSuffixes(join(current, binDir), command, suffixes);
+				if (found !== null) return found;
+			}
 		}
+
+		// A repository root ends the walk: tooling above it belongs to a different project.
+		if (probe(join(current, ".git"))) return null;
+		if (boundary !== undefined && current === boundary) return null;
+
+		const parent = dirname(current);
+		if (parent === current) return null;
+		current = parent;
 	}
+}
 
-	let pathEnv = process.env["PATH"] ?? "";
-	if (isWindows && !pathEnv) {
+function resolveFromPath(
+	command: string,
+	suffixes: readonly string[],
+	platform: NodeJS.Platform,
+	pathEnvOverride: string | undefined,
+): string | null {
+	let pathEnv = pathEnvOverride ?? process.env["PATH"] ?? "";
+	if (platform === "win32" && !pathEnv) {
 		pathEnv = process.env["Path"] ?? "";
 	}
 
-	const paths = pathEnv.split(delimiter);
+	for (const entry of pathEnv.split(delimiter)) {
+		if (entry.length === 0) continue;
+		const found = probeWithSuffixes(entry, command, suffixes);
+		if (found !== null) return found;
+	}
+	return null;
+}
 
-	for (const p of paths) {
-		for (const suffix of exts) {
-			if (existsSync(join(p, cmd + suffix))) {
-				return true;
-			}
-		}
+/**
+ * Resolves the absolute path of an LSP server binary.
+ *
+ * Probing order:
+ * 1. a path-shaped command is validated as-is,
+ * 2. marker-gated repo-local bin directories, walking up from `workingDirectory`,
+ * 3. `PATH` (including Windows executable suffixes),
+ * 4. `null` when nothing matches.
+ *
+ * Results are cached per process, keyed by working directory and command.
+ */
+export function resolveServerBinary(
+	command: string[],
+	workingDirectory?: string,
+	options: ResolveServerBinaryOptions = {},
+): string | null {
+	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 = isAbsolute(cmd) ? cmd : resolve(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: string | null = null;
+	if (workingDirectory !== undefined && workingDirectory.length > 0) {
+		resolved = resolveLocal(cmd, workingDirectory, suffixes, options.stopAt);
 	}
+	resolved ??= resolveFromPath(cmd, suffixes, platform, options.pathEnv);
+	// A configured server may be launched through the interpreter itself, e.g.
+	// { command: ["node", "my-ls.js"] }. isServerInstalled() has always treated bare `node`
+	// as available regardless of PATH, so keep those servers selectable instead of
+	// regressing them into a not_installed result. The name is returned unresolved so the
+	// spawn still goes through `node`; rewriting it to process.execPath would silently
+	// substitute a different interpreter (bun) for the one the config asked for.
+	if (resolved === null && cmd === "node") resolved = cmd;
 
-	if (cmd === "node") return true;
+	resolutionCache.set(cacheKey, resolved);
+	return resolved;
+}
 
-	return false;
+/**
+ * Reports whether an LSP server binary is available.
+ *
+ * Retained for existing consumers; `resolveServerBinary` is the richer entry point.
+ */
+export function isServerInstalled(
+	command: string[],
+	workingDirectory?: string,
+	options: ResolveServerBinaryOptions = {},
+): boolean {
+	if (command.length === 0) return false;
+	return resolveServerBinary(command, workingDirectory, options) !== null;
 }

package/packages/lsp-core/src/lsp/server-resolution-local-binary.test.ts

@@ -0,0 +1,170 @@
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+
+import { runWithRequestContext } from "../request-context.js";
+import { formatServerLookupError } from "./client-wrapper.js";
+import { __resetServerBinaryResolutionCacheForTests } from "./server-installation.js";
+import { findServerForExtension } from "./server-resolution.js";
+
+const tempDirectories: string[] = [];
+let previousPath: string | undefined;
+
+function makeTempRoot(prefix: string): string {
+	const root = mkdtempSync(join(tmpdir(), prefix));
+	tempDirectories.push(root);
+	return root;
+}
+
+function writeExecutable(path: string): string {
+	mkdirSync(join(path, ".."), { recursive: true });
+	writeFileSync(path, "#!/bin/sh\nexit 0\n");
+	chmodSync(path, 0o755);
+	return path;
+}
+
+function contextFor(cwd: string) {
+	return {
+		cwd,
+		projectConfigPaths: [join(cwd, ".codex", "lsp-client.json")],
+		userConfigPath: join(cwd, "home-config", "lsp-client.json"),
+		installDecisionsPath: join(cwd, "home-config", "lsp-install-decisions.json"),
+		capabilities: { installDecisionTool: true },
+	} as const;
+}
+
+beforeEach(() => {
+	previousPath = process.env["PATH"];
+	__resetServerBinaryResolutionCacheForTests();
+});
+
+afterEach(() => {
+	if (previousPath === undefined) delete process.env["PATH"];
+	else process.env["PATH"] = previousPath;
+	for (const directory of tempDirectories.splice(0)) {
+		rmSync(directory, { recursive: true, force: true });
+	}
+	__resetServerBinaryResolutionCacheForTests();
+});
+
+describe("findServerForExtension local binary substitution", () => {
+	test("#given a repo-local biome #when looking up a typescript file #then the command spawns the absolute local path", () => {
+		// given
+		const root = makeTempRoot("lsp-resolution-local-");
+		writeFileSync(join(root, "package.json"), "{}\n");
+		const binaryPath = writeExecutable(join(root, "node_modules", ".bin", "biome"));
+		process.env["PATH"] = join(root, "definitely-empty");
+
+		// when
+		const result = runWithRequestContext(contextFor(root), () => findServerForExtension(".ts"));
+
+		// then
+		expect(result.status).toBe("found");
+		if (result.status !== "found") throw new Error("expected a found server");
+		expect(result.server.command[0]).toBe(binaryPath);
+		expect(result.server.command.slice(1)).toEqual(["lsp-proxy", "--stdio"]);
+	});
+
+	test("#given a PATH-only server #when looking up #then the resolved PATH entry is substituted", () => {
+		// given
+		const root = makeTempRoot("lsp-resolution-path-root-");
+		writeFileSync(join(root, "package.json"), "{}\n");
+		const pathDir = makeTempRoot("lsp-resolution-path-");
+		const pathBinary = writeExecutable(join(pathDir, "biome"));
+		process.env["PATH"] = pathDir;
+
+		// when
+		const result = runWithRequestContext(contextFor(root), () => findServerForExtension(".ts"));
+
+		// then
+		expect(result.status).toBe("found");
+		if (result.status !== "found") throw new Error("expected a found server");
+		expect(result.server.command[0]).toBe(pathBinary);
+	});
+
+	test("#given no server anywhere #when looking up #then the not_installed result is preserved", () => {
+		// given
+		const root = makeTempRoot("lsp-resolution-missing-");
+		process.env["PATH"] = join(root, "definitely-empty");
+
+		// when
+		const result = runWithRequestContext(contextFor(root), () => findServerForExtension(".ts"));
+
+		// then
+		expect(result.status).toBe("not_installed");
+		if (result.status !== "not_installed") throw new Error("expected not_installed");
+		expect(result.installHint.length).toBeGreaterThan(0);
+	});
+
+	test("#given an unknown extension #when looking up #then the not_configured result is preserved", () => {
+		// given
+		const root = makeTempRoot("lsp-resolution-unknown-");
+		process.env["PATH"] = join(root, "definitely-empty");
+
+		// when
+		const result = runWithRequestContext(contextFor(root), () => findServerForExtension(".unknown-ext"));
+
+		// then
+		expect(result.status).toBe("not_configured");
+	});
+});
+
+describe("not-installed message repo-local guidance", () => {
+	test("#given a missing biome #when formatting the message #then the repo-local install is suggested before the global hint", () => {
+		// given: .css is served by biome alone, so the lookup cannot fall through to typescript
+		const root = makeTempRoot("lsp-message-biome-");
+		process.env["PATH"] = join(root, "definitely-empty");
+		const result = runWithRequestContext(contextFor(root), () => findServerForExtension(".css"));
+		if (result.status !== "not_installed") throw new Error("expected not_installed");
+		expect(result.server.id).toBe("biome");
+
+		// when
+		const message = runWithRequestContext(contextFor(root), () => formatServerLookupError(result));
+
+		// then
+		expect(message).toContain("bun add -d @biomejs/biome");
+		expect(message).toContain("npm install -g @biomejs/biome");
+		expect(message.indexOf("bun add -d @biomejs/biome")).toBeLessThan(message.indexOf("npm install -g @biomejs/biome"));
+		expect(message).toContain("ACTION REQUIRED");
+		expect(message).toContain("NOT INSTALLED");
+	});
+
+	test("#given a server with no repo-local route #when formatting the message #then only the global hint is shown", () => {
+		// given
+		const root = makeTempRoot("lsp-message-global-");
+		process.env["PATH"] = join(root, "definitely-empty");
+		const result = runWithRequestContext(contextFor(root), () => findServerForExtension(".rs"));
+		if (result.status !== "not_installed") throw new Error("expected not_installed");
+
+		// when
+		const message = runWithRequestContext(contextFor(root), () => formatServerLookupError(result));
+
+		// then
+		expect(message).toContain("To install, run:");
+		expect(message).not.toContain("THIS repository");
+		expect(message).toContain("ACTION REQUIRED");
+	});
+
+	test("#given a pre-authorized install #when formatting the message #then both install routes stay visible", () => {
+		// given
+		const root = makeTempRoot("lsp-message-allowed-");
+		process.env["PATH"] = join(root, "definitely-empty");
+		const context = contextFor(root);
+		mkdirSync(join(root, "home-config"), { recursive: true });
+		writeFileSync(
+			context.installDecisionsPath,
+			`${JSON.stringify({ biome: { decision: "allowed", decidedAt: new Date().toISOString() } })}\n`,
+		);
+		const result = runWithRequestContext(context, () => findServerForExtension(".css"));
+		if (result.status !== "not_installed") throw new Error("expected not_installed");
+
+		// when
+		const message = runWithRequestContext(context, () => formatServerLookupError(result));
+
+		// then
+		expect(message).toContain("pre-authorized");
+		expect(message).toContain("bun add -d @biomejs/biome");
+		expect(message).toContain("npm install -g @biomejs/biome");
+	});
+});

package/packages/lsp-core/src/lsp/server-resolution.ts

@@ -1,16 +1,28 @@
+import { contextCwd } from "../request-context.js";
 import { getDisabledServerIds, getMergedServers } from "./config-loader.js";
 import { BUILTIN_SERVERS, LSP_INSTALL_HINTS } from "./server-definitions.js";
-import { isServerInstalled } from "./server-installation.js";
+import { isServerInstalled, resolveServerBinary } from "./server-installation.js";
 import type { ServerLookupResult } from "./types.js";
 
+/**
+ * Replaces the command name with the absolute binary path so the client spawns the exact
+ * binary that was resolved -- in particular a repo-local one that is absent from PATH.
+ */
+function withResolvedCommand(command: string[], binaryPath: string): string[] {
+	return [binaryPath, ...command.slice(1)];
+}
+
 export function findServerForExtension(ext: string): ServerLookupResult {
 	const servers = getMergedServers();
+	const workingDirectory = contextCwd();
 
 	for (const server of servers) {
-		if (server.extensions.includes(ext) && isServerInstalled(server.command)) {
+		if (!server.extensions.includes(ext)) continue;
+		const binaryPath = resolveServerBinary(server.command, workingDirectory);
+		if (binaryPath !== null) {
 			const resolvedServer = {
 				id: server.id,
-				command: server.command,
+				command: withResolvedCommand(server.command, binaryPath),
 				extensions: server.extensions,
 				priority: server.priority,
 			};
@@ -70,6 +82,7 @@ export interface ServerStatus {
 export function getAllServers(): ServerStatus[] {
 	const servers = getMergedServers();
 	const disabled = getDisabledServerIds();
+	const workingDirectory = contextCwd();
 
 	const result: ServerStatus[] = [];
 	const seen = new Set<string>();
@@ -78,7 +91,7 @@ export function getAllServers(): ServerStatus[] {
 		if (seen.has(server.id)) continue;
 		result.push({
 			id: server.id,
-			installed: isServerInstalled(server.command),
+			installed: isServerInstalled(server.command, workingDirectory),
 			extensions: server.extensions,
 			disabled: false,
 			source: server.source,
@@ -92,7 +105,7 @@ export function getAllServers(): ServerStatus[] {
 		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",

package/packages/lsp-core/src/lsp/transport.ts

@@ -37,6 +37,7 @@ export class LspClientTransport {
 	protected readonly initializeTimeoutMs: number;
 	private workspaceApplyEditHandler: WorkspaceApplyEditHandler | null = null;
 	private diagnosticPullSupported = false;
+	private documentFormattingSupported = false;
 
 	constructor(
 		protected readonly root: string,
@@ -71,6 +72,14 @@ export class LspClientTransport {
 		return this.diagnosticPullSupported;
 	}
 
+	protected setDocumentFormattingSupported(supported: boolean): void {
+		this.documentFormattingSupported = supported;
+	}
+
+	isDocumentFormattingSupported(): boolean {
+		return this.documentFormattingSupported;
+	}
+
 	protected handlePublishDiagnostics(params: {
 		readonly uri: string;
 		readonly diagnostics: readonly Diagnostic[];

package/packages/lsp-core/src/lsp/types.ts

@@ -72,6 +72,14 @@ export interface Diagnostic {
 	message: string;
 }
 
+export interface FormattingOptions {
+	tabSize: number;
+	insertSpaces: boolean;
+	trimTrailingWhitespace?: boolean;
+	insertFinalNewline?: boolean;
+	trimFinalNewlines?: boolean;
+}
+
 export interface TextDocumentIdentifier {
 	uri: string;
 }

package/packages/lsp-core/src/lsp/workspace-edit-adversarial.test.ts

@@ -1,4 +1,4 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { mkdtempSync, readFileSync, realpathSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -87,6 +87,25 @@ describe("workspace edit adversarial inputs", () => {
 		expect(readFileSync(outsideFile, "utf-8")).toBe("outside bytes\n");
 	});
 
+	it("#given an in-workspace symlink to an outside file #when applying an edit #then rejects without modifying target", () => {
+		const workspace = makeTempDirectory("lsp-workspace-");
+		const outside = makeTempDirectory("lsp-outside-");
+		const outsideFile = join(outside, "outside.ts");
+		const canonicalWorkspace = realpathSync(workspace);
+		const linkedDirectory = join(canonicalWorkspace, "linked");
+		writeFileSync(outsideFile, "outside bytes\n", "utf-8");
+		symlinkSync(outside, linkedDirectory);
+
+		const result = applyWorkspaceEdit(
+			{ changes: { [pathToFileURL(join(linkedDirectory, "outside.ts")).href]: [insertion()] } },
+			{ workspaceRoot: canonicalWorkspace },
+		);
+
+		expect(result.success).toBe(false);
+		expect(result.errors.join("\n")).toContain("outside workspace");
+		expect(readFileSync(outsideFile, "utf-8")).toBe("outside bytes\n");
+	});
+
 	it("#given annotations or mixed edit representations #when planned #then unsupported claims are rejected", () => {
 		const workspace = makeTempDirectory("lsp-workspace-");
 		const unsupported = [

package/packages/lsp-core/src/lsp/workspace-markers.ts

@@ -0,0 +1,18 @@
+/** Repository marker: an ancestor containing this always wins over intermediate package markers. */
+export const GIT_WORKSPACE_MARKER = ".git" as const;
+
+/**
+ * Package/project markers. On their own they resolve to the NEAREST marked directory, but inside a
+ * request cwd they are only a fallback: a `.git` ancestor further up collapses nested package roots
+ * (one client per repository instead of one per monorepo package).
+ */
+export const PROJECT_WORKSPACE_MARKERS = [
+	"package.json",
+	"pyproject.toml",
+	"Cargo.toml",
+	"go.mod",
+	"pom.xml",
+	"build.gradle",
+] as const;
+
+export const WORKSPACE_MARKERS = [GIT_WORKSPACE_MARKER, ...PROJECT_WORKSPACE_MARKERS] as const;

package/packages/lsp-core/src/mcp.ts

@@ -71,6 +71,9 @@ export async function runMcpStdioServer(
 	await runJsonRpcStdioServer({
 		input,
 		output,
+		// Idle stays disabled: hosts of this CLI (legacy opencode configs and
+		// standalone lsp-tools-mcp users) have no evidenced respawn for an exited
+		// stdio server; opencode in particular marks it failed without retry.
 		idleTimeoutMs: 0,
 		parentWatchdog: options.parentWatchdog ?? {},
 		handler: (request) => runWithRequestContext(requestContext, () => handleLspMcpRequest(request)),

package/packages/lsp-core/src/request-context.test.ts

@@ -168,4 +168,33 @@ describe("LspRequestContext", () => {
 			capabilities: { installDecisionTool: true },
 		});
 	});
+
+	it("#given an injected LSP cwd #when standalone context is created #then it wins over process cwd without reading global env", () => {
+		const sessionRoot = tempRoot("lsp-context-session-");
+		const processRoot = tempRoot("lsp-context-process-");
+		const home = tempRoot("lsp-context-env-home-");
+
+		const context = createStandaloneMcpRequestContext({
+			env: {
+				LSP_TOOLS_MCP_CWD: sessionRoot,
+			},
+			homeDir: home,
+		});
+
+		expect(context.cwd).toBe(sessionRoot);
+		expect(context.projectConfigPaths).toEqual([join(sessionRoot, ".codex", "lsp-client.json")]);
+		expect(processRoot).not.toBe(context.cwd);
+	});
+
+	it("#given explicit cwd and an injected LSP cwd #when standalone context is created #then explicit cwd wins", () => {
+		const explicitRoot = tempRoot("lsp-context-explicit-");
+		const injectedRoot = tempRoot("lsp-context-injected-");
+
+		const context = createStandaloneMcpRequestContext({
+			cwd: explicitRoot,
+			env: { LSP_TOOLS_MCP_CWD: injectedRoot },
+		});
+
+		expect(context.cwd).toBe(explicitRoot);
+	});
 });

package/packages/lsp-core/src/request-context.ts

@@ -72,7 +72,7 @@ export function createStandaloneMcpRequestContext(
 	input: StandaloneMcpRequestContextInput = {},
 ): LspRequestContext {
 	const env = input.env ?? process.env;
-	const cwd = canonicalCwd(input.cwd ?? process.cwd());
+	const cwd = canonicalCwd(input.cwd ?? env["LSP_TOOLS_MCP_CWD"] ?? process.cwd());
 	const home = input.homeDir ?? homedir();
 	const projectConfigPaths = translateProjectConfigEnv(env["LSP_TOOLS_MCP_PROJECT_CONFIG"], cwd);
 	const userConfigPath = translateHomeConfigEnv(env["LSP_TOOLS_MCP_USER_CONFIG"], home, ".codex/lsp-client.json");

package/packages/lsp-core/src/tool-surface.test.ts

@@ -104,6 +104,18 @@ const expectedToolSurface = [
 			required: ["filePath", "line", "character", "newName"],
 		},
 	},
+	{
+		name: "format",
+		title: "LSP Format",
+		description: "Format a source file with its language server and write the returned edits to disk.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				filePath: { type: "string", description: "Source file path to format." },
+			},
+			required: ["filePath"],
+		},
+	},
 	{
 		name: "install_decision",
 		title: "LSP Install Decision",
@@ -128,7 +140,7 @@ const expectedToolSurface = [
 ];
 
 describe("LSP core tool surface", () => {
-	test("#given tool descriptors #when listed #then the public eight-tool schemas are pinned", () => {
+	test("#given tool descriptors #when listed #then the public nine-tool schemas are pinned", () => {
 		// given / when
 		const surface = LSP_MCP_TOOLS.map((tool) => ({
 			name: tool.name,

package/packages/lsp-core/src/tools/definitions.ts

@@ -1,4 +1,5 @@
 import { executeLspDiagnostics } from "./diagnostics.js";
+import { executeLspFormat } from "./format.js";
 import { executeLspInstallDecision } from "./install-decision.js";
 import { executeLspFindReferences, executeLspGotoDefinition } from "./navigation.js";
 import { executeLspPrepareRename, executeLspRename } from "./rename.js";
@@ -116,6 +117,19 @@ export const LSP_MCP_TOOLS: LspMcpTool[] = [
 		),
 		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"],