@oh-my-pi/pi-coding-agent 14.0.2 → 14.0.4

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 ## [Unreleased]
 
+## [14.0.4] - 2026-04-10
+### Added
+
+- Added `PI_CHUNK_AUTOINDENT` environment variable to control whether chunk read/edit tools normalize indentation to canonical tabs or preserve literal file whitespace
+- Added dynamic chunk tool prompts that automatically adjust guidance based on `PI_CHUNK_AUTOINDENT` setting without exposing a tool parameter
+- Added `<instruction-priority>`, `<output-contract>`, `<default-follow-through>`, `<tool-persistence>`, and `<completeness-contract>` sections to system prompt for improved long-horizon agent workflows
+
+### Changed
+
+- Updated chunk edit tool to apply `normalizeIndent` setting during edit operations, enabling literal whitespace preservation when `PI_CHUNK_AUTOINDENT=0`
+- Refactored environment variable parsing to use `$flag()` and `$envpos()` utilities from pi-utils for consistent boolean and integer handling across codebase
+- Updated system prompt communication guidelines to emphasize conciseness and information density, and added guidance on avoiding repetition of user requests
+- Enhanced system prompt with explicit rules for design integrity, verification before yielding, and handling of missing context via tool-based retrieval
+- Added `PI_CHUNK_AUTOINDENT` to control whether chunk read/edit tools normalize indentation, and updated chunk prompts to switch guidance automatically based on that setting
+- Refined the default system prompt with explicit instruction-priority, output-contract, tool-persistence, completeness, and verification rules for long-horizon GPT-5.4-style agent workflows
+
+### Fixed
+
+- Fixed typo in system prompt: 'backwards compatibiltity' → 'backwards compatibility'
+
+## [14.0.3] - 2026-04-09
+
+### Fixed
+
+- Fixed cached Ollama discovery rows so upgraded installs switch to the OpenAI Responses transport instead of staying on the old completions transport
+
 ## [14.0.2] - 2026-04-09
 ### Added
 
@@ -258,6 +284,10 @@
 - `/autoresearch` toggles like `/plan` when empty; slash completion no longer suggests `off`/`clear` on an empty prefix after the command
 - Chunk-mode read/edit edge cases (zero-width gap replaces, stale batch diagnostics, grouped Go receivers, line-count headers, parse error locations)
 
+### Added
+
+- `/review` command now accepts inline args as custom instructions appended to the generated prompt for all structured review modes (PR-style, uncommitted, specific commit). When inline args are provided, option 4 (editor) is suppressed from the menu. The no-UI (Task tool) path forwards args as a focus hint.
+
 ## [13.19.0] - 2026-04-05
 
 ### Added

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "14.0.2",
+	"version": "14.0.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "14.0.2",
-		"@oh-my-pi/pi-agent-core": "14.0.2",
-		"@oh-my-pi/pi-ai": "14.0.2",
-		"@oh-my-pi/pi-natives": "14.0.2",
-		"@oh-my-pi/pi-tui": "14.0.2",
-		"@oh-my-pi/pi-utils": "14.0.2",
+		"@oh-my-pi/omp-stats": "14.0.4",
+		"@oh-my-pi/pi-agent-core": "14.0.4",
+		"@oh-my-pi/pi-ai": "14.0.4",
+		"@oh-my-pi/pi-natives": "14.0.4",
+		"@oh-my-pi/pi-tui": "14.0.4",
+		"@oh-my-pi/pi-utils": "14.0.4",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/config/model-registry.ts

@@ -947,7 +947,10 @@ export class ModelRegistry {
 			}
 			const models = this.#applyProviderModelOverrides(
 				providerConfig.provider,
-				this.#applyProviderCompat(providerConfig.compat, cache.models),
+				this.#normalizeDiscoverableModels(
+					providerConfig,
+					this.#applyProviderCompat(providerConfig.compat, cache.models),
+				),
 			);
 			cachedModels.push(...models);
 			this.#providerDiscoveryStates.set(providerConfig.provider, {
@@ -967,11 +970,19 @@ export class ModelRegistry {
 		return models.map(model => ({ ...model, compat: mergeCompat(model.compat, compat) }));
 	}
 
