@pmate/chat-sdk 0.12.0-next.35 → 0.12.0-next.37

package/lib/runtime/chatSession.js

@@ -297,7 +297,10 @@ export class ChatSession {
                 }
                 if (restart)
                     continue;
-                return { messages: pages.reverse().flat(), hasEarlier: false, complete: true, resetVersion: version };
+                const result = { messages: pages.reverse().flat(), hasEarlier: false, complete: true, resetVersion: version };
+                await this.messages.expandWindow(threadId, result);
+                this.rememberHistoryEdge(threadId, result);
+                return result;
             }
             catch (error) {
                 this.assertOpen();
@@ -453,9 +456,9 @@ export class ChatSession {
         const messages = previous && previous.messages.length === raw.length && previous.messages.every((message, index) => message === raw[index]) ? previous.messages : raw;
         const outgoing = this.sender.snapshot(threadId);
         const sameSource = previous && previous.messages === messages && previous.outgoing.length === outgoing.length && previous.outgoing.every((record, index) => record === outgoing[index]);
-        const semanticReading = previous?.messageReading ?? {};
-        const semantics = sameSource ? previous.timeline : projectMessageTimeline({ appId: this.options.messages.scope.appId, profileId: this.options.messages.scope.profileId, threadId, messages, outgoing, decode: this.decodeTimeline, reading: semanticReading, previous: previous?.timeline });
         const candidates = new Map(messages.flatMap(message => { const candidate = this.options.readingCandidate?.(message); return candidate ? [[candidate.id, candidate]] : []; }));
+        const semanticReading = previous?.messageReading ?? {};
+        const semantics = sameSource ? previous.timeline : projectMessageTimeline({ appId: this.options.messages.scope.appId, profileId: this.options.messages.scope.profileId, threadId, messages, outgoing, candidates, decode: this.decodeTimeline, reading: semanticReading, previous: previous?.timeline });
         for (const item of semantics)
             if (item.recalled)
                 candidates.set(item.id, { ...candidates.get(item.id), id: item.id, threadId, from: item.from, mine: item.mine, recalled: true });
@@ -464,7 +467,7 @@ export class ChatSession {
         const view = projectConversationReading(state, { id: threadId, kind }, [...candidates.values()]);
         const unread = previous && JSON.stringify(previous.unread) === JSON.stringify(view.unread) ? previous.unread : view.unread;
         const messageReading = previous && JSON.stringify(previous.messageReading) === JSON.stringify(view.messageReading) ? previous.messageReading : view.messageReading;
-        const timeline = messageReading === semanticReading ? semantics : projectMessageTimeline({ appId: this.options.messages.scope.appId, profileId: this.options.messages.scope.profileId, threadId, messages, outgoing, decode: this.decodeTimeline, reading: messageReading, previous: previous?.timeline });
+        const timeline = messageReading === semanticReading ? semantics : projectMessageTimeline({ appId: this.options.messages.scope.appId, profileId: this.options.messages.scope.profileId, threadId, messages, outgoing, candidates, decode: this.decodeTimeline, reading: messageReading, previous: previous?.timeline });
         return { timeline, messages, hasEarlier: source?.hasEarlier ?? false, resetVersion: source?.resetVersion ?? 0, complete: source?.complete ?? false, outgoing, readCounts: this.countSnapshots.get(threadId), unread, messageReading };
     }
     subscribe(target, listener, fields) {

package/lib/runtime/messageClient.d.ts

@@ -91,6 +91,8 @@ export declare class MessageClient<T extends StoredMessage> {
     private flushWrites;
     private runWrites;
     synchronize(thread: string): Promise<void>;
+    /** Keep an explicitly requested history range in the shared subscribed view. */
+    expandWindow(thread: string, page: MessageSnapshot<T>): Promise<void>;
     earlier(thread: string, before: {
         timestamp: number;
         id: string;

package/lib/runtime/messageClient.js

@@ -485,6 +485,18 @@ export class MessageClient {
         this.syncing.set(thread, task);
         return task;
     }
+    /** Keep an explicitly requested history range in the shared subscribed view. */
+    async expandWindow(thread, page) {
+        const first = page.messages[0];
+        if (!first || !page.complete)
+            return;
+        const old = this.windowEdges.get(thread);
+        if (!old || old.version !== page.resetVersion || first.timestamp < old.timestamp || first.timestamp === old.timestamp && first.id < old.id)
+            this.windowEdges.set(thread, { timestamp: first.timestamp, id: first.id, version: page.resetVersion });
+        const snapshot = await this.reload(thread);
+        if (snapshot.resetVersion !== page.resetVersion)
+            throw new Error("MESSAGE_PROJECTION_CHANGED");
+    }
     async earlier(thread, before, limit = 100, expand = false) {
         await this.ensureScope();
         if (this.scopeDenied)
@@ -500,12 +512,8 @@ export class MessageClient {
                 await this.synchronize(thread);
             }
             const page = await this.fillWindow(thread, limit, before);
-            if (expand && page.complete && page.messages.length) {
-                const first = page.messages[0], old = this.windowEdges.get(thread);
-                if (!old || old.version !== page.resetVersion || first.timestamp < old.timestamp || first.timestamp === old.timestamp && first.id < old.id)
-                    this.windowEdges.set(thread, { timestamp: first.timestamp, id: first.id, version: page.resetVersion });
-                await this.reload(thread);
-            }
+            if (expand)
+                await this.expandWindow(thread, page);
             return page;
         }
         catch (error) {

package/lib/runtime/messageTimeline.d.ts

@@ -1,7 +1,7 @@
 import type { StoredMessage } from "./messageStore.js";
 import type { OutgoingMessage } from "./durableSender.js";
 import type { ChatRuntimeMessage } from "./protocol.js";
-import type { MessageReadingState } from "./conversationReading.js";
+import type { MessageReadingState, ReadingCandidate } from "./conversationReading.js";
 export type TimelineReactionEvent = Reaction & {
     threadId: string;
 };
@@ -18,6 +18,8 @@ export type TimelineItem<T> = {
     mine: boolean;
     status: "sending" | "sent" | "failed" | "read";
     recalled: boolean;
+    unread?: boolean;
+    attentionEligible?: boolean;
     message: T | undefined;
     reading?: MessageReadingState;
     reactions: readonly TimelineReaction[];
@@ -42,6 +44,7 @@ export declare function projectMessageTimeline<T extends StoredMessage>(input: {
     outgoing: readonly OutgoingMessage[];
     decode: (message: ChatRuntimeMessage) => T | undefined;
     reading: Readonly<Record<string, MessageReadingState>>;
+    candidates?: ReadonlyMap<string, ReadingCandidate>;
     previous?: readonly TimelineItem<T>[];
 }): readonly TimelineItem<T>[];
 export {};

package/lib/runtime/messageTimeline.js

@@ -106,13 +106,14 @@ export function projectMessageTimeline(input) {
             continue;
         const mine = envelope.from === input.profileId, reading = input.reading[message.id];
         const withdrawn = Boolean(tombstones.has(message.id) || message.recalled || envelope.legacyDisplay?.recalled || envelope.from && recalled.get(message.id)?.has(envelope.from));
-        const item = { id: message.id, threadId: message.threadId, timestamp: message.timestamp, from: envelope.from, mine, status: !mine && reading ? (reading.read ? "read" : status === "read" ? "sent" : status) : status, recalled: withdrawn,
+        const candidate = input.candidates?.get(message.id);
+        const item = { id: message.id, threadId: message.threadId, timestamp: message.timestamp, from: envelope.from, mine, status: !mine && reading ? (reading.read ? "read" : status === "read" ? "sent" : status) : status, recalled: withdrawn, ...(candidate ? { unread: !mine && !withdrawn && (reading ? !reading.read : candidate.unread), attentionEligible: candidate.attentionEligible } : {}),
             message: withdrawn ? undefined : message, reading, reactionEvents: withdrawn ? [] : groupedEvents.get(message.id) ?? [], reactions: withdrawn ? [] : [...(grouped.get(message.id) ?? [])].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([emojiId, users]) => { const userIds = [...users].sort(); return { emojiId, userIds, mine: userIds.includes(input.profileId) }; }) };
         const old = previous.get(item.id);
         const sameReading = old?.reading === item.reading || old?.reading?.seq === item.reading?.seq && old?.reading?.read === item.reading?.read && old?.reading?.readPolicy === item.reading?.readPolicy;
         const sameReactions = old?.reactions.length === item.reactions.length && old.reactions.every((reaction, index) => { const next = item.reactions[index]; return reaction.emojiId === next.emojiId && reaction.mine === next.mine && reaction.userIds.length === next.userIds.length && reaction.userIds.every((user, i) => user === next.userIds[i]); });
         const sameEvents = old?.reactionEvents.length === item.reactionEvents.length && old.reactionEvents.every((event, index) => { const next = item.reactionEvents[index]; return event.id === next.id && event.from === next.from && event.emojiId === next.emojiId && event.active === next.active && event.revision === next.revision && event.timestamp === next.timestamp && event.threadId === next.threadId && event.messageId === next.messageId; });
-        result.push(old && sameEvents && old.message === item.message && old.timestamp === item.timestamp && old.from === item.from && old.mine === item.mine && old.status === item.status && old.recalled === item.recalled && sameReading && sameReactions ? old : item);
+        result.push(old && sameEvents && old.message === item.message && old.timestamp === item.timestamp && old.from === item.from && old.mine === item.mine && old.status === item.status && old.recalled === item.recalled && old.unread === item.unread && old.attentionEligible === item.attentionEligible && sameReading && sameReactions ? old : item);
     }
     result.sort((a, b) => a.timestamp - b.timestamp || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
     return input.previous?.length === result.length && result.every((item, index) => item === input.previous[index]) ? input.previous : result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/chat-sdk",
-  "version": "0.12.0-next.35",
+  "version": "0.12.0-next.37",
   "description": "Cross-platform PMate chat input components, voice input primitives, and ASR helpers",
   "type": "module",
   "main": "./lib/index.js",