Compare commits

...

6 Commits

Author SHA1 Message Date
a81668d4fe chore(ms22-p2): update mission docs — P2-008 complete
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-04 21:30:55 -06:00
a70f149886 feat(ms22-p2): add agent selector UI in WebUI (#685)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-05 03:29:02 +00:00
2f1ee53c8d feat(ms22-p2): add agent status endpoints and chat routing (#684)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-05 02:56:36 +00:00
b52c4e7ff9 chore(ms22-p2): update docs after P2-004 completion (#683)
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-05 02:46:24 +00:00
af56684e84 feat(ms22-p2): add UserAgent CRUD endpoints (#682)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-05 02:44:19 +00:00
ee4d6fa12b feat(ms22-p2): add AgentTemplate admin CRUD endpoints (#678)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-05 02:32:17 +00:00
22 changed files with 859 additions and 40 deletions

View File

@@ -0,0 +1,47 @@
import {
Controller,
Get,
Post,
Patch,
Delete,
Body,
Param,
UseGuards,
ParseUUIDPipe,
} from "@nestjs/common";
import { AgentTemplateService } from "./agent-template.service";
import { CreateAgentTemplateDto } from "./dto/create-agent-template.dto";
import { UpdateAgentTemplateDto } from "./dto/update-agent-template.dto";
import { AuthGuard } from "../auth/guards/auth.guard";
import { AdminGuard } from "../auth/guards/admin.guard";
@Controller("admin/agent-templates")
@UseGuards(AuthGuard, AdminGuard)
export class AgentTemplateController {
constructor(private readonly agentTemplateService: AgentTemplateService) {}
@Get()
findAll() {
return this.agentTemplateService.findAll();
}
@Get(":id")
findOne(@Param("id", ParseUUIDPipe) id: string) {
return this.agentTemplateService.findOne(id);
}
@Post()
create(@Body() dto: CreateAgentTemplateDto) {
return this.agentTemplateService.create(dto);
}
@Patch(":id")
update(@Param("id", ParseUUIDPipe) id: string, @Body() dto: UpdateAgentTemplateDto) {
return this.agentTemplateService.update(id, dto);
}
@Delete(":id")
remove(@Param("id", ParseUUIDPipe) id: string) {
return this.agentTemplateService.remove(id);
}
}

View File

@@ -0,0 +1,12 @@
import { Module } from "@nestjs/common";
import { AgentTemplateService } from "./agent-template.service";
import { AgentTemplateController } from "./agent-template.controller";
import { PrismaModule } from "../prisma/prisma.module";
@Module({
imports: [PrismaModule],
controllers: [AgentTemplateController],
providers: [AgentTemplateService],
exports: [AgentTemplateService],
})
export class AgentTemplateModule {}

View File

@@ -0,0 +1,57 @@
import { Injectable, NotFoundException, ConflictException } from "@nestjs/common";
import { PrismaService } from "../prisma/prisma.service";
import { CreateAgentTemplateDto } from "./dto/create-agent-template.dto";
import { UpdateAgentTemplateDto } from "./dto/update-agent-template.dto";
@Injectable()
export class AgentTemplateService {
constructor(private readonly prisma: PrismaService) {}
async findAll() {
return this.prisma.agentTemplate.findMany({
orderBy: { createdAt: "asc" },
});
}
async findOne(id: string) {
const template = await this.prisma.agentTemplate.findUnique({ where: { id } });
if (!template) throw new NotFoundException(`AgentTemplate ${id} not found`);
return template;
}
async findByName(name: string) {
const template = await this.prisma.agentTemplate.findUnique({ where: { name } });
if (!template) throw new NotFoundException(`AgentTemplate "${name}" not found`);
return template;
}
async create(dto: CreateAgentTemplateDto) {
const existing = await this.prisma.agentTemplate.findUnique({ where: { name: dto.name } });
if (existing) throw new ConflictException(`AgentTemplate "${dto.name}" already exists`);
return this.prisma.agentTemplate.create({
data: {
name: dto.name,
displayName: dto.displayName,
role: dto.role,
personality: dto.personality,
primaryModel: dto.primaryModel,
fallbackModels: dto.fallbackModels ?? ([] as string[]),
toolPermissions: dto.toolPermissions ?? ([] as string[]),
...(dto.discordChannel !== undefined && { discordChannel: dto.discordChannel }),
isActive: dto.isActive ?? true,
isDefault: dto.isDefault ?? false,
},
});
}
async update(id: string, dto: UpdateAgentTemplateDto) {
await this.findOne(id);
return this.prisma.agentTemplate.update({ where: { id }, data: dto });
}
async remove(id: string) {
await this.findOne(id);
return this.prisma.agentTemplate.delete({ where: { id } });
}
}

View File

@@ -0,0 +1,43 @@
import { IsString, IsBoolean, IsOptional, IsArray, MinLength } from "class-validator";
export class CreateAgentTemplateDto {
@IsString()
@MinLength(1)
name!: string;
@IsString()
@MinLength(1)
displayName!: string;
@IsString()
@MinLength(1)
role!: string;
@IsString()
@MinLength(1)
personality!: string;
@IsString()
@MinLength(1)
primaryModel!: string;
@IsArray()
@IsOptional()
fallbackModels?: string[];
@IsArray()
@IsOptional()
toolPermissions?: string[];
@IsString()
@IsOptional()
discordChannel?: string;
@IsBoolean()
@IsOptional()
isActive?: boolean;
@IsBoolean()
@IsOptional()
isDefault?: boolean;
}

View File

@@ -0,0 +1,4 @@
import { PartialType } from "@nestjs/mapped-types";
import { CreateAgentTemplateDto } from "./create-agent-template.dto";
export class UpdateAgentTemplateDto extends PartialType(CreateAgentTemplateDto) {}

View File

@@ -48,6 +48,8 @@ import { TerminalModule } from "./terminal/terminal.module";
import { PersonalitiesModule } from "./personalities/personalities.module"; import { PersonalitiesModule } from "./personalities/personalities.module";
import { WorkspacesModule } from "./workspaces/workspaces.module"; import { WorkspacesModule } from "./workspaces/workspaces.module";
import { AdminModule } from "./admin/admin.module"; import { AdminModule } from "./admin/admin.module";
import { AgentTemplateModule } from "./agent-template/agent-template.module";
import { UserAgentModule } from "./user-agent/user-agent.module";
import { TeamsModule } from "./teams/teams.module"; import { TeamsModule } from "./teams/teams.module";
import { ImportModule } from "./import/import.module"; import { ImportModule } from "./import/import.module";
import { ConversationArchiveModule } from "./conversation-archive/conversation-archive.module"; import { ConversationArchiveModule } from "./conversation-archive/conversation-archive.module";
@@ -129,6 +131,8 @@ import { OrchestratorModule } from "./orchestrator/orchestrator.module";
PersonalitiesModule, PersonalitiesModule,
WorkspacesModule, WorkspacesModule,
AdminModule, AdminModule,
AgentTemplateModule,
UserAgentModule,
TeamsModule, TeamsModule,
ImportModule, ImportModule,
ConversationArchiveModule, ConversationArchiveModule,

View File

@@ -99,7 +99,8 @@ export class ChatProxyController {
const upstreamResponse = await this.chatProxyService.proxyChat( const upstreamResponse = await this.chatProxyService.proxyChat(
userId, userId,
body.messages, body.messages,
abortController.signal abortController.signal,
body.agent
); );
const upstreamContentType = upstreamResponse.headers.get("content-type"); const upstreamContentType = upstreamResponse.headers.get("content-type");

View File

@@ -1,5 +1,12 @@
import { Type } from "class-transformer"; import { Type } from "class-transformer";
import { ArrayMinSize, IsArray, IsNotEmpty, IsString, ValidateNested } from "class-validator"; import {
ArrayMinSize,
IsArray,
IsNotEmpty,
IsOptional,
IsString,
ValidateNested,
} from "class-validator";
export interface ChatMessage { export interface ChatMessage {
role: string; role: string;
@@ -22,4 +29,8 @@ export class ChatStreamDto {
@ValidateNested({ each: true }) @ValidateNested({ each: true })
@Type(() => ChatMessageDto) @Type(() => ChatMessageDto)
messages!: ChatMessageDto[]; messages!: ChatMessageDto[];
@IsString({ message: "agent must be a string" })
@IsOptional()
agent?: string;
} }

View File

@@ -2,6 +2,7 @@ import {
BadGatewayException, BadGatewayException,
Injectable, Injectable,
Logger, Logger,
NotFoundException,
ServiceUnavailableException, ServiceUnavailableException,
} from "@nestjs/common"; } from "@nestjs/common";
import { ConfigService } from "@nestjs/config"; import { ConfigService } from "@nestjs/config";
@@ -18,6 +19,13 @@ interface ContainerConnection {
token: string; token: string;
} }
interface AgentConfig {
name: string;
displayName: string;
personality: string;
primaryModel: string | null;
}
@Injectable() @Injectable()
export class ChatProxyService { export class ChatProxyService {
private readonly logger = new Logger(ChatProxyService.name); private readonly logger = new Logger(ChatProxyService.name);
@@ -38,21 +46,38 @@ export class ChatProxyService {
async proxyChat( async proxyChat(
userId: string, userId: string,
messages: ChatMessage[], messages: ChatMessage[],
signal?: AbortSignal signal?: AbortSignal,
agentName?: string
): Promise<Response> { ): Promise<Response> {
const { url: containerUrl, token: gatewayToken } = await this.getContainerConnection(userId); const { url: containerUrl, token: gatewayToken } = await this.getContainerConnection(userId);
const model = await this.getPreferredModel(userId);
// Get agent config if specified
let agentConfig: AgentConfig | null = null;
if (agentName) {
agentConfig = await this.getAgentConfig(userId, agentName);
}
const model = agentConfig?.primaryModel ?? (await this.getPreferredModel(userId));
const requestBody: Record<string, unknown> = {
messages,
model,
stream: true,
};
// Add agent config if available
if (agentConfig) {
requestBody.agent = agentConfig.name;
requestBody.agent_personality = agentConfig.personality;
}
const requestInit: RequestInit = { const requestInit: RequestInit = {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
Authorization: `Bearer ${gatewayToken}`, Authorization: `Bearer ${gatewayToken}`,
}, },
body: JSON.stringify({ body: JSON.stringify(requestBody),
messages,
model,
stream: true,
}),
}; };
if (signal) { if (signal) {
@@ -170,4 +195,32 @@ export class ChatProxyService {
return null; return null;
} }
} }
private async getAgentConfig(userId: string, agentName: string): Promise<AgentConfig> {
const agent = await this.prisma.userAgent.findUnique({
where: { userId_name: { userId, name: agentName } },
select: {
name: true,
displayName: true,
personality: true,
primaryModel: true,
isActive: true,
},
});
if (!agent) {
throw new NotFoundException(`Agent "${agentName}" not found for user`);
}
if (!agent.isActive) {
throw new NotFoundException(`Agent "${agentName}" is not active`);
}
return {
name: agent.name,
displayName: agent.displayName,
personality: agent.personality,
primaryModel: agent.primaryModel,
};
}
} }

View File

@@ -0,0 +1,43 @@
import { IsString, IsBoolean, IsOptional, IsArray, MinLength } from "class-validator";
export class CreateUserAgentDto {
@IsString()
@MinLength(1)
templateId?: string;
@IsString()
@MinLength(1)
name!: string;
@IsString()
@MinLength(1)
displayName!: string;
@IsString()
@MinLength(1)
role!: string;
@IsString()
@MinLength(1)
personality!: string;
@IsString()
@IsOptional()
primaryModel?: string;
@IsArray()
@IsOptional()
fallbackModels?: string[];
@IsArray()
@IsOptional()
toolPermissions?: string[];
@IsString()
@IsOptional()
discordChannel?: string;
@IsBoolean()
@IsOptional()
isActive?: boolean;
}

View File

@@ -0,0 +1,4 @@
import { PartialType } from "@nestjs/mapped-types";
import { CreateUserAgentDto } from "./create-user-agent.dto";
export class UpdateUserAgentDto extends PartialType(CreateUserAgentDto) {}

View File

@@ -0,0 +1,70 @@
import {
Controller,
Get,
Post,
Patch,
Delete,
Body,
Param,
UseGuards,
ParseUUIDPipe,
} from "@nestjs/common";
import { UserAgentService } from "./user-agent.service";
import { CreateUserAgentDto } from "./dto/create-user-agent.dto";
import { UpdateUserAgentDto } from "./dto/update-user-agent.dto";
import { AuthGuard } from "../auth/guards/auth.guard";
import { CurrentUser } from "../auth/decorators/current-user.decorator";
import type { AuthUser } from "@mosaic/shared";
@Controller("agents")
@UseGuards(AuthGuard)
export class UserAgentController {
constructor(private readonly userAgentService: UserAgentService) {}
@Get()
findAll(@CurrentUser() user: AuthUser) {
return this.userAgentService.findAll(user.id);
}
@Get("status")
getAllStatuses(@CurrentUser() user: AuthUser) {
return this.userAgentService.getAllStatuses(user.id);
}
@Get(":id")
findOne(@CurrentUser() user: AuthUser, @Param("id", ParseUUIDPipe) id: string) {
return this.userAgentService.findOne(user.id, id);
}
@Get(":id/status")
getStatus(@CurrentUser() user: AuthUser, @Param("id", ParseUUIDPipe) id: string) {
return this.userAgentService.getStatus(user.id, id);
}
@Post()
create(@CurrentUser() user: AuthUser, @Body() dto: CreateUserAgentDto) {
return this.userAgentService.create(user.id, dto);
}
@Post("from-template/:templateId")
createFromTemplate(
@CurrentUser() user: AuthUser,
@Param("templateId", ParseUUIDPipe) templateId: string
) {
return this.userAgentService.createFromTemplate(user.id, templateId);
}
@Patch(":id")
update(
@CurrentUser() user: AuthUser,
@Param("id", ParseUUIDPipe) id: string,
@Body() dto: UpdateUserAgentDto
) {
return this.userAgentService.update(user.id, id, dto);
}
@Delete(":id")
remove(@CurrentUser() user: AuthUser, @Param("id", ParseUUIDPipe) id: string) {
return this.userAgentService.remove(user.id, id);
}
}

View File

@@ -0,0 +1,12 @@
import { Module } from "@nestjs/common";
import { UserAgentService } from "./user-agent.service";
import { UserAgentController } from "./user-agent.controller";
import { PrismaModule } from "../prisma/prisma.module";
@Module({
imports: [PrismaModule],
controllers: [UserAgentController],
providers: [UserAgentService],
exports: [UserAgentService],
})
export class UserAgentModule {}

View File

@@ -0,0 +1,153 @@
import {
Injectable,
NotFoundException,
ConflictException,
ForbiddenException,
} from "@nestjs/common";
import { PrismaService } from "../prisma/prisma.service";
import { CreateUserAgentDto } from "./dto/create-user-agent.dto";
import { UpdateUserAgentDto } from "./dto/update-user-agent.dto";
export interface AgentStatusResponse {
id: string;
name: string;
displayName: string;
role: string;
isActive: boolean;
containerStatus?: "running" | "stopped" | "unknown";
}
@Injectable()
export class UserAgentService {
constructor(private readonly prisma: PrismaService) {}
async findAll(userId: string) {
return this.prisma.userAgent.findMany({
where: { userId },
orderBy: { createdAt: "asc" },
});
}
async findOne(userId: string, id: string) {
const agent = await this.prisma.userAgent.findUnique({ where: { id } });
if (!agent) throw new NotFoundException(`UserAgent ${id} not found`);
if (agent.userId !== userId) throw new ForbiddenException("Access denied to this agent");
return agent;
}
async findByName(userId: string, name: string) {
const agent = await this.prisma.userAgent.findUnique({
where: { userId_name: { userId, name } },
});
if (!agent) throw new NotFoundException(`UserAgent "${name}" not found for user`);
return agent;
}
async create(userId: string, dto: CreateUserAgentDto) {
// Check for unique name within user scope
const existing = await this.prisma.userAgent.findUnique({
where: { userId_name: { userId, name: dto.name } },
});
if (existing)
throw new ConflictException(`UserAgent "${dto.name}" already exists for this user`);
// If templateId provided, verify it exists
if (dto.templateId) {
const template = await this.prisma.agentTemplate.findUnique({
where: { id: dto.templateId },
});
if (!template) throw new NotFoundException(`AgentTemplate ${dto.templateId} not found`);
}
return this.prisma.userAgent.create({
data: {
userId,
templateId: dto.templateId ?? null,
name: dto.name,
displayName: dto.displayName,
role: dto.role,
personality: dto.personality,
primaryModel: dto.primaryModel ?? null,
fallbackModels: dto.fallbackModels ?? ([] as string[]),
toolPermissions: dto.toolPermissions ?? ([] as string[]),
discordChannel: dto.discordChannel ?? null,
isActive: dto.isActive ?? true,
},
});
}
async createFromTemplate(userId: string, templateId: string) {
const template = await this.prisma.agentTemplate.findUnique({
where: { id: templateId },
});
if (!template) throw new NotFoundException(`AgentTemplate ${templateId} not found`);
// Check for unique name within user scope
const existing = await this.prisma.userAgent.findUnique({
where: { userId_name: { userId, name: template.name } },
});
if (existing)
throw new ConflictException(`UserAgent "${template.name}" already exists for this user`);
return this.prisma.userAgent.create({
data: {
userId,
templateId: template.id,
name: template.name,
displayName: template.displayName,
role: template.role,
personality: template.personality,
primaryModel: template.primaryModel,
fallbackModels: template.fallbackModels as string[],
toolPermissions: template.toolPermissions as string[],
discordChannel: template.discordChannel,
isActive: template.isActive,
},
});
}
async update(userId: string, id: string, dto: UpdateUserAgentDto) {
const agent = await this.findOne(userId, id);
// If name is being changed, check for uniqueness
if (dto.name && dto.name !== agent.name) {
const existing = await this.prisma.userAgent.findUnique({
where: { userId_name: { userId, name: dto.name } },
});
if (existing)
throw new ConflictException(`UserAgent "${dto.name}" already exists for this user`);
}
return this.prisma.userAgent.update({
where: { id },
data: dto,
});
}
async remove(userId: string, id: string) {
await this.findOne(userId, id);
return this.prisma.userAgent.delete({ where: { id } });
}
async getStatus(userId: string, id: string): Promise<AgentStatusResponse> {
const agent = await this.findOne(userId, id);
return {
id: agent.id,
name: agent.name,
displayName: agent.displayName,
role: agent.role,
isActive: agent.isActive,
};
}
async getAllStatuses(userId: string): Promise<AgentStatusResponse[]> {
const agents = await this.findAll(userId);
return agents.map((agent) => ({
id: agent.id,
name: agent.name,
displayName: agent.displayName,
role: agent.role,
isActive: agent.isActive,
}));
}
}

View File

@@ -0,0 +1,128 @@
"use client";
import React from "react";
interface AgentSelectorProps {
selectedAgent?: string | null;
onChange?: (agent: string | null) => void;
disabled?: boolean;
}
const AGENT_CONFIG = {
jarvis: {
displayName: "Jarvis",
role: "Orchestrator",
color: "#3498db",
},
builder: {
displayName: "Builder",
role: "Coding Agent",
color: "#3b82f6",
},
medic: {
displayName: "Medic",
role: "Health Monitor",
color: "#10b981",
},
} as const;
function JarvisIcon({ className }: { className?: string }): React.ReactElement {
return (
<svg
className={`w-3 h-3 ${className ?? ""}`}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.5"
>
<circle cx="12" cy="12" r="3" />
<path d="M12 2v4M12 22v-4" />
<path d="M2 12h4M22 12h-4" />
</svg>
);
}
function BuilderIcon({ className }: { className?: string }): React.ReactElement {
return (
<svg
className={`w-3 h-3 ${className ?? ""}`}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.5"
>
<path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z" />
</svg>
);
}
function MedicIcon({ className }: { className?: string }): React.ReactElement {
return (
<svg
className={`w-3 h-3 ${className ?? ""}`}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.5"
>
<path d="M22 12h-4l-3 9L9 3l-3 9H2" />
</svg>
);
}
const AGENT_ICONS: Record<string, React.FC<{ className?: string }>> = {
jarvis: JarvisIcon,
builder: BuilderIcon,
medic: MedicIcon,
};
export function AgentSelector({
selectedAgent,
onChange,
disabled,
}: AgentSelectorProps): React.ReactElement {
return (
<div className="flex items-center gap-2">
<span className="text-xs font-medium" style={{ color: "rgb(var(--text-muted))" }}>
Agent
</span>
<div className="flex flex-wrap gap-1">
{Object.entries(AGENT_CONFIG).map(([name, config]) => {
const Icon = AGENT_ICONS[name];
const isSelected = selectedAgent === name;
return (
<button
key={name}
type="button"
onClick={() => onChange?.(isSelected ? null : name)}
disabled={disabled}
className={`flex items-center gap-1.5 px-2 py-1.5 rounded-lg border transition-all text-xs ${
isSelected ? "border-primary bg-primary/10 shadow-sm" : "hover:bg-muted/50"
} ${disabled ? "opacity-50 cursor-not-allowed" : ""}`}
style={{
borderColor: isSelected
? "rgb(var(--accent-primary))"
: "rgb(var(--border-default))",
color: isSelected ? "rgb(var(--accent-primary))" : "rgb(var(--text-primary))",
}}
title={`${config.displayName}${config.role}`}
>
<span
className="rounded-full"
style={{
backgroundColor: config.color,
width: "8px",
height: "8px",
}}
/>
{Icon && <Icon />}
<span className="font-medium">{config.displayName}</span>
</button>
);
})}
</div>
</div>
);
}

View File

@@ -9,6 +9,7 @@ import { useWorkspaceId } from "@/lib/hooks";
import { MessageList } from "./MessageList"; import { MessageList } from "./MessageList";
import { ChatInput, type ModelId, DEFAULT_TEMPERATURE, DEFAULT_MAX_TOKENS } from "./ChatInput"; import { ChatInput, type ModelId, DEFAULT_TEMPERATURE, DEFAULT_MAX_TOKENS } from "./ChatInput";
import { ChatEmptyState } from "./ChatEmptyState"; import { ChatEmptyState } from "./ChatEmptyState";
import { AgentSelector } from "./AgentSelector";
import type { Message } from "@/hooks/useChat"; import type { Message } from "@/hooks/useChat";
export interface ChatRef { export interface ChatRef {
@@ -66,6 +67,7 @@ export const Chat = forwardRef<ChatRef, ChatProps>(function Chat(
const [selectedModel, setSelectedModel] = useState<ModelId>("llama3.2"); const [selectedModel, setSelectedModel] = useState<ModelId>("llama3.2");
const [temperature, setTemperature] = useState<number>(DEFAULT_TEMPERATURE); const [temperature, setTemperature] = useState<number>(DEFAULT_TEMPERATURE);
const [maxTokens, setMaxTokens] = useState<number>(DEFAULT_MAX_TOKENS); const [maxTokens, setMaxTokens] = useState<number>(DEFAULT_MAX_TOKENS);
const [selectedAgent, setSelectedAgent] = useState<string | null>(null);
// Suggestion fill value: controls ChatInput's textarea content // Suggestion fill value: controls ChatInput's textarea content
const [suggestionValue, setSuggestionValue] = useState<string | undefined>(undefined); const [suggestionValue, setSuggestionValue] = useState<string | undefined>(undefined);
@@ -88,6 +90,7 @@ export const Chat = forwardRef<ChatRef, ChatProps>(function Chat(
temperature, temperature,
maxTokens, maxTokens,
...(initialProjectId !== undefined && { projectId: initialProjectId }), ...(initialProjectId !== undefined && { projectId: initialProjectId }),
...(selectedAgent !== null && { agent: selectedAgent }),
}); });
// Read workspace ID from localStorage (set by auth-context after session check). // Read workspace ID from localStorage (set by auth-context after session check).
@@ -375,6 +378,13 @@ export const Chat = forwardRef<ChatRef, ChatProps>(function Chat(
}} }}
> >
<div className="mx-auto max-w-4xl px-4 py-4 lg:px-8"> <div className="mx-auto max-w-4xl px-4 py-4 lg:px-8">
<div className="mb-3">
<AgentSelector
selectedAgent={selectedAgent}
onChange={setSelectedAgent}
disabled={isChatLoading || isStreaming || !user}
/>
</div>
<ChatInput <ChatInput
onSend={handleSendMessage} onSend={handleSendMessage}
disabled={isChatLoading || !user} disabled={isChatLoading || !user}

View File

@@ -27,6 +27,7 @@ export interface UseChatOptions {
maxTokens?: number; maxTokens?: number;
systemPrompt?: string; systemPrompt?: string;
projectId?: string | null; projectId?: string | null;
agent?: string;
onError?: (error: Error) => void; onError?: (error: Error) => void;
} }
@@ -63,6 +64,7 @@ export function useChat(options: UseChatOptions = {}): UseChatReturn {
maxTokens, maxTokens,
systemPrompt, systemPrompt,
projectId, projectId,
agent,
onError, onError,
} = options; } = options;
@@ -77,6 +79,10 @@ export function useChat(options: UseChatOptions = {}): UseChatReturn {
const projectIdRef = useRef<string | null>(projectId ?? null); const projectIdRef = useRef<string | null>(projectId ?? null);
projectIdRef.current = projectId ?? null; projectIdRef.current = projectId ?? null;
// Track agent in ref to prevent stale closures
const agentRef = useRef<string | undefined>(agent);
agentRef.current = agent;
// Track messages in ref to prevent stale closures during rapid sends // Track messages in ref to prevent stale closures during rapid sends
const messagesRef = useRef<Message[]>(messages); const messagesRef = useRef<Message[]>(messages);
messagesRef.current = messages; messagesRef.current = messages;
@@ -209,6 +215,7 @@ export function useChat(options: UseChatOptions = {}): UseChatReturn {
...(temperature !== undefined && { temperature }), ...(temperature !== undefined && { temperature }),
...(maxTokens !== undefined && { maxTokens }), ...(maxTokens !== undefined && { maxTokens }),
...(systemPrompt !== undefined && { systemPrompt }), ...(systemPrompt !== undefined && { systemPrompt }),
...(agentRef.current && { agent: agentRef.current }),
}; };
const controller = new AbortController(); const controller = new AbortController();

View File

@@ -0,0 +1,125 @@
/**
* Agent API client
* Handles agent-related API interactions
*/
import { apiGet, apiPost, apiPatch, apiDelete } from "./client";
export interface AgentStatus {
id: string;
name: string;
displayName: string;
role: string;
isActive: boolean;
containerStatus?: "running" | "stopped" | "unknown";
}
export interface UserAgent {
id: string;
userId: string;
templateId: string | null;
name: string;
displayName: string;
role: string;
personality: string;
primaryModel: string | null;
fallbackModels: string[];
toolPermissions: string[];
discordChannel: string | null;
isActive: boolean;
createdAt: string;
updatedAt: string;
}
export interface CreateUserAgentRequest {
templateId?: string;
name: string;
displayName: string;
role: string;
personality: string;
primaryModel?: string;
fallbackModels?: string[];
toolPermissions?: string[];
discordChannel?: string;
isActive?: boolean;
}
export interface UpdateUserAgentRequest {
name?: string;
displayName?: string;
role?: string;
personality?: string;
primaryModel?: string;
fallbackModels?: string[];
toolPermissions?: string[];
discordChannel?: string;
isActive?: boolean;
}
export interface UpdateUserAgentRequest {
name?: string;
displayName?: string;
role?: string;
personality?: string;
primaryModel?: string;
fallbackModels?: string[];
toolPermissions?: string[];
discordChannel?: string;
isActive?: boolean;
}
/**
* Get all user's agents
*/
export async function getAgents(): Promise<UserAgent[]> {
return apiGet<UserAgent[]>("/api/agents");
}
/**
* Get all agent statuses
*/
export async function getAgentStatuses(): Promise<AgentStatus[]> {
return apiGet<AgentStatus[]>("/api/agents/status");
}
/**
* Get a single agent by ID
*/
export async function getAgent(id: string): Promise<UserAgent> {
return apiGet<UserAgent>(`/api/agents/${id}`);
}
/**
* Get a single agent's status
*/
export async function getAgentStatus(id: string): Promise<AgentStatus> {
return apiGet<AgentStatus>(`/api/agents/${id}/status`);
}
/**
* Create a new custom agent
*/
export async function createAgent(data: CreateUserAgentRequest): Promise<UserAgent> {
return apiPost<UserAgent>("/api/agents", data);
}
/**
* Create an agent from a template
*/
export async function createAgentFromTemplate(templateId: string): Promise<UserAgent> {
return apiPost<UserAgent>(`/api/agents/from-template/${templateId}`, {});
}
/**
* Update an agent
*/
export async function updateAgent(id: string, data: UpdateUserAgentRequest): Promise<UserAgent> {
return apiPatch<UserAgent>(`/api/agents/${id}`, data);
}
/**
* Delete an agent
*/
export async function deleteAgent(id: string): Promise<void> {
await apiDelete(`/api/agents/${id}`);
}

View File

@@ -18,6 +18,7 @@ export interface ChatRequest {
temperature?: number; temperature?: number;
maxTokens?: number; maxTokens?: number;
systemPrompt?: string; systemPrompt?: string;
agent?: string;
} }
export interface ChatResponse { export interface ChatResponse {
@@ -117,7 +118,11 @@ export function streamGuestChat(
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
credentials: "include", credentials: "include",
body: JSON.stringify({ messages: request.messages, stream: true }), body: JSON.stringify({
messages: request.messages,
stream: true,
...(request.agent && { agent: request.agent }),
}),
signal: signal ?? null, signal: signal ?? null,
}); });
@@ -269,7 +274,11 @@ export function streamChatMessage(
"X-CSRF-Token": csrfToken, "X-CSRF-Token": csrfToken,
}, },
credentials: "include", credentials: "include",
body: JSON.stringify({ messages: request.messages, stream: true }), body: JSON.stringify({
messages: request.messages,
stream: true,
...(request.agent && { agent: request.agent }),
}),
signal: signal ?? null, signal: signal ?? null,
}); });

