Compare commits
4 Commits
feat/ms23-
...
chore/ms23
| Author | SHA1 | Date | |
|---|---|---|---|
| e57b84af1a | |||
| d0c6622de5 | |||
| 4749f52668 | |||
| e0b28c91c3 |
68
apps/orchestrator/src/api/agents/agent-control.service.ts
Normal file
68
apps/orchestrator/src/api/agents/agent-control.service.ts
Normal file
@@ -0,0 +1,68 @@
|
||||
import { Injectable } from "@nestjs/common";
|
||||
import type { Prisma } from "@prisma/client";
|
||||
import { PrismaService } from "../../prisma/prisma.service";
|
||||
|
||||
@Injectable()
|
||||
export class AgentControlService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
private toJsonValue(value: Record<string, unknown>): Prisma.InputJsonValue {
|
||||
return value as Prisma.InputJsonValue;
|
||||
}
|
||||
|
||||
private async createOperatorAuditLog(
|
||||
agentId: string,
|
||||
operatorId: string,
|
||||
action: "inject" | "pause" | "resume",
|
||||
payload: Record<string, unknown>
|
||||
): Promise<void> {
|
||||
await this.prisma.operatorAuditLog.create({
|
||||
data: {
|
||||
sessionId: agentId,
|
||||
userId: operatorId,
|
||||
provider: "internal",
|
||||
action,
|
||||
metadata: this.toJsonValue({ payload }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async injectMessage(agentId: string, operatorId: string, message: string): Promise<void> {
|
||||
const treeEntry = await this.prisma.agentSessionTree.findUnique({
|
||||
where: { sessionId: agentId },
|
||||
select: { id: true },
|
||||
});
|
||||
|
||||
if (treeEntry) {
|
||||
await this.prisma.agentConversationMessage.create({
|
||||
data: {
|
||||
sessionId: agentId,
|
||||
role: "operator",
|
||||
content: message,
|
||||
provider: "internal",
|
||||
metadata: this.toJsonValue({}),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
await this.createOperatorAuditLog(agentId, operatorId, "inject", { message });
|
||||
}
|
||||
|
||||
async pauseAgent(agentId: string, operatorId: string): Promise<void> {
|
||||
await this.prisma.agentSessionTree.updateMany({
|
||||
where: { sessionId: agentId },
|
||||
data: { status: "paused" },
|
||||
});
|
||||
|
||||
await this.createOperatorAuditLog(agentId, operatorId, "pause", {});
|
||||
}
|
||||
|
||||
async resumeAgent(agentId: string, operatorId: string): Promise<void> {
|
||||
await this.prisma.agentSessionTree.updateMany({
|
||||
where: { sessionId: agentId },
|
||||
data: { status: "running" },
|
||||
});
|
||||
|
||||
await this.createOperatorAuditLog(agentId, operatorId, "resume", {});
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import { AgentLifecycleService } from "../../spawner/agent-lifecycle.service";
|
||||
import { KillswitchService } from "../../killswitch/killswitch.service";
|
||||
import { AgentEventsService } from "./agent-events.service";
|
||||
import { AgentMessagesService } from "./agent-messages.service";
|
||||
import { AgentControlService } from "./agent-control.service";
|
||||
import type { KillAllResult } from "../../killswitch/killswitch.service";
|
||||
|
||||
describe("AgentsController - Killswitch Endpoints", () => {
|
||||
@@ -35,6 +36,11 @@ describe("AgentsController - Killswitch Endpoints", () => {
|
||||
getReplayMessages: ReturnType<typeof vi.fn>;
|
||||
getMessagesAfter: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
let mockControlService: {
|
||||
injectMessage: ReturnType<typeof vi.fn>;
|
||||
pauseAgent: ReturnType<typeof vi.fn>;
|
||||
resumeAgent: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
mockKillswitchService = {
|
||||
@@ -77,13 +83,20 @@ describe("AgentsController - Killswitch Endpoints", () => {
|
||||
getMessagesAfter: vi.fn().mockResolvedValue([]),
|
||||
};
|
||||
|
||||
mockControlService = {
|
||||
injectMessage: vi.fn().mockResolvedValue(undefined),
|
||||
pauseAgent: vi.fn().mockResolvedValue(undefined),
|
||||
resumeAgent: vi.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
controller = new AgentsController(
|
||||
mockQueueService as unknown as QueueService,
|
||||
mockSpawnerService as unknown as AgentSpawnerService,
|
||||
mockLifecycleService as unknown as AgentLifecycleService,
|
||||
mockKillswitchService as unknown as KillswitchService,
|
||||
mockEventsService as unknown as AgentEventsService,
|
||||
mockMessagesService as unknown as AgentMessagesService
|
||||
mockMessagesService as unknown as AgentMessagesService,
|
||||
mockControlService as unknown as AgentControlService
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import { AgentLifecycleService } from "../../spawner/agent-lifecycle.service";
|
||||
import { KillswitchService } from "../../killswitch/killswitch.service";
|
||||
import { AgentEventsService } from "./agent-events.service";
|
||||
import { AgentMessagesService } from "./agent-messages.service";
|
||||
import { AgentControlService } from "./agent-control.service";
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
|
||||
|
||||
describe("AgentsController", () => {
|
||||
@@ -36,6 +37,11 @@ describe("AgentsController", () => {
|
||||
getReplayMessages: ReturnType<typeof vi.fn>;
|
||||
getMessagesAfter: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
let controlService: {
|
||||
injectMessage: ReturnType<typeof vi.fn>;
|
||||
pauseAgent: ReturnType<typeof vi.fn>;
|
||||
resumeAgent: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
// Create mock services
|
||||
@@ -81,6 +87,12 @@ describe("AgentsController", () => {
|
||||
getMessagesAfter: vi.fn().mockResolvedValue([]),
|
||||
};
|
||||
|
||||
controlService = {
|
||||
injectMessage: vi.fn().mockResolvedValue(undefined),
|
||||
pauseAgent: vi.fn().mockResolvedValue(undefined),
|
||||
resumeAgent: vi.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
// Create controller with mocked services
|
||||
controller = new AgentsController(
|
||||
queueService as unknown as QueueService,
|
||||
@@ -88,7 +100,8 @@ describe("AgentsController", () => {
|
||||
lifecycleService as unknown as AgentLifecycleService,
|
||||
killswitchService as unknown as KillswitchService,
|
||||
eventsService as unknown as AgentEventsService,
|
||||
messagesService as unknown as AgentMessagesService
|
||||
messagesService as unknown as AgentMessagesService,
|
||||
controlService as unknown as AgentControlService
|
||||
);
|
||||
});
|
||||
|
||||
@@ -378,6 +391,47 @@ describe("AgentsController", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("agent control endpoints", () => {
|
||||
const agentId = "0b64079f-4487-42b9-92eb-cf8ea0042a64";
|
||||
|
||||
it("should inject an operator message", async () => {
|
||||
const req = { apiKey: "control-key" };
|
||||
|
||||
const result = await controller.injectAgentMessage(
|
||||
agentId,
|
||||
{ message: "pause and summarize" },
|
||||
req
|
||||
);
|
||||
|
||||
expect(controlService.injectMessage).toHaveBeenCalledWith(
|
||||
agentId,
|
||||
"control-key",
|
||||
"pause and summarize"
|
||||
);
|
||||
expect(result).toEqual({ message: `Message injected into agent ${agentId}` });
|
||||
});
|
||||
|
||||
it("should default operator id when request api key is missing", async () => {
|
||||
await controller.injectAgentMessage(agentId, { message: "continue" }, {});
|
||||
|
||||
expect(controlService.injectMessage).toHaveBeenCalledWith(agentId, "operator", "continue");
|
||||
});
|
||||
|
||||
it("should pause an agent", async () => {
|
||||
const result = await controller.pauseAgent(agentId, {}, { apiKey: "ops-user" });
|
||||
|
||||
expect(controlService.pauseAgent).toHaveBeenCalledWith(agentId, "ops-user");
|
||||
expect(result).toEqual({ message: `Agent ${agentId} paused` });
|
||||
});
|
||||
|
||||
it("should resume an agent", async () => {
|
||||
const result = await controller.resumeAgent(agentId, {}, { apiKey: "ops-user" });
|
||||
|
||||
expect(controlService.resumeAgent).toHaveBeenCalledWith(agentId, "ops-user");
|
||||
expect(result).toEqual({ message: `Agent ${agentId} resumed` });
|
||||
});
|
||||
});
|
||||
|
||||
describe("getAgentMessages", () => {
|
||||
it("should return paginated message history", async () => {
|
||||
const agentId = "0b64079f-4487-42b9-92eb-cf8ea0042a64";
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
Sse,
|
||||
MessageEvent,
|
||||
Query,
|
||||
Request,
|
||||
} from "@nestjs/common";
|
||||
import type { AgentConversationMessage } from "@prisma/client";
|
||||
import { Throttle } from "@nestjs/throttler";
|
||||
@@ -28,6 +29,9 @@ import { OrchestratorThrottlerGuard } from "../../common/guards/throttler.guard"
|
||||
import { AgentEventsService } from "./agent-events.service";
|
||||
import { GetMessagesQueryDto } from "./dto/get-messages-query.dto";
|
||||
import { AgentMessagesService } from "./agent-messages.service";
|
||||
import { AgentControlService } from "./agent-control.service";
|
||||
import { InjectAgentDto } from "./dto/inject-agent.dto";
|
||||
import { PauseAgentDto, ResumeAgentDto } from "./dto/control-agent.dto";
|
||||
|
||||
/**
|
||||
* Controller for agent management endpoints
|
||||
@@ -51,7 +55,8 @@ export class AgentsController {
|
||||
private readonly lifecycleService: AgentLifecycleService,
|
||||
private readonly killswitchService: KillswitchService,
|
||||
private readonly eventsService: AgentEventsService,
|
||||
private readonly messagesService: AgentMessagesService
|
||||
private readonly messagesService: AgentMessagesService,
|
||||
private readonly agentControlService: AgentControlService
|
||||
) {}
|
||||
|
||||
/**
|
||||
@@ -374,6 +379,57 @@ export class AgentsController {
|
||||
}
|
||||
}
|
||||
|
||||
@Post(":agentId/inject")
|
||||
@Throttle({ default: { limit: 10, ttl: 60000 } })
|
||||
@HttpCode(200)
|
||||
@UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
|
||||
async injectAgentMessage(
|
||||
@Param("agentId", ParseUUIDPipe) agentId: string,
|
||||
@Body() dto: InjectAgentDto,
|
||||
@Request() req: { apiKey?: string }
|
||||
): Promise<{ message: string }> {
|
||||
const operatorId = req.apiKey ?? "operator";
|
||||
await this.agentControlService.injectMessage(agentId, operatorId, dto.message);
|
||||
|
||||
return {
|
||||
message: `Message injected into agent ${agentId}`,
|
||||
};
|
||||
}
|
||||
|
||||
@Post(":agentId/pause")
|
||||
@Throttle({ default: { limit: 10, ttl: 60000 } })
|
||||
@HttpCode(200)
|
||||
@UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
|
||||
async pauseAgent(
|
||||
@Param("agentId", ParseUUIDPipe) agentId: string,
|
||||
@Body() _dto: PauseAgentDto,
|
||||
@Request() req: { apiKey?: string }
|
||||
): Promise<{ message: string }> {
|
||||
const operatorId = req.apiKey ?? "operator";
|
||||
await this.agentControlService.pauseAgent(agentId, operatorId);
|
||||
|
||||
return {
|
||||
message: `Agent ${agentId} paused`,
|
||||
};
|
||||
}
|
||||
|
||||
@Post(":agentId/resume")
|
||||
@Throttle({ default: { limit: 10, ttl: 60000 } })
|
||||
@HttpCode(200)
|
||||
@UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
|
||||
async resumeAgent(
|
||||
@Param("agentId", ParseUUIDPipe) agentId: string,
|
||||
@Body() _dto: ResumeAgentDto,
|
||||
@Request() req: { apiKey?: string }
|
||||
): Promise<{ message: string }> {
|
||||
const operatorId = req.apiKey ?? "operator";
|
||||
await this.agentControlService.resumeAgent(agentId, operatorId);
|
||||
|
||||
return {
|
||||
message: `Agent ${agentId} resumed`,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Kill all active agents
|
||||
* @returns Summary of kill operation
|
||||
|
||||
@@ -8,10 +8,16 @@ import { OrchestratorApiKeyGuard } from "../../common/guards/api-key.guard";
|
||||
import { AgentEventsService } from "./agent-events.service";
|
||||
import { PrismaModule } from "../../prisma/prisma.module";
|
||||
import { AgentMessagesService } from "./agent-messages.service";
|
||||
import { AgentControlService } from "./agent-control.service";
|
||||
|
||||
@Module({
|
||||
imports: [QueueModule, SpawnerModule, KillswitchModule, ValkeyModule, PrismaModule],
|
||||
controllers: [AgentsController],
|
||||
providers: [OrchestratorApiKeyGuard, AgentEventsService, AgentMessagesService],
|
||||
providers: [
|
||||
OrchestratorApiKeyGuard,
|
||||
AgentEventsService,
|
||||
AgentMessagesService,
|
||||
AgentControlService,
|
||||
],
|
||||
})
|
||||
export class AgentsModule {}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
export class PauseAgentDto {}
|
||||
|
||||
export class ResumeAgentDto {}
|
||||
7
apps/orchestrator/src/api/agents/dto/inject-agent.dto.ts
Normal file
7
apps/orchestrator/src/api/agents/dto/inject-agent.dto.ts
Normal file
@@ -0,0 +1,7 @@
|
||||
import { IsNotEmpty, IsString } from "class-validator";
|
||||
|
||||
export class InjectAgentDto {
|
||||
@IsString()
|
||||
@IsNotEmpty()
|
||||
message!: string;
|
||||
}
|
||||
@@ -122,10 +122,10 @@ Target version: `v0.0.23`
|
||||
| id | status | milestone | description | issue | repo | branch | depends_on | blocks | agent | started_at | completed_at | estimate | used | notes |
|
||||
| ----------- | ----------- | ------------- | ------------------------------------------------------------------------------------------------ | ----- | ------------ | ---------------------- | ----------------------------------------------- | ----------------------------------------------------------- | ----- | ---------- | ------------ | -------- | ---- | --------------------------------------------- |
|
||||
| MS23-P0-001 | done | p0-foundation | Prisma schema: AgentConversationMessage, AgentSessionTree, AgentProviderConfig, OperatorAuditLog | #693 | api | feat/ms23-p0-schema | — | MS23-P0-002,MS23-P0-003,MS23-P0-004,MS23-P0-005,MS23-P1-001 | codex | 2026-03-06 | 2026-03-06 | 15K | — | taskSource field per mosaic-queue note in PRD |
|
||||
| MS23-P0-002 | in-progress | p0-foundation | Agent message ingestion: wire spawner/lifecycle to write messages to DB | #693 | orchestrator | feat/ms23-p0-ingestion | MS23-P0-001 | MS23-P0-006 | codex | 2026-03-06 | — | 20K | — | |
|
||||
| MS23-P0-003 | not-started | p0-foundation | Orchestrator API: GET /agents/:id/messages + SSE stream endpoint | #693 | orchestrator | feat/ms23-p0-stream | MS23-P0-001 | MS23-P0-006 | — | — | — | 20K | — | |
|
||||
| MS23-P0-004 | not-started | p0-foundation | Orchestrator API: POST /agents/:id/inject + pause/resume endpoints | #693 | orchestrator | feat/ms23-p0-controls | MS23-P0-001 | MS23-P0-006 | — | — | — | 15K | — | |
|
||||
| MS23-P0-005 | not-started | p0-foundation | Subagent tree: parentAgentId on spawn registration + GET /agents/tree | #693 | orchestrator | feat/ms23-p0-tree | MS23-P0-001 | MS23-P0-006 | — | — | — | 15K | — | |
|
||||
| MS23-P0-002 | done | p0-foundation | Agent message ingestion: wire spawner/lifecycle to write messages to DB | #693 | orchestrator | feat/ms23-p0-ingestion | MS23-P0-001 | MS23-P0-006 | codex | 2026-03-06 | 2026-03-07 | 20K | — | |
|
||||
| MS23-P0-003 | done | p0-foundation | Orchestrator API: GET /agents/:id/messages + SSE stream endpoint | #693 | orchestrator | feat/ms23-p0-stream | MS23-P0-001 | MS23-P0-006 | codex | 2026-03-06 | 2026-03-07 | 20K | — | |
|
||||
| MS23-P0-004 | done | p0-foundation | Orchestrator API: POST /agents/:id/inject + pause/resume endpoints | #693 | orchestrator | feat/ms23-p0-controls | MS23-P0-001 | MS23-P0-006 | codex | 2026-03-07 | 2026-03-07 | 15K | — | |
|
||||
| MS23-P0-005 | in-progress | p0-foundation | Subagent tree: parentAgentId on spawn registration + GET /agents/tree | #693 | orchestrator | feat/ms23-p0-tree | MS23-P0-001 | MS23-P0-006 | — | — | — | 15K | — | |
|
||||
| MS23-P0-006 | not-started | p0-foundation | Unit + integration tests for all P0 orchestrator endpoints | #693 | orchestrator | test/ms23-p0 | MS23-P0-002,MS23-P0-003,MS23-P0-004,MS23-P0-005 | MS23-P1-001 | — | — | — | 20K | — | Phase 0 gate: SSE stream verified via curl |
|
||||
|
||||
### Phase 1 — Provider Interface (Plugin Architecture)
|
||||
|
||||
Reference in New Issue
Block a user