@nextclaw/ui 0.15.4 → 0.15.5

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

@@ -51,10 +51,10 @@ function buildPreviewBlock(params: {
   path: string;
   text: string;
   languageHint?: string | null;
-  line?: number | null;
+  startLine?: number | null;
 }): ChatFileOperationBlockViewModel {
-  const { languageHint, line, path, text } = params;
-  const startLine = line ?? 1;
+  const { languageHint, path, startLine, text } = params;
+  const normalizedStartLine = startLine ?? 1;
   return {
     key: `preview:${path}`,
     path,
@@ -62,13 +62,13 @@ function buildPreviewBlock(params: {
     lines: buildPreviewLines({
       text,
       kind: "context",
-      oldStartLine: startLine,
-      newStartLine: startLine,
+      oldStartLine: normalizedStartLine,
+      newStartLine: normalizedStartLine,
     }),
     rawText: text,
     languageHint: languageHint ?? null,
-    oldStartLine: startLine,
-    newStartLine: startLine,
+    oldStartLine: normalizedStartLine,
+    newStartLine: normalizedStartLine,
   };
 }
 
@@ -154,12 +154,21 @@ function WorkspaceDiffBody({
 
 function WorkspaceCodeSurface({
   block,
+  targetColumn,
+  targetLine,
 }: {
   block: ChatFileOperationBlockViewModel;
+  targetColumn?: number | null;
+  targetLine?: number | null;
 }) {
   return (
     <div className="h-full overflow-auto custom-scrollbar bg-white">
-      <FileOperationCodeSurface block={block} layout="workspace" />
+      <FileOperationCodeSurface
+        block={block}
+        layout="workspace"
+        targetColumn={targetColumn}
+        targetLine={targetLine}
+      />
     </div>
   );
 }
@@ -176,6 +185,8 @@ function WorkspacePreviewBody({
   previewViewer,
   previewQuery,
   previewText,
+  targetColumn,
+  targetLine,
 }: {
   contentUrl: string | null;
   contentUrlKind: WorkspaceFileContentKind | null;
@@ -188,6 +199,8 @@ function WorkspacePreviewBody({
   previewViewer: "source" | "rendered" | null;
   previewQuery: ReturnType<typeof useServerPathRead> | null | undefined;
   previewText: string | null;
+  targetColumn?: number | null;
+  targetLine?: number | null;
 }) {
   if (contentUrl && contentUrlKind) {
     return (
@@ -260,7 +273,13 @@ function WorkspacePreviewBody({
   }
 
   if (previewBlock) {
-    return <WorkspaceCodeSurface block={previewBlock} />;
+    return (
+      <WorkspaceCodeSurface
+        block={previewBlock}
+        targetColumn={targetColumn}
+        targetLine={targetLine}
+      />
+    );
   }
 
   return <WorkspaceFilePreviewStatus text={t("chatWorkspacePreviewEmpty")} />;
@@ -271,6 +290,7 @@ type ChatSessionWorkspaceFilePreviewProps = {
   refreshVersion?: number;
   sessionProjectRoot: string | null;
   sessionWorkingDir: string | null;
+  showBreadcrumbs?: boolean;
   onFileOpen: (action: ChatFileOpenActionViewModel) => void;
 };
 
@@ -279,6 +299,7 @@ export function ChatSessionWorkspaceFilePreview({
   refreshVersion = 0,
   sessionProjectRoot,
   sessionWorkingDir,
+  showBreadcrumbs = true,
   onFileOpen,
 }: ChatSessionWorkspaceFilePreviewProps) {
   const isPreviewMode = file.viewMode === "preview";
@@ -287,6 +308,7 @@ export function ChatSessionWorkspaceFilePreview({
   const previewQuery = useServerPathRead({
     path: file.path,
     basePath: sessionWorkingDir,
+    line: file.line,
     enabled: usesServerPath,
   });
   const directoryQuery = useServerPathBrowse({
@@ -351,15 +373,15 @@ export function ChatSessionWorkspaceFilePreview({
       path: previewQuery?.data?.resolvedPath ?? file.path,
       text: previewText,
       languageHint: previewQuery?.data?.languageHint ?? null,
-      line: file.line,
+      startLine: previewQuery?.data?.startLine ?? 1,
     });
   }, [
     contentUrl,
-    file.line,
     file.path,
     isPreviewMode,
     previewQuery?.data?.languageHint,
     previewQuery?.data?.resolvedPath,
+    previewQuery?.data?.startLine,
     previewText,
   ]);
   const isTextPreviewTruncated = !contentUrl && Boolean(previewQuery?.data?.truncated);
@@ -370,14 +392,10 @@ export function ChatSessionWorkspaceFilePreview({
         path: resolvedPath,
         kind: previewPathKind,
         sessionProjectRoot: breadcrumbBasePath,
-        line: file.line,
-        column: file.column,
         truncated: isTextPreviewTruncated,
       }),
     [
       breadcrumbBasePath,
-      file.column,
-      file.line,
       isTextPreviewTruncated,
       previewPathKind,
       resolvedPath,
@@ -386,10 +404,12 @@ export function ChatSessionWorkspaceFilePreview({
 
   return (
     <div className="flex h-full min-h-0 flex-col bg-white">
-      <ChatSessionWorkspaceFileBreadcrumbs
-        breadcrumb={breadcrumb}
-        onFileOpen={onFileOpen}
-      />
+      {showBreadcrumbs ? (
+        <ChatSessionWorkspaceFileBreadcrumbs
+          breadcrumb={breadcrumb}
+          onFileOpen={onFileOpen}
+        />
+      ) : null}
 
       <div className="flex-1 min-h-0 overflow-hidden">
         {file.viewMode === "diff" ? (
@@ -407,6 +427,8 @@ export function ChatSessionWorkspaceFilePreview({
             previewViewer={previewViewer}
             previewQuery={previewQuery}
             previewText={previewText}
+            targetColumn={file.column}
+            targetLine={file.line}
           />
         )}
       </div>

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

@@ -84,7 +84,11 @@ function buildCompactWorkspaceTabs(
         </span>
       ) : null,
     unreadIndicator: tab.showUnreadDot ? <span aria-label={t("chatSessionUnread")} className="h-2 w-2 shrink-0 rounded-full bg-primary" /> : null,
-    closeLabel: t("chatWorkspaceCloseFile"),
+    closeLabel: `${
+      tab.kind === "file"
+        ? t("chatWorkspaceCloseFile")
+        : t("chatWorkspaceCloseTab")
+    }: ${tab.title}`,
     closePlacement: "leading-hover",
     onSelect: tab.onSelect,
     onClose: tab.onClose,

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

@@ -39,6 +39,7 @@ type ChatSessionWorkspacePanelProps = {
   activeSideChatDraft: ChatWorkspaceSideChatDraft | null;
   workspaceFileTabs: readonly ChatWorkspaceFileTab[];
   activeWorkspaceFileKey: string | null;
+  closedWorkspaceTabEntries: readonly ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistory?: readonly ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistoryIndex?: number;
   activePanelKind?: ChatWorkspacePanelKind | null;
@@ -56,6 +57,7 @@ export function ChatSessionWorkspacePanel({
   activeSideChatDraft,
   workspaceFileTabs,
   activeWorkspaceFileKey,
+  closedWorkspaceTabEntries,
   workspaceNavigationHistory = [],
   workspaceNavigationHistoryIndex = 0,
   activePanelKind,
@@ -95,13 +97,14 @@ export function ChatSessionWorkspacePanel({
       buildWorkspaceTabsViewModel({
         resolvedChildTabs,
         activeSideChatDraft,
+        closedWorkspaceTabEntries,
         workspaceFileTabs,
         activeSelection,
         optimisticReadAtBySessionKey,
         onSelectSession: presenter.chatThreadManager.selectChildSessionDetail,
         onSelectFile: presenter.chatThreadManager.selectWorkspaceFile,
         onOpenFileViewer: presenter.chatThreadManager.openWorkspaceFileViewer,
-        onCloseFile: presenter.chatThreadManager.closeWorkspaceFile,
+        onCloseTab: presenter.chatThreadManager.closeWorkspaceTab,
         onSelectOverview: () => {
           if (sessionKey)
             presenter.chatThreadManager.openWorkspaceOverview(sessionKey);
@@ -122,6 +125,7 @@ export function ChatSessionWorkspacePanel({
     [
       activeSelection,
       activeSideChatDraft,
+      closedWorkspaceTabEntries,
       optimisticReadAtBySessionKey,
       presenter.chatThreadManager,
       resolvedChildTabs,

package/src/features/chat/features/workspace/utils/__tests__/chat-workspace-panel-view-model.utils.test.ts

@@ -4,6 +4,7 @@ import {
   buildWorkspaceTabsViewModel,
   resolveWorkspaceSelection,
 } from "@/features/chat/features/workspace/utils/chat-workspace-panel-view-model.utils";
+import { createWorkspaceFileTab } from "@/features/chat/features/workspace/utils/chat-workspace-file-tab.utils";
 import { t } from "@/shared/lib/i18n";
 
 function createChildTab(
@@ -104,7 +105,104 @@ describe("resolveWorkspaceSelection", () => {
   });
 });
 
+describe("createWorkspaceFileTab", () => {
+  it("uses source view for located Markdown unless rendered view is explicit", () => {
+    const locatedSource = createWorkspaceFileTab(
+      {
+        path: "README.md",
+        viewMode: "preview",
+        line: 12,
+      },
+      "parent-1",
+    );
+    const explicitRendered = createWorkspaceFileTab(
+      {
+        path: "README.md",
+        viewMode: "preview",
+        previewViewer: "rendered",
+        line: 12,
+      },
+      "parent-1",
+    );
+
+    expect(locatedSource).toMatchObject({
+      previewViewer: "source",
+      line: 12,
+    });
+    expect(explicitRendered).toMatchObject({
+      previewViewer: "rendered",
+      line: 12,
+    });
+  });
+});
+
 describe("buildWorkspaceTabsViewModel", () => {
+  it("keeps overview fixed while every other visible workspace tab is closable", () => {
+    const childTab = createChildTab();
+    const draft = {
+      draftKey: "draft-1",
+      parentSessionKey: "parent-1",
+    };
+    const fileTab = {
+      key: "file-1",
+      parentSessionKey: "parent-1",
+      path: "README.md",
+      viewMode: "preview" as const,
+    };
+    const onCloseTab = vi.fn();
+    const tabs = buildWorkspaceTabsViewModel({
+      resolvedChildTabs: [childTab],
+      activeSideChatDraft: draft,
+      closedWorkspaceTabEntries: [],
+      workspaceFileTabs: [fileTab],
+      activeSelection: { kind: "overview" },
+      optimisticReadAtBySessionKey: {},
+      onSelectSession: vi.fn(),
+      onSelectFile: vi.fn(),
+      onOpenFileViewer: vi.fn(),
+      onCloseTab,
+      onSelectOverview: vi.fn(),
+      onSelectChildSessions: vi.fn(),
+      onSelectProjectFiles: vi.fn(),
+      onSelectCronJobs: vi.fn(),
+    });
+
+    expect(tabs.find((tab) => tab.kind === "overview")?.onClose).toBeUndefined();
+    expect(
+      tabs.filter((tab) => tab.kind !== "overview").every((tab) => tab.onClose),
+    ).toBe(true);
+    tabs.find((tab) => tab.kind === "cron")?.onClose?.();
+    expect(onCloseTab).toHaveBeenCalledWith({ kind: "cron" });
+  });
+
+  it("does not project workspace tabs that the user closed", () => {
+    const tabs = buildWorkspaceTabsViewModel({
+      resolvedChildTabs: [createChildTab()],
+      activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [
+        { kind: "project-files" },
+        { kind: "child-session", key: "child-1" },
+      ],
+      workspaceFileTabs: [],
+      activeSelection: { kind: "overview" },
+      optimisticReadAtBySessionKey: {},
+      onSelectSession: vi.fn(),
+      onSelectFile: vi.fn(),
+      onOpenFileViewer: vi.fn(),
+      onCloseTab: vi.fn(),
+      onSelectOverview: vi.fn(),
+      onSelectChildSessions: vi.fn(),
+      onSelectProjectFiles: vi.fn(),
+      onSelectCronJobs: vi.fn(),
+    });
+
+    expect(tabs.map((tab) => tab.key)).toEqual([
+      "overview",
+      "child-sessions",
+      "cron:session",
+    ]);
+  });
+
   it("builds active and unread state from resolved tabs", () => {
     const childTab = createChildTab({
       lastMessageAt: "2026-06-09T10:00:00.000Z",
@@ -115,13 +213,14 @@ describe("buildWorkspaceTabsViewModel", () => {
     const tabs = buildWorkspaceTabsViewModel({
       resolvedChildTabs: [childTab],
       activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [],
       workspaceFileTabs: [],
       activeSelection: null,
       optimisticReadAtBySessionKey: {},
       onSelectSession,
       onSelectFile: vi.fn(),
       onOpenFileViewer: vi.fn(),
-      onCloseFile: vi.fn(),
+      onCloseTab: vi.fn(),
       onSelectOverview: vi.fn(),
       onSelectChildSessions: vi.fn(),
       onSelectProjectFiles: vi.fn(),
@@ -150,6 +249,7 @@ describe("buildWorkspaceTabsViewModel", () => {
     const tabs = buildWorkspaceTabsViewModel({
       resolvedChildTabs: [childTab],
       activeSideChatDraft: draft,
+      closedWorkspaceTabEntries: [],
       workspaceFileTabs: [],
       activeSelection: {
         kind: "side-chat-draft",
@@ -159,7 +259,7 @@ describe("buildWorkspaceTabsViewModel", () => {
       onSelectSession: vi.fn(),
       onSelectFile: vi.fn(),
       onOpenFileViewer: vi.fn(),
-      onCloseFile: vi.fn(),
+      onCloseTab: vi.fn(),
       onSelectOverview: vi.fn(),
       onSelectChildSessions: vi.fn(),
       onSelectProjectFiles: vi.fn(),
@@ -202,6 +302,7 @@ describe("buildWorkspaceTabsViewModel", () => {
     const tabs = buildWorkspaceTabsViewModel({
       resolvedChildTabs: [],
       activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [],
       workspaceFileTabs: [sourceTab, renderedTab],
       activeSelection: {
         kind: "file",
@@ -211,7 +312,7 @@ describe("buildWorkspaceTabsViewModel", () => {
       onSelectSession: vi.fn(),
       onSelectFile: vi.fn(),
       onOpenFileViewer,
-      onCloseFile: vi.fn(),
+      onCloseTab: vi.fn(),
       onSelectOverview: vi.fn(),
       onSelectChildSessions: vi.fn(),
       onSelectProjectFiles: vi.fn(),

package/src/features/chat/features/workspace/utils/chat-thread-workspace-session.utils.ts

@@ -33,6 +33,37 @@ export function areWorkspaceNavigationEntriesEqual(
   );
 }
 
+export function createWorkspaceNavigationEntryFromSnapshot(
+  snapshot: Pick<
+    ChatThreadSnapshot,
+    'activeChildSessionKey' | 'activeSideChatDraft' | 'activeWorkspaceFileKey' | 'activeWorkspacePanelKind'
+  >,
+): ChatWorkspaceNavigationEntry | null {
+  const {
+    activeChildSessionKey,
+    activeSideChatDraft,
+    activeWorkspaceFileKey,
+    activeWorkspacePanelKind,
+  } = snapshot;
+  if (
+    activeWorkspacePanelKind === 'overview' ||
+    activeWorkspacePanelKind === 'child-sessions' ||
+    activeWorkspacePanelKind === 'project-files' ||
+    activeWorkspacePanelKind === 'cron'
+  ) {
+    return { kind: activeWorkspacePanelKind };
+  }
+  if (activeWorkspacePanelKind === 'child-session' && activeChildSessionKey) {
+    return { kind: 'child-session', key: activeChildSessionKey };
+  }
+  if (activeWorkspacePanelKind === 'side-chat-draft' && activeSideChatDraft) {
+    return { kind: 'side-chat-draft', key: activeSideChatDraft.draftKey };
+  }
+  return activeWorkspacePanelKind === 'file' && activeWorkspaceFileKey
+    ? { kind: 'file', key: activeWorkspaceFileKey }
+    : null;
+}
+
 export function createWorkspaceSelectionPatch(
   entry: ChatWorkspaceNavigationEntry,
   snapshot: ChatThreadSnapshot,
@@ -88,6 +119,58 @@ export function createWorkspaceSelectionPatch(
   };
 }
 
+export function closeWorkspaceTabSnapshot(
+  snapshot: ChatThreadSnapshot,
+  entry: ChatWorkspaceNavigationEntry,
+): Partial<ChatThreadSnapshot> | null {
+  if (entry.kind === 'overview') {
+    return null;
+  }
+  const history = filterNavigationHistoryEntries(
+    {
+      entries: snapshot.workspaceNavigationHistory,
+      index: snapshot.workspaceNavigationHistoryIndex,
+    },
+    (candidate) => !areWorkspaceNavigationEntriesEqual(candidate, entry),
+    { kind: 'overview' },
+  );
+  const shouldRememberClosure = entry.kind !== 'file' && entry.kind !== 'side-chat-draft';
+  const patch: Partial<ChatThreadSnapshot> = {
+    closedWorkspaceTabEntries: shouldRememberClosure
+      ? [
+          ...snapshot.closedWorkspaceTabEntries.filter(
+            (candidate) => !areWorkspaceNavigationEntriesEqual(candidate, entry),
+          ),
+          entry,
+        ]
+      : snapshot.closedWorkspaceTabEntries,
+    childSessionTabs: entry.kind === 'child-session'
+      ? snapshot.childSessionTabs.filter((tab) => tab.sessionKey !== entry.key)
+      : snapshot.childSessionTabs,
+    activeSideChatDraft: entry.kind === 'side-chat-draft'
+      ? null
+      : snapshot.activeSideChatDraft,
+    workspaceFileTabs: entry.kind === 'file'
+      ? snapshot.workspaceFileTabs.filter((tab) => tab.key !== entry.key)
+      : snapshot.workspaceFileTabs,
+    workspaceNavigationHistory: [...history.entries],
+    workspaceNavigationHistoryIndex: history.index,
+  };
+  const activeEntry = createWorkspaceNavigationEntryFromSnapshot(snapshot);
+  if (!activeEntry || !areWorkspaceNavigationEntriesEqual(activeEntry, entry)) {
+    return patch;
+  }
+  const restoreEntry = history.entries[history.index] ?? { kind: 'overview' };
+  const restorePatch = createWorkspaceSelectionPatch(restoreEntry, {
+    ...snapshot,
+    ...patch,
+  });
+  return {
+    ...patch,
+    ...(restorePatch ?? createWorkspaceSelectionPatch({ kind: 'overview' }, snapshot)),
+  };
+}
+
 export function createSideChatDraft(parentSessionKey: string): ChatWorkspaceSideChatDraft {
   const randomPart =
     typeof globalThis.crypto?.randomUUID === 'function'

package/src/features/chat/features/workspace/utils/chat-workspace-file-tab.utils.ts

@@ -12,7 +12,10 @@ export function createWorkspaceFileTab(
   }
   const normalizedParentSessionKey = parentSessionKey?.trim() || null;
   const previewViewer = action.viewMode === 'preview'
-    ? normalizeWorkspaceFilePreviewViewer(path, action.previewViewer)
+    ? normalizeWorkspaceFilePreviewViewer(
+        path,
+        action.previewViewer ?? (action.line ? 'source' : undefined),
+      )
     : action.previewViewer ?? null;
   const viewIdentity = action.viewMode === 'preview' && previewViewer === 'rendered'
     ? 'preview:rendered'

package/src/features/chat/features/workspace/utils/chat-workspace-panel-view-model.utils.ts

@@ -1,6 +1,7 @@
 import type { ResolvedChildSessionTab } from "@/features/chat/features/ncp/hooks/use-ncp-child-session-tabs-view";
 import { shouldShowUnreadSessionIndicator } from "@/features/chat/stores/chat-session-list.store";
 import type {
+  ChatWorkspaceNavigationEntry,
   ChatWorkspacePanelKind,
   ChatWorkspaceFileTab,
   ChatWorkspaceSideChatDraft,
@@ -11,6 +12,7 @@ import {
   resolveWorkspaceFileViewer,
   type ChatWorkspaceFileViewer,
 } from "@/features/chat/features/workspace/utils/chat-workspace-file-viewer.utils";
+import { areWorkspaceNavigationEntriesEqual } from "@/features/chat/features/workspace/utils/chat-thread-workspace-session.utils";
 
 export type WorkspaceSelection =
   | {
@@ -151,41 +153,54 @@ export function resolveWorkspaceSelection(params: {
   return null;
 }
 
-export function buildWorkspaceTabsViewModel(params: {
+type WorkspaceTabsViewModelParams = {
   resolvedChildTabs: ResolvedChildSessionTab[];
   activeSideChatDraft: ChatWorkspaceSideChatDraft | null;
+  closedWorkspaceTabEntries: readonly ChatWorkspaceNavigationEntry[];
   workspaceFileTabs: readonly ChatWorkspaceFileTab[];
   activeSelection: WorkspaceSelection | null;
   optimisticReadAtBySessionKey: Record<string, string>;
   onSelectSession: (sessionKey: string) => void;
   onSelectFile: (fileKey: string) => void;
   onOpenFileViewer: (fileKey: string, viewer: ChatWorkspaceFileViewer) => void;
-  onCloseFile: (fileKey: string) => void;
+  onCloseTab: (entry: ChatWorkspaceNavigationEntry) => void;
   onSelectOverview: () => void;
   onSelectChildSessions: () => void;
   onSelectProjectFiles: () => void;
   onSelectCronJobs: () => void;
-}): WorkspaceTabViewModel[] {
-  const {
-    activeSideChatDraft,
-    resolvedChildTabs,
-    workspaceFileTabs,
-    activeSelection,
-    optimisticReadAtBySessionKey,
-    onSelectSession,
-    onSelectFile,
-    onOpenFileViewer,
-    onCloseFile,
-    onSelectOverview,
-    onSelectChildSessions,
-    onSelectProjectFiles,
-    onSelectCronJobs,
-  } = params;
+};
 
-  const workspacePages = [
+function createWorkspacePageTabEntry(
+  kind: ChatWorkspacePanelKind,
+): ChatWorkspaceNavigationEntry | null {
+  if (kind === "child-sessions" || kind === "cron" || kind === "project-files") {
+    return { kind };
+  }
+  return null;
+}
+
+function buildWorkspacePageTabs({
+  activeSelection,
+  closedWorkspaceTabEntries,
+  onCloseTab,
+  onSelectChildSessions,
+  onSelectCronJobs,
+  onSelectOverview,
+  onSelectProjectFiles,
+}: Pick<
+  WorkspaceTabsViewModelParams,
+  | "activeSelection"
+  | "closedWorkspaceTabEntries"
+  | "onCloseTab"
+  | "onSelectChildSessions"
+  | "onSelectCronJobs"
+  | "onSelectOverview"
+  | "onSelectProjectFiles"
+>): WorkspaceTabViewModel[] {
+  const tabs: WorkspaceTabViewModel[] = [
     {
       key: "overview",
-      kind: "overview" as const,
+      kind: "overview",
       title: t("chatWorkspaceOverview"),
       tooltip: t("chatWorkspaceOverview"),
       active: activeSelection?.kind === "overview",
@@ -193,29 +208,69 @@ export function buildWorkspaceTabsViewModel(params: {
     },
     {
       key: "child-sessions",
-      kind: "child-sessions" as const,
+      kind: "child-sessions",
       title: t("chatWorkspaceChildSessions"),
       tooltip: t("chatWorkspaceChildSessions"),
       active: activeSelection?.kind === "child-sessions",
       onSelect: onSelectChildSessions,
+      onClose: () => onCloseTab({ kind: "child-sessions" }),
     },
     {
       key: "cron:session",
-      kind: "cron" as const,
+      kind: "cron",
       title: t("chatWorkspaceSessionCronJobs"),
       tooltip: t("chatWorkspaceSessionCronJobs"),
       active: activeSelection?.kind === "cron",
       onSelect: onSelectCronJobs,
+      onClose: () => onCloseTab({ kind: "cron" }),
     },
     {
       key: "project-files",
-      kind: "project-files" as const,
+      kind: "project-files",
       title: t("chatWorkspaceProjectFiles"),
       tooltip: t("chatWorkspaceProjectFiles"),
       active: activeSelection?.kind === "project-files",
       onSelect: onSelectProjectFiles,
+      onClose: () => onCloseTab({ kind: "project-files" }),
     },
   ];
+  return tabs.filter((tab) => {
+    const entry = createWorkspacePageTabEntry(tab.kind);
+    return !entry || !closedWorkspaceTabEntries.some((candidate) =>
+      areWorkspaceNavigationEntriesEqual(candidate, entry),
+    );
+  });
+}
+
+export function buildWorkspaceTabsViewModel(
+  params: WorkspaceTabsViewModelParams,
+): WorkspaceTabViewModel[] {
+  const {
+    activeSideChatDraft,
+    closedWorkspaceTabEntries,
+    resolvedChildTabs,
+    workspaceFileTabs,
+    activeSelection,
+    optimisticReadAtBySessionKey,
+    onSelectSession,
+    onSelectFile,
+    onOpenFileViewer,
+    onCloseTab,
+    onSelectOverview,
+    onSelectChildSessions,
+    onSelectProjectFiles,
+    onSelectCronJobs,
+  } = params;
+
+  const workspacePages = buildWorkspacePageTabs({
+    activeSelection,
+    closedWorkspaceTabEntries,
+    onCloseTab,
+    onSelectChildSessions,
+    onSelectCronJobs,
+    onSelectOverview,
+    onSelectProjectFiles,
+  });
 
   const sideChatDraftTabs = activeSideChatDraft
     ? [
@@ -228,11 +283,23 @@ export function buildWorkspaceTabsViewModel(params: {
             activeSelection?.kind === "side-chat-draft" &&
             activeSelection.draft.draftKey === activeSideChatDraft.draftKey,
           onSelect: () => undefined,
+          onClose: () => onCloseTab({
+            kind: "side-chat-draft",
+            key: activeSideChatDraft.draftKey,
+          }),
         },
       ]
     : [];
 
-  const childTabs = resolvedChildTabs.map((tab) => {
+  const childTabs = resolvedChildTabs.filter(
+    (tab) =>
+      !closedWorkspaceTabEntries.some((entry) =>
+        areWorkspaceNavigationEntriesEqual(entry, {
+          kind: "child-session",
+          key: tab.sessionKey,
+        }),
+      ),
+  ).map((tab) => {
     const optimisticReadAt = optimisticReadAtBySessionKey[tab.sessionKey];
     const effectiveReadAt =
       optimisticReadAt && tab.readAt
@@ -259,6 +326,10 @@ export function buildWorkspaceTabsViewModel(params: {
         runStatus: tab.runStatus,
       }),
       onSelect: () => onSelectSession(tab.sessionKey),
+      onClose: () => onCloseTab({
+        kind: "child-session",
+        key: tab.sessionKey,
+      }),
     };
   });
 
@@ -292,7 +363,7 @@ export function buildWorkspaceTabsViewModel(params: {
       active:
         activeSelection?.kind === "file" && activeSelection.file.key === file.key,
       onSelect: () => onSelectFile(file.key),
-      onClose: () => onCloseFile(file.key),
+      onClose: () => onCloseTab({ kind: "file", key: file.key }),
     };
   });