@nextclaw/ui 0.20.2 → 0.20.3

package/src/features/chat/components/layout/chat-page-shell.tsx

@@ -8,6 +8,7 @@ import { useViewportLayout } from "@/app/hooks/use-viewport-layout";
 import { ChatMobileShell } from "@/platforms/mobile";
 import { InboxPage } from "@/features/inbox";
 import { PanelAppMainPage } from "@/features/panel-apps";
+import { useScrollRestoration } from "@/shared/hooks/use-scroll-restoration";
 export type MainPanelView = "chat" | "cron" | "skills" | "agents" | "inbox" | "panel-app";
 export type ChatPageProps = {
   view: MainPanelView;
@@ -36,6 +37,14 @@ type ChatPageLayoutProps = {
 };
 export function ChatPageLayout({ view, confirmDialog }: ChatPageLayoutProps) {
   const { isMobile } = useViewportLayout();
+  const cronScroll = useScrollRestoration<HTMLDivElement>({
+    restorationKey: "main-page:cron",
+  });
+  const agentsScroll = useScrollRestoration<HTMLDivElement>({
+    restorationKey: "main-page:agents",
+  });
+  const { onScroll: onCronScroll, scrollRef: cronScrollRef } = cronScroll;
+  const { onScroll: onAgentsScroll, scrollRef: agentsScrollRef } = agentsScroll;
 
   return (
     <div className="h-full flex">
@@ -52,13 +61,21 @@ export function ChatPageLayout({ view, confirmDialog }: ChatPageLayoutProps) {
           ) : view === "panel-app" ? (
             <PanelAppMainPage />
           ) : view === "cron" ? (
-            <div className="h-full overflow-auto custom-scrollbar">
+            <div
+              ref={cronScrollRef}
+              onScroll={onCronScroll}
+              className="h-full overflow-auto custom-scrollbar"
+            >
               <div className={`mx-auto w-full px-4 py-4 sm:px-6 sm:py-5 ${MANAGEMENT_PAGE_CANVAS_WIDTH_CLASS}`}>
                 <CronConfig />
               </div>
             </div>
           ) : view === "agents" ? (
-            <div className="h-full overflow-auto custom-scrollbar">
+            <div
+              ref={agentsScrollRef}
+              onScroll={onAgentsScroll}
+              className="h-full overflow-auto custom-scrollbar"
+            >
               <div className={`mx-auto w-full px-4 py-4 sm:px-6 sm:py-5 ${MANAGEMENT_PAGE_CANVAS_WIDTH_CLASS}`}>
                 <AgentsPage />
               </div>

package/src/features/chat/components/layout/chat-sidebar-desktop-layout.tsx

@@ -28,6 +28,7 @@ import { ChatSidebarUtilityMenu } from "@/features/chat/components/layout/chat-s
 import { PanelAppMainSidebarNav } from "@/features/panel-apps";
 import { isWindowsDesktopHost } from "@/platforms/desktop";
 import { viewportLayoutManager } from "@/app/managers/viewport-layout.manager";
+import { useScrollRestoration } from "@/shared/hooks/use-scroll-restoration";
 import {
   SIDEBAR_RAIL_CONTROL_CLASS,
   SIDEBAR_RAIL_ICON_CLASS,
@@ -154,6 +155,7 @@ export function ChatSidebarSessionArea({
   isLoading,
   isProjectFirstView,
   onAddProject,
+  onScrollNearEnd = () => undefined,
   onSelectMode,
   projectGroups,
   projectCronJobCountByRoot,
@@ -166,6 +168,7 @@ export function ChatSidebarSessionArea({
   isLoading: boolean;
   isProjectFirstView: boolean;
   onAddProject: () => void;
+  onScrollNearEnd?: () => void;
   onSelectMode: (mode: "time-first" | "project-first") => void;
   projectGroups: ReturnType<typeof groupSessionsByProject>;
   projectCronJobCountByRoot: ReadonlyMap<string, number>;
@@ -174,6 +177,11 @@ export function ChatSidebarSessionArea({
     typeof ChatSidebarSessionList
   >[0]["sessionTypeOptions"];
 }) {
+  const scrollRestoration = useScrollRestoration<HTMLDivElement>({
+    restorationKey: "chat-sidebar:sessions",
+    isEnabled: !isCollapsed,
+  });
+  const { onScroll: onScrollPositionSave, scrollRef } = scrollRestoration;
   if (isCollapsed) {
     return <div className="min-h-0 flex-1" aria-hidden="true" />;
   }
@@ -196,6 +204,14 @@ export function ChatSidebarSessionArea({
       </div>
 
       <div
+        ref={scrollRef}
+        onScroll={(event) => {
+          onScrollPositionSave(event);
+          const element = event.currentTarget;
+          if (element.scrollHeight - element.scrollTop - element.clientHeight < 600) {
+            onScrollNearEnd();
+          }
+        }}
         className={cn(
           "custom-scrollbar min-h-0 flex-1 overflow-y-auto px-3 pb-4 pt-1",
           SCROLL_BOTTOM_EDGE_FADE_CLASS,

package/src/features/chat/components/layout/chat-sidebar.tsx

@@ -120,7 +120,7 @@ export function ChatSidebar({
   const projectsQuery = useProjects();
   const projectCreateMutation = useCreateProject();
   const projectAddExistingMutation = useAddExistingProject();
-  const { allItems, isLoading, items } = useNcpSessionListView();
+  const { allItems, hasMore, isLoading, isLoadingMore, items, loadMore } = useNcpSessionListView();
   const { cronJobCountByProjectRoot, cronJobCountBySessionKey } =
     useChatSidebarContextCounts(allItems);
   const { language, setLanguage } = useI18n();
@@ -343,6 +343,9 @@ export function ChatSidebar({
         isLoading={isLoading}
         isProjectFirstView={isProjectFirstView}
         onAddProject={openProjectAdd}
+        onScrollNearEnd={() => {
+          if (hasMore && !isLoadingMore) void loadMore();
+        }}
         onSelectMode={presenter.chatSessionListManager.setListMode}
         projectGroups={projectGroups}
         projectCronJobCountByRoot={cronJobCountByProjectRoot}

package/src/features/chat/features/message/utils/__tests__/chat-message-timeline-compaction.utils.test.ts

@@ -169,7 +169,7 @@ describe("mid-run compaction timeline projection", () => {
     ]);
   });
 
-  it("does not silently clamp an invalid canonical part boundary", () => {
+  it("does not render a temporarily unavailable canonical part boundary as a standalone marker", () => {
     const invalidCompaction = createCompactionMessage({
       assistantId: visibleMessage.id,
       coveredPartCount: 2,
@@ -183,7 +183,7 @@ describe("mid-run compaction timeline projection", () => {
     expect(buildChatMessageTimelineItems({
       rawMessages: [visibleMessage, invalidCompaction],
       messages: [{ id: visibleMessage.id } as never],
-    }).map((item) => item.kind)).toEqual(["message", "compaction"]);
+    }).map((item) => item.kind)).toEqual(["message"]);
   });
 
   it("offsets a continued assistant compaction within its canonical message", () => {

package/src/features/chat/features/message/utils/chat-message-timeline.utils.ts

@@ -252,12 +252,12 @@ function projectVisibleChatMessageState(
       .forEach((placement) => {
         if (
           !Number.isSafeInteger(placement.boundaryIndex) ||
-          placement.boundaryIndex < 0 ||
-          placement.boundaryIndex > message.parts.length
+          placement.boundaryIndex < 0
         ) {
           inlineCompactionMessageIds.delete(placement.serviceMessageId);
           return;
         }
+        if (placement.boundaryIndex > message.parts.length) return;
         parts.splice(placement.boundaryIndex + insertedCount, 0, {
           type: "extension",
           extensionType: CONTEXT_COMPACTION_PART_EXTENSION_TYPE,

package/src/features/chat/features/ncp/hooks/__tests__/use-ncp-session-list-view.test.tsx

@@ -9,12 +9,20 @@ const mocks = vi.hoisted(() => ({
 }));
 
 vi.mock("@/features/chat/features/ncp/hooks/use-ncp-session-queries", () => ({
-  useNcpSessions: () => ({
+  useInfiniteNcpSessions: () => ({
     data: {
-      sessions: mocks.sessions,
-      total: mocks.sessions.length,
+      pages: [{
+        sessions: mocks.sessions,
+        total: mocks.sessions.length,
+        page: 1,
+        pageSize: 100,
+        hasMore: false,
+      }],
     },
     isLoading: false,
+    hasNextPage: false,
+    isFetchingNextPage: false,
+    fetchNextPage: vi.fn(),
   }),
 }));
 

package/src/features/chat/features/ncp/hooks/use-ncp-session-list-view.ts

@@ -1,9 +1,9 @@
-import { useMemo } from "react";
+import { useDeferredValue, useMemo } from "react";
 import type { SessionEntryView } from "@/shared/lib/api";
 import { sessionMatchesQuery } from "@/features/chat/features/session/utils/chat-session-display.utils";
 import { adaptNcpSessionSummaries } from "@/features/chat/features/session/utils/ncp-session-adapter.utils";
 import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
-import { useNcpSessions } from "@/features/chat/features/ncp/hooks/use-ncp-session-queries";
+import { useInfiniteNcpSessions } from "@/features/chat/features/ncp/hooks/use-ncp-session-queries";
 import type { SessionRunStatus } from "@/features/chat/types/session-run-status.types";
 
 export type NcpSessionListItemView = {
@@ -30,15 +30,19 @@ export function useNcpSessionListView(
 ) {
   const storedQuery = useChatSessionListStore((state) => state.snapshot.query);
   const query = params.query ?? storedQuery;
-  const sessionsQuery = useNcpSessions({ limit: params.limit ?? 200 });
+  const deferredQuery = useDeferredValue(query);
+  const sessionsQuery = useInfiniteNcpSessions({
+    pageSize: params.limit ?? 100,
+    query: deferredQuery,
+  });
 
   const allItems = useMemo<NcpSessionListItemView[]>(() => {
-    const summaries = sessionsQuery.data?.sessions ?? [];
+    const summaries = sessionsQuery.data?.pages.flatMap((page) => page.sessions) ?? [];
     return adaptNcpSessionSummaries(summaries).map((session) => ({
       session,
       runStatus: session.status === "running" ? "running" : undefined,
     }));
-  }, [sessionsQuery.data?.sessions]);
+  }, [sessionsQuery.data?.pages]);
   const items = useMemo<NcpSessionListItemView[]>(() => {
     const visibleItems = allItems.filter(({ session }) =>
       shouldShowSessionInSidebar(session),
@@ -59,5 +63,8 @@ export function useNcpSessionListView(
     allItems,
     isLoading: sessionsQuery.isLoading,
     items,
+    hasMore: sessionsQuery.hasNextPage,
+    isLoadingMore: sessionsQuery.isFetchingNextPage,
+    loadMore: sessionsQuery.fetchNextPage,
   };
 }

package/src/features/chat/features/ncp/hooks/use-ncp-session-queries.ts

@@ -1,4 +1,4 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import {
   fetchNcpSessionObservations,
   fetchNcpSessionSkills,
@@ -21,6 +21,20 @@ export function useNcpSessions(params?: { limit?: number; peerId?: string }) {
   });
 }
 
+export function useInfiniteNcpSessions(params: { pageSize: number; query?: string }) {
+  return useInfiniteQuery({
+    queryKey: ['ncp-session-pages', params.pageSize, params.query?.trim() || null],
+    initialPageParam: 1,
+    queryFn: ({ pageParam }) => fetchNcpSessions({
+      page: pageParam,
+      pageSize: params.pageSize,
+      ...(params.query?.trim() ? { query: params.query.trim() } : {}),
+    }),
+    getNextPageParam: (lastPage) => lastPage.hasMore ? (lastPage.page ?? 1) + 1 : undefined,
+    ...ncpSessionQueryDefaults,
+  });
+}
+
 export function useNcpSessionSkills(params: {
   sessionId: string | null;
   projectRoot?: string | null;

package/src/features/chat/features/workspace/components/__tests__/chat-session-token-usage.test.tsx

@@ -66,12 +66,15 @@ beforeEach(() => {
   mocks.query.isError = false;
 });
 
-it('shows totals, cache hit rate, and usage grouped by model', () => {
+it('shows totals, model calls, cache read ratio, and usage grouped by model', () => {
   render(<ChatSessionTokenUsage sessionKey="parent-1" />);
 
   expect(screen.getByText('Token usage')).toBeTruthy();
   expect(screen.getByText('1,490')).toBeTruthy();
   expect(screen.getAllByText('40%').length).toBeGreaterThan(0);
+  expect(screen.getByText('Model calls')).toBeTruthy();
+  expect(screen.getByText('Reported calls')).toBeTruthy();
+  expect(screen.getByText('2 agent rounds · 3 model calls · Cache read ratio: 40%')).toBeTruthy();
   expect(screen.getByText('openai/gpt-5')).toBeTruthy();
   expect(screen.getByText('anthropic/claude-sonnet-4')).toBeTruthy();
   expect(screen.getAllByText('Partial usage')).toHaveLength(2);

package/src/features/chat/features/workspace/components/__tests__/chat-session-workspace-file-preview.scroll-restoration.test.tsx

@@ -0,0 +1,182 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import type { ReactNode } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ChatSessionWorkspaceFilePreview } from "@/features/chat/features/workspace/components/chat-session-workspace-file-preview";
+import { scrollRestorationManager } from "@/shared/lib/navigation-history";
+
+const serverPathReadMock = vi.fn();
+const serverPathBrowseMock = vi.fn();
+
+vi.mock("@/shared/hooks/use-server-path-read", () => ({
+  useServerPathRead: (...args: unknown[]) => serverPathReadMock(...args),
+}));
+
+vi.mock("@/shared/hooks/use-server-path-browse", () => ({
+  useServerPathBrowse: (...args: unknown[]) => serverPathBrowseMock(...args),
+}));
+
+vi.mock("@nextclaw/agent-chat-ui", () => ({
+  ChatMessageMarkdown: ({ text }: { text: string }) => <div data-testid="markdown-preview">{text}</div>,
+  FileOperationCodeSurface: () => null,
+}));
+
+vi.mock(
+  "@/features/chat/features/workspace/components/workspace-text-selection-menu",
+  () => ({
+    WorkspaceTextSelectionMenu: ({ children }: { children: ReactNode }) => children,
+  }),
+);
+
+function renderMarkdownPreview(file: {
+  key: string;
+  path: string;
+  previewViewer?: "rendered" | "source";
+} = {
+  key: "markdown-tab",
+  path: "/tmp/README.md",
+  previewViewer: "rendered",
+}) {
+  return render(
+    <ChatSessionWorkspaceFilePreview
+      file={{
+        key: file.key,
+        parentSessionKey: "session-1",
+        path: file.path,
+        viewMode: "preview",
+        previewViewer: file.previewViewer ?? "rendered",
+      }}
+      sessionProjectRoot="/tmp"
+      sessionWorkingDir="/tmp"
+      showBreadcrumbs={false}
+      onFileOpen={vi.fn()}
+    />,
+  );
+}
+
+describe("ChatSessionWorkspaceFilePreview Markdown scroll restoration", () => {
+  beforeEach(() => {
+    scrollRestorationManager.clear();
+    serverPathReadMock.mockImplementation(({ path }: { path: string }) => ({
+      isLoading: false,
+      error: null,
+      data: {
+        kind: "markdown",
+        resolvedPath: path,
+        startLine: 1,
+        text: `# ${path}`,
+        truncated: false,
+      },
+    }));
+    serverPathBrowseMock.mockReturnValue({
+      isLoading: false,
+      error: new Error("not a directory"),
+      data: null,
+    });
+  });
+
+  it("restores the rendered Markdown position when returning to the same file tab", () => {
+    const firstView = renderMarkdownPreview();
+    const firstScrollContainer = screen.getByTestId("markdown-preview").parentElement as HTMLDivElement;
+    firstScrollContainer.scrollTop = 144;
+    fireEvent.scroll(firstScrollContainer);
+    firstView.unmount();
+
+    renderMarkdownPreview();
+
+    expect((screen.getByTestId("markdown-preview").parentElement as HTMLDivElement).scrollTop).toBe(144);
+  });
+
+  it("keeps each Markdown tab's position when switching files in one preview instance", () => {
+    const firstFile = { key: "markdown-a", path: "/tmp/A.md" };
+    const secondFile = { key: "markdown-b", path: "/tmp/B.md" };
+    const resolvedPaths = new Map([
+      [firstFile.path, "/tmp/first-location/A.md"],
+      [secondFile.path, "/tmp/B.md"],
+    ]);
+    serverPathReadMock.mockImplementation(({ path }: { path: string }) => ({
+      isLoading: false,
+      error: null,
+      data: {
+        kind: "markdown",
+        resolvedPath: resolvedPaths.get(path) ?? path,
+        startLine: 1,
+        text: `# ${path}`,
+        truncated: false,
+      },
+    }));
+    const view = renderMarkdownPreview(firstFile);
+    const firstScrollContainer = screen.getByTestId("markdown-preview").parentElement as HTMLDivElement;
+    firstScrollContainer.scrollTop = 144;
+    fireEvent.scroll(firstScrollContainer);
+
+    view.rerender(
+      <ChatSessionWorkspaceFilePreview
+        file={{ ...secondFile, parentSessionKey: "session-1", viewMode: "preview" }}
+        sessionProjectRoot="/tmp"
+        sessionWorkingDir="/tmp"
+        showBreadcrumbs={false}
+        onFileOpen={vi.fn()}
+      />,
+    );
+    const secondScrollContainer = screen.getByTestId("markdown-preview").parentElement as HTMLDivElement;
+    secondScrollContainer.scrollTop = 72;
+    fireEvent.scroll(secondScrollContainer);
+
+    // Server-path data can be stale while the query swaps back to the first
+    // tab. Its resolved path is display data, not tab identity.
+    resolvedPaths.set(firstFile.path, "/tmp/returned-location/A.md");
+
+    view.rerender(
+      <ChatSessionWorkspaceFilePreview
+        file={{ ...firstFile, parentSessionKey: "session-1", viewMode: "preview" }}
+        sessionProjectRoot="/tmp"
+        sessionWorkingDir="/tmp"
+        showBreadcrumbs={false}
+        onFileOpen={vi.fn()}
+      />,
+    );
+
+    expect((screen.getByTestId("markdown-preview").parentElement as HTMLDivElement).scrollTop).toBe(144);
+  });
+
+  it("restores Markdown after returning from its source-view tab", () => {
+    const renderedFile = {
+      key: "markdown-rendered",
+      path: "/tmp/README.md",
+      previewViewer: "rendered" as const,
+    };
+    const sourceFile = {
+      key: "markdown-source",
+      path: "/tmp/README.md",
+      previewViewer: "source" as const,
+    };
+    const view = renderMarkdownPreview(renderedFile);
+    const scrollContainer = screen.getByTestId("markdown-preview").parentElement as HTMLDivElement;
+    scrollContainer.scrollTop = 144;
+    fireEvent.scroll(scrollContainer);
+
+    // The source-view switch replaces the rendered scroll surface before the
+    // rendered effect cleanup executes.
+    scrollContainer.scrollTop = 0;
+    view.rerender(
+      <ChatSessionWorkspaceFilePreview
+        file={{ ...sourceFile, parentSessionKey: "session-1", viewMode: "preview" }}
+        sessionProjectRoot="/tmp"
+        sessionWorkingDir="/tmp"
+        showBreadcrumbs={false}
+        onFileOpen={vi.fn()}
+      />,
+    );
+    view.rerender(
+      <ChatSessionWorkspaceFilePreview
+        file={{ ...renderedFile, parentSessionKey: "session-1", viewMode: "preview" }}
+        sessionProjectRoot="/tmp"
+        sessionWorkingDir="/tmp"
+        showBreadcrumbs={false}
+        onFileOpen={vi.fn()}
+      />,
+    );
+
+    expect((screen.getByTestId("markdown-preview").parentElement as HTMLDivElement).scrollTop).toBe(144);
+  });
+});

package/src/features/chat/features/workspace/components/__tests__/session-cron-job-content.test.tsx

@@ -0,0 +1,78 @@
+import { createElement } from "react";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { CronJobView } from "@/shared/lib/api";
+import { setLanguage } from "@/shared/lib/i18n";
+import { SessionCronJobContent } from "@/features/chat/features/workspace/components/session-cron-job-content";
+
+const mocks = vi.hoisted(() => ({
+  deleteJob: vi.fn(),
+  runJob: vi.fn(),
+  toggleJob: vi.fn(),
+}));
+
+vi.mock("@/features/cron", () => ({
+  CronJobDetailDialog: ({ job, open }: { job: CronJobView | null; open: boolean }) => (
+    open ? createElement("div", { role: "dialog" }, job?.payload.message) : null
+  ),
+  useCronJobActions: () => ({
+    ConfirmDialog: () => createElement("div", { "data-testid": "cron-confirm" }),
+    deleteJob: mocks.deleteJob,
+    isPending: () => false,
+    runJob: mocks.runJob,
+    toggleJob: mocks.toggleJob,
+  }),
+}));
+
+function createJob(): CronJobView {
+  return {
+    id: "paint-daily",
+    name: "每日绘画",
+    enabled: true,
+    schedule: { kind: "cron", expr: "0 9 * * *", tz: "Asia/Shanghai" },
+    payload: {
+      kind: "agent_turn",
+      message: "请生成一幅拥有柔和晨光、细腻建筑纹理和远处山景的城市水彩画，并将结果保存到项目图库。",
+      agentId: "main",
+      sessionId: "session:paint",
+    },
+    state: {
+      nextRunAt: "2026-08-27T01:00:00.000Z",
+      lastRunAt: "2026-08-26T01:00:00.000Z",
+      lastStatus: "ok",
+      lastError: null,
+    },
+    createdAt: "2026-08-26T01:00:00.000Z",
+    updatedAt: "2026-08-26T01:00:00.000Z",
+    deleteAfterRun: false,
+  };
+}
+
+describe("SessionCronJobContent", () => {
+  beforeEach(() => {
+    setLanguage("zh");
+    vi.clearAllMocks();
+  });
+
+  it("keeps the task prompt as a two-line summary and exposes task controls", async () => {
+    const user = userEvent.setup();
+    const job = createJob();
+    render(createElement(SessionCronJobContent, { jobs: [job] }));
+
+    const summary = screen.getByText(job.payload.message);
+    expect(summary.className.split(" ")).toContain("line-clamp-2");
+    expect(screen.getAllByTestId("cron-confirm").length).toBe(1);
+
+    await user.click(screen.getByRole("switch", { name: "暂停" }));
+    expect(mocks.toggleJob).toHaveBeenCalledWith(job, false);
+
+    await user.click(screen.getByRole("button", { name: "更多操作 每日绘画" }));
+    await user.click(screen.getByRole("button", { name: "立即执行" }));
+    expect(mocks.runJob).toHaveBeenCalledWith(job);
+
+    await user.click(screen.getByRole("button", { name: "查看任务详情" }));
+    expect(screen.getByRole("dialog").textContent).toContain(job.payload.message);
+  });
+});

package/src/features/chat/features/workspace/components/chat-session-workspace-file-preview.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useRef, type ReactNode, type RefObject } from 'react';
+import { useMemo, useRef, type ReactNode, type RefObject, type UIEvent } from 'react';
 import type { ChatFileOpenActionViewModel, ChatFileOperationBlockViewModel } from '@nextclaw/agent-chat-ui';
 import { NextClawClientError } from '@nextclaw/client-sdk';
 import { ChatMessageMarkdown, FileOperationCodeSurface } from '@nextclaw/agent-chat-ui';
@@ -24,6 +24,7 @@ import { buildWorkspaceFileBreadcrumb, resolveWorkspaceRelativePath } from '@/sh
 import { cn } from '@/shared/lib/utils';
 import { resolveWorkspaceFileViewer } from '@/features/chat/features/workspace/utils/chat-workspace-file-viewer.utils';
 import { WorkspaceMarkdownOutline } from './workspace-markdown-outline';
+import { useScrollRestoration } from '@/shared/hooks/use-scroll-restoration';
 
 function inferPreviewKind(params: {
   path: string;
@@ -42,6 +43,31 @@ function appendPreviewRefreshVersion(url: string, refreshVersion: number): strin
   return `${url}${url.includes('?') ? '&' : '?'}refresh=${refreshVersion}`;
 }
 
+function createMarkdownScrollRestorationKey(params: {
+  contentUrl: string | null;
+  fileKey: string;
+  previewKind: 'text' | 'markdown' | 'binary';
+  previewText: string | null;
+  previewViewer: 'source' | 'rendered' | null;
+  refreshVersion: number;
+}): string | null {
+  const {
+    contentUrl,
+    fileKey,
+    previewKind,
+    previewText,
+    previewViewer,
+    refreshVersion,
+  } = params;
+  if (previewKind !== 'markdown' || previewViewer === 'source' || !previewText || contentUrl) {
+    return null;
+  }
+  // `fileKey` is the workspace tab's stable identity. Do not include resolvedPath:
+  // React Query may temporarily expose a previous result while a different file
+  // loads, which would turn one tab into several restoration records.
+  return `workspace-preview:markdown:${fileKey}:${refreshVersion}`;
+}
+
 function buildPreviewBlock(params: {
   path: string;
   text: string;
@@ -159,6 +185,7 @@ function WorkspacePreviewBody({
   onFileOpen,
   onHtmlContentHeightChange,
   markdownScrollRef,
+  onMarkdownScroll,
   previewBlock,
   previewKind,
   previewViewer,
@@ -176,6 +203,7 @@ function WorkspacePreviewBody({
   onFileOpen: (action: ChatFileOpenActionViewModel) => void;
   onHtmlContentHeightChange?: (height: number) => void;
   markdownScrollRef: RefObject<HTMLDivElement>;
+  onMarkdownScroll: (event: UIEvent<HTMLDivElement>) => void;
   previewBlock: ChatFileOperationBlockViewModel | null;
   previewKind: 'text' | 'markdown' | 'binary';
   previewViewer: 'source' | 'rendered' | null;
@@ -224,7 +252,11 @@ function WorkspacePreviewBody({
 
   if (previewKind === 'markdown' && previewViewer !== 'source' && previewText) {
     return (
-      <div ref={markdownScrollRef} className="h-full overflow-auto custom-scrollbar px-5 py-4">
+      <div
+        ref={markdownScrollRef}
+        onScroll={onMarkdownScroll}
+        className="h-full overflow-auto custom-scrollbar px-5 py-4"
+      >
         <ChatMessageMarkdown
           text={previewText}
           role="assistant"
@@ -338,6 +370,18 @@ export function ChatSessionWorkspaceFilePreview({
     previewText,
   ]);
   const isTextPreviewTruncated = !contentUrl && Boolean(previewQuery?.data?.truncated);
+  const markdownScrollRestoration = useScrollRestoration({
+    restorationKey: createMarkdownScrollRestorationKey({
+      contentUrl,
+      fileKey: file.key,
+      previewKind,
+      previewText,
+      previewViewer,
+      refreshVersion,
+    }),
+    scrollRef: markdownScrollRef,
+  });
+  const { onScroll: onMarkdownScroll } = markdownScrollRestoration;
   const breadcrumbBasePath = sessionProjectRoot ?? sessionWorkingDir;
   const excerptPath =
     resolveWorkspaceRelativePath({
@@ -365,6 +409,7 @@ export function ChatSessionWorkspaceFilePreview({
       onFileOpen={onFileOpen}
       onHtmlContentHeightChange={onHtmlContentHeightChange}
       markdownScrollRef={markdownScrollRef}
+      onMarkdownScroll={onMarkdownScroll}
       previewBlock={previewBlock}
       previewKind={previewKind}
       previewViewer={previewViewer}

package/src/features/chat/features/workspace/components/chat-session-workspace-panel-content.tsx

@@ -39,8 +39,11 @@ type ChatSessionWorkspacePanelContentProps = {
   filePreviewRefreshVersion: number;
   sessionKey: string | null;
   sessionCronJobs: readonly CronJobView[];
+  sessionCronJobsError?: boolean;
+  sessionCronJobsLoading?: boolean;
   sessionProjectRoot: string | null;
   sessionWorkingDir: string | null;
+  onRetrySessionCronJobs?: () => void;
 };
 
 function WorkspaceOverviewEntry({
@@ -220,8 +223,11 @@ function WorkspaceSelectedContent({
   filePreviewRefreshVersion,
   sessionKey,
   sessionCronJobs,
+  sessionCronJobsError = false,
+  sessionCronJobsLoading = false,
   sessionProjectRoot,
   sessionWorkingDir,
+  onRetrySessionCronJobs,
   explorerControl,
 }: ChatSessionWorkspacePanelContentProps & {
   explorerControl?: { open: boolean; onToggle: () => void };
@@ -309,7 +315,14 @@ function WorkspaceSelectedContent({
     );
   }
 
-  return <SessionCronJobContent jobs={sessionCronJobs} />;
+  return (
+    <SessionCronJobContent
+      jobs={sessionCronJobs}
+      isError={sessionCronJobsError}
+      isLoading={sessionCronJobsLoading}
+      onRetry={onRetrySessionCronJobs}
+    />
+  );
 }
 
 export function ChatSessionWorkspacePanelContent({