TypeScript
fix(mobile): delivered messages no longer reappear at the bottom of reopened long threads (#31182)
Alex Southwell8b570d282b5f
diff --git a/apps/mobile/src/state/acknowledged-thread-messages.ts b/apps/mobile/src/state/acknowledged-thread-messages.tsindex d7935d1debc..fda11130df3 100644--- a/apps/mobile/src/state/acknowledged-thread-messages.ts+++ b/apps/mobile/src/state/acknowledged-thread-messages.ts@@ -1,5 +1,6 @@import * as Option from "effect/Option";import { Atom } from "effect/reactivity";+import { scopedThreadKey } from "../lib/scopedEntities";import { appAtomRegistry } from "./atom-registry";import { threadHasCaughtUpTo } from "@t3tools/client-runtime/state/threads";import type { AcknowledgedThreadMessage, QueuedThreadMessage } from "./thread-outbox-model";@@ -51,6 +52,21 @@ export function retainAcknowledgedThreadMessage(message: AcknowledgedThreadMessa);}+// A bounded window later pages the message out and a remount restarts at sequence 0, so+// rows must leave as soon as their thread has caught up, not at the next write.+export function pruneCaughtUpAcknowledgedThreadMessages(+ threadKey: string,+ thread: Parameters<typeof threadHasCaughtUpTo>[1],+) {+ writeAcknowledgedThreadMessages((current) =>+ current.filter(+ (entry) =>+ scopedThreadKey(entry.environmentId, entry.threadId) !== threadKey ||+ !threadHasCaughtUpTo(entry, thread),+ ),+ );+}+export function forgetAcknowledgedThreadMessage(message: QueuedThreadMessage) {writeAcknowledgedThreadMessages((current) =>current.filter((entry) => entry.messageId !== message.messageId),diff --git a/apps/mobile/src/state/threadOutboxDelivery.test.ts b/apps/mobile/src/state/threadOutboxDelivery.test.tsindex 8fafbe62e71..3f9797cc91f 100644--- a/apps/mobile/src/state/threadOutboxDelivery.test.ts+++ b/apps/mobile/src/state/threadOutboxDelivery.test.ts@@ -1,4 +1,7 @@-import { acknowledgedThreadMessagesAtom } from "./acknowledged-thread-messages";+import {+ acknowledgedThreadMessagesAtom,+ pruneCaughtUpAcknowledgedThreadMessages,+} from "./acknowledged-thread-messages";import {CommandId,EnvironmentId,@@ -144,6 +147,7 @@ vi.mock("./thread-outbox", async () => {});import * as Option from "effect/Option";+import { scopedThreadKey } from "../lib/scopedEntities";import { appAtomRegistry } from "./atom-registry";import { pendingThreadCreationOutcomesAtom } from "./pending-thread-creation";import { clearThreadComposerError, threadComposerErrorsAtom } from "./thread-composer-error";@@ -364,6 +368,32 @@ describe("thread outbox drain delivery cleanup", () => {]);});+ it("drops an acknowledged row once the open thread catches up, so a reload cannot resurrect it", async () => {+ const message = queuedMessage({ messageId: "paged-out-later", text: "Delivered" });+ await harness.manager.enqueue(message);+ await completeQueuedMessageDelivery(message, harness.manager.revisionOf(message.messageId), 7);++ pruneCaughtUpAcknowledgedThreadMessages(+ scopedThreadKey(message.environmentId, message.threadId),+ {+ sequence: 6,+ messages: [],+ },+ );+ expect(appAtomRegistry.get(acknowledgedThreadMessagesAtom)).toEqual([+ { ...message, sequence: 7 },+ ]);++ pruneCaughtUpAcknowledgedThreadMessages(+ scopedThreadKey(message.environmentId, message.threadId),+ {+ sequence: 7,+ messages: [],+ },+ );+ expect(appAtomRegistry.get(acknowledgedThreadMessagesAtom)).toEqual([]);+ });+it("removes an acknowledged outbox item even when the sign-out archive write fails", async () => {const message = queuedMessage({ messageId: "archive-write-failure", text: "Delivered" });await harness.manager.enqueue(message);diff --git a/apps/mobile/src/state/use-thread-composer-state.ts b/apps/mobile/src/state/use-thread-composer-state.tsindex 336226cce8b..75b3b0df01f 100644--- a/apps/mobile/src/state/use-thread-composer-state.ts+++ b/apps/mobile/src/state/use-thread-composer-state.ts@@ -15,7 +15,7 @@ import {deriveThreadRuntime,threadRuntimeHasInterruptibleRun,} from "@t3tools/client-runtime/state/thread-execution";-import { useRef, useState } from "react";+import { useEffect, useRef, useState } from "react";import {CommandId,@@ -50,7 +50,10 @@ import { resolveProviderInteractionMode } from "./legacy-plan-mode";import type { DraftComposerImageAttachment } from "../lib/composerImages";import { scopedThreadKey } from "../lib/scopedEntities";import { buildThreadFeed, createThreadFeedCache } from "../lib/threadActivity";-import { acknowledgedThreadMessagesAtom } from "./acknowledged-thread-messages";+import {+ acknowledgedThreadMessagesAtom,+ pruneCaughtUpAcknowledgedThreadMessages,+} from "./acknowledged-thread-messages";import {appendPendingThreadMessages,selectPendingAcknowledgedMessages,@@ -237,6 +240,14 @@ export function useThreadComposerState() {? EMPTY_THREAD_SEQUENCE_ATOM: environmentThreadDetails.sequenceAtom(selectedThreadDetailRef),);+ // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- prunes the app-wide acknowledged atom when the mounted thread catches up+ useEffect(() => {+ if (selectedThreadKey === null || acknowledgedMessages.length === 0) return;+ pruneCaughtUpAcknowledgedThreadMessages(selectedThreadKey, {+ sequence: selectedThreadSequence,+ messages: selectedThreadMessages,+ });+ }, [acknowledgedMessages, selectedThreadKey, selectedThreadSequence, selectedThreadMessages]);const checkpointSummaries = useAtomValue(selectedThreadDetailRef === null? EMPTY_CHECKPOINT_SUMMARIES_ATOM