Some checks failed
CI/CD / lint (pull_request) Successful in 1m12s
CI/CD / test (pull_request) Successful in 1m26s
CI/CD / typecheck (pull_request) Successful in 3m22s
CI/CD / smoke (pull_request) Failing after 1m57s
CI/CD / build (pull_request) Successful in 5m15s
CI/CD / publish (pull_request) Has been skipped
New seed-once system project `ungated-global`: every server attached to it is merged into every project's MCP endpoint in front of the gate (listed and callable before begin_session), and its project prompt is prepended to every project's instructions. - mcpd: bootstrapUngatedGlobal seeds the project once-ever (marker key `ungatedGlobalSeeded` in mcpctl-system-settings), with default server `calcmcp` (patched CalcMCP fork, mysources.co.uk/michal/calcmcp:1.1.0) and a "never do math yourself, always use calcmcp" prompt. Deletions are durable: `mcpctl delete server calcmcp -p ungated-global` stays deleted. - mcpd: GET /projects/:id/servers appends global servers flagged `ungatedGlobal: true` (direct attachment wins, no self-merge); GET /projects/:id/instructions prepends the global prompt and lists the global servers. - mcplocal: discovery surfaces the flagged names; the gate plugin exempts them — gated tools/list returns begin_session + exempt tools, calls to them pass through without ungating, and initialize instructions list them under "Available immediately (no begin_session required)". - templates/calcmcp.yaml so a deleted default can be re-created by hand. - docs/ungated-global.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
423 lines
16 KiB
TypeScript
423 lines
16 KiB
TypeScript
import { describe, it, expect, vi, afterEach } from 'vitest';
|
|
import Fastify from 'fastify';
|
|
import type { FastifyInstance } from 'fastify';
|
|
import { registerProjectRoutes } from '../src/routes/projects.js';
|
|
import { ProjectService } from '../src/services/project.service.js';
|
|
import { errorHandler } from '../src/middleware/error-handler.js';
|
|
import type { IProjectRepository, ProjectWithRelations } from '../src/repositories/project.repository.js';
|
|
import type { IMcpServerRepository } from '../src/repositories/interfaces.js';
|
|
|
|
let app: FastifyInstance;
|
|
|
|
function makeProject(overrides: Partial<ProjectWithRelations> = {}): ProjectWithRelations {
|
|
return {
|
|
id: 'proj-1',
|
|
name: 'test-project',
|
|
description: '',
|
|
ownerId: 'user-1',
|
|
prompt: '',
|
|
proxyModel: '',
|
|
gated: true,
|
|
llmProvider: null,
|
|
llmModel: null,
|
|
serverOverrides: null,
|
|
version: 1,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
servers: [],
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function mockProjectRepo(): IProjectRepository {
|
|
return {
|
|
findAll: vi.fn(async () => []),
|
|
findById: vi.fn(async () => null),
|
|
findByName: vi.fn(async () => null),
|
|
create: vi.fn(async (data) => makeProject({
|
|
name: data.name,
|
|
description: data.description,
|
|
ownerId: data.ownerId,
|
|
})),
|
|
update: vi.fn(async (_id, data) => makeProject({ ...data as Partial<ProjectWithRelations> })),
|
|
delete: vi.fn(async () => {}),
|
|
setServers: vi.fn(async () => {}),
|
|
addServer: vi.fn(async () => {}),
|
|
removeServer: vi.fn(async () => {}),
|
|
};
|
|
}
|
|
|
|
function mockServerRepo(): IMcpServerRepository {
|
|
return {
|
|
findAll: vi.fn(async () => []),
|
|
findById: vi.fn(async () => null),
|
|
findByName: vi.fn(async () => null),
|
|
create: vi.fn(async () => ({} as never)),
|
|
update: vi.fn(async () => ({} as never)),
|
|
delete: vi.fn(async () => {}),
|
|
};
|
|
}
|
|
|
|
afterEach(async () => {
|
|
if (app) await app.close();
|
|
});
|
|
|
|
function createApp(projectRepo: IProjectRepository, serverRepo?: IMcpServerRepository) {
|
|
app = Fastify({ logger: false });
|
|
app.setErrorHandler(errorHandler);
|
|
const service = new ProjectService(projectRepo, serverRepo ?? mockServerRepo());
|
|
registerProjectRoutes(app, service);
|
|
return app.ready();
|
|
}
|
|
|
|
describe('Project Routes', () => {
|
|
describe('GET /api/v1/projects', () => {
|
|
it('returns project list', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findAll).mockResolvedValue([
|
|
makeProject({ id: 'p1', name: 'alpha', ownerId: 'user-1' }),
|
|
makeProject({ id: 'p2', name: 'beta', ownerId: 'user-2' }),
|
|
]);
|
|
await createApp(repo);
|
|
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects' });
|
|
expect(res.statusCode).toBe(200);
|
|
const body = res.json<Array<{ name: string }>>();
|
|
expect(body).toHaveLength(2);
|
|
});
|
|
|
|
it('lists all projects without ownerId filtering', async () => {
|
|
// This is the bug fix: the route must call list() without ownerId
|
|
// so that RBAC (preSerialization) handles access filtering, not the DB query.
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findAll).mockResolvedValue([makeProject()]);
|
|
await createApp(repo);
|
|
|
|
await app.inject({ method: 'GET', url: '/api/v1/projects' });
|
|
// findAll must be called with NO arguments (undefined ownerId)
|
|
expect(repo.findAll).toHaveBeenCalledWith(undefined);
|
|
});
|
|
});
|
|
|
|
describe('GET /api/v1/projects/:id', () => {
|
|
it('returns 404 when not found', async () => {
|
|
const repo = mockProjectRepo();
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/missing' });
|
|
expect(res.statusCode).toBe(404);
|
|
});
|
|
|
|
it('returns project when found by ID', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ id: 'p1', name: 'my-proj' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p1' });
|
|
expect(res.statusCode).toBe(200);
|
|
expect(res.json<{ name: string }>().name).toBe('my-proj');
|
|
});
|
|
|
|
it('resolves by name when ID not found', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findByName).mockResolvedValue(makeProject({ name: 'my-proj' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/my-proj' });
|
|
expect(res.statusCode).toBe(200);
|
|
expect(res.json<{ name: string }>().name).toBe('my-proj');
|
|
});
|
|
});
|
|
|
|
describe('POST /api/v1/projects', () => {
|
|
it('creates a project and returns 201', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ name: 'new-proj' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects',
|
|
payload: { name: 'new-proj' },
|
|
});
|
|
expect(res.statusCode).toBe(201);
|
|
});
|
|
|
|
it('creates a project with proxyModel', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ name: 'pm-proj', proxyModel: 'subindex' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects',
|
|
payload: { name: 'pm-proj', proxyModel: 'subindex' },
|
|
});
|
|
expect(res.statusCode).toBe(201);
|
|
expect(repo.create).toHaveBeenCalledWith(
|
|
expect.objectContaining({ proxyModel: 'subindex' }),
|
|
);
|
|
});
|
|
|
|
it('returns 400 for invalid input', async () => {
|
|
const repo = mockProjectRepo();
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects',
|
|
payload: { name: '' },
|
|
});
|
|
expect(res.statusCode).toBe(400);
|
|
});
|
|
|
|
it('returns 409 when name already exists', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findByName).mockResolvedValue(makeProject());
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects',
|
|
payload: { name: 'taken' },
|
|
});
|
|
expect(res.statusCode).toBe(409);
|
|
});
|
|
});
|
|
|
|
describe('PUT /api/v1/projects/:id', () => {
|
|
it('updates a project', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'PUT',
|
|
url: '/api/v1/projects/p1',
|
|
payload: { description: 'Updated' },
|
|
});
|
|
expect(res.statusCode).toBe(200);
|
|
});
|
|
|
|
it('updates proxyModel on a project', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'PUT',
|
|
url: '/api/v1/projects/p1',
|
|
payload: { proxyModel: 'subindex' },
|
|
});
|
|
expect(res.statusCode).toBe(200);
|
|
expect(repo.update).toHaveBeenCalledWith('p1', expect.objectContaining({ proxyModel: 'subindex' }));
|
|
});
|
|
|
|
it('returns 404 when not found', async () => {
|
|
const repo = mockProjectRepo();
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'PUT',
|
|
url: '/api/v1/projects/missing',
|
|
payload: { description: 'x' },
|
|
});
|
|
expect(res.statusCode).toBe(404);
|
|
});
|
|
});
|
|
|
|
describe('DELETE /api/v1/projects/:id', () => {
|
|
it('deletes a project and returns 204', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'DELETE', url: '/api/v1/projects/p1' });
|
|
expect(res.statusCode).toBe(204);
|
|
});
|
|
|
|
it('returns 404 when not found', async () => {
|
|
const repo = mockProjectRepo();
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'DELETE', url: '/api/v1/projects/missing' });
|
|
expect(res.statusCode).toBe(404);
|
|
});
|
|
});
|
|
|
|
describe('POST /api/v1/projects/:id/servers (attach)', () => {
|
|
it('attaches a server to a project', async () => {
|
|
const projectRepo = mockProjectRepo();
|
|
const serverRepo = mockServerRepo();
|
|
vi.mocked(projectRepo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
vi.mocked(serverRepo.findByName).mockResolvedValue({ id: 'srv-1', name: 'my-ha' } as never);
|
|
await createApp(projectRepo, serverRepo);
|
|
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects/p1/servers',
|
|
payload: { server: 'my-ha' },
|
|
});
|
|
expect(res.statusCode).toBe(200);
|
|
expect(projectRepo.addServer).toHaveBeenCalledWith('p1', 'srv-1');
|
|
});
|
|
|
|
it('returns 400 when server field is missing', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(repo);
|
|
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects/p1/servers',
|
|
payload: {},
|
|
});
|
|
expect(res.statusCode).toBe(400);
|
|
});
|
|
|
|
it('returns 404 when server not found', async () => {
|
|
const projectRepo = mockProjectRepo();
|
|
vi.mocked(projectRepo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(projectRepo);
|
|
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects/p1/servers',
|
|
payload: { server: 'nonexistent' },
|
|
});
|
|
expect(res.statusCode).toBe(404);
|
|
});
|
|
});
|
|
|
|
describe('DELETE /api/v1/projects/:id/servers/:serverName (detach)', () => {
|
|
it('detaches a server from a project', async () => {
|
|
const projectRepo = mockProjectRepo();
|
|
const serverRepo = mockServerRepo();
|
|
vi.mocked(projectRepo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
vi.mocked(serverRepo.findByName).mockResolvedValue({ id: 'srv-1', name: 'my-ha' } as never);
|
|
await createApp(projectRepo, serverRepo);
|
|
|
|
const res = await app.inject({ method: 'DELETE', url: '/api/v1/projects/p1/servers/my-ha' });
|
|
expect(res.statusCode).toBe(204);
|
|
expect(projectRepo.removeServer).toHaveBeenCalledWith('p1', 'srv-1');
|
|
});
|
|
|
|
it('returns 404 when server not found', async () => {
|
|
const projectRepo = mockProjectRepo();
|
|
vi.mocked(projectRepo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(projectRepo);
|
|
|
|
const res = await app.inject({ method: 'DELETE', url: '/api/v1/projects/p1/servers/nonexistent' });
|
|
expect(res.statusCode).toBe(404);
|
|
});
|
|
});
|
|
|
|
describe('serverOverrides', () => {
|
|
it('accepts serverOverrides in project create', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(
|
|
makeProject({ name: 'override-proj', serverOverrides: { ha: { proxyModel: 'ha-special' } } }),
|
|
);
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'POST',
|
|
url: '/api/v1/projects',
|
|
payload: { name: 'override-proj', serverOverrides: { ha: { proxyModel: 'ha-special' } } },
|
|
});
|
|
expect(res.statusCode).toBe(201);
|
|
expect(repo.create).toHaveBeenCalledWith(
|
|
expect.objectContaining({ serverOverrides: { ha: { proxyModel: 'ha-special' } } }),
|
|
);
|
|
});
|
|
|
|
it('accepts serverOverrides in project update', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(makeProject({ id: 'p1' }));
|
|
await createApp(repo);
|
|
const res = await app.inject({
|
|
method: 'PUT',
|
|
url: '/api/v1/projects/p1',
|
|
payload: { serverOverrides: { ha: { proxyModel: 'ha-special' } } },
|
|
});
|
|
expect(res.statusCode).toBe(200);
|
|
expect(repo.update).toHaveBeenCalledWith('p1', expect.objectContaining({
|
|
serverOverrides: { ha: { proxyModel: 'ha-special' } },
|
|
}));
|
|
});
|
|
|
|
it('returns serverOverrides in project GET', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockResolvedValue(
|
|
makeProject({ id: 'p1', name: 'ha-proj', serverOverrides: { ha: { proxyModel: 'ha-special' } } }),
|
|
);
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p1' });
|
|
expect(res.statusCode).toBe(200);
|
|
const body = res.json<{ serverOverrides: unknown }>();
|
|
expect(body.serverOverrides).toEqual({ ha: { proxyModel: 'ha-special' } });
|
|
});
|
|
});
|
|
|
|
describe('ungated-global merge', () => {
|
|
const mkPs = (id: string, name: string, description = '') =>
|
|
({ id: `ps-${id}`, projectId: 'x', serverId: id, createdAt: new Date(), server: { id, name, description } }) as never;
|
|
|
|
function repoWithGlobal(ownServers: never[] = []) {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockImplementation(async (id: string) =>
|
|
id === 'p1' ? makeProject({ id: 'p1', name: 'my-proj', prompt: 'own prompt', servers: ownServers }) : null);
|
|
vi.mocked(repo.findByName).mockImplementation(async (name: string) => {
|
|
if (name === 'ungated-global') {
|
|
return makeProject({
|
|
id: 'p-ug',
|
|
name: 'ungated-global',
|
|
prompt: 'Always use calcmcp for math.',
|
|
gated: false,
|
|
servers: [mkPs('srv-calc', 'calcmcp', 'scientific calculator')],
|
|
});
|
|
}
|
|
return null;
|
|
});
|
|
return repo;
|
|
}
|
|
|
|
it('GET /servers appends global servers flagged ungatedGlobal', async () => {
|
|
await createApp(repoWithGlobal([mkPs('srv-ha', 'ha')]));
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p1/servers' });
|
|
expect(res.statusCode).toBe(200);
|
|
const body = res.json<Array<{ name: string; ungatedGlobal?: boolean }>>();
|
|
expect(body.map((s) => s.name)).toEqual(['ha', 'calcmcp']);
|
|
expect(body[0]!.ungatedGlobal).toBeUndefined();
|
|
expect(body[1]!.ungatedGlobal).toBe(true);
|
|
});
|
|
|
|
it('GET /servers does not duplicate a server also attached directly', async () => {
|
|
await createApp(repoWithGlobal([mkPs('srv-calc', 'calcmcp')]));
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p1/servers' });
|
|
const body = res.json<Array<{ name: string; ungatedGlobal?: boolean }>>();
|
|
expect(body).toHaveLength(1);
|
|
expect(body[0]!.name).toBe('calcmcp');
|
|
expect(body[0]!.ungatedGlobal).toBeUndefined();
|
|
});
|
|
|
|
it('GET /servers on ungated-global itself does not self-merge', async () => {
|
|
const repo = repoWithGlobal();
|
|
vi.mocked(repo.findById).mockImplementation(async (id: string) =>
|
|
id === 'p-ug'
|
|
? makeProject({ id: 'p-ug', name: 'ungated-global', servers: [mkPs('srv-calc', 'calcmcp')] })
|
|
: null);
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p-ug/servers' });
|
|
const body = res.json<Array<{ name: string }>>();
|
|
expect(body).toHaveLength(1);
|
|
});
|
|
|
|
it('GET /instructions prepends the global prompt and lists global servers', async () => {
|
|
await createApp(repoWithGlobal([mkPs('srv-ha', 'ha', 'home assistant')]));
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p1/instructions' });
|
|
expect(res.statusCode).toBe(200);
|
|
const body = res.json<{ prompt: string; servers: Array<{ name: string }> }>();
|
|
expect(body.prompt).toBe('Always use calcmcp for math.\n\nown prompt');
|
|
expect(body.servers.map((s) => s.name)).toEqual(['ha', 'calcmcp']);
|
|
});
|
|
|
|
it('GET /servers is unchanged when ungated-global does not exist', async () => {
|
|
const repo = mockProjectRepo();
|
|
vi.mocked(repo.findById).mockImplementation(async (id: string) =>
|
|
id === 'p1' ? makeProject({ id: 'p1', name: 'my-proj', servers: [mkPs('srv-ha', 'ha')] }) : null);
|
|
await createApp(repo);
|
|
const res = await app.inject({ method: 'GET', url: '/api/v1/projects/p1/servers' });
|
|
const body = res.json<Array<{ name: string }>>();
|
|
expect(body.map((s) => s.name)).toEqual(['ha']);
|
|
});
|
|
});
|
|
});
|