diff --git a/.gitignore b/.gitignore
index abef4d4..74ae217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,4 +154,5 @@ build/
 
 # Temporary files
 tmp/
-temp/
\ No newline at end of file
+temp/
+tests/.tmp/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..1d7ac85
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..fb7657b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  }
+}
diff --git a/package.json b/package.json
index d655357..6772a9b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,8 @@
     "lint:check": "eslint ./src/**/*.{ts,tsx} --ext .ts,.tsx",
     "type-check": "tsc --noEmit",
     "preview": "vite preview",
-    "test": "echo \"No tests specified\" && exit 0",
+    "test": "tsc -p tests/tsconfig.json && node --test tests/.tmp/identity-test/tests/*.test.js",
+    "test:identity": "tsc -p tests/tsconfig.json && node --test tests/.tmp/identity-test/tests/chat-identity.test.js",
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css,md}\"",
     "format:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css,md}\""
   },
diff --git a/src/lib/chat/identity.ts b/src/lib/chat/identity.ts
new file mode 100644
index 0000000..3827dcf
--- /dev/null
+++ b/src/lib/chat/identity.ts
@@ -0,0 +1,64 @@
+type ConversationKey = {
+  id?: string;
+  remoteJid?: string;
+  remoteJidAlt?: string;
+};
+
+type MessageRecord = {
+  key?: ConversationKey;
+};
+
+export function isDirectChatJid(jid: string): boolean {
+  return jid.endsWith("@s.whatsapp.net") || jid.endsWith("@lid");
+}
+
+export function messageMatchesConversation(key: ConversationKey | null | undefined, selectedJid: string): boolean {
+  if (!key) {
+    return false;
+  }
+
+  return key.remoteJid === selectedJid || key.remoteJidAlt === selectedJid;
+}
+
+export function mergeMessagesByKeyId<T extends MessageRecord>(groups: T[][]): T[] {
+  const seenIds = new Set<string>();
+  const merged: T[] = [];
+
+  for (const group of groups) {
+    for (const record of group) {
+      const id = record.key?.id;
+      if (id) {
+        if (seenIds.has(id)) {
+          continue;
+        }
+        seenIds.add(id);
+        merged.push(record);
+        continue;
+      }
+
+      merged.push(record);
+    }
+  }
+
+  return merged;
+}
+
+export function messageRecordsFromResponse(payload: unknown): MessageRecord[] {
+  if (Array.isArray(payload)) {
+    return payload;
+  }
+
+  if (
+    payload &&
+    typeof payload === "object" &&
+    "messages" in payload &&
+    payload.messages &&
+    typeof payload.messages === "object" &&
+    "records" in payload.messages &&
+    Array.isArray(payload.messages.records)
+  ) {
+    return payload.messages.records;
+  }
+
+  return [];
+}
diff --git a/src/lib/chat/message-payload.ts b/src/lib/chat/message-payload.ts
new file mode 100644
index 0000000..bb7bf6d
--- /dev/null
+++ b/src/lib/chat/message-payload.ts
@@ -0,0 +1,10 @@
+/** Evolution persists some Android outbound records with messageType set and message null. */
+export const MISSING_CHAT_MESSAGE_FALLBACK = "Message unavailable";
+
+export function getChatMessagePayload<T>(message: { message?: T | null } | null | undefined): T | null {
+  if (message == null || message.message == null) {
+    return null;
+  }
+
+  return message.message;
+}
diff --git a/src/lib/queries/chat/findMessages.ts b/src/lib/queries/chat/findMessages.ts
index 292742e..e673da3 100644
--- a/src/lib/queries/chat/findMessages.ts
+++ b/src/lib/queries/chat/findMessages.ts
@@ -1,9 +1,14 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { isDirectChatJid, mergeMessagesByKeyId, messageMatchesConversation, messageRecordsFromResponse } from "@/lib/chat/identity";
+import { Message } from "@/types/evolution.types";
+
 import { api } from "../api";
 import { UseQueryParams } from "../types";
 import { FindMessagesResponse } from "./types";
 
