u

src/providers/mssql/queries/modelconversation.js

@@ -9,9 +9,8 @@ export const MODELCONVERSATION_COLUMNS = `
     started_by
 `;
 
-export const LIST_BY_COMPANYUSER = `
-SELECT
-${MODELCONVERSATION_COLUMNS},
+/** Raw stored payload of the conversation's first `user` message; `c` is the conversation alias. */
+const FIRST_USER_MESSAGE_COLUMN = `
     (
         SELECT m.message
         FROM modelmessage m
@@ -21,6 +20,12 @@ ${MODELCONVERSATION_COLUMNS},
             WHERE f.conversation_id = c.id AND f.role = 'user'
         )
     ) AS first_user_message
+`;
+
+export const LIST_BY_COMPANYUSER = `
+SELECT
+${MODELCONVERSATION_COLUMNS},
+${FIRST_USER_MESSAGE_COLUMN}
 FROM modelconversation c
 WHERE c.companyuser_id = @companyuserId
 ORDER BY c.updated_at DESC, c.id DESC
@@ -28,9 +33,10 @@ ORDER BY c.updated_at DESC, c.id DESC
 
 export const GET_BY_COMPANYUSER_AND_ID = `
 SELECT
-${MODELCONVERSATION_COLUMNS}
-FROM modelconversation
-WHERE id = @id AND companyuser_id = @companyuserId
+${MODELCONVERSATION_COLUMNS},
+${FIRST_USER_MESSAGE_COLUMN}
+FROM modelconversation c
+WHERE c.id = @id AND c.companyuser_id = @companyuserId
 `;
 
 export const CREATE = `

src/store/modelconversation/get.js

@@ -14,7 +14,7 @@ export default function get(provider) {
    * @param {number} googleAuthId - The id of the Google auth user.
    * @param {number} conversationId - The conversation id.
    * @param {object} [tx] - Optional transaction to run within.
-   * @returns {Promise<{id: number, companyuser_id: number, provider: string, model: string, created_at: string, updated_at: string, state: string, started_by: number|null}>}
+   * @returns {Promise<{id: number, companyuser_id: number, provider: string, model: string, created_at: string, updated_at: string, state: string, started_by: number|null, first_user_message: string|null}>} `first_user_message` is the stored `message` payload of the first `user` message (null if none yet).
    * @throws {Error} 'Conversation not found'.
    */
   return async (googleAuthId, conversationId, tx) => {
@@ -28,6 +28,6 @@ export default function get(provider) {
 
     const result = await runner.query(sql, { id, companyuserId });
     if (!result.rows[0]) throw new Error('Conversation not found');
-    return shape(result.rows[0]);
+    return { ...shape(result.rows[0]), first_user_message: result.rows[0].first_user_message ?? null };
   };
 }