refactor(server): move the team runtime into a postponed package (P1.1)
Team mode stays in the repository but is not built or shipped (ADR-0003). - The team server (index.ts, config, db, daemons, plugins, proactive, routes, scheduler, services, ws, drizzle migrations) and its tests move from @waggle/server to packages/team-server (@waggle/team-server, private). It keeps its own copies of the logger and the agent-group executor, so it does not import @waggle/server. @clerk/fastify, bullmq, ioredis, postgres, drizzle-orm, drizzle-kit, cron-parser and @waggle/waggle-dance leave @waggle/server; the launcher drops the same team-only dependencies. - build:packages no longer builds waggle-dance or the worker: nothing in the community edition imports them, and the worker's project reference would otherwise build the team server. The worker now imports from team-server; the team Dockerfile builds both explicitly. - The sidecar no longer starts the team server when DATABASE_URL is set, and loses the team routes (/api/team/*, /api/teams), the WaggleDance routes and bridge (/api/waggle-dance/*), the Team server binding and egress guard, the WebSocket team client, the TeamSync cache and pushes, team audit forwarding, team workspace registration and the team capability-policy lookup in chat. The in-process room signal bus stays: agent groups, fleet runs and external tool runs use it. middleware/audit.ts was dead and is deleted. - @waggle/core loses TeamSync and the teamServer part of WaggleConfig. A teamServer key in config.json is ignored and kept on save, as P0.1 does for the tier keys. Workspaces lose teamServerUrl and teamUserId; teamId and teamRole stay because workspaces from a shared data directory still carry them and the viewer write guards read them. POST /api/workspaces ignores team fields. - The sidecar bundle no longer marks the team packages as external. The agent still references the TeamSync type in orchestrator.ts and pattern-write-back.ts; those files are being rewritten in P1.5 and drop it there. Logs UF-030 and UF-031 (team sync and team policy defects found while removing the code).
This commit is contained in:
@@ -1,139 +0,0 @@
|
||||
/**
|
||||
* Team Server E2E — tests the multi-user team server running on Docker
|
||||
* (Postgres + Redis + LiteLLM).
|
||||
*
|
||||
* Requires: docker-compose up (postgres:5434, redis:6381, litellm:4000)
|
||||
* Team server running on port 3100.
|
||||
*/
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
const TEAM = 'http://127.0.0.1:3100';
|
||||
|
||||
test.beforeEach(async ({ request }) => {
|
||||
try {
|
||||
const res = await request.get(`${TEAM}/health`, { timeout: 1_000 });
|
||||
test.skip(!res.ok(), 'Optional team server is not running on 127.0.0.1:3100');
|
||||
} catch {
|
||||
test.skip(true, 'Optional team server is not running on 127.0.0.1:3100');
|
||||
}
|
||||
});
|
||||
|
||||
// ── 1. Server Health ──────────────────────────────────────────────────
|
||||
|
||||
test.describe('1. Team Server Health', () => {
|
||||
test('health endpoint responds', async ({ request }) => {
|
||||
const res = await request.get(`${TEAM}/health`);
|
||||
expect(res.ok()).toBeTruthy();
|
||||
const data = await res.json();
|
||||
expect(data.status).toBe('ok');
|
||||
});
|
||||
});
|
||||
|
||||
// ── 2. Team CRUD ──────────────────────────────────────────────────────
|
||||
|
||||
test.describe('2. Team Management', () => {
|
||||
let teamSlug: string;
|
||||
|
||||
test('can create a team', async ({ request }) => {
|
||||
const name = `TestTeam-${Date.now()}`;
|
||||
teamSlug = name.toLowerCase().replace(/[^a-z0-9]/g, '-');
|
||||
const res = await request.post(`${TEAM}/api/teams`, {
|
||||
data: { name, slug: teamSlug },
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
});
|
||||
// May need auth — accept 200, 201, or 401
|
||||
expect([200, 201, 401, 403]).toContain(res.status());
|
||||
});
|
||||
|
||||
test('can list teams', async ({ request }) => {
|
||||
const res = await request.get(`${TEAM}/api/teams`);
|
||||
expect([200, 401, 403]).toContain(res.status());
|
||||
if (res.ok()) {
|
||||
const data = await res.json();
|
||||
expect(Array.isArray(data) || Array.isArray(data.teams)).toBeTruthy();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// ── 3. Agent Routes ───────────────────────────────────────────────────
|
||||
|
||||
test.describe('3. Agent & Model Routes', () => {
|
||||
test('agents list', async ({ request }) => {
|
||||
const res = await request.get(`${TEAM}/api/agents`);
|
||||
expect([200, 401]).toContain(res.status());
|
||||
});
|
||||
|
||||
test('workflows list', async ({ request }) => {
|
||||
const res = await request.get(`${TEAM}/api/workflows`);
|
||||
expect([200, 401, 404]).toContain(res.status());
|
||||
});
|
||||
});
|
||||
|
||||
// ── 4. Database Connection ────────────────────────────────────────────
|
||||
|
||||
test.describe('4. Database', () => {
|
||||
test('postgres is reachable from server', async ({ request }) => {
|
||||
// The server started successfully which means DB connected.
|
||||
// Verify by hitting an endpoint that requires DB.
|
||||
const res = await request.get(`${TEAM}/api/teams`);
|
||||
// If 500, DB connection failed. 200 or 401 means DB is fine.
|
||||
expect(res.status()).not.toBe(500);
|
||||
});
|
||||
});
|
||||
|
||||
// ── 5. WebSocket Gateway ──────────────────────────────────────────────
|
||||
|
||||
test.describe('5. WebSocket', () => {
|
||||
test('ws endpoint exists', async ({ request }) => {
|
||||
// HTTP GET to /ws should return upgrade required or similar
|
||||
const res = await request.get(`${TEAM}/ws`);
|
||||
// WebSocket endpoints typically return 400 or 426 on plain HTTP
|
||||
expect([400, 404, 426]).toContain(res.status());
|
||||
});
|
||||
});
|
||||
|
||||
// ── 6. Cron & Jobs ────────────────────────────────────────────────────
|
||||
|
||||
test.describe('6. Background Services', () => {
|
||||
test('cron status endpoint', async ({ request }) => {
|
||||
const res = await request.get(`${TEAM}/api/cron`);
|
||||
expect([200, 401, 404]).toContain(res.status());
|
||||
});
|
||||
});
|
||||
|
||||
// ── 7. Knowledge & Resources ──────────────────────────────────────────
|
||||
|
||||
test.describe('7. Knowledge Routes', () => {
|
||||
test('skills endpoint', async ({ request }) => {
|
||||
const res = await request.get(`${TEAM}/api/skills`);
|
||||
expect([200, 401, 404]).toContain(res.status());
|
||||
});
|
||||
});
|
||||
|
||||
// ── 8. Concurrent Requests ────────────────────────────────────────────
|
||||
|
||||
test.describe('8. Concurrency', () => {
|
||||
test('10 concurrent health checks all succeed', async ({ request }) => {
|
||||
const results = await Promise.all(
|
||||
Array.from({ length: 10 }, () => request.get(`${TEAM}/health`))
|
||||
);
|
||||
for (const res of results) {
|
||||
expect(res.ok()).toBeTruthy();
|
||||
}
|
||||
});
|
||||
|
||||
test('server handles rapid API calls without crashing', async ({ request }) => {
|
||||
const endpoints = ['/health', '/api/teams', '/api/agents', '/api/workflows', '/api/cron'];
|
||||
const results = await Promise.all(
|
||||
endpoints.map(ep => request.get(`${TEAM}${ep}`))
|
||||
);
|
||||
// No 500s — server survived the burst
|
||||
for (const res of results) {
|
||||
expect(res.status()).toBeLessThan(500);
|
||||
}
|
||||
|
||||
// Health still ok after burst
|
||||
const health = await request.get(`${TEAM}/health`);
|
||||
expect(health.ok()).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -209,17 +209,11 @@ test.describe('2. Tier Enforcement (requireTier middleware)', () => {
|
||||
}
|
||||
});
|
||||
|
||||
test('2.5 POST /api/team/connect requires TEAMS', async ({ request }) => {
|
||||
test('2.5 the community edition has no team connect endpoint', async ({ request }) => {
|
||||
const res = await request.post(`${API}/api/team/connect`, {
|
||||
data: { teamServerUrl: 'http://test.example.com', token: 'test' },
|
||||
});
|
||||
if (res.status() === 403) {
|
||||
const data = await res.json();
|
||||
expect(data.error).toBe('TIER_INSUFFICIENT');
|
||||
expect(data.required).toBe('TEAMS');
|
||||
} else {
|
||||
expect([200, 201, 400, 422]).toContain(res.status());
|
||||
}
|
||||
expect(res.status()).toBe(404);
|
||||
});
|
||||
|
||||
test('2.6 GET /api/admin/overview requires TEAMS', async ({ request }) => {
|
||||
|
||||
@@ -1,292 +0,0 @@
|
||||
import { createHmac } from 'node:crypto';
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||
import type { FastifyRequest, FastifyReply } from 'fastify';
|
||||
import { buildServer } from '../../packages/server/src/index.js';
|
||||
import {
|
||||
users, teams, teamMembers, tasks, messages,
|
||||
teamEntities, teamResources, agentAuditLog,
|
||||
} from '../../packages/server/src/db/schema.js';
|
||||
import { sql } from 'drizzle-orm';
|
||||
|
||||
const SIGNING_KEY = Buffer.from('waggle-m3-full-stack-test-secret');
|
||||
const SIGNING_SECRET = `whsec_${SIGNING_KEY.toString('base64')}`;
|
||||
|
||||
function signedHeaders(payload: object) {
|
||||
const id = 'msg_waggle_m3_full_stack';
|
||||
const timestamp = Math.floor(Date.now() / 1000);
|
||||
const signature = createHmac('sha256', SIGNING_KEY)
|
||||
.update(`${id}.${timestamp}.${JSON.stringify(payload)}`)
|
||||
.digest('base64');
|
||||
|
||||
return {
|
||||
'svix-id': id,
|
||||
'svix-timestamp': String(timestamp),
|
||||
'svix-signature': `v1,${signature}`,
|
||||
};
|
||||
}
|
||||
|
||||
describe('M3 Full Stack Integration', () => {
|
||||
let server: Awaited<ReturnType<typeof buildServer>>;
|
||||
let ownerId: string;
|
||||
let memberId: string;
|
||||
let teamId: string;
|
||||
let originalSigningSecret: string | undefined;
|
||||
const teamSlug = 'integ-team';
|
||||
|
||||
beforeAll(async () => {
|
||||
originalSigningSecret = process.env.CLERK_WEBHOOK_SIGNING_SECRET;
|
||||
process.env.CLERK_WEBHOOK_SIGNING_SECRET = SIGNING_SECRET;
|
||||
server = await buildServer();
|
||||
|
||||
// Clean up leftover test data from previous runs (reverse dependency order)
|
||||
await server.db.execute(sql`DELETE FROM agent_audit_log WHERE user_id IN (SELECT id FROM users WHERE clerk_id LIKE 'integ_%')`);
|
||||
await server.db.execute(sql`DELETE FROM team_resources WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_relations WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_entities WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM messages WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM tasks WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM agent_jobs WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM cron_schedules WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_members WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_capability_requests WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_capability_overrides WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_capability_policies WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM teams WHERE slug = 'integ-team'`);
|
||||
await server.db.execute(sql`DELETE FROM users WHERE clerk_id LIKE 'integ_%'`);
|
||||
|
||||
// Override auth handler for testing
|
||||
server._authHandler.fn = async function (request: FastifyRequest, reply: FastifyReply) {
|
||||
const testUserId = request.headers['x-test-user-id'] as string;
|
||||
if (!testUserId) {
|
||||
return reply.code(401).send({ error: 'Missing x-test-user-id header' });
|
||||
}
|
||||
request.userId = testUserId;
|
||||
request.clerkId = 'test';
|
||||
};
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
try {
|
||||
// Clean up all test data
|
||||
await server.db.execute(sql`DELETE FROM agent_audit_log WHERE user_id IN (SELECT id FROM users WHERE clerk_id LIKE 'integ_%')`);
|
||||
await server.db.execute(sql`DELETE FROM team_resources WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_relations WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_entities WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM messages WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM tasks WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM agent_jobs WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM cron_schedules WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_members WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_capability_requests WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_capability_overrides WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM team_capability_policies WHERE team_id IN (SELECT id FROM teams WHERE slug = 'integ-team')`);
|
||||
await server.db.execute(sql`DELETE FROM teams WHERE slug = 'integ-team'`);
|
||||
await server.db.execute(sql`DELETE FROM users WHERE clerk_id LIKE 'integ_%'`);
|
||||
} finally {
|
||||
try {
|
||||
await server?.close();
|
||||
} finally {
|
||||
if (originalSigningSecret === undefined) {
|
||||
delete process.env.CLERK_WEBHOOK_SIGNING_SECRET;
|
||||
} else {
|
||||
process.env.CLERK_WEBHOOK_SIGNING_SECRET = originalSigningSecret;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
it('Step 1: Creates users via webhook', async () => {
|
||||
// Create owner
|
||||
const ownerEvent = {
|
||||
type: 'user.created',
|
||||
data: {
|
||||
id: 'integ_owner',
|
||||
first_name: 'Owner',
|
||||
last_name: 'User',
|
||||
email_addresses: [{ email_address: 'integ_owner@test.com' }],
|
||||
},
|
||||
};
|
||||
let res = await server.inject({
|
||||
method: 'POST',
|
||||
url: '/api/webhooks/clerk',
|
||||
headers: signedHeaders(ownerEvent),
|
||||
payload: ownerEvent,
|
||||
});
|
||||
expect(res.statusCode).toBe(200);
|
||||
|
||||
// Create member
|
||||
const memberEvent = {
|
||||
type: 'user.created',
|
||||
data: {
|
||||
id: 'integ_member',
|
||||
first_name: 'Member',
|
||||
last_name: 'User',
|
||||
email_addresses: [{ email_address: 'integ_member@test.com' }],
|
||||
},
|
||||
};
|
||||
res = await server.inject({
|
||||
method: 'POST',
|
||||
url: '/api/webhooks/clerk',
|
||||
headers: signedHeaders(memberEvent),
|
||||
payload: memberEvent,
|
||||
});
|
||||
expect(res.statusCode).toBe(200);
|
||||
|
||||
// Get user IDs
|
||||
const [owner] = await server.db.select().from(users).where(sql`clerk_id = 'integ_owner'`);
|
||||
const [member] = await server.db.select().from(users).where(sql`clerk_id = 'integ_member'`);
|
||||
expect(owner).toBeDefined();
|
||||
expect(member).toBeDefined();
|
||||
ownerId = owner.id;
|
||||
memberId = member.id;
|
||||
});
|
||||
|
||||
it('Step 2: Creates team and invites member', async () => {
|
||||
let res = await server.inject({
|
||||
method: 'POST',
|
||||
url: '/api/teams',
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
payload: { name: 'Integration Team', slug: teamSlug },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
teamId = JSON.parse(res.body).id;
|
||||
|
||||
// Add member
|
||||
res = await server.inject({
|
||||
method: 'POST',
|
||||
url: `/api/teams/${teamSlug}/members`,
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
payload: { email: 'integ_member@test.com', role: 'member' },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
});
|
||||
|
||||
it('Step 3: Creates task on team board', async () => {
|
||||
const res = await server.inject({
|
||||
method: 'POST',
|
||||
url: `/api/teams/${teamSlug}/tasks`,
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
payload: { title: 'Research competitor pricing', priority: 'high' },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
const body = JSON.parse(res.body);
|
||||
expect(body.title).toBe('Research competitor pricing');
|
||||
expect(body.priority).toBe('high');
|
||||
expect(body.status).toBe('open');
|
||||
});
|
||||
|
||||
it('Step 4: Sends Waggle Dance message', async () => {
|
||||
const res = await server.inject({
|
||||
method: 'POST',
|
||||
url: `/api/teams/${teamSlug}/messages`,
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
payload: {
|
||||
type: 'request',
|
||||
subtype: 'knowledge_check',
|
||||
content: { topic: 'competitor pricing' },
|
||||
},
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
const body = JSON.parse(res.body);
|
||||
expect(body.type).toBe('request');
|
||||
expect(body.subtype).toBe('knowledge_check');
|
||||
});
|
||||
|
||||
it('Step 5: Shares knowledge entity to team graph', async () => {
|
||||
const res = await server.inject({
|
||||
method: 'POST',
|
||||
url: `/api/teams/${teamSlug}/entities`,
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
payload: { entityType: 'competitor', name: 'Acme Corp', properties: { pricing: '$99/mo' } },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
const body = JSON.parse(res.body);
|
||||
expect(body.entityType).toBe('competitor');
|
||||
expect(body.name).toBe('Acme Corp');
|
||||
});
|
||||
|
||||
it('Step 6: Shares team resource', async () => {
|
||||
const res = await server.inject({
|
||||
method: 'POST',
|
||||
url: `/api/teams/${teamSlug}/resources`,
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
payload: {
|
||||
resourceType: 'model_recipe',
|
||||
name: 'Fast Research Config',
|
||||
config: { model: 'claude-haiku-4-5', temperature: 0.3 },
|
||||
},
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
const body = JSON.parse(res.body);
|
||||
expect(body.resourceType).toBe('model_recipe');
|
||||
expect(body.name).toBe('Fast Research Config');
|
||||
});
|
||||
|
||||
it('Step 7: Creates audit trail entry', async () => {
|
||||
const { AuditService } = await import('../../packages/server/src/services/audit-service.js');
|
||||
const auditService = new AuditService(server.db);
|
||||
const entry = await auditService.log({
|
||||
userId: ownerId,
|
||||
teamId,
|
||||
agentName: 'memory-weaver',
|
||||
actionType: 'consolidation',
|
||||
description: 'Consolidated meeting notes',
|
||||
});
|
||||
expect(entry.agentName).toBe('memory-weaver');
|
||||
|
||||
// Verify via admin API
|
||||
// First promote owner to admin role (owner already has admin+ perms)
|
||||
const res = await server.inject({
|
||||
method: 'GET',
|
||||
url: `/api/admin/teams/${teamSlug}/audit`,
|
||||
headers: { 'x-test-user-id': ownerId },
|
||||
});
|
||||
expect(res.statusCode).toBe(200);
|
||||
const body = JSON.parse(res.body);
|
||||
expect(body.length).toBeGreaterThanOrEqual(1);
|
||||
});
|
||||
|
||||
it('Step 8: Member cannot access admin audit endpoint', async () => {
|
||||
const res = await server.inject({
|
||||
method: 'GET',
|
||||
url: `/api/admin/teams/${teamSlug}/audit`,
|
||||
headers: { 'x-test-user-id': memberId },
|
||||
});
|
||||
expect(res.statusCode).toBe(403);
|
||||
});
|
||||
|
||||
it('Step 9: Lists tasks, messages, entities for the team', async () => {
|
||||
// Tasks
|
||||
const tasksRes = await server.inject({
|
||||
method: 'GET',
|
||||
url: `/api/teams/${teamSlug}/tasks`,
|
||||
headers: { 'x-test-user-id': memberId },
|
||||
});
|
||||
expect(tasksRes.statusCode).toBe(200);
|
||||
expect(JSON.parse(tasksRes.body).length).toBeGreaterThanOrEqual(1);
|
||||
|
||||
// Messages
|
||||
const msgsRes = await server.inject({
|
||||
method: 'GET',
|
||||
url: `/api/teams/${teamSlug}/messages`,
|
||||
headers: { 'x-test-user-id': memberId },
|
||||
});
|
||||
expect(msgsRes.statusCode).toBe(200);
|
||||
expect(JSON.parse(msgsRes.body).length).toBeGreaterThanOrEqual(1);
|
||||
|
||||
// Entities
|
||||
const entRes = await server.inject({
|
||||
method: 'GET',
|
||||
url: `/api/teams/${teamSlug}/entities`,
|
||||
headers: { 'x-test-user-id': memberId },
|
||||
});
|
||||
expect(entRes.statusCode).toBe(200);
|
||||
expect(JSON.parse(entRes.body).length).toBeGreaterThanOrEqual(1);
|
||||
});
|
||||
|
||||
it('Step 10: Health check passes', async () => {
|
||||
const res = await server.inject({ method: 'GET', url: '/health' });
|
||||
expect(res.statusCode).toBe(200);
|
||||
expect(JSON.parse(res.body).status).toBe('ok');
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user