@nextclaw/ui 0.15.3 → 0.15.5

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

@@ -4,6 +4,8 @@ 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(
   overrides: Partial<ResolvedChildSessionTab> = {},
@@ -26,6 +28,19 @@ function createChildTab(
 }
 
 describe("resolveWorkspaceSelection", () => {
+  it("keeps the explicit workspace overview even when no resources exist", () => {
+    expect(
+      resolveWorkspaceSelection({
+        activePanelKind: "overview",
+        activeChildSessionKey: null,
+        activeSideChatDraft: null,
+        activeWorkspaceFileKey: null,
+        childSessionTabs: [],
+        workspaceFileTabs: [],
+      }),
+    ).toEqual({ kind: "overview" });
+  });
+
   it("honors the explicit active panel kind before fallback order", () => {
     const childTab = createChildTab();
     const fileTab = {
@@ -43,7 +58,6 @@ describe("resolveWorkspaceSelection", () => {
         activeWorkspaceFileKey: fileTab.key,
         childSessionTabs: [childTab],
         workspaceFileTabs: [fileTab],
-        sessionCronJobCount: 1,
       }),
     ).toMatchObject({
       kind: "file",
@@ -62,7 +76,6 @@ describe("resolveWorkspaceSelection", () => {
         activeWorkspaceFileKey: null,
         childSessionTabs: [childTab],
         workspaceFileTabs: [],
-        sessionCronJobCount: 1,
       }),
     ).toMatchObject({
       kind: "child-session",
@@ -84,7 +97,6 @@ describe("resolveWorkspaceSelection", () => {
         activeWorkspaceFileKey: null,
         childSessionTabs: [createChildTab()],
         workspaceFileTabs: [],
-        sessionCronJobCount: 0,
       }),
     ).toMatchObject({
       kind: "side-chat-draft",
@@ -93,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",
@@ -104,17 +213,21 @@ describe("buildWorkspaceTabsViewModel", () => {
     const tabs = buildWorkspaceTabsViewModel({
       resolvedChildTabs: [childTab],
       activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [],
       workspaceFileTabs: [],
-      sessionCronJobCount: 0,
       activeSelection: null,
       optimisticReadAtBySessionKey: {},
       onSelectSession,
       onSelectFile: vi.fn(),
-      onCloseFile: vi.fn(),
+      onOpenFileViewer: vi.fn(),
+      onCloseTab: vi.fn(),
+      onSelectOverview: vi.fn(),
+      onSelectChildSessions: vi.fn(),
+      onSelectProjectFiles: vi.fn(),
       onSelectCronJobs: vi.fn(),
     });
 
-    expect(tabs[0]).toMatchObject({
+    expect(tabs[4]).toMatchObject({
       key: "child:child-1",
       kind: "child-session",
       title: "Child session",
@@ -122,7 +235,7 @@ describe("buildWorkspaceTabsViewModel", () => {
       showUnreadDot: true,
     });
 
-    tabs[0]?.onSelect();
+    tabs[4]?.onSelect();
     expect(onSelectSession).toHaveBeenCalledWith("child-1");
   });
 
@@ -136,8 +249,8 @@ describe("buildWorkspaceTabsViewModel", () => {
     const tabs = buildWorkspaceTabsViewModel({
       resolvedChildTabs: [childTab],
       activeSideChatDraft: draft,
+      closedWorkspaceTabEntries: [],
       workspaceFileTabs: [],
-      sessionCronJobCount: 0,
       activeSelection: {
         kind: "side-chat-draft",
         draft,
@@ -145,15 +258,23 @@ describe("buildWorkspaceTabsViewModel", () => {
       optimisticReadAtBySessionKey: {},
       onSelectSession: vi.fn(),
       onSelectFile: vi.fn(),
-      onCloseFile: 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",
+      "project-files",
       "side-chat-draft:draft-1",
       "child:child-1",
     ]);
-    expect(tabs[0]).toMatchObject({
+    expect(tabs[4]).toMatchObject({
       kind: "side-chat-draft",
       active: true,
     });
@@ -177,11 +298,12 @@ describe("buildWorkspaceTabsViewModel", () => {
       previewViewer: "source" as const,
     };
 
+    const onOpenFileViewer = vi.fn();
     const tabs = buildWorkspaceTabsViewModel({
       resolvedChildTabs: [],
       activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [],
       workspaceFileTabs: [sourceTab, renderedTab],
-      sessionCronJobCount: 0,
       activeSelection: {
         kind: "file",
         file: sourceTab,
@@ -189,19 +311,41 @@ describe("buildWorkspaceTabsViewModel", () => {
       optimisticReadAtBySessionKey: {},
       onSelectSession: vi.fn(),
       onSelectFile: vi.fn(),
-      onCloseFile: vi.fn(),
+      onOpenFileViewer,
+      onCloseTab: vi.fn(),
+      onSelectOverview: vi.fn(),
+      onSelectChildSessions: vi.fn(),
+      onSelectProjectFiles: vi.fn(),
       onSelectCronJobs: vi.fn(),
     });
 
-    expect(tabs).toEqual([
+    expect(tabs.slice(4)).toEqual([
       expect.objectContaining({
         key: "file:parent::preview::demo.html",
         active: true,
+        fileName: "demo.html",
+        title: "demo.html",
+        isRenderedPreview: false,
+        alternateViewerAction: expect.objectContaining({
+          label: t("chatWorkspaceOpenPreview"),
+          viewer: "rendered",
+        }),
       }),
       expect.objectContaining({
         key: "file:parent::preview:rendered::demo.html",
         active: false,
+        title: `${t("chatWorkspacePreview")}: demo.html`,
+        isRenderedPreview: true,
+        alternateViewerAction: expect.objectContaining({
+          label: t("chatWorkspaceOpenSource"),
+          viewer: "source",
+        }),
       }),
     ]);
+    tabs[4]?.alternateViewerAction?.onSelect();
+    expect(onOpenFileViewer).toHaveBeenCalledWith(
+      "parent::preview::demo.html",
+      "rendered",
+    );
   });
 });

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

@@ -16,10 +16,159 @@ export function areWorkspaceNavigationEntriesEqual(
   if (current.kind !== next.kind) {
     return false;
   }
-  if (current.kind === 'cron') {
+  if (
+    current.kind === 'overview' ||
+    current.kind === 'child-sessions' ||
+    current.kind === 'project-files' ||
+    current.kind === 'cron'
+  ) {
     return true;
   }
-  return next.kind !== 'cron' && current.key === next.key;
+  return (
+    next.kind !== 'overview' &&
+    next.kind !== 'child-sessions' &&
+    next.kind !== 'project-files' &&
+    next.kind !== 'cron' &&
+    current.key === next.key
+  );
+}
+
+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,
+): Partial<ChatThreadSnapshot> | null {
+  if (
+    entry.kind === 'overview' ||
+    entry.kind === 'child-sessions' ||
+    entry.kind === 'project-files'
+  ) {
+    return {
+      activeWorkspacePanelKind: entry.kind,
+      activeChildSessionKey: null,
+      activeSideChatDraft: null,
+      activeWorkspaceFileKey: null,
+    };
+  }
+  if (entry.kind === 'cron') {
+    return {
+      activeWorkspacePanelKind: 'cron',
+      activeChildSessionKey: null,
+      activeSideChatDraft: null,
+      activeWorkspaceFileKey: null,
+    };
+  }
+  if (entry.kind === 'file') {
+    if (!snapshot.workspaceFileTabs.some((tab) => tab.key === entry.key)) {
+      return null;
+    }
+    return {
+      activeWorkspacePanelKind: 'file',
+      activeChildSessionKey: null,
+      activeSideChatDraft: null,
+      activeWorkspaceFileKey: entry.key,
+    };
+  }
+  if (entry.kind === 'side-chat-draft') {
+    const { activeSideChatDraft } = snapshot;
+    if (activeSideChatDraft?.draftKey !== entry.key) {
+      return null;
+    }
+    return {
+      activeWorkspacePanelKind: 'side-chat-draft',
+      activeChildSessionKey: null,
+      activeSideChatDraft,
+      activeWorkspaceFileKey: null,
+    };
+  }
+  return {
+    activeWorkspacePanelKind: 'child-session',
+    activeChildSessionKey: entry.key,
+    activeSideChatDraft: null,
+    activeWorkspaceFileKey: null,
+  };
+}
+
+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 {

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

@@ -85,3 +85,20 @@ export function toPersistedWorkspaceFileTab(
     newStartLine: tab.newStartLine,
   };
 }
+
+export function retainWorkspaceFileTabs(
+  tabs: readonly ChatWorkspaceFileTab[],
+  activeWorkspaceFileKey: string | null | undefined,
+  maxTabs: number,
+): ChatWorkspaceFileTab[] {
+  const retained = tabs.slice(0, maxTabs);
+  const activeTab = activeWorkspaceFileKey
+    ? tabs.find((tab) => tab.key === activeWorkspaceFileKey)
+    : null;
+  if (!activeTab || retained.some((tab) => tab.key === activeTab.key)) {
+    return retained;
+  }
+  return retained.length < maxTabs
+    ? [...retained, activeTab]
+    : [...retained.slice(0, -1), activeTab];
+}

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

@@ -0,0 +1,66 @@
+import type { ChatFileOpenActionViewModel } from '@nextclaw/agent-chat-ui';
+import type { ChatWorkspaceFileTab } from '@/features/chat/stores/chat-thread.store';
+import { normalizeWorkspaceFilePreviewViewer } from './chat-workspace-file-viewer.utils';
+
+export function createWorkspaceFileTab(
+  action: ChatFileOpenActionViewModel,
+  parentSessionKey: string | null,
+): ChatWorkspaceFileTab | null {
+  const path = action.path.trim();
+  if (!path) {
+    return null;
+  }
+  const normalizedParentSessionKey = parentSessionKey?.trim() || null;
+  const previewViewer = action.viewMode === 'preview'
+    ? normalizeWorkspaceFilePreviewViewer(
+        path,
+        action.previewViewer ?? (action.line ? 'source' : undefined),
+      )
+    : action.previewViewer ?? null;
+  const viewIdentity = action.viewMode === 'preview' && previewViewer === 'rendered'
+    ? 'preview:rendered'
+    : action.viewMode;
+  return {
+    key: `${normalizedParentSessionKey ?? 'draft'}::${viewIdentity}::${path}`,
+    parentSessionKey: normalizedParentSessionKey,
+    path,
+    label: action.label?.trim() || null,
+    viewMode: action.viewMode,
+    previewViewer,
+    line: action.line ?? null,
+    column: action.column ?? null,
+    rawText: action.rawText ?? null,
+    contentUrl: action.contentUrl?.trim() || null,
+    mimeType: action.mimeType?.trim() || null,
+    beforeText: action.beforeText ?? null,
+    afterText: action.afterText ?? null,
+    patchText: action.patchText ?? null,
+    oldStartLine: action.oldStartLine ?? null,
+    newStartLine: action.newStartLine ?? null,
+    fullLines: action.fullLines,
+  };
+}
+
+export function upsertWorkspaceFileTab(
+  tabs: readonly ChatWorkspaceFileTab[],
+  nextTab: ChatWorkspaceFileTab,
+  adjacentToKey?: string,
+): ChatWorkspaceFileTab[] {
+  const existingIndex = tabs.findIndex((tab) => tab.key === nextTab.key);
+  if (existingIndex !== -1) {
+    const nextTabs = [...tabs];
+    nextTabs[existingIndex] = { ...tabs[existingIndex], ...nextTab };
+    return nextTabs;
+  }
+  const adjacentIndex = adjacentToKey
+    ? tabs.findIndex((tab) => tab.key === adjacentToKey)
+    : -1;
+  if (adjacentIndex === -1) {
+    return [nextTab, ...tabs];
+  }
+  return [
+    ...tabs.slice(0, adjacentIndex + 1),
+    nextTab,
+    ...tabs.slice(adjacentIndex + 1),
+  ];
+}

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

@@ -0,0 +1,49 @@
+import type { ChatFilePreviewViewer } from "@nextclaw/agent-chat-ui";
+
+export type ChatWorkspaceFileViewer = "source" | "rendered";
+
+function resolveDualViewFileKind(path: string): "html" | "markdown" | null {
+  if (/\.html?$/i.test(path)) {
+    return "html";
+  }
+  if (/\.mdx?$/i.test(path)) {
+    return "markdown";
+  }
+  return null;
+}
+
+export function resolveWorkspaceFileViewer(
+  path: string,
+  viewer?: ChatFilePreviewViewer | null,
+): ChatWorkspaceFileViewer | null {
+  const kind = resolveDualViewFileKind(path);
+  if (kind === "html") {
+    return viewer === "rendered" ? "rendered" : "source";
+  }
+  if (kind === "markdown") {
+    return viewer === "source" ? "source" : "rendered";
+  }
+  if (viewer === "source" || viewer === "rendered") {
+    return viewer;
+  }
+  return null;
+}
+
+export function normalizeWorkspaceFilePreviewViewer(
+  path: string,
+  viewer?: ChatFilePreviewViewer | null,
+): ChatFilePreviewViewer | null {
+  return resolveWorkspaceFileViewer(path, viewer) ?? viewer ?? null;
+}
+
+export function resolveAlternateWorkspaceFileViewer(
+  path: string,
+  viewer?: ChatFilePreviewViewer | null,
+): ChatWorkspaceFileViewer | null {
+  if (!resolveDualViewFileKind(path)) {
+    return null;
+  }
+  return resolveWorkspaceFileViewer(path, viewer) === "source"
+    ? "rendered"
+    : "source";
+}

package/src/features/chat/features/workspace/utils/chat-workspace-panel-layout.utils.ts

@@ -0,0 +1,13 @@
+export const CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH = 480;
+export const CHAT_WORKSPACE_PANEL_MIN_WIDTH = 360;
+export const CHAT_WORKSPACE_PANEL_MAX_WIDTH = 860;
+
+export function normalizeChatWorkspacePanelWidth(value: unknown): number {
+  if (typeof value !== 'number' || !Number.isFinite(value)) {
+    return CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH;
+  }
+  return Math.max(
+    CHAT_WORKSPACE_PANEL_MIN_WIDTH,
+    Math.min(CHAT_WORKSPACE_PANEL_MAX_WIDTH, value),
+  );
+}