@nextclaw/ui 0.13.11 → 0.13.13

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

@@ -1,4 +1,4 @@
-import { AlarmClock, ArrowLeft, FileCode2, MessageSquareText, X } from "lucide-react";
+import { AlarmClock, ArrowLeft, ArrowRight, FileCode2, MessageSquareText, X } from "lucide-react";
 import type { ResolvedChildSessionTab } from "@/features/chat/hooks/use-ncp-child-session-tabs-view";
 import type { ChatWorkspaceFileTab } from "@/features/chat/stores/chat-thread.store";
 import { AgentIdentityAvatar } from "@/shared/components/common/agent-identity";
@@ -184,12 +184,18 @@ function WorkspaceTabItem({ tab }: { tab: WorkspaceTabViewModel }) {
 }
 
 export function WorkspaceTabsBar({
-  onBack,
+  canGoBack,
+  canGoForward,
   onClose,
+  onGoBack,
+  onGoForward,
   tabs,
 }: {
-  onBack?: () => void;
+  canGoBack: boolean;
+  canGoForward: boolean;
   onClose: () => void;
+  onGoBack: () => void;
+  onGoForward: () => void;
   tabs: readonly WorkspaceTabViewModel[];
 }) {
   return (
@@ -208,16 +214,42 @@ export function WorkspaceTabsBar({
             ))}
           </div>
         </div>
-        {onBack ? (
-          <button
-            type="button"
-            onClick={onBack}
-            className="mx-1 flex h-7 w-7 shrink-0 self-center items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40"
-            aria-label={t("chatBackToParent")}
-          >
-            <ArrowLeft className="h-4 w-4" />
-          </button>
-        ) : null}
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <span className="ml-1 inline-flex self-center">
+              <button
+                type="button"
+                onClick={onGoBack}
+                disabled={!canGoBack}
+                className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 disabled:cursor-not-allowed disabled:text-gray-300 disabled:hover:bg-transparent"
+                aria-label={t("chatWorkspaceBack")}
+              >
+                <ArrowLeft className="h-4 w-4" />
+              </button>
+            </span>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" className="text-xs">
+            {t("chatWorkspaceBack")}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <span className="inline-flex self-center">
+              <button
+                type="button"
+                onClick={onGoForward}
+                disabled={!canGoForward}
+                className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 disabled:cursor-not-allowed disabled:text-gray-300 disabled:hover:bg-transparent"
+                aria-label={t("chatWorkspaceForward")}
+              >
+                <ArrowRight className="h-4 w-4" />
+              </button>
+            </span>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" className="text-xs">
+            {t("chatWorkspaceForward")}
+          </TooltipContent>
+        </Tooltip>
         <button
           type="button"
           onClick={onClose}

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

@@ -18,6 +18,7 @@ import {
 } from "@/features/chat/stores/chat-session-list.store";
 import type {
   ChatChildSessionTab,
+  ChatWorkspaceNavigationEntry,
   ChatWorkspaceFileTab,
 } from "@/features/chat/stores/chat-thread.store";
 import {
@@ -33,6 +34,10 @@ import { SessionCronJobContent } from "@/features/chat/components/workspace/sess
 import { ResizableRightPanel } from "@/shared/components/resizable-right-panel/resizable-right-panel";
 import { t } from "@/shared/lib/i18n";
 import { cn } from "@/shared/lib/utils";
+import {
+  canGoBackInNavigationHistory,
+  canGoForwardInNavigationHistory,
+} from "@/shared/lib/navigation-history";
 
 type ChatSessionWorkspacePanelProps = {
   sessionKey: string | null;
@@ -40,9 +45,12 @@ type ChatSessionWorkspacePanelProps = {
   activeChildSessionKey: string | null;
   workspaceFileTabs: readonly ChatWorkspaceFileTab[];
   activeWorkspaceFileKey: string | null;
+  workspaceNavigationHistory?: readonly ChatWorkspaceNavigationEntry[];
+  workspaceNavigationHistoryIndex?: number;
   activePanelKind?: "child-session" | "file" | "cron" | null;
   sessionCronJobs?: readonly CronJobView[];
   sessionProjectRoot: string | null;
+  sessionWorkingDir: string | null;
   displayMode?: "docked" | "overlay";
 };
 
@@ -246,9 +254,12 @@ export function ChatSessionWorkspacePanel({
   activeChildSessionKey,
   workspaceFileTabs,
   activeWorkspaceFileKey,
+  workspaceNavigationHistory = [],
+  workspaceNavigationHistoryIndex = 0,
   activePanelKind,
   sessionCronJobs = [],
   sessionProjectRoot,
+  sessionWorkingDir,
   displayMode = "docked",
 }: ChatSessionWorkspacePanelProps) {
   const presenter = usePresenter();
@@ -264,9 +275,10 @@ export function ChatSessionWorkspacePanel({
     workspaceFileTabs,
     sessionCronJobCount: sessionCronJobs.length,
   });
-  const hasParentSession = resolvedChildTabs.some((tab) =>
-    Boolean(tab.parentSessionKey),
-  );
+  const workspaceHistory = {
+    entries: workspaceNavigationHistory,
+    index: workspaceNavigationHistoryIndex,
+  };
 
   useEffect(() => {
     if (
@@ -331,11 +343,10 @@ export function ChatSessionWorkspacePanel({
     >
       <WorkspaceTabsBar
         tabs={workspaceTabs}
-        onBack={
-          hasParentSession
-            ? presenter.chatThreadManager.goToParentSession
-            : undefined
-        }
+        canGoBack={canGoBackInNavigationHistory(workspaceHistory)}
+        canGoForward={canGoForwardInNavigationHistory(workspaceHistory)}
+        onGoBack={presenter.chatThreadManager.goBackWorkspacePanel}
+        onGoForward={presenter.chatThreadManager.goForwardWorkspacePanel}
         onClose={presenter.chatThreadManager.closeWorkspacePanel}
       />
 
@@ -357,6 +368,7 @@ export function ChatSessionWorkspacePanel({
           <ChatSessionWorkspaceFilePreview
             file={activeSelection.file}
             sessionProjectRoot={sessionProjectRoot}
+            sessionWorkingDir={sessionWorkingDir}
             onFileOpen={presenter.chatThreadManager.openFilePreview}
           />
         ) : (

package/src/features/chat/components/conversation/chat-conversation-panel.test.tsx

@@ -16,6 +16,8 @@ const mocks = vi.hoisted(() => ({
   goToChatRoot: vi.fn(),
   goToSession: vi.fn(),
   openSessionCronPanel: vi.fn(),
+  goBackWorkspacePanel: vi.fn(),
+  goForwardWorkspacePanel: vi.fn(),
   deleteCronJob: vi.fn(),
   cronJobs: [] as CronJobView[],
   setSelectedAgentId: vi.fn(),
@@ -119,6 +121,8 @@ vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
       selectWorkspaceFile: vi.fn(),
       closeWorkspaceFile: vi.fn(),
       closeWorkspacePanel: vi.fn(),
+      goBackWorkspacePanel: mocks.goBackWorkspacePanel,
+      goForwardWorkspacePanel: mocks.goForwardWorkspacePanel,
       goToParentSession: vi.fn(),
     },
     chatSessionListManager: {
@@ -200,8 +204,25 @@ function resetChatConversationPanelTestState() {
   mocks.goToChatRoot.mockReset();
   mocks.goToSession.mockReset();
   mocks.openSessionCronPanel.mockReset();
+  mocks.goBackWorkspacePanel.mockReset();
+  mocks.goForwardWorkspacePanel.mockReset();
   mocks.deleteCronJob.mockReset();
   mocks.cronJobs = [];
+  mocks.resolvedChildTabs = [
+    {
+      sessionKey: "child-session-1",
+      parentSessionKey: "parent-session-1",
+      title: "北京天气",
+      agentId: "weather",
+      updatedAt: "2026-04-10T09:00:00.000Z",
+      lastMessageAt: "2026-04-10T09:00:00.000Z",
+      readAt: "2026-04-10T09:00:00.000Z",
+      sessionTypeLabel: "Codex",
+      preferredModel: "openai/gpt-5.3-codex",
+      projectName: "project-alpha",
+      projectRoot: "/Users/demo/project-alpha",
+    },
+  ];
   mocks.setSelectedAgentId.mockReset();
   mocks.setPendingSessionType.mockReset();
   mocks.stickyBottomScroll.mockClear();
@@ -247,6 +268,8 @@ function resetChatConversationPanelTestState() {
       activeChildSessionKey: null,
       workspaceFileTabs: [],
       activeWorkspaceFileKey: null,
+      workspaceNavigationHistory: [],
+      workspaceNavigationHistoryIndex: 0,
     },
   });
   useChatSessionListStore.setState({
@@ -406,6 +429,11 @@ describe("ChatConversationPanel", () => {
       messageCount: "1",
       sending: "true",
     });
+    expect(
+      screen
+        .getByTestId("chat-message-list")
+        .closest('[data-chat-scroll-container="true"]'),
+    ).toBeTruthy();
     expect(
       screen.queryByText("No messages yet. Send one to start."),
     ).toBeNull();
@@ -520,6 +548,8 @@ describe("ChatConversationPanel", () => {
 });
 
 describe("ChatSessionWorkspacePanel", () => {
+  beforeEach(resetChatConversationPanelTestState);
+
   it("renders child session tabs and active child metadata in the workspace sidebar", () => {
     mocks.resolvedChildTabs = [
       {
@@ -552,6 +582,7 @@ describe("ChatSessionWorkspacePanel", () => {
         workspaceFileTabs={[]}
         activeWorkspaceFileKey={null}
         sessionProjectRoot="/Users/demo/project-alpha"
+        sessionWorkingDir="/Users/demo/project-alpha"
       />,
     );
 
@@ -622,6 +653,7 @@ describe("ChatSessionWorkspacePanel", () => {
         workspaceFileTabs={[]}
         activeWorkspaceFileKey={null}
         sessionProjectRoot="/Users/demo/project-alpha"
+        sessionWorkingDir="/Users/demo/project-alpha"
       />,
     );
 
@@ -645,6 +677,7 @@ describe("ChatSessionWorkspacePanel", () => {
         ]}
         activeWorkspaceFileKey="parent-session-1::preview::README.md"
         sessionProjectRoot="/Users/demo/project-alpha"
+        sessionWorkingDir="/Users/demo/project-alpha"
       />,
     );
 
@@ -658,6 +691,45 @@ describe("ChatSessionWorkspacePanel", () => {
     ).toContain("workspace-horizontal-scrollbar");
   });
 
+  it("uses workspace-local backward and forward history actions in the tab bar", async () => {
+    const user = userEvent.setup();
+
+    render(
+      <ChatSessionWorkspacePanel
+        sessionKey="parent-session-1"
+        childSessionTabs={[]}
+        activeChildSessionKey={null}
+        workspaceFileTabs={[
+          {
+            key: "parent-session-1::preview::README.md",
+            parentSessionKey: "parent-session-1",
+            path: "README.md",
+            label: "README.md",
+            viewMode: "preview",
+          },
+        ]}
+        activeWorkspaceFileKey="parent-session-1::preview::README.md"
+        workspaceNavigationHistory={[
+          { kind: "child-session", key: "child-session-1" },
+          { kind: "file", key: "parent-session-1::preview::README.md" },
+          { kind: "cron" },
+        ]}
+        workspaceNavigationHistoryIndex={1}
+        sessionProjectRoot="/Users/demo/project-alpha"
+        sessionWorkingDir="/Users/demo/project-alpha"
+      />,
+    );
+
+    await user.click(screen.getByRole("button", { name: "Back in workspace" }));
+    await user.click(
+      screen.getByRole("button", { name: "Forward in workspace" }),
+    );
+
+    expect(mocks.goBackWorkspacePanel).toHaveBeenCalledTimes(1);
+    expect(mocks.goForwardWorkspacePanel).toHaveBeenCalledTimes(1);
+    expect(screen.queryByRole("button", { name: "Back to parent" })).toBeNull();
+  });
+
   it("renders session cron jobs in the workspace sidebar and deletes with a neutral confirmation", async () => {
     const user = userEvent.setup();
     const job: CronJobView = {
@@ -691,6 +763,7 @@ describe("ChatSessionWorkspacePanel", () => {
         activePanelKind="cron"
         sessionCronJobs={[job]}
         sessionProjectRoot="/Users/demo/project-alpha"
+        sessionWorkingDir="/Users/demo/project-alpha"
       />,
     );
 

package/src/features/chat/components/conversation/chat-conversation-panel.tsx

@@ -194,6 +194,7 @@ function ChatConversationContent() {
     <div
       ref={threadRef}
       onScroll={onScroll}
+      data-chat-scroll-container="true"
       className="flex-1 min-h-0 overflow-y-auto custom-scrollbar"
     >
       {showWelcome ? (
@@ -363,9 +364,12 @@ function ChatSessionWorkspacePanelContainer({
       activeChildSessionKey={snapshot.activeChildSessionKey ?? null}
       workspaceFileTabs={workspaceFileTabs}
       activeWorkspaceFileKey={snapshot.activeWorkspaceFileKey ?? null}
+      workspaceNavigationHistory={snapshot.workspaceNavigationHistory}
+      workspaceNavigationHistoryIndex={snapshot.workspaceNavigationHistoryIndex}
       activePanelKind={snapshot.activeWorkspacePanelKind ?? null}
       sessionCronJobs={sessionCronJobs}
       sessionProjectRoot={snapshot.sessionProjectRoot ?? null}
+      sessionWorkingDir={snapshot.sessionWorkingDir ?? snapshot.sessionProjectRoot ?? null}
       displayMode={layoutMode === "mobile" ? "overlay" : "docked"}
     />
   );

package/src/features/chat/components/providers/chat-presenter.provider.tsx

@@ -42,6 +42,8 @@ export type ChatThreadManagerLike = {
   selectWorkspaceFile: (fileKey: string) => void;
   closeWorkspaceFile: (fileKey: string) => void;
   closeWorkspacePanel: () => void;
+  goBackWorkspacePanel: () => void;
+  goForwardWorkspacePanel: () => void;
   goToParentSession: () => void;
 };
 

package/src/features/chat/hooks/use-ncp-chat-derived-state.ts

@@ -119,6 +119,7 @@ export function useNcpChatSnapshotSync(params: {
   availableAgents: AgentProfileView[];
   currentSessionDisplayName?: string;
   effectiveSessionProjectRoot: string | null;
+  effectiveSessionWorkingDir: string | null;
   effectiveSessionProjectName: string | null;
   selectedSession: SessionEntryView | null;
   threadRef: MutableRefObject<HTMLDivElement | null>;
@@ -159,6 +160,7 @@ export function useNcpChatSnapshotSync(params: {
       availableAgents: params.availableAgents,
       sessionDisplayName: params.currentSessionDisplayName,
       sessionProjectRoot: params.effectiveSessionProjectRoot,
+      sessionWorkingDir: params.effectiveSessionWorkingDir,
       sessionProjectName: params.effectiveSessionProjectName,
       canDeleteSession: Boolean(params.selectedSession),
       threadRef: params.threadRef,

package/src/features/chat/managers/chat-session-list.manager.test.ts

@@ -57,6 +57,10 @@ describe('ChatSessionListManager', () => {
         activeWorkspacePanelKind: 'child-session',
         activeChildSessionKey: 'child-session-1',
         activeWorkspaceFileKey: null,
+        workspaceNavigationHistory: [
+          { kind: 'child-session', key: 'child-session-1' },
+        ],
+        workspaceNavigationHistoryIndex: 0,
       },
     });
   });

package/src/features/chat/managers/chat-session-list.manager.ts

@@ -30,6 +30,8 @@ export class ChatSessionListManager {
       childSessionTabs: [],
       activeChildSessionKey: null,
       activeWorkspaceFileKey: null,
+      workspaceNavigationHistory: [],
+      workspaceNavigationHistoryIndex: 0,
     });
   };
 

package/src/features/chat/managers/ncp-chat-thread.manager.test.ts

@@ -19,33 +19,37 @@ vi.mock('@/shared/lib/api', async (importOriginal) => {
   };
 });
 
-describe('NcpChatThreadManager', () => {
-  beforeEach(() => {
-    useChatSessionListStore.setState({
-      optimisticReadAtBySessionKey: {},
-      snapshot: {
-        ...useChatSessionListStore.getState().snapshot,
-        selectedSessionKey: 'parent-session-1',
-      },
-    });
-    useChatThreadStore.setState({
-      snapshot: {
-        ...useChatThreadStore.getState().snapshot,
-        sessionKey: 'parent-session-1',
-        workspacePanelParentKey: null,
-        childSessionTabs: [
-          {
-            sessionKey: 'child-session-1',
-            parentSessionKey: 'parent-session-1',
-            label: 'Child Session 1',
-            agentId: 'reviewer',
-          },
-        ],
-        activeChildSessionKey: null,
-      },
-    });
+beforeEach(() => {
+  useChatSessionListStore.setState({
+    optimisticReadAtBySessionKey: {},
+    snapshot: {
+      ...useChatSessionListStore.getState().snapshot,
+      selectedSessionKey: 'parent-session-1',
+    },
   });
+  useChatThreadStore.setState({
+    snapshot: {
+      ...useChatThreadStore.getState().snapshot,
+      sessionKey: 'parent-session-1',
+      workspacePanelParentKey: null,
+      childSessionTabs: [
+        {
+          sessionKey: 'child-session-1',
+          parentSessionKey: 'parent-session-1',
+          label: 'Child Session 1',
+          agentId: 'reviewer',
+        },
+      ],
+      activeChildSessionKey: null,
+      workspaceFileTabs: [],
+      activeWorkspaceFileKey: null,
+      workspaceNavigationHistory: [],
+      workspaceNavigationHistoryIndex: 0,
+    },
+  });
+});
 
+describe('NcpChatThreadManager', () => {
   it('opens the child-session panel for the requested parent session and keeps focus on the chosen child', () => {
     const uiManager = {
       goToSession: vi.fn(),
@@ -190,7 +194,129 @@ describe('NcpChatThreadManager', () => {
       ]),
     );
   });
+});
+
+describe('NcpChatThreadManager workspace navigation', () => {
+  it('navigates backward and forward through workspace selections', () => {
+    const uiManager = {
+      goToSession: vi.fn(),
+      goToChatRoot: vi.fn(),
+      goToProviders: vi.fn(),
+      confirm: vi.fn(),
+    } as unknown as ConstructorParameters<typeof NcpChatThreadManager>[0];
+    const manager = new NcpChatThreadManager(
+      uiManager,
+      {} as ConstructorParameters<typeof NcpChatThreadManager>[1],
+      {} as ConstructorParameters<typeof NcpChatThreadManager>[2],
+    );
+
+    manager.openChildSessionPanel({
+      parentSessionKey: 'parent-session-1',
+      activeChildSessionKey: 'child-session-1',
+    });
+    manager.openFilePreview({
+      path: 'README.md',
+      label: 'README.md',
+      viewMode: 'preview',
+    });
+    manager.openSessionCronPanel('parent-session-1');
+
+    expect(useChatThreadStore.getState().snapshot.workspaceNavigationHistory).toEqual([
+      { kind: 'child-session', key: 'child-session-1' },
+      { kind: 'file', key: 'parent-session-1::preview::README.md' },
+      { kind: 'cron' },
+    ]);
+
+    manager.goBackWorkspacePanel();
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspacePanelKind: 'file',
+      activeWorkspaceFileKey: 'parent-session-1::preview::README.md',
+      workspaceNavigationHistoryIndex: 1,
+    });
+
+    manager.goBackWorkspacePanel();
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspacePanelKind: 'child-session',
+      activeChildSessionKey: 'child-session-1',
+      workspaceNavigationHistoryIndex: 0,
+    });
+
+    manager.goForwardWorkspacePanel();
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspacePanelKind: 'file',
+      activeWorkspaceFileKey: 'parent-session-1::preview::README.md',
+      workspaceNavigationHistoryIndex: 1,
+    });
+  });
+
+  it('truncates workspace forward history after selecting a new entry', () => {
+    useChatThreadStore.getState().setSnapshot({
+      childSessionTabs: [
+        ...useChatThreadStore.getState().snapshot.childSessionTabs,
+        {
+          sessionKey: 'child-session-2',
+          parentSessionKey: 'parent-session-1',
+          label: 'Child Session 2',
+          agentId: 'writer',
+        },
+      ],
+    });
+    const manager = new NcpChatThreadManager(
+      { goToSession: vi.fn() } as unknown as ConstructorParameters<typeof NcpChatThreadManager>[0],
+      {} as ConstructorParameters<typeof NcpChatThreadManager>[1],
+      {} as ConstructorParameters<typeof NcpChatThreadManager>[2],
+    );
+
+    manager.openChildSessionPanel({
+      parentSessionKey: 'parent-session-1',
+      activeChildSessionKey: 'child-session-1',
+    });
+    manager.openFilePreview({
+      path: 'README.md',
+      label: 'README.md',
+      viewMode: 'preview',
+    });
+    manager.goBackWorkspacePanel();
+    manager.selectChildSessionDetail('child-session-2');
+
+    expect(useChatThreadStore.getState().snapshot.workspaceNavigationHistory).toEqual([
+      { kind: 'child-session', key: 'child-session-1' },
+      { kind: 'child-session', key: 'child-session-2' },
+    ]);
+    expect(useChatThreadStore.getState().snapshot.workspaceNavigationHistoryIndex).toBe(1);
+  });
+
+  it('removes a closed active file from workspace history and restores the previous entry', () => {
+    const manager = new NcpChatThreadManager(
+      { goToSession: vi.fn() } as unknown as ConstructorParameters<typeof NcpChatThreadManager>[0],
+      {} as ConstructorParameters<typeof NcpChatThreadManager>[1],
+      {} as ConstructorParameters<typeof NcpChatThreadManager>[2],
+    );
+
+    manager.openChildSessionPanel({
+      parentSessionKey: 'parent-session-1',
+      activeChildSessionKey: 'child-session-1',
+    });
+    manager.openFilePreview({
+      path: 'README.md',
+      label: 'README.md',
+      viewMode: 'preview',
+    });
+    manager.closeWorkspaceFile('parent-session-1::preview::README.md');
+
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspacePanelKind: 'child-session',
+      activeChildSessionKey: 'child-session-1',
+      activeWorkspaceFileKey: null,
+      workspaceNavigationHistory: [
+        { kind: 'child-session', key: 'child-session-1' },
+      ],
+      workspaceNavigationHistoryIndex: 0,
+    });
+  });
+});
 
+describe('NcpChatThreadManager deletion', () => {
   it('clears the selected thread state after deleting the current session', async () => {
     const removeQueries = vi.spyOn(appQueryClient, 'removeQueries').mockImplementation(async () => undefined);
     const uiManager = {
@@ -228,6 +354,8 @@ describe('NcpChatThreadManager', () => {
       activeChildSessionKey: null,
       workspaceFileTabs: [],
       activeWorkspaceFileKey: null,
+      workspaceNavigationHistory: [],
+      workspaceNavigationHistoryIndex: 0,
     });
     expect(streamActionsManager.resetStreamState).toHaveBeenCalledTimes(1);
     expect(deleteSummaryMock).toHaveBeenCalledWith(appQueryClient, 'parent-session-1');