smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mcp] Revert plugin env expansion

Browse Source 
Keep host-specific secret injection in the maintained plugin layer instead
of carrying a behavioral divergence in the OMP fork.

Solves: Unwanted fork maintenance for MCP injection
Tests: Reverts only drycode/oh-my-pi PR #1
This commit is contained in:
Daniel Young
2026-08-18 08:50:06 -04:00
parent a52c2fc2fb
commit 1496a139ce
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/src/discovery/claude-plugins.ts
+1 -3
View File
@@ -580,9 +580,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
...(raw.timeout !== undefined && { timeout: raw.timeout }),
...(rooted.command !== undefined && { command: rooted.command }),
...(raw.args !== undefined && { args: substitutePluginRoot(raw.args, root.path) }),
...(raw.env !== undefined && {
env: expandEnvVarsDeep(substitutePluginRoot(raw.env, root.path)),
}),
...(raw.env !== undefined && { env: substitutePluginRoot(raw.env, root.path) }),
...(rooted.cwd !== undefined && { cwd: rooted.cwd }),
...(raw.url !== undefined && { url: expandEnvVarsDeep(raw.url) }),
...(raw.headers !== undefined && { headers: expandEnvVarsDeep(raw.headers) }),
packages/coding-agent/test/discovery/claude-plugins.test.ts
+1 -15
View File
@@ -527,7 +527,7 @@ describe("listClaudePluginRoots", () => {
);
});
test("expands env placeholders throughout marketplace plugin MCP configuration", async () => {
test("expands env placeholders in marketplace plugin MCP url and headers", async () => {
const pluginsDir = path.join(tempDir, ".claude", "plugins");
const pluginPath = path.join(tempDir, "plugins", "context7");
const originalApiKey = process.env.OMP_PLUGIN_MCP_API_KEY;
@@ -566,14 +566,6 @@ describe("listClaudePluginRoots", () => {
CONTEXT7_API_KEY: envPlaceholder("OMP_PLUGIN_MCP_API_KEY"),
},
},
local: {
type: "stdio",
command: "${CLAUDE_PLUGIN_ROOT}/bin/server",
env: {
API_KEY: envPlaceholder("OMP_PLUGIN_MCP_API_KEY"),
CONFIG_PATH: "${CLAUDE_PLUGIN_ROOT}/config.json",
},
},
}),
);
@@ -585,12 +577,6 @@ describe("listClaudePluginRoots", () => {
expect(server?.url).toBe("https://mcp.context7.example/mcp");
expect(server?.headers).toEqual({ CONTEXT7_API_KEY: "ctx7sk-test-key" });
const localServer = result.all.find(item => item.name === "context7:local");
expect(localServer?.command).toBe(path.join(pluginPath, "bin", "server"));
expect(localServer?.env).toEqual({
API_KEY: "ctx7sk-test-key",
CONFIG_PATH: path.join(pluginPath, "config.json"),
});
} finally {
if (originalApiKey === undefined) delete process.env.OMP_PLUGIN_MCP_API_KEY;
else process.env.OMP_PLUGIN_MCP_API_KEY = originalApiKey;