fix

Author: brendan-kellam

packages/web/src/app/api/(server)/chat/blocking/route.ts

@@ -100,7 +100,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
                 data: {
                     orgId: org.id,
                     createdById: user?.id,
-                    visibility: ChatVisibility.PRIVATE,
+                    visibility: user ? ChatVisibility.PRIVATE : ChatVisibility.PUBLIC,
                     messages: [] as unknown as Prisma.InputJsonValue,
                 },
             });
@@ -156,6 +156,18 @@ export const POST = apiHandler(async (request: NextRequest) => {
                 onFinish: async ({ messages }) => {
                     finalMessages = messages;
                 },
+                onError: (error) => {
+                    if (error instanceof ServiceErrorException) {
+                        throw error;
+                    }
+
+                    const message = error instanceof Error ? error.message : String(error);
+                    throw new ServiceErrorException({
+                        statusCode: StatusCodes.INTERNAL_SERVER_ERROR,
+                        errorCode: ErrorCode.UNEXPECTED_ERROR,
+                        message,
+                    });
+                },
             })
 
             await Promise.all([

packages/web/src/app/api/(server)/chat/route.ts

@@ -100,6 +100,24 @@ export const POST = apiHandler(async (req: NextRequest) => {
                         messages
                     });
                 },
+                onError: (error: unknown) => {
+                    logger.error(error);
+                    Sentry.captureException(error);
+
+                    if (error == null) {
+                        return 'unknown error';
+                    }
+
+                    if (typeof error === 'string') {
+                        return error;
+                    }
+
+                    if (error instanceof Error) {
+                        return error.message;
+                    }
+
+                    return JSON.stringify(error);
+                }
             });
 
             return createUIMessageStreamResponse({
@@ -134,6 +152,7 @@ interface CreateMessageStreamResponseProps {
     orgId: number;
     prisma: PrismaClient;
     onFinish: UIMessageStreamOnFinishCallback<SBChatMessage>;
+    onError: (error: unknown) => string;
 }
 
 export const createMessageStream = async ({
@@ -145,6 +164,7 @@ export const createMessageStream = async ({
     orgId,
     prisma,
     onFinish,
+    onError,
 }: CreateMessageStreamResponseProps) => {
     const latestMessage = messages[messages.length - 1];
     const sources = latestMessage.parts
@@ -247,30 +267,10 @@ export const createMessageStream = async ({
                 type: 'finish',
             });
         },
-        onError: errorHandler,
+        onError,
         originalMessages: messages,
         onFinish,
     });
 
     return stream;
 };
-
-const errorHandler = (error: unknown) => {
-    logger.error(error);
-    Sentry.captureException(error);
-
-    if (error == null) {
-        return 'unknown error';
-    }
-
-    if (typeof error === 'string') {
-        return error;
-    }
-
-    if (error instanceof Error) {
-        return error.message;
-    }
-
-    return JSON.stringify(error);
-}
-