Compare commits
2 Commits
feat/ms23-
...
feat/ms23-
| Author | SHA1 | Date | |
|---|---|---|---|
| bcada71e88 | |||
| 9cc82e7fcf |
@@ -0,0 +1,54 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
Param,
|
||||||
|
Patch,
|
||||||
|
Post,
|
||||||
|
UseGuards,
|
||||||
|
UsePipes,
|
||||||
|
ValidationPipe,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import type { AgentProviderConfig } from "@prisma/client";
|
||||||
|
import { OrchestratorApiKeyGuard } from "../../common/guards/api-key.guard";
|
||||||
|
import { OrchestratorThrottlerGuard } from "../../common/guards/throttler.guard";
|
||||||
|
import { AgentProvidersService } from "./agent-providers.service";
|
||||||
|
import { CreateAgentProviderDto } from "./dto/create-agent-provider.dto";
|
||||||
|
import { UpdateAgentProviderDto } from "./dto/update-agent-provider.dto";
|
||||||
|
|
||||||
|
@Controller("agent-providers")
|
||||||
|
@UseGuards(OrchestratorApiKeyGuard, OrchestratorThrottlerGuard)
|
||||||
|
export class AgentProvidersController {
|
||||||
|
constructor(private readonly agentProvidersService: AgentProvidersService) {}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
async list(): Promise<AgentProviderConfig[]> {
|
||||||
|
return this.agentProvidersService.list();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get(":id")
|
||||||
|
async getById(@Param("id") id: string): Promise<AgentProviderConfig> {
|
||||||
|
return this.agentProvidersService.getById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
|
||||||
|
async create(@Body() dto: CreateAgentProviderDto): Promise<AgentProviderConfig> {
|
||||||
|
return this.agentProvidersService.create(dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(":id")
|
||||||
|
@UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
|
||||||
|
async update(
|
||||||
|
@Param("id") id: string,
|
||||||
|
@Body() dto: UpdateAgentProviderDto
|
||||||
|
): Promise<AgentProviderConfig> {
|
||||||
|
return this.agentProvidersService.update(id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(":id")
|
||||||
|
async delete(@Param("id") id: string): Promise<AgentProviderConfig> {
|
||||||
|
return this.agentProvidersService.delete(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import { Module } from "@nestjs/common";
|
||||||
|
import { PrismaModule } from "../../prisma/prisma.module";
|
||||||
|
import { OrchestratorApiKeyGuard } from "../../common/guards/api-key.guard";
|
||||||
|
import { AgentProvidersController } from "./agent-providers.controller";
|
||||||
|
import { AgentProvidersService } from "./agent-providers.service";
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [PrismaModule],
|
||||||
|
controllers: [AgentProvidersController],
|
||||||
|
providers: [OrchestratorApiKeyGuard, AgentProvidersService],
|
||||||
|
})
|
||||||
|
export class AgentProvidersModule {}
|
||||||
@@ -0,0 +1,211 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { NotFoundException } from "@nestjs/common";
|
||||||
|
import { AgentProvidersService } from "./agent-providers.service";
|
||||||
|
import { PrismaService } from "../../prisma/prisma.service";
|
||||||
|
|
||||||
|
describe("AgentProvidersService", () => {
|
||||||
|
let service: AgentProvidersService;
|
||||||
|
let prisma: {
|
||||||
|
agentProviderConfig: {
|
||||||
|
findMany: ReturnType<typeof vi.fn>;
|
||||||
|
findUnique: ReturnType<typeof vi.fn>;
|
||||||
|
create: ReturnType<typeof vi.fn>;
|
||||||
|
update: ReturnType<typeof vi.fn>;
|
||||||
|
delete: ReturnType<typeof vi.fn>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
prisma = {
|
||||||
|
agentProviderConfig: {
|
||||||
|
findMany: vi.fn(),
|
||||||
|
findUnique: vi.fn(),
|
||||||
|
create: vi.fn(),
|
||||||
|
update: vi.fn(),
|
||||||
|
delete: vi.fn(),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
service = new AgentProvidersService(prisma as unknown as PrismaService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("lists all provider configs", async () => {
|
||||||
|
const expected = [
|
||||||
|
{
|
||||||
|
id: "cfg-1",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "Primary",
|
||||||
|
provider: "openai",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: {},
|
||||||
|
isActive: true,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
prisma.agentProviderConfig.findMany.mockResolvedValue(expected);
|
||||||
|
|
||||||
|
const result = await service.list();
|
||||||
|
|
||||||
|
expect(prisma.agentProviderConfig.findMany).toHaveBeenCalledWith({
|
||||||
|
orderBy: [{ createdAt: "desc" }, { id: "desc" }],
|
||||||
|
});
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns a single provider config", async () => {
|
||||||
|
const expected = {
|
||||||
|
id: "cfg-1",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "Primary",
|
||||||
|
provider: "openai",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: { apiKeyRef: "vault:openai" },
|
||||||
|
isActive: true,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
};
|
||||||
|
prisma.agentProviderConfig.findUnique.mockResolvedValue(expected);
|
||||||
|
|
||||||
|
const result = await service.getById("cfg-1");
|
||||||
|
|
||||||
|
expect(prisma.agentProviderConfig.findUnique).toHaveBeenCalledWith({
|
||||||
|
where: { id: "cfg-1" },
|
||||||
|
});
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws NotFoundException when provider config is missing", async () => {
|
||||||
|
prisma.agentProviderConfig.findUnique.mockResolvedValue(null);
|
||||||
|
|
||||||
|
await expect(service.getById("missing")).rejects.toBeInstanceOf(NotFoundException);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("creates a provider config with default credentials", async () => {
|
||||||
|
const created = {
|
||||||
|
id: "cfg-created",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "New Provider",
|
||||||
|
provider: "claude",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: {},
|
||||||
|
isActive: true,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
};
|
||||||
|
prisma.agentProviderConfig.create.mockResolvedValue(created);
|
||||||
|
|
||||||
|
const result = await service.create({
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "New Provider",
|
||||||
|
provider: "claude",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(prisma.agentProviderConfig.create).toHaveBeenCalledWith({
|
||||||
|
data: {
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "New Provider",
|
||||||
|
provider: "claude",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: {},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(result).toEqual(created);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("updates a provider config", async () => {
|
||||||
|
prisma.agentProviderConfig.findUnique.mockResolvedValue({
|
||||||
|
id: "cfg-1",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "Primary",
|
||||||
|
provider: "openai",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: {},
|
||||||
|
isActive: true,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
});
|
||||||
|
|
||||||
|
const updated = {
|
||||||
|
id: "cfg-1",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "Secondary",
|
||||||
|
provider: "openai",
|
||||||
|
gatewayUrl: "https://gateway2.example.com",
|
||||||
|
credentials: { apiKeyRef: "vault:new" },
|
||||||
|
isActive: false,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T19:00:00.000Z"),
|
||||||
|
};
|
||||||
|
prisma.agentProviderConfig.update.mockResolvedValue(updated);
|
||||||
|
|
||||||
|
const result = await service.update("cfg-1", {
|
||||||
|
name: "Secondary",
|
||||||
|
gatewayUrl: "https://gateway2.example.com",
|
||||||
|
credentials: { apiKeyRef: "vault:new" },
|
||||||
|
isActive: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(prisma.agentProviderConfig.update).toHaveBeenCalledWith({
|
||||||
|
where: { id: "cfg-1" },
|
||||||
|
data: {
|
||||||
|
name: "Secondary",
|
||||||
|
gatewayUrl: "https://gateway2.example.com",
|
||||||
|
credentials: { apiKeyRef: "vault:new" },
|
||||||
|
isActive: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(result).toEqual(updated);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws NotFoundException when updating a missing provider config", async () => {
|
||||||
|
prisma.agentProviderConfig.findUnique.mockResolvedValue(null);
|
||||||
|
|
||||||
|
await expect(service.update("missing", { name: "Updated" })).rejects.toBeInstanceOf(
|
||||||
|
NotFoundException
|
||||||
|
);
|
||||||
|
expect(prisma.agentProviderConfig.update).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("deletes a provider config", async () => {
|
||||||
|
prisma.agentProviderConfig.findUnique.mockResolvedValue({
|
||||||
|
id: "cfg-1",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "Primary",
|
||||||
|
provider: "openai",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: {},
|
||||||
|
isActive: true,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
});
|
||||||
|
|
||||||
|
const deleted = {
|
||||||
|
id: "cfg-1",
|
||||||
|
workspaceId: "8bcd7eda-a122-4d6c-adfd-b152f6f75369",
|
||||||
|
name: "Primary",
|
||||||
|
provider: "openai",
|
||||||
|
gatewayUrl: "https://gateway.example.com",
|
||||||
|
credentials: {},
|
||||||
|
isActive: true,
|
||||||
|
createdAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T18:00:00.000Z"),
|
||||||
|
};
|
||||||
|
prisma.agentProviderConfig.delete.mockResolvedValue(deleted);
|
||||||
|
|
||||||
|
const result = await service.delete("cfg-1");
|
||||||
|
|
||||||
|
expect(prisma.agentProviderConfig.delete).toHaveBeenCalledWith({
|
||||||
|
where: { id: "cfg-1" },
|
||||||
|
});
|
||||||
|
expect(result).toEqual(deleted);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws NotFoundException when deleting a missing provider config", async () => {
|
||||||
|
prisma.agentProviderConfig.findUnique.mockResolvedValue(null);
|
||||||
|
|
||||||
|
await expect(service.delete("missing")).rejects.toBeInstanceOf(NotFoundException);
|
||||||
|
expect(prisma.agentProviderConfig.delete).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
import { Injectable, NotFoundException } from "@nestjs/common";
|
||||||
|
import type { AgentProviderConfig, Prisma } from "@prisma/client";
|
||||||
|
import { PrismaService } from "../../prisma/prisma.service";
|
||||||
|
import { CreateAgentProviderDto } from "./dto/create-agent-provider.dto";
|
||||||
|
import { UpdateAgentProviderDto } from "./dto/update-agent-provider.dto";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AgentProvidersService {
|
||||||
|
constructor(private readonly prisma: PrismaService) {}
|
||||||
|
|
||||||
|
async list(): Promise<AgentProviderConfig[]> {
|
||||||
|
return this.prisma.agentProviderConfig.findMany({
|
||||||
|
orderBy: [{ createdAt: "desc" }, { id: "desc" }],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async getById(id: string): Promise<AgentProviderConfig> {
|
||||||
|
const providerConfig = await this.prisma.agentProviderConfig.findUnique({
|
||||||
|
where: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!providerConfig) {
|
||||||
|
throw new NotFoundException(`Agent provider config with id ${id} not found`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return providerConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
async create(dto: CreateAgentProviderDto): Promise<AgentProviderConfig> {
|
||||||
|
return this.prisma.agentProviderConfig.create({
|
||||||
|
data: {
|
||||||
|
workspaceId: dto.workspaceId,
|
||||||
|
name: dto.name,
|
||||||
|
provider: dto.provider,
|
||||||
|
gatewayUrl: dto.gatewayUrl,
|
||||||
|
credentials: this.toJsonValue(dto.credentials ?? {}),
|
||||||
|
...(dto.isActive !== undefined ? { isActive: dto.isActive } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(id: string, dto: UpdateAgentProviderDto): Promise<AgentProviderConfig> {
|
||||||
|
await this.getById(id);
|
||||||
|
|
||||||
|
const data: Prisma.AgentProviderConfigUpdateInput = {
|
||||||
|
...(dto.workspaceId !== undefined ? { workspaceId: dto.workspaceId } : {}),
|
||||||
|
...(dto.name !== undefined ? { name: dto.name } : {}),
|
||||||
|
...(dto.provider !== undefined ? { provider: dto.provider } : {}),
|
||||||
|
...(dto.gatewayUrl !== undefined ? { gatewayUrl: dto.gatewayUrl } : {}),
|
||||||
|
...(dto.isActive !== undefined ? { isActive: dto.isActive } : {}),
|
||||||
|
...(dto.credentials !== undefined ? { credentials: this.toJsonValue(dto.credentials) } : {}),
|
||||||
|
};
|
||||||
|
|
||||||
|
return this.prisma.agentProviderConfig.update({
|
||||||
|
where: { id },
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(id: string): Promise<AgentProviderConfig> {
|
||||||
|
await this.getById(id);
|
||||||
|
|
||||||
|
return this.prisma.agentProviderConfig.delete({
|
||||||
|
where: { id },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private toJsonValue(value: Record<string, unknown>): Prisma.InputJsonValue {
|
||||||
|
return value as Prisma.InputJsonValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { IsBoolean, IsNotEmpty, IsObject, IsOptional, IsString, IsUUID } from "class-validator";
|
||||||
|
|
||||||
|
export class CreateAgentProviderDto {
|
||||||
|
@IsUUID()
|
||||||
|
workspaceId!: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
name!: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
provider!: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
gatewayUrl!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsObject()
|
||||||
|
credentials?: Record<string, unknown>;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isActive?: boolean;
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { IsBoolean, IsNotEmpty, IsObject, IsOptional, IsString, IsUUID } from "class-validator";
|
||||||
|
|
||||||
|
export class UpdateAgentProviderDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
workspaceId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
name?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
provider?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
gatewayUrl?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsObject()
|
||||||
|
credentials?: Record<string, unknown>;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isActive?: boolean;
|
||||||
|
}
|
||||||
137
apps/orchestrator/src/api/agents/agent-provider.registry.spec.ts
Normal file
137
apps/orchestrator/src/api/agents/agent-provider.registry.spec.ts
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
import { Logger } from "@nestjs/common";
|
||||||
|
import type {
|
||||||
|
AgentMessage,
|
||||||
|
AgentSession,
|
||||||
|
AgentSessionList,
|
||||||
|
IAgentProvider,
|
||||||
|
InjectResult,
|
||||||
|
} from "@mosaic/shared";
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { AgentProviderRegistry } from "./agent-provider.registry";
|
||||||
|
import { InternalAgentProvider } from "./internal-agent.provider";
|
||||||
|
|
||||||
|
type MockProvider = IAgentProvider & {
|
||||||
|
listSessions: ReturnType<typeof vi.fn>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const emptyMessageStream = async function* (): AsyncIterable<AgentMessage> {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
const createProvider = (providerId: string, sessions: AgentSession[] = []): MockProvider => {
|
||||||
|
return {
|
||||||
|
providerId,
|
||||||
|
providerType: providerId,
|
||||||
|
displayName: providerId,
|
||||||
|
listSessions: vi.fn().mockResolvedValue({
|
||||||
|
sessions,
|
||||||
|
total: sessions.length,
|
||||||
|
} as AgentSessionList),
|
||||||
|
getSession: vi.fn().mockResolvedValue(null),
|
||||||
|
getMessages: vi.fn().mockResolvedValue([]),
|
||||||
|
injectMessage: vi.fn().mockResolvedValue({ accepted: true } as InjectResult),
|
||||||
|
pauseSession: vi.fn().mockResolvedValue(undefined),
|
||||||
|
resumeSession: vi.fn().mockResolvedValue(undefined),
|
||||||
|
killSession: vi.fn().mockResolvedValue(undefined),
|
||||||
|
streamMessages: vi.fn().mockReturnValue(emptyMessageStream()),
|
||||||
|
isAvailable: vi.fn().mockResolvedValue(true),
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
describe("AgentProviderRegistry", () => {
|
||||||
|
let registry: AgentProviderRegistry;
|
||||||
|
let internalProvider: MockProvider;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
internalProvider = createProvider("internal");
|
||||||
|
registry = new AgentProviderRegistry(internalProvider as unknown as InternalAgentProvider);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("registers InternalAgentProvider on module init", () => {
|
||||||
|
registry.onModuleInit();
|
||||||
|
|
||||||
|
expect(registry.getProvider("internal")).toBe(internalProvider);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("registers providers and returns null for unknown provider ids", () => {
|
||||||
|
const externalProvider = createProvider("openclaw");
|
||||||
|
|
||||||
|
registry.registerProvider(externalProvider);
|
||||||
|
|
||||||
|
expect(registry.getProvider("openclaw")).toBe(externalProvider);
|
||||||
|
expect(registry.getProvider("missing")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("aggregates and sorts sessions from all providers", async () => {
|
||||||
|
const internalSessions: AgentSession[] = [
|
||||||
|
{
|
||||||
|
id: "session-older",
|
||||||
|
providerId: "internal",
|
||||||
|
providerType: "internal",
|
||||||
|
status: "active",
|
||||||
|
createdAt: new Date("2026-03-07T10:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T10:10:00.000Z"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const externalSessions: AgentSession[] = [
|
||||||
|
{
|
||||||
|
id: "session-newer",
|
||||||
|
providerId: "openclaw",
|
||||||
|
providerType: "external",
|
||||||
|
status: "paused",
|
||||||
|
createdAt: new Date("2026-03-07T09:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T10:20:00.000Z"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
internalProvider.listSessions.mockResolvedValue({
|
||||||
|
sessions: internalSessions,
|
||||||
|
total: internalSessions.length,
|
||||||
|
} as AgentSessionList);
|
||||||
|
|
||||||
|
const externalProvider = createProvider("openclaw", externalSessions);
|
||||||
|
registry.onModuleInit();
|
||||||
|
registry.registerProvider(externalProvider);
|
||||||
|
|
||||||
|
const result = await registry.listAllSessions();
|
||||||
|
|
||||||
|
expect(result.map((session) => session.id)).toEqual(["session-newer", "session-older"]);
|
||||||
|
expect(internalProvider.listSessions).toHaveBeenCalledTimes(1);
|
||||||
|
expect(externalProvider.listSessions).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("skips provider failures and logs warning", async () => {
|
||||||
|
const warnSpy = vi.spyOn(Logger.prototype, "warn").mockImplementation(() => undefined);
|
||||||
|
|
||||||
|
const healthyProvider = createProvider("healthy", [
|
||||||
|
{
|
||||||
|
id: "session-1",
|
||||||
|
providerId: "healthy",
|
||||||
|
providerType: "external",
|
||||||
|
status: "active",
|
||||||
|
createdAt: new Date("2026-03-07T11:00:00.000Z"),
|
||||||
|
updatedAt: new Date("2026-03-07T11:00:00.000Z"),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const failingProvider = createProvider("failing");
|
||||||
|
failingProvider.listSessions.mockRejectedValue(new Error("provider offline"));
|
||||||
|
|
||||||
|
registry.onModuleInit();
|
||||||
|
registry.registerProvider(healthyProvider);
|
||||||
|
registry.registerProvider(failingProvider);
|
||||||
|
|
||||||
|
const result = await registry.listAllSessions();
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]?.id).toBe("session-1");
|
||||||
|
expect(warnSpy).toHaveBeenCalledWith(
|
||||||
|
expect.stringContaining("Failed to list sessions for provider failing")
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
57
apps/orchestrator/src/api/agents/agent-provider.registry.ts
Normal file
57
apps/orchestrator/src/api/agents/agent-provider.registry.ts
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
import { Injectable, Logger, OnModuleInit } from "@nestjs/common";
|
||||||
|
import type { AgentSession, IAgentProvider } from "@mosaic/shared";
|
||||||
|
import { InternalAgentProvider } from "./internal-agent.provider";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AgentProviderRegistry implements OnModuleInit {
|
||||||
|
private readonly logger = new Logger(AgentProviderRegistry.name);
|
||||||
|
private readonly providers = new Map<string, IAgentProvider>();
|
||||||
|
|
||||||
|
constructor(private readonly internalProvider: InternalAgentProvider) {}
|
||||||
|
|
||||||
|
onModuleInit(): void {
|
||||||
|
this.registerProvider(this.internalProvider);
|
||||||
|
}
|
||||||
|
|
||||||
|
registerProvider(provider: IAgentProvider): void {
|
||||||
|
const existingProvider = this.providers.get(provider.providerId);
|
||||||
|
if (existingProvider !== undefined) {
|
||||||
|
this.logger.warn(`Replacing existing provider registration for ${provider.providerId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.providers.set(provider.providerId, provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
getProvider(providerId: string): IAgentProvider | null {
|
||||||
|
return this.providers.get(providerId) ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async listAllSessions(): Promise<AgentSession[]> {
|
||||||
|
const providers = [...this.providers.values()];
|
||||||
|
const sessionsByProvider = await Promise.all(
|
||||||
|
providers.map(async (provider) => {
|
||||||
|
try {
|
||||||
|
const { sessions } = await provider.listSessions();
|
||||||
|
return sessions;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to list sessions for provider ${provider.providerId}: ${this.toErrorMessage(error)}`
|
||||||
|
);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
return sessionsByProvider
|
||||||
|
.flat()
|
||||||
|
.sort((left, right) => right.updatedAt.getTime() - left.updatedAt.getTime());
|
||||||
|
}
|
||||||
|
|
||||||
|
private toErrorMessage(error: unknown): string {
|
||||||
|
if (error instanceof Error) {
|
||||||
|
return error.message;
|
||||||
|
}
|
||||||
|
|
||||||
|
return String(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ import { AgentMessagesService } from "./agent-messages.service";
|
|||||||
import { AgentControlService } from "./agent-control.service";
|
import { AgentControlService } from "./agent-control.service";
|
||||||
import { AgentTreeService } from "./agent-tree.service";
|
import { AgentTreeService } from "./agent-tree.service";
|
||||||
import { InternalAgentProvider } from "./internal-agent.provider";
|
import { InternalAgentProvider } from "./internal-agent.provider";
|
||||||
|
import { AgentProviderRegistry } from "./agent-provider.registry";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [QueueModule, SpawnerModule, KillswitchModule, ValkeyModule, PrismaModule],
|
imports: [QueueModule, SpawnerModule, KillswitchModule, ValkeyModule, PrismaModule],
|
||||||
@@ -22,7 +23,8 @@ import { InternalAgentProvider } from "./internal-agent.provider";
|
|||||||
AgentControlService,
|
AgentControlService,
|
||||||
AgentTreeService,
|
AgentTreeService,
|
||||||
InternalAgentProvider,
|
InternalAgentProvider,
|
||||||
|
AgentProviderRegistry,
|
||||||
],
|
],
|
||||||
exports: [InternalAgentProvider],
|
exports: [InternalAgentProvider, AgentProviderRegistry],
|
||||||
})
|
})
|
||||||
export class AgentsModule {}
|
export class AgentsModule {}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { ThrottlerModule } from "@nestjs/throttler";
|
|||||||
import { HealthModule } from "./api/health/health.module";
|
import { HealthModule } from "./api/health/health.module";
|
||||||
import { AgentsModule } from "./api/agents/agents.module";
|
import { AgentsModule } from "./api/agents/agents.module";
|
||||||
import { QueueApiModule } from "./api/queue/queue-api.module";
|
import { QueueApiModule } from "./api/queue/queue-api.module";
|
||||||
|
import { AgentProvidersModule } from "./api/agent-providers/agent-providers.module";
|
||||||
import { CoordinatorModule } from "./coordinator/coordinator.module";
|
import { CoordinatorModule } from "./coordinator/coordinator.module";
|
||||||
import { BudgetModule } from "./budget/budget.module";
|
import { BudgetModule } from "./budget/budget.module";
|
||||||
import { CIModule } from "./ci";
|
import { CIModule } from "./ci";
|
||||||
@@ -51,6 +52,7 @@ import { orchestratorConfig } from "./config/orchestrator.config";
|
|||||||
]),
|
]),
|
||||||
HealthModule,
|
HealthModule,
|
||||||
AgentsModule,
|
AgentsModule,
|
||||||
|
AgentProvidersModule,
|
||||||
QueueApiModule,
|
QueueApiModule,
|
||||||
CoordinatorModule,
|
CoordinatorModule,
|
||||||
BudgetModule,
|
BudgetModule,
|
||||||
|
|||||||
Reference in New Issue
Block a user