+export { messageRecordsFromResponse };
+
 interface IParams {
   instanceName: string;
   remoteJid: string;
@@ -11,14 +16,24 @@ interface IParams {
 
 const queryKey = (params: Partial<IParams>) => ["chats", "findMessages", JSON.stringify(params)];
 
-export const findMessages = async ({ instanceName, remoteJid }: IParams) => {
-  const response = await api.post(`/chat/findMessages/${instanceName}`, {
+export const findMessages = async ({ instanceName, remoteJid }: IParams): Promise<Message[]> => {
+  const url = `/chat/findMessages/${instanceName}`;
+  const primaryRequest = api.post(url, {
     where: { key: { remoteJid } },
   });
-  if (response.data?.messages?.records) {
-    return response.data.messages.records;
-  }
-  return response.data;
+  const alternateRequest = isDirectChatJid(remoteJid)
+    ? api
+        .post(url, {
+          where: { key: { remoteJidAlt: remoteJid } },
+        })
+        .then((response) => (messageRecordsFromResponse(response.data) as Message[]).filter((message) => messageMatchesConversation(message.key, remoteJid)))
+        .catch(() => [] as Message[])
+    : Promise.resolve([] as Message[]);
+
+  const [primaryResponse, alternateRecords] = await Promise.all([primaryRequest, alternateRequest]);
+  const primaryRecords = messageRecordsFromResponse(primaryResponse.data) as Message[];
+
+  return mergeMessagesByKeyId([primaryRecords, alternateRecords]);
 };
 
 export const useFindMessages = (props: UseQueryParams<FindMessagesResponse> & Partial<IParams>) => {
diff --git a/src/pages/instance/Chat/index.tsx b/src/pages/instance/Chat/index.tsx
index 07ff877..7ad2068 100644
--- a/src/pages/instance/Chat/index.tsx
+++ b/src/pages/instance/Chat/index.tsx
@@ -9,6 +9,7 @@ import { useNavigate, useParams } from "react-router-dom";
 
 import { useInstance } from "@/contexts/InstanceContext";
 
+import { isDirectChatJid } from "@/lib/chat/identity";
 import { useFindChats } from "@/lib/queries/chat/findChats";
 import { getToken, TOKEN_ID } from "@/lib/queries/token";
 import { cn } from "@/lib/utils";
@@ -115,7 +116,7 @@ function Chat() {
   const visibleChats = useMemo(() => {
     const isContacts = kind === "contacts";
     const filtered = allChats.filter((c) =>
-      isContacts ? c.remoteJid.includes("@s.whatsapp.net") : c.remoteJid.includes("@g.us"),
+      isContacts ? isDirectChatJid(c.remoteJid) : c.remoteJid.includes("@g.us"),
     );
     if (!search.trim()) return filtered;
     const q = search.toLowerCase();
diff --git a/src/pages/instance/Chat/messages.tsx b/src/pages/instance/Chat/messages.tsx
index 6331202..f6064b2 100644
--- a/src/pages/instance/Chat/messages.tsx
+++ b/src/pages/instance/Chat/messages.tsx
@@ -9,6 +9,8 @@ import { Textarea } from "@/components/ui/textarea";
 
 import { useInstance } from "@/contexts/InstanceContext";
 
+import { messageMatchesConversation } from "@/lib/chat/identity";
+import { getChatMessagePayload, MISSING_CHAT_MESSAGE_FALLBACK } from "@/lib/chat/message-payload";
 import { useFindChat } from "@/lib/queries/chat/findChat";
 import { useFindMessages } from "@/lib/queries/chat/findMessages";
 import { useSendMessage, useSendMedia } from "@/lib/queries/chat/sendMessage";
@@ -112,14 +114,10 @@ const DateSeparator = ({ date }: { date: string }) => (
   </div>
 );
 
-const formatMessageTime = (date: Date, locale: string): string =>
-  date.toLocaleTimeString(locale, { hour: "2-digit", minute: "2-digit" });
+const formatMessageTime = (date: Date, locale: string): string => date.toLocaleTimeString(locale, { hour: "2-digit", minute: "2-digit" });
 
 // WhatsApp-like deterministic color palette per sender
-const SENDER_COLORS = [
-  "#e91e63", "#9c27b0", "#3f51b5", "#2196f3", "#00bcd4",
-  "#009688", "#4caf50", "#ff9800", "#f44336", "#795548",
-];
+const SENDER_COLORS = ["#e91e63", "#9c27b0", "#3f51b5", "#2196f3", "#00bcd4", "#009688", "#4caf50", "#ff9800", "#f44336", "#795548"];
 
 const getSenderColor = (key: string): string => {
   let hash = 0;
@@ -152,11 +150,16 @@ const getMessageText = (messageObj: any): string => {
 // Component to render different message types based on messageType
 const MessageContent = ({ message }: { message: Message }) => {
   const messageType = message.messageType as string;
+  const payload = getChatMessagePayload(message);
+
+  if (payload == null) {
+    return <span className="text-muted-foreground">{MISSING_CHAT_MESSAGE_FALLBACK}</span>;
+  }
 
   switch (messageType) {
     case "conversation":
-      if (message.message.contactMessage) {
-        const contactMsg = message.message.contactMessage;
+      if (payload.contactMessage) {
+        const contactMsg = payload.contactMessage;
         return (
           <div className="p-3 bg-muted rounded-lg max-w-xs">
             <div className="flex items-center gap-2 mb-2">
@@ -169,8 +172,8 @@ const MessageContent = ({ message }: { message: Message }) => {
         );
       }
 
-      if (message.message.locationMessage) {
-        const locationMsg = message.message.locationMessage;
+      if (payload.locationMessage) {
+        const locationMsg = payload.locationMessage;
         return (
           <div className="p-3 bg-muted rounded-lg max-w-xs">
             <div className="flex items-center gap-2 mb-2">
@@ -192,16 +195,16 @@ const MessageContent = ({ message }: { message: Message }) => {
         );
       }
 
-      return <span>{getMessageText(message.message)}</span>;
+      return <span>{getMessageText(payload)}</span>;
 
     case "extendedTextMessage":
-      return <span>{message.message.conversation ?? message.message.extendedTextMessage?.text}</span>;
+      return <span>{payload.conversation ?? payload.extendedTextMessage?.text}</span>;
 
     case "imageMessage":
       // Use base64 data or mediaUrl for images
-      const imageBase64 = message.message.base64 ? (message.message.base64.startsWith("data:") ? message.message.base64 : `data:image/jpeg;base64,${message.message.base64}`) : null;
+      const imageBase64 = payload.base64 ? (payload.base64.startsWith("data:") ? payload.base64 : `data:image/jpeg;base64,${payload.base64}`) : null;
 
-      const imageSrc = imageBase64 || message.message.mediaUrl;
+      const imageSrc = imageBase64 || payload.mediaUrl;
 
       return (
         <div className="flex flex-col gap-2">
@@ -223,15 +226,15 @@ const MessageContent = ({ message }: { message: Message }) => {
               <p className="text-center text-xs text-muted-foreground mt-1">Missing base64 data and mediaUrl</p>
             </div>
           )}
-          {message.message.imageMessage?.caption && <p className="text-sm">{message.message.imageMessage.caption}</p>}
+          {payload.imageMessage?.caption && <p className="text-sm">{payload.imageMessage.caption}</p>}
         </div>
       );
 
     case "videoMessage":
       // Use base64 data or mediaUrl for videos
-      const videoBase64 = message.message.base64 ? (message.message.base64.startsWith("data:") ? message.message.base64 : `data:video/mp4;base64,${message.message.base64}`) : null;
+      const videoBase64 = payload.base64 ? (payload.base64.startsWith("data:") ? payload.base64 : `data:video/mp4;base64,${payload.base64}`) : null;
 
-      const videoSrc = videoBase64 || message.message.mediaUrl;
+      const videoSrc = videoBase64 || payload.mediaUrl;
 
       return (
         <div className="flex flex-col gap-2">
@@ -251,15 +254,15 @@ const MessageContent = ({ message }: { message: Message }) => {
               <p className="text-center text-xs text-muted-foreground mt-1">Missing base64 data and mediaUrl</p>
             </div>
           )}
-          {message.message.videoMessage?.caption && <p className="text-sm">{message.message.videoMessage.caption}</p>}
+          {payload.videoMessage?.caption && <p className="text-sm">{payload.videoMessage.caption}</p>}
         </div>
       );
 
     case "audioMessage":
       // Use base64 data or mediaUrl for audio
-      const audioBase64 = message.message.base64 ? (message.message.base64.startsWith("data:") ? message.message.base64 : `data:audio/mpeg;base64,${message.message.base64}`) : null;
+      const audioBase64 = payload.base64 ? (payload.base64.startsWith("data:") ? payload.base64 : `data:audio/mpeg;base64,${payload.base64}`) : null;
 
-      const audioSrc = audioBase64 || message.message.mediaUrl;
+      const audioSrc = audioBase64 || payload.mediaUrl;
 
       return audioSrc ? (
         <audio controls className="w-full max-w-xs">
@@ -278,14 +281,14 @@ const MessageContent = ({ message }: { message: Message }) => {
         <div className="flex items-center gap-2 p-3 bg-muted rounded-lg max-w-xs">
           <div className="text-2xl">📄</div>
           <div className="flex-1 min-w-0">
-            <p className="font-medium truncate">{message.message.documentMessage?.fileName || "Document"}</p>
-            {message.message.documentMessage?.fileLength && <p className="text-xs text-muted-foreground">{(message.message.documentMessage.fileLength / 1024 / 1024).toFixed(2)} MB</p>}
+            <p className="font-medium truncate">{payload.documentMessage?.fileName || "Document"}</p>
+            {payload.documentMessage?.fileLength && <p className="text-xs text-muted-foreground">{(payload.documentMessage.fileLength / 1024 / 1024).toFixed(2)} MB</p>}
           </div>
         </div>
       );
 
     case "stickerMessage":
-      return <img src={message.message.mediaUrl} alt="Sticker" className="max-w-32 max-h-32 object-contain" />;
+      return <img src={payload.mediaUrl} alt="Sticker" className="max-w-32 max-h-32 object-contain" />;
 
     default:
       // Fallback for unknown message types
@@ -293,7 +296,7 @@ const MessageContent = ({ message }: { message: Message }) => {
         <div className="text-xs text-muted-foreground bg-muted p-2 rounded max-w-xs">
           <details>
             <summary>Unknown message type: {messageType}</summary>
-            <pre className="mt-2 whitespace-pre-wrap break-all text-xs">{JSON.stringify(message.message, null, 2)}</pre>
+            <pre className="mt-2 whitespace-pre-wrap break-all text-xs">{JSON.stringify(payload, null, 2)}</pre>
           </details>
         </div>
       );
@@ -460,7 +463,7 @@ function Messages({ textareaRef, handleTextareaChange, textareaHeight, lastMessa
         return;
       }
 
-      if (data?.data?.key?.remoteJid !== remoteJid) {
+      if (!messageMatchesConversation(data?.data?.key, remoteJid)) {
         return;
       }
 
@@ -581,9 +584,7 @@ function Messages({ textareaRef, handleTextareaChange, textareaHeight, lastMessa
         <div className="rounded-lg bg-primary px-3 py-2 text-sm text-primary-foreground">
           <MessageContent message={message} />
         </div>
-        <span className="mt-0.5 block px-1 text-right text-[11px] text-muted-foreground">
-          {formatMessageTime(getMessageTimestamp(message), locale)}
-        </span>
+        <span className="mt-0.5 block px-1 text-right text-[11px] text-muted-foreground">{formatMessageTime(getMessageTimestamp(message), locale)}</span>
       </div>
     </div>
   );
@@ -605,9 +606,7 @@ function Messages({ textareaRef, handleTextareaChange, textareaHeight, lastMessa
           <div className="rounded-lg border bg-muted px-3 py-2 text-sm text-foreground">
             <MessageContent message={message} />
           </div>
-          <span className="mt-0.5 block px-1 text-[11px] text-muted-foreground">
-            {formatMessageTime(getMessageTimestamp(message), locale)}
-          </span>
+          <span className="mt-0.5 block px-1 text-[11px] text-muted-foreground">{formatMessageTime(getMessageTimestamp(message), locale)}</span>
         </div>
       </div>
     );
@@ -636,9 +635,7 @@ function Messages({ textareaRef, handleTextareaChange, textareaHeight, lastMessa
         {groupedMessages.map((group, groupIndex) => (
           <div key={groupIndex}>
             <DateSeparator date={group.date} />
-            {group.messages.map((message) =>
-              message.key.fromMe ? renderBubbleRight(message) : renderBubbleLeft(message),
-            )}
+            {group.messages.map((message) => (message.key.fromMe ? renderBubbleRight(message) : renderBubbleLeft(message)))}
           </div>
         ))}
         <div ref={lastMessageRef as never} />
@@ -651,9 +648,7 @@ function Messages({ textareaRef, handleTextareaChange, textareaHeight, lastMessa
             </div>
           )}
           <div className="flex items-center gap-2 px-2 py-1.5">
-            <div className="flex flex-shrink-0 items-center">
-              {instance && <MediaOptions instance={instance} setSelectedMedia={setSelectedMedia} />}
-            </div>
+            <div className="flex flex-shrink-0 items-center">{instance && <MediaOptions instance={instance} setSelectedMedia={setSelectedMedia} />}</div>
             <Textarea
               placeholder={t("chat.input.placeholder", { defaultValue: "Digite uma mensagem..." })}
               name="message"
@@ -672,8 +667,7 @@ function Messages({ textareaRef, handleTextareaChange, textareaHeight, lastMessa
               size="icon"
               onClick={sendMessage}
               disabled={(!messageText.trim() && !selectedMedia) || isSending}
-              className="h-9 w-9 flex-shrink-0 bg-primary text-primary-foreground hover:bg-primary/85 disabled:bg-muted disabled:text-muted-foreground disabled:opacity-50"
-            >
+              className="h-9 w-9 flex-shrink-0 bg-primary text-primary-foreground hover:bg-primary/85 disabled:bg-muted disabled:text-muted-foreground disabled:opacity-50">
               <Send className="h-4 w-4" />
               <span className="sr-only">{t("chat.input.send")}</span>
             </Button>
diff --git a/src/types/evolution.types.ts b/src/types/evolution.types.ts
index 8de75ff..1e5737a 100644
--- a/src/types/evolution.types.ts
+++ b/src/types/evolution.types.ts
@@ -68,6 +68,7 @@ export type Key = {
   id: string;
   fromMe: boolean;
   remoteJid: string;
+  remoteJidAlt?: string;
   participant?: string;
 };
 
diff --git a/tests/chat-identity.test.ts b/tests/chat-identity.test.ts
new file mode 100644
index 0000000..4370434
--- /dev/null
+++ b/tests/chat-identity.test.ts
@@ -0,0 +1,129 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+
+import { isDirectChatJid, mergeMessagesByKeyId, messageMatchesConversation, messageRecordsFromResponse } from "../src/lib/chat/identity.js";
+
+describe("isDirectChatJid", () => {
+  it("detects phone direct chats", () => {
+    assert.equal(isDirectChatJid("5511999999999@s.whatsapp.net"), true);
+  });
+
+  it("detects LID direct chats", () => {
+    assert.equal(isDirectChatJid("123456789012345@lid"), true);
+  });
+
+  it("rejects groups", () => {
+    assert.equal(isDirectChatJid("120363012345678901@g.us"), false);
+  });
+
+  it("rejects broadcasts", () => {
+    assert.equal(isDirectChatJid("status@broadcast"), false);
+  });
+});
+
+describe("messageMatchesConversation", () => {
+  it("matches a selected phone JID through a LID-primary key via remoteJidAlt", () => {
+    assert.equal(
+      messageMatchesConversation(
+        {
+          remoteJid: "123456789012345@lid",
+          remoteJidAlt: "5511999999999@s.whatsapp.net",
+        },
+        "5511999999999@s.whatsapp.net",
+      ),
+      true,
+    );
+  });
+
+  it("matches a selected LID JID through a phone-primary key via remoteJidAlt", () => {
+    assert.equal(
+      messageMatchesConversation(
+        {
+          remoteJid: "5511999999999@s.whatsapp.net",
+          remoteJidAlt: "123456789012345@lid",
+        },
+        "123456789012345@lid",
+      ),
+      true,
+    );
+  });
+
+  it("rejects unrelated conversation identities", () => {
+    assert.equal(
+      messageMatchesConversation(
+        {
+          remoteJid: "15555550123@s.whatsapp.net",
+          remoteJidAlt: "15555550123@lid",
+        },
+        "5511999999999@s.whatsapp.net",
+      ),
+      false,
+    );
+  });
+});
+
+describe("mergeMessagesByKeyId", () => {
+  it("keeps a phone-primary and LID-primary pair when they have different IDs", () => {
+    const phonePrimary = {
+      key: {
+        id: "phone-msg-1",
+        remoteJid: "5511999999999@s.whatsapp.net",
+        remoteJidAlt: "123456789012345@lid",
+      },
+    };
+    const lidPrimary = {
+      key: {
+        id: "lid-msg-1",
+        remoteJid: "123456789012345@lid",
+        remoteJidAlt: "5511999999999@s.whatsapp.net",
+      },
+    };
+
+    assert.deepEqual(mergeMessagesByKeyId([[phonePrimary], [lidPrimary]]), [phonePrimary, lidPrimary]);
+  });
+
+  it("de-duplicates records that share the same nonempty key id, keeping the first", () => {
+    const first = {
+      key: {
+        id: "shared-id",
+        remoteJid: "5511999999999@s.whatsapp.net",
+      },
+      source: "primary",
+    };
+    const duplicate = {
+      key: {
+        id: "shared-id",
+        remoteJid: "123456789012345@lid",
+      },
+      source: "alternate",
+    };
+
+    assert.deepEqual(mergeMessagesByKeyId([[first], [duplicate]]), [first]);
+  });
+
+  it("keeps unkeyed records without replacing keyed ones", () => {
+    const keyed = { key: { id: "keyed-1", remoteJid: "5511999999999@s.whatsapp.net" } };
+    const unkeyed = { key: { remoteJid: "5511999999999@s.whatsapp.net" } };
+
+    assert.deepEqual(mergeMessagesByKeyId([[keyed], [unkeyed]]), [keyed, unkeyed]);
+  });
+});
+
+describe("messageRecordsFromResponse", () => {
+  it("normalizes a raw Message array", () => {
+    const records = [{ key: { id: "raw-1", remoteJid: "5511999999999@s.whatsapp.net" } }];
+    assert.equal(messageRecordsFromResponse(records), records);
+  });
+
+  it("normalizes { messages: { records } } payloads", () => {
+    const records = [{ key: { id: "nested-1", remoteJid: "123456789012345@lid" } }];
+    assert.deepEqual(messageRecordsFromResponse({ messages: { records } }), records);
+  });
+
+  it("returns an empty array for unrecognized shapes", () => {
+    assert.deepEqual(messageRecordsFromResponse(undefined), []);
+    assert.deepEqual(messageRecordsFromResponse(null), []);
+    assert.deepEqual(messageRecordsFromResponse({}), []);
+    assert.deepEqual(messageRecordsFromResponse({ messages: {} }), []);
+  });
+});
diff --git a/tests/chat-message-payload.test.ts b/tests/chat-message-payload.test.ts
new file mode 100644
index 0000000..03203b5
--- /dev/null
+++ b/tests/chat-message-payload.test.ts
@@ -0,0 +1,41 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+
+import { getChatMessagePayload, MISSING_CHAT_MESSAGE_FALLBACK } from "../src/lib/chat/message-payload.js";
+
+describe("getChatMessagePayload", () => {
+  it("returns null for persisted conversation records whose message payload is null", () => {
+    const record = {
+      messageType: "conversation",
+      message: null,
+    };
+
+    assert.equal(getChatMessagePayload(record), null);
+  });
+
+  it("returns null for undefined message payloads across messageType branches", () => {
+    for (const messageType of ["conversation", "extendedTextMessage", "imageMessage", "videoMessage", "audioMessage", "documentMessage", "stickerMessage"]) {
+      const record: { messageType: string; message?: null } = { messageType, message: undefined };
+      assert.equal(getChatMessagePayload(record), null);
+    }
+  });
+
+  it("returns null when the message record itself is missing", () => {
+    assert.equal(getChatMessagePayload(null), null);
+    assert.equal(getChatMessagePayload(undefined), null);
+  });
+
+  it("returns the original payload when one is present", () => {
+    const payload = { conversation: "hello" };
+    const record = { messageType: "conversation", message: payload };
+
+    assert.equal(getChatMessagePayload(record), payload);
+  });
+});
+
+describe("MISSING_CHAT_MESSAGE_FALLBACK", () => {
+  it("is a concise user-visible string", () => {
+    assert.equal(typeof MISSING_CHAT_MESSAGE_FALLBACK, "string");
+    assert.ok(MISSING_CHAT_MESSAGE_FALLBACK.length > 0);
+  });
+});
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
new file mode 100644
index 0000000..981df7e
--- /dev/null
+++ b/tests/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "types": ["node"],
+    "rootDir": "..",
+    "outDir": ".tmp/identity-test",
+    "noEmitOnError": true
+  },
+  "files": ["../src/lib/chat/identity.ts", "../src/lib/chat/message-payload.ts", "./chat-identity.test.ts", "./chat-message-payload.test.ts"]
+}