+	#normalizeDiscoverableModels(providerConfig: DiscoveryProviderConfig, models: Model<Api>[]): Model<Api>[] {
+		if (providerConfig.provider !== "ollama" || providerConfig.api !== "openai-responses") {
+			return models;
+		}
+
+		return models.map(model => (model.api === "openai-completions" ? { ...model, api: "openai-responses" } : model));
+	}
+
 	#addImplicitDiscoverableProviders(configuredProviders: Set<string>): void {
 		if (!configuredProviders.has("ollama")) {
 			this.#discoverableProviders.push({
 				provider: "ollama",
-				api: "openai-completions",
+				api: "openai-responses",
 				baseUrl: Bun.env.OLLAMA_BASE_URL || "http://127.0.0.1:11434",
 				discovery: { type: "ollama" },
 				optional: true,
@@ -1203,7 +1214,10 @@ export class ModelRegistry {
 		}
 		return this.#applyProviderModelOverrides(
 			providerId,
-			this.#applyProviderCompat(providerConfig.compat, result.models),
+			this.#normalizeDiscoverableModels(
+				providerConfig,
+				this.#applyProviderCompat(providerConfig.compat, result.models),
+			),
 		);
 	}
 

package/src/edit/index.ts

@@ -19,6 +19,7 @@ import {
 	executeChunkMode,
 	isChunkParams,
 	resolveAnchorStyle,
+	resolveChunkAutoIndent,
 } from "./modes/chunk";
 import { executeHashlineMode, type HashlineParams, hashlineEditParamsSchema, isHashlineParams } from "./modes/hashline";
 import { executePatchMode, isPatchParams, type PatchParams, patchEditSchema } from "./modes/patch";
