@oh-my-pi/pi-coding-agent 3.30.0 → 3.31.0

package/src/core/tools/lsp/defaults.json

@@ -0,0 +1,465 @@
+{
+	"rust-analyzer": {
+		"command": "rust-analyzer",
+		"args": [],
+		"fileTypes": [".rs"],
+		"rootMarkers": ["Cargo.toml", "rust-analyzer.toml"],
+		"initOptions": {
+			"checkOnSave": { "command": "clippy" },
+			"cargo": { "allFeatures": true },
+			"procMacro": { "enable": true }
+		},
+		"settings": {
+			"rust-analyzer": {
+				"diagnostics": { "enable": true },
+				"inlayHints": { "enable": true }
+			}
+		},
+		"capabilities": {
+			"flycheck": true,
+			"ssr": true,
+			"expandMacro": true,
+			"runnables": true,
+			"relatedTests": true
+		}
+	},
+	"clangd": {
+		"command": "clangd",
+		"args": ["--background-index", "--clang-tidy", "--header-insertion=iwyu"],
+		"fileTypes": [".c", ".cpp", ".cc", ".cxx", ".h", ".hpp", ".hxx", ".m", ".mm"],
+		"rootMarkers": ["compile_commands.json", "CMakeLists.txt", ".clangd", ".clang-format", "Makefile"]
+	},
+	"zls": {
+		"command": "zls",
+		"args": [],
+		"fileTypes": [".zig"],
+		"rootMarkers": ["build.zig", "build.zig.zon", "zls.json"]
+	},
+	"gopls": {
+		"command": "gopls",
+		"args": ["serve"],
+		"fileTypes": [".go", ".mod", ".sum"],
+		"rootMarkers": ["go.mod", "go.work", "go.sum"],
+		"settings": {
+			"gopls": {
+				"analyses": { "unusedparams": true, "shadow": true },
+				"staticcheck": true,
+				"gofumpt": true
+			}
+		}
+	},
+	"typescript-language-server": {
+		"command": "typescript-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"],
+		"rootMarkers": ["package.json", "tsconfig.json", "jsconfig.json"],
+		"initOptions": {
+			"hostInfo": "omp-coding-agent",
+			"preferences": {
+				"includeInlayParameterNameHints": "all",
+				"includeInlayVariableTypeHints": true,
+				"includeInlayFunctionParameterTypeHints": true
+			}
+		}
+	},
+	"biome": {
+		"command": "biome",
+		"args": ["lsp-proxy"],
+		"fileTypes": [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".json", ".jsonc"],
+		"rootMarkers": ["biome.json", "biome.jsonc"],
+		"isLinter": true
+	},
+	"eslint": {
+		"command": "vscode-eslint-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".vue", ".svelte"],
+		"rootMarkers": [
+			".eslintrc",
+			".eslintrc.js",
+			".eslintrc.json",
+			".eslintrc.yml",
+			"eslint.config.js",
+			"eslint.config.mjs"
+		],
+		"isLinter": true,
+		"settings": {
+			"validate": "on",
+			"run": "onType"
+		}
+	},
+	"denols": {
+		"command": "deno",
+		"args": ["lsp"],
+		"fileTypes": [".ts", ".tsx", ".js", ".jsx"],
+		"rootMarkers": ["deno.json", "deno.jsonc", "deno.lock"],
+		"initOptions": {
+			"enable": true,
+			"lint": true,
+			"unstable": true
+		}
+	},
+	"vscode-html-language-server": {
+		"command": "vscode-html-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".html", ".htm"],
+		"rootMarkers": ["package.json", ".git"],
+		"initOptions": {
+			"provideFormatter": true
+		}
+	},
+	"vscode-css-language-server": {
+		"command": "vscode-css-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".css", ".scss", ".sass", ".less"],
+		"rootMarkers": ["package.json", ".git"],
+		"initOptions": {
+			"provideFormatter": true
+		}
+	},
+	"vscode-json-language-server": {
+		"command": "vscode-json-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".json", ".jsonc"],
+		"rootMarkers": ["package.json", ".git"],
+		"initOptions": {
+			"provideFormatter": true
+		}
+	},
+	"tailwindcss": {
+		"command": "tailwindcss-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".html", ".css", ".scss", ".js", ".jsx", ".ts", ".tsx", ".vue", ".svelte"],
+		"rootMarkers": ["tailwind.config.js", "tailwind.config.ts", "tailwind.config.mjs", "tailwind.config.cjs"]
+	},
+	"svelte": {
+		"command": "svelteserver",
+		"args": ["--stdio"],
+		"fileTypes": [".svelte"],
+		"rootMarkers": ["svelte.config.js", "svelte.config.mjs", "package.json"]
+	},
+	"vue-language-server": {
+		"command": "vue-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".vue"],
+		"rootMarkers": ["vue.config.js", "nuxt.config.js", "nuxt.config.ts", "package.json"]
+	},
+	"astro": {
+		"command": "astro-ls",
+		"args": ["--stdio"],
+		"fileTypes": [".astro"],
+		"rootMarkers": ["astro.config.mjs", "astro.config.js", "astro.config.ts"]
+	},
+	"pyright": {
+		"command": "pyright-langserver",
+		"args": ["--stdio"],
+		"fileTypes": [".py", ".pyi"],
+		"rootMarkers": ["pyproject.toml", "pyrightconfig.json", "setup.py", "setup.cfg", "requirements.txt", "Pipfile"],
+		"settings": {
+			"python": {
+				"analysis": {
+					"autoSearchPaths": true,
+					"diagnosticMode": "openFilesOnly",
+					"useLibraryCodeForTypes": true
+				}
+			}
+		}
+	},
+	"basedpyright": {
+		"command": "basedpyright-langserver",
+		"args": ["--stdio"],
+		"fileTypes": [".py", ".pyi"],
+		"rootMarkers": ["pyproject.toml", "pyrightconfig.json", "setup.py", "requirements.txt"],
+		"settings": {
+			"basedpyright": {
+				"analysis": {
+					"autoSearchPaths": true,
+					"diagnosticMode": "openFilesOnly",
+					"useLibraryCodeForTypes": true
+				}
+			}
+		}
+	},
+	"pylsp": {
+		"command": "pylsp",
+		"args": [],
+		"fileTypes": [".py"],
+		"rootMarkers": ["pyproject.toml", "setup.py", "setup.cfg", "requirements.txt", "Pipfile"]
+	},
+	"ruff": {
+		"command": "ruff",
+		"args": ["server"],
+		"fileTypes": [".py", ".pyi"],
+		"rootMarkers": ["pyproject.toml", "ruff.toml", ".ruff.toml"],
+		"isLinter": true
+	},
+	"jdtls": {
+		"command": "jdtls",
+		"args": [],
+		"fileTypes": [".java"],
+		"rootMarkers": ["pom.xml", "build.gradle", "build.gradle.kts", "settings.gradle", ".project"]
+	},
+	"kotlin-language-server": {
+		"command": "kotlin-language-server",
+		"args": [],
+		"fileTypes": [".kt", ".kts"],
+		"rootMarkers": ["build.gradle", "build.gradle.kts", "pom.xml", "settings.gradle", "settings.gradle.kts"]
+	},
+	"metals": {
+		"command": "metals",
+		"args": [],
+		"fileTypes": [".scala", ".sbt", ".sc"],
+		"rootMarkers": ["build.sbt", "build.sc", "build.gradle", "pom.xml"],
+		"initOptions": {
+			"statusBarProvider": "show-message",
+			"isHttpEnabled": true
+		}
+	},
+	"hls": {
+		"command": "haskell-language-server-wrapper",
+		"args": ["--lsp"],
+		"fileTypes": [".hs", ".lhs"],
+		"rootMarkers": ["stack.yaml", "cabal.project", "hie.yaml", "package.yaml", "*.cabal"],
+		"settings": {
+			"haskell": {
+				"formattingProvider": "ormolu",
+				"checkProject": true
+			}
+		}
+	},
+	"ocamllsp": {
+		"command": "ocamllsp",
+		"args": [],
+		"fileTypes": [".ml", ".mli", ".mll", ".mly"],
+		"rootMarkers": ["dune-project", "dune-workspace", "*.opam", ".ocamlformat"]
+	},
+	"elixirls": {
+		"command": "elixir-ls",
+		"args": [],
+		"fileTypes": [".ex", ".exs", ".heex", ".eex"],
+		"rootMarkers": ["mix.exs", "mix.lock"],
+		"settings": {
+			"elixirLS": {
+				"dialyzerEnabled": true,
+				"fetchDeps": false
+			}
+		}
+	},
+	"erlangls": {
+		"command": "erlang_ls",
+		"args": [],
+		"fileTypes": [".erl", ".hrl"],
+		"rootMarkers": ["rebar.config", "erlang.mk", "rebar.lock"]
+	},
+	"gleam": {
+		"command": "gleam",
+		"args": ["lsp"],
+		"fileTypes": [".gleam"],
+		"rootMarkers": ["gleam.toml"]
+	},
+	"solargraph": {
+		"command": "solargraph",
+		"args": ["stdio"],
+		"fileTypes": [".rb", ".rake", ".gemspec"],
+		"rootMarkers": ["Gemfile", ".solargraph.yml", "Rakefile"],
+		"initOptions": {
+			"formatting": true
+		},
+		"settings": {
+			"solargraph": {
+				"diagnostics": true,
+				"completion": true,
+				"hover": true,
+				"formatting": true,
+				"references": true,
+				"rename": true,
+				"symbols": true
+			}
+		}
+	},
+	"ruby-lsp": {
+		"command": "ruby-lsp",
+		"args": [],
+		"fileTypes": [".rb", ".rake", ".gemspec", ".erb"],
+		"rootMarkers": ["Gemfile", ".ruby-version", ".ruby-gemset"],
+		"initOptions": {
+			"formatter": "auto"
+		}
+	},
+	"rubocop": {
+		"command": "rubocop",
+		"args": ["--lsp"],
+		"fileTypes": [".rb", ".rake"],
+		"rootMarkers": [".rubocop.yml", "Gemfile"],
+		"isLinter": true
+	},
+	"bashls": {
+		"command": "bash-language-server",
+		"args": ["start"],
+		"fileTypes": [".sh", ".bash", ".zsh"],
+		"rootMarkers": [".git"],
+		"settings": {
+			"bashIde": {
+				"globPattern": "*@(.sh|.inc|.bash|.command)"
+			}
+		}
+	},
+	"nushell": {
+		"command": "nu",
+		"args": ["--lsp"],
+		"fileTypes": [".nu"],
+		"rootMarkers": [".git"]
+	},
+	"lua-language-server": {
+		"command": "lua-language-server",
+		"args": [],
+		"fileTypes": [".lua"],
+		"rootMarkers": [".luarc.json", ".luarc.jsonc", ".luacheckrc", ".stylua.toml", "stylua.toml"],
+		"settings": {
+			"Lua": {
+				"runtime": { "version": "LuaJIT" },
+				"diagnostics": { "globals": ["vim"] },
+				"workspace": { "checkThirdParty": false },
+				"telemetry": { "enable": false }
+			}
+		}
+	},
+	"intelephense": {
+		"command": "intelephense",
+		"args": ["--stdio"],
+		"fileTypes": [".php", ".phtml"],
+		"rootMarkers": ["composer.json", "composer.lock", ".git"]
+	},
+	"phpactor": {
+		"command": "phpactor",
+		"args": ["language-server"],
+		"fileTypes": [".php"],
+		"rootMarkers": ["composer.json", ".phpactor.json", ".phpactor.yml"]
+	},
+	"omnisharp": {
+		"command": "omnisharp",
+		"args": ["-z", "--hostPID", "$PID", "--encoding", "utf-8", "--languageserver"],
+		"fileTypes": [".cs", ".csx"],
+		"rootMarkers": ["*.sln", "*.csproj", "omnisharp.json", ".git"],
+		"settings": {
+			"FormattingOptions": { "EnableEditorConfigSupport": true },
+			"RoslynExtensionsOptions": { "EnableAnalyzersSupport": true }
+		}
+	},
+	"yamlls": {
+		"command": "yaml-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".yaml", ".yml"],
+		"rootMarkers": [".git"],
+		"settings": {
+			"yaml": {
+				"validate": true,
+				"format": { "enable": true },
+				"hover": true,
+				"completion": true
+			},
+			"redhat": { "telemetry": { "enabled": false } }
+		}
+	},
+	"taplo": {
+		"command": "taplo",
+		"args": ["lsp", "stdio"],
+		"fileTypes": [".toml"],
+		"rootMarkers": [".taplo.toml", "taplo.toml", ".git"]
+	},
+	"terraformls": {
+		"command": "terraform-ls",
+		"args": ["serve"],
+		"fileTypes": [".tf", ".tfvars"],
+		"rootMarkers": [".terraform", "terraform.tfstate", "*.tf"]
+	},
+	"dockerls": {
+		"command": "docker-langserver",
+		"args": ["--stdio"],
+		"fileTypes": [".dockerfile", "Dockerfile"],
+		"rootMarkers": ["Dockerfile", "docker-compose.yml", "docker-compose.yaml", ".dockerignore"]
+	},
+	"helm-ls": {
+		"command": "helm_ls",
+		"args": ["serve"],
+		"fileTypes": [".yaml", ".yml", ".tpl"],
+		"rootMarkers": ["Chart.yaml", "Chart.yml"]
+	},
+	"nixd": {
+		"command": "nixd",
+		"args": [],
+		"fileTypes": [".nix"],
+		"rootMarkers": ["flake.nix", "default.nix", "shell.nix"]
+	},
+	"nil": {
+		"command": "nil",
+		"args": [],
+		"fileTypes": [".nix"],
+		"rootMarkers": ["flake.nix", "default.nix", "shell.nix"]
+	},
+	"ols": {
+		"command": "ols",
+		"args": [],
+		"fileTypes": [".odin"],
+		"rootMarkers": ["ols.json", ".git"]
+	},
+	"dartls": {
+		"command": "dart",
+		"args": ["language-server", "--protocol=lsp"],
+		"fileTypes": [".dart"],
+		"rootMarkers": ["pubspec.yaml", "pubspec.lock"],
+		"initOptions": {
+			"closingLabels": true,
+			"flutterOutline": true,
+			"outline": true
+		}
+	},
+	"marksman": {
+		"command": "marksman",
+		"args": ["server"],
+		"fileTypes": [".md", ".markdown"],
+		"rootMarkers": [".marksman.toml", ".git"]
+	},
+	"texlab": {
+		"command": "texlab",
+		"args": [],
+		"fileTypes": [".tex", ".bib", ".sty", ".cls"],
+		"rootMarkers": [".latexmkrc", "latexmkrc", ".texlabroot", "texlabroot", "Tectonic.toml"],
+		"settings": {
+			"texlab": {
+				"build": {
+					"executable": "latexmk",
+					"args": ["-pdf", "-interaction=nonstopmode", "-synctex=1", "%f"]
+				},
+				"chktex": { "onOpenAndSave": true }
+			}
+		}
+	},
+	"graphql": {
+		"command": "graphql-lsp",
+		"args": ["server", "-m", "stream"],
+		"fileTypes": [".graphql", ".gql"],
+		"rootMarkers": [".graphqlrc", ".graphqlrc.json", ".graphqlrc.yml", ".graphqlrc.yaml", "graphql.config.js"]
+	},
+	"prismals": {
+		"command": "prisma-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".prisma"],
+		"rootMarkers": ["schema.prisma", "prisma/schema.prisma"]
+	},
+	"vimls": {
+		"command": "vim-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".vim", ".vimrc"],
+		"rootMarkers": [".git"],
+		"initOptions": {
+			"isNeovim": true,
+			"diagnostic": { "enable": true }
+		}
+	},
+	"emmet-language-server": {
+		"command": "emmet-language-server",
+		"args": ["--stdio"],
+		"fileTypes": [".html", ".css", ".scss", ".less", ".jsx", ".tsx", ".vue", ".svelte"],
+		"rootMarkers": [".git"]
+	}
+}

