Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat: enable chat input in activity view & exclude tool-result from task messages
Gus42e9967f65af
diff --git a/src/shared/src/db/queries/task-message.ts b/src/shared/src/db/queries/task-message.tsindex 6fbcf2964..4672211f7 100644--- a/src/shared/src/db/queries/task-message.ts+++ b/src/shared/src/db/queries/task-message.ts@@ -48,13 +48,13 @@ export async function listTaskMessages(db: Database, taskId: string, workspaceId}).from(taskMessage).innerJoin(agentTaskQueue, eq(taskMessage.taskId, agentTaskQueue.id))- .where(and(eq(taskMessage.taskId, taskId), eq(agentTaskQueue.workspaceId, workspaceId)))+ .where(and(eq(taskMessage.taskId, taskId), eq(agentTaskQueue.workspaceId, workspaceId), notInArray(taskMessage.type, ["tool-result"]))).orderBy(asc(taskMessage.seq));}return db.select().from(taskMessage)- .where(eq(taskMessage.taskId, taskId))+ .where(and(eq(taskMessage.taskId, taskId), notInArray(taskMessage.type, ["tool-result"]))).orderBy(asc(taskMessage.seq));}@@ -66,7 +66,7 @@ export async function listTaskMessagesSince(return db.select().from(taskMessage)- .where(and(eq(taskMessage.taskId, taskId), gt(taskMessage.seq, afterSeq)))+ .where(and(eq(taskMessage.taskId, taskId), gt(taskMessage.seq, afterSeq), notInArray(taskMessage.type, ["tool-result"]))).orderBy(asc(taskMessage.seq));}diff --git a/src/shared/test/queries/task-message.test.ts b/src/shared/test/queries/task-message.test.tsindex 6e57b2068..f4a1001c7 100644--- a/src/shared/test/queries/task-message.test.ts+++ b/src/shared/test/queries/task-message.test.ts@@ -23,6 +23,18 @@ describe("task-message query module exports", () => {});});+describe("listTaskMessages", () => {+ it("accepts (db, taskId, workspaceId?)", () => {+ expect(taskMessageQueries.listTaskMessages.length).toBe(3);+ });+});++describe("listTaskMessagesSince", () => {+ it("accepts (db, taskId, afterSeq)", () => {+ expect(taskMessageQueries.listTaskMessagesSince.length).toBe(3);+ });+});+describe("countTaskMessagesByTaskIds", () => {it("accepts (db, taskIds, workspaceId)", () => {expect(taskMessageQueries.countTaskMessagesByTaskIds.length).toBe(3);diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.ts b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.tsindex baee90f4b..d1efaf8c0 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.ts@@ -43,8 +43,9 @@ vi.mock("@/lib/middleware/helpers", async () => {vi.mock("@/lib/api/responses", () => ({taskMessageToResponse: (...args: any[]) => mockTaskMessageToResponse(...args),}));+const mockBroadcastToUser = vi.fn().mockResolvedValue(undefined);vi.mock("@/lib/broadcast", () => ({- broadcastToUser: vi.fn().mockResolvedValue(undefined),+ broadcastToUser: (...args: any[]) => mockBroadcastToUser(...args),}));vi.mock("@/lib/logger", () => ({log: { warn: vi.fn(), info: vi.fn(), error: vi.fn() },@@ -158,4 +159,56 @@ describe("POST /api/daemon/tasks/[taskId]/messages", () => {expect(body.error).toBe("task not found");expect(mockCreateTaskMessage).not.toHaveBeenCalled();});++ it("excludes tool-result messages from WebSocket broadcast", async () => {+ mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1" });+ mockCreateTaskMessage.mockResolvedValue({ id: "m1" });++ const res = await POST(+ new NextRequest("http://localhost/api/daemon/tasks/t1/messages", {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({+ messages: [+ { seq: 1, type: "text", content: "hello" },+ { seq: 2, type: "tool-result", content: "large payload" },+ { seq: 3, type: "tool-use", tool: "grep", content: "" },+ ],+ }),+ }),+ withParams("t1")+ );+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body.status).toBe("ok");+ expect(mockCreateTaskMessage).toHaveBeenCalledTimes(3);+ expect(mockBroadcastToUser).toHaveBeenCalledTimes(1);+ const broadcastPayload = mockBroadcastToUser.mock.calls[0][1];+ expect(broadcastPayload.messages).toHaveLength(2);+ expect(broadcastPayload.messages.every((m: any) => m.type !== "tool-result")).toBe(true);+ expect(broadcastPayload.messages[0].type).toBe("text");+ expect(broadcastPayload.messages[1].type).toBe("tool-use");+ });++ it("does not broadcast when all messages are tool-result", async () => {+ mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1" });+ mockCreateTaskMessage.mockResolvedValue({ id: "m1" });++ await POST(+ new NextRequest("http://localhost/api/daemon/tasks/t1/messages", {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({+ messages: [+ { seq: 1, type: "tool-result", content: "result1" },+ { seq: 2, type: "tool-result", content: "result2" },+ ],+ }),+ }),+ withParams("t1")+ );++ expect(mockBroadcastToUser).not.toHaveBeenCalled();+ });});diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.ts b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.tsindex 56d08e764..e595b9d16 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.ts@@ -74,8 +74,9 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {});const succeeded = body.messages.filter((_, i) => results[i].status === "fulfilled");- if (succeeded.length > 0) {- const wsMessages: TaskMessage[] = succeeded.map((m) => ({+ const broadcastable = succeeded.filter((m) => m.type !== "tool-result");+ if (broadcastable.length > 0) {+ const wsMessages: TaskMessage[] = broadcastable.map((m) => ({id: "",task_id: taskId,seq: m.seq,diff --git a/src/web/src/app/api/tasks/[id]/messages/route.test.ts b/src/web/src/app/api/tasks/[id]/messages/route.test.tsindex 109d42ab1..57ecf2449 100644--- a/src/web/src/app/api/tasks/[id]/messages/route.test.ts+++ b/src/web/src/app/api/tasks/[id]/messages/route.test.ts@@ -141,4 +141,43 @@ describe("GET /api/tasks/[id]/messages", () => {expect(res.status).toBe(404);expect(body.error).toBe("task not found");});++ it("does not return tool-result messages (filtered at query level)", async () => {+ const task = { id: "t1", workspaceId: "w1" };+ const messages = [+ { id: "m1", taskId: "t1", seq: 1, type: "text", content: "hello" },+ { id: "m2", taskId: "t1", seq: 3, type: "tool-use", content: "search" },+ ];+ mockGetTask.mockResolvedValue(task);+ mockListTaskMessages.mockResolvedValue(messages);++ const res = await GET(+ new NextRequest("http://localhost/api/tasks/t1/messages"),+ { params: Promise.resolve({ id: "t1" }) }+ );+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toHaveLength(2);+ expect(body.every((m: any) => m.type !== "tool-result")).toBe(true);+ });++ it("does not return tool-result messages with since parameter (filtered at query level)", async () => {+ const task = { id: "t1", workspaceId: "w1" };+ const messages = [+ { id: "m4", taskId: "t1", seq: 7, type: "thinking", content: "hmm" },+ ];+ mockGetTask.mockResolvedValue(task);+ mockListTaskMessagesSince.mockResolvedValue(messages);++ const res = await GET(+ new NextRequest("http://localhost/api/tasks/t1/messages?since=5"),+ { params: Promise.resolve({ id: "t1" }) }+ );+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toHaveLength(1);+ expect(body.every((m: any) => m.type !== "tool-result")).toBe(true);+ });});diff --git a/src/web/src/components/agent-chat/agent-chat-view.tsx b/src/web/src/components/agent-chat/agent-chat-view.tsxindex e3e3c3daa..855260f26 100644--- a/src/web/src/components/agent-chat/agent-chat-view.tsx+++ b/src/web/src/components/agent-chat/agent-chat-view.tsx@@ -234,7 +234,7 @@ export function AgentChatView() {const [messages, setMessages] = useState<Message[]>([]);const [input, setInput] = useState(() => {if (typeof window === "undefined") return "";- return localStorage.getItem(`chat-draft:${agentId}`) ?? "";+ return localStorage.getItem(`chat-draft:${agentId}:${targetConvId ?? 'default'}`) ?? "";});const [sending, setSending] = useState(false);const [cancelling, setCancelling] = useState(false);@@ -298,13 +298,13 @@ export function AgentChatView() {});useEffect(() => {- const key = `chat-draft:${agentId}`;+ const key = `chat-draft:${agentId}:${targetConvId ?? 'default'}`;if (input) {localStorage.setItem(key, input);} else {localStorage.removeItem(key);}- }, [input, agentId]);+ }, [input, agentId, targetConvId]);useEffect(() => {if (!sending) {@@ -337,19 +337,22 @@ export function AgentChatView() {setHasMoreConversations(false);oldestConvIdRef.current = null;oldestConvCreatedAtRef.current = null;+ setInput(localStorage.getItem(`chat-draft:${agentId}:${targetConvId ?? 'default'}`) ?? "");async function load() {try {if (targetConvId && scrollToTaskId) {try {- const [conv, msgs, arts] = await Promise.all([+ const [conv, msgs, arts, buffered] = await Promise.all([getConversation(targetConvId, workspaceId),listMessages(targetConvId, workspaceId),listArtifacts(targetConvId, workspaceId).catch(() => [] as Artifact[]),+ listBufferedMessages(targetConvId, workspaceId).catch(() => [] as Message[]),]);setConversation(conv);setMessages(msgs);setHasMore(msgs.length >= MESSAGE_LIMIT);setArtifacts(arts);+ setBufferedMessages(buffered);const taskIds = [...new Set(msgs.filter((m) => m.role === "assistant" && m.task_id).map((m) => m.task_id!))];if (taskIds.length > 0) {getTaskStepCounts(taskIds, workspaceId)@@ -1277,7 +1280,7 @@ export function AgentChatView() {</div>{/* Follow-up buffer indicator */}- {!targetConvId && <FollowUpBuffer+ <FollowUpBufferbufferedMessages={bufferedMessages}onDelete={(messageId) => {const prev = bufferedMessages;@@ -1287,10 +1290,10 @@ export function AgentChatView() {toast.error("Failed to delete follow-up");});}}- />}+ />- {/* Input — hidden when viewing a specific conversation from activity */}- {!targetConvId && <div className="px-3 md:px-5 py-3">+ {/* Input */}+ <div className="px-3 md:px-5 py-3"><div className="mx-auto max-w-2xl relative"><divclassName={cn(@@ -1381,28 +1384,30 @@ export function AgentChatView() {<div className="flex items-center justify-between px-2 pb-2 pt-0.5"><div className="flex items-center gap-1">- <Tooltip>- <TooltipTrigger render={(props) => (- <span {...props} className={cn("inline-flex", props.className)}>- <Button- variant="ghost"- size="icon-sm"- onClick={handleNap}- disabled={napping || !conversation || !currentConvHasMessages || isTaskActive}- className="rounded-lg text-muted-foreground/60 hover:text-foreground transition-colors duration-200"- >- {napping ? (- <Loader2 className="size-3.5 animate-spin" />- ) : (- <BedDouble className="size-3.5" />- )}- </Button>- </span>- )} />- <TooltipContent side="top">- {isTaskActive ? "Wait for the task to finish" : currentConvHasMessages ? "Take a nap" : `${agentName} is well-rested and ready to go`}- </TooltipContent>- </Tooltip>+ {!targetConvId && (+ <Tooltip>+ <TooltipTrigger render={(props) => (+ <span {...props} className={cn("inline-flex", props.className)}>+ <Button+ variant="ghost"+ size="icon-sm"+ onClick={handleNap}+ disabled={napping || !conversation || !currentConvHasMessages || isTaskActive}+ className="rounded-lg text-muted-foreground/60 hover:text-foreground transition-colors duration-200"+ >+ {napping ? (+ <Loader2 className="size-3.5 animate-spin" />+ ) : (+ <BedDouble className="size-3.5" />+ )}+ </Button>+ </span>+ )} />+ <TooltipContent side="top">+ {isTaskActive ? "Wait for the task to finish" : currentConvHasMessages ? "Take a nap" : `${agentName} is well-rested and ready to go`}+ </TooltipContent>+ </Tooltip>+ )}<Tooltip><TooltipTrigger render={<Button@@ -1509,7 +1514,7 @@ export function AgentChatView() {</div></div></div>- </div>}+ </div><ArtifactSheetopen={artifactSheetOpen}