Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(daemon): add missing WS push for daemon.kill, daemon.meetings, daemon.evict (#101)

Gener5505ffe19442
diff --git a/src/shared/src/db/queries/task.ts b/src/shared/src/db/queries/task.ts
index 59bf8e544..86aa841b1 100644
--- a/src/shared/src/db/queries/task.ts
+++ b/src/shared/src/db/queries/task.ts
@@ -616,7 +616,7 @@ export async function claimKillTasks(
return rows.map(r => ClaimedTaskRowSchema.parse(r));
}
-const KILL_TASK_STALE_SECONDS = 30;
+const KILL_TASK_STALE_SECONDS = 90;
export async function failStaleKillTasks(db: Database, workspaceId: string) {
const threshold = new Date(Date.now() - KILL_TASK_STALE_SECONDS * 1000).toISOString();
diff --git a/src/web/src/app/api/agents/[id]/meetings/route.ts b/src/web/src/app/api/agents/[id]/meetings/route.ts
index 85a6360c0..390710842 100644
--- a/src/web/src/app/api/agents/[id]/meetings/route.ts
+++ b/src/web/src/app/api/agents/[id]/meetings/route.ts
@@ -6,6 +6,7 @@ import { withWorkspaceMember } from "@/lib/middleware/workspace"
import { writeJSON, writeError } from "@/lib/middleware/helpers"
import { meetingToResponse } from "@/lib/api/responses"
import { getDb } from "@/lib/db"
+import { broadcastToDaemon } from "@/lib/broadcast"
const MEET_URL_RE = /^https:\/\/meet\.google\.com\/[a-z]{3}-[a-z]{4}-[a-z]{3}$/
@@ -70,5 +71,28 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const created = await queries.meetingSession.getMeetingSession(db, meeting.id, ws.workspaceId)
if (!created) return writeError("meeting not found", 404)
+
+ if (agent.runtimeId) {
+ const runtime = await queries.runtime.getAgentRuntime(db, agent.runtimeId)
+ if (runtime) {
+ const scheduledTime = body.scheduledAt ? new Date(body.scheduledAt) : new Date()
+ const fiveMinFromNow = new Date(Date.now() + 5 * 60 * 1000)
+ if (scheduledTime <= fiveMinFromNow) {
+ broadcastToDaemon(runtime.daemonId, {
+ type: "daemon.meetings",
+ meetings: [{
+ id: created.id,
+ meeting_url: created.meetingUrl,
+ participants: created.participants as string[],
+ workspace_id: ws.workspaceId,
+ agent_id: agentId,
+ agent_name: agent.name ?? "",
+ title: created.title || undefined,
+ }],
+ }).catch(() => {})
+ }
+ }
+ }
+
return writeJSON(meetingToResponse(created), 201)
})
diff --git a/src/web/src/app/api/runtimes/machine/route.test.ts b/src/web/src/app/api/runtimes/machine/route.test.ts
index b0e1c8f70..4377008c8 100644
--- a/src/web/src/app/api/runtimes/machine/route.test.ts
+++ b/src/web/src/app/api/runtimes/machine/route.test.ts
@@ -55,6 +55,7 @@ vi.mock("@/lib/logger", () => ({
}));
vi.mock("@/lib/broadcast", () => ({
broadcastToUser: vi.fn().mockResolvedValue(undefined),
+ broadcastToDaemon: vi.fn().mockResolvedValue({ sent: 1 }),
}));
import { DELETE } from "./route";
@@ -147,4 +148,18 @@ describe("DELETE /api/runtimes/machine", () => {
expect(res.status).toBe(500);
expect(body.error).toContain("Failed to remove machine");
});
+
+ it("broadcasts daemon.evict on successful delete", async () => {
+ const { broadcastToDaemon } = await import("@/lib/broadcast");
+ mockGetMemberByUserAndWorkspace.mockResolvedValue({ id: "m1" });
+ mockDeleteRuntimesByDaemonId.mockResolvedValue(undefined);
+ mockDeleteMachine.mockResolvedValue(undefined);
+
+ await DELETE(makeReq({ daemon_id: "d1", workspace_id: "w1" }));
+
+ expect(broadcastToDaemon).toHaveBeenCalledWith("d1", {
+ type: "daemon.evict",
+ workspaceId: "w1",
+ });
+ });
});
diff --git a/src/web/src/app/api/runtimes/machine/route.ts b/src/web/src/app/api/runtimes/machine/route.ts
index 66a4d55a0..40e1bdc63 100644
--- a/src/web/src/app/api/runtimes/machine/route.ts
+++ b/src/web/src/app/api/runtimes/machine/route.ts
@@ -6,7 +6,7 @@ import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
import { writeJSON } from "@/lib/middleware/helpers";
import { log } from "@/lib/logger";
-import { broadcastToUser } from "@/lib/broadcast";
+import { broadcastToUser, broadcastToDaemon } from "@/lib/broadcast";
import { invalidate, cacheKeys } from "@/lib/cache";
export const DELETE = withAuth(async (req: NextRequest, ctx) => {
@@ -33,6 +33,11 @@ export const DELETE = withAuth(async (req: NextRequest, ctx) => {
return writeJSON({ error: "Failed to remove machine" }, 500);
}
+ broadcastToDaemon(daemonId, {
+ type: "daemon.evict",
+ workspaceId: ws.workspaceId,
+ }).catch(() => {});
+
broadcastToUser(ctx.userId, {
type: "runtime.deleted",
daemonId,
diff --git a/src/web/src/lib/services/task.test.ts b/src/web/src/lib/services/task.test.ts
index 95c92bc15..049d78ee8 100644
--- a/src/web/src/lib/services/task.test.ts
+++ b/src/web/src/lib/services/task.test.ts
@@ -49,6 +49,9 @@ vi.mock("@alook/shared", () => ({
getIssueByConversation: vi.fn(),
updateIssue: vi.fn(),
},
+ runtime: {
+ getAgentRuntime: vi.fn(),
+ },
},
}));
@@ -58,6 +61,7 @@ vi.mock("@/lib/logger", () => ({
vi.mock("@/lib/broadcast", () => ({
broadcastToUser: vi.fn().mockResolvedValue(undefined),
+ broadcastToDaemon: vi.fn().mockResolvedValue({ sent: 1 }),
}));
vi.mock("@/lib/api/responses", () => ({
@@ -67,7 +71,7 @@ vi.mock("@/lib/api/responses", () => ({
import { TaskService } from "./task";
import { queries } from "@alook/shared";
-import { broadcastToUser } from "@/lib/broadcast";
+import { broadcastToUser, broadcastToDaemon } from "@/lib/broadcast";
const taskQ = queries.task as {
[K in keyof typeof queries.task]: ReturnType<typeof vi.fn>;
@@ -86,6 +90,9 @@ const issueQ = (queries as any).issue as {
getIssueByConversation: ReturnType<typeof vi.fn>;
updateIssue: ReturnType<typeof vi.fn>;
};
+const runtimeQ = (queries as any).runtime as {
+ getAgentRuntime: ReturnType<typeof vi.fn>;
+};
const service = new TaskService({} as any);
@@ -800,7 +807,9 @@ describe("TaskService", () => {
const task = { id: "t1", status: "running", agentId: "a1", runtimeId: "r1", conversationId: "c1" };
taskQ.getActiveTaskByConversation.mockResolvedValue(task);
taskQ.cancelTask.mockResolvedValue({ ...task, status: "cancelled" });
+ taskQ.createTask.mockResolvedValue({ id: "kt1" });
taskQ.countRunningTasks.mockResolvedValue(0);
+ runtimeQ.getAgentRuntime.mockResolvedValue({ daemonId: "d1" });
await service.cancelActiveTask("c1", "w1");
@@ -813,11 +822,58 @@ describe("TaskService", () => {
}));
});
+ it("pushes daemon.kill for running task", async () => {
+ const task = { id: "t1", status: "running", agentId: "a1", runtimeId: "r1", conversationId: "c1" };
+ taskQ.getActiveTaskByConversation.mockResolvedValue(task);
+ taskQ.cancelTask.mockResolvedValue({ ...task, status: "cancelled" });
+ taskQ.createTask.mockResolvedValue({ id: "kt1" });
+ taskQ.countRunningTasks.mockResolvedValue(0);
+ runtimeQ.getAgentRuntime.mockResolvedValue({ daemonId: "d1" });
+
+ await service.cancelActiveTask("c1", "w1");
+
+ expect(broadcastToDaemon).toHaveBeenCalledWith("d1", {
+ type: "daemon.kill",
+ workspaceId: "w1",
+ taskId: "kt1",
+ targetTaskId: "t1",
+ });
+ });
+
+ it("pushes daemon.kill for dispatched task", async () => {
+ const task = { id: "t1", status: "dispatched", agentId: "a1", runtimeId: "r1", conversationId: "c1" };
+ taskQ.getActiveTaskByConversation.mockResolvedValue(task);
+ taskQ.cancelTask.mockResolvedValue({ ...task, status: "cancelled" });
+ taskQ.createTask.mockResolvedValue({ id: "kt1" });
+ taskQ.countRunningTasks.mockResolvedValue(0);
+ runtimeQ.getAgentRuntime.mockResolvedValue({ daemonId: "d1" });
+
+ await service.cancelActiveTask("c1", "w1");
+
+ expect(broadcastToDaemon).toHaveBeenCalledWith("d1", expect.objectContaining({
+ type: "daemon.kill",
+ targetTaskId: "t1",
+ }));
+ });
+
+ it("does not push daemon.kill for queued task", async () => {
+ const task = { id: "t1", status: "queued", agentId: "a1", runtimeId: "r1", conversationId: "c1" };
+ taskQ.getActiveTaskByConversation.mockResolvedValue(task);
+ taskQ.cancelTask.mockResolvedValue({ ...task, status: "cancelled" });
+ taskQ.countRunningTasks.mockResolvedValue(0);
+
+ await service.cancelActiveTask("c1", "w1");
+
+ expect(broadcastToDaemon).not.toHaveBeenCalled();
+ });
+
it("creates kill_task for dispatched task", async () => {
const task = { id: "t1", status: "dispatched", agentId: "a1", runtimeId: "r1", conversationId: "c1" };
taskQ.getActiveTaskByConversation.mockResolvedValue(task);
taskQ.cancelTask.mockResolvedValue({ ...task, status: "cancelled" });
+ taskQ.createTask.mockResolvedValue({ id: "kt1" });
taskQ.countRunningTasks.mockResolvedValue(0);
+ runtimeQ.getAgentRuntime.mockResolvedValue({ daemonId: "d1" });
await service.cancelActiveTask("c1", "w1");
@@ -831,7 +887,9 @@ describe("TaskService", () => {
const task = { id: "t1", status: "running", agentId: "a1", runtimeId: "r1", conversationId: "c1" };
taskQ.getActiveTaskByConversation.mockResolvedValue(task);
taskQ.cancelTask.mockResolvedValue({ ...task, status: "cancelled" });
+ taskQ.createTask.mockResolvedValue({ id: "kt1" });
taskQ.countRunningTasks.mockResolvedValue(0);
+ runtimeQ.getAgentRuntime.mockResolvedValue({ daemonId: "d1" });
await service.cancelActiveTask("c1", "w1");
diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.ts
index 4ab818090..072e06d7b 100644
--- a/src/web/src/lib/services/task.ts
+++ b/src/web/src/lib/services/task.ts
@@ -314,7 +314,7 @@ export class TaskService {
if (!cancelled) return null;
if (activeTask.status === "dispatched" || activeTask.status === "running") {
- await taskQueries.createTask(this.db, {
+ const killTask = await taskQueries.createTask(this.db, {
agentId: activeTask.agentId,
runtimeId: activeTask.runtimeId,
workspaceId,
@@ -323,6 +323,16 @@ export class TaskService {
type: TASK_TYPES.KILL_TASK,
context: { target_task_id: activeTask.id },
});
+
+ const runtime = await queries.runtime.getAgentRuntime(this.db, activeTask.runtimeId);
+ if (runtime) {
+ broadcastToDaemon(runtime.daemonId, {
+ type: "daemon.kill",
+ workspaceId,
+ taskId: killTask.id,
+ targetTaskId: activeTask.id,
+ }).catch(() => {});
+ }
}
await messageQueries.createMessage(this.db, {