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).
92 lines
3.0 KiB
TypeScript
92 lines
3.0 KiB
TypeScript
/**
|
|
* Task handler — runs agent loop with task context.
|
|
* Replaces the stub implementation with real agent invocation.
|
|
*/
|
|
|
|
import type { Job } from 'bullmq';
|
|
import type { JobData } from '../job-processor.js';
|
|
import type { Db } from '../../../team-server/src/db/connection.js';
|
|
import { tasks } from '../../../team-server/src/db/schema.js';
|
|
import { eq } from 'drizzle-orm';
|
|
import { runAgentLoop } from '@waggle/agent';
|
|
import { createWorkerExecutionContext } from '../execution-policy.js';
|
|
|
|
const LITELLM_URL = process.env.LITELLM_URL ?? 'http://localhost:4000/v1';
|
|
const LITELLM_API_KEY = process.env.LITELLM_API_KEY ?? process.env.LITELLM_MASTER_KEY ?? 'sk-waggle-dev';
|
|
const DEFAULT_MODEL = process.env.DEFAULT_MODEL ?? 'claude-sonnet';
|
|
|
|
export async function taskHandler(job: Job<JobData>, db: Db): Promise<Record<string, unknown>> {
|
|
const { teamId, userId, input } = job.data;
|
|
const taskId = (input as Record<string, unknown>).taskId as string | undefined;
|
|
|
|
if (!taskId) {
|
|
throw new Error('taskHandler requires input.taskId');
|
|
}
|
|
|
|
// Load task from DB to verify it exists and belongs to the team
|
|
const [task] = await db.select().from(tasks)
|
|
.where(eq(tasks.id, taskId));
|
|
|
|
if (!task) {
|
|
throw new Error(`Task not found: ${taskId}`);
|
|
}
|
|
|
|
if (task.teamId !== teamId) {
|
|
throw new Error(`Task ${taskId} does not belong to team ${teamId}`);
|
|
}
|
|
|
|
const executionContext = createWorkerExecutionContext(teamId);
|
|
|
|
// Mark task as in-progress
|
|
await db.update(tasks)
|
|
.set({ status: 'in_progress', assignedTo: userId, updatedAt: new Date() })
|
|
.where(eq(tasks.id, taskId));
|
|
|
|
// Build prompt from task context
|
|
const systemPrompt = [
|
|
executionContext.systemPrompt,
|
|
'',
|
|
'You are a Waggle AI agent executing an assigned task.',
|
|
'Complete the task described below. Be thorough but concise.',
|
|
'',
|
|
`Task: ${task.title}`,
|
|
task.description ? `Details: ${task.description}` : '',
|
|
task.priority ? `Priority: ${task.priority}` : '',
|
|
].filter(Boolean).join('\n');
|
|
|
|
const model = (input as Record<string, unknown>).model as string ?? DEFAULT_MODEL;
|
|
|
|
try {
|
|
const result = await runAgentLoop({
|
|
litellmUrl: LITELLM_URL,
|
|
litellmApiKey: LITELLM_API_KEY,
|
|
model,
|
|
systemPrompt,
|
|
tools: executionContext.tools,
|
|
messages: [{ role: 'user', content: `Execute this task: ${task.title}${task.description ? '\n\n' + task.description : ''}` }],
|
|
});
|
|
|
|
// Mark task as completed
|
|
await db.update(tasks)
|
|
.set({ status: 'completed', updatedAt: new Date() })
|
|
.where(eq(tasks.id, taskId));
|
|
|
|
return {
|
|
taskId,
|
|
taskTitle: task.title,
|
|
status: 'completed',
|
|
result: result.content,
|
|
toolsUsed: result.toolsUsed,
|
|
tokensUsed: result.usage.inputTokens + result.usage.outputTokens,
|
|
userId,
|
|
};
|
|
} catch (err) {
|
|
// Reset task to open on failure (not stuck in in_progress)
|
|
await db.update(tasks)
|
|
.set({ status: 'open', updatedAt: new Date() })
|
|
.where(eq(tasks.id, taskId));
|
|
|
|
throw err; // Let the worker mark the job as failed
|
|
}
|
|
}
|