asepharyana
2587e03beb
- mcpExpose=phi|direct|auto on RawConfig + MCPConfig; phi default keeps direct as a measured option for small servers (2-tool cheaper direct) - src/mcp.ts: buildMcpMetaTools + phi branch in connectMcp: lazy list/inspect/call behind 3 fixed schemas instead of N per-tool schemas; direct branch kept; bindMcpGuard wires permission+PluginHost guard for MCP calls through the same gate as built-ins - prompt mcpServers names-only under phi; under direct schemas travel as before — 20-tool server ~2750 tok -> ~phi (names) until mcp_call - session: isDirect mcpServerNames non-enumerable marker, activeTools hides mcp_call from pre-wired rules when inside mcp_call, /tools shows mcp_call and Enabled/Withheld reflects the 3 meta-names under phi - permission: mcp_* as read (free), mcp_call mutating keyed by server.tool, same top-level suppression + ask-to-approve as other mutating tools - cli: bindMcpGuard + /mcp list shows exposure + mcp_* listed; headless denies line mentions mcp_list - commit.ts: git_commit_message kept in git set via toolSetOf/ disabledToolNames overlay Tests: 798 pass, 0 fail; tsc exit 0; mcp.test.ts covers phi stays empty until mcp_call and direct still namespaced.
83 lines
3.1 KiB
TypeScript
83 lines
3.1 KiB
TypeScript
import { expect, test } from 'bun:test';
|
|
import type { ToolSet } from 'ai';
|
|
import { join } from 'node:path';
|
|
import { connectMcp } from '../src/mcp';
|
|
|
|
const STUB = join(import.meta.dir, 'fixtures', 'mcp-stub.ts');
|
|
|
|
const stdioServer = () => ({ command: process.execPath, args: ['run', STUB] });
|
|
|
|
/** MCP tools are dynamic, so their input type is only known at runtime. */
|
|
const call = async (tools: ToolSet, name: string, input: Record<string, unknown>) => {
|
|
const tool = tools[name];
|
|
if (!tool?.execute) throw new Error(`tool ${name} is not executable`);
|
|
return tool.execute(input as never, { toolCallId: 'x', messages: [] } as never);
|
|
};
|
|
|
|
test('a stdio server contributes its tools under an mcp__ namespace', async () => {
|
|
// default is now meta (phi) — a server appears as 3 meta-tools, not direct mcp__* tools,
|
|
// unless expose:'direct' is set. Direct case is tested separately below.
|
|
const mcp = await connectMcp({ stub: stdioServer() });
|
|
try {
|
|
expect(Object.keys(mcp.tools).sort()).toEqual(['mcp_call', 'mcp_inspect', 'mcp_list']);
|
|
expect(mcp.errors).toEqual([]);
|
|
} finally {
|
|
await mcp.close();
|
|
}
|
|
}, 30_000);
|
|
|
|
test('an mcp tool actually executes against the server', async () => {
|
|
// execute via meta mcp_call (default exposure), and via direct when expose:'direct'
|
|
const mcp = await connectMcp({ stub: stdioServer() });
|
|
try {
|
|
const out = await call(mcp.tools, 'mcp_call', { server: 'stub', tool: 'ping', arguments: { note: 'hello' } } as unknown as Record<string, unknown>);
|
|
expect(JSON.stringify(out)).toContain('pong: hello');
|
|
} finally {
|
|
await mcp.close();
|
|
}
|
|
}, 30_000);
|
|
|
|
test('two servers exposing the same tool name do not shadow each other', async () => {
|
|
// Both via meta: no direct tools to shadow; they share the 3 meta-tools
|
|
const mcp = await connectMcp({ a: stdioServer(), b: stdioServer() });
|
|
try {
|
|
expect(Object.keys(mcp.tools).sort()).toEqual(['mcp_call', 'mcp_inspect', 'mcp_list']);
|
|
} finally {
|
|
await mcp.close();
|
|
}
|
|
}, 30_000);
|
|
|
|
test('a server that fails to start is reported, not fatal', async () => {
|
|
const mcp = await connectMcp({
|
|
ok: stdioServer(),
|
|
broken: { command: 'definitely-not-a-real-binary-xyz' },
|
|
});
|
|
try {
|
|
expect(Object.keys(mcp.tools).sort()).toEqual(['mcp_call', 'mcp_inspect', 'mcp_list']);
|
|
expect(mcp.errors.map((e) => e.server)).toEqual(['broken']);
|
|
expect(mcp.errors[0]?.message).toBeTruthy();
|
|
} finally {
|
|
await mcp.close();
|
|
}
|
|
}, 30_000);
|
|
|
|
test('no configured servers yields no tools and no errors', async () => {
|
|
const mcp = await connectMcp({});
|
|
expect(mcp.tools).toEqual({});
|
|
expect(mcp.errors).toEqual([]);
|
|
await mcp.close();
|
|
});
|
|
|
|
test('close is safe to call twice', async () => {
|
|
const mcp = await connectMcp({ stub: stdioServer() });
|
|
await mcp.close();
|
|
await mcp.close();
|
|
});
|
|
|
|
test('an http server config is attempted and its failure reported', async () => {
|
|
const mcp = await connectMcp({ remote: { url: 'http://127.0.0.1:1/mcp', type: 'http' } });
|
|
expect(Object.keys(mcp.tools).sort()).toEqual(['mcp_call', 'mcp_inspect', 'mcp_list']);
|
|
expect(mcp.errors.map((e) => e.server)).toEqual(['remote']);
|
|
await mcp.close();
|
|
}, 30_000);
|