roboomp
e88c45f063
resolvePluginStdioPaths resolved a path-like command against the config directory unconditionally, but the stdio transport spawns the subprocess with the rooted cwd as its process cwd, so the OS resolves a relative command from there. For cwd="server", command="./bin/mcp" that meant OMP looked for <configDir>/bin/mcp instead of <configDir>/server/bin/mcp. Root cwd first, then resolve path-like commands from that rooted cwd, falling back to configDir only when no cwd is set. Fixes #5561
97 lines
3.6 KiB
TypeScript
97 lines
3.6 KiB
TypeScript
/**
|
|
* Regression tests for #5561.
|
|
*
|
|
* The Codex `config.toml` MCP importer in `packages/coding-agent/src/discovery/codex.ts`
|
|
* used to copy only `command`/`args`/`url` into the returned `MCPServer`, dropping
|
|
* `cwd` and leaving relative `command` values verbatim. MCP stdio spawning then
|
|
* resolved those relative values against the OMP session cwd, so the bundled Codex
|
|
* Computer Use server (a relative `command` with `cwd = "."`) failed with ENOENT.
|
|
*
|
|
* The importer now roots relative `command`/`cwd` at the config directory via
|
|
* `resolvePluginStdioPaths`, matching the claude-plugins/omp-plugins fix in #5481.
|
|
*/
|
|
import { afterEach, beforeEach, expect, test, vi } from "bun:test";
|
|
import * as fs from "node:fs/promises";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import type { MCPServer } from "@oh-my-pi/pi-coding-agent/capability/mcp";
|
|
import { mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
|
|
import { loadCapability } from "@oh-my-pi/pi-coding-agent/discovery";
|
|
import { removeWithRetries } from "@oh-my-pi/pi-utils";
|
|
|
|
let tempHome = "";
|
|
let tempCwd = "";
|
|
let originalHome: string | undefined;
|
|
|
|
beforeEach(async () => {
|
|
originalHome = process.env.HOME;
|
|
tempHome = await fs.mkdtemp(path.join(os.tmpdir(), "omp-codex-mcp-home-"));
|
|
tempCwd = await fs.mkdtemp(path.join(os.tmpdir(), "omp-codex-mcp-cwd-"));
|
|
process.env.HOME = tempHome;
|
|
vi.spyOn(os, "homedir").mockReturnValue(tempHome);
|
|
await fs.mkdir(path.join(tempHome, ".codex"), { recursive: true });
|
|
});
|
|
|
|
afterEach(async () => {
|
|
vi.restoreAllMocks();
|
|
if (originalHome === undefined) delete process.env.HOME;
|
|
else process.env.HOME = originalHome;
|
|
await removeWithRetries(tempHome);
|
|
await removeWithRetries(tempCwd);
|
|
});
|
|
|
|
async function loadCodexServers(): Promise<MCPServer[]> {
|
|
const result = await loadCapability<MCPServer>(mcpCapability.id, {
|
|
cwd: tempCwd,
|
|
providers: ["codex"],
|
|
});
|
|
return result.items;
|
|
}
|
|
|
|
test("relative path-like command and cwd resolve against the Codex config directory (#5561)", async () => {
|
|
const codexDir = path.join(tempHome, ".codex");
|
|
await fs.writeFile(
|
|
path.join(codexDir, "config.toml"),
|
|
[
|
|
"[mcp_servers.computer-use]",
|
|
'command = "./bin/SkyComputerUseClient"',
|
|
'args = ["mcp"]',
|
|
'cwd = "."',
|
|
"",
|
|
"[mcp_servers.bare]",
|
|
'command = "npx"',
|
|
'args = ["-y", "@some/mcp"]',
|
|
"",
|
|
].join("\n"),
|
|
);
|
|
|
|
const servers = await loadCodexServers();
|
|
const cu = servers.find(s => s.name === "computer-use");
|
|
const bare = servers.find(s => s.name === "bare");
|
|
|
|
// Path-like command and "." cwd rebase onto the config directory (~/.codex),
|
|
// not the session cwd. Bare executables are left untouched.
|
|
expect(cu?.command).toBe(path.join(codexDir, "bin", "SkyComputerUseClient"));
|
|
expect(cu?.cwd).toBe(codexDir);
|
|
expect(cu?.args).toEqual(["mcp"]);
|
|
expect(bare?.command).toBe("npx");
|
|
expect(bare?.cwd).toBeUndefined();
|
|
});
|
|
|
|
test("path-like command resolves against a subdirectory cwd, not the config directory (#5562 review)", async () => {
|
|
const codexDir = path.join(tempHome, ".codex");
|
|
await fs.writeFile(
|
|
path.join(codexDir, "config.toml"),
|
|
["[mcp_servers.nested]", 'command = "./bin/mcp"', 'args = ["serve"]', 'cwd = "server"', ""].join("\n"),
|
|
);
|
|
|
|
const servers = await loadCodexServers();
|
|
const nested = servers.find(s => s.name === "nested");
|
|
|
|
// The transport spawns the subprocess with the rooted cwd; a relative command
|
|
// is resolved by the OS from there. cwd="server" + command="./bin/mcp" must
|
|
// resolve to <codexDir>/server/bin/mcp, not <codexDir>/bin/mcp.
|
|
expect(nested?.cwd).toBe(path.join(codexDir, "server"));
|
|
expect(nested?.command).toBe(path.join(codexDir, "server", "bin", "mcp"));
|
|
});
|