Compare commits
2 Commits
chore/ms21
...
feat/ms21-
| Author | SHA1 | Date | |
|---|---|---|---|
| bc89952f10 | |||
| c640d22394 |
@@ -1,2 +0,0 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "tasks" ADD COLUMN "assigned_agent" TEXT;
|
||||
@@ -379,7 +379,6 @@ model Task {
|
||||
creatorId String @map("creator_id") @db.Uuid
|
||||
projectId String? @map("project_id") @db.Uuid
|
||||
parentId String? @map("parent_id") @db.Uuid
|
||||
assignedAgent String? @map("assigned_agent")
|
||||
domainId String? @map("domain_id") @db.Uuid
|
||||
sortOrder Int @default(0) @map("sort_order")
|
||||
metadata Json @default("{}")
|
||||
|
||||
@@ -1,198 +0,0 @@
|
||||
import { beforeAll, beforeEach, describe, expect, it, afterAll } from "vitest";
|
||||
import { randomUUID as uuid } from "crypto";
|
||||
import { Test, TestingModule } from "@nestjs/testing";
|
||||
import { NotFoundException } from "@nestjs/common";
|
||||
import { PrismaClient } from "@prisma/client";
|
||||
import { AgentMemoryService } from "./agent-memory.service";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
|
||||
const shouldRunDbIntegrationTests =
|
||||
process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
|
||||
const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
|
||||
|
||||
async function createWorkspace(
|
||||
prisma: PrismaClient,
|
||||
label: string
|
||||
): Promise<{ workspaceId: string; ownerId: string }> {
|
||||
const workspace = await prisma.workspace.create({
|
||||
data: {
|
||||
name: `${label} ${Date.now()}`,
|
||||
owner: {
|
||||
create: {
|
||||
email: `${label.toLowerCase().replace(/\s+/g, "-")}-${Date.now()}@example.com`,
|
||||
name: `${label} Owner`,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
return {
|
||||
workspaceId: workspace.id,
|
||||
ownerId: workspace.ownerId,
|
||||
};
|
||||
}
|
||||
|
||||
describeFn("AgentMemoryService Integration", () => {
|
||||
let moduleRef: TestingModule;
|
||||
let prisma: PrismaClient;
|
||||
let service: AgentMemoryService;
|
||||
let setupComplete = false;
|
||||
|
||||
let workspaceAId: string;
|
||||
let workspaceAOwnerId: string;
|
||||
let workspaceBId: string;
|
||||
let workspaceBOwnerId: string;
|
||||
|
||||
beforeAll(async () => {
|
||||
prisma = new PrismaClient();
|
||||
await prisma.$connect();
|
||||
|
||||
const workspaceA = await createWorkspace(prisma, "Agent Memory Integration A");
|
||||
workspaceAId = workspaceA.workspaceId;
|
||||
workspaceAOwnerId = workspaceA.ownerId;
|
||||
|
||||
const workspaceB = await createWorkspace(prisma, "Agent Memory Integration B");
|
||||
workspaceBId = workspaceB.workspaceId;
|
||||
workspaceBOwnerId = workspaceB.ownerId;
|
||||
|
||||
moduleRef = await Test.createTestingModule({
|
||||
providers: [
|
||||
AgentMemoryService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prisma,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = moduleRef.get<AgentMemoryService>(AgentMemoryService);
|
||||
setupComplete = true;
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
await prisma.agentMemory.deleteMany({
|
||||
where: {
|
||||
workspaceId: {
|
||||
in: [workspaceAId, workspaceBId],
|
||||
},
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
if (!prisma) {
|
||||
return;
|
||||
}
|
||||
|
||||
const workspaceIds = [workspaceAId, workspaceBId].filter(
|
||||
(id): id is string => typeof id === "string"
|
||||
);
|
||||
const ownerIds = [workspaceAOwnerId, workspaceBOwnerId].filter(
|
||||
(id): id is string => typeof id === "string"
|
||||
);
|
||||
|
||||
if (workspaceIds.length > 0) {
|
||||
await prisma.agentMemory.deleteMany({
|
||||
where: {
|
||||
workspaceId: {
|
||||
in: workspaceIds,
|
||||
},
|
||||
},
|
||||
});
|
||||
await prisma.workspace.deleteMany({ where: { id: { in: workspaceIds } } });
|
||||
}
|
||||
|
||||
if (ownerIds.length > 0) {
|
||||
await prisma.user.deleteMany({ where: { id: { in: ownerIds } } });
|
||||
}
|
||||
|
||||
if (moduleRef) {
|
||||
await moduleRef.close();
|
||||
}
|
||||
await prisma.$disconnect();
|
||||
});
|
||||
|
||||
it("upserts and lists memory entries", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const agentId = `agent-${uuid()}`;
|
||||
|
||||
const entry = await service.upsert(workspaceAId, agentId, "session-context", {
|
||||
value: { intent: "create-tests", depth: "integration" },
|
||||
});
|
||||
|
||||
expect(entry.workspaceId).toBe(workspaceAId);
|
||||
expect(entry.agentId).toBe(agentId);
|
||||
expect(entry.key).toBe("session-context");
|
||||
|
||||
const listed = await service.findAll(workspaceAId, agentId);
|
||||
|
||||
expect(listed).toHaveLength(1);
|
||||
expect(listed[0]?.id).toBe(entry.id);
|
||||
expect(listed[0]?.value).toMatchObject({ intent: "create-tests" });
|
||||
});
|
||||
|
||||
it("updates existing key via upsert without creating duplicates", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const agentId = `agent-${uuid()}`;
|
||||
|
||||
const first = await service.upsert(workspaceAId, agentId, "preferences", {
|
||||
value: { model: "fast" },
|
||||
});
|
||||
|
||||
const second = await service.upsert(workspaceAId, agentId, "preferences", {
|
||||
value: { model: "accurate" },
|
||||
});
|
||||
|
||||
expect(second.id).toBe(first.id);
|
||||
expect(second.value).toMatchObject({ model: "accurate" });
|
||||
|
||||
const rowCount = await prisma.agentMemory.count({
|
||||
where: {
|
||||
workspaceId: workspaceAId,
|
||||
agentId,
|
||||
key: "preferences",
|
||||
},
|
||||
});
|
||||
|
||||
expect(rowCount).toBe(1);
|
||||
});
|
||||
|
||||
it("lists keys in sorted order and isolates by workspace", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const agentId = `agent-${uuid()}`;
|
||||
|
||||
await service.upsert(workspaceAId, agentId, "beta", { value: { v: 2 } });
|
||||
await service.upsert(workspaceAId, agentId, "alpha", { value: { v: 1 } });
|
||||
await service.upsert(workspaceBId, agentId, "alpha", { value: { v: 99 } });
|
||||
|
||||
const workspaceAEntries = await service.findAll(workspaceAId, agentId);
|
||||
const workspaceBEntries = await service.findAll(workspaceBId, agentId);
|
||||
|
||||
expect(workspaceAEntries.map((row) => row.key)).toEqual(["alpha", "beta"]);
|
||||
expect(workspaceBEntries).toHaveLength(1);
|
||||
expect(workspaceBEntries[0]?.value).toMatchObject({ v: 99 });
|
||||
});
|
||||
|
||||
it("throws NotFoundException when requesting unknown key", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
await expect(service.findOne(workspaceAId, `agent-${uuid()}`, "missing")).rejects.toThrow(
|
||||
NotFoundException
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1,239 +0,0 @@
|
||||
import { beforeAll, beforeEach, describe, expect, it, afterAll, vi } from "vitest";
|
||||
import { randomUUID as uuid } from "crypto";
|
||||
import { Test, TestingModule } from "@nestjs/testing";
|
||||
import { ConflictException } from "@nestjs/common";
|
||||
import { PrismaClient, Prisma } from "@prisma/client";
|
||||
import { EMBEDDING_DIMENSION } from "@mosaic/shared";
|
||||
import { ConversationArchiveService } from "./conversation-archive.service";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { EmbeddingService } from "../knowledge/services/embedding.service";
|
||||
|
||||
const shouldRunDbIntegrationTests =
|
||||
process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
|
||||
const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
|
||||
|
||||
function vector(value: number): number[] {
|
||||
return Array.from({ length: EMBEDDING_DIMENSION }, () => value);
|
||||
}
|
||||
|
||||
function toVectorLiteral(input: number[]): string {
|
||||
return `[${input.join(",")}]`;
|
||||
}
|
||||
|
||||
describeFn("ConversationArchiveService Integration", () => {
|
||||
let moduleRef: TestingModule;
|
||||
let prisma: PrismaClient;
|
||||
let service: ConversationArchiveService;
|
||||
let workspaceId: string;
|
||||
let ownerId: string;
|
||||
let setupComplete = false;
|
||||
|
||||
const embeddingServiceMock = {
|
||||
isConfigured: vi.fn(),
|
||||
generateEmbedding: vi.fn(),
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
prisma = new PrismaClient();
|
||||
await prisma.$connect();
|
||||
|
||||
const workspace = await prisma.workspace.create({
|
||||
data: {
|
||||
name: `Conversation Archive Integration ${Date.now()}`,
|
||||
owner: {
|
||||
create: {
|
||||
email: `conversation-archive-integration-${Date.now()}@example.com`,
|
||||
name: "Conversation Archive Integration Owner",
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
workspaceId = workspace.id;
|
||||
ownerId = workspace.ownerId;
|
||||
|
||||
moduleRef = await Test.createTestingModule({
|
||||
providers: [
|
||||
ConversationArchiveService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prisma,
|
||||
},
|
||||
{
|
||||
provide: EmbeddingService,
|
||||
useValue: embeddingServiceMock,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = moduleRef.get<ConversationArchiveService>(ConversationArchiveService);
|
||||
setupComplete = true;
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks();
|
||||
embeddingServiceMock.isConfigured.mockReturnValue(false);
|
||||
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
await prisma.conversationArchive.deleteMany({ where: { workspaceId } });
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
if (!prisma) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (workspaceId) {
|
||||
await prisma.conversationArchive.deleteMany({ where: { workspaceId } });
|
||||
await prisma.workspace.deleteMany({ where: { id: workspaceId } });
|
||||
}
|
||||
if (ownerId) {
|
||||
await prisma.user.deleteMany({ where: { id: ownerId } });
|
||||
}
|
||||
|
||||
if (moduleRef) {
|
||||
await moduleRef.close();
|
||||
}
|
||||
await prisma.$disconnect();
|
||||
});
|
||||
|
||||
it("ingests a conversation log", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const sessionId = `session-${uuid()}`;
|
||||
|
||||
const result = await service.ingest(workspaceId, {
|
||||
sessionId,
|
||||
agentId: "agent-conversation-ingest",
|
||||
messages: [
|
||||
{ role: "user", content: "Can you summarize deployment issues?" },
|
||||
{ role: "assistant", content: "Yes, three retries timed out in staging." },
|
||||
],
|
||||
summary: "Deployment retry failures discussed",
|
||||
startedAt: "2026-02-28T21:00:00.000Z",
|
||||
endedAt: "2026-02-28T21:05:00.000Z",
|
||||
metadata: { source: "integration-test" },
|
||||
});
|
||||
|
||||
expect(result.id).toBeDefined();
|
||||
|
||||
const stored = await prisma.conversationArchive.findUnique({
|
||||
where: {
|
||||
id: result.id,
|
||||
},
|
||||
});
|
||||
|
||||
expect(stored).toBeTruthy();
|
||||
expect(stored?.workspaceId).toBe(workspaceId);
|
||||
expect(stored?.sessionId).toBe(sessionId);
|
||||
expect(stored?.messageCount).toBe(2);
|
||||
expect(stored?.summary).toBe("Deployment retry failures discussed");
|
||||
});
|
||||
|
||||
it("rejects duplicate session ingest per workspace", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const sessionId = `session-${uuid()}`;
|
||||
const dto = {
|
||||
sessionId,
|
||||
agentId: "agent-conversation-duplicate",
|
||||
messages: [{ role: "user", content: "hello" }],
|
||||
summary: "simple conversation",
|
||||
startedAt: "2026-02-28T22:00:00.000Z",
|
||||
};
|
||||
|
||||
await service.ingest(workspaceId, dto);
|
||||
|
||||
await expect(service.ingest(workspaceId, dto)).rejects.toThrow(ConflictException);
|
||||
});
|
||||
|
||||
it("rejects semantic search when embeddings are disabled", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
embeddingServiceMock.isConfigured.mockReturnValue(false);
|
||||
|
||||
await expect(
|
||||
service.search(workspaceId, {
|
||||
query: "deployment retries",
|
||||
})
|
||||
).rejects.toThrow(ConflictException);
|
||||
});
|
||||
|
||||
it("searches archived conversations by vector similarity", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const near = vector(0.02);
|
||||
const far = vector(0.85);
|
||||
|
||||
const matching = await prisma.conversationArchive.create({
|
||||
data: {
|
||||
workspaceId,
|
||||
sessionId: `session-search-${uuid()}`,
|
||||
agentId: "agent-conversation-search-a",
|
||||
messages: [
|
||||
{ role: "user", content: "What caused deployment retries?" },
|
||||
{ role: "assistant", content: "A connection pool timeout." },
|
||||
] as unknown as Prisma.InputJsonValue,
|
||||
messageCount: 2,
|
||||
summary: "Deployment retries caused by connection pool timeout",
|
||||
startedAt: new Date("2026-02-28T23:00:00.000Z"),
|
||||
metadata: { channel: "cli" } as Prisma.InputJsonValue,
|
||||
},
|
||||
});
|
||||
|
||||
const nonMatching = await prisma.conversationArchive.create({
|
||||
data: {
|
||||
workspaceId,
|
||||
sessionId: `session-search-${uuid()}`,
|
||||
agentId: "agent-conversation-search-b",
|
||||
messages: [
|
||||
{ role: "user", content: "How is billing configured?" },
|
||||
] as unknown as Prisma.InputJsonValue,
|
||||
messageCount: 1,
|
||||
summary: "Billing and quotas conversation",
|
||||
startedAt: new Date("2026-02-28T23:10:00.000Z"),
|
||||
metadata: { channel: "cli" } as Prisma.InputJsonValue,
|
||||
},
|
||||
});
|
||||
|
||||
await prisma.$executeRaw`
|
||||
UPDATE conversation_archives
|
||||
SET embedding = ${toVectorLiteral(near)}::vector(${EMBEDDING_DIMENSION})
|
||||
WHERE id = ${matching.id}::uuid
|
||||
`;
|
||||
await prisma.$executeRaw`
|
||||
UPDATE conversation_archives
|
||||
SET embedding = ${toVectorLiteral(far)}::vector(${EMBEDDING_DIMENSION})
|
||||
WHERE id = ${nonMatching.id}::uuid
|
||||
`;
|
||||
|
||||
embeddingServiceMock.isConfigured.mockReturnValue(true);
|
||||
embeddingServiceMock.generateEmbedding.mockResolvedValue(near);
|
||||
|
||||
const result = await service.search(workspaceId, {
|
||||
query: "deployment retries timeout",
|
||||
agentId: "agent-conversation-search-a",
|
||||
similarityThreshold: 0,
|
||||
limit: 10,
|
||||
});
|
||||
|
||||
const rows = result.data as Array<{ id: string; agent_id: string; similarity: number }>;
|
||||
|
||||
expect(result.pagination.total).toBe(1);
|
||||
expect(rows).toHaveLength(1);
|
||||
expect(rows[0]?.id).toBe(matching.id);
|
||||
expect(rows[0]?.agent_id).toBe("agent-conversation-search-a");
|
||||
expect(rows[0]?.similarity).toBeGreaterThan(0);
|
||||
});
|
||||
});
|
||||
@@ -1,226 +0,0 @@
|
||||
import { beforeAll, beforeEach, describe, expect, it, afterAll, vi } from "vitest";
|
||||
import { randomUUID as uuid } from "crypto";
|
||||
import { Test, TestingModule } from "@nestjs/testing";
|
||||
import { BadRequestException, NotFoundException } from "@nestjs/common";
|
||||
import { PrismaClient, Prisma } from "@prisma/client";
|
||||
import { FindingsService } from "./findings.service";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { EmbeddingService } from "../knowledge/services/embedding.service";
|
||||
|
||||
const shouldRunDbIntegrationTests =
|
||||
process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
|
||||
const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
|
||||
|
||||
const EMBEDDING_DIMENSION = 1536;
|
||||
|
||||
function vector(value: number): number[] {
|
||||
return Array.from({ length: EMBEDDING_DIMENSION }, () => value);
|
||||
}
|
||||
|
||||
function toVectorLiteral(input: number[]): string {
|
||||
return `[${input.join(",")}]`;
|
||||
}
|
||||
|
||||
describeFn("FindingsService Integration", () => {
|
||||
let moduleRef: TestingModule;
|
||||
let prisma: PrismaClient;
|
||||
let service: FindingsService;
|
||||
let workspaceId: string;
|
||||
let ownerId: string;
|
||||
let setupComplete = false;
|
||||
|
||||
const embeddingServiceMock = {
|
||||
isConfigured: vi.fn(),
|
||||
generateEmbedding: vi.fn(),
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
prisma = new PrismaClient();
|
||||
await prisma.$connect();
|
||||
|
||||
const workspace = await prisma.workspace.create({
|
||||
data: {
|
||||
name: `Findings Integration ${Date.now()}`,
|
||||
owner: {
|
||||
create: {
|
||||
email: `findings-integration-${Date.now()}@example.com`,
|
||||
name: "Findings Integration Owner",
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
workspaceId = workspace.id;
|
||||
ownerId = workspace.ownerId;
|
||||
|
||||
moduleRef = await Test.createTestingModule({
|
||||
providers: [
|
||||
FindingsService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prisma,
|
||||
},
|
||||
{
|
||||
provide: EmbeddingService,
|
||||
useValue: embeddingServiceMock,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = moduleRef.get<FindingsService>(FindingsService);
|
||||
setupComplete = true;
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
embeddingServiceMock.isConfigured.mockReturnValue(false);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
if (!prisma) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (workspaceId) {
|
||||
await prisma.finding.deleteMany({ where: { workspaceId } });
|
||||
await prisma.workspace.deleteMany({ where: { id: workspaceId } });
|
||||
}
|
||||
if (ownerId) {
|
||||
await prisma.user.deleteMany({ where: { id: ownerId } });
|
||||
}
|
||||
|
||||
if (moduleRef) {
|
||||
await moduleRef.close();
|
||||
}
|
||||
await prisma.$disconnect();
|
||||
});
|
||||
|
||||
it("creates, lists, fetches, and deletes findings", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const created = await service.create(workspaceId, {
|
||||
agentId: "agent-findings-crud",
|
||||
type: "security",
|
||||
title: "Unescaped SQL fragment",
|
||||
data: { severity: "high" },
|
||||
summary: "Potential injection risk in dynamic query path.",
|
||||
});
|
||||
|
||||
expect(created.id).toBeDefined();
|
||||
expect(created.workspaceId).toBe(workspaceId);
|
||||
expect(created.taskId).toBeNull();
|
||||
|
||||
const listed = await service.findAll(workspaceId, {
|
||||
page: 1,
|
||||
limit: 10,
|
||||
agentId: "agent-findings-crud",
|
||||
});
|
||||
|
||||
expect(listed.meta.total).toBeGreaterThanOrEqual(1);
|
||||
expect(listed.data.some((row) => row.id === created.id)).toBe(true);
|
||||
|
||||
const found = await service.findOne(created.id, workspaceId);
|
||||
expect(found.id).toBe(created.id);
|
||||
expect(found.title).toBe("Unescaped SQL fragment");
|
||||
|
||||
await expect(service.findOne(created.id, uuid())).rejects.toThrow(NotFoundException);
|
||||
|
||||
await expect(service.remove(created.id, workspaceId)).resolves.toEqual({
|
||||
message: "Finding deleted successfully",
|
||||
});
|
||||
|
||||
await expect(service.findOne(created.id, workspaceId)).rejects.toThrow(NotFoundException);
|
||||
});
|
||||
|
||||
it("rejects create when taskId does not exist in workspace", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
await expect(
|
||||
service.create(workspaceId, {
|
||||
taskId: uuid(),
|
||||
agentId: "agent-findings-missing-task",
|
||||
type: "bug",
|
||||
title: "Invalid task id",
|
||||
data: { source: "integration-test" },
|
||||
summary: "Should fail when task relation is not found.",
|
||||
})
|
||||
).rejects.toThrow(NotFoundException);
|
||||
});
|
||||
|
||||
it("rejects vector search when embeddings are disabled", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
embeddingServiceMock.isConfigured.mockReturnValue(false);
|
||||
|
||||
await expect(
|
||||
service.search(workspaceId, {
|
||||
query: "security issue",
|
||||
})
|
||||
).rejects.toThrow(BadRequestException);
|
||||
});
|
||||
|
||||
it("searches findings by vector similarity with filters", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const near = vector(0.01);
|
||||
const far = vector(0.9);
|
||||
|
||||
const matchedFinding = await prisma.finding.create({
|
||||
data: {
|
||||
workspaceId,
|
||||
agentId: "agent-findings-search-a",
|
||||
type: "incident",
|
||||
title: "Authentication bypass",
|
||||
data: { score: 0.9 } as Prisma.InputJsonValue,
|
||||
summary: "Bypass risk found in login checks.",
|
||||
},
|
||||
});
|
||||
|
||||
const otherFinding = await prisma.finding.create({
|
||||
data: {
|
||||
workspaceId,
|
||||
agentId: "agent-findings-search-b",
|
||||
type: "incident",
|
||||
title: "Retry timeout",
|
||||
data: { score: 0.2 } as Prisma.InputJsonValue,
|
||||
summary: "Timeout issue in downstream retries.",
|
||||
},
|
||||
});
|
||||
|
||||
await prisma.$executeRaw`
|
||||
UPDATE findings
|
||||
SET embedding = ${toVectorLiteral(near)}::vector(1536)
|
||||
WHERE id = ${matchedFinding.id}::uuid
|
||||
`;
|
||||
await prisma.$executeRaw`
|
||||
UPDATE findings
|
||||
SET embedding = ${toVectorLiteral(far)}::vector(1536)
|
||||
WHERE id = ${otherFinding.id}::uuid
|
||||
`;
|
||||
|
||||
embeddingServiceMock.isConfigured.mockReturnValue(true);
|
||||
embeddingServiceMock.generateEmbedding.mockResolvedValue(near);
|
||||
|
||||
const result = await service.search(workspaceId, {
|
||||
query: "authentication bypass risk",
|
||||
agentId: "agent-findings-search-a",
|
||||
limit: 10,
|
||||
similarityThreshold: 0,
|
||||
});
|
||||
|
||||
expect(result.query).toBe("authentication bypass risk");
|
||||
expect(result.meta.total).toBe(1);
|
||||
expect(result.data).toHaveLength(1);
|
||||
expect(result.data[0]?.id).toBe(matchedFinding.id);
|
||||
expect(result.data[0]?.agentId).toBe("agent-findings-search-a");
|
||||
expect(result.data.find((row) => row.id === otherFinding.id)).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -50,12 +50,6 @@ export class CreateTaskDto {
|
||||
@IsUUID("4", { message: "parentId must be a valid UUID" })
|
||||
parentId?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString({ message: "assignedAgent must be a string" })
|
||||
@MinLength(1, { message: "assignedAgent must not be empty" })
|
||||
@MaxLength(255, { message: "assignedAgent must not exceed 255 characters" })
|
||||
assignedAgent?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsInt({ message: "sortOrder must be an integer" })
|
||||
@Min(0, { message: "sortOrder must be at least 0" })
|
||||
|
||||
@@ -52,12 +52,6 @@ export class UpdateTaskDto {
|
||||
@IsUUID("4", { message: "parentId must be a valid UUID" })
|
||||
parentId?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsString({ message: "assignedAgent must be a string" })
|
||||
@MinLength(1, { message: "assignedAgent must not be empty" })
|
||||
@MaxLength(255, { message: "assignedAgent must not exceed 255 characters" })
|
||||
assignedAgent?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsInt({ message: "sortOrder must be an integer" })
|
||||
@Min(0, { message: "sortOrder must be at least 0" })
|
||||
|
||||
@@ -1,162 +0,0 @@
|
||||
import { beforeAll, beforeEach, describe, expect, it, afterAll, vi } from "vitest";
|
||||
import { randomUUID as uuid } from "crypto";
|
||||
import { Test, TestingModule } from "@nestjs/testing";
|
||||
import { PrismaClient } from "@prisma/client";
|
||||
import { TasksService } from "./tasks.service";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { ActivityService } from "../activity/activity.service";
|
||||
|
||||
const shouldRunDbIntegrationTests =
|
||||
process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
|
||||
const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
|
||||
|
||||
describeFn("TasksService assignedAgent Integration", () => {
|
||||
let moduleRef: TestingModule;
|
||||
let prisma: PrismaClient;
|
||||
let service: TasksService;
|
||||
let workspaceId: string;
|
||||
let ownerId: string;
|
||||
let setupComplete = false;
|
||||
|
||||
const activityServiceMock = {
|
||||
logTaskCreated: vi.fn().mockResolvedValue(undefined),
|
||||
logTaskUpdated: vi.fn().mockResolvedValue(undefined),
|
||||
logTaskDeleted: vi.fn().mockResolvedValue(undefined),
|
||||
logTaskCompleted: vi.fn().mockResolvedValue(undefined),
|
||||
logTaskAssigned: vi.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
prisma = new PrismaClient();
|
||||
await prisma.$connect();
|
||||
|
||||
const workspace = await prisma.workspace.create({
|
||||
data: {
|
||||
name: `Tasks Assigned Agent Integration ${Date.now()}`,
|
||||
owner: {
|
||||
create: {
|
||||
email: `tasks-assigned-agent-integration-${Date.now()}@example.com`,
|
||||
name: "Tasks Assigned Agent Integration Owner",
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
workspaceId = workspace.id;
|
||||
ownerId = workspace.ownerId;
|
||||
|
||||
moduleRef = await Test.createTestingModule({
|
||||
providers: [
|
||||
TasksService,
|
||||
{
|
||||
provide: PrismaService,
|
||||
useValue: prisma,
|
||||
},
|
||||
{
|
||||
provide: ActivityService,
|
||||
useValue: activityServiceMock,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
|
||||
service = moduleRef.get<TasksService>(TasksService);
|
||||
setupComplete = true;
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks();
|
||||
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
await prisma.task.deleteMany({ where: { workspaceId } });
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
if (!prisma) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (workspaceId) {
|
||||
await prisma.task.deleteMany({ where: { workspaceId } });
|
||||
await prisma.workspace.deleteMany({ where: { id: workspaceId } });
|
||||
}
|
||||
if (ownerId) {
|
||||
await prisma.user.deleteMany({ where: { id: ownerId } });
|
||||
}
|
||||
|
||||
if (moduleRef) {
|
||||
await moduleRef.close();
|
||||
}
|
||||
await prisma.$disconnect();
|
||||
});
|
||||
|
||||
it("persists assignedAgent on create", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const task = await service.create(workspaceId, ownerId, {
|
||||
title: `Assigned agent create ${uuid()}`,
|
||||
assignedAgent: "fleet-worker-1",
|
||||
});
|
||||
|
||||
expect(task.assignedAgent).toBe("fleet-worker-1");
|
||||
|
||||
const stored = await prisma.task.findUnique({
|
||||
where: {
|
||||
id: task.id,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
assignedAgent: true,
|
||||
},
|
||||
});
|
||||
|
||||
expect(stored).toMatchObject({
|
||||
id: task.id,
|
||||
assignedAgent: "fleet-worker-1",
|
||||
});
|
||||
|
||||
const listed = await service.findAll({ workspaceId, page: 1, limit: 10 }, ownerId);
|
||||
const listedTask = listed.data.find((row) => row.id === task.id);
|
||||
|
||||
expect(listedTask?.assignedAgent).toBe("fleet-worker-1");
|
||||
});
|
||||
|
||||
it("updates and clears assignedAgent", async () => {
|
||||
if (!setupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
const created = await service.create(workspaceId, ownerId, {
|
||||
title: `Assigned agent update ${uuid()}`,
|
||||
});
|
||||
|
||||
expect(created.assignedAgent).toBeNull();
|
||||
|
||||
const updated = await service.update(created.id, workspaceId, ownerId, {
|
||||
assignedAgent: "fleet-worker-2",
|
||||
});
|
||||
|
||||
expect(updated.assignedAgent).toBe("fleet-worker-2");
|
||||
|
||||
const cleared = await service.update(created.id, workspaceId, ownerId, {
|
||||
assignedAgent: null,
|
||||
});
|
||||
|
||||
expect(cleared.assignedAgent).toBeNull();
|
||||
|
||||
const stored = await prisma.task.findUnique({
|
||||
where: {
|
||||
id: created.id,
|
||||
},
|
||||
select: {
|
||||
assignedAgent: true,
|
||||
},
|
||||
});
|
||||
|
||||
expect(stored?.assignedAgent).toBeNull();
|
||||
});
|
||||
});
|
||||
@@ -48,7 +48,6 @@ describe("TasksService", () => {
|
||||
creatorId: mockUserId,
|
||||
projectId: null,
|
||||
parentId: null,
|
||||
assignedAgent: null,
|
||||
sortOrder: 0,
|
||||
metadata: {},
|
||||
createdAt: new Date(),
|
||||
@@ -159,28 +158,6 @@ describe("TasksService", () => {
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it("should include assignedAgent when provided", async () => {
|
||||
const createDto = {
|
||||
title: "Agent-owned Task",
|
||||
assignedAgent: "fleet-worker-1",
|
||||
};
|
||||
|
||||
mockPrismaService.task.create.mockResolvedValue({
|
||||
...mockTask,
|
||||
assignedAgent: createDto.assignedAgent,
|
||||
});
|
||||
|
||||
await service.create(mockWorkspaceId, mockUserId, createDto);
|
||||
|
||||
expect(prisma.task.create).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
data: expect.objectContaining({
|
||||
assignedAgent: createDto.assignedAgent,
|
||||
}),
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("findAll", () => {
|
||||
@@ -492,26 +469,6 @@ describe("TasksService", () => {
|
||||
service.update(mockTaskId, mockWorkspaceId, mockUserId, { title: "Test" })
|
||||
).rejects.toThrow(NotFoundException);
|
||||
});
|
||||
|
||||
it("should update assignedAgent when provided", async () => {
|
||||
const updateDto = { assignedAgent: "fleet-worker-2" };
|
||||
|
||||
mockPrismaService.task.findUnique.mockResolvedValue(mockTask);
|
||||
mockPrismaService.task.update.mockResolvedValue({
|
||||
...mockTask,
|
||||
assignedAgent: updateDto.assignedAgent,
|
||||
});
|
||||
|
||||
await service.update(mockTaskId, mockWorkspaceId, mockUserId, updateDto);
|
||||
|
||||
expect(prisma.task.update).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
data: expect.objectContaining({
|
||||
assignedAgent: updateDto.assignedAgent,
|
||||
}),
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("remove", () => {
|
||||
|
||||
@@ -67,9 +67,6 @@ export class TasksService {
|
||||
metadata: createTaskDto.metadata
|
||||
? (createTaskDto.metadata as unknown as Prisma.InputJsonValue)
|
||||
: {},
|
||||
...(createTaskDto.assignedAgent !== undefined && {
|
||||
assignedAgent: createTaskDto.assignedAgent,
|
||||
}),
|
||||
...(assigneeConnection && { assignee: assigneeConnection }),
|
||||
...(projectConnection && { project: projectConnection }),
|
||||
...(parentConnection && { parent: parentConnection }),
|
||||
@@ -294,9 +291,6 @@ export class TasksService {
|
||||
if (updateTaskDto.parentId !== undefined && updateTaskDto.parentId !== null) {
|
||||
data.parent = { connect: { id: updateTaskDto.parentId } };
|
||||
}
|
||||
if (updateTaskDto.assignedAgent !== undefined) {
|
||||
data.assignedAgent = updateTaskDto.assignedAgent;
|
||||
}
|
||||
|
||||
// Handle completedAt based on status changes
|
||||
if (updateTaskDto.status) {
|
||||
|
||||
@@ -230,7 +230,6 @@ const categories: CategoryConfig[] = [
|
||||
title: "Teams",
|
||||
description: "Create and manage teams within your active workspace.",
|
||||
href: "/settings/teams",
|
||||
adminOnly: true,
|
||||
accent: "var(--ms-blue-400)",
|
||||
iconBg: "rgba(47, 128, 255, 0.12)",
|
||||
icon: (
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
import type { ReactElement, ReactNode } from "react";
|
||||
import type { TeamRecord } from "@/lib/api/teams";
|
||||
|
||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
||||
import { render, screen, waitFor } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { createTeam, deleteTeam, fetchTeams, updateTeam } from "@/lib/api/teams";
|
||||
import { fetchUserWorkspaces } from "@/lib/api/workspaces";
|
||||
import { fetchTeams } from "@/lib/api/teams";
|
||||
|
||||
import TeamsSettingsPage from "./page";
|
||||
|
||||
@@ -25,19 +22,9 @@ vi.mock("next/link", () => ({
|
||||
vi.mock("@/lib/api/teams", () => ({
|
||||
fetchTeams: vi.fn(),
|
||||
createTeam: vi.fn(),
|
||||
updateTeam: vi.fn(),
|
||||
deleteTeam: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("@/lib/api/workspaces", () => ({
|
||||
fetchUserWorkspaces: vi.fn(),
|
||||
}));
|
||||
|
||||
const fetchTeamsMock = vi.mocked(fetchTeams);
|
||||
const createTeamMock = vi.mocked(createTeam);
|
||||
const updateTeamMock = vi.mocked(updateTeam);
|
||||
const deleteTeamMock = vi.mocked(deleteTeam);
|
||||
const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
|
||||
|
||||
const baseTeam: TeamRecord = {
|
||||
id: "team-1",
|
||||
@@ -55,33 +42,6 @@ const baseTeam: TeamRecord = {
|
||||
describe("TeamsSettingsPage", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
fetchTeamsMock.mockResolvedValue([]);
|
||||
fetchUserWorkspacesMock.mockResolvedValue([
|
||||
{
|
||||
id: "workspace-1",
|
||||
name: "Personal Workspace",
|
||||
ownerId: "owner-1",
|
||||
role: WorkspaceMemberRole.OWNER,
|
||||
createdAt: "2026-01-01T00:00:00.000Z",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it("shows access denied to non-admin users", async () => {
|
||||
fetchUserWorkspacesMock.mockResolvedValueOnce([
|
||||
{
|
||||
id: "workspace-1",
|
||||
name: "Personal Workspace",
|
||||
ownerId: "owner-1",
|
||||
role: WorkspaceMemberRole.MEMBER,
|
||||
createdAt: "2026-01-01T00:00:00.000Z",
|
||||
},
|
||||
]);
|
||||
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Access Denied")).toBeInTheDocument();
|
||||
expect(fetchTeamsMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("loads and renders teams from the API", async () => {
|
||||
@@ -89,7 +49,9 @@ describe("TeamsSettingsPage", () => {
|
||||
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Team Directory")).toBeInTheDocument();
|
||||
expect(screen.getByText("Loading teams...")).toBeInTheDocument();
|
||||
|
||||
expect(await screen.findByText("Your Teams (1)")).toBeInTheDocument();
|
||||
expect(screen.getByText("Platform Team")).toBeInTheDocument();
|
||||
expect(fetchTeamsMock).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
@@ -99,8 +61,8 @@ describe("TeamsSettingsPage", () => {
|
||||
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("No Teams Yet")).toBeInTheDocument();
|
||||
expect(screen.getByText("Create the first team to get started.")).toBeInTheDocument();
|
||||
expect(await screen.findByText("Your Teams (0)")).toBeInTheDocument();
|
||||
expect(screen.getByText("No teams yet")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("shows error state and does not show empty state", async () => {
|
||||
@@ -109,82 +71,6 @@ describe("TeamsSettingsPage", () => {
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Unable to load teams")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("creates a team from the create dialog", async () => {
|
||||
const user = userEvent.setup();
|
||||
fetchTeamsMock.mockResolvedValue([baseTeam]);
|
||||
createTeamMock.mockResolvedValue({
|
||||
...baseTeam,
|
||||
id: "team-2",
|
||||
name: "Design Team",
|
||||
description: "Owns design quality",
|
||||
});
|
||||
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Platform Team")).toBeInTheDocument();
|
||||
|
||||
const triggerButton = screen.getByRole("button", { name: "Create Team" });
|
||||
await user.click(triggerButton);
|
||||
|
||||
await user.type(screen.getByLabelText("Name"), "Design Team");
|
||||
await user.type(screen.getByLabelText("Description"), "Owns design quality");
|
||||
|
||||
const submitButton = screen.getAllByRole("button", { name: "Create Team" })[1];
|
||||
if (!submitButton) {
|
||||
throw new Error("Expected create-team submit button to be rendered");
|
||||
}
|
||||
await user.click(submitButton);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(createTeamMock).toHaveBeenCalledWith({
|
||||
name: "Design Team",
|
||||
description: "Owns design quality",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("opens team details and updates name", async () => {
|
||||
const user = userEvent.setup();
|
||||
fetchTeamsMock.mockResolvedValue([baseTeam]);
|
||||
updateTeamMock.mockResolvedValue({
|
||||
...baseTeam,
|
||||
name: "Platform Engineering",
|
||||
});
|
||||
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Platform Team")).toBeInTheDocument();
|
||||
|
||||
await user.click(screen.getByText("Platform Team"));
|
||||
|
||||
const nameInput = await screen.findByLabelText("Name");
|
||||
await user.clear(nameInput);
|
||||
await user.type(nameInput, "Platform Engineering");
|
||||
await user.click(screen.getByRole("button", { name: "Save Changes" }));
|
||||
|
||||
await waitFor(() => {
|
||||
expect(updateTeamMock).toHaveBeenCalledWith("team-1", {
|
||||
name: "Platform Engineering",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("deletes a team from the confirmation dialog", async () => {
|
||||
const user = userEvent.setup();
|
||||
fetchTeamsMock.mockResolvedValue([baseTeam]);
|
||||
deleteTeamMock.mockResolvedValue();
|
||||
|
||||
render(<TeamsSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Platform Team")).toBeInTheDocument();
|
||||
|
||||
await user.click(screen.getByRole("button", { name: "Delete" }));
|
||||
await user.click(screen.getByRole("button", { name: "Delete Team" }));
|
||||
|
||||
await waitFor(() => {
|
||||
expect(deleteTeamMock).toHaveBeenCalledWith("team-1");
|
||||
});
|
||||
expect(screen.queryByText("No teams yet")).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,582 +1,244 @@
|
||||
"use client";
|
||||
|
||||
import {
|
||||
useCallback,
|
||||
useEffect,
|
||||
useState,
|
||||
type ChangeEvent,
|
||||
type KeyboardEvent,
|
||||
type ReactElement,
|
||||
type SyntheticEvent,
|
||||
} from "react";
|
||||
import type { ReactElement, SyntheticEvent } from "react";
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { Plus, Trash2, Users } from "lucide-react";
|
||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
||||
import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
DialogTrigger,
|
||||
} from "@/components/ui/dialog";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogDescription,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
} from "@/components/ui/alert-dialog";
|
||||
import {
|
||||
createTeam,
|
||||
deleteTeam,
|
||||
fetchTeams,
|
||||
updateTeam,
|
||||
type CreateTeamDto,
|
||||
type TeamRecord,
|
||||
type UpdateTeamDto,
|
||||
} from "@/lib/api/teams";
|
||||
import { fetchUserWorkspaces } from "@/lib/api/workspaces";
|
||||
import { createTeam, fetchTeams, type CreateTeamDto, type TeamRecord } from "@/lib/api/teams";
|
||||
|
||||
const INITIAL_CREATE_FORM = {
|
||||
name: "",
|
||||
description: "",
|
||||
};
|
||||
function getErrorMessage(error: unknown, fallback: string): string {
|
||||
if (error instanceof Error) {
|
||||
return error.message;
|
||||
}
|
||||
|
||||
const INITIAL_DETAIL_FORM = {
|
||||
name: "",
|
||||
description: "",
|
||||
};
|
||||
|
||||
interface DetailInitialState {
|
||||
name: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
function toMemberLabel(count: number): string {
|
||||
return `${String(count)} member${count === 1 ? "" : "s"}`;
|
||||
return fallback;
|
||||
}
|
||||
|
||||
export default function TeamsSettingsPage(): ReactElement {
|
||||
const [teams, setTeams] = useState<TeamRecord[]>([]);
|
||||
const [isLoading, setIsLoading] = useState<boolean>(true);
|
||||
const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [isAdmin, setIsAdmin] = useState<boolean | null>(null);
|
||||
|
||||
const [isCreateOpen, setIsCreateOpen] = useState<boolean>(false);
|
||||
const [createForm, setCreateForm] = useState(INITIAL_CREATE_FORM);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [loadError, setLoadError] = useState<string | null>(null);
|
||||
const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
|
||||
const [isCreating, setIsCreating] = useState(false);
|
||||
const [newTeamName, setNewTeamName] = useState("");
|
||||
const [newTeamDescription, setNewTeamDescription] = useState("");
|
||||
const [createError, setCreateError] = useState<string | null>(null);
|
||||
const [isCreating, setIsCreating] = useState<boolean>(false);
|
||||
|
||||
const [detailTarget, setDetailTarget] = useState<TeamRecord | null>(null);
|
||||
const [detailForm, setDetailForm] = useState(INITIAL_DETAIL_FORM);
|
||||
const [detailInitial, setDetailInitial] = useState<DetailInitialState | null>(null);
|
||||
const [detailError, setDetailError] = useState<string | null>(null);
|
||||
const [isSavingDetails, setIsSavingDetails] = useState<boolean>(false);
|
||||
const loadTeams = useCallback(async (): Promise<void> => {
|
||||
setIsLoading(true);
|
||||
|
||||
const [deleteTarget, setDeleteTarget] = useState<TeamRecord | null>(null);
|
||||
const [isDeleting, setIsDeleting] = useState<boolean>(false);
|
||||
|
||||
const loadTeams = useCallback(async (showLoadingState: boolean): Promise<void> => {
|
||||
try {
|
||||
if (showLoadingState) {
|
||||
setIsLoading(true);
|
||||
} else {
|
||||
setIsRefreshing(true);
|
||||
}
|
||||
|
||||
const data = await fetchTeams();
|
||||
setTeams(data);
|
||||
setError(null);
|
||||
} catch (err: unknown) {
|
||||
setError(err instanceof Error ? err.message : "Failed to load teams");
|
||||
setLoadError(null);
|
||||
} catch (error) {
|
||||
setLoadError(getErrorMessage(error, "Failed to load teams"));
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
setIsRefreshing(false);
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
fetchUserWorkspaces()
|
||||
.then((workspaces) => {
|
||||
const adminRoles: WorkspaceMemberRole[] = [
|
||||
WorkspaceMemberRole.OWNER,
|
||||
WorkspaceMemberRole.ADMIN,
|
||||
];
|
||||
void loadTeams();
|
||||
}, [loadTeams]);
|
||||
|
||||
setIsAdmin(workspaces.some((workspace) => adminRoles.includes(workspace.role)));
|
||||
})
|
||||
.catch(() => {
|
||||
setIsAdmin(true); // fail open
|
||||
});
|
||||
}, []);
|
||||
const handleCreateTeam = async (e: SyntheticEvent<HTMLFormElement>): Promise<void> => {
|
||||
e.preventDefault();
|
||||
|
||||
useEffect(() => {
|
||||
if (isAdmin !== true) {
|
||||
return;
|
||||
}
|
||||
const teamName = newTeamName.trim();
|
||||
if (!teamName) return;
|
||||
|
||||
void loadTeams(true);
|
||||
}, [isAdmin, loadTeams]);
|
||||
|
||||
function resetCreateForm(): void {
|
||||
setCreateForm(INITIAL_CREATE_FORM);
|
||||
setIsCreating(true);
|
||||
setCreateError(null);
|
||||
}
|
||||
|
||||
function openTeamDetails(team: TeamRecord): void {
|
||||
const nextDetailForm = {
|
||||
name: team.name,
|
||||
description: team.description ?? "",
|
||||
};
|
||||
|
||||
setDetailTarget(team);
|
||||
setDetailForm(nextDetailForm);
|
||||
setDetailInitial({
|
||||
name: nextDetailForm.name,
|
||||
description: nextDetailForm.description,
|
||||
});
|
||||
setDetailError(null);
|
||||
}
|
||||
|
||||
function resetTeamDetails(): void {
|
||||
setDetailTarget(null);
|
||||
setDetailForm(INITIAL_DETAIL_FORM);
|
||||
setDetailInitial(null);
|
||||
setDetailError(null);
|
||||
}
|
||||
|
||||
function handleTeamRowKeyDown(event: KeyboardEvent<HTMLDivElement>, team: TeamRecord): void {
|
||||
if (event.key === "Enter" || event.key === " ") {
|
||||
event.preventDefault();
|
||||
openTeamDetails(team);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleCreateSubmit(event: SyntheticEvent): Promise<void> {
|
||||
event.preventDefault();
|
||||
setCreateError(null);
|
||||
|
||||
const name = createForm.name.trim();
|
||||
if (!name) {
|
||||
setCreateError("Name is required.");
|
||||
return;
|
||||
}
|
||||
|
||||
const description = createForm.description.trim();
|
||||
const dto: CreateTeamDto = { name };
|
||||
if (description) {
|
||||
dto.description = description;
|
||||
}
|
||||
|
||||
try {
|
||||
setIsCreating(true);
|
||||
const description = newTeamDescription.trim();
|
||||
const dto: CreateTeamDto = { name: teamName };
|
||||
if (description.length > 0) {
|
||||
dto.description = description;
|
||||
}
|
||||
|
||||
await createTeam(dto);
|
||||
setIsCreateOpen(false);
|
||||
resetCreateForm();
|
||||
await loadTeams(false);
|
||||
} catch (err: unknown) {
|
||||
setCreateError(err instanceof Error ? err.message : "Failed to create team");
|
||||
setNewTeamName("");
|
||||
setNewTeamDescription("");
|
||||
setIsCreateDialogOpen(false);
|
||||
await loadTeams();
|
||||
} catch (error) {
|
||||
setCreateError(getErrorMessage(error, "Failed to create team"));
|
||||
} finally {
|
||||
setIsCreating(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleDetailSubmit(event: SyntheticEvent): Promise<void> {
|
||||
event.preventDefault();
|
||||
|
||||
if (detailTarget === null || detailInitial === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
const name = detailForm.name.trim();
|
||||
if (!name) {
|
||||
setDetailError("Name is required.");
|
||||
return;
|
||||
}
|
||||
|
||||
const nextDescription = detailForm.description.trim();
|
||||
const normalizedNextDescription = nextDescription.length > 0 ? nextDescription : null;
|
||||
const normalizedInitialDescription =
|
||||
detailInitial.description.trim().length > 0 ? detailInitial.description.trim() : null;
|
||||
|
||||
const dto: UpdateTeamDto = {};
|
||||
|
||||
if (name !== detailInitial.name) {
|
||||
dto.name = name;
|
||||
}
|
||||
|
||||
if (normalizedNextDescription !== normalizedInitialDescription) {
|
||||
dto.description = normalizedNextDescription;
|
||||
}
|
||||
|
||||
if (Object.keys(dto).length === 0) {
|
||||
resetTeamDetails();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
setIsSavingDetails(true);
|
||||
setDetailError(null);
|
||||
await updateTeam(detailTarget.id, dto);
|
||||
resetTeamDetails();
|
||||
await loadTeams(false);
|
||||
} catch (err: unknown) {
|
||||
setDetailError(err instanceof Error ? err.message : "Failed to update team");
|
||||
} finally {
|
||||
setIsSavingDetails(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function confirmDelete(): Promise<void> {
|
||||
if (!deleteTarget) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
setIsDeleting(true);
|
||||
await deleteTeam(deleteTarget.id);
|
||||
setDeleteTarget(null);
|
||||
await loadTeams(false);
|
||||
setError(null);
|
||||
} catch (err: unknown) {
|
||||
setError(err instanceof Error ? err.message : "Failed to delete team");
|
||||
} finally {
|
||||
setIsDeleting(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (isAdmin === null) {
|
||||
return (
|
||||
<Card className="max-w-2xl mx-auto mt-8">
|
||||
<CardContent className="py-12 text-center text-muted-foreground">
|
||||
Checking permissions...
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
if (!isAdmin) {
|
||||
return <SettingsAccessDenied message="You need Admin or Owner role to manage teams." />;
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="max-w-6xl mx-auto p-6 space-y-6">
|
||||
<div className="flex items-start justify-between gap-4">
|
||||
<div>
|
||||
<div className="flex items-center gap-3">
|
||||
<h1 className="text-3xl font-bold">Teams</h1>
|
||||
<Badge variant="outline">{teams.length} total</Badge>
|
||||
</div>
|
||||
<p className="text-muted-foreground mt-1">Create and manage workspace teams</p>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={() => {
|
||||
void loadTeams(false);
|
||||
}}
|
||||
disabled={isLoading || isRefreshing}
|
||||
>
|
||||
{isRefreshing ? "Refreshing..." : "Refresh"}
|
||||
</Button>
|
||||
|
||||
<Dialog
|
||||
open={isCreateOpen}
|
||||
onOpenChange={(open) => {
|
||||
if (!open && !isCreating) {
|
||||
resetCreateForm();
|
||||
}
|
||||
setIsCreateOpen(open);
|
||||
}}
|
||||
>
|
||||
<DialogTrigger asChild>
|
||||
<Button>
|
||||
<Plus className="h-4 w-4 mr-2" />
|
||||
Create Team
|
||||
</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Create Team</DialogTitle>
|
||||
<DialogDescription>
|
||||
Create a team in the active workspace to organize members and permissions.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<form
|
||||
onSubmit={(event) => {
|
||||
void handleCreateSubmit(event);
|
||||
}}
|
||||
className="space-y-4"
|
||||
>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="create-name">Name</Label>
|
||||
<Input
|
||||
id="create-name"
|
||||
value={createForm.name}
|
||||
onChange={(event: ChangeEvent<HTMLInputElement>) => {
|
||||
setCreateForm((prev) => ({ ...prev, name: event.target.value }));
|
||||
}}
|
||||
placeholder="Platform Team"
|
||||
maxLength={100}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="create-description">Description</Label>
|
||||
<Textarea
|
||||
id="create-description"
|
||||
value={createForm.description}
|
||||
onChange={(event: ChangeEvent<HTMLTextAreaElement>) => {
|
||||
setCreateForm((prev) => ({ ...prev, description: event.target.value }));
|
||||
}}
|
||||
placeholder="Owns platform services and infrastructure"
|
||||
maxLength={500}
|
||||
rows={4}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{createError ? (
|
||||
<p className="text-sm text-destructive" role="alert">
|
||||
{createError}
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
<DialogFooter>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={() => {
|
||||
if (!isCreating) {
|
||||
setIsCreateOpen(false);
|
||||
resetCreateForm();
|
||||
}
|
||||
}}
|
||||
disabled={isCreating}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button type="submit" disabled={isCreating}>
|
||||
{isCreating ? "Creating..." : "Create Team"}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
<main className="container mx-auto px-4 py-8 max-w-5xl">
|
||||
<div className="mb-8">
|
||||
<div className="flex items-center justify-between mb-2">
|
||||
<h1 className="text-3xl font-bold text-gray-900">Teams</h1>
|
||||
<Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
|
||||
{"<-"} Back to Settings
|
||||
</Link>
|
||||
</div>
|
||||
<p className="text-gray-600">Manage teams in your active workspace</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
|
||||
← Back to Settings
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
{error ? (
|
||||
<Card>
|
||||
<CardContent className="py-4">
|
||||
<p className="text-sm text-destructive" role="alert">
|
||||
{error}
|
||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-6 mb-6">
|
||||
<div className="flex items-center justify-between gap-4">
|
||||
<div>
|
||||
<h2 className="text-lg font-semibold text-gray-900">Create New Team</h2>
|
||||
<p className="text-sm text-gray-600 mt-1">
|
||||
Add a team to organize members and permissions.
|
||||
</p>
|
||||
</CardContent>
|
||||
</Card>
|
||||
) : null}
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setCreateError(null);
|
||||
setIsCreateDialogOpen(true);
|
||||
}}
|
||||
className="px-6 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 font-medium"
|
||||
>
|
||||
Create Team
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{isLoading ? (
|
||||
<Card>
|
||||
<CardContent className="py-12 text-center text-muted-foreground">
|
||||
Loading teams...
|
||||
</CardContent>
|
||||
</Card>
|
||||
) : teams.length === 0 ? (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>No Teams Yet</CardTitle>
|
||||
<CardDescription>Create the first team to get started.</CardDescription>
|
||||
</CardHeader>
|
||||
</Card>
|
||||
) : (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Team Directory</CardTitle>
|
||||
<CardDescription>
|
||||
Click a team to view details or edit name and description.
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-3">
|
||||
{teams.map((team) => {
|
||||
const memberCount = team._count?.members ?? 0;
|
||||
const description = team.description?.trim();
|
||||
{isCreateDialogOpen && (
|
||||
<div
|
||||
className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 px-4"
|
||||
role="dialog"
|
||||
>
|
||||
<div className="w-full max-w-lg rounded-lg border border-gray-200 bg-white p-6 shadow-xl">
|
||||
<h3 className="text-lg font-semibold text-gray-900">Create New Team</h3>
|
||||
<p className="mt-1 text-sm text-gray-600">
|
||||
Enter a team name and optional description.
|
||||
</p>
|
||||
|
||||
return (
|
||||
<div
|
||||
key={team.id}
|
||||
className="rounded-md border p-4 flex flex-col gap-3 md:flex-row md:items-center md:justify-between cursor-pointer hover:bg-muted/30"
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
onClick={() => {
|
||||
openTeamDetails(team);
|
||||
}}
|
||||
onKeyDown={(event) => {
|
||||
handleTeamRowKeyDown(event, team);
|
||||
<form onSubmit={handleCreateTeam} className="mt-4 space-y-4">
|
||||
<div>
|
||||
<label htmlFor="team-name" className="mb-1 block text-sm font-medium text-gray-700">
|
||||
Team Name
|
||||
</label>
|
||||
<input
|
||||
id="team-name"
|
||||
type="text"
|
||||
value={newTeamName}
|
||||
onChange={(e) => {
|
||||
setNewTeamName(e.target.value);
|
||||
}}
|
||||
placeholder="Enter team name..."
|
||||
disabled={isCreating}
|
||||
className="w-full rounded-lg border border-gray-300 px-4 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100"
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label
|
||||
htmlFor="team-description"
|
||||
className="mb-1 block text-sm font-medium text-gray-700"
|
||||
>
|
||||
<div className="space-y-1 min-w-0">
|
||||
<p className="font-semibold truncate">{team.name}</p>
|
||||
<p className="text-sm text-muted-foreground truncate">
|
||||
{description && description.length > 0 ? description : "No description"}
|
||||
</p>
|
||||
</div>
|
||||
Description (optional)
|
||||
</label>
|
||||
<textarea
|
||||
id="team-description"
|
||||
value={newTeamDescription}
|
||||
onChange={(e) => {
|
||||
setNewTeamDescription(e.target.value);
|
||||
}}
|
||||
placeholder="Describe this team's purpose..."
|
||||
disabled={isCreating}
|
||||
rows={3}
|
||||
className="w-full rounded-lg border border-gray-300 px-4 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2 flex-wrap md:justify-end">
|
||||
<Badge variant="outline">
|
||||
<Users className="h-3.5 w-3.5 mr-1" />
|
||||
{toMemberLabel(memberCount)}
|
||||
</Badge>
|
||||
<Badge variant="secondary">
|
||||
Created {new Date(team.createdAt).toLocaleDateString()}
|
||||
</Badge>
|
||||
<Button
|
||||
variant="destructive"
|
||||
size="sm"
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
setDeleteTarget(team);
|
||||
}}
|
||||
>
|
||||
<Trash2 className="h-4 w-4 mr-2" />
|
||||
Delete
|
||||
</Button>
|
||||
</div>
|
||||
{createError !== null && (
|
||||
<div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
|
||||
{createError}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
<div className="flex justify-end gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
if (!isCreating) {
|
||||
setIsCreateDialogOpen(false);
|
||||
}
|
||||
}}
|
||||
disabled={isCreating}
|
||||
className="px-4 py-2 rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
type="submit"
|
||||
disabled={isCreating || !newTeamName.trim()}
|
||||
className="px-5 py-2 rounded-lg bg-blue-600 text-white font-medium hover:bg-blue-700 disabled:cursor-not-allowed disabled:opacity-50"
|
||||
>
|
||||
{isCreating ? "Creating..." : "Create Team"}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<Dialog
|
||||
open={detailTarget !== null}
|
||||
onOpenChange={(open) => {
|
||||
if (!open && !isSavingDetails) {
|
||||
resetTeamDetails();
|
||||
}
|
||||
}}
|
||||
>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Team Details</DialogTitle>
|
||||
<DialogDescription>
|
||||
Edit team details for {detailTarget?.name ?? "selected team"}.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<form
|
||||
onSubmit={(event) => {
|
||||
void handleDetailSubmit(event);
|
||||
}}
|
||||
className="space-y-4"
|
||||
>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="detail-name">Name</Label>
|
||||
<Input
|
||||
id="detail-name"
|
||||
value={detailForm.name}
|
||||
onChange={(event: ChangeEvent<HTMLInputElement>) => {
|
||||
setDetailForm((prev) => ({ ...prev, name: event.target.value }));
|
||||
}}
|
||||
placeholder="Team name"
|
||||
maxLength={100}
|
||||
disabled={isSavingDetails}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="detail-description">Description</Label>
|
||||
<Textarea
|
||||
id="detail-description"
|
||||
value={detailForm.description}
|
||||
onChange={(event: ChangeEvent<HTMLTextAreaElement>) => {
|
||||
setDetailForm((prev) => ({ ...prev, description: event.target.value }));
|
||||
}}
|
||||
placeholder="Describe this team"
|
||||
maxLength={500}
|
||||
rows={4}
|
||||
disabled={isSavingDetails}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{detailError !== null ? (
|
||||
<p className="text-sm text-destructive" role="alert">
|
||||
{detailError}
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
<DialogFooter>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={() => {
|
||||
if (!isSavingDetails) {
|
||||
resetTeamDetails();
|
||||
}
|
||||
}}
|
||||
disabled={isSavingDetails}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button type="submit" disabled={isSavingDetails}>
|
||||
{isSavingDetails ? "Saving..." : "Save Changes"}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<AlertDialog
|
||||
open={deleteTarget !== null}
|
||||
onOpenChange={(open) => {
|
||||
if (!open && !isDeleting) {
|
||||
setDeleteTarget(null);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<AlertDialogContent>
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>Delete Team</AlertDialogTitle>
|
||||
<AlertDialogDescription>
|
||||
Delete {deleteTarget?.name}? Team members will be removed from this team assignment.
|
||||
</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
|
||||
<AlertDialogAction
|
||||
disabled={isDeleting}
|
||||
onClick={() => {
|
||||
void confirmDelete();
|
||||
}}
|
||||
<div className="space-y-4">
|
||||
<h2 className="text-xl font-semibold text-gray-900">
|
||||
Your Teams ({isLoading ? "..." : teams.length})
|
||||
</h2>
|
||||
{loadError !== null ? (
|
||||
<div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-red-700">
|
||||
{loadError}
|
||||
</div>
|
||||
) : isLoading ? (
|
||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center text-gray-600">
|
||||
Loading teams...
|
||||
</div>
|
||||
) : teams.length === 0 ? (
|
||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center">
|
||||
<svg
|
||||
className="mx-auto h-12 w-12 text-gray-400 mb-4"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
{isDeleting ? "Deleting..." : "Delete Team"}
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
</div>
|
||||
<path
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
strokeWidth={2}
|
||||
d="M17 20h5V8H2v12h5m10 0v-4a3 3 0 10-6 0v4m6 0H7"
|
||||
/>
|
||||
</svg>
|
||||
<h3 className="text-lg font-medium text-gray-900 mb-2">No teams yet</h3>
|
||||
<p className="text-gray-600">Create your first team to get started</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
{teams.map((team) => (
|
||||
<article
|
||||
key={team.id}
|
||||
className="rounded-lg border border-gray-200 bg-white p-5 shadow-sm"
|
||||
data-testid="team-card"
|
||||
>
|
||||
<h3 className="text-lg font-semibold text-gray-900">{team.name}</h3>
|
||||
{team.description ? (
|
||||
<p className="mt-1 text-sm text-gray-600">{team.description}</p>
|
||||
) : (
|
||||
<p className="mt-1 text-sm text-gray-400 italic">No description</p>
|
||||
)}
|
||||
<div className="mt-4 flex items-center gap-3 text-xs text-gray-500">
|
||||
<span>{team._count?.members ?? 0} members</span>
|
||||
<span>|</span>
|
||||
<span>Created {new Date(team.createdAt).toLocaleDateString()}</span>
|
||||
</div>
|
||||
</article>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -118,23 +118,6 @@ describe("UsersSettingsPage", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("shows access denied to non-admin users", async () => {
|
||||
fetchUserWorkspacesMock.mockResolvedValueOnce([
|
||||
{
|
||||
id: "workspace-1",
|
||||
name: "Personal Workspace",
|
||||
ownerId: "owner-1",
|
||||
role: WorkspaceMemberRole.MEMBER,
|
||||
createdAt: "2026-01-01T00:00:00.000Z",
|
||||
},
|
||||
]);
|
||||
|
||||
render(<UsersSettingsPage />);
|
||||
|
||||
expect(await screen.findByText("Access Denied")).toBeInTheDocument();
|
||||
expect(fetchAdminUsersMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("invites a user with email and role from the dialog", async () => {
|
||||
const user = userEvent.setup();
|
||||
render(<UsersSettingsPage />);
|
||||
|
||||
@@ -56,7 +56,6 @@ import {
|
||||
type UpdateUserDto,
|
||||
} from "@/lib/api/admin";
|
||||
import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
|
||||
import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
|
||||
|
||||
const ROLE_PRIORITY: Record<WorkspaceMemberRole, number> = {
|
||||
[WorkspaceMemberRole.OWNER]: 4,
|
||||
@@ -147,6 +146,10 @@ export default function UsersSettingsPage(): ReactElement {
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
void loadUsers(true);
|
||||
}, [loadUsers]);
|
||||
|
||||
useEffect(() => {
|
||||
fetchUserWorkspaces()
|
||||
.then((workspaces) => {
|
||||
@@ -164,14 +167,6 @@ export default function UsersSettingsPage(): ReactElement {
|
||||
});
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (isAdmin !== true) {
|
||||
return;
|
||||
}
|
||||
|
||||
void loadUsers(true);
|
||||
}, [isAdmin, loadUsers]);
|
||||
|
||||
function resetInviteForm(): void {
|
||||
setInviteForm(INITIAL_INVITE_FORM);
|
||||
setInviteError(null);
|
||||
@@ -337,20 +332,17 @@ export default function UsersSettingsPage(): ReactElement {
|
||||
}
|
||||
}
|
||||
|
||||
if (isAdmin === null) {
|
||||
if (isAdmin === false) {
|
||||
return (
|
||||
<Card className="max-w-2xl mx-auto mt-8">
|
||||
<CardContent className="py-12 text-center text-muted-foreground">
|
||||
Checking permissions...
|
||||
</CardContent>
|
||||
</Card>
|
||||
<div className="p-8 max-w-2xl">
|
||||
<div className="rounded-lg border border-red-200 bg-red-50 p-6 text-center">
|
||||
<p className="text-lg font-semibold text-red-700">Access Denied</p>
|
||||
<p className="mt-2 text-sm text-red-600">You need Admin or Owner role to manage users.</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!isAdmin) {
|
||||
return <SettingsAccessDenied message="You need Admin or Owner role to manage users." />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="max-w-6xl mx-auto p-6 space-y-6">
|
||||
<div className="flex items-start justify-between gap-4">
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
import type { ReactElement } from "react";
|
||||
|
||||
interface SettingsAccessDeniedProps {
|
||||
message: string;
|
||||
}
|
||||
|
||||
export function SettingsAccessDenied({ message }: SettingsAccessDeniedProps): ReactElement {
|
||||
return (
|
||||
<div className="p-8 max-w-2xl">
|
||||
<div className="rounded-lg border border-red-200 bg-red-50 p-6 text-center">
|
||||
<p className="text-lg font-semibold text-red-700">Access Denied</p>
|
||||
<p className="mt-2 text-sm text-red-600">{message}</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import * as client from "./client";
|
||||
import { fetchTeams, createTeam, fetchTeamMembers, updateTeam, deleteTeam } from "./teams";
|
||||
import { fetchTeams, createTeam, fetchTeamMembers } from "./teams";
|
||||
|
||||
vi.mock("./client");
|
||||
|
||||
@@ -44,18 +44,6 @@ describe("createTeam", (): void => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("updateTeam", (): void => {
|
||||
it("patches team endpoint", async (): Promise<void> => {
|
||||
vi.mocked(client.apiPatch).mockResolvedValueOnce({ id: "t1", name: "Platform" } as never);
|
||||
await updateTeam("t1", { name: "Platform" });
|
||||
expect(client.apiPatch).toHaveBeenCalledWith(
|
||||
"/api/workspaces/ws-1/teams/t1",
|
||||
expect.objectContaining({ name: "Platform" }),
|
||||
"ws-1"
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("fetchTeamMembers", (): void => {
|
||||
it("calls members endpoint for team", async (): Promise<void> => {
|
||||
vi.mocked(client.apiGet).mockResolvedValueOnce([] as never);
|
||||
@@ -63,11 +51,3 @@ describe("fetchTeamMembers", (): void => {
|
||||
expect(client.apiGet).toHaveBeenCalledWith("/api/workspaces/ws-1/teams/t-1/members", "ws-1");
|
||||
});
|
||||
});
|
||||
|
||||
describe("deleteTeam", (): void => {
|
||||
it("deletes team endpoint", async (): Promise<void> => {
|
||||
vi.mocked(client.apiDelete).mockResolvedValueOnce(undefined as never);
|
||||
await deleteTeam("t1");
|
||||
expect(client.apiDelete).toHaveBeenCalledWith("/api/workspaces/ws-1/teams/t1", "ws-1");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
|
||||
import type { TeamMemberRole } from "@mosaic/shared";
|
||||
import { apiDelete, apiGet, apiPatch, apiPost } from "./client";
|
||||
import { apiDelete, apiGet, apiPost } from "./client";
|
||||
|
||||
const WORKSPACE_STORAGE_KEY = "mosaic-workspace-id";
|
||||
|
||||
@@ -55,11 +55,6 @@ export interface CreateTeamDto {
|
||||
description?: string;
|
||||
}
|
||||
|
||||
export interface UpdateTeamDto {
|
||||
name?: string;
|
||||
description?: string | null;
|
||||
}
|
||||
|
||||
export interface AddTeamMemberDto {
|
||||
userId: string;
|
||||
role?: TeamMemberRole;
|
||||
@@ -85,22 +80,6 @@ export async function createTeam(dto: CreateTeamDto, workspaceId?: string): Prom
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a team in the active workspace.
|
||||
*/
|
||||
export async function updateTeam(
|
||||
teamId: string,
|
||||
dto: UpdateTeamDto,
|
||||
workspaceId?: string
|
||||
): Promise<TeamRecord> {
|
||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
||||
return apiPatch<TeamRecord>(
|
||||
`/api/workspaces/${resolvedWorkspaceId}/teams/${teamId}`,
|
||||
dto,
|
||||
resolvedWorkspaceId
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch team members for a team in the active workspace.
|
||||
* The current backend route shape is workspace-scoped team membership.
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
# OpenClaw Agent Fleet
|
||||
|
||||
OpenClaw multi-agent deployment for Mosaic Stack using Docker Swarm and Portainer.
|
||||
|
||||
## Agent Roster
|
||||
|
||||
| Agent | Service | Primary Model | Role |
|
||||
| ----------------- | ------------------- | --------------- | ---------------------------------- |
|
||||
| jarvis-main | `jarvis-main` | `zai/glm-5` | Orchestrator / user-facing gateway |
|
||||
| jarvis-projects | `jarvis-projects` | `zai/glm-5` | Development and coding tasks |
|
||||
| jarvis-research | `jarvis-research` | `zai/glm-5` | Research and web search |
|
||||
| jarvis-operations | `jarvis-operations` | `ollama/cogito` | Monitoring, health checks, alerts |
|
||||
|
||||
## Prerequisites
|
||||
|
||||
1. Docker Swarm initialized on the target host
|
||||
2. Existing Docker network `mosaic-stack_internal` (external swarm network)
|
||||
3. Z.ai API access key (`ZAI_API_KEY`)
|
||||
4. Ollama reachable at `10.1.1.42:11434` for the `cogito` model
|
||||
|
||||
## Quick Start
|
||||
|
||||
### 1. Configure each agent env file
|
||||
|
||||
Set values in:
|
||||
|
||||
- `docker/openclaw-instances/jarvis-main.env`
|
||||
- `docker/openclaw-instances/jarvis-projects.env`
|
||||
- `docker/openclaw-instances/jarvis-research.env`
|
||||
- `docker/openclaw-instances/jarvis-operations.env`
|
||||
|
||||
Required variables:
|
||||
|
||||
- `OPENCLAW_CONFIG_PATH=/config/openclaw.json`
|
||||
- `ZAI_API_KEY=<your-zai-api-key>`
|
||||
- `OPENCLAW_GATEWAY_TOKEN=<unique-token-per-agent>`
|
||||
|
||||
### 2. Generate unique gateway tokens
|
||||
|
||||
Generate one token per service:
|
||||
|
||||
```bash
|
||||
openssl rand -hex 32
|
||||
```
|
||||
|
||||
### 3. Deploy the fleet
|
||||
|
||||
From repo root:
|
||||
|
||||
```bash
|
||||
docker stack deploy -c docker/openclaw-compose.yml jarvis
|
||||
```
|
||||
|
||||
### 4. Verify service status
|
||||
|
||||
```bash
|
||||
docker stack services jarvis
|
||||
docker service logs jarvis-jarvis-main --tail 100
|
||||
docker service logs jarvis-jarvis-projects --tail 100
|
||||
docker service logs jarvis-jarvis-research --tail 100
|
||||
docker service logs jarvis-jarvis-operations --tail 100
|
||||
```
|
||||
|
||||
### 5. First-time auth (if required)
|
||||
|
||||
Exec into a container and run OpenClaw auth device flow:
|
||||
|
||||
```bash
|
||||
docker exec -it $(docker ps -q -f name=jarvis-jarvis-main) sh
|
||||
openclaw auth
|
||||
```
|
||||
|
||||
You can also complete this in the Mosaic WebUI terminal (xterm.js).
|
||||
|
||||
## Management Commands
|
||||
|
||||
| Command | Description |
|
||||
| ----------------------------------------------------------- | ---------------------- |
|
||||
| `docker stack deploy -c docker/openclaw-compose.yml jarvis` | Deploy/update fleet |
|
||||
| `docker stack services jarvis` | List services in stack |
|
||||
| `docker service logs jarvis-<service>` | View service logs |
|
||||
| `docker service update --force jarvis-<service>` | Restart rolling update |
|
||||
| `docker service scale jarvis-<service>=N` | Scale a service |
|
||||
| `docker stack rm jarvis` | Remove fleet |
|
||||
|
||||
## Notes
|
||||
|
||||
- Each service stores persistent local OpenClaw state in `/home/node/.openclaw`.
|
||||
- Each service mounts a read-only per-agent JSON config at `/config/openclaw.json`.
|
||||
- `chatCompletions` endpoint is enabled in each agent config for Mosaic API usage.
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM quay.io/openbao/openbao:2.5.1
|
||||
FROM quay.io/openbao/openbao:2.5.0
|
||||
|
||||
LABEL maintainer="Mosaic Stack <dev@mosaic.local>"
|
||||
LABEL description="OpenBao secrets management for Mosaic Stack"
|
||||
|
||||
@@ -1,166 +0,0 @@
|
||||
services:
|
||||
jarvis-main:
|
||||
image: alpine/openclaw:latest
|
||||
command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
|
||||
env_file:
|
||||
- ./openclaw-instances/jarvis-main.env
|
||||
environment:
|
||||
OPENCLAW_CONFIG_PATH: /config/openclaw.json
|
||||
volumes:
|
||||
- jarvis-main-config:/config/openclaw.json:ro
|
||||
- jarvis-main-state:/home/node/.openclaw
|
||||
networks:
|
||||
- mosaic-stack_internal
|
||||
healthcheck:
|
||||
test: ["CMD", "openclaw", "gateway", "health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 20s
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
max_attempts: 3
|
||||
resources:
|
||||
limits:
|
||||
memory: 2G
|
||||
reservations:
|
||||
memory: 512M
|
||||
labels:
|
||||
- com.mosaic.agent=jarvis-main
|
||||
- com.mosaic.role=orchestrator
|
||||
|
||||
jarvis-projects:
|
||||
image: alpine/openclaw:latest
|
||||
command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
|
||||
env_file:
|
||||
- ./openclaw-instances/jarvis-projects.env
|
||||
environment:
|
||||
OPENCLAW_CONFIG_PATH: /config/openclaw.json
|
||||
volumes:
|
||||
- jarvis-projects-config:/config/openclaw.json:ro
|
||||
- jarvis-projects-state:/home/node/.openclaw
|
||||
networks:
|
||||
- mosaic-stack_internal
|
||||
healthcheck:
|
||||
test: ["CMD", "openclaw", "gateway", "health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 20s
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
max_attempts: 3
|
||||
resources:
|
||||
limits:
|
||||
memory: 4G
|
||||
reservations:
|
||||
memory: 1G
|
||||
labels:
|
||||
- com.mosaic.agent=jarvis-projects
|
||||
- com.mosaic.role=development
|
||||
|
||||
jarvis-research:
|
||||
image: alpine/openclaw:latest
|
||||
command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
|
||||
env_file:
|
||||
- ./openclaw-instances/jarvis-research.env
|
||||
environment:
|
||||
OPENCLAW_CONFIG_PATH: /config/openclaw.json
|
||||
volumes:
|
||||
- jarvis-research-config:/config/openclaw.json:ro
|
||||
- jarvis-research-state:/home/node/.openclaw
|
||||
networks:
|
||||
- mosaic-stack_internal
|
||||
healthcheck:
|
||||
test: ["CMD", "openclaw", "gateway", "health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 20s
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
max_attempts: 3
|
||||
resources:
|
||||
limits:
|
||||
memory: 1G
|
||||
reservations:
|
||||
memory: 256M
|
||||
labels:
|
||||
- com.mosaic.agent=jarvis-research
|
||||
- com.mosaic.role=research
|
||||
|
||||
jarvis-operations:
|
||||
image: alpine/openclaw:latest
|
||||
command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
|
||||
env_file:
|
||||
- ./openclaw-instances/jarvis-operations.env
|
||||
environment:
|
||||
OPENCLAW_CONFIG_PATH: /config/openclaw.json
|
||||
volumes:
|
||||
- jarvis-operations-config:/config/openclaw.json:ro
|
||||
- jarvis-operations-state:/home/node/.openclaw
|
||||
networks:
|
||||
- mosaic-stack_internal
|
||||
healthcheck:
|
||||
test: ["CMD", "openclaw", "gateway", "health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 20s
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
max_attempts: 3
|
||||
resources:
|
||||
limits:
|
||||
memory: 1G
|
||||
reservations:
|
||||
memory: 256M
|
||||
labels:
|
||||
- com.mosaic.agent=jarvis-operations
|
||||
- com.mosaic.role=operations
|
||||
|
||||
networks:
|
||||
mosaic-stack_internal:
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
jarvis-main-config:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ${PWD}/docker/openclaw-instances/jarvis-main.json
|
||||
jarvis-projects-config:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ${PWD}/docker/openclaw-instances/jarvis-projects.json
|
||||
jarvis-research-config:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ${PWD}/docker/openclaw-instances/jarvis-research.json
|
||||
jarvis-operations-config:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ${PWD}/docker/openclaw-instances/jarvis-operations.json
|
||||
jarvis-main-state:
|
||||
jarvis-projects-state:
|
||||
jarvis-research-state:
|
||||
jarvis-operations-state:
|
||||
@@ -1,47 +0,0 @@
|
||||
# OpenClaw Agent Instance Setup
|
||||
|
||||
Each service in the OpenClaw fleet reads:
|
||||
|
||||
- A per-agent environment file: `docker/openclaw-instances/<agent>.env`
|
||||
- A per-agent JSON5 config: `docker/openclaw-instances/<agent>.json`
|
||||
|
||||
## 1. Fill in API keys in `.env` files
|
||||
|
||||
Set `ZAI_API_KEY` in each instance env file:
|
||||
|
||||
- `jarvis-main.env`
|
||||
- `jarvis-projects.env`
|
||||
- `jarvis-research.env`
|
||||
- `jarvis-operations.env`
|
||||
|
||||
## 2. Generate unique gateway tokens per agent
|
||||
|
||||
Generate one token per instance:
|
||||
|
||||
```bash
|
||||
openssl rand -hex 32
|
||||
```
|
||||
|
||||
Set a different `OPENCLAW_GATEWAY_TOKEN` in each `.env` file.
|
||||
|
||||
## 3. Deploy the Docker Swarm stack
|
||||
|
||||
From repository root:
|
||||
|
||||
```bash
|
||||
docker stack deploy -c docker/openclaw-compose.yml jarvis
|
||||
```
|
||||
|
||||
## 4. First-time auth (if needed)
|
||||
|
||||
If an instance requires first-time login, exec into the running container and run:
|
||||
|
||||
```bash
|
||||
openclaw auth
|
||||
```
|
||||
|
||||
This uses OpenClaw's headless OAuth device-code flow.
|
||||
|
||||
## 5. Use Mosaic WebUI terminal for auth
|
||||
|
||||
You can complete the device-code auth flow from the Mosaic WebUI terminal (xterm.js) attached to the service container.
|
||||
@@ -1,3 +0,0 @@
|
||||
OPENCLAW_CONFIG_PATH=/config/openclaw.json
|
||||
ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
|
||||
OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
"gateway": {
|
||||
"mode": "local",
|
||||
"port": 18789,
|
||||
"bind": "lan",
|
||||
"auth": { "mode": "token" },
|
||||
"http": {
|
||||
"endpoints": {
|
||||
"chatCompletions": { "enabled": true }
|
||||
}
|
||||
}
|
||||
},
|
||||
"agents": {
|
||||
"defaults": {
|
||||
"workspace": "/home/node/workspace",
|
||||
"model": { "primary": "zai/glm-5" }
|
||||
}
|
||||
},
|
||||
// Z.ai is built in and uses ZAI_API_KEY.
|
||||
// Ollama is configured for optional local reasoning fallback.
|
||||
"models": {
|
||||
"mode": "merge",
|
||||
"providers": {
|
||||
"ollama": {
|
||||
"baseUrl": "http://10.1.1.42:11434/v1",
|
||||
"api": "openai-completions",
|
||||
"models": [
|
||||
{
|
||||
"id": "cogito",
|
||||
"name": "Cogito (Local Reasoning)",
|
||||
"reasoning": false,
|
||||
"input": ["text"],
|
||||
"cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
|
||||
"contextWindow": 128000,
|
||||
"maxTokens": 8192
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
OPENCLAW_CONFIG_PATH=/config/openclaw.json
|
||||
ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
|
||||
OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
"gateway": {
|
||||
"mode": "local",
|
||||
"port": 18789,
|
||||
"bind": "lan",
|
||||
"auth": { "mode": "token" },
|
||||
"http": {
|
||||
"endpoints": {
|
||||
"chatCompletions": { "enabled": true }
|
||||
}
|
||||
}
|
||||
},
|
||||
"agents": {
|
||||
"defaults": {
|
||||
"workspace": "/home/node/workspace",
|
||||
"model": { "primary": "ollama/cogito" }
|
||||
}
|
||||
},
|
||||
// Operations uses local Ollama Cogito as the primary model.
|
||||
"models": {
|
||||
"mode": "merge",
|
||||
"providers": {
|
||||
"ollama": {
|
||||
"baseUrl": "http://10.1.1.42:11434/v1",
|
||||
"api": "openai-completions",
|
||||
"models": [
|
||||
{
|
||||
"id": "cogito",
|
||||
"name": "Cogito (Local Reasoning)",
|
||||
"reasoning": false,
|
||||
"input": ["text"],
|
||||
"cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
|
||||
"contextWindow": 128000,
|
||||
"maxTokens": 8192
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
OPENCLAW_CONFIG_PATH=/config/openclaw.json
|
||||
ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
|
||||
OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
"gateway": {
|
||||
"mode": "local",
|
||||
"port": 18789,
|
||||
"bind": "lan",
|
||||
"auth": { "mode": "token" },
|
||||
"http": {
|
||||
"endpoints": {
|
||||
"chatCompletions": { "enabled": true }
|
||||
}
|
||||
}
|
||||
},
|
||||
"agents": {
|
||||
"defaults": {
|
||||
"workspace": "/home/node/workspace",
|
||||
"model": { "primary": "zai/glm-5" }
|
||||
}
|
||||
},
|
||||
"models": {
|
||||
"mode": "merge",
|
||||
"providers": {
|
||||
"ollama": {
|
||||
"baseUrl": "http://10.1.1.42:11434/v1",
|
||||
"api": "openai-completions",
|
||||
"models": [
|
||||
{
|
||||
"id": "cogito",
|
||||
"name": "Cogito (Local Reasoning)",
|
||||
"reasoning": false,
|
||||
"input": ["text"],
|
||||
"cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
|
||||
"contextWindow": 128000,
|
||||
"maxTokens": 8192
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
OPENCLAW_CONFIG_PATH=/config/openclaw.json
|
||||
ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
|
||||
OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
"gateway": {
|
||||
"mode": "local",
|
||||
"port": 18789,
|
||||
"bind": "lan",
|
||||
"auth": { "mode": "token" },
|
||||
"http": {
|
||||
"endpoints": {
|
||||
"chatCompletions": { "enabled": true }
|
||||
}
|
||||
}
|
||||
},
|
||||
"agents": {
|
||||
"defaults": {
|
||||
"workspace": "/home/node/workspace",
|
||||
"model": { "primary": "zai/glm-5" }
|
||||
}
|
||||
},
|
||||
"models": {
|
||||
"mode": "merge",
|
||||
"providers": {
|
||||
"ollama": {
|
||||
"baseUrl": "http://10.1.1.42:11434/v1",
|
||||
"api": "openai-completions",
|
||||
"models": [
|
||||
{
|
||||
"id": "cogito",
|
||||
"name": "Cogito (Local Reasoning)",
|
||||
"reasoning": false,
|
||||
"input": ["text"],
|
||||
"cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
|
||||
"contextWindow": 128000,
|
||||
"maxTokens": 8192
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,14 +25,14 @@
|
||||
| MS21-MIG-003 | not-started | phase-3 | Run migration on production database | #568 | api | — | MS21-MIG-001,MS21-TEST-003 | MS21-VER-001 | — | — | — | 5K | — | Needs deploy coordination; not automatable |
|
||||
| MS21-MIG-004 | done | phase-3 | Import API endpoints (6/6 tests) | #568 | api | feat/ms21-import-api | MS21-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | 24K | PR #567 merged, CI green. Review: 0 blockers, 4 should-fix, 1 medium sec (no audit log). |
|
||||
| MS21-UI-001 | done | phase-4 | Settings/users page | #569 | web | feat/ms21-ui-users | MS21-API-001,MS21-API-002 | — | codex | 2026-02-28 | 2026-02-28 | 20K | ~30K | PR #573 merged. Review: 0 blockers, 4 should-fix → MS21-UI-001-QA |
|
||||
| MS21-UI-001-QA | in-progress | phase-4 | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569 | web | fix/ms21-ui-001-qa | MS21-UI-001 | — | — | — | — | 15K | — | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
|
||||
| MS21-UI-002 | done | phase-4 | User detail/edit and invite dialogs | #569 | web | feat/ms21-ui-users | MS21-UI-001 | — | — | — | — | 15K | — | |
|
||||
| MS21-UI-001-QA | not-started | phase-4 | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569 | web | fix/ms21-ui-001-qa | MS21-UI-001 | — | — | — | — | 15K | — | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
|
||||
| MS21-UI-002 | not-started | phase-4 | User detail/edit and invite dialogs | #569 | web | feat/ms21-ui-users | MS21-UI-001 | — | — | — | — | 15K | — | |
|
||||
| MS21-UI-003 | done | phase-4 | Settings/workspaces page (wire to real API) | #569 | web | feat/ms21-ui-workspaces | MS21-API-003 | — | codex | 2026-02-28 | 2026-02-28 | 15K | ~25K | PR #574 merged. Review: 0 critical, 1 low (raw errors in UI) |
|
||||
| MS21-UI-004 | done | phase-4 | Workspace member management UI | #569 | web | feat/ms21-ui-workspaces | MS21-UI-003,MS21-API-003 | — | — | — | — | 15K | — | Components exist |
|
||||
| MS21-UI-005 | done | phase-4 | Settings/teams page | #569 | web | feat/ms21-ui-teams | MS21-API-004 | — | — | — | — | 15K | — | |
|
||||
| MS21-TEST-004 | in-progress | phase-4 | Frontend component tests | #569 | web | test/ms21-ui | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | — | — | — | — | 20K | — | |
|
||||
| MS21-RBAC-001 | done | phase-5 | Sidebar navigation role gating | #570 | web | feat/ms21-rbac | MS21-UI-001 | — | — | — | — | 10K | — | |
|
||||
| MS21-RBAC-002 | done | phase-5 | Settings page access restriction | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
||||
| MS21-UI-004 | not-started | phase-4 | Workspace member management UI | #569 | web | feat/ms21-ui-workspaces | MS21-UI-003,MS21-API-003 | — | — | — | — | 15K | — | Components exist |
|
||||
| MS21-UI-005 | not-started | phase-4 | Settings/teams page | #569 | web | feat/ms21-ui-teams | MS21-API-004 | — | — | — | — | 15K | — | |
|
||||
| MS21-TEST-004 | not-started | phase-4 | Frontend component tests | #569 | web | test/ms21-ui | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | — | — | — | — | 20K | — | |
|
||||
| MS21-RBAC-001 | not-started | phase-5 | Sidebar navigation role gating | #570 | web | feat/ms21-rbac | MS21-UI-001 | — | — | — | — | 10K | — | |
|
||||
| MS21-RBAC-002 | not-started | phase-5 | Settings page access restriction | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
||||
| MS21-RBAC-003 | done | phase-5 | Action button permission gating | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
||||
| MS21-RBAC-004 | done | phase-5 | User profile role display | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 5K | — | |
|
||||
| MS21-VER-001 | done | phase-6 | Full quality gate pass | #571 | stack | — | MS21-TEST-004,MS21-RBAC-004,MS21-MIG-003 | MS21-VER-002 | — | — | — | 5K | — | |
|
||||
@@ -69,5 +69,5 @@ Remaining estimate: ~143K tokens (Codex budget).
|
||||
| MS22-API-003 | not-started | p0-knowledge | Task API: expose assigned_agent in CRUD | TASKS:P0 | api | feat/ms22-task-agent | MS22-DB-003 | MS22-TEST-001 | — | — | — | 8K | — | Extend existing TaskModule |
|
||||
| MS22-TEST-001 | not-started | p0-knowledge | Integration tests: Findings + AgentMemory + ConvArchive | TASKS:P0 | api | test/ms22-integration | MS22-API-001,MS22-API-002,MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | E2E with live postgres |
|
||||
| MS22-SKILL-001 | not-started | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory) | TASKS:P0 | stack | feat/ms22-openclaw-skill | MS22-API-001,MS22-API-002 | MS22-VER-P0 | — | — | — | 15K | — | Skill in ~/.agents/skills/mosaic/ |
|
||||
| MS22-INGEST-001 | done | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest | MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | Script to batch-ingest existing logs |
|
||||
| MS22-INGEST-001 | not-started | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest | MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | Script to batch-ingest existing logs |
|
||||
| MS22-VER-P0 | not-started | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested | TASKS:P0 | stack | — | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | — | — | — | — | 5K | — | |
|
||||
|
||||
@@ -35,8 +35,7 @@
|
||||
"docker:ps": "docker compose ps",
|
||||
"docker:build": "docker compose build",
|
||||
"docker:restart": "docker compose restart",
|
||||
"prepare": "husky || true",
|
||||
"ingest:sessions": "tsx scripts/ingest-openclaw-sessions.ts"
|
||||
"prepare": "husky || true"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "^8.26.0",
|
||||
|
||||
@@ -1,621 +0,0 @@
|
||||
import { createReadStream, constants as fsConstants } from "node:fs";
|
||||
import { access, readdir, stat } from "node:fs/promises";
|
||||
import { homedir } from "node:os";
|
||||
import * as path from "node:path";
|
||||
import * as process from "node:process";
|
||||
import { createInterface } from "node:readline";
|
||||
|
||||
const DEFAULT_ENDPOINT = "https://mosaic-api.woltje.com/conversation-archive/ingest";
|
||||
|
||||
type IngestRole = "user" | "assistant";
|
||||
|
||||
interface IngestMessage {
|
||||
role: IngestRole;
|
||||
content: string;
|
||||
timestamp?: string;
|
||||
}
|
||||
|
||||
interface IngestPayload {
|
||||
sessionId: string;
|
||||
workspaceId: string;
|
||||
title: string;
|
||||
messages: IngestMessage[];
|
||||
agentId?: string;
|
||||
}
|
||||
|
||||
interface CliOptions {
|
||||
workspaceId: string;
|
||||
agentId?: string;
|
||||
since?: Date;
|
||||
sessionsDir?: string;
|
||||
endpoint: string;
|
||||
}
|
||||
|
||||
interface ParsedSession {
|
||||
sessionId: string;
|
||||
title: string;
|
||||
messages: IngestMessage[];
|
||||
startedAt?: string;
|
||||
endedAt?: string;
|
||||
parseErrors: number;
|
||||
inferredAgentId?: string;
|
||||
}
|
||||
|
||||
interface SendResult {
|
||||
ok: boolean;
|
||||
status: number;
|
||||
body: string;
|
||||
}
|
||||
|
||||
interface IngestSummary {
|
||||
discovered: number;
|
||||
processed: number;
|
||||
ingested: number;
|
||||
skippedSince: number;
|
||||
skippedEmpty: number;
|
||||
skippedDuplicate: number;
|
||||
failed: number;
|
||||
}
|
||||
|
||||
function printUsage(): void {
|
||||
console.log(
|
||||
[
|
||||
"Usage:",
|
||||
" pnpm ingest:sessions --workspace-id <id> [--agent-id <id>] [--since <ISO date>] [--sessions-dir <path>] [--endpoint <url>]",
|
||||
"",
|
||||
"Required:",
|
||||
" --workspace-id Target Mosaic workspace ID",
|
||||
"",
|
||||
"Optional:",
|
||||
" --agent-id Agent ID to include in each ingest payload",
|
||||
" --since Skip sessions before this date/time (ISO8601 or YYYY-MM-DD)",
|
||||
" --sessions-dir Override session directory path",
|
||||
` --endpoint Ingest endpoint (default: ${DEFAULT_ENDPOINT})`,
|
||||
].join("\n")
|
||||
);
|
||||
}
|
||||
|
||||
function expandHomePath(inputPath: string): string {
|
||||
if (inputPath === "~") {
|
||||
return homedir();
|
||||
}
|
||||
if (inputPath.startsWith("~/")) {
|
||||
return path.join(homedir(), inputPath.slice(2));
|
||||
}
|
||||
return inputPath;
|
||||
}
|
||||
|
||||
function parseSinceDate(rawDate: string): Date {
|
||||
const parsed = new Date(rawDate);
|
||||
if (Number.isNaN(parsed.getTime())) {
|
||||
throw new Error(`Invalid --since date: "${rawDate}". Use ISO8601 or YYYY-MM-DD.`);
|
||||
}
|
||||
return parsed;
|
||||
}
|
||||
|
||||
function parseCliArgs(args: string[]): CliOptions {
|
||||
let workspaceId: string | null = null;
|
||||
let agentId: string | undefined;
|
||||
let since: Date | undefined;
|
||||
let sessionsDir: string | undefined;
|
||||
let endpoint = DEFAULT_ENDPOINT;
|
||||
|
||||
for (let index = 0; index < args.length; index += 1) {
|
||||
const arg = args[index];
|
||||
|
||||
if (arg === "--help" || arg === "-h") {
|
||||
printUsage();
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
if (arg.startsWith("--workspace-id=")) {
|
||||
workspaceId = arg.slice("--workspace-id=".length);
|
||||
continue;
|
||||
}
|
||||
if (arg === "--workspace-id") {
|
||||
const value = args[index + 1];
|
||||
if (!value) {
|
||||
throw new Error("Missing value for --workspace-id");
|
||||
}
|
||||
workspaceId = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (arg.startsWith("--agent-id=")) {
|
||||
agentId = arg.slice("--agent-id=".length);
|
||||
continue;
|
||||
}
|
||||
if (arg === "--agent-id") {
|
||||
const value = args[index + 1];
|
||||
if (!value) {
|
||||
throw new Error("Missing value for --agent-id");
|
||||
}
|
||||
agentId = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (arg.startsWith("--since=")) {
|
||||
since = parseSinceDate(arg.slice("--since=".length));
|
||||
continue;
|
||||
}
|
||||
if (arg === "--since") {
|
||||
const value = args[index + 1];
|
||||
if (!value) {
|
||||
throw new Error("Missing value for --since");
|
||||
}
|
||||
since = parseSinceDate(value);
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (arg.startsWith("--sessions-dir=")) {
|
||||
sessionsDir = arg.slice("--sessions-dir=".length);
|
||||
continue;
|
||||
}
|
||||
if (arg === "--sessions-dir") {
|
||||
const value = args[index + 1];
|
||||
if (!value) {
|
||||
throw new Error("Missing value for --sessions-dir");
|
||||
}
|
||||
sessionsDir = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (arg.startsWith("--endpoint=")) {
|
||||
endpoint = arg.slice("--endpoint=".length);
|
||||
continue;
|
||||
}
|
||||
if (arg === "--endpoint") {
|
||||
const value = args[index + 1];
|
||||
if (!value) {
|
||||
throw new Error("Missing value for --endpoint");
|
||||
}
|
||||
endpoint = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
throw new Error(`Unknown flag: ${arg}`);
|
||||
}
|
||||
|
||||
if (!workspaceId || workspaceId.trim().length === 0) {
|
||||
throw new Error("--workspace-id is required");
|
||||
}
|
||||
|
||||
return {
|
||||
workspaceId: workspaceId.trim(),
|
||||
agentId: agentId?.trim(),
|
||||
since,
|
||||
sessionsDir: sessionsDir ? path.resolve(expandHomePath(sessionsDir)) : undefined,
|
||||
endpoint,
|
||||
};
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === "object" && value !== null;
|
||||
}
|
||||
|
||||
function asString(value: unknown): string | null {
|
||||
return typeof value === "string" ? value : null;
|
||||
}
|
||||
|
||||
function normalizeIsoTimestamp(value: unknown): string | null {
|
||||
if (typeof value === "string") {
|
||||
const parsed = new Date(value);
|
||||
if (!Number.isNaN(parsed.getTime())) {
|
||||
return parsed.toISOString();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
if (typeof value === "number" && Number.isFinite(value)) {
|
||||
const millis = value >= 1_000_000_000_000 ? value : value * 1000;
|
||||
const parsed = new Date(millis);
|
||||
if (!Number.isNaN(parsed.getTime())) {
|
||||
return parsed.toISOString();
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function truncate(value: string, maxLength: number): string {
|
||||
if (value.length <= maxLength) {
|
||||
return value;
|
||||
}
|
||||
return `${value.slice(0, maxLength - 3)}...`;
|
||||
}
|
||||
|
||||
function deriveTitle(content: string, fallbackSessionId: string): string {
|
||||
const firstLine = content
|
||||
.split(/\r?\n/u)
|
||||
.map((line) => line.trim())
|
||||
.find((line) => line.length > 0);
|
||||
|
||||
if (!firstLine) {
|
||||
return `OpenClaw session ${fallbackSessionId}`;
|
||||
}
|
||||
|
||||
const normalized = firstLine.replace(/\s+/gu, " ").trim();
|
||||
return truncate(normalized, 140);
|
||||
}
|
||||
|
||||
function extractTextContent(content: unknown): string {
|
||||
if (typeof content === "string") {
|
||||
return content.trim();
|
||||
}
|
||||
|
||||
if (Array.isArray(content)) {
|
||||
const parts: string[] = [];
|
||||
for (const item of content) {
|
||||
if (typeof item === "string") {
|
||||
const trimmed = item.trim();
|
||||
if (trimmed.length > 0) {
|
||||
parts.push(trimmed);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (!isRecord(item)) {
|
||||
continue;
|
||||
}
|
||||
const itemType = asString(item.type);
|
||||
if (itemType !== null && itemType !== "text") {
|
||||
continue;
|
||||
}
|
||||
const textValue = asString(item.text);
|
||||
if (textValue && textValue.trim().length > 0) {
|
||||
parts.push(textValue.trim());
|
||||
}
|
||||
}
|
||||
return parts.join("\n\n").trim();
|
||||
}
|
||||
|
||||
if (isRecord(content)) {
|
||||
const textValue = asString(content.text);
|
||||
if (textValue) {
|
||||
return textValue.trim();
|
||||
}
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
function inferAgentIdFromPath(filePath: string): string | null {
|
||||
const pathParts = filePath.split(path.sep);
|
||||
const agentsIndex = pathParts.lastIndexOf("agents");
|
||||
if (agentsIndex < 0) {
|
||||
return null;
|
||||
}
|
||||
const candidate = pathParts[agentsIndex + 1];
|
||||
return candidate && candidate.trim().length > 0 ? candidate : null;
|
||||
}
|
||||
|
||||
async function parseSessionFile(filePath: string): Promise<ParsedSession> {
|
||||
const fallbackSessionId = path.basename(filePath, path.extname(filePath));
|
||||
const inferredAgentId = inferAgentIdFromPath(filePath) ?? undefined;
|
||||
|
||||
let sessionId = fallbackSessionId;
|
||||
let title: string | null = null;
|
||||
let startedAt: string | undefined;
|
||||
let endedAt: string | undefined;
|
||||
let parseErrors = 0;
|
||||
const messages: IngestMessage[] = [];
|
||||
|
||||
const readStream = createReadStream(filePath, { encoding: "utf8" });
|
||||
const lineReader = createInterface({
|
||||
input: readStream,
|
||||
crlfDelay: Number.POSITIVE_INFINITY,
|
||||
});
|
||||
|
||||
for await (const rawLine of lineReader) {
|
||||
const line = rawLine.trim();
|
||||
if (line.length === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let parsedLine: unknown;
|
||||
try {
|
||||
parsedLine = JSON.parse(line) as unknown;
|
||||
} catch {
|
||||
parseErrors += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!isRecord(parsedLine)) {
|
||||
parseErrors += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
const eventType = asString(parsedLine.type);
|
||||
if (eventType === "session") {
|
||||
const rawSessionId = asString(parsedLine.id);
|
||||
if (rawSessionId && rawSessionId.trim().length > 0) {
|
||||
sessionId = rawSessionId;
|
||||
}
|
||||
|
||||
const sessionTimestamp = normalizeIsoTimestamp(parsedLine.timestamp);
|
||||
if (sessionTimestamp) {
|
||||
startedAt ??= sessionTimestamp;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (eventType !== "message") {
|
||||
continue;
|
||||
}
|
||||
|
||||
const messageRecord = parsedLine.message;
|
||||
if (!isRecord(messageRecord)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const role = asString(messageRecord.role);
|
||||
if (role !== "user" && role !== "assistant") {
|
||||
continue;
|
||||
}
|
||||
|
||||
const content = extractTextContent(messageRecord.content);
|
||||
if (content.length === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const timestamp =
|
||||
normalizeIsoTimestamp(messageRecord.timestamp) ?? normalizeIsoTimestamp(parsedLine.timestamp);
|
||||
|
||||
const message: IngestMessage = {
|
||||
role,
|
||||
content,
|
||||
timestamp: timestamp ?? undefined,
|
||||
};
|
||||
messages.push(message);
|
||||
|
||||
if (!title && role === "user") {
|
||||
title = deriveTitle(content, sessionId);
|
||||
}
|
||||
if (!startedAt && timestamp) {
|
||||
startedAt = timestamp;
|
||||
}
|
||||
if (timestamp) {
|
||||
endedAt = timestamp;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
sessionId,
|
||||
title: title ?? `OpenClaw session ${sessionId}`,
|
||||
messages,
|
||||
startedAt,
|
||||
endedAt,
|
||||
parseErrors,
|
||||
inferredAgentId,
|
||||
};
|
||||
}
|
||||
|
||||
async function pathExists(candidatePath: string): Promise<boolean> {
|
||||
try {
|
||||
await access(candidatePath, fsConstants.F_OK);
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function discoverSessionDirectories(overrideDir?: string): Promise<string[]> {
|
||||
if (overrideDir) {
|
||||
if (!(await pathExists(overrideDir))) {
|
||||
throw new Error(`Provided --sessions-dir does not exist: ${overrideDir}`);
|
||||
}
|
||||
return [overrideDir];
|
||||
}
|
||||
|
||||
const defaultDir = path.join(homedir(), ".openclaw", "sessions");
|
||||
if (await pathExists(defaultDir)) {
|
||||
return [defaultDir];
|
||||
}
|
||||
|
||||
const agentsRoot = path.join(homedir(), ".openclaw", "agents");
|
||||
if (!(await pathExists(agentsRoot))) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const agentEntries = await readdir(agentsRoot, { withFileTypes: true });
|
||||
const directories: string[] = [];
|
||||
for (const entry of agentEntries) {
|
||||
if (!entry.isDirectory()) {
|
||||
continue;
|
||||
}
|
||||
const sessionsDir = path.join(agentsRoot, entry.name, "sessions");
|
||||
if (await pathExists(sessionsDir)) {
|
||||
directories.push(sessionsDir);
|
||||
}
|
||||
}
|
||||
|
||||
return directories.sort((left, right) => left.localeCompare(right));
|
||||
}
|
||||
|
||||
async function discoverSessionFiles(overrideDir?: string): Promise<string[]> {
|
||||
const directories = await discoverSessionDirectories(overrideDir);
|
||||
const files: string[] = [];
|
||||
|
||||
for (const directory of directories) {
|
||||
const entries = await readdir(directory, { withFileTypes: true });
|
||||
for (const entry of entries) {
|
||||
if (!entry.isFile() || !entry.name.endsWith(".jsonl")) {
|
||||
continue;
|
||||
}
|
||||
files.push(path.join(directory, entry.name));
|
||||
}
|
||||
}
|
||||
|
||||
return files.sort((left, right) => left.localeCompare(right));
|
||||
}
|
||||
|
||||
async function resolveSessionTimestamp(session: ParsedSession, filePath: string): Promise<Date> {
|
||||
const sessionTimestamp = session.startedAt ?? session.endedAt;
|
||||
if (sessionTimestamp) {
|
||||
const parsed = new Date(sessionTimestamp);
|
||||
if (!Number.isNaN(parsed.getTime())) {
|
||||
return parsed;
|
||||
}
|
||||
}
|
||||
|
||||
const fileStat = await stat(filePath);
|
||||
return fileStat.mtime;
|
||||
}
|
||||
|
||||
function buildPayload(
|
||||
options: CliOptions,
|
||||
session: ParsedSession,
|
||||
fallbackAgentId: string | undefined
|
||||
): IngestPayload {
|
||||
const payload: IngestPayload = {
|
||||
sessionId: session.sessionId,
|
||||
workspaceId: options.workspaceId,
|
||||
title: session.title,
|
||||
messages: session.messages,
|
||||
};
|
||||
|
||||
const selectedAgentId = options.agentId ?? fallbackAgentId;
|
||||
if (selectedAgentId && selectedAgentId.trim().length > 0) {
|
||||
payload.agentId = selectedAgentId.trim();
|
||||
}
|
||||
|
||||
return payload;
|
||||
}
|
||||
|
||||
async function sendIngestRequest(
|
||||
endpoint: string,
|
||||
token: string,
|
||||
payload: IngestPayload
|
||||
): Promise<SendResult> {
|
||||
const response = await fetch(endpoint, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
|
||||
const body = await response.text();
|
||||
return {
|
||||
ok: response.ok,
|
||||
status: response.status,
|
||||
body,
|
||||
};
|
||||
}
|
||||
|
||||
function summarizeFailureBody(body: string): string {
|
||||
const compact = body.replace(/\s+/gu, " ").trim();
|
||||
if (compact.length === 0) {
|
||||
return "(empty response body)";
|
||||
}
|
||||
return truncate(compact, 220);
|
||||
}
|
||||
|
||||
async function main(): Promise<void> {
|
||||
const options = parseCliArgs(process.argv.slice(2));
|
||||
const token = process.env.MOSAIC_API_TOKEN;
|
||||
if (!token || token.trim().length === 0) {
|
||||
throw new Error("MOSAIC_API_TOKEN environment variable is required.");
|
||||
}
|
||||
|
||||
const sessionFiles = await discoverSessionFiles(options.sessionsDir);
|
||||
if (sessionFiles.length === 0) {
|
||||
console.log("No OpenClaw session files found.");
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`Discovered ${sessionFiles.length} session file(s).`);
|
||||
if (options.since) {
|
||||
console.log(`Applying --since filter at ${options.since.toISOString()}.`);
|
||||
}
|
||||
|
||||
const summary: IngestSummary = {
|
||||
discovered: sessionFiles.length,
|
||||
processed: 0,
|
||||
ingested: 0,
|
||||
skippedSince: 0,
|
||||
skippedEmpty: 0,
|
||||
skippedDuplicate: 0,
|
||||
failed: 0,
|
||||
};
|
||||
|
||||
for (const [index, filePath] of sessionFiles.entries()) {
|
||||
const position = `${index + 1}/${sessionFiles.length}`;
|
||||
const parsedSession = await parseSessionFile(filePath);
|
||||
summary.processed += 1;
|
||||
|
||||
if (parsedSession.messages.length === 0) {
|
||||
summary.skippedEmpty += 1;
|
||||
console.log(
|
||||
`[${position}] Skipped ${parsedSession.sessionId}: no user/assistant text messages.`
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
const sessionDate = await resolveSessionTimestamp(parsedSession, filePath);
|
||||
if (options.since && sessionDate.getTime() < options.since.getTime()) {
|
||||
summary.skippedSince += 1;
|
||||
console.log(
|
||||
`[${position}] Skipped ${parsedSession.sessionId}: session is before --since (${sessionDate.toISOString()}).`
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
const payload = buildPayload(options, parsedSession, parsedSession.inferredAgentId);
|
||||
let result: SendResult;
|
||||
|
||||
try {
|
||||
result = await sendIngestRequest(options.endpoint, token, payload);
|
||||
} catch (error) {
|
||||
summary.failed += 1;
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
console.error(`[${position}] Failed ${parsedSession.sessionId}: request error: ${message}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (result.ok) {
|
||||
summary.ingested += 1;
|
||||
const note =
|
||||
parsedSession.parseErrors > 0 ? ` (parse warnings: ${parsedSession.parseErrors})` : "";
|
||||
console.log(
|
||||
`[${position}] Ingested ${parsedSession.sessionId} (${parsedSession.messages.length} messages)${note}.`
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (result.status === 409) {
|
||||
summary.skippedDuplicate += 1;
|
||||
console.log(`[${position}] Skipped ${parsedSession.sessionId}: already exists (409).`);
|
||||
continue;
|
||||
}
|
||||
|
||||
summary.failed += 1;
|
||||
console.error(
|
||||
`[${position}] Failed ${parsedSession.sessionId}: HTTP ${result.status} ${summarizeFailureBody(result.body)}`
|
||||
);
|
||||
}
|
||||
|
||||
console.log("\nIngestion summary:");
|
||||
console.log(` Discovered: ${summary.discovered}`);
|
||||
console.log(` Processed: ${summary.processed}`);
|
||||
console.log(` Ingested: ${summary.ingested}`);
|
||||
console.log(` Skipped (--since): ${summary.skippedSince}`);
|
||||
console.log(` Skipped (empty): ${summary.skippedEmpty}`);
|
||||
console.log(` Skipped (duplicate): ${summary.skippedDuplicate}`);
|
||||
console.log(` Failed: ${summary.failed}`);
|
||||
|
||||
if (summary.failed > 0) {
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
main().catch((error: unknown) => {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
console.error(`Fatal error: ${message}`);
|
||||
process.exit(1);
|
||||
});
|
||||
Reference in New Issue
Block a user