Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(chat): 修复远程刷新与历史翻页导致的消息跳动 (#4584)

DavidShenXD1a30139b0a85
diff --git a/apps/desktop/src/main/file-browser/__tests__/html-preview.test.ts b/apps/desktop/src/main/file-browser/__tests__/html-preview.test.ts
index 5973ed74ec..96d96d6719 100644
--- a/apps/desktop/src/main/file-browser/__tests__/html-preview.test.ts
+++ b/apps/desktop/src/main/file-browser/__tests__/html-preview.test.ts
@@ -14,6 +14,7 @@ import {
const cleanups: Array<() => Promise<void>> = [];
afterEach(async () => {
+ vi.restoreAllMocks();
for (const cleanup of cleanups.splice(0).reverse()) await cleanup();
});
async function fixture() {
diff --git a/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts b/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts
index 9c2e9e48dc..e3a1a3f633 100644
--- a/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts
+++ b/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts
@@ -991,7 +991,10 @@ describe('device-link controller mirror — end-to-end scenarios', () => {
}
});
- it.each([false, true])('propagates remote pagination loading synchronously to the rendered light state (fails=%s)', async (fails) => {
+ it.each([
+ { older: true, fails: false }, { older: true, fails: true },
+ { older: false, fails: false }, { older: false, fails: true },
+ ])('only propagates pagination loading to the rendered light state (older=$older, fails=$fails)', async ({ older, fails }) => {
const s = sid();
host.enableHistoryView();
const rows = Array.from({ length: 30 }, (_, index) => dbMessage(s, String(index), 'visible',
@@ -1016,23 +1019,24 @@ describe('device-link controller mirror — end-to-end scenarios', () => {
// MessageStream subscribes to this view while its parent reads the light
// store. Check both at the same notification, before any React scheduling.
const unsubscribe = view.subscribe(() => {
- const loading = view.getSnapshot().loading;
+ const loading = view.getSnapshot().loading && older;
expect(makerChatStore.getSnapshot(s).isLoadingMore).toBe(loading);
expect(makerChatStore.getLightSnapshot(s).isLoadingMore).toBe(loading);
observed.push(loading);
});
try {
- const result = makerChatStore.loadOlderMessages(s).then(
+ const result = (older ? makerChatStore.loadOlderMessages(s) : view.refresh()).then(
(advanced) => ({ advanced }),
(error: Error) => ({ error: error.message }),
);
- expect(observed).toEqual([true]);
+ expect(view.getSnapshot().loading).toBe(true);
+ expect(observed).toEqual([older]);
expect(view.getSnapshot().items).toBe(previousItems);
- expect(makerChatStore.getLightSnapshot(s).isLoadingMore).toBe(true);
+ expect(makerChatStore.getLightSnapshot(s).isLoadingMore).toBe(older);
release();
- expect(await result).toEqual(fails ? { error: 'page unavailable' } : { advanced: true });
- expect(observed).toEqual([true, false]);
- expect(view.getSnapshot().items).toHaveLength(fails ? 20 : 30);
+ expect(await result).toEqual(!older ? { advanced: undefined } : fails ? { error: 'page unavailable' } : { advanced: true });
+ expect(observed).toEqual([older, false]);
+ expect(view.getSnapshot().items).toHaveLength(fails || !older ? 20 : 30);
expect(makerChatStore.getLightSnapshot(s).isLoadingMore).toBe(false);
} finally {
unsubscribe();
diff --git a/apps/desktop/src/renderer/__tests__/focusScrollLifecycle.test.ts b/apps/desktop/src/renderer/__tests__/focusScrollLifecycle.test.ts
index c142757dfb..d62e14e551 100644
--- a/apps/desktop/src/renderer/__tests__/focusScrollLifecycle.test.ts
+++ b/apps/desktop/src/renderer/__tests__/focusScrollLifecycle.test.ts
@@ -546,11 +546,12 @@ describe('MessageStream focus cancellation wiring', () => {
expect(recoveredStart).toBeGreaterThanOrEqual(0);
expect(recoveredEnd).toBeGreaterThan(recoveredStart);
const recovered = compensation.slice(recoveredStart, recoveredEnd);
- expect(recovered).toContain('restoreViewportSnapshot(rebased, 0)');
+ expect(recovered).toContain('offset: snapshot.offset');
+ expect(recovered).toContain('restoreViewportSnapshot(rebased)');
expect(recovered).toContain(
'if (!windowAnchorLost && !programmaticScrollRef.current && !isLoadingMore)',
);
- const restoreIndex = recovered.indexOf('restoreViewportSnapshot(rebased, 0)');
+ const restoreIndex = recovered.indexOf('restoreViewportSnapshot(rebased)');
const guardIndex = recovered.indexOf(
'if (!windowAnchorLost && !programmaticScrollRef.current && !isLoadingMore)',
);
diff --git a/apps/desktop/src/renderer/__tests__/historyViewportCompensation.test.ts b/apps/desktop/src/renderer/__tests__/historyViewportCompensation.test.ts
index e27aef2c86..ecb274755b 100644
--- a/apps/desktop/src/renderer/__tests__/historyViewportCompensation.test.ts
+++ b/apps/desktop/src/renderer/__tests__/historyViewportCompensation.test.ts
@@ -24,8 +24,14 @@ const compiled = ts.transpileModule(
),
{ compilerOptions: { target: ts.ScriptTarget.ES2022 } },
).outputText;
+const measureCompiled = ts.transpileModule(
+ between(' const measureViewportTop =', ' const refreshViewportAnchor ='),
+ { compilerOptions: { target: ts.ScriptTarget.ES2022 } },
+).outputText;
-function run({ targetTop = 42, missing = false, loading = false, exact = false } = {}) {
+function run({ targetTop = 42, missing = false, loading = false, exact = false, measuredBeforeTop }: {
+ targetTop?: number; missing?: boolean; loading?: boolean; exact?: boolean; measuredBeforeTop?: number;
+} = {}) {
let top = 1058;
const writes: number[] = [];
const el = {
@@ -39,7 +45,12 @@ function run({ targetTop = 42, missing = false, loading = false, exact = false }
},
getBoundingClientRect: () => ({ top: 0 }),
};
- const target = { getAttribute: () => 'anchor', getBoundingClientRect: () => ({ top: 1058 + targetTop - top, height: 100 }) };
+ let anchorTop = measuredBeforeTop ?? targetTop;
+ const target = {
+ getAttribute: () => 'anchor',
+ getBoundingClientRect: () => ({ top: 1058 + anchorTop - top, bottom: 1158 + anchorTop - top, height: 100 }),
+ querySelectorAll: () => [],
+ };
const items = [{ key: 'anchor' }];
const previousHeight = { current: 38313 };
const bindings = {
@@ -61,6 +72,8 @@ function run({ targetTop = 42, missing = false, loading = false, exact = false }
isNearBottomRef: { current: false },
isLoadingMore: loading,
queryMessageElement: () => (exact && !missing ? target : null),
+ pickIntersectingChildAnchor: () => null,
+ readViewportChildAnchorClientId: () => null,
toRenderItemViewportSnapshot,
detectScrollAnchoringApplied,
viewportAnchorCorrection,
@@ -69,11 +82,69 @@ function run({ targetTop = 42, missing = false, loading = false, exact = false }
finishProgrammaticScroll: vi.fn(),
requestAnimationFrame: vi.fn(),
};
+ if (measuredBeforeTop !== undefined) {
+ bindings.lastViewportTopRef.current = new Function(
+ ...Object.keys(bindings), measureCompiled + '\nreturn measureViewportTop();',
+ )(...Object.values(bindings));
+ anchorTop = targetTop;
+ }
new Function(...Object.keys(bindings), compiled)(...Object.values(bindings));
return { top, writes, previousHeight: previousHeight.current };
}
describe('history viewport compensation', () => {
+ it('keeps an aligned reading row through native scroll events even with null render items', () => {
+ let readingTop = 28;
+ const estimatedRow = {
+ getAttribute: () => 'estimated-row',
+ getBoundingClientRect: () => ({ top: -180, bottom: 60, height: 240 }),
+ querySelectorAll: () => [],
+ };
+ const previous = { viewportTopKey: 'reading-row', offset: -28 };
+ const readingRow = {
+ getAttribute: () => 'reading-row',
+ getBoundingClientRect: () => ({ top: readingTop, bottom: readingTop + 100, height: 100 }),
+ querySelectorAll: () => [],
+ };
+ const bindings = {
+ useCallback: (fn: unknown) => fn,
+ scrollRef: { current: { getBoundingClientRect: () => ({ top: 0, bottom: 700 }) } },
+ itemsRef: { current: { children: [estimatedRow, readingRow] } },
+ visibleRenderItemsRef: { current: [{ key: 'null-row' }, { key: 'estimated-row' }, { key: 'reading-row' }] },
+ lastViewportTopRef: { current: previous },
+ findRenderItemElement,
+ pickIntersectingChildAnchor: () => null,
+ readViewportChildAnchorClientId: () => null,
+ viewportAnchorCorrection,
+ settleChipJump: vi.fn(),
+ chipJumpGenerationRef: { current: null },
+ programmaticScrollRef: { current: true },
+ programmaticScrollGenerationRef: { current: 1 },
+ finishProgrammaticScroll: () => false,
+ };
+ const captureCode = ts.transpileModule(
+ between(' const measureViewportTop =', ' const beginProgrammaticScroll =') +
+ between(' const onScrollEnd = () => {\n settleChipJump();', '\n root.addEventListener'),
+ { compilerOptions: { target: ts.ScriptTarget.ES2022 } },
+ ).outputText;
+ const capture = new Function(
+ ...Object.keys(bindings), captureCode + '\nonScrollEnd(); return refreshViewportAnchor;',
+ )(...Object.values(bindings));
+ expect(capture(true)).toBe(previous);
+ expect(bindings.lastViewportTopRef.current).toBe(previous);
+ readingTop = 400;
+ expect(capture(true)).toEqual({ viewportTopKey: 'estimated-row', offset: 180 });
+ });
+ it.each([
+ { measuredBeforeTop: 28, targetTop: 28, expectedTop: 1058 },
+ { measuredBeforeTop: 28, targetTop: 282, expectedTop: 1312 },
+ { measuredBeforeTop: 7, targetTop: 282, expectedTop: 1333 },
+ { measuredBeforeTop: -12, targetTop: 242, expectedTop: 1312 },
+ ])('preserves the measured reading position across prepend ($measuredBeforeTop -> $targetTop)',
+ ({ measuredBeforeTop, targetTop, expectedTop }) => {
+ expect(run({ measuredBeforeTop, targetTop }).top).toBe(expectedTop);
+ },
+ );
it.each([false, true])(
'uses actual anchor displacement, not unrelated total growth (exact=%s)',
(exact) => {
diff --git a/apps/desktop/src/renderer/__tests__/i18nCompleteness.test.ts b/apps/desktop/src/renderer/__tests__/i18nCompleteness.test.ts
index 4b84c045b7..73e7a2465e 100644
--- a/apps/desktop/src/renderer/__tests__/i18nCompleteness.test.ts
+++ b/apps/desktop/src/renderer/__tests__/i18nCompleteness.test.ts
@@ -86,29 +86,65 @@ interface Scan {
// A literal prefix followed by concatenation is not a complete static key.
const STATIC_KEY_RE = /\bt\(\s*['"]([A-Za-z0-9_][A-Za-z0-9_.]*)['"]\s*(?=[,)])/g;
-async function scanSource(): Promise<Scan> {
+function scanText(txt: string): Scan {
const used = new Set<string>();
const withDefault = new Set<string>();
let templateCount = 0;
-
// 位置参默认:t('k', '默认')
const posDefaultRe = /\bt\(\s*['"]([A-Za-z0-9_][A-Za-z0-9_.]*)['"]\s*,\s*['"]/g;
// 选项默认:t('k', { ... defaultValue ... })
const optDefaultRe = /\bt\(\s*['"]([A-Za-z0-9_][A-Za-z0-9_.]*)['"]\s*,\s*\{[^}]*defaultValue/g;
const templateRe = /\bt\(\s*`/g;
+ for (const m of txt.matchAll(STATIC_KEY_RE)) used.add(m[1]);
+ for (const m of txt.matchAll(posDefaultRe)) withDefault.add(m[1]);
+ for (const m of txt.matchAll(optDefaultRe)) withDefault.add(m[1]);
+ templateCount += [...txt.matchAll(templateRe)].length;
+ return { used, withDefault, templateCount };
+}
+
+async function scanSource(): Promise<Scan> {
+ const result: Scan = { used: new Set(), withDefault: new Set(), templateCount: 0 };
for await (const entry of glob('**/*.{ts,tsx}', { cwd: RENDERER })) {
if (entry.includes('__tests__') || entry.startsWith('i18n/')) continue;
- const txt = readFileSync(resolve(RENDERER, entry), 'utf8');
- for (const m of txt.matchAll(STATIC_KEY_RE)) used.add(m[1]);
- for (const m of txt.matchAll(posDefaultRe)) withDefault.add(m[1]);
- for (const m of txt.matchAll(optDefaultRe)) withDefault.add(m[1]);
- templateCount += [...txt.matchAll(templateRe)].length;
+ const scan = scanText(readFileSync(resolve(RENDERER, entry), 'utf8'));
+ for (const key of scan.used) result.used.add(key);
+ for (const key of scan.withDefault) result.withDefault.add(key);
+ result.templateCount += scan.templateCount;
}
- return { used, withDefault, templateCount };
+ return result;
}
+describe('static translation key scanner', () => {
+ it('does not treat a dynamic concatenation prefix as a complete key', () => {
+ const scan = scanText(`
+ t('cindyMake.code.phases.' + phase);
+ t("settings.cindyMake.tasks." + action + 'Confirm', { count });
+ t('settings.cindyMake.tasks.status.'
+ + statusOf(selected, taskAction));
+ t('cindyMake.source.errors.' + code, 'Fallback');
+ t('cindyMakeDoctor.checks.' + check.id, { defaultValue: 'Fallback' });
+ `);
+ expect([...scan.used]).toEqual([]);
+ expect([...scan.withDefault]).toEqual([]);
+ });
+
+ it('retains complete static keys, options and inline defaults', () => {
+ const scan = scanText(`
+ t('missing.key');
+ t("plural.key", { count });
+ t('positional.key', 'Fallback');
+ t('options.key', { count, defaultValue: 'Fallback' });
+ `);
+ expect([...scan.used]).toEqual([
+ 'missing.key', 'plural.key', 'positional.key', 'options.key',
+ ]);
+ expect([...scan.withDefault]).toEqual(['positional.key', 'options.key']);
+ expect(present({}, 'missing.key')).toBe(false);
+ });
+});
+
describe('i18n completeness (static keys present in all locales)', () => {
it('checks complete literal keys without treating dynamic prefixes as keys', () => {
const source = `t('static.key'); t("static.options", { count: 2 });
diff --git a/apps/desktop/src/renderer/__tests__/messageViewportDeletionIntegration.test.ts b/apps/desktop/src/renderer/__tests__/messageViewportDeletionIntegration.test.ts
index b282587017..6a6472cca8 100644
--- a/apps/desktop/src/renderer/__tests__/messageViewportDeletionIntegration.test.ts
+++ b/apps/desktop/src/renderer/__tests__/messageViewportDeletionIntegration.test.ts
@@ -81,13 +81,16 @@ const messages: ChatMessage[] = [
];
const build = (input: ChatMessage[]) => groupWorkRuns(buildRenderItems(input).items, false);
-function setup({ deleted = true, hidden = false, nativeShift = 0 } = {}) {
- const before = build(messages);
+function setup({ deleted = true, hidden = false, nativeShift = 0, prependedGroup = false } = {}) {
+ const before = build(prependedGroup ? messages.slice(3) : messages);
const after = build(deleted ? messages.filter((message) => message.clientId !== 'a-draft') : messages);
const beforeGroup = before.find((item) => item.type === 'work_group')!;
const afterGroup = after.find((item) => item.type === 'work_group')!;
- expect(afterGroup.key).toBe(beforeGroup.key);
- expect(after).toHaveLength(before.length);
+ if (prependedGroup) expect(afterGroup.key).not.toBe(beforeGroup.key);
+ else {
+ expect(afterGroup.key).toBe(beforeGroup.key);
+ expect(after).toHaveLength(before.length);
+ }
vi.stubGlobal('CSS', { escape: (value: string) => value });
const root = document.createElement('div');
@@ -115,9 +118,8 @@ function setup({ deleted = true, hidden = false, nativeShift = 0 } = {}) {
}
const snapshot: Snapshot = {
viewportTopKey: beforeGroup.key,
- offset: 730,
- messageClientId: 'a-draft',
- messageOffset: 130,
+ offset: prependedGroup ? -28 : 730,
+ ...(!prependedGroup ? { messageClientId: 'a-draft', messageOffset: 130 } : {}),
};
const lastViewportTopRef = ref<Snapshot | null>(snapshot);
const programmaticScrollRef = ref(false);
@@ -174,7 +176,7 @@ function setup({ deleted = true, hidden = false, nativeShift = 0 } = {}) {
};
expect(effects).toHaveLength(2);
return {
- root, snapshot, lastViewportTopRef, elements, positions,
+ root, snapshot, lastViewportTopRef, elements, positions, afterGroup, items,
compensate: callbacks.compensateMessageHeight,
commit: () => effects.forEach((effect) => effect()),
flushFrames: () => frames.splice(0).forEach((callback) => callback(0)),
@@ -187,6 +189,17 @@ afterEach(() => {
});
describe('message height and deletion compensation lifecycle', () => {
+ it('keeps top spacing when an older page merges the leading work group', () => {
+ const view = setup({ deleted: false, prependedGroup: true });
+ view.commit();
+ expect(view.lastViewportTopRef.current).toEqual({
+ viewportTopKey: view.afterGroup.key, offset: -28,
+ });
+ expect(view.root.scrollTop).toBe(172);
+ view.flushFrames();
+ view.compensate();
+ expect(view.root.scrollTop).toBe(172);
+ });
it.each([
{ nativeShift: 0, observerFirst: false },
{ nativeShift: -200, observerFirst: false },
diff --git a/apps/desktop/src/renderer/components/chat/MessageStream.tsx b/apps/desktop/src/renderer/components/chat/MessageStream.tsx
index 983e0fe731..ca983cacc9 100644
--- a/apps/desktop/src/renderer/components/chat/MessageStream.tsx
+++ b/apps/desktop/src/renderer/components/chat/MessageStream.tsx
@@ -3068,16 +3068,18 @@ export function MessageStream({
const cTop = container.getBoundingClientRect().top;
const children = items.children;
for (let i = 0; i < children.length; i++) {
- const rect = (children[i] as HTMLElement).getBoundingClientRect();
+ const itemElement = children[i] as HTMLElement;
+ const rect = itemElement.getBoundingClientRect();
// 第一条「底边还在容器顶边下方」的 item = 正好跨过视口顶边的那条。
if (rect.height > 0 && rect.bottom - cTop > 0) {
const key = children[i].getAttribute('data-render-item-key');
if (!key) return null;
const snapshot: ViewportTopSnapshot = {
viewportTopKey: key,
+ // Negative offsets retain top padding or a gap above the first visible
+ // row; clamping to zero pulls that row to the viewport edge on prepend.
offset: cTop - rect.top,
};
- const itemElement = children[i] as HTMLElement;
const childAnchor = pickIntersectingChildAnchor(
Array.from(
[itemElement, ...itemElement.querySelectorAll<HTMLElement>('[data-message-client-id]')],
@@ -3110,7 +3112,24 @@ export function MessageStream({
}, []);
// 量测并写入「删除前快照」,返回结果供同帧复用。用户滚动、非贴底程序化跳转与
// focus 落定经它刷新;贴底态由 auto-follow 接管,无需快照。
- const refreshViewportAnchor = useCallback((): ViewportTopSnapshot | null => {
+ const refreshViewportAnchor = useCallback((preserveAligned = false): ViewportTopSnapshot | null => {
+ const previous = lastViewportTopRef.current;
+ const container = scrollRef.current;
+ if (preserveAligned && previous && container) {
+ const target = previous.messageClientId
+ ? queryMessageElement(container, previous.messageClientId)
+ : findRenderItemElement(itemsRef.current, previous.viewportTopKey);
+ const rect = target?.getBoundingClientRect();
+ const viewport = container.getBoundingClientRect();
+ const offset = previous.messageClientId ? previous.messageOffset ?? 0 : previous.offset;
+ // Native anchoring also emits scroll events during prepend/size settling.
+ // An already aligned reading row must not be replaced by a new offscreen
+ // row whose content-visibility estimate temporarily crosses the top edge.
+ if (
+ rect && rect.height > 0 && rect.bottom > viewport.top && rect.top < viewport.bottom
+ && viewportAnchorCorrection(viewport.top, rect.top, offset) === 0
+ ) return previous;
+ }
const measured = measureViewportTop();
if (measured) lastViewportTopRef.current = measured;
return measured;
@@ -3812,7 +3831,7 @@ export function MessageStream({
(includeHeights = false) => {
// Do not overwrite the reading position with the temporary tail while loading it.
if (restoringRef.current && restoreLoadRef.current !== 'settled') return;
- const measured = refreshViewportAnchor();
+ const measured = refreshViewportAnchor(true);
if (!sessionId || !measured) return;
const items = itemsRef.current;
let itemHeights: SessionScrollSnapshot['itemHeights'];
@@ -4234,7 +4253,7 @@ export function MessageStream({
if (chipJumpGenerationRef.current !== null) return;
if (!programmaticScrollRef.current) return;
const generation = programmaticScrollGenerationRef.current;
- if (finishProgrammaticScroll(generation) === false) refreshViewportAnchor();
+ if (finishProgrammaticScroll(generation) === false) refreshViewportAnchor(true);
};
root.addEventListener('scrollend', onScrollEnd);
return () => root.removeEventListener('scrollend', onScrollEnd);
@@ -5020,7 +5039,9 @@ export function MessageStream({
const rebased: ViewportTopSnapshot = {
...snapshot,
viewportTopKey: recoveredKey,
- offset: 0,
+ // A prepended page can rename a surviving work group. Preserve its
+ // measured offset instead of treating it as a newly selected row.
+ offset: snapshot.offset,
...(recoverableMessageExists
? {
messageClientId: recoverableMessageClientId,
@@ -5030,7 +5051,7 @@ export function MessageStream({
};
lastViewportTopRef.current = rebased;
if (!windowAnchorLost && !programmaticScrollRef.current && !isLoadingMore) {
- restoreViewportSnapshot(rebased, 0);
+ restoreViewportSnapshot(rebased);
}
}
if (!windowAnchorLost && !programmaticScrollRef.current && !isLoadingMore) return;
@@ -5797,7 +5818,7 @@ export function MessageStream({
>
<div
ref={contentRef}
- className="mx-auto w-full pt-7"
+ className="relative mx-auto w-full pt-7"
style={{
paddingBottom: resolvedBottomPadding,
// Match the input overlay's width so chat content + input box
@@ -5807,9 +5828,10 @@ export function MessageStream({
}}
>
{historyLoaded && historyCleared && <HistoryClearedMarker />}
- {/* F-SYNC-2: Loading spinner at top */}
+ {/* Keep pagination feedback inside the existing top padding so
+ toggling it never changes message positions or scrollHeight. */}
{isLoadingMore && (
- <div className="flex items-center justify-center pb-4">
+ <div className="pointer-events-none absolute inset-x-0 top-1 flex items-center justify-center">
<Spinner size={20} className="text-[var(--msg-tool-text)]" />
</div>
)}
diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.ts
index ddd3dabf00..c5cae64e1a 100644
--- a/apps/desktop/src/renderer/lib/makerChatStore.ts
+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts
@@ -10966,7 +10966,7 @@ function createRemoteHistoryView(sessionId: string) {
mergeMessages(available, state.messages.filter((message) => !message.cacheHydrated), { addOnly: true }),
new Set(available.filter((message) => message.role === 'user').map((message) => message.clientId)),
),
- hasMoreMessages: snapshot.hasMore, isLoadingMore: snapshot.loading,
+ hasMoreMessages: snapshot.hasMore, isLoadingMore: view.isLoadingOlder(),
oldestMessageId: snapshot.nextCursor,
historyWindowHasIsland: false,
}));
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index f0b67ba142..819a58dd33 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -9364,7 +9364,7 @@ export default function SessionScreen() {
itemsStructureKey={messageListStructureKey}
pendingSend={pendingSendActions}
getSentImagePreview={getSentImagePreview}
- loadingEarlier={historyView.snapshot.ready ? historyView.snapshot.loading : loadingEarlier}
+ loadingEarlier={historyView.snapshot.ready ? historyView.view.isLoadingOlder() : loadingEarlier}
loadEarlierProgressKey={oldestLoadedMessageCursor}
onCopyMessageLink={copyMessageLink}
onAddMessageToComposer={canUseComposer ? addMessageToComposer : undefined}
diff --git a/packages/maker-shared/src/__tests__/historyViewLoading.test.ts b/packages/maker-shared/src/__tests__/historyViewLoading.test.ts
new file mode 100644
index 0000000000..1d5dcc86e4
--- /dev/null
+++ b/packages/maker-shared/src/__tests__/historyViewLoading.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it, vi } from 'vitest';
+import { HistoryViewController } from '../historyViewController.js';
+import type { HistoryMessageSource, HistoryViewPage } from '../historyView.js';
+
+const page: HistoryViewPage<HistoryMessageSource> = {
+ version: 1, items: [], hasMore: true, nextCursor: 'older',
+};
+
+function fixture() {
+ const transport = { page: vi.fn(async () => page), details: vi.fn(), expanded: vi.fn(async () => undefined) };
+ const view = new HistoryViewController(transport);
+ return { view, transport };
+}
+
+describe('history pagination feedback', () => {
+ it('keeps initial and repeated background reads silent, including a queued older page', async () => {
+ const { view, transport } = fixture();
+ const feedback: boolean[] = [];
+ view.subscribe(() => feedback.push(view.isLoadingOlder()));
+ await view.refresh();
+ for (let index = 0; index < 3; index++) await view.refresh();
+ expect(feedback.every((loading) => !loading)).toBe(true);
+
+ let finish!: (value: typeof page) => void;
+ transport.page.mockImplementationOnce(() => new Promise((resolve) => { finish = resolve; }));
+ const refresh = view.refresh();
+ const older = view.refresh(true);
+ expect(view.getSnapshot().loading).toBe(true);
+ expect(view.isLoadingOlder()).toBe(false);
+ finish(page);
+ await refresh; await older;
+ expect(feedback.slice(-4)).toEqual([false, false, true, false]);
+ expect(transport.page).toHaveBeenLastCalledWith('older');
+ });
+
+ it.each(['failure', 'offline', 'blur', 'reset'] as const)('clears pagination feedback after %s', async (end) => {
+ const { view, transport } = fixture();
+ await view.refresh();
+ let finish!: (value: typeof page) => void;
+ let fail!: (error: Error) => void;
+ transport.page.mockImplementationOnce(() => new Promise((resolve, reject) => { finish = resolve; fail = reject; }));
+ const older = view.refresh(true);
+ expect(view.isLoadingOlder()).toBe(true);
+ if (end === 'failure') fail(new Error('unavailable'));
+ else {
+ if (end === 'offline') view.setNetworkAvailable(false);
+ if (end === 'blur') view.setActive(false);
+ if (end === 'reset') view.reset();
+ expect(view.isLoadingOlder()).toBe(false);
+ finish(page);
+ }
+ await older;
+ expect(view.isLoadingOlder()).toBe(false);
+ });
+});
diff --git a/packages/maker-shared/src/historyViewController.ts b/packages/maker-shared/src/historyViewController.ts
index 70de136545..8a2fb8102b 100644
--- a/packages/maker-shared/src/historyViewController.ts
+++ b/packages/maker-shared/src/historyViewController.ts
@@ -71,6 +71,8 @@ export class HistoryViewController<T extends HistoryMessageSource> {
if (available && this.active) void this.refresh();
}
getSnapshot = (): HistoryViewSnapshot<T> => this.state;
+ /** Pagination feedback only; background validation must not disturb the reading viewport. */
+ isLoadingOlder = (): boolean => this.state.loading && this.pageOlder;
subscribe = (listener: () => void): (() => void) => {
this.listeners.add(listener);
return () => this.listeners.delete(listener);