Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Preserve preview tabs during session restore (#7531)

Nick Gomez2144090ddb85
diff --git a/.changeset/preview-tab-session-restore.md b/.changeset/preview-tab-session-restore.md
new file mode 100644
index 000000000..135a7adf9
--- /dev/null
+++ b/.changeset/preview-tab-session-restore.md
@@ -0,0 +1,5 @@
+---
+'@inkeep/open-knowledge': patch
+---
+
+Keep preview tabs marked as previews when session restoration finishes after a file is opened.
diff --git a/packages/app/src/editor/DocumentContext.dom.test.tsx b/packages/app/src/editor/DocumentContext.dom.test.tsx
index 7033f9114..182d75133 100644
--- a/packages/app/src/editor/DocumentContext.dom.test.tsx
+++ b/packages/app/src/editor/DocumentContext.dom.test.tsx
@@ -46,6 +46,7 @@ const { DocumentProvider, useDocumentContext } = await import('./DocumentContext
const PINNED_TAB_ID = docTabId('Pinned');
const OTHER_TAB_ID = docTabId('Other');
const THIRD_TAB_ID = docTabId('Third');
+const PREVIEW_TAB_ID = docTabId('Preview');
const LICENSE_TAB_ID = assetTabId('LICENSE');
const SKILL_TAB_ID = skillFileTabId({ scope: 'project', name: 'example', path: 'SKILL.md' });
const originalFetch = globalThis.fetch;
@@ -439,6 +440,30 @@ function OpenLicenseDuringRestoreHarness() {
);
}
+function OpenPreviewDuringRestoreHarness() {
+ const ctx = useDocumentContext();
+ return (
+ <>
+ <span data-testid="open-tabs">{ctx.openTabs.join('|')}</span>
+ <span data-testid="preview-tab">
+ {[...ctx.previewTabIdsByPane.values()].map((tabId) => tabId ?? '').join('|')}
+ </span>
+ <span data-testid="session-loaded">{String(ctx.tabSessionLoaded)}</span>
+ <button
+ type="button"
+ onClick={() =>
+ ctx.openTarget(
+ { kind: 'doc', target: 'Preview', docName: 'Preview' },
+ { disposition: 'preview', consumeActiveNewTab: true },
+ )
+ }
+ >
+ Open preview
+ </button>
+ </>
+ );
+}
+
function PaneWorkspaceHarness() {
const ctx = useDocumentContext();
return (
@@ -1560,6 +1585,66 @@ describe('DocumentContext tab restore', () => {
expect(window.location.hash).toBe(hashFromAssetPath('LICENSE'));
});
+ test('keeps a preview marker when a sidebar preview opens before session restore resolves', async () => {
+ mockCollabUrl = 'ws://localhost:1/collab';
+ globalThis.fetch = vi.fn(() => Promise.reject(new Error('unexpected fetch'))) as never;
+ const stub = makeDeferredSessionBridgeStub(
+ persistedTabSession(
+ [OTHER_TAB_ID],
+ [],
+ OTHER_TAB_ID,
+ new Date('2026-06-07T00:00:00.000Z').toISOString(),
+ ),
+ );
+ window.okDesktop = stub.bridge;
+ window.location.hash = '#/Other';
+
+ render(<OpenPreviewDuringRestoreHarness />, { wrapper: ProviderHarness });
+
+ const user = userEvent.setup();
+ await user.click(screen.getByRole('button', { name: 'Open preview' }));
+ expect(screen.getByTestId('preview-tab').textContent).toBe(PREVIEW_TAB_ID);
+
+ act(() => {
+ stub.resolveSession();
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('session-loaded').textContent).toBe('true');
+ expect(screen.getByTestId('preview-tab').textContent).toBe(PREVIEW_TAB_ID);
+ });
+ });
+
+ test('keeps a saved tab permanent when a live preview shares its id', async () => {
+ mockCollabUrl = 'ws://localhost:1/collab';
+ globalThis.fetch = vi.fn(() => Promise.reject(new Error('unexpected fetch'))) as never;
+ const stub = makeDeferredSessionBridgeStub(
+ persistedTabSession(
+ [PREVIEW_TAB_ID],
+ [],
+ PREVIEW_TAB_ID,
+ new Date('2026-06-07T00:00:00.000Z').toISOString(),
+ ),
+ );
+ window.okDesktop = stub.bridge;
+ window.location.hash = '#/Preview';
+
+ render(<OpenPreviewDuringRestoreHarness />, { wrapper: ProviderHarness });
+
+ const user = userEvent.setup();
+ await user.click(screen.getByRole('button', { name: 'Open preview' }));
+ expect(screen.getByTestId('preview-tab').textContent).toBe(PREVIEW_TAB_ID);
+
+ act(() => {
+ stub.resolveSession();
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('session-loaded').textContent).toBe('true');
+ expect(screen.getByTestId('preview-tab').textContent).toBe('');
+ });
+ });
+
test('keeps a new tab active when session restore resolves afterward', async () => {
mockCollabUrl = 'ws://localhost:1/collab';
globalThis.fetch = vi.fn(() => Promise.reject(new Error('unexpected fetch'))) as never;
diff --git a/packages/app/src/editor/DocumentContext.tsx b/packages/app/src/editor/DocumentContext.tsx
index a825c9d1c..e2d1234ee 100644
--- a/packages/app/src/editor/DocumentContext.tsx
+++ b/packages/app/src/editor/DocumentContext.tsx
@@ -60,6 +60,7 @@ import {
hydrateEditorWorkspace,
normalizeEditorWorkspace,
type PaneSide,
+ preserveLivePreviewTabs,
projectVisibleEditorWorkspace,
type RecentlyClosedEditorTab,
recordRecentlyClosedTab,
@@ -737,6 +738,7 @@ export function DocumentProvider({ children }: { children: ReactNode }) {
activeTarget: currentFocused.activeNewTabId ? null : pane.activeTarget,
}));
}
+ nextWorkspace = preserveLivePreviewTabs(nextWorkspace, currentWorkspace, state);
const hash = window.location.hash;
const hashTabId = tabIdFromHash(hash);
const hashOwner = hashTabId ? findPaneOwningTab(nextWorkspace, hashTabId) : null;
diff --git a/packages/app/src/editor/editor-panes.test.ts b/packages/app/src/editor/editor-panes.test.ts
index 6a34fb7b4..d2e17b044 100644
--- a/packages/app/src/editor/editor-panes.test.ts
+++ b/packages/app/src/editor/editor-panes.test.ts
@@ -13,6 +13,7 @@ import {
normalizeEditorWorkspace,
parsePersistedEditorWorkspace,
persistEditorWorkspace,
+ preserveLivePreviewTabs,
projectVisibleEditorWorkspace,
pruneEmptyEditorPanes,
recordRecentlyClosedTab,
@@ -107,6 +108,107 @@ describe('editor pane workspace', () => {
});
});
+ test('preserves live preview markers while merging restored tabs', () => {
+ const restored = hydrateEditorWorkspace({
+ panes: [
+ {
+ id: 'pane-a',
+ openTabs: ['other'],
+ pinnedTabIds: [],
+ activeTabId: 'other',
+ size: 100,
+ },
+ ],
+ focusedPaneId: 'pane-a',
+ });
+ const live = {
+ panes: [
+ {
+ ...pane('pane-a', ['other', 'preview'], 'preview'),
+ previewTabId: 'preview',
+ },
+ ],
+ focusedPaneId: 'pane-a',
+ };
+
+ const merged = preserveLivePreviewTabs(
+ {
+ ...restored,
+ panes: restored.panes.map((item) => ({
+ ...item,
+ openTabs: ['other', 'preview'],
+ activeTabId: 'preview',
+ })),
+ },
+ live,
+ { panes: [{ ...restored.panes[0], openTabs: ['other'] }] },
+ );
+
+ expect(merged.panes[0]?.previewTabId).toBe('preview');
+ });
+
+ test('keeps persisted tabs permanent when a live preview marker overlaps them', () => {
+ const persisted = {
+ panes: [
+ {
+ id: 'pane-a',
+ openTabs: ['saved'],
+ pinnedTabIds: [],
+ activeTabId: 'saved',
+ size: 100,
+ },
+ ],
+ focusedPaneId: 'pane-a',
+ };
+ const restored = hydrateEditorWorkspace(persisted);
+ const live = {
+ panes: [{ ...pane('pane-a', ['saved'], 'saved'), previewTabId: 'saved' }],
+ focusedPaneId: 'pane-a',
+ };
+
+ const merged = preserveLivePreviewTabs(restored, live, persisted);
+
+ expect(merged.panes[0]?.previewTabId).toBeNull();
+ });
+
+ test('matches duplicate independent preview ids to their live panes', () => {
+ const folderTabId = '\u0000folder:foo';
+ const workspace = {
+ panes: [
+ { ...pane('pane-a', [folderTabId], folderTabId, 50), previewTabId: null },
+ { ...pane('pane-b', [folderTabId], folderTabId, 50), previewTabId: null },
+ ],
+ focusedPaneId: 'pane-b',
+ };
+ const live = {
+ panes: [
+ { ...pane('pane-a', [folderTabId], folderTabId, 50), previewTabId: folderTabId },
+ { ...pane('pane-b', [folderTabId], folderTabId, 50), previewTabId: folderTabId },
+ ],
+ focusedPaneId: 'pane-b',
+ };
+
+ const merged = preserveLivePreviewTabs(workspace, live, { panes: [] });
+
+ expect(merged.panes.map((item) => item.previewTabId)).toEqual([folderTabId, folderTabId]);
+ });
+
+ test('falls back to a restored pane when a live preview pane id differs', () => {
+ const previewTabId = '\u0000folder:foo';
+ const workspace = {
+ panes: [{ ...pane('restored-pane', [previewTabId], previewTabId), previewTabId: null }],
+ focusedPaneId: 'restored-pane',
+ };
+ const live = {
+ panes: [{ ...pane('live-pane', [previewTabId], previewTabId), previewTabId }],
+ focusedPaneId: 'live-pane',
+ };
+
+ const merged = preserveLivePreviewTabs(workspace, live, { panes: [] });
+
+ expect(merged.panes[0]?.previewTabId).toBe(previewTabId);
+ });
+
test('normalizes current ids, target ownership, pins, focus, and size percentages', () => {
const workspace = normalizeEditorWorkspace({
panes: [
diff --git a/packages/app/src/editor/editor-panes.ts b/packages/app/src/editor/editor-panes.ts
index 1b2e58bd0..959ddb80d 100644
--- a/packages/app/src/editor/editor-panes.ts
+++ b/packages/app/src/editor/editor-panes.ts
@@ -405,6 +405,36 @@ export function updateEditorPane(
};
}
+export function preserveLivePreviewTabs(
+ workspace: EditorWorkspaceState,
+ liveWorkspace: EditorWorkspaceState,
+ persistedWorkspace: Pick<PersistedEditorWorkspace, 'panes'>,
+): EditorWorkspaceState {
+ const persistedTabsByPane = new Map(
+ persistedWorkspace.panes.map((pane) => [pane.id, new Set(pane.openTabs)]),
+ );
+ let nextWorkspace = workspace;
+ for (const livePane of liveWorkspace.panes) {
+ const previewTabId = livePane.previewTabId;
+ if (!previewTabId) continue;
+ const owner =
+ nextWorkspace.panes.find(
+ (pane) => pane.id === livePane.id && pane.openTabs.includes(previewTabId),
+ ) ?? findPaneOwningTab(nextWorkspace, previewTabId);
+ if (
+ !owner ||
+ owner.pinnedTabIds.includes(previewTabId) ||
+ persistedTabsByPane.get(owner.id)?.has(previewTabId)
+ )
+ continue;
+ nextWorkspace = updateEditorPane(nextWorkspace, owner.id, (pane) => ({
+ ...pane,
+ previewTabId,
+ }));
+ }
+ return nextWorkspace;
+}
+
export function reorderPaneTabs(
workspace: EditorWorkspaceState,
paneId: EditorPaneId,