Add a tool for adding comments

Author: exAspArk

backend/src/entities/user.ts

@@ -69,6 +69,7 @@ export class User extends BaseEntity {
       firstName: user.firstName,
       email: user.isBordly ? '' : user.email,
       photoUrl: user.photoUrl,
+      isBordly: user.isBordly,
     };
   }
 

backend/src/services/agent.service.ts

@@ -9,6 +9,7 @@ import { BoardMember } from '@/entities/board-member';
 import { BORDLY_USER_ID } from '@/entities/user';
 import { BoardMemberService } from '@/services/board-member.service';
 import { boardCardReadTool } from '@/tools/board-card-read.tool';
+import { commentAddTool } from '@/tools/comment-add.tool';
 import { emailDraftUpsertTool } from '@/tools/email-draft-upsert.tool';
 import { gmailAttachmentReadTool } from '@/tools/gmail-attachment-read.tool';
 import { ENV } from '@/utils/env';
@@ -30,6 +31,7 @@ const BORDLY_AGENT = {
 
 - Treat the user's prompt as a simplified request, not a word-for-word instruction.
 - Never make assumptions about the board card's state without using the tools to verify.
+- When a prompt asks for information, add a comment instead of outputting the information directly.
 
 # Writing emails
 
@@ -39,6 +41,7 @@ const BORDLY_AGENT = {
   model: ENV.LLM_THINKING_MODEL,
   tools: {
     'board-card-read': boardCardReadTool,
+    'comment-add': commentAddTool,
     'email-draft-upsert': emailDraftUpsertTool,
     'gmail-attachment-read': gmailAttachmentReadTool,
   } as Record<string, ToolAction<unknown, unknown>>,

backend/src/services/comment.service.ts

@@ -7,7 +7,7 @@ import { AgentService } from '@/services/agent.service';
 import { BoardCardService } from '@/services/board-card.service';
 import { BoardMemberService } from '@/services/board-member.service';
 import { orm } from '@/utils/orm';
-import { isBordlyComment } from '@/utils/shared';
+import { isCommentForBordly } from '@/utils/shared';
 
 export class CommentService {
   static async create(
@@ -34,14 +34,17 @@ export class CommentService {
     boardCard.setSnippet(`${user.firstName}: ${contentText}`);
     boardCard.setLastEventAt(comment.createdAt);
 
-    const userBoardCardReadPosition = boardCard.boardCardReadPositions.find((pos) => pos.user.id === user.id)!;
-    userBoardCardReadPosition.setLastReadAt(boardCard.lastEventAt);
+    if (!user.isBordly) {
+      const userBoardCardReadPosition = boardCard.boardCardReadPositions.find((pos) => pos.user.id === user.id)!;
+      userBoardCardReadPosition.setLastReadAt(boardCard.lastEventAt);
+      orm.em.persist(userBoardCardReadPosition);
+    }
 
-    orm.em.persist([comment, boardCard, userBoardCardReadPosition]);
+    orm.em.persist([comment, boardCard]);
 
     await orm.em.flush();
 
-    if (isBordlyComment(contentText)) {
+    if (isCommentForBordly(contentText) && !user.isBordly) {
       const userBoardMember = await BoardMemberService.findById(board, {
         boardMemberId: boardMember.id,
         populate: ['user', 'memory'],
@@ -80,7 +83,12 @@ export class CommentService {
       populate?: Populate<Comment, Hint>;
     },
   ) {
-    const comment = await CommentService.findById(boardCard, { commentId, populate });
+    const comment = await CommentService.findById(boardCard, {
+      commentId,
+      populate: [...(populate || []), 'user'] as Populate<Comment, Hint>,
+    });
+    if (comment.user.id !== user.id) throw new Error('You can only edit your own comments');
+
     const boardMember = user.boardMembers.find((bm) => bm.board.id === board.id)!;
     const wasLastBoardCardEvent = comment.createdAt.getTime() === boardCard.lastEventAt.getTime();
 
@@ -93,7 +101,7 @@ export class CommentService {
 
     await orm.em.flush();
 
-    if (isBordlyComment(contentText)) {
+    if (isCommentForBordly(contentText)) {
       const userBoardMember = await BoardMemberService.findById(board, {
         boardMemberId: boardMember.id,
         populate: ['user', 'memory'],
@@ -113,8 +121,12 @@ export class CommentService {
     return { boardCard, comment };
   }
 
-  static async delete(boardCard: BoardCard, { commentId }: { commentId: string }) {
-    const comment = await CommentService.findById(boardCard, { commentId });
+  static async delete(boardCard: BoardCard, { user, commentId }: { user: Loaded<User>; commentId: string }) {
+    const comment = await CommentService.findById(boardCard, { commentId, populate: ['user'] });
+    if (comment.user.id !== user.id && !comment.loadedUser.isBordly) {
+      throw new Error('You can only delete your own comments or comments from Bordly');
+    }
+
     orm.em.remove(comment);
 
     await BoardCardService.rebuildLastEventAtAndSnippet(boardCard, { ignoreLastEventAt: comment.createdAt });

backend/src/services/email-draft.service.ts

@@ -102,8 +102,8 @@ export class EmailDraftService {
     boardCard.setSnippet(htmlToText(boardCard.emailDraft.bodyHtml || ''));
     orm.em.persist([boardCard.emailDraft, boardCard]);
 
-    const userBoardCardReadPosition = boardCard.boardCardReadPositions.find((pos) => pos.user.id === user.id);
-    if (userBoardCardReadPosition) {
+    if (!user.isBordly) {
+      const userBoardCardReadPosition = boardCard.boardCardReadPositions.find((pos) => pos.user.id === user.id)!;
       userBoardCardReadPosition.setLastReadAt(boardCard.lastEventAt);
       orm.em.persist(userBoardCardReadPosition);
     }
@@ -218,10 +218,8 @@ export class EmailDraftService {
     orm.em.persist(rebuiltBoardCard);
 
     const userBoardCardReadPosition = rebuiltBoardCard.boardCardReadPositions.find((pos) => pos.user.id === user.id)!;
-    if (userBoardCardReadPosition) {
-      userBoardCardReadPosition.setLastReadAt(rebuiltBoardCard.lastEventAt);
-      orm.em.persist(userBoardCardReadPosition);
-    }
+    userBoardCardReadPosition.setLastReadAt(rebuiltBoardCard.lastEventAt);
+    orm.em.persist(userBoardCardReadPosition);
 
     if (rebuiltBoardCard.emailDraft) {
       const { emailDraft } = rebuiltBoardCard;

backend/src/tools/comment-add.tool.ts

@@ -0,0 +1,41 @@
+import type { RequestContext } from '@mastra/core/request-context';
+import { createTool } from '@mastra/core/tools';
+import type { Loaded } from '@mikro-orm/postgresql';
+import { z } from 'zod';
+import type { User } from '@/entities/user';
+import type { Context } from '@/services/agent.service';
+import { BoardCardService } from '@/services/board-card.service';
+import { BoardMemberService } from '@/services/board-member.service';
+import { CommentService } from '@/services/comment.service';
+
+export const commentAddTool = createTool({
+  id: 'comment-add',
+  description: 'Add a comment to the board card',
+  inputSchema: z.object({
+    contentHtml: z.string().min(1).describe('Comment content in HTML format'),
+    contentText: z.string().min(1).describe('Comment content in plain text format'),
+  }),
+  execute: async (data, context) => {
+    const { requestContext } = context as { requestContext: RequestContext<Context> };
+    const initialBoardCard = requestContext.get('boardCard');
+    console.log(`[AGENT] Executing comment-add for board card ${initialBoardCard.id}: ${JSON.stringify(data)}`);
+
+    const bordlyBoardMember = requestContext.get('bordlyBoardMember');
+    if (!bordlyBoardMember) throw new Error('Board member context is required');
+
+    await BoardMemberService.populate(bordlyBoardMember, ['user.boardMembers']);
+    const user = bordlyBoardMember.loadedUser as Loaded<User, 'boardMembers'>;
+
+    const boardCard = await BoardCardService.populate(initialBoardCard, ['boardCardReadPositions']);
+
+    const { boardCard: updatedBoardCard } = await CommentService.create(boardCard, {
+      board: bordlyBoardMember.board,
+      user,
+      contentHtml: data.contentHtml,
+      contentText: data.contentText,
+    });
+
+    requestContext.set('boardCard', updatedBoardCard);
+    return { success: true };
+  },
+});

backend/src/tools/email-draft-upsert.tool.ts

@@ -28,12 +28,12 @@ export const emailDraftUpsertTool = createTool({
     const { requestContext } = context as { requestContext: RequestContext<Context> };
     const initialBoardCard = requestContext.get('boardCard');
     console.log(`[AGENT] Executing email-draft-upsert for board card ${initialBoardCard.id}: ${JSON.stringify(data)}`);
-    const bordlyBoardMember = requestContext.get('bordlyBoardMember');
+    const userBoardMember = requestContext.get('userBoardMember');
     const userTimeZone = requestContext.get('userTimeZone');
-    if (!bordlyBoardMember) throw new Error('Board member context is required');
+    if (!userBoardMember) throw new Error('Board member context is required');
 
-    await BoardMemberService.populate(bordlyBoardMember, ['user.boardMembers']);
-    const user = bordlyBoardMember.loadedUser as Loaded<User, 'boardMembers'>;
+    await BoardMemberService.populate(userBoardMember, ['user.boardMembers']);
+    const user = userBoardMember.loadedUser as Loaded<User, 'boardMembers'>;
 
     const boardCard = await BoardCardService.populate(initialBoardCard, [
       'emailDraft',

backend/src/trpc-routes/comment.routes.ts

@@ -77,7 +77,10 @@ export const COMMENT_ROUTES = {
           boardCardId: input.boardCardId,
           populate: BOARD_CARD_POPULATE,
         });
-        const boardCard = await CommentService.delete(initialBoardCard, { commentId: input.commentId });
+        const boardCard = await CommentService.delete(initialBoardCard, {
+          user: ctx.user!,
+          commentId: input.commentId,
+        });
         return { boardCard: boardCardToJson(boardCard as typeof initialBoardCard, ctx) };
       }),
   } satisfies TRPCRouterRecord,

backend/src/utils/shared.ts

@@ -39,7 +39,7 @@ export interface Participant {
 
 export const participantToString = (p: Participant) => (p.name ? `${p.name} <${p.email}>` : p.email);
 
-export const isBordlyComment = (text: string) => text.trim().toLowerCase().startsWith('@bordly');
+export const isCommentForBordly = (text: string) => text.trim().toLowerCase().startsWith('@bordly');
 
 export const createQuotedHtml = ({
   from,

frontend/src/components/board-card/comment-input.tsx

@@ -1,5 +1,5 @@
 import { useMutation } from '@tanstack/react-query';
-import { isBordlyComment } from 'bordly-backend/utils/shared';
+import { isCommentForBordly } from 'bordly-backend/utils/shared';
 import { ArrowDown } from 'lucide-react';
 import { useState } from 'react';
 import { Button } from '@/components/ui/button';
@@ -40,7 +40,7 @@ export const CommentInput = ({
     queryKey: boardCardQueryKey,
     onExecute: (params) => {
       addFakeCommentData({ trpc, queryClient, params });
-      if (isBordlyComment(params.contentText)) {
+      if (isCommentForBordly(params.contentText)) {
         const bordlyUser = boardMembers.find((member) => member.isAgent);
         if (bordlyUser) {
           addBordlyThinkingComment({

frontend/src/components/board-card/mention-textarea.tsx

@@ -288,6 +288,11 @@ export const MentionTextarea = ({
 };
 
 export const renderCommentHtml = (html: string) => {
-  // biome-ignore lint/security/noDangerouslySetInnerHtml: HTML is generated by Tiptap editor
-  return <div className="whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: html }} />;
+  return (
+    <div
+      className="[&_p]:mb-1 [&_p:last-child]:mb-0 [&_ul]:my-1 [&_ul]:list-disc [&_ul]:pl-6 [&_ol]:my-1 [&_ol]:list-decimal [&_ol]:pl-6 [&_li]:my-0 text-1.5"
+      // biome-ignore lint/security/noDangerouslySetInnerHtml: HTML is generated by Tiptap editor
+      dangerouslySetInnerHTML={{ __html: html }}
+    />
+  );
 };