package/src/core/tools/lsp/index.ts

@@ -1,5 +1,5 @@
 import type { Dirent } from "node:fs";
-import { existsSync } from "node:fs";
+import { existsSync, statSync } from "node:fs";
 import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { BunFile } from "bun";
@@ -136,14 +136,18 @@ async function syncFileContent(
 	content: string,
 	cwd: string,
 	servers: Array<[string, ServerConfig]>,
+	signal?: AbortSignal,
 ): Promise<void> {
+	signal?.throwIfAborted();
 	await Promise.allSettled(
 		servers.map(async ([_serverName, serverConfig]) => {
+			signal?.throwIfAborted();
 			if (serverConfig.createClient) {
 				return;
 			}
 			const client = await getOrCreateClient(serverConfig, cwd);
-			await syncContent(client, absolutePath, content);
+			signal?.throwIfAborted();
+			await syncContent(client, absolutePath, content, signal);
 		}),
 	);
 }
@@ -160,14 +164,17 @@ async function notifyFileSaved(
 	absolutePath: string,
 	cwd: string,
 	servers: Array<[string, ServerConfig]>,
+	signal?: AbortSignal,
 ): Promise<void> {
+	signal?.throwIfAborted();
 	await Promise.allSettled(
 		servers.map(async ([_serverName, serverConfig]) => {
+			signal?.throwIfAborted();
 			if (serverConfig.createClient) {
 				return;
 			}
 			const client = await getOrCreateClient(serverConfig, cwd);
-			await notifySaved(client, absolutePath);
+			await notifySaved(client, absolutePath, signal);
 		}),
 	);
 }