@@ -197,6 +198,7 @@ export class EditTool implements AgentTool<TInput> {
 				description: (session: ToolSession) =>
 					prompt.render(chunkEditDescription, {
 						anchorStyle: resolveAnchorStyle(session.settings),
+						chunkAutoIndent: resolveChunkAutoIndent(),
 					}),
 				parameters: chunkEditParamsSchema,
 				invalidParamsMessage: "Invalid edit parameters for chunk mode.",

package/src/edit/modes/chunk.ts

@@ -11,6 +11,7 @@ import {
 	ChunkState,
 	type EditOperation as NativeEditOperation,
 } from "@oh-my-pi/pi-natives";
+import { $envpos } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import type { BunFile } from "bun";
 import { LRUCache } from "lru-cache";
@@ -63,6 +64,34 @@ const validAnchorStyles: Record<string, ChunkAnchorStyle> = {
 	bare: ChunkAnchorStyle.Bare,
 };
 
+export function resolveChunkAutoIndent(rawValue = Bun.env.PI_CHUNK_AUTOINDENT): boolean {
+	if (!rawValue) return true;
+	const normalized = rawValue.trim().toLowerCase();
+	switch (normalized) {
+		case "1":
+		case "true":
+		case "yes":
+		case "on":
+			return true;
+		case "0":
+		case "false":
+		case "no":
+		case "off":
+			return false;
+		default:
+			throw new Error(`Invalid PI_CHUNK_AUTOINDENT: ${rawValue}`);
+	}
+}
+
+function getChunkRenderIndentOptions(): {
+	normalizeIndent: boolean;
+	tabReplacement: string;
+} {
+	return resolveChunkAutoIndent()
+		? { normalizeIndent: true, tabReplacement: "    " }
+		: { normalizeIndent: false, tabReplacement: "\t" };
+}
+
 export function resolveAnchorStyle(settings?: Settings): ChunkAnchorStyle {
 	const envStyle = Bun.env.PI_ANCHOR_STYLE;
 	return (
@@ -72,16 +101,8 @@ export function resolveAnchorStyle(settings?: Settings): ChunkAnchorStyle {
 	);
 }
 
-const readEnvInt = (name: string, defaultValue: number): number => {
-	const value = Bun.env[name];
-	if (!value) return defaultValue;
-	const parsed = Number.parseInt(value, 10);
-	if (Number.isNaN(parsed) || parsed <= 0) return defaultValue;
-	return parsed;
-};
-
 const chunkStateCache = new LRUCache<string, ChunkCacheEntry>({
-	max: readEnvInt("PI_CHUNK_CACHE_MAX_ENTRIES", 200),
+	max: $envpos("PI_CHUNK_CACHE_MAX_ENTRIES", 200),
 });
 
 export function invalidateChunkCache(filePath: string): void {
@@ -215,6 +236,7 @@ export async function formatChunkedRead(params: {
 	const normalizedLanguage = normalizeLanguage(language);
 	const { state } = await loadChunkStateForFile(filePath, normalizedLanguage);
 	const displayPath = displayPathForFile(filePath, cwd);
+	const renderIndentOptions = getChunkRenderIndentOptions();
 	const result = state.renderRead({
 		readPath,
 		displayPath,
@@ -224,8 +246,8 @@ export async function formatChunkedRead(params: {
 		absoluteLineRange: absoluteLineRange
 			? { startLine: absoluteLineRange.startLine, endLine: absoluteLineRange.endLine ?? absoluteLineRange.startLine }
 			: undefined,
-		tabReplacement: "    ",
-		normalizeIndent: true,
+		tabReplacement: renderIndentOptions.tabReplacement,
+		normalizeIndent: renderIndentOptions.normalizeIndent,
 	});
 	return { text: result.text, resolvedPath: filePath, chunk: result.chunk };
 }
@@ -280,6 +302,7 @@ export function applyChunkEdits(params: {
 	const state = ChunkState.parse(normalizedSource, normalizeLanguage(params.language));
 	const result = state.applyEdits({
 		operations: nativeOperations,
+		normalizeIndent: resolveChunkAutoIndent(),
 		defaultSelector: params.defaultSelector,
 		defaultCrc: params.defaultCrc,
 		anchorStyle: params.anchorStyle,
@@ -312,7 +335,8 @@ export const chunkToolEditSchema = Type.Object({
 			"Chunk selector. Format: 'path@region' for insertions, 'path#CRC@region' for replace. Omit @region to target the full chunk. Valid regions: head, body, tail, decl.",
 	}),
 	content: Type.String({
-		description: "New content. Use one leading space per indent level; do not include the chunk's base padding.",
+		description:
+			"New content. Write indentation relative to the targeted region as described in the tool prompt. Do NOT include the chunk's base padding.",
 	}),
 });
 export const chunkEditParamsSchema = Type.Object(
@@ -387,7 +411,7 @@ async function writeChunkResult(params: {
 	invalidateFsScanAfterWrite(resolvedPath);
 
 	const diffResult = generateUnifiedDiffString(result.diffSourceBefore, result.diffSourceAfter);
-	const warningsBlock = result.warnings.length > 0 ? `\n\n${result.warnings.join("\n")}` : "";
+	const warningsBlock = result.warnings.length > 0 ? `\n\nWarnings:\n${result.warnings.join("\n")}` : "";
 	const meta = outputMeta()
 		.diagnostics(diagnostics?.summary ?? "", diagnostics?.messages ?? [])
 		.get();

package/src/edit/modes/hashline.ts

@@ -156,8 +156,8 @@ interface ExecuteHashlineModeOptions {
 	beginDeferredDiagnosticsForPath: (path: string) => WritethroughDeferredHandle;
 }
 
-export function hashlineParseText(edit: string[] | string | null): string[] {
-	if (edit === null) return [];
+export function hashlineParseText(edit: string[] | string | null | undefined): string[] {
+	if (edit == null) return [];
 	if (typeof edit === "string") {
 		const normalizedEdit = edit.endsWith("\n") ? edit.slice(0, -1) : edit;
 		edit = normalizedEdit.replaceAll("\r", "").split("\n");

package/src/extensibility/custom-commands/bundled/review/index.ts

@@ -197,7 +197,7 @@ const MAX_FILES_FOR_INLINE_DIFF = 20; // Don't include diff if more files than t
 /**
  * Build the full review prompt with diff stats and distribution guidance.
  */
-function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): string {
+function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string, additionalInstructions?: string): string {
 	const agentCount = getRecommendedAgentCount(stats);
 	const skipDiff = rawDiff.length > MAX_DIFF_CHARS || stats.files.length > MAX_FILES_FOR_INLINE_DIFF;
 	const totalLines = stats.totalAdded + stats.totalRemoved;
@@ -221,6 +221,7 @@ function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): str
 		skipDiff,
 		rawDiff: rawDiff.trim(),
 		linesPerFile,
+		additionalInstructions,
 	});
 }
 
@@ -230,17 +231,30 @@ export class ReviewCommand implements CustomCommand {
 
 	constructor(private api: CustomCommandAPI) {}
 
-	async execute(_args: string[], ctx: HookCommandContext): Promise<string | undefined> {
+	async execute(args: string[], ctx: HookCommandContext): Promise<string | undefined> {
 		if (!ctx.hasUI) {
-			return "Use the Task tool to run the 'reviewer' agent to review recent code changes.";
+			const base = "Use the Task tool to run the 'reviewer' agent to review recent code changes.";
+			return args.length > 0 ? `${base} Focus: ${args.join(" ")}` : base;
 		}
 
-		const mode = await ctx.ui.select("Review Mode", [
-			"1. Review against a base branch (PR Style)",
-			"2. Review uncommitted changes",
-			"3. Review a specific commit",
-			"4. Custom review instructions",
-		]);
+		// Inline args act as additional instructions appended to the generated prompt.
+		// When present, skip option 4 (editor) — the args already provide the instructions.
+		const extraInstructions = args.length > 0 ? args.join(" ") : undefined;
+
+		const menuItems = extraInstructions
+			? [
+					"1. Review against a base branch (PR Style)",
+					"2. Review uncommitted changes",
+					"3. Review a specific commit",
+				]
+			: [
+					"1. Review against a base branch (PR Style)",
+					"2. Review uncommitted changes",
+					"3. Review a specific commit",
+					"4. Custom review instructions",
+				];
+
+		const mode = await ctx.ui.select("Review Mode", menuItems);
 
 		if (!mode) return undefined;
 
@@ -282,6 +296,7 @@ export class ReviewCommand implements CustomCommand {
 					`Reviewing changes between \`${baseBranch}\` and \`${currentBranch}\` (PR-style)`,
 					stats,
 					diffText,
+					extraInstructions,
 				);
 			}
 
@@ -318,7 +333,12 @@ export class ReviewCommand implements CustomCommand {
 					return undefined;
 				}
 
-				return buildReviewPrompt("Reviewing uncommitted changes (staged + unstaged)", stats, combinedDiff);
+				return buildReviewPrompt(
+					"Reviewing uncommitted changes (staged + unstaged)",
+					stats,
+					combinedDiff,
+					extraInstructions,
+				);
 			}
 
 			case 3: {
@@ -354,7 +374,7 @@ export class ReviewCommand implements CustomCommand {
 					return undefined;
 				}
 
-				return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, diffText);
+				return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, diffText, extraInstructions);
 			}
 
 			case 4: {
@@ -374,11 +394,12 @@ export class ReviewCommand implements CustomCommand {
 				if (reviewDiff) {
 					const stats = parseDiff(reviewDiff);
 					// Even if all files filtered, include the custom instructions
-					return `${buildReviewPrompt(
+					return buildReviewPrompt(
 						`Custom review: ${instructions.split("\n")[0].slice(0, 60)}…`,
 						stats,
 						reviewDiff,
-					)}\n\n### Additional Instructions\n\n${instructions}`;
+						instructions,
+					);
 				}
 
 				// No diff available, just pass instructions

package/src/ipy/executor.ts

@@ -1,5 +1,5 @@
 import * as path from "node:path";
-import { getAgentDir, getProjectDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
+import { getAgentDir, getProjectDir, isBunTestRuntime, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { OutputSink } from "../session/streaming-output";
 import { shutdownSharedGateway } from "./gateway-coordinator";
 import {
@@ -299,10 +299,6 @@ async function writePreludeCache(state: PreludeCacheState, helpers: PreludeHelpe
 	}
 }
 
-function isPythonTestEnvironment(): boolean {
-	return Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test";
-}
-
 function getPreludeIntrospectionOptions(
 	options: KernelSessionExecutionOptions = {},
 ): Pick<KernelExecuteOptions, "signal" | "timeoutMs"> {
@@ -318,7 +314,7 @@ async function cachePreludeDocs(
 	cacheState?: PreludeCacheState | null,
 ): Promise<PreludeHelper[]> {
 	cachedPreludeDocs = docs;
-	if (!isPythonTestEnvironment() && docs.length > 0) {
+	if (!isBunTestRuntime() && docs.length > 0) {
 		const state = cacheState ?? (await buildPreludeCacheState(cwd));
 		await writePreludeCache(state, docs);
 	}
@@ -416,7 +412,7 @@ export async function warmPythonEnvironment(
 		cachedPreludeDocs = [];
 		return { ok: false, reason, docs: [] };
 	}
-	if (!isPythonTestEnvironment()) {
+	if (!isBunTestRuntime()) {
 		try {
 			cacheState = await buildPreludeCacheState(cwd);
 			const cached = await readPreludeCache(cacheState);

package/src/ipy/kernel.ts

@@ -1,4 +1,4 @@
-import { $env, logger, Snowflake } from "@oh-my-pi/pi-utils";
+import { $env, $flag, isBunTestRuntime, logger, Snowflake } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { Settings } from "../config/settings";
 import { htmlToBasicMarkdown } from "../web/scrapers/types";
@@ -10,7 +10,7 @@ import { filterEnv, resolvePythonRuntime } from "./runtime";
 
 const TEXT_ENCODER = new TextEncoder();
 const TEXT_DECODER = new TextDecoder();
-const TRACE_IPC = $env.PI_PYTHON_IPC_TRACE === "1";
+const TRACE_IPC = $flag("PI_PYTHON_IPC_TRACE");
 const PRELUDE_INTROSPECTION_SNIPPET = "import json\nprint(json.dumps(__omp_prelude_docs__()))";
 
 class SharedGatewayCreateError extends Error {
@@ -195,7 +195,7 @@ export interface PythonKernelAvailability {
 }
 
 export async function checkPythonKernelAvailability(cwd: string): Promise<PythonKernelAvailability> {
-	if (Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test" || $env.PI_PYTHON_SKIP_CHECK === "1") {
+	if (isBunTestRuntime() || $flag("PI_PYTHON_SKIP_CHECK")) {
 		return { ok: true };
 	}
 

package/src/lsp/config.ts

@@ -197,6 +197,21 @@ const LOCAL_BIN_PATHS: Array<{ markers: string[]; binDir: string }> = [
 	{ markers: ["go.mod", "go.sum"], binDir: "bin" },
 ];
 
+const WINDOWS_LOCAL_EXECUTABLE_EXTENSIONS = [".exe", ".cmd", ".bat"] as const;
+
+function resolveLocalCommand(basePath: string): string | null {
+	if (fs.existsSync(basePath)) return basePath;
+	if (process.platform !== "win32") return null;
+
+	// Package managers write Windows launchers with executable suffixes in node_modules/.bin.
+	for (const extension of WINDOWS_LOCAL_EXECUTABLE_EXTENSIONS) {
+		const candidate = `${basePath}${extension}`;
+		if (fs.existsSync(candidate)) return candidate;
+	}
+
+	return null;
+}
+
 /**
  * Resolve a command to an executable path.
  * Checks project-local bin directories first, then falls back to $PATH.
@@ -210,8 +225,9 @@ export function resolveCommand(command: string, cwd: string): string | null {
 	for (const { markers, binDir } of LOCAL_BIN_PATHS) {
 		if (hasRootMarkers(cwd, markers)) {
 			const localPath = path.join(cwd, binDir, command);
-			if (fs.existsSync(localPath)) {
-				return localPath;
+			const resolvedLocalPath = resolveLocalCommand(localPath);
+			if (resolvedLocalPath) {
+				return resolvedLocalPath;
 			}
 		}
 	}

package/src/lsp/lspmux.ts

@@ -1,6 +1,6 @@
 import * as os from "node:os";
 import * as path from "node:path";
-import { $env, $which, logger } from "@oh-my-pi/pi-utils";
+import { $flag, $which, logger } from "@oh-my-pi/pi-utils";
 import { TOML } from "bun";
 
 /**
@@ -135,7 +135,7 @@ export async function detectLspmux(): Promise<LspmuxState> {
 		return cachedState;
 	}
 
-	if ($env.PI_DISABLE_LSPMUX === "1") {
+	if ($flag("PI_DISABLE_LSPMUX")) {
 		cachedState = { available: false, running: false, binaryPath: null, config: null };
 		cacheTimestamp = now;
 		return cachedState;

package/src/lsp/utils.ts

@@ -16,149 +16,7 @@ import type {
 	WorkspaceEdit,
 } from "./types";
 
-// =============================================================================
-// Language Detection
-// =============================================================================
-
-const LANGUAGE_MAP: Record<string, string> = {
-	// TypeScript/JavaScript
-	".ts": "typescript",
-	".tsx": "typescriptreact",
-	".js": "javascript",
-	".jsx": "javascriptreact",
-	".mjs": "javascript",
-	".cjs": "javascript",
-	".mts": "typescript",
-	".cts": "typescript",
-
-	// Systems languages
-	".rs": "rust",
-	".go": "go",
-	".c": "c",
-	".h": "c",
-	".cpp": "cpp",
-	".cc": "cpp",
-	".cxx": "cpp",
-	".hpp": "cpp",
-	".hxx": "cpp",
-	".zig": "zig",
-
-	// Scripting languages
-	".py": "python",
-	".rb": "ruby",
-	".lua": "lua",
-	".sh": "shellscript",
-	".bash": "shellscript",
-	".zsh": "shellscript",
-	".fish": "fish",
-	".pl": "perl",
-	".pm": "perl",
-	".php": "php",
-
-	// JVM languages
-	".java": "java",
-	".kt": "kotlin",
-	".kts": "kotlin",
-	".scala": "scala",
-	".groovy": "groovy",
-	".clj": "clojure",
-
-	// .NET languages
-	".cs": "csharp",
-	".fs": "fsharp",
-	".vb": "vb",
-
-	// Web
-	".html": "html",
-	".htm": "html",
-	".css": "css",
-	".scss": "scss",
-	".sass": "sass",
-	".less": "less",
-	".vue": "vue",
-	".svelte": "svelte",
-	".astro": "astro",
-
-	// Data formats
-	".json": "json",
-	".jsonc": "jsonc",
-	".yaml": "yaml",
-	".yml": "yaml",
-	".toml": "toml",
-	".xml": "xml",
-	".ini": "ini",
-
-	// Documentation
-	".md": "markdown",
-	".markdown": "markdown",
-	".rst": "restructuredtext",
-	".adoc": "asciidoc",
-	".tex": "latex",
-
-	// Other
-	".sql": "sql",
-	".graphql": "graphql",
-	".gql": "graphql",
-	".proto": "protobuf",
-	".dockerfile": "dockerfile",
-	".tf": "terraform",
-	".hcl": "hcl",
-	".nix": "nix",
-	".ex": "elixir",
-	".exs": "elixir",
-	".erl": "erlang",
-	".hrl": "erlang",
-	".hs": "haskell",
-	".ml": "ocaml",
-	".mli": "ocaml",
-	".swift": "swift",
-	".r": "r",
-	".R": "r",
-	".jl": "julia",
-	".dart": "dart",
-	".elm": "elm",
-	".v": "v",
-	".nim": "nim",
-	".cr": "crystal",
-	".d": "d",
-	".pas": "pascal",
-	".pp": "pascal",
-	".lisp": "lisp",
-	".lsp": "lisp",
-	".rkt": "racket",
-	".scm": "scheme",
-	".ps1": "powershell",
-	".psm1": "powershell",
-	".bat": "bat",
-	".cmd": "bat",
-	".tla": "tlaplus",
-	".tlaplus": "tlaplus",
-};
-
-/**
- * Detect language ID from file path.
- * Returns the LSP language identifier for the file type.
- */
-export function detectLanguageId(filePath: string): string {
-	const ext = path.extname(filePath).toLowerCase();
-	const basename = path.basename(filePath).toLowerCase();
-
-	// Handle special filenames
-	if (basename === "dockerfile" || basename.startsWith("dockerfile.") || basename === "containerfile") {
-		return "dockerfile";
-	}
-	if (basename === "makefile" || basename === "gnumakefile") {
-		return "makefile";
-	}
-	if (basename === "justfile") {
-		return "just";
-	}
-	if (basename === "cmakelists.txt" || ext === ".cmake") {
-		return "cmake";
-	}
-
-	return LANGUAGE_MAP[ext] ?? "plaintext";
-}
+export { detectLanguageId } from "../utils/lang-from-path";
 
 // =============================================================================
 // URI Handling (Cross-Platform)