@rikaidev/yomi 0.2.6 → 0.3.1

package/dist/line/core/e2ee/keys/decrypt.js

@@ -2,7 +2,6 @@ import { tryDecryptInner } from './message-decrypt.js';
 const PEER_KEY_MISMATCH_PATTERN = /Peer E2EE key mismatch/i;
 const MISSING_GROUP_SENDER_KEY_PATTERN = /Missing group sender key/i;
 const GCM_AUTH_FAILURE_PATTERN = /unable to authenticate data|Unsupported state or unable to authenticate/i;
-export { decryptV1, decryptV2, decryptV2WithCandidates, extractTextPayload, generateAAD, getIntBytes, toChunkKeyId, } from './message-crypto.js';
 /**
  * Build one structured decrypt-failure log payload from a raw LINE message.
  *

package/dist/line/core/e2ee/keys/group-key.js

@@ -257,4 +257,3 @@ export async function getGroupKey(ctx, chatMid, receiverKeyId, senderMid, sender
         ctx.groupKeyFetches.delete(fetchKey);
     }
 }
-export { normalizeGroupPublicKeys } from './key-payload.js';

package/dist/line/core/e2ee/keys/key-payload.js

@@ -52,7 +52,7 @@ function readNegotiatedValue(publicKey, raw, fieldId) {
  * @param keyData - Raw key payload from thrift or object responses.
  * @returns Buffer instance or null when unsupported.
  */
