@nextclaw/ui 0.15.4 → 0.15.6

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 }),
     };
   });
 

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

@@ -24,6 +24,7 @@ describe('ChatThreadManager workspace pages', () => {
         activeWorkspacePanelKind: null,
         activeChildSessionKey: null,
         activeWorkspaceFileKey: null,
+        closedWorkspaceTabEntries: [],
         workspaceNavigationHistory: [],
         workspaceNavigationHistoryIndex: 0,
       },
@@ -73,4 +74,28 @@ describe('ChatThreadManager workspace pages', () => {
       activeWorkspacePanelKind: null,
     });
   });
+
+  it('closes a workspace page, restores overview, and reopens the page on demand', () => {
+    const manager = new ChatThreadManager(
+      createUiManager(),
+      {} as ConstructorParameters<typeof ChatThreadManager>[1],
+    );
+
+    manager.openWorkspaceOverview('parent-session-1');
+    manager.openProjectFiles('parent-session-1');
+    manager.closeWorkspaceTab({ kind: 'project-files' });
+
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspacePanelKind: 'overview',
+      closedWorkspaceTabEntries: [{ kind: 'project-files' }],
+      workspaceNavigationHistory: [{ kind: 'overview' }],
+      workspaceNavigationHistoryIndex: 0,
+    });
+
+    manager.openProjectFiles('parent-session-1');
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspacePanelKind: 'project-files',
+      closedWorkspaceTabEntries: [],
+    });
+  });
 });

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

@@ -60,6 +60,7 @@ beforeEach(() => {
       activeSideChatDraft: null,
       workspaceFileTabs: [],
       activeWorkspaceFileKey: null,
+      closedWorkspaceTabEntries: [],
       workspaceNavigationHistory: [],
       workspaceNavigationHistoryIndex: 0,
     },
@@ -504,7 +505,10 @@ describe('ChatThreadManager workspace navigation', () => {
       label: 'README.md',
       viewMode: 'preview',
     });
-    manager.closeWorkspaceFile('parent-session-1::preview:rendered::README.md');
+    manager.closeWorkspaceTab({
+      kind: 'file',
+      key: 'parent-session-1::preview:rendered::README.md',
+    });
 
     expect(useChatThreadStore.getState().snapshot).toMatchObject({
       activeWorkspacePanelKind: 'child-session',

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

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

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

@@ -24,13 +24,13 @@ import { normalizeChatWorkspacePanelWidth } from '@/features/chat/features/works
 import { t } from '@/shared/lib/i18n';
 import {
   areWorkspaceNavigationEntriesEqual,
+  closeWorkspaceTabSnapshot,
   createWorkspaceSelectionPatch,
   createSideChatDraft,
   materializeSideChatDraftSnapshot,
   upsertChildSessionTab,
 } from '@/features/chat/features/workspace/utils/chat-thread-workspace-session.utils';
 import {
-  filterNavigationHistoryEntries,
   pushNavigationHistoryEntry,
   stepNavigationHistory,
 } from '@/shared/lib/navigation-history';
@@ -96,6 +96,7 @@ export class ChatThreadManager {
       activeSideChatDraft: null,
       workspaceFileTabs: [],
       activeWorkspaceFileKey: null,
+      closedWorkspaceTabEntries: [],
       workspaceNavigationHistory: [],
       workspaceNavigationHistoryIndex: 0,
     });
@@ -163,8 +164,16 @@ export class ChatThreadManager {
       entry,
       areWorkspaceNavigationEntriesEqual,
     );
+    const closedWorkspaceTabEntries =
+      patch.workspacePanelParentKey &&
+      patch.workspacePanelParentKey !== snapshot.workspacePanelParentKey
+        ? []
+        : snapshot.closedWorkspaceTabEntries.filter(
+            (candidate) => !areWorkspaceNavigationEntriesEqual(candidate, entry),
+          );
     useChatThreadStore.getState().setSnapshot({
       ...patch,
+      closedWorkspaceTabEntries,
       workspaceNavigationHistory: [...history.entries],
       workspaceNavigationHistoryIndex: history.index,
     });
@@ -461,44 +470,12 @@ export class ChatThreadManager {
     });
   };
 
