Compare commits
1 Commits
test/ms22-
...
feat/ms22-
| Author | SHA1 | Date | |
|---|---|---|---|
| 1de3e5da2b |
@@ -1,8 +1,4 @@
|
|||||||
import {
|
import { ServiceUnavailableException } from "@nestjs/common";
|
||||||
ServiceUnavailableException,
|
|
||||||
NotFoundException,
|
|
||||||
BadGatewayException,
|
|
||||||
} from "@nestjs/common";
|
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
import { ChatProxyService } from "./chat-proxy.service";
|
import { ChatProxyService } from "./chat-proxy.service";
|
||||||
|
|
||||||
@@ -13,9 +9,6 @@ describe("ChatProxyService", () => {
|
|||||||
userAgentConfig: {
|
userAgentConfig: {
|
||||||
findUnique: vi.fn(),
|
findUnique: vi.fn(),
|
||||||
},
|
},
|
||||||
userAgent: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const containerLifecycle = {
|
const containerLifecycle = {
|
||||||
@@ -23,17 +16,13 @@ describe("ChatProxyService", () => {
|
|||||||
touch: vi.fn(),
|
touch: vi.fn(),
|
||||||
};
|
};
|
||||||
|
|
||||||
const config = {
|
|
||||||
get: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let service: ChatProxyService;
|
let service: ChatProxyService;
|
||||||
let fetchMock: ReturnType<typeof vi.fn>;
|
let fetchMock: ReturnType<typeof vi.fn>;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fetchMock = vi.fn();
|
fetchMock = vi.fn();
|
||||||
vi.stubGlobal("fetch", fetchMock);
|
vi.stubGlobal("fetch", fetchMock);
|
||||||
service = new ChatProxyService(prisma as never, containerLifecycle as never, config as never);
|
service = new ChatProxyService(prisma as never, containerLifecycle as never);
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
@@ -116,135 +105,4 @@ describe("ChatProxyService", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("proxyChat with agent routing", () => {
|
|
||||||
it("includes agent config when agentName is specified", async () => {
|
|
||||||
const mockAgent = {
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
personality: "Capable, direct, proactive.",
|
|
||||||
primaryModel: "opus",
|
|
||||||
isActive: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
|
||||||
url: "http://mosaic-user-user-123:19000",
|
|
||||||
token: "gateway-token",
|
|
||||||
});
|
|
||||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
|
||||||
prisma.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
fetchMock.mockResolvedValue(new Response("event: token\ndata: hello\n\n"));
|
|
||||||
|
|
||||||
const messages = [{ role: "user", content: "Hello Jarvis" }];
|
|
||||||
await service.proxyChat(userId, messages, undefined, "jarvis");
|
|
||||||
|
|
||||||
const [, request] = fetchMock.mock.calls[0] as [string, RequestInit];
|
|
||||||
const parsedBody = JSON.parse(String(request.body));
|
|
||||||
|
|
||||||
expect(parsedBody).toEqual({
|
|
||||||
messages,
|
|
||||||
model: "opus",
|
|
||||||
stream: true,
|
|
||||||
agent: "jarvis",
|
|
||||||
agent_personality: "Capable, direct, proactive.",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws NotFoundException when agent not found", async () => {
|
|
||||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
|
||||||
url: "http://mosaic-user-user-123:19000",
|
|
||||||
token: "gateway-token",
|
|
||||||
});
|
|
||||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
|
||||||
prisma.userAgent.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
const messages = [{ role: "user", content: "Hello" }];
|
|
||||||
await expect(service.proxyChat(userId, messages, undefined, "nonexistent")).rejects.toThrow(
|
|
||||||
NotFoundException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws NotFoundException when agent is not active", async () => {
|
|
||||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
|
||||||
url: "http://mosaic-user-user-123:19000",
|
|
||||||
token: "gateway-token",
|
|
||||||
});
|
|
||||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
|
||||||
prisma.userAgent.findUnique.mockResolvedValue({
|
|
||||||
name: "inactive-agent",
|
|
||||||
displayName: "Inactive",
|
|
||||||
personality: "...",
|
|
||||||
primaryModel: null,
|
|
||||||
isActive: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const messages = [{ role: "user", content: "Hello" }];
|
|
||||||
await expect(
|
|
||||||
service.proxyChat(userId, messages, undefined, "inactive-agent")
|
|
||||||
).rejects.toThrow(NotFoundException);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("falls back to default model when agent has no primaryModel", async () => {
|
|
||||||
const mockAgent = {
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
personality: "Capable, direct, proactive.",
|
|
||||||
primaryModel: null,
|
|
||||||
isActive: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
|
||||||
url: "http://mosaic-user-user-123:19000",
|
|
||||||
token: "gateway-token",
|
|
||||||
});
|
|
||||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
|
||||||
prisma.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
prisma.userAgentConfig.findUnique.mockResolvedValue(null);
|
|
||||||
fetchMock.mockResolvedValue(new Response("event: token\ndata: hello\n\n"));
|
|
||||||
|
|
||||||
const messages = [{ role: "user", content: "Hello" }];
|
|
||||||
await service.proxyChat(userId, messages, undefined, "jarvis");
|
|
||||||
|
|
||||||
const [, request] = fetchMock.mock.calls[0] as [string, RequestInit];
|
|
||||||
const parsedBody = JSON.parse(String(request.body));
|
|
||||||
|
|
||||||
expect(parsedBody.model).toBe("openclaw:default");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("proxyGuestChat", () => {
|
|
||||||
it("uses environment variables for guest LLM configuration", async () => {
|
|
||||||
config.get.mockImplementation((key: string) => {
|
|
||||||
if (key === "GUEST_LLM_URL") return "http://10.1.1.42:11434/v1";
|
|
||||||
if (key === "GUEST_LLM_MODEL") return "llama3.2";
|
|
||||||
return undefined;
|
|
||||||
});
|
|
||||||
fetchMock.mockResolvedValue(new Response("event: token\ndata: hello\n\n"));
|
|
||||||
|
|
||||||
const messages = [{ role: "user", content: "Hello" }];
|
|
||||||
await service.proxyGuestChat(messages);
|
|
||||||
|
|
||||||
expect(fetchMock).toHaveBeenCalledWith(
|
|
||||||
"http://10.1.1.42:11434/v1/chat/completions",
|
|
||||||
expect.objectContaining({
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
const [, request] = fetchMock.mock.calls[0] as [string, RequestInit];
|
|
||||||
const parsedBody = JSON.parse(String(request.body));
|
|
||||||
expect(parsedBody.model).toBe("llama3.2");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws BadGatewayException on guest LLM errors", async () => {
|
|
||||||
config.get.mockReturnValue(undefined);
|
|
||||||
fetchMock.mockResolvedValue(new Response("Internal Server Error", { status: 500 }));
|
|
||||||
|
|
||||||
const messages = [{ role: "user", content: "Hello" }];
|
|
||||||
await expect(service.proxyGuestChat(messages)).rejects.toThrow(BadGatewayException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,300 +0,0 @@
|
|||||||
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { UserAgentService } from "./user-agent.service";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { NotFoundException, ConflictException, ForbiddenException } from "@nestjs/common";
|
|
||||||
|
|
||||||
describe("UserAgentService", () => {
|
|
||||||
let service: UserAgentService;
|
|
||||||
let prisma: PrismaService;
|
|
||||||
|
|
||||||
const mockPrismaService = {
|
|
||||||
userAgent: {
|
|
||||||
findMany: vi.fn(),
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
create: vi.fn(),
|
|
||||||
update: vi.fn(),
|
|
||||||
delete: vi.fn(),
|
|
||||||
},
|
|
||||||
agentTemplate: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockUserId = "550e8400-e29b-41d4-a716-446655440001";
|
|
||||||
const mockAgentId = "550e8400-e29b-41d4-a716-446655440002";
|
|
||||||
const mockTemplateId = "550e8400-e29b-41d4-a716-446655440003";
|
|
||||||
|
|
||||||
const mockAgent = {
|
|
||||||
id: mockAgentId,
|
|
||||||
userId: mockUserId,
|
|
||||||
templateId: null,
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
role: "orchestrator",
|
|
||||||
personality: "Capable, direct, proactive.",
|
|
||||||
primaryModel: "opus",
|
|
||||||
fallbackModels: ["sonnet"],
|
|
||||||
toolPermissions: ["all"],
|
|
||||||
discordChannel: "jarvis",
|
|
||||||
isActive: true,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockTemplate = {
|
|
||||||
id: mockTemplateId,
|
|
||||||
name: "builder",
|
|
||||||
displayName: "Builder",
|
|
||||||
role: "coding",
|
|
||||||
personality: "Focused, thorough.",
|
|
||||||
primaryModel: "codex",
|
|
||||||
fallbackModels: ["sonnet"],
|
|
||||||
toolPermissions: ["exec", "read", "write"],
|
|
||||||
discordChannel: "builder",
|
|
||||||
isActive: true,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
UserAgentService,
|
|
||||||
{
|
|
||||||
provide: PrismaService,
|
|
||||||
useValue: mockPrismaService,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<UserAgentService>(UserAgentService);
|
|
||||||
prisma = module.get<PrismaService>(PrismaService);
|
|
||||||
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should be defined", () => {
|
|
||||||
expect(service).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findAll", () => {
|
|
||||||
it("should return all agents for a user", async () => {
|
|
||||||
mockPrismaService.userAgent.findMany.mockResolvedValue([mockAgent]);
|
|
||||||
|
|
||||||
const result = await service.findAll(mockUserId);
|
|
||||||
|
|
||||||
expect(result).toEqual([mockAgent]);
|
|
||||||
expect(mockPrismaService.userAgent.findMany).toHaveBeenCalledWith({
|
|
||||||
where: { userId: mockUserId },
|
|
||||||
orderBy: { createdAt: "asc" },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should return empty array if no agents", async () => {
|
|
||||||
mockPrismaService.userAgent.findMany.mockResolvedValue([]);
|
|
||||||
|
|
||||||
const result = await service.findAll(mockUserId);
|
|
||||||
|
|
||||||
expect(result).toEqual([]);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findOne", () => {
|
|
||||||
it("should return an agent by id", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
const result = await service.findOne(mockUserId, mockAgentId);
|
|
||||||
|
|
||||||
expect(result).toEqual(mockAgent);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw NotFoundException if agent not found", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.findOne(mockUserId, mockAgentId)).rejects.toThrow(NotFoundException);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw ForbiddenException if agent belongs to different user", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue({
|
|
||||||
...mockAgent,
|
|
||||||
userId: "different-user-id",
|
|
||||||
});
|
|
||||||
|
|
||||||
await expect(service.findOne(mockUserId, mockAgentId)).rejects.toThrow(ForbiddenException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findByName", () => {
|
|
||||||
it("should return an agent by name", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
const result = await service.findByName(mockUserId, "jarvis");
|
|
||||||
|
|
||||||
expect(result).toEqual(mockAgent);
|
|
||||||
expect(mockPrismaService.userAgent.findUnique).toHaveBeenCalledWith({
|
|
||||||
where: { userId_name: { userId: mockUserId, name: "jarvis" } },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw NotFoundException if agent not found", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.findByName(mockUserId, "nonexistent")).rejects.toThrow(
|
|
||||||
NotFoundException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("create", () => {
|
|
||||||
it("should create a new agent", async () => {
|
|
||||||
const createDto = {
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
role: "orchestrator",
|
|
||||||
personality: "Capable, direct, proactive.",
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(null);
|
|
||||||
mockPrismaService.userAgent.create.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
const result = await service.create(mockUserId, createDto);
|
|
||||||
|
|
||||||
expect(result).toEqual(mockAgent);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw ConflictException if agent name already exists", async () => {
|
|
||||||
const createDto = {
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
role: "orchestrator",
|
|
||||||
personality: "Capable, direct, proactive.",
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
await expect(service.create(mockUserId, createDto)).rejects.toThrow(ConflictException);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw NotFoundException if templateId is invalid", async () => {
|
|
||||||
const createDto = {
|
|
||||||
name: "custom",
|
|
||||||
displayName: "Custom",
|
|
||||||
role: "custom",
|
|
||||||
personality: "Custom agent",
|
|
||||||
templateId: "nonexistent-template",
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(null);
|
|
||||||
mockPrismaService.agentTemplate.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.create(mockUserId, createDto)).rejects.toThrow(NotFoundException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("createFromTemplate", () => {
|
|
||||||
it("should create an agent from a template", async () => {
|
|
||||||
mockPrismaService.agentTemplate.findUnique.mockResolvedValue(mockTemplate);
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(null);
|
|
||||||
mockPrismaService.userAgent.create.mockResolvedValue({
|
|
||||||
...mockAgent,
|
|
||||||
templateId: mockTemplateId,
|
|
||||||
name: mockTemplate.name,
|
|
||||||
displayName: mockTemplate.displayName,
|
|
||||||
role: mockTemplate.role,
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await service.createFromTemplate(mockUserId, mockTemplateId);
|
|
||||||
|
|
||||||
expect(result.name).toBe(mockTemplate.name);
|
|
||||||
expect(result.displayName).toBe(mockTemplate.displayName);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw NotFoundException if template not found", async () => {
|
|
||||||
mockPrismaService.agentTemplate.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.createFromTemplate(mockUserId, mockTemplateId)).rejects.toThrow(
|
|
||||||
NotFoundException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw ConflictException if agent name already exists", async () => {
|
|
||||||
mockPrismaService.agentTemplate.findUnique.mockResolvedValue(mockTemplate);
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
await expect(service.createFromTemplate(mockUserId, mockTemplateId)).rejects.toThrow(
|
|
||||||
ConflictException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("update", () => {
|
|
||||||
it("should update an agent", async () => {
|
|
||||||
const updateDto = { displayName: "Updated Jarvis" };
|
|
||||||
const updatedAgent = { ...mockAgent, ...updateDto };
|
|
||||||
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
mockPrismaService.userAgent.update.mockResolvedValue(updatedAgent);
|
|
||||||
|
|
||||||
const result = await service.update(mockUserId, mockAgentId, updateDto);
|
|
||||||
|
|
||||||
expect(result.displayName).toBe("Updated Jarvis");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw ConflictException if new name already exists", async () => {
|
|
||||||
const updateDto = { name: "existing-name" };
|
|
||||||
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
// Second call checks for existing name
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue({ ...mockAgent, id: "other-id" });
|
|
||||||
|
|
||||||
await expect(service.update(mockUserId, mockAgentId, updateDto)).rejects.toThrow(
|
|
||||||
ConflictException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("remove", () => {
|
|
||||||
it("should delete an agent", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
mockPrismaService.userAgent.delete.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
const result = await service.remove(mockUserId, mockAgentId);
|
|
||||||
|
|
||||||
expect(result).toEqual(mockAgent);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("getStatus", () => {
|
|
||||||
it("should return agent status", async () => {
|
|
||||||
mockPrismaService.userAgent.findUnique.mockResolvedValue(mockAgent);
|
|
||||||
|
|
||||||
const result = await service.getStatus(mockUserId, mockAgentId);
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
id: mockAgentId,
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
role: "orchestrator",
|
|
||||||
isActive: true,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("getAllStatuses", () => {
|
|
||||||
it("should return all agent statuses", async () => {
|
|
||||||
mockPrismaService.userAgent.findMany.mockResolvedValue([mockAgent]);
|
|
||||||
|
|
||||||
const result = await service.getAllStatuses(mockUserId);
|
|
||||||
|
|
||||||
expect(result).toHaveLength(1);
|
|
||||||
expect(result[0]).toEqual({
|
|
||||||
id: mockAgentId,
|
|
||||||
name: "jarvis",
|
|
||||||
displayName: "Jarvis",
|
|
||||||
role: "orchestrator",
|
|
||||||
isActive: true,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -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-05
|
**Last Updated:** 2026-03-04
|
||||||
|
|
||||||
## Success Criteria
|
## Success Criteria
|
||||||
|
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
| 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 | ✅ done | P2-004 | PR #682 merged |
|
| 3 | user-crud | User CRUD | ✅ done | P2-004 | PR #682 merged |
|
||||||
| 4 | agent-routing | Agent Routing | ✅ done | P2-005, P2-006 | PR #684 merged |
|
| 4 | agent-routing | Agent Routing | ⬜ pending | P2-005, P2-006 | Depends on M3 |
|
||||||
| 5 | discord-ui | Discord+UI | 🔄 partial | P2-007, P2-008 | P2-008 done (PR #685) |
|
| 5 | discord-ui | Discord+UI | ⬜ pending | P2-007, P2-008 | Depends on M4 |
|
||||||
| 6 | verification | Verification | ⬜ pending | P2-009, P2-010 | Final gate |
|
| 6 | verification | Verification | ⬜ pending | P2-009, P2-010 | Final gate |
|
||||||
|
|
||||||
## Task Summary
|
## Task Summary
|
||||||
@@ -43,27 +43,26 @@ See `docs/TASKS.md` — MS22 Phase 2 section for full task details.
|
|||||||
| 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 | ✅ done | #682 | /api/agents |
|
| P2-004 User CRUD | ✅ done | #682 | /api/agents |
|
||||||
| P2-005 Status endpoints | ✅ done | #684 | Agent status API |
|
| P2-005 Status endpoints | ⬜ not-started | — | |
|
||||||
| P2-006 Chat routing | ✅ done | #684 | Agent routing in chat proxy |
|
| P2-006 Chat routing | ⬜ not-started | — | |
|
||||||
| P2-007 Discord routing | ⬜ not-started | — | |
|
| P2-007 Discord routing | ⬜ not-started | — | |
|
||||||
| P2-008 WebUI selector | ✅ done | #685 | AgentSelector component |
|
| P2-008 WebUI selector | ⬜ not-started | — | |
|
||||||
| 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 | ~15K |
|
| Schema+Seed+CRUD | 30K | ~15K (done directly) |
|
||||||
| User CRUD+Routing | 40K | ~25K |
|
| User CRUD+Routing | 40K | ~25K |
|
||||||
| Discord+UI | 30K | ~15K (P2-008 done) |
|
| Discord+UI | 30K | — |
|
||||||
| Verification | 10K | — |
|
| Verification | 10K | — |
|
||||||
| **Total** | **110K** | **~55K** |
|
| **Total** | **110K** | **~40K** |
|
||||||
|
|
||||||
## Session Log
|
## Session Log
|
||||||
|
|
||||||
| Date | Work Done |
|
| Date | Work Done |
|
||||||
| ---------- | ----------------------------------------------------------------------------------------------------------------- |
|
| ---------- | --------------------------------------------------------------------------------------------------------- |
|
||||||
| 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 | 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 |
|
| 2026-03-04 | P2-001..003 shipped; CI fix; postgres rebuilt; mission initialized |
|
||||||
|
|||||||
@@ -100,9 +100,9 @@ PRD: `docs/PRD-MS22-P2-AGENT-FLEET.md`
|
|||||||
| 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-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 | 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-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 | 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-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 | 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-005 | in-progress | p2-fleet | Agent status endpoints | TASKS:P2 | api | feat/ms22-p2-agent-status | P2-003 | P2-008 | orchestrator | 2026-03-04 | — | 10K | — | |
|
||||||
| 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-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-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 | 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-008 | not-started | p2-fleet | Agent list/selector UI in WebUI | TASKS:P2 | web | feat/ms22-p2-agent-ui | P2-005 | — | — | — | — | 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-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 | — | |
|
||||||
|
|||||||
@@ -14,8 +14,7 @@
|
|||||||
## Session Log
|
## Session Log
|
||||||
|
|
||||||
| Session | Date | Milestone | Tasks Done | Outcome |
|
| 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. |
|
| 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 |
|
| 1 | 2026-03-04 | M1+M2 | P2-001, P2-002, P2-003 | Schema, seed, and Admin CRUD complete |
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user