View File

@@ -10,7 +10,7 @@
**PRD:** `docs/PRD-MS22-P2-AGENT-FLEET.md` **PRD:** `docs/PRD-MS22-P2-AGENT-FLEET.md`
**Phase:** Execution **Phase:** Execution
**Status:** in-progress **Status:** in-progress
**Last Updated:** 2026-03-04 **Last Updated:** 2026-03-05
## Success Criteria ## Success Criteria
@@ -28,9 +28,9 @@
| --- | ------------- | ------------- | ---------- | -------------- | --------------------- | | --- | ------------- | ------------- | ---------- | -------------- | --------------------- |
| 1 | schema-seed | Schema+Seed | ✅ done | P2-001, P2-002 | PRs #675, #677 merged | | 1 | schema-seed | Schema+Seed | ✅ done | P2-001, P2-002 | PRs #675, #677 merged |
| 2 | admin-crud | Admin CRUD | ✅ done | P2-003 | PR #678 merged | | 2 | admin-crud | Admin CRUD | ✅ done | P2-003 | PR #678 merged |
| 3 | user-crud | User CRUD | 🔄 next | P2-004 | Depends on M2 | | 3 | user-crud | User CRUD | ✅ done | P2-004 | PR #682 merged |
| 4 | agent-routing | Agent Routing | ⬜ pending | P2-005, P2-006 | Depends on M3 | | 4 | agent-routing | Agent Routing | ✅ done | P2-005, P2-006 | PR #684 merged |
| 5 | discord-ui | Discord+UI | pending | P2-007, P2-008 | Depends on M4 | | 5 | discord-ui | Discord+UI | 🔄 partial | P2-007, P2-008 | P2-008 done (PR #685) |
| 6 | verification | Verification | ⬜ pending | P2-009, P2-010 | Final gate | | 6 | verification | Verification | ⬜ pending | P2-009, P2-010 | Final gate |
## Task Summary ## Task Summary
@@ -42,26 +42,28 @@ See `docs/TASKS.md` — MS22 Phase 2 section for full task details.
| P2-001 Schema | ✅ done | #675 | AgentTemplate + UserAgent | | P2-001 Schema | ✅ done | #675 | AgentTemplate + UserAgent |
| P2-002 Seed | ✅ done | #677 | jarvis/builder/medic templates | | P2-002 Seed | ✅ done | #677 | jarvis/builder/medic templates |
| P2-003 Admin CRUD | ✅ done | #678 | /admin/agent-templates | | P2-003 Admin CRUD | ✅ done | #678 | /admin/agent-templates |
| P2-004 User CRUD | ⬜ not-started | — | | | P2-004 User CRUD | ✅ done | #682 | /api/agents |
| P2-005 Status endpoints | ⬜ not-started | — | | | P2-005 Status endpoints | ✅ done | #684 | Agent status API |
| P2-006 Chat routing | ⬜ not-started | — | | | P2-006 Chat routing | ✅ done | #684 | Agent routing in chat proxy |
| P2-007 Discord routing | ⬜ not-started | — | | | P2-007 Discord routing | ⬜ not-started | — | |
| P2-008 WebUI selector | ⬜ not-started | — | | | P2-008 WebUI selector | ✅ done | #685 | AgentSelector component |
| P2-009 Unit tests | ⬜ not-started | — | | | P2-009 Unit tests | ⬜ not-started | — | |
| P2-010 E2E verification | ⬜ not-started | — | | | P2-010 E2E verification | ⬜ not-started | — | |
## Token Budget ## Token Budget
| Phase | Est | Used | | Phase | Est | Used |
| ----------------- | -------- | -------------------- | | ----------------- | -------- | ------------------ |
| Schema+Seed+CRUD | 30K | ~10K (done directly) | | Schema+Seed+CRUD | 30K | ~15K |
| User CRUD+Routing | 40K | | | User CRUD+Routing | 40K | ~25K |
| Discord+UI | 30K | | | Discord+UI | 30K | ~15K (P2-008 done) |
| Verification | 10K | — | | Verification | 10K | — |
| **Total** | **110K** | **~10K** | | **Total** | **110K** | **~55K** |
## Session Log ## Session Log
| Date | Work Done | | Date | Work Done |
| ---------- | ------------------------------------------------------------------ | | ---------- | ----------------------------------------------------------------------------------------------------------------- |
| 2026-03-04 | P2-001..003 shipped; CI fix; postgres rebuilt; mission initialized | | 2026-03-05 | Session 3: Completed P2-008 (WebUI agent selector) PR #685. Milestones 1-4 + P2-008 complete (3 tasks remaining). |
| 2026-03-04 | Session 2: Fixed CI security audit, merged PRs #681, #678, #682. Milestones 1-3 complete (4/6 remaining). |
| 2026-03-04 | P2-001..003 shipped; CI fix; postgres rebuilt; mission initialized |

View File

@@ -97,12 +97,12 @@ PRD: `docs/PRD-MS22-P2-AGENT-FLEET.md`
| Task ID | Status | Phase | Description | Issue | Scope | Branch | Depends On | Blocks | Assigned Worker | Started | Completed | Est Tokens | Act Tokens | Notes | | Task ID | Status | Phase | Description | Issue | Scope | Branch | Depends On | Blocks | Assigned Worker | Started | Completed | Est Tokens | Act Tokens | Notes |
| ----------- | ----------- | -------- | -------------------------------------------- | -------- | ----- | --------------------------- | ------------- | ------------- | --------------- | ---------- | ---------- | ---------- | ---------- | -------------- | | ----------- | ----------- | -------- | -------------------------------------------- | -------- | ----- | --------------------------- | ------------- | ------------- | --------------- | ---------- | ---------- | ---------- | ---------- | -------------- |
| MS22-P2-001 | done | p2-fleet | Prisma schema: AgentTemplate, UserAgent | TASKS:P2 | api | feat/ms22-p2-agent-schema | MS22-P1a | P2-002,P2-003 | orchestrator | 2026-03-04 | 2026-03-04 | 10K | 3K | PR #675 merged | | MS22-P2-001 | done | p2-fleet | Prisma schema: AgentTemplate, UserAgent | TASKS:P2 | api | feat/ms22-p2-agent-schema | MS22-P1a | P2-002,P2-003 | orchestrator | 2026-03-04 | 2026-03-04 | 10K | 3K | PR #675 merged |
| MS22-P2-002 | not-started | p2-fleet | Seed default agents (jarvis, builder, medic) | TASKS:P2 | api | feat/ms22-p2-agent-seed | P2-001 | P2-004 | — | — | — | 5K | | | | MS22-P2-002 | done | p2-fleet | Seed default agents (jarvis, builder, medic) | TASKS:P2 | api | feat/ms22-p2-agent-seed | P2-001 | P2-004 | orchestrator | 2026-03-04 | 2026-03-04 | 5K | 2K | PR #677 merged |
| MS22-P2-003 | not-started | p2-fleet | Agent template CRUD endpoints (admin) | TASKS:P2 | api | feat/ms22-p2-agent-api | P2-001 | P2-005 | — | — | — | 15K | | | | MS22-P2-003 | done | p2-fleet | Agent template CRUD endpoints (admin) | TASKS:P2 | api | feat/ms22-p2-agent-crud | P2-001 | P2-005 | orchestrator | 2026-03-04 | 2026-03-04 | 15K | 5K | PR #678 merged |
| MS22-P2-004 | not-started | p2-fleet | User agent CRUD endpoints | TASKS:P2 | api | feat/ms22-p2-agent-api | P2-002,P2-003 | P2-006 | — | — | — | 15K | | | | MS22-P2-004 | done | p2-fleet | User agent CRUD endpoints | TASKS:P2 | api | feat/ms22-p2-user-agents | P2-002,P2-003 | P2-006 | orchestrator | 2026-03-04 | 2026-03-04 | 15K | 8K | PR #682 merged |
| MS22-P2-005 | not-started | p2-fleet | Agent status endpoints | TASKS:P2 | api | feat/ms22-p2-agent-api | P2-003 | P2-008 | — | — | — | 10K | | | | MS22-P2-005 | done | p2-fleet | Agent status endpoints | TASKS:P2 | api | feat/ms22-p2-agent-routing | P2-003 | P2-008 | orchestrator | 2026-03-04 | 2026-03-04 | 10K | 5K | PR #684 merged |
| MS22-P2-006 | not-started | p2-fleet | Agent chat routing (select agent by name) | TASKS:P2 | api | feat/ms22-p2-agent-routing | P2-004 | P2-007 | — | — | — | 15K | | | | MS22-P2-006 | done | p2-fleet | Agent chat routing (select agent by name) | TASKS:P2 | api | feat/ms22-p2-agent-routing | P2-004 | P2-007 | orchestrator | 2026-03-04 | 2026-03-04 | 15K | 5K | PR #684 merged |
| MS22-P2-007 | not-started | p2-fleet | Discord channel → agent routing | TASKS:P2 | api | feat/ms22-p2-discord-router | P2-006 | P2-009 | — | — | — | 15K | — | | | MS22-P2-007 | not-started | p2-fleet | Discord channel → agent routing | TASKS:P2 | api | feat/ms22-p2-discord-router | P2-006 | P2-009 | — | — | — | 15K | — | |
| MS22-P2-008 | not-started | p2-fleet | Agent list/selector UI in WebUI | TASKS:P2 | web | feat/ms22-p2-agent-ui | P2-005 | — | — | — | — | 15K | | | | MS22-P2-008 | done | p2-fleet | Agent list/selector UI in WebUI | TASKS:P2 | web | feat/ms22-p2-agent-ui | P2-005 | — | orchestrator | 2026-03-04 | 2026-03-04 | 15K | 8K | PR #685 merged |
| MS22-P2-009 | not-started | p2-fleet | Unit tests for agent services | TASKS:P2 | api | test/ms22-p2-agent-tests | P2-007 | P2-010 | — | — | — | 15K | — | | | MS22-P2-009 | not-started | p2-fleet | Unit tests for agent services | TASKS:P2 | api | test/ms22-p2-agent-tests | P2-007 | P2-010 | — | — | — | 15K | — | |
| MS22-P2-010 | not-started | p2-fleet | E2E verification: Discord → agent → response | TASKS:P2 | stack | — | P2-009 | — | — | — | — | 10K | — | | | MS22-P2-010 | not-started | p2-fleet | E2E verification: Discord → agent → response | TASKS:P2 | stack | — | P2-009 | — | — | — | — | 10K | — | |

View File

@@ -0,0 +1,24 @@
# Mission Scratchpad — MS22-P2 Named Agent Fleet
> Append-only log. NEVER delete entries. NEVER overwrite sections.
> This is the orchestrator's working memory across sessions.
## Original Mission Prompt
```
(Paste the mission prompt here on first session)
```
## Planning Decisions
## Session Log
| Session | Date | Milestone | Tasks Done | Outcome |
| ------- | ---------- | --------- | ---------------------- | --------------------------------------------------------------------------------------------- |
| 3 | 2026-03-05 | M4+M5 | P2-008 done | Fixed corrupted AgentSelector.tsx, integrated into Chat.tsx. PR #685 merged. 8/10 tasks done. |
| 2 | 2026-03-04 | M1+M2+M3 | P2-004 done | Fixed CI security audit, merged PRs #681, #678, #682. Milestones 1-3 complete. |
| 1 | 2026-03-04 | M1+M2 | P2-001, P2-002, P2-003 | Schema, seed, and Admin CRUD complete |
## Open Questions
## Corrections