oh-my-opencode 4.8.1 → 4.9.0

package/packages/omo-codex/plugin/components/lsp/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-tool-use",
 						"timeout": 60,
-						"statusMessage": "LazyCodex(0.2.0): Checking LSP Diagnostics"
+						"statusMessage": "LazyCodex(4.9.0): Checking LSP Diagnostics"
 					}
 				]
 			}
@@ -21,7 +21,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-compact",
 						"timeout": 5,
-						"statusMessage": "LazyCodex(0.2.0): Resetting LSP Diagnostics Cache"
+						"statusMessage": "LazyCodex(4.9.0): Resetting LSP Diagnostics Cache"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/lsp/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-lsp",
-	"version": "0.2.0",
+	"version": "4.9.0",
 	"description": "Codex plugin that exposes Language Server Protocol tools and post-edit diagnostics.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",
@@ -36,21 +36,21 @@
 		"CHANGELOG.md"
 	],
 	"scripts": {
-		"bootstrap": "node scripts/build-lsp-tools.mjs",
-		"prebuild": "node scripts/build-lsp-tools.mjs",
+		"bootstrap": "node scripts/build-lsp-tools.mjs && node scripts/build-lsp-daemon.mjs",
+		"prebuild": "node scripts/build-lsp-tools.mjs && node scripts/build-lsp-daemon.mjs",
 		"build": "node scripts/clean-dist.mjs && tsc -p tsconfig.build.json",
-		"pretest": "node scripts/build-lsp-tools.mjs",
+		"pretest": "node scripts/build-lsp-tools.mjs && node scripts/build-lsp-daemon.mjs",
 		"test": "node scripts/test.mjs",
 		"test:watch": "vitest",
-		"pretypecheck": "node scripts/build-lsp-tools.mjs",
+		"pretypecheck": "node scripts/build-lsp-tools.mjs && node scripts/build-lsp-daemon.mjs",
 		"typecheck": "tsc --noEmit",
 		"lint": "biome check src test",
 		"lint:fix": "biome check --write src test",
-		"precheck": "node scripts/build-lsp-tools.mjs",
+		"precheck": "node scripts/build-lsp-tools.mjs && node scripts/build-lsp-daemon.mjs",
 		"check": "tsc --noEmit && biome check src test && tsc -p tsconfig.build.json"
 	},
 	"dependencies": {
-		"@code-yeongyu/lsp-tools-mcp": "file:../../../../lsp-tools-mcp"
+		"@code-yeongyu/lsp-daemon": "file:../../../../lsp-daemon"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.4.15",

package/packages/omo-codex/plugin/components/lsp/scripts/build-lsp-daemon.mjs

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+import { execSync } from "node:child_process";
+import { existsSync, statSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = dirname(fileURLToPath(import.meta.url));
+const force = process.argv.includes("--force");
+
+// Ordered candidate list:
+// (1) 5-up repo sibling — has package.json, can be built (repo checkout layout)
+// (2) 2-up components sibling — bundled dist-only inside the installed plugin cache
+const candidates = [
+	join(here, "..", "..", "..", "..", "..", "lsp-daemon"),
+	join(here, "..", "..", "lsp-daemon"),
+];
+
+function requiredOutputs(dir) {
+	return [
+		join(dir, "dist", "cli.js"),
+		join(dir, "dist", "index.js"),
+		join(dir, "dist", "index.d.ts"),
+	];
+}
+
+// Phase 1: find the first buildable candidate (package.json present).
+// --force skips the freshness check but does NOT prevent using a buildable candidate.
+for (const dir of candidates) {
+	const packageJson = join(dir, "package.json");
+	if (existsSync(packageJson)) {
+		const outputs = requiredOutputs(dir);
+		if (!force && isBuildFresh(packageJson, outputs)) {
+			process.exit(0);
+		}
+		console.log("Installing repository lsp-daemon dependencies...");
+		execSync("npm ci", { cwd: dir, stdio: "inherit" });
+		console.log("Building repository lsp-daemon...");
+		execSync("npm run build", { cwd: dir, stdio: "inherit" });
+		console.log("Done.");
+		process.exit(0);
+	}
+}
+
+// Phase 2: find the first candidate with all required outputs already present.
+// Bundled dist is accepted even under --force — a dist-only layout cannot be rebuilt.
+for (const dir of candidates) {
+	const outputs = requiredOutputs(dir);
+	if (outputs.every((p) => existsSync(p))) {
+		console.log(`Using bundled lsp-daemon dist at ${dir}.`);
+		process.exit(0);
+	}
+}
+
+// Phase 3: no usable candidate found — enumerate every probed path.
+// Keep the primary-candidate error on the first line so the issue's grep stays valid.
+const probedPaths = candidates.map((dir) => join(dir, "package.json")).join(", ");
+console.error(
+	`lsp-daemon package metadata is missing at ${join(candidates[0], "package.json")}; build packages/lsp-daemon before codex-lsp`,
+);
+console.error(`probed: ${probedPaths}`);
+process.exit(1);
+
+function isBuildFresh(inputPath, outputPaths) {
+	if (!existsSync(inputPath)) return false;
+	if (outputPaths.some((path) => !existsSync(path))) return false;
+	const inputMtime = statSync(inputPath).mtimeMs;
+	return outputPaths.every((path) => statSync(path).mtimeMs >= inputMtime);
+}

package/packages/omo-codex/plugin/components/lsp/scripts/build-lsp-tools.mjs

@@ -6,37 +6,60 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const lspToolsDir = join(__dirname, "..", "..", "..", "..", "..", "lsp-tools-mcp");
-const packageJson = join(lspToolsDir, "package.json");
-const requiredOutputs = [
-	join(lspToolsDir, "dist", "cli.js"),
-	join(lspToolsDir, "dist", "tools.js"),
-	join(lspToolsDir, "dist", "lsp", "manager.js"),
-];
 const force = process.argv.includes("--force");
 
-if (!force && isBuildFresh(packageJson, requiredOutputs)) {
-	process.exit(0);
+// Ordered candidate list:
+// (1) 5-up repo sibling — has package.json, can be built (repo checkout layout)
+// (2) 2-up components sibling — bundled dist-only inside the installed plugin cache
+const candidates = [
+	join(__dirname, "..", "..", "..", "..", "..", "lsp-tools-mcp"),
+	join(__dirname, "..", "..", "lsp-tools-mcp"),
+];
+
+function requiredOutputs(dir) {
+	return [
+		join(dir, "dist", "cli.js"),
+		join(dir, "dist", "tools.js"),
+		join(dir, "dist", "lsp", "manager.js"),
+	];
 }
 
-if (!existsSync(packageJson)) {
-	if (!force && requiredOutputs.every((path) => existsSync(path))) {
-		console.log("Using bundled lsp-tools-mcp dist.");
+// Phase 1: find the first buildable candidate (package.json present).
+// --force skips the freshness check but does NOT prevent using a buildable candidate.
+for (const dir of candidates) {
+	const packageJson = join(dir, "package.json");
+	if (existsSync(packageJson)) {
+		const outputs = requiredOutputs(dir);
+		if (!force && isBuildFresh(packageJson, outputs)) {
+			process.exit(0);
+		}
+		console.log("Installing repository lsp-tools-mcp dependencies...");
+		execSync("npm ci", { cwd: dir, stdio: "inherit" });
+		console.log("Building repository lsp-tools-mcp...");
+		execSync("npm run build", { cwd: dir, stdio: "inherit" });
+		console.log("Done.");
 		process.exit(0);
 	}
-	console.error(
-		`lsp-tools-mcp package metadata is missing at ${packageJson}; build packages/lsp-tools-mcp before codex-lsp`,
-	);
-	process.exit(1);
 }
 
-console.log("Installing repository lsp-tools-mcp dependencies...");
-execSync("npm ci", { cwd: lspToolsDir, stdio: "inherit" });
-
-console.log("Building repository lsp-tools-mcp...");
-execSync("npm run build", { cwd: lspToolsDir, stdio: "inherit" });
+// Phase 2: find the first candidate with all required outputs already present.
+// Bundled dist is accepted even under --force — a dist-only layout cannot be rebuilt.
+for (const dir of candidates) {
+	const outputs = requiredOutputs(dir);
+	if (outputs.every((p) => existsSync(p))) {
+		console.log(`Using bundled lsp-tools-mcp dist at ${dir}.`);
+		process.exit(0);
+	}
+}
 
-console.log("Done.");
+// Phase 3: no usable candidate found — enumerate every probed path.
+// Keep the primary-candidate error on the first line so the issue's grep stays valid.
+const probedPaths = candidates.map((dir) => join(dir, "package.json")).join(", ");
+console.error(
+	`lsp-tools-mcp package metadata is missing at ${join(candidates[0], "package.json")}; build packages/lsp-tools-mcp before codex-lsp`,
+);
+console.error(`probed: ${probedPaths}`);
+process.exit(1);
 
 function isBuildFresh(inputPath, outputPaths) {
 	if (!existsSync(inputPath)) return false;

package/packages/omo-codex/plugin/components/lsp/src/cli.ts

@@ -6,7 +6,7 @@ import { argv, execPath, stderr } from "node:process";
 import { runPostCompactHookCli, runPostToolUseHookCli } from "./codex-hook-cli.js";
 
 const require = createRequire(import.meta.url);
-const PACKAGE_LSP_MCP_CLI = "@code-yeongyu/lsp-tools-mcp/dist/cli.js";
+const PACKAGE_LSP_MCP_CLI = "@code-yeongyu/lsp-daemon/dist/cli.js";
 
 async function main(): Promise<void> {
 	const [command = "mcp", subcommand = ""] = argv.slice(2);

package/packages/omo-codex/plugin/components/lsp/src/codex-hook-cli.ts

@@ -1,6 +1,6 @@
 import { stdin as processStdin } from "node:process";
 
-import { disposeDefaultLspManager } from "@code-yeongyu/lsp-tools-mcp/dist/lsp/manager.js";
+import { disposeDefaultLspManager } from "@code-yeongyu/lsp-daemon";
 
 import { isRecord, runLspPostCompactHook, runLspPostToolUseHook } from "./codex-hook.js";
 

package/packages/omo-codex/plugin/components/lsp/src/codex-hook.ts

@@ -1,8 +1,9 @@
 import { readFileSync } from "node:fs";
 
-import { executeLspDiagnostics } from "@code-yeongyu/lsp-tools-mcp/dist/tools.js";
+import { callDiagnosticsViaDaemon, currentRequestContext } from "@code-yeongyu/lsp-daemon";
 
 import {
+	isLspDaemonUnreachableDiagnostics,
 	isUnavailableLspDiagnostics,
 	markLspSessionCompacted,
 	recordLspDiagnosticsObservations,
@@ -59,7 +60,7 @@ const CONTEXT_PRESSURE_MARKERS = [
 ] as const;
 
 export async function runLspDiagnosticsText(filePath: string): Promise<string> {
-	const result = await executeLspDiagnostics({ filePath, severity: "error" });
+	const result = await callDiagnosticsViaDaemon(filePath, { context: currentRequestContext() });
 	return result.content.map((block) => block.text).join("\n");
 }
 
@@ -76,6 +77,9 @@ export async function runLspPostToolUseHook(
 	const blocks: DiagnosticBlock[] = [];
 	const observations: Array<{ filePath: string; unavailable: boolean }> = [];
 	for (const { filePath, diagnostics } of await collectDiagnostics(filePaths, runDiagnostics)) {
+		// A daemon outage is transient (connect-or-spawn retries on the next request);
+		// recording it would silence this extension for the rest of the session.
+		if (isLspDaemonUnreachableDiagnostics(diagnostics)) continue;
 		const unavailable = isUnavailableLspDiagnostics(diagnostics);
 		observations.push({ filePath, unavailable });
 		if (isCleanDiagnostics(diagnostics)) continue;

package/packages/omo-codex/plugin/components/lsp/src/lsp-session-state.ts

@@ -68,6 +68,10 @@ export function isUnavailableLspDiagnostics(diagnostics: string): boolean {
 	);
 }
 
+export function isLspDaemonUnreachableDiagnostics(diagnostics: string): boolean {
+	return diagnostics.includes("LSP daemon unreachable");
+}
+
 function sessionStatePath(sessionId: string): string {
 	const root = process.env["PLUGIN_DATA"] ?? join(homedir(), ".codex", "codex-lsp");
 	return join(root, "sessions", `${safePathSegment(sessionId)}.json`);

package/packages/omo-codex/plugin/components/lsp/test/codex-hook-unavailable.test.ts

@@ -12,6 +12,12 @@ const MARKSMAN_INITIALIZE_TIMEOUT = [
 	'[01:16:41 INF] <Folder> Loading folder documents: {"uri":"file:///repo"}',
 ].join("\n");
 
+const DAEMON_UNREACHABLE = [
+	"LSP daemon unreachable: daemon did not become reachable.",
+	"The MCP server is a thin proxy and never runs language servers in-process.",
+	"Logs: /tmp/daemon.log",
+].join("\n");
+
 const tempDirs: string[] = [];
 
 afterEach(() => {
@@ -118,6 +124,68 @@ describe("codex PostToolUse unavailable LSP suppression", () => {
 		});
 	});
 
+	it("#given the LSP daemon is unreachable #when PostToolUse repeats #then it suppresses feedback once and retries on the next edit", async () => {
+		// given
+		const pluginData = tempPluginData();
+		const input = postToolUseInput("session-daemon-down", "src/app.ts");
+		let calls = 0;
+
+		await withPluginData(pluginData, async () => {
+			// when
+			const firstOutput = await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return DAEMON_UNREACHABLE;
+			});
+			const secondOutput = await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return "error[typescript] (2304) at 1:1: Cannot find name 'missing'.";
+			});
+
+			// then
+			expect(firstOutput).toBe("");
+			expect(secondOutput).toContain("Cannot find name 'missing'");
+			expect(calls).toBe(2);
+		});
+	});
+
+	it("#given a cached unavailable extension #when the post-compact probe hits a daemon outage #then the cache survives and the probe stays pending", async () => {
+		// given
+		const pluginData = tempPluginData();
+		const input = postToolUseInput("session-daemon-down-probe", ".omo/ulw-loop/evidence/note.md");
+		let calls = 0;
+
+		await withPluginData(pluginData, async () => {
+			await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return MARKSMAN_INITIALIZE_TIMEOUT;
+			});
+			await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return "error[markdown] (1000) at 1:1: cached call should have been skipped.";
+			});
+			await runLspPostCompactHook({ session_id: "session-daemon-down-probe" });
+
+			// when
+			const outageProbeOutput = await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return DAEMON_UNREACHABLE;
+			});
+			const retriedProbeOutput = await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return MARKSMAN_INITIALIZE_TIMEOUT;
+			});
+			await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return "error[markdown] (1000) at 1:1: re-cached call should have been skipped.";
+			});
+
+			// then
+			expect(outageProbeOutput).toBe("");
+			expect(retriedProbeOutput).toBe("");
+			expect(calls).toBe(3);
+		});
+	});
+
 	it("#given markdown LSP is cached unavailable #when TypeScript diagnostics run #then real diagnostics still block", async () => {
 		// given
 		const pluginData = tempPluginData();

package/packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts

@@ -70,7 +70,7 @@ describe("plugin package metadata", () => {
 		expect(packageJson.type).toBe("module");
 		expect(packageJson.packageManager).toBe("npm@11.12.1");
 		expect(packageJson.dependencies).toEqual({
-			"@code-yeongyu/lsp-tools-mcp": "file:../../../../lsp-tools-mcp",
+			"@code-yeongyu/lsp-daemon": "file:../../../../lsp-daemon",
 		});
 		expect(packageJson.bin["omo-lsp"]).toBe("./dist/cli.js");
 		expect(packageJson.bin["codex-lsp"]).toBeUndefined();
@@ -80,29 +80,17 @@ describe("plugin package metadata", () => {
 		expect(postToolUseCommand).toBe(`node "${pluginRoot}/dist/cli.js" hook post-tool-use`);
 		expect(postCompactCommand).toBe(`node "${pluginRoot}/dist/cli.js" hook post-compact`);
 		expect(lspServer?.command).toBe("node");
-		expect(lspServer?.args).toEqual(["../../../../lsp-tools-mcp/dist/cli.js", "mcp"]);
+		expect(lspServer?.args).toEqual(["../../../../lsp-daemon/dist/cli.js", "mcp"]);
 		expect(cliSource).not.toContain("./lazy-lsp-mcp.js");
-		expect(cliSource).toContain("@code-yeongyu/lsp-tools-mcp/dist/cli.js");
-		expect(cliSource).not.toContain("../../../../../lsp-tools-mcp/dist/cli.js");
-		expect(codexHookCliSource).toContain("@code-yeongyu/lsp-tools-mcp/dist/lsp/manager.js");
-		expect(codexHookSource).toContain("@code-yeongyu/lsp-tools-mcp/dist/tools.js");
-		expect(codexHookCliSource).not.toContain("../../../../../lsp-tools-mcp/dist/lsp/manager.js");
-		expect(codexHookSource).not.toContain("../../../../../lsp-tools-mcp/dist/tools.js");
+		expect(cliSource).toContain("@code-yeongyu/lsp-daemon/dist/cli.js");
+		expect(cliSource).not.toContain("../../../../../lsp-daemon/dist/cli.js");
+		expect(codexHookCliSource).toContain("@code-yeongyu/lsp-daemon");
+		expect(codexHookSource).toContain("@code-yeongyu/lsp-daemon");
+		expect(codexHookCliSource).not.toContain("../../../../../lsp-daemon");
+		expect(codexHookSource).not.toContain("../../../../../lsp-daemon");
 		expect(sourceFiles.filter((name) => name.startsWith("lazy-mcp") || name === "lazy-lsp-mcp.ts")).toEqual([]);
 	});
 
-	it("#given LSP skill guidance #when validating MCP tool instructions #then tool names are not framed as shell commands", () => {
-		// given
-		const skill = readFileSync("skills/lsp/SKILL.md", "utf8");
-
-		// when
-		const mentionsToolInterface = skill.includes("through the tool interface");
-		const rejectsShellExecution = skill.includes("not shell commands");
-
-		// then
-		expect(mentionsToolInterface).toBe(true);
-		expect(rejectsShellExecution).toBe(true);
-	});
 });
 
 function isPackageJson(value: unknown): value is PackageJson {