-export function toKeyBuffer(keyData) {
+function toKeyBuffer(keyData) {
     if (Buffer.isBuffer(keyData)) {
         return keyData;
     }

package/dist/line/core/e2ee/keys/message-decrypt.js

@@ -43,7 +43,7 @@ function hasDecryptMaterial(resolved) {
  * @param msg - Raw message object
  * @returns Parsed E2EE chunk data, or null if the message is not E2EE
  */
-export function parseE2EEChunks(ctx, msg) {
+function parseE2EEChunks(ctx, msg) {
     const chunks = msg.chunks;
     if (!chunks || !Array.isArray(chunks) || chunks.length < 5) {
         return null;

package/dist/line/core/e2ee/keys/peer-key.js

@@ -59,7 +59,7 @@ export async function getPeerPublicKey(ctx, mid, keyId) {
  * @param keyId - Public key id
  * @param data - 32-byte public key
  */
-export async function persistPeerPublicKey(ctx, mid, keyId, data) {
+async function persistPeerPublicKey(ctx, mid, keyId, data) {
     const store = ctx.getStore();
     const record = JSON.stringify({
         mid,

package/dist/line/core/media-decrypt.js

@@ -24,7 +24,7 @@ async function deriveLineMediaKeyMaterial(keyMaterial) {
     };
 }
 /** Thrown when a media object's MAC does not match its ciphertext. */
-export class MediaMacVerificationError extends Error {
+class MediaMacVerificationError extends Error {
     constructor(message) {
         super(message);
         this.name = 'MediaMacVerificationError';

package/dist/line/core/mention.js

@@ -31,7 +31,7 @@
  * @param mentions - Proposed mentions.
  * @throws Error describing the first invalid mention or overlap found.
  */
-export function validateMentions(text, mentions) {
+function validateMentions(text, mentions) {
     const sorted = [...mentions].sort((a, b) => a.start - b.start);
     for (const mention of sorted) {
         const { mid, start, end } = mention;

package/dist/line/core/message-query-service.js

@@ -27,7 +27,7 @@ function inferLineToType(chatId) {
  * @param chatId - Requested LINE chat MID.
  * @returns Message with stable chat context.
  */
-export function normalizeLineMessageContext(message, chatId = null) {
+function normalizeLineMessageContext(message, chatId = null) {
     const resolvedChatId = message?.chatMid || chatId || null;
     const inferredToType = inferLineToType(resolvedChatId);
     return {
@@ -97,7 +97,7 @@ export async function decryptLineMessage(e2eeManager, message, chatId = null) {
  * @param chatId - Optional chat id to attach to each message.
  * @returns Messages with decrypted text flags when available.
  */
-export async function decryptLineMessages(e2eeManager, messages, chatId = null) {
+async function decryptLineMessages(e2eeManager, messages, chatId = null) {
     return Promise.all(messages.map((message) => decryptLineMessage(e2eeManager, message, chatId)));
 }
 /**

package/dist/line/core/session-state/persist.js

@@ -11,7 +11,7 @@ const persistLog = createCliLogger('SESSION-PERSIST');
  * @param value - Raw credential value.
  * @returns Persistable string value.
  */
-export function toPersistedKeyValue(value) {
+function toPersistedKeyValue(value) {
     if (!value) {
         return null;
     }

package/dist/line/core/thrift/binary/type-codec-dsl.js

@@ -1,5 +1,5 @@
 import { THRIFT_TYPE } from '../types.js';
-export const BINARY_TYPE_CODEC_DEFINITIONS = [
+const BINARY_TYPE_CODEC_DEFINITIONS = [
     {
         type: THRIFT_TYPE.BOOL,
         readHandler: 'readBoolValue',

package/dist/line/core/thrift/compact/type-codec-dsl.js

@@ -1,37 +1,4 @@
-import { THRIFT_TYPE } from '../types.js';
-export const COMPACT_TYPE_CODEC_DEFINITIONS = [
-    {
-        type: THRIFT_TYPE.BOOL,
-        readHandler: 'readBoolValue',
-        writeHandler: 'writeBoolValue',
-    },
-    {
-        type: THRIFT_TYPE.BYTE,
-        readHandler: 'readByteValue',
-        writeHandler: 'writeByteValue',
-    },
-    {
-        type: THRIFT_TYPE.I16,
-        readHandler: 'readI16Value',
-        writeHandler: 'writeI16Value',
-    },
-    {
-        type: THRIFT_TYPE.I32,
-        readHandler: 'readI32Value',
-        writeHandler: 'writeI32Value',
-    },
-    {
-        type: THRIFT_TYPE.I64,
-        readHandler: 'readI64Value',
-        writeHandler: 'writeI64Value',
-    },
-    {
-        type: THRIFT_TYPE.STRING,
-        readHandler: 'readStringValue',
-        writeHandler: 'writeStringValue',
-    },
-];
-export const COMPACT_STRUCT_TYPE_DEFINITIONS = [
+const COMPACT_STRUCT_TYPE_DEFINITIONS = [
     { type: 0, handler: 'readNullValue' },
     { type: 1, handler: 'readTrueValue' },
     { type: 2, handler: 'readFalseValue' },
@@ -46,15 +13,6 @@ export const COMPACT_STRUCT_TYPE_DEFINITIONS = [
     { type: 11, handler: 'readMapValue' },
     { type: 12, handler: 'readStructValue' },
 ];
-/**
- * Resolve one compact thrift type into its configured codec definition.
- *
- * @param type - Thrift wire type.
- * @returns Codec definition, if defined.
- */
-export function getCompactTypeCodecDefinition(type) {
-    return (COMPACT_TYPE_CODEC_DEFINITIONS.find((candidate) => candidate.type === type) ?? null);
-}
 /**
  * Resolve one compact struct field type into its configured reader handler.
  *

package/dist/line/core/thrift/fields/builders.js

@@ -9,7 +9,7 @@
  * @param value - Field value.
  * @returns Thrift field tuple.
  */
-export function field(type, fieldId, value) {
+function field(type, fieldId, value) {
     return [type, fieldId, value];
 }
 /**
@@ -32,16 +32,6 @@ export function boolField(fieldId, value) {
 export function byteField(fieldId, value) {
     return field(3, fieldId, value);
 }
-/**
- * Build an I16 field tuple.
- *
- * @param fieldId - Thrift field ID.
- * @param value - I16 value.
- * @returns Thrift field tuple.
- */
-export function i16Field(fieldId, value) {
-    return field(6, fieldId, value);
-}
 /**
  * Build an I32 field tuple.
  *

package/dist/line/core/thrift/index.js

@@ -1,12 +1,7 @@
 /**
  * Thrift - exports all modules
  */
-export { TBinaryReader } from './binary/binary-reader.js';
-export { TBinaryWriter } from './binary/binary-writer.js';
-export { TCompactReader } from './compact/compact-reader.js';
-export { TCompactWriter } from './compact/compact-writer.js';
-export { boolField, byteField, field, i16Field, i32Field, i64Field, listField, mapField, setField, stringField, structField, } from './fields/builders.js';
+export { boolField, byteField, i32Field, i64Field, listField, mapField, setField, stringField, structField, } from './fields/builders.js';
 export { decodeResponseMessage } from './message/decoder.js';
 export { encodeCallMessage } from './message/encoder.js';
 export { readStructFields } from './struct/reader.js';
-export { MSG_TYPE, THRIFT_TYPE } from './types.js';

package/dist/line/core/thrift/primitives/varint.js

@@ -36,7 +36,7 @@ export function zigzag(value) {
  * @param value - Bigint to encode.
  * @returns Encoded varint buffer.
  */
-export function varintBig(value) {
+function varintBig(value) {
     const bytes = [];
     let remaining = value;
     if (remaining < 0n) {

package/dist/line/core/thrift/types.js

@@ -15,9 +15,3 @@ export const THRIFT_TYPE = {
     SET: 14,
     LIST: 15,
 };
-export const MSG_TYPE = {
-    CALL: 1,
-    REPLY: 2,
-    EXCEPTION: 3,
-    ONEWAY: 4,
-};

package/dist/mcp/handlers/contacts.js

@@ -1,6 +1,6 @@
 import { createCliLogger } from '../../util/log.js';
 import { resolveUserNames } from '../names.js';
-import { jsonResult, toolError } from './shared.js';
+import { jsonResult, toolError, toonResult } from './shared.js';
 const log = createCliLogger('Yomi');
 /**
  * Fetch and normalize the authenticated user's full friend list in one
@@ -43,11 +43,7 @@ async function fetchAllContacts(service) {
  */
 export async function handleListContacts(service) {
     const contacts = await fetchAllContacts(service);
-    return {
-        content: [
-            { type: 'text', text: JSON.stringify(contacts, null, 2) },
-        ],
-    };
+    return toonResult(contacts);
 }
 /**
  * Handle `find_contact` — case-insensitive substring match over the
@@ -66,11 +62,7 @@ export async function handleFindContact(service, args) {
     const needle = args.name.toLowerCase();
     const contacts = await fetchAllContacts(service);
     const matches = contacts.filter((contact) => contact.displayName?.toLowerCase().includes(needle));
-    return {
-        content: [
-            { type: 'text', text: JSON.stringify(matches, null, 2) },
-        ],
-    };
+    return toonResult(matches);
 }
 /**
  * Handle `get_group_members` — the raw member list of one LINE group/room.
@@ -110,11 +102,7 @@ export async function handleGetGroupMembers(service, args) {
             invited: true,
         })),
     ];
-    return {
-        content: [
-            { type: 'text', text: JSON.stringify(summaries, null, 2) },
-        ],
-    };
+    return toonResult(summaries);
 }
 /**
  * Handle `add_friend` — REALLY adds a person to THIS account's LINE friends now

package/dist/mcp/handlers/conversations.js

@@ -4,7 +4,7 @@ import { createCliLogger } from '../../util/log.js';
 import { resolveLineMediaDescriptor, resolveLineMediaType } from '../media.js';
 import { resolveConversationNames, resolveSenderNames } from '../names.js';
 import { createPhiAccumulator, maskInto, phiNote } from '../phi-guard.js';
-import { toolError } from './shared.js';
+import { jsonResult, toolError, toonText } from './shared.js';
 const log = createCliLogger('Yomi');
 /**
  * Handle `list_conversations` — list LINE conversations (chats, groups, rooms)
@@ -42,7 +42,7 @@ export async function handleListConversations(service, args) {
         };
     }));
     const content = [
-        { type: 'text', text: JSON.stringify(conversations, null, 2) },
+        { type: 'text', text: toonText(conversations) },
     ];
     const note = phiNote(acc);
     if (note)
@@ -113,9 +113,7 @@ export async function handleGetChatMessages(service, args) {
             ? { e2eeIntegrityVerified: false }
             : {}),
     }));
-    const content = [
-        { type: 'text', text: JSON.stringify(shaped, null, 2) },
-    ];
+    const content = [{ type: 'text', text: toonText(shaped) }];
     const note = phiNote(acc);
     if (note)
         content.push(note);
@@ -137,9 +135,7 @@ export async function handleMarkRead(service, args) {
     }
     const result = await service.markChatRead(args.chatId, args.messageId);
     log.info('mark_read.done', { chatId: args.chatId, marked: result.marked });
-    return {
-        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-    };
+    return jsonResult(result);
 }
 /**
  * Handle `get_unread_digest` — one-shot composite: every conversation with
@@ -183,9 +179,7 @@ export async function handleGetUnreadDigest(service, args) {
             })),
         };
     }));
-    const content = [
-        { type: 'text', text: JSON.stringify(digest, null, 2) },
-    ];
+    const content = [{ type: 'text', text: toonText(digest) }];
     const note = phiNote(acc);
     if (note)
         content.push(note);

package/dist/mcp/handlers/index.js

@@ -5,6 +5,7 @@
 export * from './contacts.js';
 export * from './conversations.js';
 export * from './groups.js';
+export * from './insight.js';
 export * from './login.js';
 export * from './media.js';
 export * from './message-actions.js';

package/dist/mcp/handlers/insight.js

@@ -0,0 +1,129 @@
+import { encode } from '@toon-format/toon';
+import { computeInsights } from '../../insight/index.js';
+import { getDefaultEmbedder } from '../../search/default-embedder.js';
+import { getExcludedChatIds } from '../../search/scope.js';
+import { createPhiAccumulator, maskInto, phiNote } from '../phi-guard.js';
+/**
+ * get_insight — return structured attention context for the agent to judge.
+ *
+ * This is a first-stage tool: it does not decide what needs attention, it
+ * assembles a compact context network that can be computed without reading
+ * illocutionary force. Nodes are cross-conversation connectors and
+ * conversations; `open` are directed edges (last speaker → addressee) for
+ * threads whose latest message is not yours, each with reply-rhythm, overdue
+ * ratio, a boilerplate-shape hint, an address hint, and a message-id pointer —
+ * but no thread text. The agent dereferences the pointer (get_chat_messages)
+ * only for the edges it chooses to judge, and decides open-request vs
+ * closing-ack, a judgement the topic embedding cannot make. See ../../insight
+ * for why the split is drawn exactly there.
+ *
+ * Denylist-excluded chats (../../search/scope) are removed from every section.
+ *
+ * @param service - Live LINE service (used for the owner's identity).
+ * @param args - Optional focus chat and lookback window.
+ * @returns MCP tool result: the JSON context package plus any PHI-masking note.
+ */
+export async function handleGetInsight(service, args) {
+    const pkg = computeInsights({
+        focusChatId: args.chatId,
+        sinceHours: args.sinceHours,
+        selfMid: service.profile?.mid ?? null,
+        embedder: getDefaultEmbedder(),
+    });
+    const excluded = getExcludedChatIds();
+    const filtered = {
+        window: pkg.window,
+        relationships: pkg.relationships.filter((r) => !excluded.has(r.chatId)),
+        connectors: pkg.connectors,
+        open: pkg.open.filter((o) => !excluded.has(o.chatId)),
+    };
+    if (filtered.window.messages === 0) {
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: 'The semantic index is empty — run collect_messages (or any search) first, then retry.',
+                },
+            ],
+        };
+    }
+    const acc = createPhiAccumulator();
+    const masked = maskPackage(filtered, acc);
+    // TOON encoding (github.com/toon-format/toon) over a lean projection: uniform
+    // arrays become a one-line column header plus CSV rows (~half the tokens of
+    // JSON), and the projection drops fields the agent can derive or does not need
+    // — long MIDs/pointers, and low-signal one-off conversations.
+    const guide = 'A context network over your local LINE index, encoded as TOON — objects are `key: value`, uniform arrays are `name[count]{columns}:` then one comma-separated row per item. NOT verdicts. `connectors`: people across ≥2 of your chats (hubs; `isBridge` = removing them splits your contact graph). `relationships`: per-conversation engagement (`msgs` total, `yours` from you, `rhythmH` = your usual reply latency in hours) for conversations that matter. `open`: conversations whose latest message is not yours, most overdue vs that rhythm first (`overdueR`), with the last speaker (`from`) and a `preview`. Read each `preview` to judge — who it addresses (a group message may name someone else, who then owns it), open-request vs closing-acknowledgement, and nickname identities — then fetch the thread via get_chat_messages(chatId) only for the few worth it. `typicality` hints boilerplate shape but also buries polite requests, so never filter on it.';
+    const content = [
+        {
+            type: 'text',
+            text: `${guide}\n\n${encode(roundNumbers(project(masked)))}`,
+        },
+    ];
+    const note = phiNote(acc);
+    if (note) {
+        content.push(note);
+    }
+    return { content };
+}
+/**
+ * Project the package to a lean shape for encoding: drop long MIDs and message
+ * pointers, drop values the agent can derive (reciprocity, absolute times), and
+ * keep only conversations with signal — an open thread, or real back-and-forth
+ * (≥5 messages). One-off two-line chats are noise in a "what needs attention"
+ * scaffold.
+ */
+function project(pkg) {
+    const openChatIds = new Set(pkg.open.map((o) => o.chatId));
+    return {
+        window: pkg.window,
+        connectors: pkg.connectors.map((c) => ({
+            name: c.name,
+            chats: c.chatCount,
+            isBridge: c.isBridge,
+        })),
+        relationships: pkg.relationships
+            .filter((r) => openChatIds.has(r.chatId) || r.totalMessages >= 5)
+            .map((r) => ({
+            chatId: r.chatId,
+            name: r.chatName,
+            isDM: r.isDM,
+            msgs: r.totalMessages,
+            yours: r.yourMessages,
+            rhythmH: r.rhythmHours,
+        })),
+        open: pkg.open.map((o) => ({
+            chatId: o.chatId,
+            name: o.chatName,
+            isDM: o.isDM,
+            from: o.fromName,
+            waitH: o.waitHours,
+            overdueR: o.overdueRatio,
+            typicality: o.typicality,
+            preview: o.preview,
+        })),
+    };
+}
+/** Round every number to 2 decimals — full float precision is pure token cost. */
+function roundNumbers(value) {
+    if (typeof value === 'number') {
+        return (Math.round(value * 100) / 100);
+    }
+    if (Array.isArray(value)) {
+        return value.map(roundNumbers);
+    }
+    if (value && typeof value === 'object') {
+        return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, roundNumbers(v)]));
+    }
+    return value;
+}
+/** Mask PHI in the free-text previews the package carries. */
+function maskPackage(pkg, acc) {
+    return {
+        ...pkg,
+        open: pkg.open.map((o) => ({
+            ...o,
+            preview: maskInto(acc, o.preview) ?? o.preview,
+        })),
+    };
+}

package/dist/mcp/handlers/login.js

@@ -27,7 +27,7 @@ import { runPwlessLogin } from '../../cli/login.js';
 import { LINE_PIN_CODE_LIFETIME_MS, PAAK_AUTH_CLIENT_CEILING_MS, PIN_VERIFY_CLIENT_CEILING_MS, } from '../../line/auth/pwless/index.js';
 import { createCliLogger } from '../../util/log.js';
 import { supportsMcpApps } from '../ui/capability.js';
-import { toolError } from './shared.js';
+import { jsonText, toolError } from './shared.js';
 const log = createCliLogger('Yomi');
 /** LINE region codes offered on the login elicitation form. */
 const LOGIN_REGIONS = ['TW', 'JP', 'TH', 'ID', 'US'];
@@ -176,7 +176,7 @@ async function handleLoginElicitation(server, service, args) {
             content: [
                 {
                     type: 'text',
-                    text: JSON.stringify({ loggedIn: true, mid, displayName }, null, 2),
+                    text: jsonText({ loggedIn: true, mid, displayName }),
                 },
             ],
         };
@@ -461,7 +461,7 @@ export async function handleLoginComplete() {
             content: [
                 {
                     type: 'text',
-                    text: JSON.stringify({ loggedIn: true, mid, displayName }, null, 2),
+                    text: jsonText({ loggedIn: true, mid, displayName }),
                 },
             ],
         };

package/dist/mcp/handlers/scope.js

@@ -12,7 +12,7 @@
 import { addExcludedChatIds, deleteMessagesForChats, getExcludedChatIds, removeExcludedChatIds, } from '../../search/scope.js';
 import { resolveConversationNames } from '../names.js';
 import { getPrivacyPolicyText } from '../policy.js';
-import { toolError } from './shared.js';
+import { jsonResult, jsonText, toolError } from './shared.js';
 /**
  * Read the current exclusion denylist and pair each chatId with a
  * best-effort display name. Name resolution only runs when a live LINE
@@ -54,7 +54,7 @@ export async function handleExcludeChats(args) {
         content: [
             {
                 type: 'text',
-                text: JSON.stringify({ excluded, purgedMessages }, null, 2),
+                text: jsonText({ excluded, purgedMessages }),
             },
         ],
     };
@@ -74,9 +74,7 @@ export async function handleIncludeChats(args) {
     }
     const included = removeExcludedChatIds(args.chatIds);
     return {
-        content: [
-            { type: 'text', text: JSON.stringify({ included }, null, 2) },
-        ],
+        content: [{ type: 'text', text: jsonText({ included }) }],
     };
 }
 /**
@@ -91,9 +89,7 @@ export async function handleIncludeChats(args) {
  */
 export async function handleListExcludedChats(service) {
     const result = await listExcludedChatsWithNames(service);
-    return {
-        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-    };
+    return jsonResult(result);
 }
 /**
  * Handle `get_scope_policy` — return Yomi's data-capture privacy policy (the
@@ -114,7 +110,5 @@ export async function handleGetScopePolicy(service) {
         policy: getPrivacyPolicyText(),
         excludedChats,
     };
-    return {
-        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-    };
+    return jsonResult(result);
 }

package/dist/mcp/handlers/search.js

@@ -24,10 +24,10 @@
  */
 import { collectMessages } from '../../search/collector.js';
 import { getDefaultEmbedder } from '../../search/default-embedder.js';
-import { getEmbeddingCount, getIndexedMessageCount, searchMessages, semanticSearch, } from '../../search/store.js';
+import { getEmbeddingCount, getIndexedMessageCount, getMessageContext, searchMessages, semanticSearch, } from '../../search/store.js';
 import { createCliLogger } from '../../util/log.js';
 import { createPhiAccumulator, maskInto, phiNote } from '../phi-guard.js';
-import { toolError } from './shared.js';
+import { jsonText, toolError, toonText } from './shared.js';
 const log = createCliLogger('Yomi');
 /**
  * Reciprocal Rank Fusion constant. The standard k=60 from Cormack et al.:
@@ -50,7 +50,7 @@ const RRF_K = 60;
  * @param limit - Maximum number of fused results to return.
  * @returns Fused results, best-first, each carrying its RRF score.
  */
-function fuseByRrf(lists, limit) {
+export function fuseByRrf(lists, limit) {
     const scores = new Map();
     const rows = new Map();
     for (const list of lists) {
@@ -69,6 +69,26 @@ function fuseByRrf(lists, limit) {
         score,
     }));
 }
+/**
+ * Keep one active conversation from flooding the top results. Skipped rows are
+ * backfilled only when there are not enough distinct conversations, so a query
+ * scoped by its natural matches still returns the requested number of hits.
+ */
+export function applyConversationDiversity(rows, limit, perChat = 3) {
+    const selected = [];
+    const deferred = [];
+    const counts = new Map();
+    for (const row of rows) {
+        if ((counts.get(row.chatId) ?? 0) < perChat) {
+            selected.push(row);
+            counts.set(row.chatId, (counts.get(row.chatId) ?? 0) + 1);
+        }
+        else {
+            deferred.push(row);
+        }
+    }
+    return [...selected, ...deferred].slice(0, limit);
+}
 /**
  * Handle `collect_messages` — explicit bulk fetch of recent messages from
  * one or more LINE conversations into the local search index, batch-
@@ -88,9 +108,7 @@ export async function handleCollectMessages(service, args) {
         embedder: getDefaultEmbedder(),
     });
     return {
-        content: [
-            { type: 'text', text: JSON.stringify(summary, null, 2) },
-        ],
+        content: [{ type: 'text', text: jsonText(summary) }],
     };
 }
 /**
@@ -168,25 +186,29 @@ export async function handleSearchMessages(service, args) {
     let results;
     if (semantic.length > 0 && keyword.length > 0) {
         mode = 'hybrid';
-        results = fuseByRrf([keyword, semantic], limit);
+        results = applyConversationDiversity(fuseByRrf([keyword, semantic], pool), limit);
     }
     else if (semantic.length > 0) {
         mode = 'semantic';
-        results = semantic.slice(0, limit);
+        results = applyConversationDiversity(semantic, limit);
     }
     else {
         mode = 'keyword';
-        results = keyword.slice(0, limit);
+        results = applyConversationDiversity(keyword, limit);
     }
     const acc = createPhiAccumulator();
     const maskedResults = results.map((row) => ({
         ...row,
         text: maskInto(acc, row.text),
+        context: getMessageContext(row.messageId).map((message) => ({
+            ...message,
+            text: maskInto(acc, message.text),
+        })),
     }));
     const content = [
         {
             type: 'text',
-            text: JSON.stringify({ mode, results: maskedResults }, null, 2),
+            text: toonText({ mode, results: maskedResults }),
         },
     ];
     const note = phiNote(acc);