@@ -227,13 +234,19 @@ function findFileByExtensions(baseDir: string, extensions: string[], maxDepth: n
 	const normalized = extensions.map((ext) => ext.toLowerCase());
 	const search = (dir: string, depth: number): string | null => {
 		if (depth > maxDepth) return null;
-		let entries: Dirent[];
+		const entries: Dirent[] = [];
 		try {
-			entries = Array.from(new Bun.Glob("*").scanSync({ cwd: dir, onlyFiles: false })).map((name) => ({
-				name,
-				isFile: () => !existsSync(path.join(dir, name)) || Bun.file(path.join(dir, name)).type !== "directory",
-				isDirectory: () => existsSync(path.join(dir, name)) && Bun.file(path.join(dir, name)).type === "directory",
-			})) as Dirent[];
+			const names = Array.from(new Bun.Glob("*").scanSync({ cwd: dir, onlyFiles: false }));
+			for (const name of names) {
+				const fullPath = path.join(dir, name);
+				let isDir = false;
+				try {
+					isDir = statSync(fullPath).isDirectory();
+				} catch {
+					continue;
+				}
+				entries.push({ name, isFile: () => !isDir, isDirectory: () => isDir } as Dirent);
+			}
 		} catch {
 			return null;
 		}
@@ -298,9 +311,15 @@ function getServerForWorkspaceAction(config: LspConfig, action: string): [string
 	return null;
 }
 
-async function waitForDiagnostics(client: LspClient, uri: string, timeoutMs = 3000): Promise<Diagnostic[]> {
+async function waitForDiagnostics(
+	client: LspClient,
+	uri: string,
+	timeoutMs = 3000,
+	signal?: AbortSignal,
+): Promise<Diagnostic[]> {
 	const start = Date.now();
 	while (Date.now() - start < timeoutMs) {
+		signal?.throwIfAborted();
 		const diagnostics = client.diagnostics.get(uri);
 		if (diagnostics !== undefined) return diagnostics;
 		await sleep(100);
@@ -440,6 +459,7 @@ async function getDiagnosticsForFile(
 	absolutePath: string,
 	cwd: string,
 	servers: Array<[string, ServerConfig]>,
+	signal?: AbortSignal,
 ): Promise<FileDiagnosticsResult | undefined> {
 	if (servers.length === 0) {
 		return undefined;
@@ -453,6 +473,7 @@ async function getDiagnosticsForFile(
 	// Wait for diagnostics from all servers in parallel
 	const results = await Promise.allSettled(
 		servers.map(async ([serverName, serverConfig]) => {
+			signal?.throwIfAborted();
 			// Use custom linter client if configured
 			if (serverConfig.createClient) {
 				const linterClient = getLinterClient(serverName, serverConfig, cwd);
@@ -462,8 +483,9 @@ async function getDiagnosticsForFile(
 
 			// Default: use LSP
 			const client = await getOrCreateClient(serverConfig, cwd);
+			signal?.throwIfAborted();
 			// Content already synced + didSave sent, just wait for diagnostics
-			const diagnostics = await waitForDiagnostics(client, uri);
+			const diagnostics = await waitForDiagnostics(client, uri, 3000, signal);
 			return { serverName, diagnostics };
 		}),
 	);
@@ -539,6 +561,7 @@ async function formatContent(
 	content: string,
 	cwd: string,
 	servers: Array<[string, ServerConfig]>,
+	signal?: AbortSignal,
 ): Promise<string> {
 	if (servers.length === 0) {
 		return content;
@@ -548,6 +571,7 @@ async function formatContent(
 
 	for (const [serverName, serverConfig] of servers) {
 		try {
+			signal?.throwIfAborted();
 			// Use custom linter client if configured
 			if (serverConfig.createClient) {
 				const linterClient = getLinterClient(serverName, serverConfig, cwd);
@@ -556,6 +580,7 @@ async function formatContent(
 
 			// Default: use LSP
 			const client = await getOrCreateClient(serverConfig, cwd);
+			signal?.throwIfAborted();
 
 			const caps = client.serverCapabilities;
 			if (!caps?.documentFormattingProvider) {
@@ -563,10 +588,15 @@ async function formatContent(
 			}
 
 			// Request formatting (content already synced)
-			const edits = (await sendRequest(client, "textDocument/formatting", {
-				textDocument: { uri },
-				options: DEFAULT_FORMAT_OPTIONS,
-			})) as TextEdit[] | null;
+			const edits = (await sendRequest(
+				client,
+				"textDocument/formatting",
+				{
+					textDocument: { uri },
+					options: DEFAULT_FORMAT_OPTIONS,
+				},
+				signal,
+			)) as TextEdit[] | null;
 
 			if (!edits || edits.length === 0) {
 				return content;
@@ -633,28 +663,29 @@ export function createLspWritethrough(cwd: string, options?: WritethroughOptions
 		let formatter: FileFormatResult | undefined;
 		let diagnostics: FileDiagnosticsResult | undefined;
 		try {
-			signal ??= AbortSignal.timeout(10_000);
-			await untilAborted(signal, async () => {
+			const timeoutSignal = AbortSignal.timeout(10_000);
+			const operationSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+			await untilAborted(operationSignal, async () => {
 				if (useCustomFormatter) {
 					// Custom linters (e.g. Biome CLI) require on-disk input.
 					await writeContent(content);
-					finalContent = await formatContent(dst, content, cwd, customLinterServers);
+					finalContent = await formatContent(dst, content, cwd, customLinterServers, operationSignal);
 					formatter = finalContent !== content ? FileFormatResult.FORMATTED : FileFormatResult.UNCHANGED;
 					await writeContent(finalContent);
-					await syncFileContent(dst, finalContent, cwd, lspServers);
+					await syncFileContent(dst, finalContent, cwd, lspServers, operationSignal);
 				} else {
 					// 1. Sync original content to LSP servers
-					await syncFileContent(dst, content, cwd, lspServers);
+					await syncFileContent(dst, content, cwd, lspServers, operationSignal);
 
 					// 2. Format in-memory via LSP
 					if (enableFormat) {
-						finalContent = await formatContent(dst, content, cwd, lspServers);
+						finalContent = await formatContent(dst, content, cwd, lspServers, operationSignal);
 						formatter = finalContent !== content ? FileFormatResult.FORMATTED : FileFormatResult.UNCHANGED;
 					}
 
 					// 3. If formatted, sync formatted content to LSP servers
 					if (finalContent !== content) {
-						await syncFileContent(dst, finalContent, cwd, lspServers);
+						await syncFileContent(dst, finalContent, cwd, lspServers, operationSignal);
 					}
 
 					// 4. Write to disk
@@ -662,11 +693,11 @@ export function createLspWritethrough(cwd: string, options?: WritethroughOptions
 				}
 
 				// 5. Notify saved to LSP servers
-				await notifyFileSaved(dst, cwd, lspServers);
+				await notifyFileSaved(dst, cwd, lspServers, operationSignal);
 
 				// 6. Get diagnostics from all servers
 				if (enableDiagnostics) {
-					diagnostics = await getDiagnosticsForFile(dst, cwd, servers);
+					diagnostics = await getDiagnosticsForFile(dst, cwd, servers, operationSignal);
 				}
 			});
 		} catch {
@@ -1362,11 +1393,3 @@ export function createLspTool(session: ToolSession): AgentTool<typeof lspSchema,
 		},
 	};
 }
-
-export const lspTool = createLspTool({
-	cwd: process.cwd(),
-	hasUI: false,
-	rulebookRules: [],
-	getSessionFile: () => null,
-	getSessionSpawns: () => null,
-});