-  closeWorkspaceFile = (fileKey: string) => {
-    const normalizedFileKey = fileKey.trim();
-    if (!normalizedFileKey) {
-      return;
-    }
+  closeWorkspaceTab = (entry: ChatWorkspaceNavigationEntry) => {
     const { snapshot } = useChatThreadStore.getState();
-    const { activeWorkspaceFileKey, workspaceFileTabs } = snapshot;
-    const nextTabs = workspaceFileTabs.filter(
-      (tab) => tab.key !== normalizedFileKey,
-    );
-    const history = filterNavigationHistoryEntries(
-      {
-        entries: snapshot.workspaceNavigationHistory,
-        index: snapshot.workspaceNavigationHistoryIndex,
-      },
-      (entry) => entry.kind !== 'file' || entry.key !== normalizedFileKey,
-    );
-    const nextPatch: Partial<ChatThreadSnapshot> = {
-      workspaceFileTabs: nextTabs,
-      workspaceNavigationHistory: [...history.entries],
-      workspaceNavigationHistoryIndex: history.index,
-    };
-    if (activeWorkspaceFileKey === normalizedFileKey) {
-      const nextSnapshot = {
-        ...snapshot,
-        workspaceFileTabs: nextTabs,
-      };
-      const restoreEntry = history.entries[history.index];
-      const restorePatch = restoreEntry
-        ? createWorkspaceSelectionPatch(restoreEntry, nextSnapshot)
-        : null;
-      Object.assign(nextPatch, restorePatch ?? {
-        activeWorkspacePanelKind: null,
-        activeSideChatDraft: null,
-        activeWorkspaceFileKey: null,
-      });
+    const patch = closeWorkspaceTabSnapshot(snapshot, entry);
+    if (patch) {
+      useChatThreadStore.getState().setSnapshot(patch);
     }
-    useChatThreadStore.getState().setSnapshot(nextPatch);
   };
 
   closeWorkspacePanel = () => {
@@ -508,6 +485,7 @@ export class ChatThreadManager {
       activeChildSessionKey: null,
       activeSideChatDraft: null,
       activeWorkspaceFileKey: null,
+      closedWorkspaceTabEntries: [],
       workspaceNavigationHistory: [],
       workspaceNavigationHistoryIndex: 0,
     });

package/src/features/chat/pages/__tests__/ncp-chat-page.test.ts

@@ -215,6 +215,29 @@ describe('buildChatRunMetadata', () => {
     ).not.toHaveProperty('ui_inline_tokens');
   });
 
+  it('adds structured workspace references to run metadata', () => {
+    expect(
+      buildChatRunMetadata({
+        composerNodes: [
+          createChatComposerTokenNode({
+            tokenKind: 'workspace_file',
+            tokenKey: 'src/file name.ts',
+            label: 'file name.ts',
+          }),
+        ],
+      }),
+    ).toMatchObject({
+      ui_inline_tokens: [
+        {
+          kind: 'workspace_file',
+          key: 'src/file name.ts',
+          label: 'file name.ts',
+          rawText: '@file:src%2Ffile%20name.ts',
+        },
+      ],
+    });
+  });
+
   it('serializes child session materialization metadata for side chat drafts', () => {
     expect(
       buildChatRunMetadata({

package/src/features/chat/stores/__tests__/chat-thread.store.test.ts

@@ -28,6 +28,7 @@ function resetChatThreadStore() {
       activeSideChatDraft: null,
       workspaceFileTabs: [],
       activeWorkspaceFileKey: null,
+      closedWorkspaceTabEntries: [],
       workspaceNavigationHistory: [],
       workspaceNavigationHistoryIndex: 0,
       workspacePanelWidth: CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
@@ -64,6 +65,10 @@ describe('chat thread workspace panel persistence', () => {
         },
       ],
       activeWorkspaceFileKey: 'session-1::preview::README.md',
+      closedWorkspaceTabEntries: [
+        { kind: 'project-files' },
+        { kind: 'child-session', key: 'child-session-2' },
+      ],
       workspaceNavigationHistory: [
         { kind: 'child-session', key: 'child-session-1' },
         { kind: 'file', key: 'session-1::preview::README.md' },
@@ -79,6 +84,10 @@ describe('chat thread workspace panel persistence', () => {
       workspacePanelParentKey: 'session-1',
       activeWorkspacePanelKind: 'file',
       activeWorkspaceFileKey: 'session-1::preview::README.md',
+      closedWorkspaceTabEntries: [
+        { kind: 'project-files' },
+        { kind: 'child-session', key: 'child-session-2' },
+      ],
       workspaceNavigationHistory: [
         { kind: 'child-session', key: 'child-session-1' },
         { kind: 'file', key: 'session-1::preview::README.md' },

package/src/features/chat/stores/chat-thread.store.ts

@@ -15,6 +15,7 @@ import {
   CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
   normalizeChatWorkspacePanelWidth,
 } from '@/features/chat/features/workspace/utils/chat-workspace-panel-layout.utils';
+import { createWorkspaceNavigationEntryFromSnapshot } from '@/features/chat/features/workspace/utils/chat-thread-workspace-session.utils';
 
 export type ChatChildSessionTab = {
   sessionKey: string;
@@ -92,6 +93,7 @@ export type ChatThreadSnapshot = {
   activeSideChatDraft?: ChatWorkspaceSideChatDraft | null;
   workspaceFileTabs: ChatWorkspaceFileTab[];
   activeWorkspaceFileKey?: string | null;
+  closedWorkspaceTabEntries: ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistory: ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistoryIndex: number;
   workspacePanelWidth: number;
@@ -114,6 +116,7 @@ type PersistedChatThreadStore = {
     activeChildSessionKey?: unknown;
     workspaceFileTabs?: unknown;
     activeWorkspaceFileKey?: unknown;
+    closedWorkspaceTabEntries?: unknown;
     workspaceNavigationHistory?: unknown;
     workspaceNavigationHistoryIndex?: unknown;
     workspacePanelWidth?: unknown;
@@ -127,6 +130,7 @@ type PersistedChatWorkspaceSnapshot = Pick<
   | 'activeChildSessionKey'
   | 'workspaceFileTabs'
   | 'activeWorkspaceFileKey'
+  | 'closedWorkspaceTabEntries'
   | 'workspaceNavigationHistory'
   | 'workspaceNavigationHistoryIndex'
   | 'workspacePanelWidth'
@@ -159,6 +163,7 @@ const initialSnapshot: ChatThreadSnapshot = {
   activeSideChatDraft: null,
   workspaceFileTabs: [],
   activeWorkspaceFileKey: null,
+  closedWorkspaceTabEntries: [],
   workspaceNavigationHistory: [],
   workspaceNavigationHistoryIndex: 0,
   workspacePanelWidth: CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
@@ -218,42 +223,6 @@ function normalizePersistedWorkspaceNavigationEntry(
   };
 }
 
-function createWorkspaceNavigationEntryFromSnapshot({
-  activeChildSessionKey,
-  activeWorkspaceFileKey,
-  activeWorkspacePanelKind,
-}: {
-  activeWorkspacePanelKind: ChatThreadSnapshot['activeWorkspacePanelKind'];
-  activeChildSessionKey: string | null;
-  activeWorkspaceFileKey: string | null;
-}): ChatWorkspaceNavigationEntry | null {
-  if (activeWorkspacePanelKind === 'overview') {
-    return { kind: 'overview' };
-  }
-  if (activeWorkspacePanelKind === 'child-sessions') {
-    return { kind: 'child-sessions' };
-  }
-  if (activeWorkspacePanelKind === 'project-files') {
-    return { kind: 'project-files' };
-  }
-  if (activeWorkspacePanelKind === 'cron') {
-    return { kind: 'cron' };
-  }
-  if (activeWorkspacePanelKind === 'child-session' && activeChildSessionKey) {
-    return {
-      kind: 'child-session',
-      key: activeChildSessionKey,
-    };
-  }
-  if (activeWorkspacePanelKind === 'file' && activeWorkspaceFileKey) {
-    return {
-      kind: 'file',
-      key: activeWorkspaceFileKey,
-    };
-  }
-  return null;
-}
-
 function normalizePersistedWorkspaceSnapshot(
   value: unknown,
 ): PersistedChatWorkspaceSnapshot | null {
@@ -287,9 +256,17 @@ function normalizePersistedWorkspaceSnapshot(
       ? null
       : activeWorkspacePanelKind;
   const activeChildSessionKey = normalizeOptionalString(value.activeChildSessionKey);
+  const closedWorkspaceTabEntries = Array.isArray(value.closedWorkspaceTabEntries)
+    ? value.closedWorkspaceTabEntries
+      .map(normalizePersistedWorkspaceNavigationEntry)
+      .filter((entry): entry is ChatWorkspaceNavigationEntry =>
+        entry !== null && entry.kind !== 'overview',
+      )
+    : [];
   const fallbackHistoryEntry = createWorkspaceNavigationEntryFromSnapshot({
     activeWorkspacePanelKind: resolvedActiveWorkspacePanelKind,
     activeChildSessionKey,
+    activeSideChatDraft: null,
     activeWorkspaceFileKey: resolvedActiveWorkspaceFileKey,
   });
   const normalizedNavigationHistory = Array.isArray(value.workspaceNavigationHistory)
@@ -320,6 +297,7 @@ function normalizePersistedWorkspaceSnapshot(
     activeChildSessionKey,
     workspaceFileTabs,
     activeWorkspaceFileKey: resolvedActiveWorkspaceFileKey,
+    closedWorkspaceTabEntries,
     workspaceNavigationHistory,
     workspaceNavigationHistoryIndex,
     workspacePanelWidth: normalizeChatWorkspacePanelWidth(
@@ -369,6 +347,8 @@ export const useChatThreadStore = create<ChatThreadStore>()(
             )
               .map(toPersistedWorkspaceFileTab),
             activeWorkspaceFileKey: state.snapshot.activeWorkspaceFileKey,
+            closedWorkspaceTabEntries: state.snapshot.closedWorkspaceTabEntries
+              .filter((entry) => entry.kind !== 'overview' && entry.kind !== 'side-chat-draft'),
             workspaceNavigationHistory,
             workspaceNavigationHistoryIndex,
             workspacePanelWidth: state.snapshot.workspacePanelWidth,

package/src/features/chat/types/chat-input-bar.types.ts

@@ -11,6 +11,8 @@ export type ChatSkillRecord = {
   key: string;
   label: string;
   scopeLabel?: string;
+  groupKey?: string;
+  groupLabel?: string;
   description?: string;
   descriptionZh?: string;
   badgeLabel?: string;

package/src/features/settings/components/config/provider-form.tsx

@@ -230,10 +230,6 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
 
   const handleAddModel = () => {
     const result = addProviderLocalModel(models, modelDraft, providerModelAliases);
-    if (result.errorKey) {
-      toast.error(t('providerModelInvalidProviderPrefix'));
-      return;
-    }
     setModels(result.models);
     setModelDraft(result.draft);
   };