luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(omo-codex): embed ast-grep MCP for Codex

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-05-28 15:26:18 +09:00
parent 091550b94d
commit 4f75a56ce5
8 changed files with 220 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/omo-codex/plugin/.mcp.json
+6 -1
View File
@@ -1,8 +1,13 @@
{
"mcpServers": {
"ast_grep": {
"command": "node",
"args": ["../../ast-grep-mcp/dist/cli.js", "mcp"],
"cwd": "."
},
"lsp": {
"command": "node",
"args": ["./components/lsp/packages/lsp-tools-mcp/dist/cli.js", "mcp"],
"args": ["../../lsp-tools-mcp/dist/cli.js", "mcp"],
"cwd": "."
}
}
packages/omo-codex/plugin/package.json
+1 -2
View File
@@ -9,13 +9,12 @@
"components/comment-checker",
"components/rules",
"components/lsp",
"components/lsp/packages/lsp-tools-mcp",
"components/telemetry",
"components/ultragoal",
"components/ultrawork"
],
"scripts": {
"build": "node scripts/sync-skills.mjs && node ../scripts/sync-telemetry-component.mjs && npm run build --workspaces --if-present",
"build": "bun run --cwd ../../ast-grep-mcp build && node scripts/sync-skills.mjs && node ../scripts/sync-telemetry-component.mjs && npm run build --workspaces --if-present",
"check": "npm run build && npm test",
"sync:skills": "node scripts/sync-skills.mjs",
"test": "node --test test/*.test.mjs"
packages/omo-codex/plugin/test/aggregate.test.mjs
+21 -6
View File
@@ -71,17 +71,29 @@ test("#given aggregate OMO plugin is enabled #when hooks are inspected #then ult
assert.deepEqual(preToolUseGroups.map((group) => group.matcher), ["^create_goal$"]);
});
test("#given aggregate MCP config #when inspected #then lsp server stays component isolated", async () => {
test("#given aggregate MCP config #when inspected #then code MCP servers reuse root MCP packages", async () => {
// given
const packageJson = await readJson("package.json");
const mcp = await readJson(".mcp.json");
// when
const server = mcp.mcpServers.lsp;
const lspServer = mcp.mcpServers.lsp;
const astGrepServer = mcp.mcpServers.ast_grep;
const codeMcpNames = Object.keys(mcp.mcpServers)
.filter((name) => name === "lsp" || name === "ast_grep")
.sort();
// then
assert.equal(server.command, "node");
assert.deepEqual(server.args, ["./components/lsp/packages/lsp-tools-mcp/dist/cli.js", "mcp"]);
assert.equal(server.cwd, ".");
assert.deepEqual(codeMcpNames, ["ast_grep", "lsp"]);
assert.equal(packageJson.workspaces.includes("components/lsp/packages/lsp-tools-mcp"), false);
assert.equal(packageJson.workspaces.includes("components/ast-grep/packages/ast-grep-mcp"), false);
assert.match(packageJson.scripts.build, /ast-grep-mcp/);
assert.equal(lspServer.command, "node");
assert.deepEqual(lspServer.args, ["../../lsp-tools-mcp/dist/cli.js", "mcp"]);
assert.equal(lspServer.cwd, ".");
assert.equal(astGrepServer.command, "node");
assert.deepEqual(astGrepServer.args, ["../../ast-grep-mcp/dist/cli.js", "mcp"]);
assert.equal(astGrepServer.cwd, ".");
});
test("#given aggregate plugin build script #when inspected #then telemetry sync runs before workspace builds", async () => {
@@ -93,7 +105,10 @@ test("#given aggregate plugin build script #when inspected #then telemetry sync
const buildScript = packageJson.scripts.build;
// then
assert.equal(buildScript, "node scripts/sync-skills.mjs && node ../scripts/sync-telemetry-component.mjs && npm run build --workspaces --if-present");
assert.equal(
buildScript,
"bun run --cwd ../../ast-grep-mcp build && node scripts/sync-skills.mjs && node ../scripts/sync-telemetry-component.mjs && npm run build --workspaces --if-present",
);
assert.match(telemetrySyncScript, /syncTelemetryComponent/);
});
packages/omo-codex/scripts/install/cache.mjs
+57 -4
View File
@@ -1,4 +1,4 @@
import { basename, dirname, join, sep } from "node:path";
import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
import { cp, lstat, mkdir, readFile, readdir, readlink, rename, rm, symlink, writeFile } from "node:fs/promises";
import { exists, isRecord } from "./utils.mjs";
@@ -11,8 +11,9 @@ export async function installCachedPlugin({ codexHome, marketplaceName, name, ru
const targetPath = join(codexHome, "plugins", "cache", marketplaceName, name, version);
await replaceDirectory(sourcePath, targetPath, shouldCopyPluginPath);
await rewriteCachedPackageLocalFileDependencies(targetPath, sourcePath);
await maybeRunNpmInstall(targetPath, runCommand, ["install", "--omit=dev"]);
await rewriteCachedMcpManifest(targetPath);
await rewriteCachedMcpManifest(targetPath, sourcePath);
return { name, version, path: targetPath };
}
@@ -157,7 +158,7 @@ function shouldCopyPluginPath(path, root) {
return !parts.some((part) => part === ".git" || part === "node_modules");
}
async function rewriteCachedMcpManifest(pluginRoot) {
async function rewriteCachedMcpManifest(pluginRoot, sourceRoot = pluginRoot) {
const manifestPath = join(pluginRoot, ".mcp.json");
if (!(await exists(manifestPath))) return;
const raw = await readFile(manifestPath, "utf8");
@@ -173,7 +174,7 @@ async function rewriteCachedMcpManifest(pluginRoot) {
if (!Array.isArray(server.args)) continue;
const nextArgs = server.args.map((arg) => {
if (typeof arg !== "string") return arg;
if (arg.startsWith("./") || arg.startsWith("../")) return join(pluginRoot, arg);
if (arg.startsWith("./") || arg.startsWith("../")) return resolveCachedRuntimePath(pluginRoot, sourceRoot, arg);
return arg;
});
if (nextArgs.some((value, index) => value !== server.args[index])) {
@@ -183,3 +184,55 @@ async function rewriteCachedMcpManifest(pluginRoot) {
}
if (changed) await writeFile(manifestPath, `${JSON.stringify(parsed, null, "\t")}\n`);
}
async function rewriteCachedPackageLocalFileDependencies(pluginRoot, sourceRoot) {
const packageJsonPaths = [];
await collectPackageJsonPaths(pluginRoot, pluginRoot, packageJsonPaths);
for (const packageJsonPath of packageJsonPaths) {
const raw = await readFile(packageJsonPath, "utf8");
const parsed = JSON.parse(raw);
if (!isRecord(parsed)) continue;
const packageDir = dirname(packageJsonPath);
const sourcePackageDir = join(sourceRoot, relative(pluginRoot, packageDir));
let changed = false;
for (const field of ["dependencies", "optionalDependencies", "peerDependencies"]) {
const dependencies = parsed[field];
if (!isRecord(dependencies)) continue;
for (const [name, specifier] of Object.entries(dependencies)) {
if (typeof specifier !== "string" || !specifier.startsWith("file:")) continue;
const filePath = specifier.slice("file:".length);
if (filePath.length === 0 || isAbsolute(filePath)) continue;
const targetPath = resolve(packageDir, filePath);
if (isPathInside(targetPath, pluginRoot)) continue;
dependencies[name] = `file:${resolve(sourcePackageDir, filePath)}`;
changed = true;
}
}
if (changed) await writeFile(packageJsonPath, `${JSON.stringify(parsed, null, "\t")}\n`);
}
}
async function collectPackageJsonPaths(directory, root, paths) {
const entries = await readdir(directory, { withFileTypes: true });
if (entries.some((entry) => entry.isFile() && entry.name === "package.json")) {
paths.push(join(directory, "package.json"));
}
for (const entry of entries) {
if (!entry.isDirectory()) continue;
if (entry.name === "node_modules" || entry.name === ".git" || entry.name === "dist") continue;
const childPath = join(directory, entry.name);
if (!childPath.startsWith(root)) continue;
await collectPackageJsonPaths(childPath, root, paths);
}
}
function resolveCachedRuntimePath(pluginRoot, sourceRoot, runtimePath) {
const targetPath = resolve(pluginRoot, runtimePath);
if (isPathInside(targetPath, pluginRoot)) return targetPath;
return resolve(sourceRoot, runtimePath);
}
function isPathInside(candidatePath, rootPath) {
const pathFromRoot = relative(rootPath, candidatePath);
return pathFromRoot === "" || (!pathFromRoot.startsWith("..") && !isAbsolute(pathFromRoot));
}