Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): stop the message list bouncing after switching to a running task
MagicLizic8bad8029e40
diff --git a/apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx b/apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsxindex cde19c3e5a..bda14deb07 100644--- a/apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx+++ b/apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx@@ -18,8 +18,9 @@ import { FileTypeIcon } from '@/components/ui/file-type-icon';* 存在性门槛(DESIGN.md §14.5「可点必存在」):本地会话渲染前 stat 过滤,不存在* 的文件不出 chip,整卡为空则不渲染。远程会话经 verifyRemotePathCached 远端 stat* 复核:仅在远端明确确认是普通文件后呈现;检查中、断链或限流都不先展示一张- * 可能无法打开的完成卡。首屏等检查完成再出现。流式期间只 stat 已完成- * (ready !== false,或本轮已封口)且尚未确认的路径;内容指纹不变就不发 IPC,+ * 可能无法打开的完成卡。首屏等检查完成再出现;本机路径若本次运行已 stat 过,重挂载时+ * 按当前时间窗同步判定先出卡,再整卡复核(见 seedLocalGeneratedFilesFromStatCache)。+ * 流式期间只 stat 已完成(ready !== false,或本轮已封口)且尚未确认的路径;内容指纹不变就不发 IPC,* 已确认的 chip 留在原地,避免 messages 换引用把整页带着跳。** 本地文件统一要求时间戳落在本轮 `[turnStartMs, turnEndMs)` 窗口内。tool 来源@@ -469,6 +470,46 @@ interface GeneratedFileStat {mtimeMs?: number;}+/**+ * 本机最近一次 stat 结果(按绝对路径,有界)。卡片的 React 标识取本轮首条消息:运行中的+ * 长轮次往上补历史时首条消息会变,切换任务也会整卡重挂载。新实例若从空白开始等 IPC,+ * 贴底的消息区会先被拉下一截再弹回。挂载时用这里的 stat 按**当前**轮次时间窗同步判定,+ * 判定口径与异步复核完全相同;首个 effect 仍会对全部候选重新 stat。远程会话不走这里,+ * 渲染态以 remoteFileOpen 的结论缓存为唯一来源。+ */+const LOCAL_STAT_CACHE_LIMIT = 500;+const localGeneratedFileStatCache = new Map<string, GeneratedFileStat>();++function rememberLocalGeneratedFileStat(path: string, stat: GeneratedFileStat | null): void {+ localGeneratedFileStatCache.delete(path);+ if (!stat) return;+ localGeneratedFileStatCache.set(path, stat);+ if (localGeneratedFileStatCache.size > LOCAL_STAT_CACHE_LIMIT) {+ const oldest = localGeneratedFileStatCache.keys().next().value;+ if (oldest !== undefined) localGeneratedFileStatCache.delete(oldest);+ }+}++/** 用已缓存的本机 stat 立即得出首屏可见文件;没有任何可确认的文件时保持 null。 */+export function seedLocalGeneratedFilesFromStatCache(+ files: readonly GeneratedFileRef[],+ turnStartMs: number | null,+ turnEndMs: number | null,+ turnSealed = false,+): GeneratedFileRef[] | null {+ const seeded = files.filter((file) => {+ if (!isGeneratedFileStatable(file, turnEndMs, turnSealed)) return false;+ const stat = localGeneratedFileStatCache.get(file.path);+ return stat !== undefined && isLocalGeneratedFileInTurn(file, stat, turnStartMs, turnEndMs);+ });+ return seeded.length > 0 ? seeded : null;+}++/** Test-only reset for the module-level stat cache. */+export function _clearLocalGeneratedFileStatCache(): void {+ localGeneratedFileStatCache.clear();+}+/*** 本地文件是否有足够证据归属于该 turn。普通文件工具必须有真实创建时间;* 只有文档工具的结构化 ok:true 结果能证明 overwrite 是本轮成功交付,此时@@ -711,16 +752,24 @@ export const GeneratedFilesCard = memo(function GeneratedFilesCard({const { t } = useTranslation();const fileCtx = useChatSessionFile();const remoteOrigin = isRemoteFileOrigin(fileCtx.origin) ? fileCtx.origin : null;- // 首屏保持 null。之后按内容指纹增量 stat:未完成的 tool_use 不查,- // 已确认的路径不重复 IPC,工作目录 / 远端来源变了才整卡重来。- const [existing, setExisting] = useState<GeneratedFileRef[] | null>(null);+ // 首屏保持 null(本机已 stat 过的路径例外,见 seedLocalGeneratedFilesFromStatCache)。+ // 之后按内容指纹增量 stat:未完成的 tool_use 不查,已确认的路径不重复 IPC,+ // 工作目录 / 远端来源变了才整卡重来。+ const [initialVisible] = useState(() =>+ remoteOrigin+ ? null+ : seedLocalGeneratedFilesFromStatCache(files, turnStartMs, turnEndMs, turnSealed),+ );+ const [existing, setExisting] = useState<GeneratedFileRef[] | null>(initialVisible);const [expanded, setExpanded] = useState(false);const [relatedExpanded, setRelatedExpanded] = useState(false);const [remoteVerdictGen, setRemoteVerdictGen] = useState(0);const checkKey = generatedFilesCheckKey(files, turnStartMs, turnEndMs, turnSealed);const filesRef = useRef(files);filesRef.current = files;- const visibleRef = useRef<GeneratedFileRef[] | null>(null);+ const visibleRef = useRef<GeneratedFileRef[] | null>(initialVisible);+ // 首屏来自缓存的结论仍要整卡复核一次:缓存只负责不留空白帧,不替代本次 stat。+ const seededRef = useRef(initialVisible !== null);const checkEnvRef = useRef({ remoteOrigin, workingDir: fileCtx.workingDir });const turnWindowRef = useRef({ turnStartMs, turnEndMs, turnSealed });const remoteVerdictGenRef = useRef(remoteVerdictGen);@@ -761,7 +810,8 @@ export const GeneratedFilesCard = memo(function GeneratedFilesCard({turnWindowRef.current.turnStartMs !== turnStartMs ||turnWindowRef.current.turnEndMs !== turnEndMs ||turnWindowRef.current.turnSealed !== turnSealed;- const forceRestat = remoteVerdictGenRef.current !== remoteVerdictGen;+ const forceRestat = remoteVerdictGenRef.current !== remoteVerdictGen || seededRef.current;+ seededRef.current = false;checkEnvRef.current = { remoteOrigin, workingDir: fileCtx.workingDir };turnWindowRef.current = { turnStartMs, turnEndMs, turnSealed };remoteVerdictGenRef.current = remoteVerdictGen;@@ -821,8 +871,10 @@ export const GeneratedFilesCard = memo(function GeneratedFilesCard({toStat.map(async (file) => {try {const stat = await window.electronAPI.fsBrowse.statPath(file.path);+ rememberLocalGeneratedFileStat(file.path, stat);return isLocalGeneratedFileInTurn(file, stat, turnStartMs, turnEndMs);} catch {+ rememberLocalGeneratedFileStat(file.path, null);return false;}}),diff --git a/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx b/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsxindex af716c736b..2e9592cdb6 100644--- a/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx+++ b/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx@@ -277,7 +277,10 @@ export function WorkGroupBlock({: (deferred?.expanded ?? rememberedExpanded);const deferredRef = useRef(deferred);deferredRef.current = deferred;- useEffect(() => {+ // Register before paint. Switching back to a running task remounts this group;+ // a passive effect can lag 50–300ms behind the stream's mount, showing a+ // preview-less header until the cached tail reappears and the pinned list jumps.+ useLayoutEffect(() => {const current = deferredRef.current;current?.setVisible?.(expanded, !compact && isStreaming);return () => current?.setVisible?.(false, false);diff --git a/apps/desktop/src/renderer/components/chat/__tests__/GeneratedFilesCard.localSeed.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/GeneratedFilesCard.localSeed.test.tsxnew file mode 100644index 0000000000..7696bddd2f--- /dev/null+++ b/apps/desktop/src/renderer/components/chat/__tests__/GeneratedFilesCard.localSeed.test.tsx@@ -0,0 +1,153 @@+// @vitest-environment jsdom+import { cleanup, render, screen, waitFor } from '@testing-library/react';+import { afterEach, describe, expect, it, vi } from 'vitest';+import { ChatSessionFileProvider } from '../ChatSessionFileContext';+import {+ _clearLocalGeneratedFileStatCache,+ GeneratedFilesCard,+ seedLocalGeneratedFilesFromStatCache,+} from '../GeneratedFilesCard';+import type { GeneratedFileRef } from '@/lib/generatedFiles';++vi.mock('../useFileChipContextMenu', () => ({+ useFileChipContextMenu: () => ({ menu: null, onContextMenu: vi.fn() }),+}));+vi.mock('react-i18next', async (importOriginal) => ({+ ...(await importOriginal<typeof import('react-i18next')>()),+ useTranslation: () => ({ t: (key: string) => key }),+}));++const START = 1_000_000;+const report: GeneratedFileRef = {+ path: 'C:\\work\\report.md',+ name: 'report.md',+ source: 'tool',+ ready: true,+};++function stubStat(statPath: ReturnType<typeof vi.fn>) {+ Object.defineProperty(window, 'electronAPI', {+ configurable: true,+ value: { fsBrowse: { statPath } },+ });+}++function renderCard(props: {+ renderItemKey: string;+ turnStartMs: number;+ turnEndMs?: number | null;+}) {+ return render(+ <ChatSessionFileProvider+ value={{ sessionId: 'local-task', workingDir: 'C:\\work', origin: { kind: 'local' } }}+ >+ <GeneratedFilesCard+ renderItemKey={props.renderItemKey}+ files={[report]}+ turnStartMs={props.turnStartMs}+ turnEndMs={props.turnEndMs ?? null}+ />+ </ChatSessionFileProvider>,+ );+}++afterEach(() => {+ cleanup();+ _clearLocalGeneratedFileStatCache();+ vi.unstubAllGlobals();+});++describe('local generated files remount', () => {+ it('keeps the first paint empty until a path has been checked once', async () => {+ const statPath = vi+ .fn()+ .mockResolvedValue({ kind: 'file', birthtimeMs: START + 5_000, mtimeMs: START + 5_000 });+ stubStat(statPath);+ renderCard({ renderItemKey: 'genfiles-a', turnStartMs: START });+ expect(screen.queryByText('report.md')).toBeNull();+ await waitFor(() => expect(screen.getByText('report.md')).toBeTruthy());+ });++ it('renders a remounted card immediately when an earlier history page moves the turn start', async () => {+ const statPath = vi+ .fn()+ .mockResolvedValue({ kind: 'file', birthtimeMs: START + 5_000, mtimeMs: START + 5_000 });+ stubStat(statPath);+ const first = renderCard({ renderItemKey: 'genfiles-a', turnStartMs: START });+ await waitFor(() => expect(screen.getByText('report.md')).toBeTruthy());+ first.unmount();++ // Prepending older rows of the same open turn changes its key and widens the window.+ renderCard({ renderItemKey: 'genfiles-older', turnStartMs: START - 60_000 });+ expect(screen.getByText('report.md')).toBeTruthy();+ // The cached conclusion only bridges the paint; the new instance still re-checks.+ await waitFor(() => expect(statPath).toHaveBeenCalledTimes(2));+ });++ it('removes a seeded chip when the re-check finds the file gone', async () => {+ const statPath = vi+ .fn()+ .mockResolvedValueOnce({ kind: 'file', birthtimeMs: START + 5_000, mtimeMs: START + 5_000 })+ .mockResolvedValueOnce({ kind: 'missing' });+ stubStat(statPath);+ const first = renderCard({ renderItemKey: 'genfiles-a', turnStartMs: START });+ await waitFor(() => expect(screen.getByText('report.md')).toBeTruthy());+ first.unmount();++ renderCard({ renderItemKey: 'genfiles-a', turnStartMs: START });+ expect(screen.getByText('report.md')).toBeTruthy();+ await waitFor(() => expect(screen.queryByText('report.md')).toBeNull());+ });++ it('applies the current turn window to cached stats', async () => {+ const statPath = vi+ .fn()+ .mockResolvedValue({ kind: 'file', birthtimeMs: START + 5_000, mtimeMs: START + 5_000 });+ stubStat(statPath);+ const first = renderCard({+ renderItemKey: 'genfiles-a',+ turnStartMs: START,+ turnEndMs: START + 60_000,+ });+ await waitFor(() => expect(screen.getByText('report.md')).toBeTruthy());+ first.unmount();++ // A later turn that touches the same path must not inherit the earlier turn's file.+ expect(seedLocalGeneratedFilesFromStatCache([report], START + 120_000, null)).toBeNull();+ expect(seedLocalGeneratedFilesFromStatCache([report], START - 60_000, START + 60_000)).toEqual([+ report,+ ]);+ });++ it('does not seed from local stats for remote sessions', async () => {+ const statPath = vi+ .fn()+ .mockResolvedValue({ kind: 'file', birthtimeMs: START + 5_000, mtimeMs: START + 5_000 });+ const chatStat = vi.fn(() => new Promise(() => {}));+ Object.defineProperty(window, 'electronAPI', {+ configurable: true,+ value: { fsBrowse: { statPath }, fileBrowser: { chatStat } },+ });+ const first = renderCard({ renderItemKey: 'genfiles-a', turnStartMs: START });+ await waitFor(() => expect(screen.getByText('report.md')).toBeTruthy());+ first.unmount();++ render(+ <ChatSessionFileProvider+ value={{+ sessionId: 'remote-task',+ workingDir: 'C:\\work',+ origin: { kind: 'device', deviceId: 'host' },+ }}+ >+ <GeneratedFilesCard+ renderItemKey="genfiles-a"+ files={[report]}+ turnStartMs={START}+ turnEndMs={null}+ />+ </ChatSessionFileProvider>,+ );+ expect(screen.queryByText('report.md')).toBeNull();+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsxindex de20803693..ecff61fc16 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx@@ -105,10 +105,7 @@ import {readSendFollowCancelGeneration,tryRequestFollowLatest,} from '@/components/chat/autoFollowIntent';-import {- getMessageStreamIndicatorResizeTargets,- measureMessageStreamIndicatorClearanceOffset,-} from '@/components/chat/messageStreamIndicatorPosition';+import { useComposerOverlayMetrics } from './useComposerOverlayMetrics';import { ShareSelectionBar } from '@/components/chat/ShareSelectionBar';import {shareSelectionStore,@@ -1496,10 +1493,7 @@ export function CCAgentSessionView({const overlayRef = useCallback((node: HTMLDivElement | null) => {setOverlayEl(node);}, []);- const [overlayHeight, setOverlayHeight] = useState(200);- const [bottomCenterClearanceOffset, setBottomCenterClearanceOffset] = useState<- number | undefined- >(undefined);+ const { overlayHeight, bottomCenterClearanceOffset } = useComposerOverlayMetrics(overlayEl);const [inlinePlanVisibilityState, setInlinePlanVisibilityState] = useState<{sessionId: string | undefined;value: InlinePlanVisibility | null;@@ -1525,42 +1519,6 @@ export function CCAgentSessionView({[sessionId],);- useEffect(() => {- if (!overlayEl) return;- const measureOverlay = () => {- // 状态行会动态出现 / 收起,overlay 总高度不等于底部中央控件的避让边界。- // 空中央行仍以 composer 栈为锚;步骤 / 接管胶囊在场时改取中央组顶边,- // 让消息流悬浮按钮与它们纵向成栈,而不是共享同一块 32px 区域。- setOverlayHeight(overlayEl.offsetHeight);- setBottomCenterClearanceOffset(measureMessageStreamIndicatorClearanceOffset(overlayEl));- };- const ro = new ResizeObserver(measureOverlay);- let observedTargets = new Set<HTMLElement>();- const syncResizeTargetsAndMeasure = () => {- const nextTargets = new Set(getMessageStreamIndicatorResizeTargets(overlayEl));- for (const target of observedTargets) {- if (!nextTargets.has(target)) ro.unobserve(target);- }- for (const target of nextTargets) {- if (!observedTargets.has(target)) ro.observe(target);- }- observedTargets = nextTargets;- measureOverlay();- };-- // Seed with the current geometry so the first paint after remount does not- // reuse stale state. The plan flyout is absolutely positioned and mounts- // only on hover/click, so its insertion does not resize the center group;- // resync observed targets whenever that subtree changes.- syncResizeTargetsAndMeasure();- const mutationObserver = new MutationObserver(syncResizeTargetsAndMeasure);- mutationObserver.observe(overlayEl, { childList: true, subtree: true });- return () => {- mutationObserver.disconnect();- ro.disconnect();- };- }, [overlayEl]);-// F-FP-5: 点击 workingDir → 在系统文件管理器里直接打开目录(复用 shell:open-path IPC)。// local only:remote session 的 chip 仅作展示,不响应点击(见下方 remoteHostId 早返 +// 渲染处的条件 onClick)。diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/useComposerOverlayMetrics.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/useComposerOverlayMetrics.test.tsxnew file mode 100644index 0000000000..bec316307b--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/useComposerOverlayMetrics.test.tsx@@ -0,0 +1,77 @@+// @vitest-environment jsdom+import { cleanup, render } from '@testing-library/react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import { useComposerOverlayMetrics } from '../useComposerOverlayMetrics';++type ActGlobal = typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };++let resizeCallbacks: Array<() => void> = [];+let overlayHeight = 236;+let renders = 0;+let latest: ReturnType<typeof useComposerOverlayMetrics> | null = null;+let previousActEnvironment: boolean | undefined;++function makeOverlay(): HTMLDivElement {+ const overlay = document.createElement('div');+ Object.defineProperty(overlay, 'offsetHeight', { configurable: true, get: () => overlayHeight });+ document.body.append(overlay);+ return overlay;+}++function Probe({ overlay }: { overlay: HTMLElement }) {+ renders += 1;+ latest = useComposerOverlayMetrics(overlay);+ return null;+}++beforeEach(() => {+ resizeCallbacks = [];+ overlayHeight = 236;+ renders = 0;+ latest = null;+ vi.stubGlobal(+ 'ResizeObserver',+ class {+ constructor(callback: () => void) {+ resizeCallbacks.push(callback);+ }+ observe() {}+ unobserve() {}+ disconnect() {}+ },+ );+ // Observer callbacks run outside act in the app; model the real runtime scheduling.+ previousActEnvironment = (globalThis as ActGlobal).IS_REACT_ACT_ENVIRONMENT;+});++afterEach(() => {+ (globalThis as ActGlobal).IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;+ cleanup();+ document.body.innerHTML = '';+ vi.unstubAllGlobals();+});++describe('useComposerOverlayMetrics', () => {+ it('uses the measured overlay height on the first commit', () => {+ render(<Probe overlay={makeOverlay()} />);+ expect(latest?.overlayHeight).toBe(236);+ });++ it('commits a resized overlay inside the observer callback, before the next paint', () => {+ render(<Probe overlay={makeOverlay()} />);+ (globalThis as ActGlobal).IS_REACT_ACT_ENVIRONMENT = false;+ // The running-status row appears: the overlay grows by one row.+ overlayHeight = 272;+ for (const callback of resizeCallbacks) callback();+ expect(latest?.overlayHeight).toBe(272);+ });++ it('does not re-render when the observed size is unchanged', () => {+ render(<Probe overlay={makeOverlay()} />);+ (globalThis as ActGlobal).IS_REACT_ACT_ENVIRONMENT = false;+ const before = renders;+ for (const callback of resizeCallbacks) callback();+ expect(renders).toBe(before);+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/useComposerOverlayMetrics.ts b/apps/desktop/src/renderer/features/cc-agent/useComposerOverlayMetrics.tsnew file mode 100644index 0000000000..c2429fc251--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/useComposerOverlayMetrics.ts@@ -0,0 +1,92 @@+import { useLayoutEffect, useState } from 'react';+import { flushSync } from 'react-dom';++import {+ getMessageStreamIndicatorResizeTargets,+ measureMessageStreamIndicatorClearanceOffset,+} from '@/components/chat/messageStreamIndicatorPosition';++export interface ComposerOverlayMetrics {+ /** Feeds MessageStream bottomPadding. */+ overlayHeight: number;+ /** Bottom-center clearance for the stream's floating indicators. */+ bottomCenterClearanceOffset: number | undefined;+}++const INITIAL_METRICS: ComposerOverlayMetrics = {+ overlayHeight: 200,+ bottomCenterClearanceOffset: undefined,+};++/**+ * 实测输入区 overlay 的高度与底部中央避让边界。+ *+ * 运行状态行、步骤 / 接管胶囊、多行输入都会让 overlay 变高变矮;新值必须与 overlay 的+ * 尺寸变化同帧提交给消息流。默认优先级的 setState 在切换任务时会排在整列消息的挂载+ * 之后,晚 50–150ms 才生效:贴底的消息先被输入区盖住一截,再整体平移(2026-10-08+ * 实录)。所以观察回调里用 flushSync 提交,并且只在数值真的变化时提交——输入框打字+ * 引起的 DOM 变动不会因此多渲染。+ */+export function useComposerOverlayMetrics(overlayEl: HTMLElement | null): ComposerOverlayMetrics {+ const [metrics, setMetrics] = useState(INITIAL_METRICS);++ // Layout effect: the first paint after the overlay node attaches already uses its geometry.+ useLayoutEffect(() => {+ if (!overlayEl) return;+ let last: ComposerOverlayMetrics | null = null;+ const measure = (sync: boolean) => {+ // 状态行会动态出现 / 收起,overlay 总高度不等于底部中央控件的避让边界。+ // 空中央行仍以 composer 栈为锚;步骤 / 接管胶囊在场时改取中央组顶边,+ // 让消息流悬浮按钮与它们纵向成栈,而不是共享同一块 32px 区域。+ const next: ComposerOverlayMetrics = {+ overlayHeight: overlayEl.offsetHeight,+ bottomCenterClearanceOffset: measureMessageStreamIndicatorClearanceOffset(overlayEl),+ };+ if (+ last &&+ last.overlayHeight === next.overlayHeight &&+ last.bottomCenterClearanceOffset === next.bottomCenterClearanceOffset+ ) {+ return;+ }+ last = next;+ const apply = () =>+ setMetrics((previous) =>+ previous.overlayHeight === next.overlayHeight &&+ previous.bottomCenterClearanceOffset === next.bottomCenterClearanceOffset+ ? previous+ : next,+ );+ // Observer callbacks run outside React work, before the browser paints this frame.+ if (sync) flushSync(apply);+ else apply();+ };+ const ro = new ResizeObserver(() => measure(true));+ let observedTargets = new Set<HTMLElement>();+ const syncResizeTargetsAndMeasure = (sync: boolean) => {+ const nextTargets = new Set(getMessageStreamIndicatorResizeTargets(overlayEl));+ for (const target of observedTargets) {+ if (!nextTargets.has(target)) ro.unobserve(target);+ }+ for (const target of nextTargets) {+ if (!observedTargets.has(target)) ro.observe(target);+ }+ observedTargets = nextTargets;+ measure(sync);+ };++ // Seed with the current geometry so the first paint after remount does not+ // reuse stale state. The plan flyout is absolutely positioned and mounts+ // only on hover/click, so its insertion does not resize the center group;+ // resync observed targets whenever that subtree changes.+ syncResizeTargetsAndMeasure(false);+ const mutationObserver = new MutationObserver(() => syncResizeTargetsAndMeasure(true));+ mutationObserver.observe(overlayEl, { childList: true, subtree: true });+ return () => {+ mutationObserver.disconnect();+ ro.disconnect();+ };+ }, [overlayEl]);++ return metrics;+}diff --git a/packages/maker-shared/src/__tests__/historyView.test.ts b/packages/maker-shared/src/__tests__/historyView.test.tsindex 87125bd7ef..f99c8e39fc 100644--- a/packages/maker-shared/src/__tests__/historyView.test.ts+++ b/packages/maker-shared/src/__tests__/historyView.test.ts@@ -624,6 +624,31 @@ describe('locating folded history preserves display expansion', () => {view.setActive(false);});+ it('keeps the previous running preview window while its advanced tail is still loading', async () => {+ const rows = Array.from({ length: 8 }, (_, i) => row(i + 1, 'thinking', `detail-${i}`));+ const items = projectHistoryView(rows, true);+ if (items[0].type !== 'work') throw new Error('missing work');+ const summary = items[0].summary;+ // Three new activities moved the latest-five preview from rows[0..4] to rows[3..7].+ summary.preview = { ...summary, key: 'preview', firstMessageId: rows[3].id, lastMessageId: rows[7].id };+ const view = new HistoryViewController<HistoryMessageSource>({+ page: async () => ({ version: 1, items, hasMore: false, nextCursor: null }),+ details: () => new Promise(() => {}),+ expanded: async () => undefined,+ });+ await view.refresh();+ view.setExpanded('preview', true);+ const snapshot = view.getSnapshot();+ const details = new Map(snapshot.details);+ details.set('preview', { messages: rows.slice(0, 5), revision: 'previous', lastMessageId: rows[4].id,+ loading: true, complete: false, error: null });+ const rendered = renderHistoryView({ view, snapshot: { ...snapshot, details }, liveMessages: [], streaming: true,+ build: messages => messages.map(message => message.clientId), structure: ungroupedStructure });+ // Not the two-row overlap [rows[3], rows[4]]: the live list keeps its height until the read lands.+ expect(rendered).toEqual(rows.slice(0, 5).map(message => message.clientId));+ view.setActive(false);+ });+it('does not replace a located complete range with an in-flight partial expansion', async () => {const rows = [row(1, 'thinking', 'one'), row(2, 'thinking', 'two')];const items = projectHistoryView(rows, false);diff --git a/packages/maker-shared/src/historyViewRender.ts b/packages/maker-shared/src/historyViewRender.tsindex 98490b07fb..e79084f00c 100644--- a/packages/maker-shared/src/historyViewRender.ts+++ b/packages/maker-shared/src/historyViewRender.ts@@ -69,9 +69,14 @@ export function renderHistoryView<T extends HistoryMessageSource, TItem>(options|| (id.startsWith('history-live:') && row.clientId === id.slice('history-live:'.length));const first = cached.findIndex((row) => matchesReference(row, range.firstMessageId));const last = cached.findIndex((row) => matchesReference(row, range.lastMessageId));+ // A running preview is a sliding tail: new activities move both endpoints+ // past the cached window. Until that tail is read, keep showing the previous+ // window — a partial slice would collapse the live list for one read and+ // shift a bottom-pinned stream up and down.+ const slidingPreview = preview && last < 0 && cached.length > 0;// A visible result can split a previously cached range. Retain only this// reference's prefix while its replacement pages are being fetched.- const body = (first < 0 ? [] : cached.slice(first, last < first ? undefined : last + 1))+ const body = (slidingPreview ? cached : first < 0 ? [] : cached.slice(first, last < first ? undefined : last + 1)).filter((row) => !sourceIds.has(row.clientId));const placeholder = structure.placeholder(summary);if (!body.some((row) => row.clientId === placeholder.clientId)) {