diff --git a/packages/common/infra/src/app-config-storage.ts b/packages/common/infra/src/app-config-storage.ts
index 36b5698e5937e..5db0127d2d26f 100644
--- a/packages/common/infra/src/app-config-storage.ts
+++ b/packages/common/infra/src/app-config-storage.ts
@@ -1,11 +1,12 @@
 import { z } from 'zod';
 
-const _appConfigSchema = z.object({
+export const appConfigSchema = z.object({
   /** whether to show onboarding first */
   onBoarding: z.boolean().optional().default(true),
 });
-export type AppConfigSchema = z.infer<typeof _appConfigSchema>;
-export const defaultAppConfig = _appConfigSchema.parse({});
+
+export type AppConfigSchema = z.infer<typeof appConfigSchema>;
+export const defaultAppConfig = appConfigSchema.parse({});
 
 const _storage: Record<number, any> = {};
 let _inMemoryId = 0;
@@ -48,7 +49,7 @@ class Storage<T extends object> {
   }
 
   get(): T;
-  get(key: keyof T): T[keyof T];
+  get<K extends keyof T>(key: K): T[K];
   /**
    * get config, if key is provided, return the value of the key
    * @param key
diff --git a/packages/common/infra/src/atom/settings.ts b/packages/common/infra/src/atom/settings.ts
index e0ce75301c5d8..6778e821527ad 100644
--- a/packages/common/infra/src/atom/settings.ts
+++ b/packages/common/infra/src/atom/settings.ts
@@ -105,6 +105,7 @@ export function setupEditorFlags(docCollection: DocCollection) {
 
 type SetStateAction<Value> = Value | ((prev: Value) => Value);
 
+// todo(@pengx17): use global state instead
 const appSettingEffect = atomEffect(get => {
   const settings = get(appSettingBaseAtom);
   // some values in settings should be synced into electron side
diff --git a/packages/common/infra/src/framework/core/index.ts b/packages/common/infra/src/framework/core/index.ts
index c1cce58426e5f..b0edde95c1968 100644
--- a/packages/common/infra/src/framework/core/index.ts
+++ b/packages/common/infra/src/framework/core/index.ts
@@ -8,4 +8,4 @@ export { Framework } from './framework';
 export { createIdentifier } from './identifier';
 export type { ResolveOptions } from './provider';
 export { FrameworkProvider } from './provider';
-export type { GeneralIdentifier } from './types';
+export type { GeneralIdentifier, Identifier } from './types';
diff --git a/packages/frontend/component/src/components/auth-components/onboarding-page.tsx b/packages/frontend/component/src/components/auth-components/onboarding-page.tsx
index d0166240c393d..1fa11ec63fecf 100644
--- a/packages/frontend/component/src/components/auth-components/onboarding-page.tsx
+++ b/packages/frontend/component/src/components/auth-components/onboarding-page.tsx
@@ -100,11 +100,9 @@ export const ScrollableLayout = ({
 export const OnboardingPage = ({
   user,
   onOpenAffine,
-  windowControl,
 }: {
   user: User;
   onOpenAffine: () => void;
-  windowControl?: React.ReactNode;
 }) => {
   const location = useLocation();
   const navigate = useNavigate();
@@ -150,19 +148,16 @@ export const OnboardingPage = ({
     return (
       <ScrollableLayout
         headerItems={
-          <>
-            {isWindowsDesktop ? windowControl : null}
-            <Button
-              className={clsx(styles.button, {
-                [styles.disableButton]: questionIdx === 0,
-                [styles.windowsAppButton]: isWindowsDesktop,
-              })}
-              size="extraLarge"
-              onClick={() => setQuestionIdx(questions.length)}
-            >
-              Skip
-            </Button>
-          </>
+          <Button
+            className={clsx(styles.button, {
+              [styles.disableButton]: questionIdx === 0,
+              [styles.windowsAppButton]: isWindowsDesktop,
+            })}
+            size="extraLarge"
+            onClick={() => setQuestionIdx(questions.length)}
+          >
+            Skip
+          </Button>
         }
         isMacosDesktop={isMacosDesktop}
         isWindowsDesktop={isWindowsDesktop}
@@ -265,7 +260,6 @@ export const OnboardingPage = ({
   }
   return (
     <ScrollableLayout
-      headerItems={isWindowsDesktop ? windowControl : null}
       isMacosDesktop={isMacosDesktop}
       isWindowsDesktop={isWindowsDesktop}
     >
diff --git a/packages/frontend/component/src/theme/global.css b/packages/frontend/component/src/theme/global.css
index 33b73419a7c5f..1907c62220ba3 100644
--- a/packages/frontend/component/src/theme/global.css
+++ b/packages/frontend/component/src/theme/global.css
@@ -288,6 +288,20 @@ textarea
   -webkit-app-region: no-drag;
 }
 
+html[data-active='false'] {
+  opacity: 0;
+  transition: opacity 0.2s 0.1s;
+}
+
+html[data-active='true']:has([data-blur-background='true']) {
+  opacity: 1;
+  transition: opacity 0.2s;
+}
+
+html[data-active='false'] * {
+  -webkit-app-region: no-drag !important;
+}
+
 html,
 body {
   height: 100%;
diff --git a/packages/frontend/component/src/ui/notification/notification-card.tsx b/packages/frontend/component/src/ui/notification/notification-card.tsx
index 0217ebd59f155..59d0971fc1a4b 100644
--- a/packages/frontend/component/src/ui/notification/notification-card.tsx
+++ b/packages/frontend/component/src/ui/notification/notification-card.tsx
@@ -80,7 +80,10 @@ export const NotificationCard = ({ notification }: NotificationCardProps) => {
             data-float={!!thumb}
             className={clsx(styles.headAlignWrapper, styles.closeButton)}
           >
-            <IconButton onClick={onDismiss}>
+            <IconButton
+              data-testid="notification-close-button"
+              onClick={onDismiss}
+            >
               <CloseIcon className={styles.closeIcon} width={16} height={16} />
             </IconButton>
           </div>
diff --git a/packages/frontend/component/src/ui/scrollbar/scrollbar.tsx b/packages/frontend/component/src/ui/scrollbar/scrollbar.tsx
index 2d2291428a3fa..137c8bf2843dd 100644
--- a/packages/frontend/component/src/ui/scrollbar/scrollbar.tsx
+++ b/packages/frontend/component/src/ui/scrollbar/scrollbar.tsx
@@ -1,7 +1,6 @@
 import * as ScrollArea from '@radix-ui/react-scroll-area';
 import clsx from 'clsx';
 import type { PropsWithChildren } from 'react';
-import { useRef } from 'react';
 
 import * as styles from './index.css';
 import { useHasScrollTop } from './use-has-scroll-top';
@@ -24,8 +23,7 @@ export const ScrollableContainer = ({
   viewPortClassName,
   scrollBarClassName,
 }: PropsWithChildren<ScrollableContainerProps>) => {
-  const ref = useRef<HTMLDivElement>(null);
-  const hasScrollTop = useHasScrollTop(ref);
+  const [setContainer, hasScrollTop] = useHasScrollTop();
   return (
     <ScrollArea.Root
       style={_styles}
@@ -37,7 +35,7 @@ export const ScrollableContainer = ({
       />
       <ScrollArea.Viewport
         className={clsx([styles.scrollableViewport, viewPortClassName])}
-        ref={ref}
+        ref={setContainer}
       >
         <div className={styles.scrollableContainer}>{children}</div>
       </ScrollArea.Viewport>
diff --git a/packages/frontend/component/src/ui/scrollbar/use-has-scroll-top.tsx b/packages/frontend/component/src/ui/scrollbar/use-has-scroll-top.tsx
index b5f5cace49a96..eb0f97225f8d4 100644
--- a/packages/frontend/component/src/ui/scrollbar/use-has-scroll-top.tsx
+++ b/packages/frontend/component/src/ui/scrollbar/use-has-scroll-top.tsx
@@ -1,31 +1,27 @@
-import type { RefObject } from 'react';
-import { useEffect, useState } from 'react';
+import { debounce } from 'lodash-es';
+import { useMemo, useState } from 'react';
 
-export function useHasScrollTop(ref: RefObject<HTMLElement> | null) {
+export function useHasScrollTop() {
   const [hasScrollTop, setHasScrollTop] = useState(false);
-
-  useEffect(() => {
-    if (!ref?.current) {
-      return;
-    }
-
-    const container = ref.current;
-
-    function updateScrollTop() {
-      if (container) {
-        setTimeout(() => {
-          const hasScrollTop = container.scrollTop > 0;
-          setHasScrollTop(hasScrollTop);
-        });
-      }
-    }
-
-    container.addEventListener('scroll', updateScrollTop);
-    updateScrollTop();
-    return () => {
-      container.removeEventListener('scroll', updateScrollTop);
+  const containerRefFn = useMemo(() => {
+    let unsub: (() => void) | null = null;
+    return (container: HTMLElement | null) => {
+      unsub?.();
+      const updateScrollTop = debounce(() => {
+        if (container) {
+          setTimeout(() => {
+            const hasScrollTop = container.scrollTop > 0;
+            setHasScrollTop(hasScrollTop);
+          });
+        }
+      }, 50);
+      container?.addEventListener('scroll', updateScrollTop);
+      updateScrollTop();
+      unsub = () => {
+        container?.removeEventListener('scroll', updateScrollTop);
+      };
     };
-  }, [ref]);
+  }, []);
 
-  return hasScrollTop;
+  return [containerRefFn, hasScrollTop] as const;
 }
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts
index fb6bffe189970..6e55c41b9db9c 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts
@@ -168,7 +168,7 @@ export class ChatPanelMessages extends WithDisposable(ShadowlessElement) {
 
   private _renderAIOnboarding() {
     return this.isLoading ||
-      !this.host.doc.awarenessStore.getFlag('enable_ai_onboarding')
+      !this.host?.doc.awarenessStore.getFlag('enable_ai_onboarding')
       ? nothing
       : html`<div
           style=${styleMap({
diff --git a/packages/frontend/core/src/components/affine/page-properties/styles.css.ts b/packages/frontend/core/src/components/affine/page-properties/styles.css.ts
index 4d8f1e08e1c9b..cf12e239ecf02 100644
--- a/packages/frontend/core/src/components/affine/page-properties/styles.css.ts
+++ b/packages/frontend/core/src/components/affine/page-properties/styles.css.ts
@@ -98,7 +98,7 @@ export const tableHeaderTimestamp = style({
 
 export const tableHeaderDivider = style({
   height: 0,
-  borderTop: `1px solid ${cssVar('borderColor')}`,
+  borderTop: `0.5px solid ${cssVar('borderColor')}`,
   width: '100%',
   margin: '8px 0',
 });
diff --git a/packages/frontend/core/src/components/app-sidebar/index.css.ts b/packages/frontend/core/src/components/app-sidebar/index.css.ts
index 7857584c0ad07..ce3fcf9fcb6ad 100644
--- a/packages/frontend/core/src/components/app-sidebar/index.css.ts
+++ b/packages/frontend/core/src/components/app-sidebar/index.css.ts
@@ -1,5 +1,5 @@
 import { cssVar } from '@toeverything/theme';
-import { globalStyle, style } from '@vanilla-extract/css';
+import { style } from '@vanilla-extract/css';
 export const floatingMaxWidth = 768;
 export const navWrapperStyle = style({
   paddingBottom: '8px',
@@ -11,7 +11,7 @@ export const navWrapperStyle = style({
   },
   selectors: {
     '&[data-has-border=true]': {
-      borderRight: `1px solid ${cssVar('borderColor')}`,
+      borderRight: `0.5px solid ${cssVar('borderColor')}`,
     },
     '&[data-is-floating="true"]': {
       backgroundColor: cssVar('backgroundPrimaryColor'),
@@ -45,14 +45,6 @@ export const navHeaderStyle = style({
   ['WebkitAppRegion' as string]: 'drag',
 });
 
-globalStyle(
-  `html[data-fullscreen="false"]
-  ${navHeaderStyle}[data-is-macos-electron="true"]`,
-  {
-    paddingLeft: '90px',
-  }
-);
-
 export const navBodyStyle = style({
   flex: '1 1 auto',
   height: 'calc(100% - 52px)',
diff --git a/packages/frontend/core/src/components/app-sidebar/index.jotai.ts b/packages/frontend/core/src/components/app-sidebar/index.jotai.ts
index c782e669af682..2d80e6a33f11a 100644
--- a/packages/frontend/core/src/components/app-sidebar/index.jotai.ts
+++ b/packages/frontend/core/src/components/app-sidebar/index.jotai.ts
@@ -2,7 +2,7 @@ import { atom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';
 
 export const APP_SIDEBAR_OPEN = 'app-sidebar-open';
-export const isMobile = window.innerWidth < 768;
+export const isMobile = window.innerWidth < 768 && !environment.isDesktop;
 
 export const appSidebarOpenAtom = atomWithStorage(APP_SIDEBAR_OPEN, !isMobile);
 export const appSidebarFloatingAtom = atom(isMobile);
diff --git a/packages/frontend/core/src/components/app-sidebar/index.tsx b/packages/frontend/core/src/components/app-sidebar/index.tsx
index dff1fda30e777..b11a0c52aec99 100644
--- a/packages/frontend/core/src/components/app-sidebar/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/index.tsx
@@ -41,7 +41,6 @@ const MIN_WIDTH = 248;
 export function AppSidebar({
   children,
   clientBorder,
-  translucentUI,
 }: AppSidebarProps): ReactElement {
   const [open, setOpen] = useAtom(appSidebarOpenAtom);
   const [width, setWidth] = useAtom(appSidebarWidthAtom);
@@ -49,6 +48,11 @@ export function AppSidebar({
   const [resizing, setResizing] = useAtom(appSidebarResizingAtom);
 
   useEffect(() => {
+    // do not float app sidebar on desktop
+    if (environment.isDesktop) {
+      return;
+    }
+
     function onResize() {
       const isFloatingMaxWidth = window.matchMedia(
         `(max-width: ${floatingMaxWidth}px)`
@@ -75,10 +79,8 @@ export function AppSidebar({
     };
   }, [open, setFloating, setOpen, width]);
 
+  const hasRightBorder = !environment.isDesktop && !clientBorder;
   const isMacosDesktop = environment.isDesktop && environment.isMacOs;
-  const hasRightBorder =
-    !environment.isDesktop || (!clientBorder && !translucentUI);
-
   return (
     <>
       <ResizePanel
@@ -96,12 +98,13 @@ export function AppSidebar({
         resizeHandleOffset={clientBorder ? 8 : 0}
         resizeHandleVerticalPadding={clientBorder ? 16 : 0}
         data-transparent
+        data-open={open}
         data-has-border={hasRightBorder}
         data-testid="app-sidebar-wrapper"
         data-is-macos-electron={isMacosDesktop}
       >
         <nav className={navStyle} data-testid="app-sidebar">
-          <SidebarHeader />
+          {!environment.isDesktop && <SidebarHeader />}
           <div className={navBodyStyle} data-testid="sliderBar-inner">
             {children}
           </div>
diff --git a/packages/frontend/core/src/components/app-sidebar/sidebar-containers/index.tsx b/packages/frontend/core/src/components/app-sidebar/sidebar-containers/index.tsx
index cea1850e29f3b..db5b2d2d01b9b 100644
--- a/packages/frontend/core/src/components/app-sidebar/sidebar-containers/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/sidebar-containers/index.tsx
@@ -1,8 +1,7 @@
 import { useHasScrollTop } from '@affine/component';
 import * as ScrollArea from '@radix-ui/react-scroll-area';
 import clsx from 'clsx';
-import type { PropsWithChildren } from 'react';
-import { useRef } from 'react';
+import { type PropsWithChildren } from 'react';
 
 import * as styles from './index.css';
 
@@ -11,8 +10,7 @@ export function SidebarContainer({ children }: PropsWithChildren) {
 }
 
 export function SidebarScrollableContainer({ children }: PropsWithChildren) {
-  const ref = useRef<HTMLDivElement>(null);
-  const hasScrollTop = useHasScrollTop(ref);
+  const [setContainer, hasScrollTop] = useHasScrollTop();
   return (
     <ScrollArea.Root className={styles.scrollableContainerRoot}>
       <div
@@ -21,7 +19,7 @@ export function SidebarScrollableContainer({ children }: PropsWithChildren) {
       />
       <ScrollArea.Viewport
         className={clsx([styles.scrollableViewport])}
-        ref={ref}
+        ref={setContainer}
       >
         <div className={clsx([styles.scrollableContainer])}>{children}</div>
       </ScrollArea.Viewport>
diff --git a/packages/frontend/core/src/components/app-sidebar/sidebar-header/index.tsx b/packages/frontend/core/src/components/app-sidebar/sidebar-header/index.tsx
index 6066c3a06d3e1..3ee548b27e4b3 100644
--- a/packages/frontend/core/src/components/app-sidebar/sidebar-header/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/sidebar-header/index.tsx
@@ -1,6 +1,5 @@
 import { useAtomValue } from 'jotai';
 
-import { NavigationButtons } from '../../../modules/navigation';
 import { navHeaderStyle } from '../index.css';
 import { appSidebarOpenAtom } from '../index.jotai';
 import { SidebarSwitch } from './sidebar-switch';
@@ -9,13 +8,8 @@ export const SidebarHeader = () => {
   const open = useAtomValue(appSidebarOpenAtom);
 
   return (
-    <div
-      className={navHeaderStyle}
-      data-open={open}
-      data-is-macos-electron={environment.isDesktop && environment.isMacOs}
-    >
+    <div className={navHeaderStyle} data-open={open}>
       <SidebarSwitch show={open} />
-      <NavigationButtons />
     </div>
   );
 };
diff --git a/packages/frontend/core/src/components/page-list/list.tsx b/packages/frontend/core/src/components/page-list/list.tsx
index 84bac8f6d680e..6e340afc12f0d 100644
--- a/packages/frontend/core/src/components/page-list/list.tsx
+++ b/packages/frontend/core/src/components/page-list/list.tsx
@@ -7,7 +7,6 @@ import {
   useCallback,
   useEffect,
   useImperativeHandle,
-  useRef,
 } from 'react';
 
 import { usePageHeaderColsDef } from './header-col-def';
@@ -156,8 +155,7 @@ export const ListScrollContainer = forwardRef<
   HTMLDivElement,
   PropsWithChildren<ListScrollContainerProps>
 >(({ className, children, style }, ref) => {
-  const containerRef = useRef<HTMLDivElement | null>(null);
-  const hasScrollTop = useHasScrollTop(containerRef);
+  const [setContainer, hasScrollTop] = useHasScrollTop();
 
   const setNodeRef = useCallback(
     (r: HTMLDivElement) => {
@@ -168,9 +166,9 @@ export const ListScrollContainer = forwardRef<
           ref.current = r;
         }
       }
-      containerRef.current = r;
+      return setContainer(r);
     },
-    [ref]
+    [ref, setContainer]
   );
 
   return (
diff --git a/packages/frontend/core/src/components/page-list/page-header.css.ts b/packages/frontend/core/src/components/page-list/page-header.css.ts
index 37d4115972236..1d65d764a22a6 100644
--- a/packages/frontend/core/src/components/page-list/page-header.css.ts
+++ b/packages/frontend/core/src/components/page-list/page-header.css.ts
@@ -19,7 +19,7 @@ export const tableHeader = style({
   transform: 'translateY(-0.5px)', // fix sticky look through issue
 });
 globalStyle(`[data-has-scroll-top=true] ${tableHeader}`, {
-  boxShadow: `0 1px ${cssVar('borderColor')}`,
+  boxShadow: `0 0.5px ${cssVar('borderColor')}`,
 });
 export const headerTitleSelectionIconWrapper = style({
   display: 'flex',
diff --git a/packages/frontend/core/src/components/pure/header/style.css.tsx b/packages/frontend/core/src/components/pure/header/style.css.tsx
index 5b634bdacc9df..2d2c13aad6875 100644
--- a/packages/frontend/core/src/components/pure/header/style.css.tsx
+++ b/packages/frontend/core/src/components/pure/header/style.css.tsx
@@ -56,6 +56,7 @@ export const headerSideContainer = style({
 
 export const windowAppControlsWrapper = style({
   display: 'flex',
+  flexShrink: 0,
 });
 
 export const windowAppControl = style({
diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
index 4a2dcf6a1a96b..af450d4796e8e 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
@@ -1,4 +1,6 @@
+import { openSettingModalAtom } from '@affine/core/atoms';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
+import { useNavigateHelper } from '@affine/core/hooks/use-navigate-helper';
 import {
   ExplorerCollections,
   ExplorerFavorites,
@@ -7,17 +9,19 @@ import {
   ExplorerOrganize,
 } from '@affine/core/modules/explorer';
 import { ExplorerTags } from '@affine/core/modules/explorer/views/sections/tags';
+import { CMDKQuickSearchService } from '@affine/core/modules/quicksearch/services/cmdk';
 import { TelemetryWorkspaceContextService } from '@affine/core/modules/telemetry/services/telemetry';
+import { pathGenerator } from '@affine/core/shared';
 import { mixpanel } from '@affine/core/utils';
 import { apis, events } from '@affine/electron-api';
 import { useI18n } from '@affine/i18n';
 import { FolderIcon, SettingsIcon } from '@blocksuite/icons/rc';
 import type { Doc } from '@blocksuite/store';
 import type { Workspace } from '@toeverything/infra';
-import { useLiveData, useService } from '@toeverything/infra';
-import { useAtomValue } from 'jotai';
+import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useAtomValue, useSetAtom } from 'jotai';
 import type { ReactElement } from 'react';
-import { memo, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 
 import { useAppSettingHelper } from '../../hooks/affine/use-app-setting-helper';
 import { WorkbenchService } from '../../modules/workbench';
@@ -33,6 +37,7 @@ import {
   SidebarContainer,
   SidebarScrollableContainer,
 } from '../app-sidebar';
+import { usePageHelper } from '../blocksuite/block-suite-page-list/utils';
 import { WorkspaceSelector } from '../workspace-selector';
 import ImportPage from './import-page';
 import {
@@ -64,127 +69,147 @@ export type RootAppSidebarProps = {
  * This is for the whole affine app sidebar.
  * This component wraps the app sidebar in `@affine/component` with logic and data.
  *
- * @todo(himself65): rewrite all styled component into @vanilla-extract/css
  */
-export const RootAppSidebar = memo(
-  ({
-    currentWorkspace,
-    openPage,
-    createPage,
-    paths,
-    onOpenQuickSearchModal,
-    onOpenSettingModal,
-  }: RootAppSidebarProps): ReactElement => {
-    const currentWorkspaceId = currentWorkspace.id;
-    const { appSettings } = useAppSettingHelper();
-    const docCollection = currentWorkspace.docCollection;
-    const t = useI18n();
-    const currentPath = useLiveData(
-      useService(WorkbenchService).workbench.location$.map(
-        location => location.pathname
-      )
-    );
+export const RootAppSidebar = (): ReactElement => {
+  const currentWorkspace = useService(WorkspaceService).workspace;
+  const currentWorkspaceId = currentWorkspace.id;
+  const { openPage } = useNavigateHelper();
+  const { appSettings } = useAppSettingHelper();
+  const docCollection = currentWorkspace.docCollection;
+  const t = useI18n();
+  const currentPath = useLiveData(
+    useService(WorkbenchService).workbench.location$.map(
+      location => location.pathname
+    )
+  );
+  const cmdkQuickSearchService = useService(CMDKQuickSearchService);
+  const onOpenQuickSearchModal = useCallback(() => {
+    cmdkQuickSearchService.toggle();
+    mixpanel.track('QuickSearchOpened', {
+      segment: 'navigation panel',
+      control: 'search button',
+    });
+  }, [cmdkQuickSearchService]);
 
-    const telemetry = useService(TelemetryWorkspaceContextService);
+  const telemetry = useService(TelemetryWorkspaceContextService);
 
-    const allPageActive = currentPath === '/all';
+  const allPageActive = currentPath === '/all';
 
-    const onClickNewPage = useAsyncCallback(async () => {
-      const page = createPage();
-      page.load();
-      openPage(page.id);
-      mixpanel.track('DocCreated', {
-        page: telemetry.getPageContext(),
-        segment: 'navigation panel',
-        module: 'bottom button',
-        control: 'new doc button',
-        category: 'page',
-        type: 'doc',
-      });
-    }, [createPage, openPage, telemetry]);
+  const pageHelper = usePageHelper(currentWorkspace.docCollection);
+  const createPage = useCallback(() => {
+    return pageHelper.createPage();
+  }, [pageHelper]);
 
-    // Listen to the "New Page" action from the menu
-    useEffect(() => {
-      if (environment.isDesktop) {
-        return events?.applicationMenu.onNewPageAction(onClickNewPage);
-      }
-      return;
-    }, [onClickNewPage]);
+  const onClickNewPage = useAsyncCallback(async () => {
+    const page = createPage();
+    page.load();
+    openPage(currentWorkspaceId, page.id);
+    mixpanel.track('DocCreated', {
+      page: telemetry.getPageContext(),
+      segment: 'navigation panel',
+      module: 'bottom button',
+      control: 'new doc button',
+      category: 'page',
+      type: 'doc',
+    });
+  }, [createPage, currentWorkspaceId, openPage, telemetry]);
 
-    const sidebarOpen = useAtomValue(appSidebarOpenAtom);
-    useEffect(() => {
-      if (environment.isDesktop) {
-        apis?.ui.handleSidebarVisibilityChange(sidebarOpen).catch(err => {
-          console.error(err);
-        });
-      }
-    }, [sidebarOpen]);
+  // Listen to the "New Page" action from the menu
+  useEffect(() => {
+    if (environment.isDesktop) {
+      return events?.applicationMenu.onNewPageAction(onClickNewPage);
+    }
+    return;
+  }, [onClickNewPage]);
 
-    return (
-      <AppSidebar
-        clientBorder={appSettings.clientBorder}
-        translucentUI={appSettings.enableBlurBackground}
-      >
-        <SidebarContainer>
-          <div className={workspaceAndUserWrapper}>
-            <div className={workspaceWrapper}>
-              <WorkspaceSelector />
-            </div>
-            <UserInfo />
-          </div>
-          <div className={quickSearchAndNewPage}>
-            <QuickSearchInput
-              className={quickSearch}
-              data-testid="slider-bar-quick-search-button"
-              onClick={onOpenQuickSearchModal}
-            />
-            <AddPageButton onClick={onClickNewPage} />
+  const setOpenSettingModalAtom = useSetAtom(openSettingModalAtom);
+
+  const onOpenSettingModal = useCallback(() => {
+    setOpenSettingModalAtom({
+      activeTab: 'appearance',
+      open: true,
+    });
+    mixpanel.track('SettingsViewed', {
+      // page:
+      segment: 'navigation panel',
+      module: 'general list',
+      control: 'settings button',
+    });
+  }, [setOpenSettingModalAtom]);
+
+  const sidebarOpen = useAtomValue(appSidebarOpenAtom);
+  useEffect(() => {
+    if (environment.isDesktop) {
+      apis?.ui.handleSidebarVisibilityChange(sidebarOpen).catch(err => {
+        console.error(err);
+      });
+    }
+  }, [sidebarOpen]);
+
+  return (
+    <AppSidebar
+      clientBorder={appSettings.clientBorder}
+      translucentUI={appSettings.enableBlurBackground}
+    >
+      <SidebarContainer>
+        <div className={workspaceAndUserWrapper}>
+          <div className={workspaceWrapper}>
+            <WorkspaceSelector />
           </div>
-          <MenuLinkItem
-            icon={<FolderIcon />}
-            active={allPageActive}
-            to={paths.all(currentWorkspaceId)}
-          >
-            <span data-testid="all-pages">
-              {t['com.affine.workspaceSubPath.all']()}
-            </span>
-          </MenuLinkItem>
-          <AppSidebarJournalButton
-            docCollection={currentWorkspace.docCollection}
+          <UserInfo />
+        </div>
+        <div className={quickSearchAndNewPage}>
+          <QuickSearchInput
+            className={quickSearch}
+            data-testid="slider-bar-quick-search-button"
+            onClick={onOpenQuickSearchModal}
           />
-          <MenuItem
-            data-testid="slider-bar-workspace-setting-button"
-            icon={<SettingsIcon />}
-            onClick={onOpenSettingModal}
-          >
-            <span data-testid="settings-modal-trigger">
-              {t['com.affine.settingSidebar.title']()}
-            </span>
-          </MenuItem>
-        </SidebarContainer>
-        <SidebarScrollableContainer>
-          {runtimeConfig.enableNewFavorite && <ExplorerFavorites />}
-          {runtimeConfig.enableOrganize && <ExplorerOrganize />}
-          {runtimeConfig.enableNewFavorite && <ExplorerMigrationFavorites />}
-          {runtimeConfig.enableOldFavorite && (
-            <ExplorerOldFavorites defaultCollapsed />
-          )}
-          <ExplorerCollections defaultCollapsed />
-          <ExplorerTags defaultCollapsed />
-          <CategoryDivider label={t['com.affine.rootAppSidebar.others']()} />
-          {/* fixme: remove the following spacer */}
-          <div style={{ height: '4px' }} />
-          <div style={{ padding: '0 8px' }}>
-            <TrashButton />
-            <ImportPage docCollection={docCollection} />
-          </div>
-        </SidebarScrollableContainer>
-        <SidebarContainer>
-          {environment.isDesktop ? <UpdaterButton /> : <AppDownloadButton />}
-        </SidebarContainer>
-      </AppSidebar>
-    );
-  }
-);
+          <AddPageButton onClick={onClickNewPage} />
+        </div>
+        <MenuLinkItem
+          icon={<FolderIcon />}
+          active={allPageActive}
+          to={pathGenerator.all(currentWorkspaceId)}
+        >
+          <span data-testid="all-pages">
+            {t['com.affine.workspaceSubPath.all']()}
+          </span>
+        </MenuLinkItem>
+        <AppSidebarJournalButton
+          docCollection={currentWorkspace.docCollection}
+        />
+        <MenuItem
+          data-testid="slider-bar-workspace-setting-button"
+          icon={<SettingsIcon />}
+          onClick={onOpenSettingModal}
+        >
+          <span data-testid="settings-modal-trigger">
+            {t['com.affine.settingSidebar.title']()}
+          </span>
+        </MenuItem>
+      </SidebarContainer>
+      <SidebarScrollableContainer>
+        {runtimeConfig.enableNewFavorite && <ExplorerFavorites />}
+        {runtimeConfig.enableOrganize && <ExplorerOrganize />}
+        {runtimeConfig.enableNewFavorite && <ExplorerMigrationFavorites />}
+        {runtimeConfig.enableOldFavorite && (
+          <ExplorerOldFavorites defaultCollapsed />
+        )}
+        <ExplorerCollections defaultCollapsed />
+        <ExplorerTags defaultCollapsed />
+        <CategoryDivider label={t['com.affine.rootAppSidebar.others']()} />
+        {/* fixme: remove the following spacer */}
+        <div style={{ height: '4px' }} />
+        <div style={{ padding: '0 8px' }}>
+          <TrashButton />
+          <ImportPage docCollection={docCollection} />
+        </div>
+      </SidebarScrollableContainer>
+      <SidebarContainer>
+        {environment.isDesktop ? <UpdaterButton /> : <AppDownloadButton />}
+      </SidebarContainer>
+    </AppSidebar>
+  );
+};
 
 RootAppSidebar.displayName = 'memo(RootAppSidebar)';
diff --git a/packages/frontend/core/src/components/workspace/index.css.ts b/packages/frontend/core/src/components/workspace/index.css.ts
index b215a9bca17ed..c7527337eb35f 100644
--- a/packages/frontend/core/src/components/workspace/index.css.ts
+++ b/packages/frontend/core/src/components/workspace/index.css.ts
@@ -4,9 +4,8 @@ export const appStyle = style({
   width: '100%',
   position: 'relative',
   height: '100vh',
-  display: 'flex',
   flexGrow: '1',
-  flexDirection: 'row',
+  display: 'flex',
   backgroundColor: cssVar('backgroundPrimaryColor'),
   selectors: {
     '&[data-is-resizing="true"]': {
@@ -42,11 +41,11 @@ globalStyle(`html[data-theme="dark"] ${appStyle}`, {
     },
   },
 });
+
 export const mainContainerStyle = style({
   position: 'relative',
   zIndex: 0,
-  // it will create stacking context to limit layer of child elements and be lower than after auto zIndex
-  width: 0,
+  width: '100%',
   display: 'flex',
   flex: 1,
   overflow: 'clip',
@@ -71,14 +70,16 @@ export const mainContainerStyle = style({
     '&[data-client-border="true"][data-side-bar-open="true"]': {
       marginLeft: 0,
     },
-    '&[data-client-border="true"]:before': {
-      content: '""',
-      position: 'absolute',
-      height: '8px',
-      width: '100%',
-      top: '-8px',
-      left: 0,
-      ['WebkitAppRegion' as string]: 'drag',
+    '&[data-client-border="true"][data-is-desktop="true"]': {
+      marginTop: 0,
+    },
+    '&[data-client-border="false"][data-is-desktop="true"][data-side-bar-open="true"]':
+      {
+        borderTopLeftRadius: 6,
+      },
+    '&[data-client-border="false"][data-is-desktop="true"]': {
+      borderTop: `0.5px solid ${cssVar('borderColor')}`,
+      borderLeft: `0.5px solid ${cssVar('borderColor')}`,
     },
     '&[data-transparent=true]': {
       backgroundColor: 'transparent',
diff --git a/packages/frontend/core/src/components/workspace/index.tsx b/packages/frontend/core/src/components/workspace/index.tsx
index c4c202eaafa10..54db2200ad06d 100644
--- a/packages/frontend/core/src/components/workspace/index.tsx
+++ b/packages/frontend/core/src/components/workspace/index.tsx
@@ -1,3 +1,4 @@
+import { useAppSettingHelper } from '@affine/core/hooks/affine/use-app-setting-helper';
 import {
   DocsService,
   GlobalContextService,
@@ -26,45 +27,44 @@ export const AppContainer = ({
   ...rest
 }: WorkspaceRootProps) => {
   const noisyBackground = useNoisyBackground && environment.isDesktop;
+  const blurBackground = environment.isDesktop && useBlurBackground;
   return (
     <div
       {...rest}
       className={clsx(appStyle, {
         'noisy-background': noisyBackground,
-        'blur-background': environment.isDesktop && useBlurBackground,
+        'blur-background': blurBackground,
       })}
       data-noise-background={noisyBackground}
       data-is-resizing={resizing}
+      data-blur-background={blurBackground}
     >
       {children}
     </div>
   );
 };
 
-export interface MainContainerProps extends HTMLAttributes<HTMLDivElement> {
-  clientBorder?: boolean;
-}
+export interface MainContainerProps extends HTMLAttributes<HTMLDivElement> {}
 
 export const MainContainer = forwardRef<
   HTMLDivElement,
   PropsWithChildren<MainContainerProps>
->(function MainContainer(
-  { className, children, clientBorder, ...props },
-  ref
-): ReactElement {
+>(function MainContainer({ className, children, ...props }, ref): ReactElement {
   const appSideBarOpen = useAtomValue(appSidebarOpenAtom);
+  const { appSettings } = useAppSettingHelper();
+
   return (
     <div
       {...props}
       className={clsx(mainContainerStyle, className)}
-      data-is-macos={environment.isDesktop && environment.isMacOs}
+      data-is-desktop={environment.isDesktop}
       data-transparent={false}
-      data-client-border={clientBorder}
+      data-client-border={appSettings.clientBorder}
       data-side-bar-open={appSideBarOpen}
       data-testid="main-container"
       ref={ref}
     >
-      {children}
+      <div className={mainContainerStyle}>{children}</div>
     </div>
   );
 });
diff --git a/packages/frontend/core/src/hooks/use-navigate-helper.ts b/packages/frontend/core/src/hooks/use-navigate-helper.ts
index d5c2156ca7f17..af52717ab1f4c 100644
--- a/packages/frontend/core/src/hooks/use-navigate-helper.ts
+++ b/packages/frontend/core/src/hooks/use-navigate-helper.ts
@@ -10,9 +10,8 @@ export enum RouteLogic {
 }
 
 function defaultNavigate(to: To, option?: { replace?: boolean }) {
-  console.log(to, option);
   setTimeout(() => {
-    router.navigate(to, option).catch(err => {
+    router?.navigate(to, option).catch(err => {
       console.error('Failed to navigate', err);
     });
   }, 100);
diff --git a/packages/frontend/core/src/layouts/styles.css.ts b/packages/frontend/core/src/layouts/styles.css.ts
new file mode 100644
index 0000000000000..519f292b9d09e
--- /dev/null
+++ b/packages/frontend/core/src/layouts/styles.css.ts
@@ -0,0 +1,45 @@
+import { style } from '@vanilla-extract/css';
+
+export const browserAppViewContainer = style({
+  display: 'flex',
+  flexFlow: 'row',
+  height: '100%',
+  width: '100%',
+  position: 'relative',
+});
+
+export const desktopAppViewContainer = style({
+  display: 'flex',
+  flexFlow: 'column',
+  height: '100%',
+  width: '100%',
+});
+
+export const desktopAppViewMain = style({
+  display: 'flex',
+  flexFlow: 'row',
+  width: '100%',
+  height: 'calc(100% - 52px)',
+  position: 'relative',
+});
+
+export const desktopTabsHeader = style({
+  display: 'flex',
+  flexFlow: 'row',
+  height: '52px',
+  zIndex: 1,
+  width: '100%',
+  overflow: 'hidden',
+});
+
+export const desktopTabsHeaderTopLeft = style({
+  display: 'flex',
+  flexFlow: 'row',
+  alignItems: 'center',
+  transition: 'width 0.3s, padding 0.3s',
+  justifyContent: 'space-between',
+  marginRight: -8, // make room for tab's padding
+  padding: '0 16px',
+  flexShrink: 0,
+  ['WebkitAppRegion' as string]: 'drag',
+});
diff --git a/packages/frontend/core/src/layouts/workspace-layout.tsx b/packages/frontend/core/src/layouts/workspace-layout.tsx
index d40efe491b207..86f097292d762 100644
--- a/packages/frontend/core/src/layouts/workspace-layout.tsx
+++ b/packages/frontend/core/src/layouts/workspace-layout.tsx
@@ -5,12 +5,12 @@ import {
 } from '@affine/component/global-loading';
 import { useI18n } from '@affine/i18n';
 import { ZipTransformer } from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
 import {
   type DocMode,
   DocsService,
   effect,
   fromPromise,
+  LiveData,
   onStart,
   throwIfAborted,
   useLiveData,
@@ -19,7 +19,7 @@ import {
 } from '@toeverything/infra';
 import { useAtomValue, useSetAtom } from 'jotai';
 import type { PropsWithChildren } from 'react';
-import { useCallback, useEffect } from 'react';
+import { useEffect } from 'react';
 import {
   catchError,
   EMPTY,
@@ -30,33 +30,35 @@ import {
 } from 'rxjs';
 import { Map as YMap } from 'yjs';
 
-import { openSettingModalAtom } from '../atoms';
 import { AIProvider } from '../blocksuite/presets/ai';
 import { WorkspaceAIOnboarding } from '../components/affine/ai-onboarding';
 import { AppContainer } from '../components/affine/app-container';
 import { SyncAwareness } from '../components/affine/awareness';
-import { appSidebarResizingAtom } from '../components/app-sidebar';
-import { usePageHelper } from '../components/blocksuite/block-suite-page-list/utils';
+import {
+  appSidebarFloatingAtom,
+  appSidebarOpenAtom,
+  appSidebarResizingAtom,
+  SidebarSwitch,
+} from '../components/app-sidebar';
+import { appSidebarWidthAtom } from '../components/app-sidebar/index.jotai';
 import { AIIsland } from '../components/pure/ai-island';
 import { RootAppSidebar } from '../components/root-app-sidebar';
 import { MainContainer } from '../components/workspace';
 import { WorkspaceUpgrade } from '../components/workspace-upgrade';
-import { useAppSettingHelper } from '../hooks/affine/use-app-setting-helper';
 import { useRegisterFindInPageCommands } from '../hooks/affine/use-register-find-in-page-commands';
 import { useSubscriptionNotifyReader } from '../hooks/affine/use-subscription-notify';
-import { useNavigateHelper } from '../hooks/use-navigate-helper';
 import { useRegisterWorkspaceCommands } from '../hooks/use-register-workspace-commands';
+import { AppTabsHeader } from '../modules/app-tabs-header';
+import { NavigationButtons } from '../modules/navigation';
 import { useRegisterNavigationCommands } from '../modules/navigation/view/use-register-navigation-commands';
 import { QuickSearchContainer } from '../modules/quicksearch';
-import { CMDKQuickSearchService } from '../modules/quicksearch/services/cmdk';
 import { WorkbenchService } from '../modules/workbench';
 import {
   AllWorkspaceModals,
   CurrentWorkspaceModals,
 } from '../providers/modal-provider';
 import { SWRConfigProvider } from '../providers/swr-config-provider';
-import { pathGenerator } from '../shared';
-import { mixpanel } from '../utils';
+import * as styles from './styles.css';
 
 export const WorkspaceLayout = function WorkspaceLayout({
   children,
@@ -74,26 +76,14 @@ export const WorkspaceLayout = function WorkspaceLayout({
   );
 };
 
-export const WorkspaceLayoutInner = ({ children }: PropsWithChildren) => {
+const WorkspaceLayoutProviders = ({ children }: PropsWithChildren) => {
   const t = useI18n();
   const pushGlobalLoadingEvent = useSetAtom(pushGlobalLoadingEventAtom);
   const resolveGlobalLoadingEvent = useSetAtom(resolveGlobalLoadingEventAtom);
   const currentWorkspace = useService(WorkspaceService).workspace;
   const docsList = useService(DocsService).list;
-  const { openPage } = useNavigateHelper();
-  const pageHelper = usePageHelper(currentWorkspace.docCollection);
-
-  const upgrading = useLiveData(currentWorkspace.upgrade.upgrading$);
-  const needUpgrade = useLiveData(currentWorkspace.upgrade.needUpgrade$);
 
   const workbench = useService(WorkbenchService).workbench;
-
-  const basename = useLiveData(workbench.basename$);
-
-  const currentPath = useLiveData(
-    workbench.location$.map(location => basename + location.pathname)
-  );
-
   useEffect(() => {
     const insertTemplate = effect(
       switchMap(({ template, mode }: { template: string; mode: string }) => {
@@ -180,64 +170,89 @@ export const WorkspaceLayoutInner = ({ children }: PropsWithChildren) => {
     }
   }, [currentWorkspace.docCollection.doc]);
 
-  const handleCreatePage = useCallback(() => {
-    return pageHelper.createPage();
-  }, [pageHelper]);
-
-  const cmdkQuickSearchService = useService(CMDKQuickSearchService);
-  const handleOpenQuickSearchModal = useCallback(() => {
-    cmdkQuickSearchService.toggle();
-    mixpanel.track('QuickSearchOpened', {
-      segment: 'navigation panel',
-      control: 'search button',
-    });
-  }, [cmdkQuickSearchService]);
-
-  const setOpenSettingModalAtom = useSetAtom(openSettingModalAtom);
-
-  const handleOpenSettingModal = useCallback(() => {
-    setOpenSettingModalAtom({
-      activeTab: 'appearance',
-      open: true,
-    });
-
-    mixpanel.track('SettingsViewed', {
-      // page:
-      segment: 'navigation panel',
-      module: 'general list',
-      control: 'settings button',
-    });
-  }, [setOpenSettingModalAtom]);
-
-  const resizing = useAtomValue(appSidebarResizingAtom);
-
-  const { appSettings } = useAppSettingHelper();
-
   return (
     <>
-      <AppContainer data-current-path={currentPath} resizing={resizing}>
-        <RootAppSidebar
-          isPublicWorkspace={false}
-          onOpenQuickSearchModal={handleOpenQuickSearchModal}
-          onOpenSettingModal={handleOpenSettingModal}
-          currentWorkspace={currentWorkspace}
-          openPage={useCallback(
-            (pageId: string) => {
-              assertExists(currentWorkspace);
-              return openPage(currentWorkspace.id, pageId);
-            },
-            [currentWorkspace, openPage]
-          )}
-          createPage={handleCreatePage}
-          paths={pathGenerator}
-        />
-
-        <MainContainer clientBorder={appSettings.clientBorder}>
-          {needUpgrade || upgrading ? <WorkspaceUpgrade /> : children}
-        </MainContainer>
-      </AppContainer>
+      {/* This DndContext is used for drag page from all-pages list into a folder in sidebar */}
+      {children}
       <QuickSearchContainer />
       <SyncAwareness />
     </>
   );
 };
+
+const DesktopLayout = ({ children }: PropsWithChildren) => {
+  const resizing = useAtomValue(appSidebarResizingAtom);
+  const sidebarWidth = useAtomValue(appSidebarWidthAtom);
+  const sidebarOpen = useAtomValue(appSidebarOpenAtom);
+  const sidebarFloating = useAtomValue(appSidebarFloatingAtom);
+  const sidebarResizing = useAtomValue(appSidebarResizingAtom);
+  const isMacosDesktop = environment.isDesktop && environment.isMacOs;
+
+  return (
+    <div className={styles.desktopAppViewContainer}>
+      <div className={styles.desktopTabsHeader}>
+        <div
+          className={styles.desktopTabsHeaderTopLeft}
+          style={{
+            transition: sidebarResizing ? 'none' : undefined,
+            paddingLeft:
+              isMacosDesktop && sidebarOpen && !sidebarFloating ? 90 : 16,
+            width: sidebarOpen && !sidebarFloating ? sidebarWidth : 130,
+          }}
+        >
+          <SidebarSwitch show />
+          <NavigationButtons />
+        </div>
+        <AppTabsHeader reportBoundingUpdate={!resizing} />
+      </div>
+      <div className={styles.desktopAppViewMain}>
+        <RootAppSidebar />
+        <MainContainer>{children}</MainContainer>
+      </div>
+    </div>
+  );
+};
+
+const BrowserLayout = ({ children }: PropsWithChildren) => {
+  return (
+    <div className={styles.browserAppViewContainer}>
+      <RootAppSidebar />
+      <MainContainer>{children}</MainContainer>
+    </div>
+  );
+};
+
+/**
+ * Wraps the workspace layout main router view
+ */
+const WorkspaceLayoutUIContainer = ({ children }: PropsWithChildren) => {
+  const workbench = useService(WorkbenchService).workbench;
+  const currentPath = useLiveData(
+    LiveData.computed(get => {
+      return get(workbench.basename$) + get(workbench.location$).pathname;
+    })
+  );
+
+  const resizing = useAtomValue(appSidebarResizingAtom);
+  const LayoutComponent = environment.isDesktop ? DesktopLayout : BrowserLayout;
+
+  return (
+    <AppContainer data-current-path={currentPath} resizing={resizing}>
+      <LayoutComponent>{children}</LayoutComponent>
+    </AppContainer>
+  );
+};
+export const WorkspaceLayoutInner = ({ children }: PropsWithChildren) => {
+  const currentWorkspace = useService(WorkspaceService).workspace;
+
+  const upgrading = useLiveData(currentWorkspace.upgrade.upgrading$);
+  const needUpgrade = useLiveData(currentWorkspace.upgrade.needUpgrade$);
+
+  return (
+    <WorkspaceLayoutProviders>
+      <WorkspaceLayoutUIContainer>
+        {needUpgrade || upgrading ? <WorkspaceUpgrade /> : children}
+      </WorkspaceLayoutUIContainer>
+    </WorkspaceLayoutProviders>
+  );
+};
diff --git a/packages/frontend/core/src/modules/app-tabs-header/index.ts b/packages/frontend/core/src/modules/app-tabs-header/index.ts
new file mode 100644
index 0000000000000..4dd75898311fc
--- /dev/null
+++ b/packages/frontend/core/src/modules/app-tabs-header/index.ts
@@ -0,0 +1,9 @@
+import { type Framework } from '@toeverything/infra';
+
+import { AppTabsHeaderService } from './services/app-tabs-header-service';
+
+export { AppTabsHeader } from './views/app-tabs-header';
+
+export function configureAppTabsHeaderModule(framework: Framework) {
+  framework.service(AppTabsHeaderService);
+}
diff --git a/packages/frontend/core/src/modules/app-tabs-header/services/app-tabs-header-service.ts b/packages/frontend/core/src/modules/app-tabs-header/services/app-tabs-header-service.ts
new file mode 100644
index 0000000000000..cf3ddd8508bd8
--- /dev/null
+++ b/packages/frontend/core/src/modules/app-tabs-header/services/app-tabs-header-service.ts
@@ -0,0 +1,53 @@
+import { apis, events } from '@affine/electron-api';
+import { LiveData, Service } from '@toeverything/infra';
+import { Observable } from 'rxjs';
+
+export type TabStatus = Parameters<
+  Parameters<NonNullable<typeof events>['ui']['onTabsStatusChange']>[0]
+>[0][number];
+
+export class AppTabsHeaderService extends Service {
+  constructor() {
+    super();
+  }
+
+  tabsStatus$ = LiveData.from<TabStatus[]>(
+    new Observable(subscriber => {
+      let unsub: (() => void) | undefined;
+      apis?.ui
+        .getTabsStatus()
+        .then(tabs => {
+          subscriber.next(tabs);
+          unsub = events?.ui.onTabsStatusChange(tabs => {
+            subscriber.next(tabs);
+          });
+        })
+        .catch(console.error);
+
+      return () => {
+        unsub?.();
+      };
+    }),
+    []
+  );
+
+  showContextMenu = async (workbenchId: string, viewIdx: number) => {
+    await apis?.ui.showTabContextMenu(workbenchId, viewIdx);
+  };
+
+  activateView = async (workbenchId: string, viewIdx: number) => {
+    await apis?.ui.activateView(workbenchId, viewIdx);
+  };
+
+  closeTab = async (workbenchId: string) => {
+    await apis?.ui.closeTab(workbenchId);
+  };
+
+  onAddTab = async () => {
+    await apis?.ui.addTab();
+  };
+
+  onToggleRightSidebar = async () => {
+    await apis?.ui.toggleRightSidebar();
+  };
+}
diff --git a/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx b/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx
new file mode 100644
index 0000000000000..a21017b2a3faf
--- /dev/null
+++ b/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx
@@ -0,0 +1,230 @@
+import { IconButton, Loading, observeResize } from '@affine/component';
+import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls';
+import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
+import { DesktopStateSynchronizer } from '@affine/core/modules/workbench/services/desktop-state-synchronizer';
+import type { WorkbenchMeta } from '@affine/electron-api';
+import { apis } from '@affine/electron-api';
+import {
+  CloseIcon,
+  DeleteIcon,
+  EdgelessIcon,
+  FolderIcon,
+  PageIcon,
+  PlusIcon,
+  RightSidebarIcon,
+  TagIcon,
+  TodayIcon,
+  ViewLayersIcon,
+} from '@blocksuite/icons/rc';
+import {
+  useLiveData,
+  useService,
+  useServiceOptional,
+} from '@toeverything/infra';
+import { debounce, partition } from 'lodash-es';
+import {
+  Fragment,
+  type MouseEventHandler,
+  type ReactNode,
+  useEffect,
+  useRef,
+} from 'react';
+
+import {
+  AppTabsHeaderService,
+  type TabStatus,
+} from '../services/app-tabs-header-service';
+import * as styles from './styles.css';
+
+type ModuleName = NonNullable<WorkbenchMeta['views'][0]['moduleName']>;
+
+const moduleNameToIcon = {
+  all: <FolderIcon />,
+  collection: <ViewLayersIcon />,
+  doc: <PageIcon />,
+  page: <PageIcon />,
+  edgeless: <EdgelessIcon />,
+  journal: <TodayIcon />,
+  tag: <TagIcon />,
+  trash: <DeleteIcon />,
+} satisfies Record<ModuleName, ReactNode>;
+
+const WorkbenchTab = ({
+  workbench,
+  active: tabActive,
+  tabsLength,
+}: {
+  workbench: TabStatus;
+  active: boolean;
+  tabsLength: number;
+}) => {
+  const tabsHeaderService = useService(AppTabsHeaderService);
+  const activeViewIndex = workbench.activeViewIndex ?? 0;
+  const onContextMenu = useAsyncCallback(
+    async (viewIdx: number) => {
+      await tabsHeaderService.showContextMenu(workbench.id, viewIdx);
+    },
+    [tabsHeaderService, workbench.id]
+  );
+  const onActivateView = useAsyncCallback(
+    async (viewIdx: number) => {
+      await tabsHeaderService.activateView(workbench.id, viewIdx);
+    },
+    [tabsHeaderService, workbench.id]
+  );
+  const onCloseTab: MouseEventHandler = useAsyncCallback(
+    async e => {
+      e.stopPropagation();
+
+      await tabsHeaderService.closeTab(workbench.id);
+    },
+    [tabsHeaderService, workbench.id]
+  );
+
+  return (
+    <div
+      key={workbench.id}
+      data-active={tabActive}
+      data-pinned={workbench.pinned}
+      className={styles.tab}
+    >
+      {workbench.views.map((view, viewIdx) => {
+        return (
+          <Fragment key={view.id}>
+            <button
+              key={view.id}
+              className={styles.splitViewLabel}
+              data-active={activeViewIndex === viewIdx && tabActive}
+              onContextMenu={() => {
+                onContextMenu(viewIdx);
+              }}
+              onClick={e => {
+                e.stopPropagation();
+                onActivateView(viewIdx);
+              }}
+            >
+              <div className={styles.labelIcon}>
+                {workbench.ready || !workbench.loaded ? (
+                  moduleNameToIcon[view.moduleName ?? 'all']
+                ) : (
+                  <Loading />
+                )}
+              </div>
+              {workbench.pinned || !view.title ? null : (
+                <div title={view.title} className={styles.splitViewLabelText}>
+                  {view.title}
+                </div>
+              )}
+            </button>
+
+            {viewIdx !== workbench.views.length - 1 ? (
+              <div className={styles.splitViewSeparator} />
+            ) : null}
+          </Fragment>
+        );
+      })}
+      {!workbench.pinned && tabsLength > 1 ? (
+        <div className={styles.tabCloseButtonWrapper}>
+          <button className={styles.tabCloseButton} onClick={onCloseTab}>
+            <CloseIcon />
+          </button>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export const AppTabsHeader = ({
+  style,
+  reportBoundingUpdate,
+}: {
+  style?: React.CSSProperties;
+  reportBoundingUpdate?: boolean;
+}) => {
+  const tabsHeaderService = useService(AppTabsHeaderService);
+  const tabs = useLiveData(tabsHeaderService.tabsStatus$);
+
+  const [pinned, unpinned] = partition(tabs, tab => tab.pinned);
+
+  const onAddTab = useAsyncCallback(async () => {
+    await tabsHeaderService.onAddTab();
+  }, [tabsHeaderService]);
+
+  const onToggleRightSidebar = useAsyncCallback(async () => {
+    await tabsHeaderService.onToggleRightSidebar();
+  }, [tabsHeaderService]);
+
+  const ref = useRef<HTMLDivElement | null>(null);
+
+  useServiceOptional(DesktopStateSynchronizer);
+
+  useEffect(() => {
+    if (ref.current && reportBoundingUpdate) {
+      return observeResize(
+        ref.current,
+        debounce(() => {
+          if (document.visibilityState === 'visible') {
+            const rect = ref.current?.getBoundingClientRect();
+            if (!rect) {
+              return;
+            }
+            const toInt = (value: number) => Math.round(value);
+            const boundRect = {
+              height: toInt(rect.height),
+              width: toInt(rect.width),
+              x: toInt(rect.x),
+              y: toInt(rect.y),
+            };
+            apis?.ui.updateTabsBoundingRect(boundRect).catch(console.error);
+          }
+        }, 50)
+      );
+    }
+    return;
+  }, [reportBoundingUpdate]);
+
+  return (
+    <div
+      className={styles.root}
+      ref={ref}
+      style={style}
+      data-is-windows={environment.isDesktop && environment.isWindows}
+    >
+      <div className={styles.tabs}>
+        {pinned.map(tab => {
+          return (
+            <WorkbenchTab
+              tabsLength={pinned.length}
+              key={tab.id}
+              workbench={tab}
+              active={tab.active}
+            />
+          );
+        })}
+        {pinned.length > 0 && unpinned.length > 0 && (
+          <div className={styles.pinSeparator} />
+        )}
+        {unpinned.map(workbench => {
+          return (
+            <WorkbenchTab
+              tabsLength={tabs.length}
+              key={workbench.id}
+              workbench={workbench}
+              active={workbench.active}
+            />
+          );
+        })}
+        <IconButton onClick={onAddTab}>
+          <PlusIcon />
+        </IconButton>
+      </div>
+      <div className={styles.spacer} />
+      <IconButton size="large" onClick={onToggleRightSidebar}>
+        <RightSidebarIcon />
+      </IconButton>
+      {environment.isDesktop && environment.isWindows ? (
+        <WindowsAppControls />
+      ) : null}
+    </div>
+  );
+};
diff --git a/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts b/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts
new file mode 100644
index 0000000000000..71e7ee7e56450
--- /dev/null
+++ b/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts
@@ -0,0 +1,178 @@
+import { cssVar } from '@toeverything/theme';
+import { style } from '@vanilla-extract/css';
+
+export const root = style({
+  width: '100%',
+  height: '52px',
+  display: 'flex',
+  alignItems: 'center',
+  flexDirection: 'row',
+  gap: '8px',
+  overflow: 'clip',
+  pointerEvents: 'auto',
+  ['WebkitAppRegion' as string]: 'drag',
+  selectors: {
+    '&[data-is-windows="false"]': {
+      paddingRight: 8,
+    },
+  },
+});
+
+export const tabs = style({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  padding: '0 8px',
+  gap: '8px',
+  overflow: 'clip',
+  height: '100%',
+  selectors: {
+    '&[data-pinned="true"]': {
+      flexShrink: 0,
+    },
+  },
+});
+
+export const pinSeparator = style({
+  background: cssVar('iconSecondary'),
+  width: 1,
+  height: 16,
+  flexShrink: 0,
+});
+
+export const splitViewSeparator = style({
+  background: cssVar('borderColor'),
+  width: 1,
+  height: '100%',
+  flexShrink: 0,
+});
+
+export const tab = style({
+  height: 32,
+  minWidth: 32,
+  overflow: 'clip',
+  background: cssVar('backgroundSecondaryColor'),
+  display: 'flex',
+  justifyContent: 'flex-start',
+  alignItems: 'center',
+  color: cssVar('textSecondaryColor'),
+  userSelect: 'none',
+  borderRadius: 4,
+  position: 'relative',
+  ['WebkitAppRegion' as string]: 'no-drag',
+  selectors: {
+    '&[data-active="true"]': {
+      background: cssVar('backgroundPrimaryColor'),
+      boxShadow: cssVar('shadow1'),
+    },
+    '&[data-pinned="false"]': {
+      paddingRight: 20,
+    },
+    '&[data-pinned="true"]': {
+      flexShrink: 0,
+    },
+  },
+});
+
+export const splitViewLabel = style({
+  minWidth: 32,
+  padding: '0 8px',
+  height: '100%',
+  display: 'flex',
+  gap: '4px',
+  fontWeight: 500,
+  alignItems: 'center',
+  maxWidth: 180,
+  cursor: 'default',
+});
+
+export const splitViewLabelText = style({
+  minWidth: 0,
+  textOverflow: 'ellipsis',
+  overflow: 'clip',
+  whiteSpace: 'nowrap',
+  color: cssVar('textSecondaryColor'),
+  fontSize: cssVar('fontXs'),
+  selectors: {
+    [`${splitViewLabel}:hover &`]: {
+      color: cssVar('textPrimaryColor'),
+    },
+    [`${splitViewLabel}[data-active="true"] &`]: {
+      color: cssVar('primaryColor'),
+    },
+    [`${splitViewLabel}:last-of-type &`]: {
+      textOverflow: 'clip',
+    },
+  },
+});
+
+export const tabIcon = style({
+  color: cssVar('iconSecondary'),
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+});
+
+export const labelIcon = style([
+  tabIcon,
+  {
+    width: 16,
+    height: 16,
+    fontSize: 16,
+    flexShrink: 0,
+    selectors: {
+      [`${tab}[data-active=true] &`]: {
+        color: cssVar('primaryColor'),
+      },
+      [`${splitViewLabel}[data-active=false]:hover &`]: {
+        color: cssVar('iconColor'),
+      },
+    },
+  },
+]);
+
+export const tabCloseButtonWrapper = style({
+  pointerEvents: 'none',
+  position: 'absolute',
+  right: 0,
+  top: 0,
+  bottom: 0,
+  height: '100%',
+  width: 16,
+  overflow: 'clip',
+  display: 'flex',
+  alignItems: 'center',
+  paddingRight: 4,
+  justifyContent: 'flex-end',
+  selectors: {
+    [`${tab}:is([data-active=true], :hover) &`]: {
+      width: 40,
+    },
+    [`${tab}[data-active=true] &`]: {
+      background: `linear-gradient(270deg, ${cssVar('backgroundPrimaryColor')} 52.86%, rgba(255, 255, 255, 0.00) 100%)`,
+    },
+    [`${tab}[data-active=false] &`]: {
+      background: `linear-gradient(270deg, ${cssVar('backgroundSecondaryColor')} 65.71%, rgba(244, 244, 245, 0.00) 100%)`,
+    },
+  },
+});
+
+export const tabCloseButton = style([
+  tabIcon,
+  {
+    pointerEvents: 'auto',
+    width: 16,
+    height: '100%',
+    display: 'none',
+    color: cssVar('iconColor'),
+    selectors: {
+      [`${tab}:is([data-active=true], :hover) &`]: {
+        display: 'flex',
+      },
+    },
+  },
+]);
+
+export const spacer = style({
+  flexGrow: 1,
+});
diff --git a/packages/frontend/core/src/modules/index.ts b/packages/frontend/core/src/modules/index.ts
index 66b4936eb5bb0..2391a16187ae0 100644
--- a/packages/frontend/core/src/modules/index.ts
+++ b/packages/frontend/core/src/modules/index.ts
@@ -16,14 +16,12 @@ import { configureQuickSearchModule } from './quicksearch';
 import { configureShareDocsModule } from './share-doc';
 import { configureTagModule } from './tag';
 import { configureTelemetryModule } from './telemetry';
-import { configureWorkbenchModule } from './workbench';
 
 export function configureCommonModules(framework: Framework) {
   configureInfraModules(framework);
   configureCollectionModule(framework);
   configureNavigationModule(framework);
   configureTagModule(framework);
-  configureWorkbenchModule(framework);
   configureWorkspacePropertiesModule(framework);
   configureCloudModule(framework);
   configureQuotaModule(framework);
diff --git a/packages/frontend/core/src/modules/navigation/utils.ts b/packages/frontend/core/src/modules/navigation/utils.ts
index 5017b40040e0e..8d64800726e9c 100644
--- a/packages/frontend/core/src/modules/navigation/utils.ts
+++ b/packages/frontend/core/src/modules/navigation/utils.ts
@@ -18,11 +18,13 @@ export const resolveRouteLinkMeta = (href: string) => {
       return null;
     }
 
-    // http://xxx/workspace/all/yyy
-    // to { workspaceId: '48__RTCSwASvWZxyAk3Jw', docId: '-Uge-K6SYcAbcNYfQ5U-j', blockId: 'xxxx' }
+    const hash = url.hash;
+    const pathname = url.pathname;
 
+    // http://---/workspace/{workspaceid}/xxx/yyy
+    // http://---/workspace/{workspaceid}/xxx
     const [_, workspaceId, moduleName, subModuleName] =
-      url.toString().match(/\/workspace\/([^/]+)\/([^#]+)(?:#(.+))?/) || [];
+      pathname.match(/\/workspace\/([^/]+)\/([^/]+)(?:\/([^/]+))?/) || [];
 
     if (isRouteModulePath(moduleName)) {
       return {
@@ -36,7 +38,7 @@ export const resolveRouteLinkMeta = (href: string) => {
         workspaceId,
         moduleName: 'doc' as const,
         docId: moduleName,
-        blockId: subModuleName,
+        blockId: hash.slice(1),
       };
     }
     return;
@@ -48,7 +50,8 @@ export const resolveRouteLinkMeta = (href: string) => {
 /**
  * @see /packages/frontend/core/src/router.tsx
  */
-const routeModulePaths = ['all', 'collection', 'tag', 'trash'] as const;
+export const routeModulePaths = ['all', 'collection', 'tag', 'trash'] as const;
+export type RouteModulePath = (typeof routeModulePaths)[number];
 
 const isRouteModulePath = (
   path: string
diff --git a/packages/frontend/core/src/modules/workbench/entities/view.ts b/packages/frontend/core/src/modules/workbench/entities/view.ts
index 04bd65d97a902..c91fbf18f3890 100644
--- a/packages/frontend/core/src/modules/workbench/entities/view.ts
+++ b/packages/frontend/core/src/modules/workbench/entities/view.ts
@@ -13,7 +13,14 @@ export class View extends Entity<{
   scope = this.framework.createScope(ViewScope, {
     view: this as View,
   });
-  id = this.props.id;
+
+  get id() {
+    return this.props.id;
+  }
+
+  set id(id: string) {
+    this.props.id = id;
+  }
 
   sidebarTabs$ = new LiveData<SidebarTab[]>([]);
 
diff --git a/packages/frontend/core/src/modules/workbench/entities/workbench.ts b/packages/frontend/core/src/modules/workbench/entities/workbench.ts
index 4593d85506785..24dc2d3b11906 100644
--- a/packages/frontend/core/src/modules/workbench/entities/workbench.ts
+++ b/packages/frontend/core/src/modules/workbench/entities/workbench.ts
@@ -3,6 +3,7 @@ import { Entity, LiveData } from '@toeverything/infra';
 import type { To } from 'history';
 import { nanoid } from 'nanoid';
 
+import type { WorkbenchDefaultState } from '../services/workbench-view-state';
 import { View } from './view';
 
 export type WorkbenchPosition = 'beside' | 'active' | 'head' | 'tail' | number;
@@ -13,17 +14,27 @@ interface WorkbenchOpenOptions {
 }
 
 export class Workbench extends Entity {
-  readonly views$ = new LiveData([
-    this.framework.createEntity(View, { id: nanoid() }),
-  ]);
+  constructor(private readonly defaultState: WorkbenchDefaultState) {
+    super();
+  }
+
+  readonly activeViewIndex$ = new LiveData(this.defaultState.activeViewIndex);
+  readonly basename$ = new LiveData(this.defaultState.basename);
+
+  readonly views$: LiveData<View[]> = new LiveData(
+    this.defaultState.views.map(meta => {
+      return this.framework.createEntity(View, {
+        id: meta.id,
+        defaultLocation: meta.path,
+      });
+    })
+  );
 
-  activeViewIndex$ = new LiveData(0);
   activeView$ = LiveData.computed(get => {
     const activeIndex = get(this.activeViewIndex$);
     const views = get(this.views$);
-    return views[activeIndex];
+    return views[activeIndex]; // todo: this could be null
   });
-  basename$ = new LiveData('/');
   location$ = LiveData.computed(get => {
     return get(get(this.activeView$).location$);
   });
@@ -34,6 +45,10 @@ export class Workbench extends Entity {
     this.activeViewIndex$.next(index);
   }
 
+  updateBasename(basename: string) {
+    this.basename$.next(basename);
+  }
+
   createView(at: WorkbenchPosition = 'beside', defaultLocation: To) {
     const view = this.framework.createEntity(View, {
       id: nanoid(),
diff --git a/packages/frontend/core/src/modules/workbench/index.ts b/packages/frontend/core/src/modules/workbench/index.ts
index fe76b315d73f8..5d404cf94ddb0 100644
--- a/packages/frontend/core/src/modules/workbench/index.ts
+++ b/packages/frontend/core/src/modules/workbench/index.ts
@@ -6,22 +6,55 @@ export { ViewBody, ViewHeader, ViewSidebarTab } from './view/view-islands';
 export { WorkbenchLink } from './view/workbench-link';
 export { WorkbenchRoot } from './view/workbench-root';
 
-import { type Framework, WorkspaceScope } from '@toeverything/infra';
+import {
+  DocsService,
+  type Framework,
+  GlobalStateService,
+  WorkspaceScope,
+} from '@toeverything/infra';
 
+import { WorkspacePropertiesAdapter } from '../properties';
 import { SidebarTab } from './entities/sidebar-tab';
 import { View } from './entities/view';
 import { Workbench } from './entities/workbench';
 import { ViewScope } from './scopes/view';
+import { DesktopStateSynchronizer } from './services/desktop-state-synchronizer';
 import { ViewService } from './services/view';
 import { WorkbenchService } from './services/workbench';
+import {
+  DesktopWorkbenchDefaultState,
+  InMemoryWorkbenchDefaultState,
+  WorkbenchDefaultState,
+} from './services/workbench-view-state';
 
-export function configureWorkbenchModule(services: Framework) {
+export function configureWorkbenchCommonModule(services: Framework) {
   services
     .scope(WorkspaceScope)
     .service(WorkbenchService)
-    .entity(Workbench)
+    .entity(Workbench, [WorkbenchDefaultState])
     .entity(View)
     .scope(ViewScope)
     .service(ViewService, [ViewScope])
     .entity(SidebarTab);
 }
+
+export function configureBrowserWorkbenchModule(services: Framework) {
+  configureWorkbenchCommonModule(services);
+  services
+    .scope(WorkspaceScope)
+    .impl(WorkbenchDefaultState, InMemoryWorkbenchDefaultState);
+}
+
+export function configureDesktopWorkbenchModule(services: Framework) {
+  configureWorkbenchCommonModule(services);
+  services
+    .scope(WorkspaceScope)
+    .impl(WorkbenchDefaultState, DesktopWorkbenchDefaultState, [
+      GlobalStateService,
+    ])
+    .service(DesktopStateSynchronizer, [
+      WorkbenchService,
+      WorkspacePropertiesAdapter,
+      DocsService,
+    ]);
+}
diff --git a/packages/frontend/core/src/modules/workbench/services/desktop-state-synchronizer.ts b/packages/frontend/core/src/modules/workbench/services/desktop-state-synchronizer.ts
new file mode 100644
index 0000000000000..5dd3e8d869ec2
--- /dev/null
+++ b/packages/frontend/core/src/modules/workbench/services/desktop-state-synchronizer.ts
@@ -0,0 +1,227 @@
+import {
+  apis,
+  appInfo,
+  events,
+  type WorkbenchViewMeta,
+} from '@affine/electron-api';
+import { I18n, type I18nKeys, i18nTime } from '@affine/i18n';
+import type { DocsService } from '@toeverything/infra';
+import { Service } from '@toeverything/infra';
+import { combineLatest, filter, map, of, switchMap } from 'rxjs';
+
+import { resolveRouteLinkMeta } from '../../navigation';
+import type { RouteModulePath } from '../../navigation/utils';
+import type { WorkspacePropertiesAdapter } from '../../properties';
+import type { WorkbenchService } from '../../workbench';
+
+const routeModuleToI18n = {
+  all: 'All pages',
+  collection: 'Collections',
+  tag: 'Tags',
+  trash: 'Trash',
+} satisfies Record<RouteModulePath, I18nKeys>;
+
+/**
+ * Synchronize workbench state with state stored in main process
+ */
+export class DesktopStateSynchronizer extends Service {
+  constructor(
+    private readonly workbenchService: WorkbenchService,
+    private readonly workspaceProperties: WorkspacePropertiesAdapter,
+    private readonly docsService: DocsService
+  ) {
+    super();
+    this.startSync();
+  }
+
+  startSync = () => {
+    if (!environment.isDesktop) {
+      return;
+    }
+
+    const workbench = this.workbenchService.workbench;
+
+    events?.ui.onTabAction(event => {
+      if (
+        event.type === 'open-in-split-view' &&
+        event.payload.tabId === appInfo?.viewId
+      ) {
+        const activeView = workbench.activeView$.value;
+        if (activeView) {
+          workbench.open(activeView.location$.value, {
+            at: 'beside',
+          });
+        }
+      }
+
+      if (
+        event.type === 'separate-view' &&
+        event.payload.tabId === appInfo?.viewId
+      ) {
+        const view = workbench.viewAt(event.payload.viewIndex);
+        if (view) {
+          workbench.close(view);
+        }
+      }
+
+      if (
+        event.type === 'activate-view' &&
+        event.payload.tabId === appInfo?.viewId
+      ) {
+        workbench.active(event.payload.viewIndex);
+      }
+    });
+
+    events?.ui.onToggleRightSidebar(tabId => {
+      if (tabId === appInfo?.viewId) {
+        workbench.sidebarOpen$.next(!workbench.sidebarOpen$.value);
+      }
+    });
+
+    // sync workbench state with main process
+    // also fill tab view meta with title & moduleName
+    this.workspaceProperties.workspace.engine.rootDocState$
+      .pipe(
+        filter(v => v.ready),
+        switchMap(() => workbench.views$),
+        switchMap(views => {
+          return combineLatest(
+            views.map(view =>
+              view.location$.map(location => {
+                return {
+                  view,
+                  location,
+                };
+              })
+            )
+          );
+        }),
+        map(viewLocations => {
+          if (!apis || !appInfo?.viewId) {
+            return;
+          }
+
+          const viewMetas = viewLocations.map(({ view, location }) => {
+            return {
+              id: view.id,
+              path: location,
+            };
+          });
+
+          return viewMetas.map(viewMeta => this.fillTabViewMeta(viewMeta));
+        }),
+        filter(v => !!v),
+        switchMap(viewMetas => {
+          return this.docsService.list.docs$.pipe(
+            switchMap(docs => {
+              return combineLatest(
+                viewMetas.map(vm => {
+                  return (
+                    docs
+                      .find(doc => doc.id === vm.docId)
+                      ?.mode$.asObservable() ?? of('page')
+                  ).pipe(
+                    map(mode => ({
+                      ...vm,
+                      moduleName:
+                        vm.moduleName === 'page' ? mode : vm.moduleName,
+                    }))
+                  );
+                })
+              );
+            })
+          );
+        })
+      )
+      .subscribe(viewMetas => {
+        if (!apis || !appInfo?.viewId) {
+          return;
+        }
+
+        apis.ui
+          .updateWorkbenchMeta(appInfo.viewId, {
+            views: viewMetas,
+          })
+          .catch(console.error);
+      });
+
+    workbench.activeViewIndex$.subscribe(activeViewIndex => {
+      if (!apis || !appInfo?.viewId) {
+        return;
+      }
+
+      apis.ui
+        .updateWorkbenchMeta(appInfo.viewId, {
+          activeViewIndex: activeViewIndex,
+        })
+        .catch(console.error);
+    });
+
+    workbench.basename$.subscribe(basename => {
+      if (!apis || !appInfo?.viewId) {
+        return;
+      }
+
+      apis.ui
+        .updateWorkbenchMeta(appInfo.viewId, {
+          basename: basename,
+        })
+        .catch(console.error);
+    });
+  };
+
+  private toFullUrl(
+    basename: string,
+    location: { hash?: string; pathname?: string; search?: string }
+  ) {
+    return basename + location.pathname + location.search + location.hash;
+  }
+
+  // fill tab view meta with title & moduleName
+  private fillTabViewMeta(
+    view: WorkbenchViewMeta
+  ): WorkbenchViewMeta & { docId?: string } {
+    if (!view.path) {
+      return view;
+    }
+
+    const url = this.toFullUrl(
+      this.workbenchService.workbench.basename$.value,
+      view.path
+    );
+    const linkMeta = resolveRouteLinkMeta(url);
+
+    if (!linkMeta) {
+      return view;
+    }
+
+    const journalString =
+      linkMeta.moduleName === 'doc'
+        ? this.workspaceProperties.getJournalPageDateString(linkMeta.docId)
+        : undefined;
+    const isJournal = !!journalString;
+
+    const title = (() => {
+      // todo: resolve more module types like collections?
+      if (linkMeta?.moduleName === 'doc') {
+        if (journalString) {
+          return i18nTime(journalString, { absolute: { accuracy: 'day' } });
+        }
+        return (
+          this.workspaceProperties.workspace.docCollection.meta.getDocMeta(
+            linkMeta.docId
+          )?.title || I18n['Untitled']()
+        );
+      } else {
+        return I18n[routeModuleToI18n[linkMeta.moduleName]]();
+      }
+    })();
+
+    return {
+      ...view,
+      title: title,
+      docId: linkMeta.docId,
+      moduleName: isJournal ? 'journal' : linkMeta.moduleName,
+    };
+  }
+}
diff --git a/packages/frontend/core/src/modules/workbench/services/workbench-view-state.ts b/packages/frontend/core/src/modules/workbench/services/workbench-view-state.ts
new file mode 100644
index 0000000000000..0baf4351dbf41
--- /dev/null
+++ b/packages/frontend/core/src/modules/workbench/services/workbench-view-state.ts
@@ -0,0 +1,60 @@
+import { appInfo, type TabViewsMetaSchema } from '@affine/electron-api';
+import type { GlobalStateService } from '@toeverything/infra';
+import { createIdentifier, Service } from '@toeverything/infra';
+import { nanoid } from 'nanoid';
+
+export type WorkbenchDefaultState = {
+  basename: string;
+  views: {
+    id: string;
+    path?: { pathname?: string; hash?: string; search?: string };
+  }[];
+  activeViewIndex: number;
+};
+
+export const WorkbenchDefaultState = createIdentifier<WorkbenchDefaultState>(
+  'WorkbenchDefaultState'
+);
+
+export const InMemoryWorkbenchDefaultState: WorkbenchDefaultState = {
+  basename: '/',
+  views: [
+    {
+      id: nanoid(),
+    },
+  ],
+  activeViewIndex: 0,
+};
+
+export class DesktopWorkbenchDefaultState
+  extends Service
+  implements WorkbenchDefaultState
+{
+  constructor(private readonly globalStateService: GlobalStateService) {
+    super();
+  }
+
+  get value() {
+    const tabViewsMeta =
+      this.globalStateService.globalState.get<TabViewsMetaSchema>(
+        'tabViewsMetaSchema'
+      );
+
+    return (
+      tabViewsMeta?.workbenches.find(w => w.id === appInfo?.viewId) ||
+      InMemoryWorkbenchDefaultState
+    );
+  }
+
+  get basename() {
+    return this.value.basename;
+  }
+
+  get activeViewIndex() {
+    return this.value.activeViewIndex;
+  }
+
+  get views() {
+    return this.value.views;
+  }
+}
diff --git a/packages/frontend/core/src/modules/workbench/view/desktop-adapter.ts b/packages/frontend/core/src/modules/workbench/view/desktop-adapter.ts
index 110334712a90f..702176ff13db3 100644
--- a/packages/frontend/core/src/modules/workbench/view/desktop-adapter.ts
+++ b/packages/frontend/core/src/modules/workbench/view/desktop-adapter.ts
@@ -21,7 +21,6 @@ export function useBindWorkbenchToDesktopRouter(
   basename: string
 ) {
   const browserLocation = useLocation();
-
   useEffect(() => {
     const newLocation = browserLocationToViewLocation(
       browserLocation,
@@ -37,7 +36,6 @@ export function useBindWorkbenchToDesktopRouter(
     ) {
       return;
     }
-
     workbench.open(newLocation);
   }, [basename, browserLocation, workbench]);
 }
diff --git a/packages/frontend/core/src/modules/workbench/view/route-container.css.ts b/packages/frontend/core/src/modules/workbench/view/route-container.css.ts
index 663671238f5ff..b5742a8063efd 100644
--- a/packages/frontend/core/src/modules/workbench/view/route-container.css.ts
+++ b/packages/frontend/core/src/modules/workbench/view/route-container.css.ts
@@ -20,7 +20,6 @@ export const header = style({
   flexShrink: 0,
   background: cssVar('backgroundPrimaryColor'),
   padding: '0 16px',
-  ['WebkitAppRegion' as string]: 'drag',
   '@media': {
     print: {
       display: 'none',
@@ -62,10 +61,3 @@ export const viewHeaderContainer = style({
   flexGrow: 1,
   minWidth: 12,
 });
-
-export const windowsAppControlsContainer = style({
-  display: 'flex',
-  height: '100%',
-  marginRight: '-16px',
-  paddingLeft: '16px',
-});
diff --git a/packages/frontend/core/src/modules/workbench/view/route-container.tsx b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
index 02654e2945047..717b342513d15 100644
--- a/packages/frontend/core/src/modules/workbench/view/route-container.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
@@ -1,5 +1,4 @@
 import { IconButton } from '@affine/component';
-import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls';
 import { RightSidebarIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useAtomValue } from 'jotai';
@@ -50,12 +49,11 @@ export const RouteContainer = ({ route }: Props) => {
   const handleToggleSidebar = useCallback(() => {
     workbench.toggleSidebar();
   }, [workbench]);
-  const isWindowsDesktop = environment.isDesktop && environment.isWindows;
 
   return (
     <div className={styles.root}>
       <div className={styles.header}>
-        {viewPosition.isFirst && (
+        {viewPosition.isFirst && !environment.isDesktop && (
           <SidebarSwitch
             show={!leftSidebarOpen}
             className={styles.leftSidebarButton}
@@ -65,19 +63,12 @@ export const RouteContainer = ({ route }: Props) => {
           viewId={view.id}
           className={styles.viewHeaderContainer}
         />
-        {viewPosition.isLast && (
-          <>
-            <ToggleButton
-              show={!sidebarOpen}
-              className={styles.rightSidebarButton}
-              onToggle={handleToggleSidebar}
-            />
-            {isWindowsDesktop && !sidebarOpen && (
-              <div className={styles.windowsAppControlsContainer}>
-                <WindowsAppControls />
-              </div>
-            )}
-          </>
+        {viewPosition.isLast && !environment.isDesktop && (
+          <ToggleButton
+            show={!sidebarOpen}
+            className={styles.rightSidebarButton}
+            onToggle={handleToggleSidebar}
+          />
         )}
       </div>
 
diff --git a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.css.ts b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.css.ts
index f06770b1408b9..9f12241b70c51 100644
--- a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.css.ts
+++ b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.css.ts
@@ -25,7 +25,10 @@ export const sidebarBodyTarget = style({
   height: '100%',
   overflow: 'hidden',
   alignItems: 'center',
-  borderTop: `1px solid ${cssVar('borderColor')}`,
+});
+
+export const borderTop = style({
+  borderTop: `0.5px solid ${cssVar('borderColor')}`,
 });
 
 export const sidebarBodyNoSelection = style({
diff --git a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.tsx b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.tsx
index f71ea737c30f6..a0e8a73cc60e3 100644
--- a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-container.tsx
@@ -24,16 +24,11 @@ export const SidebarContainer = ({
     workbench.toggleSidebar();
   }, [workbench]);
 
-  const isWindowsDesktop = environment.isDesktop && environment.isWindows;
-
   return (
     <div className={clsx(styles.sidebarContainerInner, className)} {...props}>
       <Header floating={false} onToggle={handleToggleOpen}>
-        {!isWindowsDesktop && sidebarTabs.length > 0 && (
-          <SidebarHeaderSwitcher />
-        )}
+        <SidebarHeaderSwitcher />
       </Header>
-      {isWindowsDesktop && sidebarTabs.length > 0 && <SidebarHeaderSwitcher />}
       {sidebarTabs.length > 0 ? (
         sidebarTabs.map(sidebar => (
           <ViewSidebarTabBodyTarget
@@ -41,7 +36,10 @@ export const SidebarContainer = ({
             key={sidebar.id}
             style={{ display: activeSidebarTab === sidebar ? 'block' : 'none' }}
             viewId={view.id}
-            className={styles.sidebarBodyTarget}
+            className={clsx(
+              styles.sidebarBodyTarget,
+              !environment.isDesktop && styles.borderTop
+            )}
           />
         ))
       ) : (
diff --git a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.css.ts b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.css.ts
index f0b97c4b5b3e1..ea457cb2aba1b 100644
--- a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.css.ts
+++ b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.css.ts
@@ -11,11 +11,6 @@ export const header = style({
   zIndex: 1,
   gap: '12px',
   background: cssVar('backgroundPrimaryColor'),
-  selectors: {
-    '&[data-sidebar-floating="false"]': {
-      ['WebkitAppRegion' as string]: 'drag',
-    },
-  },
   '@media': {
     print: {
       display: 'none',
@@ -36,9 +31,3 @@ export const standaloneExtensionSwitcherWrapper = style({
   height: '52px',
   position: 'relative',
 });
-
-export const windowsAppControlsContainer = style({
-  display: 'flex',
-  height: '100%',
-  marginRight: '-16px',
-});
diff --git a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx
index 4cb2bcb5a256c..a0532493369cd 100644
--- a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx
@@ -1,5 +1,4 @@
 import { IconButton } from '@affine/component';
-import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls';
 import { RightSidebarIcon } from '@blocksuite/icons/rc';
 
 import * as styles from './sidebar-header.css';
@@ -41,28 +40,16 @@ const ToggleButton = ({ onToggle }: { onToggle?: () => void }) => {
   );
 };
 
-const Windows = ({ floating, onToggle, children }: HeaderProps) => {
+export const Header = ({ floating, children, onToggle }: HeaderProps) => {
   return (
     <Container className={styles.header} floating={floating}>
       {children}
-      <div className={styles.spacer} />
-      <ToggleButton onToggle={onToggle} />
-      <div className={styles.windowsAppControlsContainer}>
-        <WindowsAppControls />
-      </div>
+      {!environment.isDesktop && (
+        <>
+          <div className={styles.spacer} />
+          <ToggleButton onToggle={onToggle} />
+        </>
+      )}
     </Container>
   );
 };
-
-const NonWindows = ({ floating, children, onToggle }: HeaderProps) => {
-  return (
-    <Container className={styles.header} floating={floating}>
-      {children}
-      <div className={styles.spacer} />
-      <ToggleButton onToggle={onToggle} />
-    </Container>
-  );
-};
-
-export const Header =
-  environment.isDesktop && environment.isWindows ? Windows : NonWindows;
diff --git a/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx b/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx
index 35fd731b16834..8c63c449d7daa 100644
--- a/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx
@@ -1,8 +1,10 @@
 import { useAppSettingHelper } from '@affine/core/hooks/affine/use-app-setting-helper';
+import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { popupWindow } from '@affine/core/utils';
+import { apis } from '@affine/electron-api';
 import { useLiveData, useService } from '@toeverything/infra';
-import type { To } from 'history';
-import { forwardRef, type MouseEvent, useCallback } from 'react';
+import { parsePath, type To } from 'history';
+import { forwardRef, type MouseEvent } from 'react';
 
 import { WorkbenchService } from '../services/workbench';
 
@@ -21,8 +23,8 @@ export const WorkbenchLink = forwardRef<
   const link =
     basename +
     (typeof to === 'string' ? to : `${to.pathname}${to.search}${to.hash}`);
-  const handleClick = useCallback(
-    (event: React.MouseEvent<HTMLAnchorElement>) => {
+  const handleClick = useAsyncCallback(
+    async (event: React.MouseEvent<HTMLAnchorElement>) => {
       event.preventDefault();
       event.stopPropagation();
       if (onClick?.(event) === false) {
@@ -30,8 +32,16 @@ export const WorkbenchLink = forwardRef<
       }
 
       if (event.ctrlKey || event.metaKey) {
-        if (appSettings.enableMultiView && environment.isDesktop) {
-          workbench.open(to, { at: 'beside' });
+        if (environment.isDesktop) {
+          if (event.altKey && appSettings.enableMultiView) {
+            workbench.open(to, { at: 'tail' });
+          } else {
+            const path = typeof to === 'string' ? parsePath(to) : to;
+            await apis?.ui.addTab({
+              basename,
+              view: { path },
+            });
+          }
         } else if (!environment.isDesktop) {
           popupWindow(link);
         }
@@ -39,7 +49,7 @@ export const WorkbenchLink = forwardRef<
         workbench.open(to);
       }
     },
-    [appSettings.enableMultiView, link, onClick, to, workbench]
+    [appSettings.enableMultiView, basename, link, onClick, to, workbench]
   );
 
   // eslint suspicious runtime error
diff --git a/packages/frontend/core/src/modules/workbench/view/workbench-root.css.ts b/packages/frontend/core/src/modules/workbench/view/workbench-root.css.ts
index 8fbd1db5ba134..336b7d601a4c5 100644
--- a/packages/frontend/core/src/modules/workbench/view/workbench-root.css.ts
+++ b/packages/frontend/core/src/modules/workbench/view/workbench-root.css.ts
@@ -25,7 +25,7 @@ export const workbenchSidebar = style({
       borderRadius: 6,
     },
     [`&[data-client-border=false]`]: {
-      borderLeft: `1px solid ${cssVar('borderColor')}`,
+      borderLeft: `0.5px solid ${cssVar('borderColor')}`,
     },
   },
 });
diff --git a/packages/frontend/core/src/modules/workbench/view/workbench-root.tsx b/packages/frontend/core/src/modules/workbench/view/workbench-root.tsx
index d91e51718aefd..8b50d7b16a3c4 100644
--- a/packages/frontend/core/src/modules/workbench/view/workbench-root.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/workbench-root.tsx
@@ -49,8 +49,8 @@ export const WorkbenchRoot = memo(() => {
   );
 
   useEffect(() => {
-    workbench.basename$.next(basename);
-  }, [basename, workbench.basename$]);
+    workbench.updateBasename(basename);
+  }, [basename, workbench]);
 
   return (
     <ViewIslandRegistryProvider>
diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-sqlite.ts b/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-sqlite.ts
index a22ddce918429..390255274f293 100644
--- a/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-sqlite.ts
+++ b/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-sqlite.ts
@@ -1,10 +1,12 @@
 import { apis } from '@affine/electron-api';
 import type { ByteKV, ByteKVBehavior, DocStorage } from '@toeverything/infra';
-import { AsyncLock, MemoryDocEventBus } from '@toeverything/infra';
+import { AsyncLock } from '@toeverything/infra';
+
+import { BroadcastChannelDocEventBus } from './doc-broadcast-channel';
 
 export class SqliteDocStorage implements DocStorage {
   constructor(private readonly workspaceId: string) {}
-  eventBus = new MemoryDocEventBus();
+  eventBus = new BroadcastChannelDocEventBus(this.workspaceId);
   readonly doc = new Doc(this.workspaceId);
   readonly syncMetadata = new SyncMetadataKV(this.workspaceId);
   readonly serverClock = new ServerClockKV(this.workspaceId);
diff --git a/packages/frontend/core/src/pages/404.tsx b/packages/frontend/core/src/pages/404.tsx
index 9321d1d962808..9cdb546137c88 100644
--- a/packages/frontend/core/src/pages/404.tsx
+++ b/packages/frontend/core/src/pages/404.tsx
@@ -9,6 +9,7 @@ import { useCallback, useState } from 'react';
 
 import { SignOutModal } from '../components/affine/sign-out-modal';
 import { RouteLogic, useNavigateHelper } from '../hooks/use-navigate-helper';
+import { AppTabsHeader } from '../modules/app-tabs-header';
 import { AuthService } from '../modules/cloud';
 import { SignIn } from './sign-in';
 
@@ -38,6 +39,14 @@ export const PageNotFound = ({
 
   return (
     <>
+      {environment.isDesktop ? (
+        <AppTabsHeader
+          style={{
+            paddingLeft: environment.isMacOs ? 80 : 0,
+          }}
+          reportBoundingUpdate
+        />
+      ) : null}
       {noPermission ? (
         <NoPermissionOrNotFound
           user={account}
diff --git a/packages/frontend/core/src/pages/auth.tsx b/packages/frontend/core/src/pages/auth.tsx
index dd54eb5795ed2..7fb288134ca64 100644
--- a/packages/frontend/core/src/pages/auth.tsx
+++ b/packages/frontend/core/src/pages/auth.tsx
@@ -23,7 +23,6 @@ import type { LoaderFunction } from 'react-router-dom';
 import { redirect, useParams, useSearchParams } from 'react-router-dom';
 import { z } from 'zod';
 
-import { WindowsAppControls } from '../components/pure/header/windows-app-controls';
 import { useMutation } from '../hooks/use-mutation';
 import { RouteLogic, useNavigateHelper } from '../hooks/use-navigate-helper';
 import { AuthService, ServerConfigService } from '../modules/cloud';
@@ -106,13 +105,7 @@ export const AuthPage = (): ReactElement | null => {
 
   switch (authType) {
     case 'onboarding':
-      return (
-        <OnboardingPage
-          user={account}
-          onOpenAffine={onOpenAffine}
-          windowControl={<WindowsAppControls />}
-        />
-      );
+      return <OnboardingPage user={account} onOpenAffine={onOpenAffine} />;
     case 'signUp': {
       return (
         <SignUpPage
diff --git a/packages/frontend/core/src/pages/index.tsx b/packages/frontend/core/src/pages/index.tsx
index 2d0ed65e2c638..7c239db482552 100644
--- a/packages/frontend/core/src/pages/index.tsx
+++ b/packages/frontend/core/src/pages/index.tsx
@@ -22,6 +22,7 @@ import {
 import { AppFallback } from '../components/affine/app-container';
 import { UserWithWorkspaceList } from '../components/pure/workspace-slider-bar/user-with-workspace-list';
 import { useNavigateHelper } from '../hooks/use-navigate-helper';
+import { AppTabsHeader } from '../modules/app-tabs-header';
 import { AuthService } from '../modules/cloud';
 import { WorkspaceSubPath } from '../shared';
 
@@ -147,6 +148,14 @@ export const Component = () => {
   // TODO(@eyhn): We need a no workspace page
   return (
     <>
+      {environment.isDesktop ? (
+        <AppTabsHeader
+          style={{
+            paddingLeft: environment.isMacOs ? 80 : 0,
+          }}
+          reportBoundingUpdate
+        />
+      ) : null}
       <div
         style={{
           position: 'fixed',
diff --git a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts
index 10cb6441fc2b9..4b5007f7ae509 100644
--- a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts
+++ b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts
@@ -6,7 +6,16 @@ export const mainContainer = style({
   flexDirection: 'column',
   flex: 1,
   overflow: 'hidden',
-  borderTop: `1px solid ${cssVar('borderColor')}`,
+  borderTop: `0.5px solid transparent`,
+  transition: 'border-color 0.2s',
+  selectors: {
+    '&[data-dynamic-top-border="false"]': {
+      borderColor: cssVar('borderColor'),
+    },
+    '&[data-has-scroll-top="true"]': {
+      borderColor: cssVar('borderColor'),
+    },
+  },
 });
 
 export const editorContainer = style({
diff --git a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx
index 5e6ba728d1be8..2ec3bf0f9df82 100644
--- a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx
+++ b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx
@@ -1,4 +1,4 @@
-import { Scrollable } from '@affine/component';
+import { Scrollable, useHasScrollTop } from '@affine/component';
 import { PageDetailSkeleton } from '@affine/component/page-detail-skeleton';
 import type { ChatPanel } from '@affine/core/blocksuite/presets/ai';
 import { AIProvider } from '@affine/core/blocksuite/presets/ai';
@@ -212,18 +212,26 @@ const DetailPageImpl = memo(function DetailPageImpl() {
     view.activeSidebarTab('outline');
   }, [workbench, view]);
 
+  const [refCallback, hasScrollTop] = useHasScrollTop();
+  const dynamicTopBorder = environment.isDesktop;
+
   return (
     <>
       <ViewHeader>
         <DetailPageHeader page={doc.blockSuiteDoc} workspace={workspace} />
       </ViewHeader>
       <ViewBody>
-        <div className={styles.mainContainer}>
+        <div
+          className={styles.mainContainer}
+          data-dynamic-top-border={dynamicTopBorder}
+          data-has-scroll-top={hasScrollTop}
+        >
           {/* Add a key to force rerender when page changed, to avoid error boundary persisting. */}
           <AffineErrorBoundary key={doc.id}>
             <TopTip pageId={doc.id} workspace={workspace} />
             <Scrollable.Root>
               <Scrollable.Viewport
+                ref={refCallback}
                 className={clsx(
                   'affine-page-viewport',
                   styles.affineDocViewport,
diff --git a/packages/frontend/core/src/pages/workspace/detail-page/use-header-responsive.ts b/packages/frontend/core/src/pages/workspace/detail-page/use-header-responsive.ts
index e578e79927b70..3ee4951a36088 100644
--- a/packages/frontend/core/src/pages/workspace/detail-page/use-header-responsive.ts
+++ b/packages/frontend/core/src/pages/workspace/detail-page/use-header-responsive.ts
@@ -19,7 +19,10 @@ export const useDetailPageHeaderResponsive = (availableWidth: number) => {
   const hideToday = availableWidth < 300;
 
   const showDivider =
-    viewPosition.isLast && !rightSidebarOpen && !(hidePresent && hideShare);
+    viewPosition.isLast &&
+    !rightSidebarOpen &&
+    !(hidePresent && hideShare) &&
+    !environment.isDesktop;
 
   return {
     hideShare,
diff --git a/packages/frontend/electron-api/src/index.ts b/packages/frontend/electron-api/src/index.ts
index c5f61bbe49d1b..0f7ea8970d79d 100644
--- a/packages/frontend/electron-api/src/index.ts
+++ b/packages/frontend/electron-api/src/index.ts
@@ -45,3 +45,9 @@ export const sharedStorage = (globalThis as any).sharedStorage as
   | null;
 
 export type { UpdateMeta } from '@affine/electron/main/updater/event';
+export {
+  type TabViewsMetaSchema,
+  type WorkbenchMeta,
+  type WorkbenchViewMeta,
+  type WorkbenchViewModule,
+} from '@affine/electron/main/windows-manager/tab-views-meta-schema';
diff --git a/packages/frontend/electron/renderer/app.tsx b/packages/frontend/electron/renderer/app.tsx
index ac7771b792ac9..f4a419f01b4b0 100644
--- a/packages/frontend/electron/renderer/app.tsx
+++ b/packages/frontend/electron/renderer/app.tsx
@@ -4,9 +4,12 @@ import '@affine/component/theme/theme.css';
 import { NotificationCenter } from '@affine/component';
 import { AffineContext } from '@affine/component/context';
 import { GlobalLoading } from '@affine/component/global-loading';
+import { registerAffineCommand } from '@affine/core/commands';
 import { AppFallback } from '@affine/core/components/affine/app-container';
 import { configureCommonModules } from '@affine/core/modules';
+import { configureAppTabsHeaderModule } from '@affine/core/modules/app-tabs-header';
 import { configureElectronStateStorageImpls } from '@affine/core/modules/storage';
+import { configureDesktopWorkbenchModule } from '@affine/core/modules/workbench';
 import {
   configureBrowserWorkspaceFlavours,
   configureSqliteWorkspaceEngineStorageProvider,
@@ -19,6 +22,7 @@ import {
 import { Telemetry } from '@affine/core/telemetry';
 import createEmotionCache from '@affine/core/utils/create-emotion-cache';
 import { createI18n, setUpLanguage } from '@affine/i18n';
+import { SettingsIcon } from '@blocksuite/icons/rc';
 import { CacheProvider } from '@emotion/react';
 import {
   Framework,
@@ -85,6 +89,8 @@ configureCommonModules(framework);
 configureElectronStateStorageImpls(framework);
 configureBrowserWorkspaceFlavours(framework);
 configureSqliteWorkspaceEngineStorageProvider(framework);
+configureDesktopWorkbenchModule(framework);
+configureAppTabsHeaderModule(framework);
 const frameworkProvider = framework.provider();
 
 // setup application lifecycle events, and emit application start event
@@ -121,3 +127,14 @@ export function App() {
     </Suspense>
   );
 }
+
+registerAffineCommand({
+  id: 'affine:reload',
+  category: 'affine:general',
+  label: 'Reload current tab',
+  icon: <SettingsIcon />,
+  keyBinding: '$mod+R',
+  run() {
+    location.reload();
+  },
+});
diff --git a/packages/frontend/electron/renderer/index.tsx b/packages/frontend/electron/renderer/index.tsx
index 0e883e463c80a..d9abb899bf35f 100644
--- a/packages/frontend/electron/renderer/index.tsx
+++ b/packages/frontend/electron/renderer/index.tsx
@@ -3,7 +3,7 @@ import '@affine/core/bootstrap/preload';
 
 import { appConfigProxy } from '@affine/core/hooks/use-app-config-storage';
 import { performanceLogger } from '@affine/core/shared';
-import { apis, events } from '@affine/electron-api';
+import { apis, appInfo, events } from '@affine/electron-api';
 import {
   init,
   reactRouterV6BrowserTracingIntegration,
@@ -74,6 +74,23 @@ function main() {
     events?.ui.onMaximized(handleMaximized);
     events?.ui.onFullScreen(handleFullscreen);
 
+    const tabId = appInfo?.viewId;
+    const handleActiveTabChange = (active: boolean) => {
+      document.documentElement.dataset.active = String(active);
+    };
+
+    if (tabId) {
+      apis?.ui
+        .isActiveTab()
+        .then(active => {
+          handleActiveTabChange(active);
+          events?.ui.onActiveTabChanged(id => {
+            handleActiveTabChange(id === tabId);
+          });
+        })
+        .catch(console.error);
+    }
+
     const handleResize = debounce(() => {
       apis?.ui.handleWindowResize().catch(console.error);
     }, 50);
diff --git a/packages/frontend/electron/renderer/shell/index.tsx b/packages/frontend/electron/renderer/shell/index.tsx
new file mode 100644
index 0000000000000..944954d4f9bdf
--- /dev/null
+++ b/packages/frontend/electron/renderer/shell/index.tsx
@@ -0,0 +1,56 @@
+import 'setimmediate';
+import '@affine/component/theme/global.css';
+import '@affine/component/theme/theme.css';
+
+import { ThemeProvider } from '@affine/component/theme-provider';
+import { appConfigProxy } from '@affine/core/hooks/use-app-config-storage';
+import { configureAppTabsHeaderModule } from '@affine/core/modules/app-tabs-header';
+import { configureElectronStateStorageImpls } from '@affine/core/modules/storage';
+import { performanceLogger } from '@affine/core/shared';
+import {
+  configureGlobalStorageModule,
+  Framework,
+  FrameworkRoot,
+} from '@toeverything/infra';
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { ShellRoot } from './shell';
+
+const framework = new Framework();
+configureGlobalStorageModule(framework);
+configureElectronStateStorageImpls(framework);
+configureAppTabsHeaderModule(framework);
+const frameworkProvider = framework.provider();
+
+const logger = performanceLogger.namespace('shell');
+
+function main() {
+  appConfigProxy
+    .getSync()
+    .catch(() => console.error('failed to load app config'));
+}
+
+function mountApp() {
+  const root = document.getElementById('app');
+  if (!root) {
+    throw new Error('Root element not found');
+  }
+  logger.info('render app');
+  createRoot(root).render(
+    <StrictMode>
+      <FrameworkRoot framework={frameworkProvider}>
+        <ThemeProvider>
+          <ShellRoot />
+        </ThemeProvider>
+      </FrameworkRoot>
+    </StrictMode>
+  );
+}
+
+try {
+  main();
+  mountApp();
+} catch (err) {
+  console.error('Failed to bootstrap app', err);
+}
diff --git a/packages/frontend/electron/renderer/shell/shell.css.ts b/packages/frontend/electron/renderer/shell/shell.css.ts
new file mode 100644
index 0000000000000..3e92d4b8f149a
--- /dev/null
+++ b/packages/frontend/electron/renderer/shell/shell.css.ts
@@ -0,0 +1,22 @@
+import { cssVar } from '@toeverything/theme';
+import { globalStyle, style } from '@vanilla-extract/css';
+
+export const root = style({
+  width: '100vw',
+  height: '100vh',
+  opacity: 1,
+  transition: 'opacity 0.1s',
+  background: cssVar('backgroundPrimaryColor'),
+  selectors: {
+    '&[data-active="false"]': {
+      opacity: 0,
+    },
+    '&[data-translucent="true"]': {
+      background: 'transparent',
+    },
+  },
+});
+
+globalStyle(`${root}[data-active="false"] *`, {
+  ['WebkitAppRegion' as string]: 'no-drag !important',
+});
diff --git a/packages/frontend/electron/renderer/shell/shell.tsx b/packages/frontend/electron/renderer/shell/shell.tsx
new file mode 100644
index 0000000000000..27273cbbab93a
--- /dev/null
+++ b/packages/frontend/electron/renderer/shell/shell.tsx
@@ -0,0 +1,86 @@
+import { useAppSettingHelper } from '@affine/core/hooks/affine/use-app-setting-helper';
+import { AppTabsHeader } from '@affine/core/modules/app-tabs-header';
+import { apis, events } from '@affine/electron-api';
+import { useEffect, useState } from 'react';
+
+import * as styles from './shell.css';
+
+const useIsShellActive = () => {
+  const [active, setActive] = useState(true);
+
+  useEffect(() => {
+    const unsub = events?.ui.onTabShellViewActiveChange(active => {
+      setActive(active);
+    });
+    return () => {
+      unsub?.();
+    };
+  });
+
+  return active;
+};
+
+const useTabsBoundingRect = () => {
+  const [rect, setRect] = useState<{
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+  }>({
+    x: environment.isDesktop && environment.isMacOs ? 80 : 0,
+    y: 0,
+    width: window.innerWidth,
+    height: 52,
+  });
+
+  useEffect(() => {
+    let unsub: (() => void) | undefined;
+    apis?.ui
+      .getTabsBoundingRect()
+      .then(rect => {
+        if (rect) {
+          setRect(rect);
+        }
+        unsub = events?.ui.onTabsBoundingRectChanged(rect => {
+          if (rect) {
+            setRect(rect);
+          }
+        });
+      })
+      .catch(err => {
+        console.error(err);
+      });
+    return () => {
+      unsub?.();
+    };
+  }, []);
+
+  return rect;
+};
+
+export function ShellRoot() {
+  const active = useIsShellActive();
+  const { appSettings } = useAppSettingHelper();
+  const rect = useTabsBoundingRect();
+  const translucent =
+    environment.isDesktop &&
+    environment.isMacOs &&
+    appSettings.enableBlurBackground;
+  return (
+    <div
+      className={styles.root}
+      data-translucent={translucent}
+      data-active={active}
+    >
+      <AppTabsHeader
+        style={{
+          position: 'fixed',
+          top: rect.y,
+          left: rect.x,
+          width: rect.width,
+          height: rect.height,
+        }}
+      />
+    </div>
+  );
+}
diff --git a/packages/frontend/electron/src/main/application-menu/create.ts b/packages/frontend/electron/src/main/application-menu/create.ts
index c2b22688f5e18..08c9055cdf24d 100644
--- a/packages/frontend/electron/src/main/application-menu/create.ts
+++ b/packages/frontend/electron/src/main/application-menu/create.ts
@@ -1,9 +1,16 @@
 import { app, Menu } from 'electron';
 
 import { isMacOS } from '../../shared/utils';
-import { revealLogFile } from '../logger';
-import { initAndShowMainWindow, showMainWindow } from '../main-window';
+import { logger, revealLogFile } from '../logger';
 import { checkForUpdates } from '../updater';
+import {
+  addTab,
+  closeTab,
+  initAndShowMainWindow,
+  showDevTools,
+  showMainWindow,
+  undoCloseTab,
+} from '../windows-manager';
 import { applicationMenuSubjects } from './subject';
 
 // Unique id for menuitems
@@ -55,8 +62,6 @@ export function createApplicationMenu() {
             applicationMenuSubjects.newPageAction$.next();
           },
         },
-        { type: 'separator' },
-        isMac ? { role: 'close' } : { role: 'quit' },
       ],
     },
     // { role: 'editMenu' }
@@ -89,34 +94,44 @@ export function createApplicationMenu() {
       submenu: [
         { role: 'reload' },
         { role: 'forceReload' },
-        { role: 'toggleDevTools' },
+        {
+          label: 'Open devtools',
+          accelerator: isMac ? 'Cmd+Option+I' : 'Ctrl+Shift+I',
+          click: () => {
+            showDevTools();
+          },
+        },
         { type: 'separator' },
         { role: 'resetZoom' },
         { role: 'zoomIn' },
         { role: 'zoomOut' },
         { type: 'separator' },
         { role: 'togglefullscreen' },
-      ],
-    },
-    // { role: 'windowMenu' }
-    {
-      label: 'Window',
-      submenu: [
-        { role: 'minimize' },
-        { role: 'zoom' },
-        ...(isMac
-          ? [
-              { type: 'separator' },
-              { role: 'front' },
-              { type: 'separator' },
-              {
-                role: 'window',
-                click: async () => {
-                  await initAndShowMainWindow();
-                },
-              },
-            ]
-          : [{ role: 'close' }]),
+        { type: 'separator' },
+        {
+          label: 'New tab',
+          accelerator: 'CommandOrControl+T',
+          click() {
+            logger.info('New tab with shortcut');
+            addTab().catch(console.error);
+          },
+        },
+        {
+          label: 'Close tab',
+          accelerator: 'CommandOrControl+W',
+          click() {
+            logger.info('Close tab with shortcut');
+            closeTab().catch(console.error);
+          },
+        },
+        {
+          label: 'Undo close tab',
+          accelerator: 'CommandOrControl+Shift+T',
+          click() {
+            logger.info('Undo close tab with shortcut');
+            undoCloseTab().catch(console.error);
+          },
+        },
       ],
     },
     {
diff --git a/packages/frontend/electron/src/main/constants.ts b/packages/frontend/electron/src/main/constants.ts
index b421456e52a78..9719c8b82ebb8 100644
--- a/packages/frontend/electron/src/main/constants.ts
+++ b/packages/frontend/electron/src/main/constants.ts
@@ -1 +1,3 @@
 export const mainWindowOrigin = process.env.DEV_SERVER_URL || 'file://.';
+export const onboardingViewUrl = `${mainWindowOrigin}${mainWindowOrigin.endsWith('/') ? '' : '/'}onboarding`;
+export const shellViewUrl = `${mainWindowOrigin}${mainWindowOrigin.endsWith('/') ? '' : '/'}shell.html`;
diff --git a/packages/frontend/electron/src/main/deep-link.ts b/packages/frontend/electron/src/main/deep-link.ts
index df762d716152b..13b7232580747 100644
--- a/packages/frontend/electron/src/main/deep-link.ts
+++ b/packages/frontend/electron/src/main/deep-link.ts
@@ -10,7 +10,7 @@ import {
   getMainWindow,
   handleOpenUrlInHiddenWindow,
   setCookie,
-} from './main-window';
+} from './windows-manager';
 
 let protocol = buildType === 'stable' ? 'affine' : `affine-${buildType}`;
 if (isDev) {
diff --git a/packages/frontend/electron/src/main/events.ts b/packages/frontend/electron/src/main/events.ts
index f92134fbf8465..ad1cc6593fa5a 100644
--- a/packages/frontend/electron/src/main/events.ts
+++ b/packages/frontend/electron/src/main/events.ts
@@ -1,4 +1,4 @@
-import { app, BrowserWindow } from 'electron';
+import { app, BrowserWindow, WebContentsView } from 'electron';
 
 import { applicationMenuEvents } from './application-menu';
 import { logger } from './logger';
@@ -21,9 +21,9 @@ export function registerEvents() {
   // register events
   for (const [namespace, namespaceEvents] of Object.entries(allEvents)) {
     for (const [key, eventRegister] of Object.entries(namespaceEvents)) {
-      const subscription = eventRegister((...args: any[]) => {
+      const unsubscribe = eventRegister((...args: any[]) => {
         const chan = `${namespace}:${key}`;
-        logger.info(
+        logger.debug(
           '[ipc-event]',
           chan,
           args.filter(
@@ -33,10 +33,31 @@ export function registerEvents() {
               typeof a !== 'object'
           )
         );
-        getActiveWindows().forEach(win => win.webContents.send(chan, ...args));
+        // is this efficient?
+        getActiveWindows().forEach(win => {
+          if (win.isDestroyed()) {
+            return;
+          }
+          // .webContents could be undefined if the window is destroyed
+          win.webContents?.send(chan, ...args);
+          win.contentView.children.forEach(child => {
+            if (
+              child instanceof WebContentsView &&
+              child.webContents &&
+              !child.webContents.isDestroyed()
+            ) {
+              child.webContents?.send(chan, ...args);
+            }
+          });
+        });
       });
       app.on('before-quit', () => {
-        subscription();
+        // subscription on quit sometimes crashes the app
+        try {
+          unsubscribe();
+        } catch (err) {
+          logger.error('unsubscribe error', err);
+        }
       });
     }
   }
diff --git a/packages/frontend/electron/src/main/handlers.ts b/packages/frontend/electron/src/main/handlers.ts
index bc8f3e72087b7..68582041276ac 100644
--- a/packages/frontend/electron/src/main/handlers.ts
+++ b/packages/frontend/electron/src/main/handlers.ts
@@ -43,7 +43,7 @@ export const registerHandlers = () => {
         const start = performance.now();
         try {
           const result = await handler(e, ...args);
-          logger.info(
+          logger.debug(
             '[ipc-api]',
             chan,
             args.filter(
diff --git a/packages/frontend/electron/src/main/main-window.ts b/packages/frontend/electron/src/main/main-window.ts
deleted file mode 100644
index 415099ba2141b..0000000000000
--- a/packages/frontend/electron/src/main/main-window.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-import assert from 'node:assert';
-import { join } from 'node:path';
-
-import { type CookiesSetDetails } from 'electron';
-import { BrowserWindow, nativeTheme } from 'electron';
-import electronWindowState from 'electron-window-state';
-
-import { isLinux, isMacOS, isWindows } from '../shared/utils';
-import { buildType } from './config';
-import { mainWindowOrigin } from './constants';
-import { ensureHelperProcess } from './helper-process';
-import { logger } from './logger';
-import { uiSubjects } from './ui/subject';
-import { parseCookie } from './utils';
-
-const IS_DEV: boolean =
-  process.env.NODE_ENV === 'development' && !process.env.CI;
-
-// todo: not all window need all of the exposed meta
-const getWindowAdditionalArguments = async () => {
-  const { getExposedMeta } = await import('./exposed');
-  const mainExposedMeta = getExposedMeta();
-  const helperProcessManager = await ensureHelperProcess();
-  const helperExposedMeta = await helperProcessManager.rpc?.getMeta();
-  return [
-    `--main-exposed-meta=` + JSON.stringify(mainExposedMeta),
-    `--helper-exposed-meta=` + JSON.stringify(helperExposedMeta),
-    `--window-name=main`,
-  ];
-};
-
-function closeAllWindows() {
-  BrowserWindow.getAllWindows().forEach(w => {
-    if (!w.isDestroyed()) {
-      w.destroy();
-    }
-  });
-}
-
-async function createWindow(additionalArguments: string[]) {
-  logger.info('create window');
-  const mainWindowState = electronWindowState({
-    defaultWidth: 1000,
-    defaultHeight: 800,
-  });
-
-  const helperProcessManager = await ensureHelperProcess();
-  const helperExposedMeta = await helperProcessManager.rpc?.getMeta();
-
-  assert(helperExposedMeta, 'helperExposedMeta should be defined');
-
-  const browserWindow = new BrowserWindow({
-    titleBarStyle: isMacOS()
-      ? 'hiddenInset'
-      : isWindows()
-        ? 'hidden'
-        : 'default',
-    x: mainWindowState.x,
-    y: mainWindowState.y,
-    width: mainWindowState.width,
-    autoHideMenuBar: isLinux(),
-    minWidth: 640,
-    minHeight: 480,
-    visualEffectState: 'active',
-    vibrancy: 'under-window',
-    // backgroundMaterial: 'mica',
-    height: mainWindowState.height,
-    show: false, // Use 'ready-to-show' event to show window
-    webPreferences: {
-      webgl: true,
-      contextIsolation: true,
-      sandbox: false,
-      webviewTag: false, // The webview tag is not recommended. Consider alternatives like iframe or Electron's BrowserView. https://www.electronjs.org/docs/latest/api/webview-tag#warning
-      spellcheck: false, // FIXME: enable?
-      preload: join(__dirname, './preload.js'),
-      // serialize exposed meta that to be used in preload
-      additionalArguments: additionalArguments,
-    },
-  });
-
-  if (isLinux()) {
-    browserWindow.setIcon(
-      join(__dirname, `../resources/icons/icon_${buildType}_64x64.png`)
-    );
-  }
-
-  nativeTheme.themeSource = 'light';
-
-  mainWindowState.manage(browserWindow);
-
-  let helperConnectionUnsub: (() => void) | undefined;
-
-  /**
-   * If you install `show: true` then it can cause issues when trying to close the window.
-   * Use `show: false` and listener events `ready-to-show` to fix these issues.
-   *
-   * @see https://github.com/electron/electron/issues/25012
-   */
-  browserWindow.on('ready-to-show', () => {
-    helperConnectionUnsub?.();
-    helperConnectionUnsub = helperProcessManager.connectRenderer(
-      browserWindow.webContents
-    );
-
-    logger.info('main window is ready to show');
-
-    uiSubjects.onMaximized$.next(browserWindow.isMaximized());
-    uiSubjects.onFullScreen$.next(browserWindow.isFullScreen());
-
-    handleWebContentsResize().catch(logger.error);
-  });
-
-  browserWindow.on('close', e => {
-    // TODO(@Peng): gracefully close the app, for example, ask user to save unsaved changes
-    e.preventDefault();
-    if (!isMacOS()) {
-      closeAllWindows();
-    } else {
-      // hide window on macOS
-      // application quit will be handled by closing the hidden window
-      //
-      // explanation:
-      // - closing the top window (by clicking close button or CMD-w)
-      //   - will be captured in "close" event here
-      //   - hiding the app to make the app open faster when user click the app icon
-      // - quit the app by "cmd+q" or right click on the dock icon and select "quit"
-      //   - all browser windows will capture the "close" event
-      //   - the hidden window will close all windows
-      //   - "window-all-closed" event will be emitted and eventually quit the app
-      if (browserWindow.isFullScreen()) {
-        browserWindow.once('leave-full-screen', () => {
-          browserWindow.hide();
-        });
-        browserWindow.setFullScreen(false);
-      } else {
-        browserWindow.hide();
-      }
-    }
-    helperConnectionUnsub?.();
-    helperConnectionUnsub = undefined;
-  });
-
-  browserWindow.on('leave-full-screen', () => {
-    // seems call this too soon may cause the app to crash
-    setTimeout(() => {
-      // FIXME: workaround for theme bug in full screen mode
-      const size = browserWindow.getSize();
-      browserWindow.setSize(size[0] + 1, size[1] + 1);
-      browserWindow.setSize(size[0], size[1]);
-    });
-    uiSubjects.onMaximized$.next(false);
-    uiSubjects.onFullScreen$.next(false);
-  });
-
-  browserWindow.on('maximize', () => {
-    uiSubjects.onMaximized$.next(true);
-  });
-
-  browserWindow.on('unmaximize', () => {
-    uiSubjects.onMaximized$.next(false);
-  });
-
-  // full-screen == maximized in UI on windows
-  browserWindow.on('enter-full-screen', () => {
-    uiSubjects.onFullScreen$.next(true);
-  });
-
-  browserWindow.on('leave-full-screen', () => {
-    uiSubjects.onFullScreen$.next(false);
-  });
-
-  /**
-   * URL for main window.
-   */
-  const pageUrl = mainWindowOrigin; // see protocol.ts
-
-  logger.info('loading page at', pageUrl);
-
-  await browserWindow.loadURL(pageUrl);
-
-  logger.info('main window is loaded at', pageUrl);
-
-  return browserWindow;
-}
-
-// singleton
-let browserWindow: Promise<BrowserWindow> | undefined;
-
-// a hidden window that prevents the app from quitting on MacOS
-let hiddenMacWindow: BrowserWindow | undefined;
-
-/**
- * Init main BrowserWindow. Will create a new window if it's not created yet.
- */
-export async function initAndShowMainWindow() {
-  if (!browserWindow || (await browserWindow.then(w => w.isDestroyed()))) {
-    browserWindow = (async () => {
-      const additionalArguments = await getWindowAdditionalArguments();
-      return createWindow(additionalArguments);
-    })();
-  }
-  const mainWindow = await browserWindow;
-
-  if (IS_DEV) {
-    // do not gain focus in dev mode
-    mainWindow.showInactive();
-  } else {
-    mainWindow.show();
-  }
-
-  if (!hiddenMacWindow && isMacOS()) {
-    hiddenMacWindow = new BrowserWindow({
-      show: false,
-      width: 100,
-      height: 100,
-    });
-    hiddenMacWindow.on('close', () => {
-      closeAllWindows();
-    });
-  }
-
-  return mainWindow;
-}
-
-export async function getMainWindow() {
-  if (!browserWindow) return;
-  const window = await browserWindow;
-  if (window.isDestroyed()) return;
-  return window;
-}
-
-export async function showMainWindow() {
-  const window = await getMainWindow();
-  if (!window) return;
-  if (window.isMinimized()) {
-    window.restore();
-  }
-  window.focus();
-}
-
-export async function handleOpenUrlInHiddenWindow(url: string) {
-  const win = new BrowserWindow({
-    width: 1200,
-    height: 600,
-    webPreferences: {
-      preload: join(__dirname, './preload.js'),
-    },
-    show: false,
-  });
-  win.on('close', e => {
-    e.preventDefault();
-    if (!win.isDestroyed()) {
-      win.destroy();
-    }
-  });
-  logger.info('loading page at', url);
-  await win.loadURL(url);
-  return win;
-}
-
-export async function setCookie(cookie: CookiesSetDetails): Promise<void>;
-export async function setCookie(origin: string, cookie: string): Promise<void>;
-
-export async function setCookie(
-  arg0: CookiesSetDetails | string,
-  arg1?: string
-) {
-  const window = await browserWindow;
-  if (!window) {
-    // do nothing if window is not ready
-    return;
-  }
-  const details =
-    typeof arg1 === 'string' && typeof arg0 === 'string'
-      ? parseCookie(arg0, arg1)
-      : arg0;
-
-  logger.info('setting cookie to main window', details);
-
-  if (typeof details !== 'object') {
-    throw new Error('invalid cookie details');
-  }
-
-  await window.webContents.session.cookies.set(details);
-}
-
-export async function removeCookie(url: string, name: string): Promise<void> {
-  const window = await browserWindow;
-  if (!window) {
-    // do nothing if window is not ready
-    return;
-  }
-  await window.webContents.session.cookies.remove(url, name);
-}
-
-export async function getCookie(url?: string, name?: string) {
-  const window = await browserWindow;
-  if (!window) {
-    // do nothing if window is not ready
-    return;
-  }
-  const cookies = await window.webContents.session.cookies.get({
-    url,
-    name,
-  });
-  return cookies;
-}
-
-// there is no proper way to listen to webContents resize event
-// we will rely on window.resize event in renderer instead
-export async function handleWebContentsResize() {
-  // right now when window is resized, we will relocate the traffic light positions
-  if (isMacOS()) {
-    const window = await getMainWindow();
-    const factor = window?.webContents.getZoomFactor() || 1;
-    window?.setWindowButtonPosition({ x: 20 * factor, y: 24 * factor - 6 });
-  }
-}
diff --git a/packages/frontend/electron/src/main/protocol.ts b/packages/frontend/electron/src/main/protocol.ts
index 448ab5d424293..37dd67ae5ec06 100644
--- a/packages/frontend/electron/src/main/protocol.ts
+++ b/packages/frontend/electron/src/main/protocol.ts
@@ -4,7 +4,7 @@ import { net, protocol, session } from 'electron';
 
 import { CLOUD_BASE_URL } from './config';
 import { logger } from './logger';
-import { getCookie } from './main-window';
+import { getCookie } from './windows-manager';
 
 protocol.registerSchemesAsPrivileged([
   {
diff --git a/packages/frontend/electron/src/main/shared-storage/json-file.ts b/packages/frontend/electron/src/main/shared-storage/json-file.ts
index 09b45aae8405f..cd5412a768ad6 100644
--- a/packages/frontend/electron/src/main/shared-storage/json-file.ts
+++ b/packages/frontend/electron/src/main/shared-storage/json-file.ts
@@ -117,7 +117,7 @@ export class PersistentJSONFileStorage implements Memento {
         try {
           await fs.promises.writeFile(
             this.filepath,
-            JSON.stringify(this.data),
+            JSON.stringify(this.data, null, 2),
             'utf-8'
           );
         } catch (err) {
diff --git a/packages/frontend/electron/src/main/ui/events.ts b/packages/frontend/electron/src/main/ui/events.ts
index 556e031c642d2..712de3fd1656f 100644
--- a/packages/frontend/electron/src/main/ui/events.ts
+++ b/packages/frontend/electron/src/main/ui/events.ts
@@ -1,4 +1,12 @@
 import type { MainEventRegister } from '../type';
+import {
+  onActiveTabChanged,
+  onTabAction,
+  onTabsBoundingRectChanged,
+  onTabShellViewActiveChange,
+  onTabsStatusChange,
+  onTabViewsMetaChanged,
+} from '../windows-manager';
 import { uiSubjects } from './subject';
 
 /**
@@ -17,4 +25,16 @@ export const uiEvents = {
       sub.unsubscribe();
     };
   },
+  onTabViewsMetaChanged,
+  onTabAction,
+  onToggleRightSidebar: (fn: (tabId: string) => void) => {
+    const sub = uiSubjects.onToggleRightSidebar$.subscribe(fn);
+    return () => {
+      sub.unsubscribe();
+    };
+  },
+  onTabsStatusChange,
+  onActiveTabChanged,
+  onTabShellViewActiveChange,
+  onTabsBoundingRectChanged,
 } satisfies Record<string, MainEventRegister>;
diff --git a/packages/frontend/electron/src/main/ui/handlers.ts b/packages/frontend/electron/src/main/ui/handlers.ts
index 65679d2ac2f00..0d7ba8281ebc2 100644
--- a/packages/frontend/electron/src/main/ui/handlers.ts
+++ b/packages/frontend/electron/src/main/ui/handlers.ts
@@ -4,15 +4,29 @@ import { getLinkPreview } from 'link-preview-js';
 import { isMacOS } from '../../shared/utils';
 import { persistentConfig } from '../config-storage/persist';
 import { logger } from '../logger';
+import type { NamespaceHandlers } from '../type';
 import {
+  activateView,
+  addTab,
+  closeTab,
   getMainWindow,
+  getOnboardingWindow,
+  getTabsBoundingRect,
+  getTabsStatus,
+  getTabViewsMeta,
+  getWorkbenchMeta,
   handleWebContentsResize,
   initAndShowMainWindow,
-} from '../main-window';
-import { getOnboardingWindow } from '../onboarding';
-import type { NamespaceHandlers } from '../type';
-import { launchStage } from '../windows-manager/stage';
+  isActiveTab,
+  launchStage,
+  showDevTools,
+  showTab,
+  showTabContextMenu,
+  updateTabsBoundingRect,
+  updateWorkbenchMeta,
+} from '../windows-manager';
 import { getChallengeResponse } from './challenge';
+import { uiSubjects } from './subject';
 
 export let isOnline = true;
 
@@ -141,4 +155,57 @@ export const uiHandlers = {
   openExternal(_, url: string) {
     return shell.openExternal(url);
   },
+
+  // tab handlers
+  isActiveTab: async e => {
+    return isActiveTab(e.sender);
+  },
+  getWorkbenchMeta: async (_, ...args: Parameters<typeof getWorkbenchMeta>) => {
+    return getWorkbenchMeta(...args);
+  },
+  updateWorkbenchMeta: async (
+    _,
+    ...args: Parameters<typeof updateWorkbenchMeta>
+  ) => {
+    return updateWorkbenchMeta(...args);
+  },
+  getTabViewsMeta: async () => {
+    return getTabViewsMeta();
+  },
+  getTabsStatus: async () => {
+    return getTabsStatus();
+  },
+  addTab: async (_, ...args: Parameters<typeof addTab>) => {
+    await addTab(...args);
+  },
+  showTab: async (_, ...args: Parameters<typeof showTab>) => {
+    await showTab(...args);
+  },
+  closeTab: async (_, ...args: Parameters<typeof closeTab>) => {
+    await closeTab(...args);
+  },
+  activateView: async (_, ...args: Parameters<typeof activateView>) => {
+    await activateView(...args);
+  },
+  toggleRightSidebar: async (_, tabId?: string) => {
+    tabId ??= getTabViewsMeta().activeWorkbenchId;
+    if (tabId) {
+      uiSubjects.onToggleRightSidebar$.next(tabId);
+    }
+  },
+  getTabsBoundingRect: async () => {
+    return getTabsBoundingRect();
+  },
+  updateTabsBoundingRect: async (
+    e,
+    rect: { x: number; y: number; width: number; height: number }
+  ) => {
+    return updateTabsBoundingRect(e.sender, rect);
+  },
+  showDevTools: async (_, ...args: Parameters<typeof showDevTools>) => {
+    return showDevTools(...args);
+  },
+  showTabContextMenu: async (_, tabKey: string, viewIndex: number) => {
+    return showTabContextMenu(tabKey, viewIndex);
+  },
 } satisfies NamespaceHandlers;
diff --git a/packages/frontend/electron/src/main/ui/subject.ts b/packages/frontend/electron/src/main/ui/subject.ts
index 030db45c20e8c..a69158c8f89b6 100644
--- a/packages/frontend/electron/src/main/ui/subject.ts
+++ b/packages/frontend/electron/src/main/ui/subject.ts
@@ -3,4 +3,5 @@ import { Subject } from 'rxjs';
 export const uiSubjects = {
   onMaximized$: new Subject<boolean>(),
   onFullScreen$: new Subject<boolean>(),
+  onToggleRightSidebar$: new Subject<string>(),
 };
diff --git a/packages/frontend/electron/src/main/windows-manager/index.ts b/packages/frontend/electron/src/main/windows-manager/index.ts
new file mode 100644
index 0000000000000..8b2e79e3d857b
--- /dev/null
+++ b/packages/frontend/electron/src/main/windows-manager/index.ts
@@ -0,0 +1,6 @@
+export * from './launcher';
+export * from './main-window';
+export * from './onboarding';
+export * from './stage';
+export * from './tab-views';
+export * from './types';
diff --git a/packages/frontend/electron/src/main/windows-manager/launcher.ts b/packages/frontend/electron/src/main/windows-manager/launcher.ts
index 7c1cc2e5c5e34..59518d04f0599 100644
--- a/packages/frontend/electron/src/main/windows-manager/launcher.ts
+++ b/packages/frontend/electron/src/main/windows-manager/launcher.ts
@@ -1,9 +1,6 @@
 import { logger } from '../logger';
-import { initAndShowMainWindow } from '../main-window';
-import {
-  getOnboardingWindow,
-  getOrCreateOnboardingWindow,
-} from '../onboarding';
+import { initAndShowMainWindow } from './main-window';
+import { getOnboardingWindow, getOrCreateOnboardingWindow } from './onboarding';
 import { launchStage } from './stage';
 
 /**
diff --git a/packages/frontend/electron/src/main/windows-manager/main-window.ts b/packages/frontend/electron/src/main/windows-manager/main-window.ts
new file mode 100644
index 0000000000000..846b8cb995511
--- /dev/null
+++ b/packages/frontend/electron/src/main/windows-manager/main-window.ts
@@ -0,0 +1,247 @@
+import { join } from 'node:path';
+
+import { BrowserWindow, nativeTheme } from 'electron';
+import electronWindowState from 'electron-window-state';
+import { BehaviorSubject } from 'rxjs';
+
+import { isLinux, isMacOS, isWindows } from '../../shared/utils';
+import { buildType } from '../config';
+import { ensureHelperProcess } from '../helper-process';
+import { logger } from '../logger';
+import { uiSubjects } from '../ui/subject';
+
+const IS_DEV: boolean =
+  process.env.NODE_ENV === 'development' && !process.env.CI;
+
+function closeAllWindows() {
+  BrowserWindow.getAllWindows().forEach(w => {
+    if (!w.isDestroyed()) {
+      w.destroy();
+    }
+  });
+}
+
+export class MainWindowManager {
+  static readonly instance = new MainWindowManager();
+  mainWindowReady: Promise<BrowserWindow> | undefined;
+  mainWindow$ = new BehaviorSubject<BrowserWindow | undefined>(undefined);
+
+  private hiddenMacWindow: BrowserWindow | undefined;
+
+  get mainWindow() {
+    return this.mainWindow$.value;
+  }
+
+  // #region private methods
+  private preventMacAppQuit() {
+    if (!this.hiddenMacWindow && isMacOS()) {
+      this.hiddenMacWindow = new BrowserWindow({
+        show: false,
+        width: 100,
+        height: 100,
+      });
+      this.hiddenMacWindow.on('close', () => {
+        this.cleanupWindows();
+      });
+    }
+  }
+
+  private cleanupWindows() {
+    closeAllWindows();
+    this.mainWindowReady = undefined;
+    this.mainWindow$.next(undefined);
+    this.hiddenMacWindow?.destroy();
+    this.hiddenMacWindow = undefined;
+  }
+
+  private async createMainWindow() {
+    logger.info('create window');
+    const mainWindowState = electronWindowState({
+      defaultWidth: 1000,
+      defaultHeight: 800,
+    });
+
+    await ensureHelperProcess();
+
+    const browserWindow = new BrowserWindow({
+      titleBarStyle: isMacOS()
+        ? 'hiddenInset'
+        : isWindows()
+          ? 'hidden'
+          : 'default',
+      x: mainWindowState.x,
+      y: mainWindowState.y,
+      width: mainWindowState.width,
+      autoHideMenuBar: isLinux(),
+      minWidth: 640,
+      minHeight: 480,
+      visualEffectState: 'active',
+      vibrancy: 'under-window',
+      // backgroundMaterial: 'mica',
+      height: mainWindowState.height,
+      show: false, // Use 'ready-to-show' event to show window
+      webPreferences: {
+        webgl: true,
+        contextIsolation: true,
+        sandbox: false,
+      },
+    });
+
+    if (isLinux()) {
+      browserWindow.setIcon(
+        // __dirname is `packages/frontend/electron/dist` (the bundled output directory)
+        join(__dirname, `../resources/icons/icon_${buildType}_64x64.png`)
+      );
+    }
+
+    nativeTheme.themeSource = 'light';
+    mainWindowState.manage(browserWindow);
+
+    this.bindEvents(browserWindow);
+    return browserWindow;
+  }
+
+  private bindEvents(mainWindow: BrowserWindow) {
+    /**
+     * If you install `show: true` then it can cause issues when trying to close the window.
+     * Use `show: false` and listener events `ready-to-show` to fix these issues.
+     *
+     * @see https://github.com/electron/electron/issues/25012
+     */
+    mainWindow.on('ready-to-show', () => {
+      logger.info('main window is ready to show');
+
+      uiSubjects.onMaximized$.next(mainWindow.isMaximized());
+      uiSubjects.onFullScreen$.next(mainWindow.isFullScreen());
+    });
+
+    mainWindow.on('close', e => {
+      // TODO(@pengx17): gracefully close the app, for example, ask user to save unsaved changes
+      e.preventDefault();
+      if (!isMacOS()) {
+        closeAllWindows();
+      } else {
+        // hide window on macOS
+        // application quit will be handled by closing the hidden window
+        //
+        // explanation:
+        // - closing the top window (by clicking close button or CMD-w)
+        //   - will be captured in "close" event here
+        //   - hiding the app to make the app open faster when user click the app icon
+        // - quit the app by "cmd+q" or right click on the dock icon and select "quit"
+        //   - all browser windows will capture the "close" event
+        //   - the hidden window will close all windows
+        //   - "window-all-closed" event will be emitted and eventually quit the app
+        if (mainWindow.isFullScreen()) {
+          mainWindow.once('leave-full-screen', () => {
+            mainWindow.hide();
+          });
+          mainWindow.setFullScreen(false);
+        } else {
+          mainWindow.hide();
+        }
+      }
+    });
+
+    mainWindow.on('leave-full-screen', () => {
+      // seems call this too soon may cause the app to crash
+      setTimeout(() => {
+        // FIXME: workaround for theme bug in full screen mode
+        const size = mainWindow.getSize();
+        mainWindow.setSize(size[0] + 1, size[1] + 1);
+        mainWindow.setSize(size[0], size[1]);
+      });
+      uiSubjects.onMaximized$.next(false);
+      uiSubjects.onFullScreen$.next(false);
+    });
+
+    mainWindow.on('maximize', () => {
+      uiSubjects.onMaximized$.next(true);
+    });
+
+    mainWindow.on('unmaximize', () => {
+      uiSubjects.onMaximized$.next(false);
+    });
+
+    // full-screen == maximized in UI on windows
+    mainWindow.on('enter-full-screen', () => {
+      uiSubjects.onFullScreen$.next(true);
+    });
+
+    mainWindow.on('leave-full-screen', () => {
+      uiSubjects.onFullScreen$.next(false);
+    });
+  }
+  // #endregion
+
+  async ensureMainWindow(): Promise<BrowserWindow> {
+    if (
+      !this.mainWindowReady ||
+      (await this.mainWindowReady.then(w => w.isDestroyed()))
+    ) {
+      this.mainWindowReady = this.createMainWindow();
+      this.mainWindow$.next(await this.mainWindowReady);
+      this.preventMacAppQuit();
+    }
+    return this.mainWindowReady;
+  }
+
+  /**
+   * Init main BrowserWindow. Will create a new window if it's not created yet.
+   */
+  async initAndShowMainWindow() {
+    const mainWindow = await this.ensureMainWindow();
+
+    if (IS_DEV) {
+      // do not gain focus in dev mode
+      mainWindow.showInactive();
+    } else {
+      mainWindow.show();
+    }
+
+    this.preventMacAppQuit();
+
+    return mainWindow;
+  }
+}
+
+export async function initAndShowMainWindow() {
+  return MainWindowManager.instance.initAndShowMainWindow();
+}
+
+export async function getMainWindow() {
+  return MainWindowManager.instance.ensureMainWindow();
+}
+
+export async function showMainWindow() {
+  const window = await getMainWindow();
+  if (!window) return;
+  if (window.isMinimized()) {
+    window.restore();
+  }
+  window.focus();
+}
+
+/**
+ * Open a URL in a hidden window.
+ * This is useful for opening a URL in the background without user interaction for *authentication*.
+ */
+export async function handleOpenUrlInHiddenWindow(url: string) {
+  const win = new BrowserWindow({
+    width: 1200,
+    height: 600,
+    webPreferences: {
+      preload: join(__dirname, './preload.js'),
+    },
+    show: false,
+  });
+  win.on('close', e => {
+    e.preventDefault();
+    if (!win.isDestroyed()) {
+      win.destroy();
+    }
+  });
+  logger.info('loading page at', url);
+  await win.loadURL(url);
+  return win;
+}
diff --git a/packages/frontend/electron/src/main/onboarding.ts b/packages/frontend/electron/src/main/windows-manager/onboarding.ts
similarity index 91%
rename from packages/frontend/electron/src/main/onboarding.ts
rename to packages/frontend/electron/src/main/windows-manager/onboarding.ts
index 4dfa9fcd812e8..206562cbd9be8 100644
--- a/packages/frontend/electron/src/main/onboarding.ts
+++ b/packages/frontend/electron/src/main/windows-manager/onboarding.ts
@@ -3,10 +3,10 @@ import { join } from 'node:path';
 import type { Display } from 'electron';
 import { BrowserWindow, screen } from 'electron';
 
-import { isMacOS } from '../shared/utils';
-import { mainWindowOrigin } from './constants';
+import { isMacOS } from '../../shared/utils';
+import { onboardingViewUrl } from '../constants';
 // import { getExposedMeta } from './exposed';
-import { logger } from './logger';
+import { logger } from '../logger';
 
 const getScreenSize = (display: Display) => {
   const { width, height } = isMacOS() ? display.bounds : display.workArea;
@@ -15,7 +15,7 @@ const getScreenSize = (display: Display) => {
 
 // todo: not all window need all of the exposed meta
 const getWindowAdditionalArguments = async () => {
-  const { getExposedMeta } = await import('./exposed');
+  const { getExposedMeta } = await import('../exposed');
   const mainExposedMeta = getExposedMeta();
   return [
     `--main-exposed-meta=` + JSON.stringify(mainExposedMeta),
@@ -90,9 +90,7 @@ async function createOnboardingWindow(additionalArguments: string[]) {
     fullscreenAndCenter(browserWindow);
   });
 
-  await browserWindow.loadURL(
-    `${mainWindowOrigin}${mainWindowOrigin.endsWith('/') ? '' : '/'}onboarding`
-  );
+  await browserWindow.loadURL(onboardingViewUrl);
 
   return browserWindow;
 }
diff --git a/packages/frontend/electron/src/main/windows-manager/tab-views-meta-schema.ts b/packages/frontend/electron/src/main/windows-manager/tab-views-meta-schema.ts
new file mode 100644
index 0000000000000..0b0abbc0d2a95
--- /dev/null
+++ b/packages/frontend/electron/src/main/windows-manager/tab-views-meta-schema.ts
@@ -0,0 +1,45 @@
+import { z } from 'zod';
+
+export const workbenchViewModuleSchema = z.enum([
+  'trash',
+  'all',
+  'collection',
+  'tag',
+  'doc', // refers to a doc whose mode is not yet being resolved
+  'page',
+  'edgeless',
+  'journal',
+]);
+
+export const workbenchViewMetaSchema = z.object({
+  id: z.string(),
+  path: z
+    .object({
+      pathname: z.string().optional(),
+      hash: z.string().optional(),
+      search: z.string().optional(),
+    })
+    .optional(),
+  // todo: move title/module to cached stated
+  title: z.string().optional(),
+  moduleName: workbenchViewModuleSchema.optional(),
+});
+
+export const workbenchMetaSchema = z.object({
+  id: z.string(),
+  activeViewIndex: z.number(),
+  pinned: z.boolean().optional(),
+  basename: z.string(),
+  views: z.array(workbenchViewMetaSchema),
+});
+
+export const tabViewsMetaSchema = z.object({
+  activeWorkbenchId: z.string().optional(),
+  workbenches: z.array(workbenchMetaSchema).default([]),
+});
+
+export const TabViewsMetaKey = 'tabViewsMetaSchema';
+export type TabViewsMetaSchema = z.infer<typeof tabViewsMetaSchema>;
+export type WorkbenchMeta = z.infer<typeof workbenchMetaSchema>;
+export type WorkbenchViewMeta = z.infer<typeof workbenchViewMetaSchema>;
+export type WorkbenchViewModule = z.infer<typeof workbenchViewModuleSchema>;
diff --git a/packages/frontend/electron/src/main/windows-manager/tab-views.ts b/packages/frontend/electron/src/main/windows-manager/tab-views.ts
new file mode 100644
index 0000000000000..7e9ff9c8786bb
--- /dev/null
+++ b/packages/frontend/electron/src/main/windows-manager/tab-views.ts
@@ -0,0 +1,999 @@
+import { join } from 'node:path';
+
+import {
+  app,
+  type CookiesSetDetails,
+  globalShortcut,
+  Menu,
+  type Rectangle,
+  type View,
+  type WebContents,
+  WebContentsView,
+} from 'electron';
+import { partition } from 'lodash-es';
+import { nanoid } from 'nanoid';
+import {
+  BehaviorSubject,
+  combineLatest,
+  filter,
+  firstValueFrom,
+  map,
+  shareReplay,
+  startWith,
+  Subject,
+  type Unsubscribable,
+} from 'rxjs';
+
+import { isMacOS } from '../../shared/utils';
+import { isDev } from '../config';
+import { mainWindowOrigin, shellViewUrl } from '../constants';
+import { ensureHelperProcess } from '../helper-process';
+import { logger } from '../logger';
+import { globalStateStorage } from '../shared-storage/storage';
+import { parseCookie } from '../utils';
+import { getMainWindow, MainWindowManager } from './main-window';
+import {
+  TabViewsMetaKey,
+  type TabViewsMetaSchema,
+  tabViewsMetaSchema,
+  type WorkbenchMeta,
+  type WorkbenchViewMeta,
+} from './tab-views-meta-schema';
+
+async function getAdditionalArguments() {
+  const { getExposedMeta } = await import('../exposed');
+  const mainExposedMeta = getExposedMeta();
+  const helperProcessManager = await ensureHelperProcess();
+  const helperExposedMeta = await helperProcessManager.rpc?.getMeta();
+  return [
+    `--main-exposed-meta=` + JSON.stringify(mainExposedMeta),
+    `--helper-exposed-meta=` + JSON.stringify(helperExposedMeta),
+    `--window-name=main`,
+  ];
+}
+
+const TabViewsMetaState = {
+  $: globalStateStorage.watch<TabViewsMetaSchema>(TabViewsMetaKey).pipe(
+    map(v => tabViewsMetaSchema.parse(v ?? {})),
+    shareReplay(1)
+  ),
+
+  set value(value: TabViewsMetaSchema) {
+    globalStateStorage.set(TabViewsMetaKey, value);
+  },
+
+  get value() {
+    return tabViewsMetaSchema.parse(
+      globalStateStorage.get(TabViewsMetaKey) ?? {}
+    );
+  },
+
+  // shallow merge
+  patch(patch: Partial<TabViewsMetaSchema>) {
+    this.value = {
+      ...this.value,
+      ...patch,
+    };
+  },
+};
+
+type AddTabAction = {
+  type: 'add-tab';
+  payload: WorkbenchMeta;
+};
+
+type CloseTabAction = {
+  type: 'close-tab';
+  payload?: string;
+};
+
+type PinTabAction = {
+  type: 'pin-tab';
+  payload: { key: string; shouldPin: boolean };
+};
+
+type ActivateViewAction = {
+  type: 'activate-view';
+  payload: { tabId: string; viewIndex: number };
+};
+
+type SeparateViewAction = {
+  type: 'separate-view';
+  payload: { tabId: string; viewIndex: number };
+};
+
+type OpenInSplitViewAction = {
+  type: 'open-in-split-view';
+  payload: { tabId: string };
+};
+
+type TabAction =
+  | AddTabAction
+  | CloseTabAction
+  | PinTabAction
+  | ActivateViewAction
+  | SeparateViewAction
+  | OpenInSplitViewAction;
+
+type AddTabOption = {
+  basename: string;
+  view?: Omit<WorkbenchViewMeta, 'id'> | Array<Omit<WorkbenchViewMeta, 'id'>>;
+};
+
+export class WebContentViewsManager {
+  static readonly instance = new WebContentViewsManager(
+    MainWindowManager.instance
+  );
+
+  private constructor(public mainWindowManager: MainWindowManager) {
+    this.setup();
+  }
+
+  readonly tabViewsMeta$ = TabViewsMetaState.$;
+  readonly tabsBoundingRect$ = new BehaviorSubject<Rectangle | null>(null);
+  readonly appTabsUIReady$ = new BehaviorSubject(new Set<string>());
+
+  // all web views
+  readonly webViewsMap$ = new BehaviorSubject(
+    new Map<string, WebContentsView>()
+  );
+
+  readonly tabsStatus$ = combineLatest([
+    this.tabViewsMeta$.pipe(startWith(TabViewsMetaState.value)),
+    this.webViewsMap$,
+    this.appTabsUIReady$,
+  ]).pipe(
+    map(([viewsMeta, views, ready]) => {
+      return viewsMeta.workbenches.map(w => {
+        return {
+          id: w.id,
+          pinned: !!w.pinned,
+          active: viewsMeta.activeWorkbenchId === w.id,
+          loaded: views.has(w.id),
+          ready: ready.has(w.id),
+          activeViewIndex: w.activeViewIndex,
+          views: w.views,
+        };
+      });
+    }),
+    shareReplay(1)
+  );
+
+  // all app views (excluding shell view)
+  readonly workbenchViewsMap$ = this.webViewsMap$.pipe(
+    map(
+      views => new Map([...views.entries()].filter(([key]) => key !== 'shell'))
+    )
+  );
+
+  // a stack of closed workbenches (for undo close tab)
+  readonly closedWorkbenches: WorkbenchMeta[] = [];
+
+  /**
+   * Emits whenever a tab action is triggered.
+   */
+  readonly tabAction$ = new Subject<TabAction>();
+
+  readonly activeWorkbenchId$ = this.tabViewsMeta$.pipe(
+    map(m => m?.activeWorkbenchId ?? m?.workbenches[0].id)
+  );
+  readonly activeWorkbench$ = combineLatest([
+    this.activeWorkbenchId$,
+    this.workbenchViewsMap$,
+  ]).pipe(map(([key, views]) => (key ? views.get(key) : undefined)));
+
+  readonly shellView$ = this.webViewsMap$.pipe(
+    map(views => views.get('shell'))
+  );
+
+  readonly webViewKeys$ = this.webViewsMap$.pipe(
+    map(views => Array.from(views.keys()))
+  );
+
+  get tabViewsMeta() {
+    return TabViewsMetaState.value;
+  }
+
+  private set tabViewsMeta(meta: TabViewsMetaSchema) {
+    TabViewsMetaState.value = meta;
+  }
+
+  readonly patchTabViewsMeta = (patch: Partial<TabViewsMetaSchema>) => {
+    TabViewsMetaState.patch(patch);
+  };
+
+  get tabsBoundingRect() {
+    return this.tabsBoundingRect$.value;
+  }
+
+  set tabsBoundingRect(rect: Rectangle | null) {
+    this.tabsBoundingRect$.next(rect);
+  }
+
+  get shellView() {
+    return this.webViewsMap$.value.get('shell');
+  }
+
+  set activeWorkbenchId(id: string | undefined) {
+    this.patchTabViewsMeta({
+      activeWorkbenchId: id,
+    });
+  }
+
+  get activeWorkbenchId() {
+    return (
+      this.tabViewsMeta.activeWorkbenchId ??
+      this.tabViewsMeta.workbenches.at(0)?.id
+    );
+  }
+
+  get activeWorkbenchView() {
+    return this.activeWorkbenchId
+      ? this.webViewsMap$.value.get(this.activeWorkbenchId)
+      : undefined;
+  }
+
+  get activeWorkbenchMeta() {
+    return this.tabViewsMeta.workbenches.find(
+      w => w.id === this.activeWorkbenchId
+    );
+  }
+
+  get mainWindow() {
+    return this.mainWindowManager.mainWindow;
+  }
+
+  get tabViewsMap() {
+    return this.webViewsMap$.value;
+  }
+
+  get allViews() {
+    return Array.from(this.tabViewsMap.values());
+  }
+
+  setTabUIReady = (tabId: string) => {
+    this.appTabsUIReady$.next(new Set([...this.appTabsUIReady$.value, tabId]));
+    this.reorderViews();
+  };
+
+  getViewIdFromWebContentsId = (id: number) => {
+    return Array.from(this.tabViewsMap.entries()).find(
+      ([, view]) => view.webContents.id === id
+    )?.[0];
+  };
+
+  updateWorkbenchMeta = (id: string, patch: Partial<WorkbenchMeta>) => {
+    const workbenches = this.tabViewsMeta.workbenches;
+    const index = workbenches.findIndex(w => w.id === id);
+    if (index === -1) {
+      return;
+    }
+    const newWorkbenches = workbenches.toSpliced(index, 1, {
+      ...workbenches[index],
+      ...patch,
+    });
+    this.patchTabViewsMeta({
+      workbenches: newWorkbenches,
+    });
+  };
+
+  isActiveTab = (id: string) => {
+    return this.activeWorkbenchId === id;
+  };
+
+  closeTab = async (id?: string) => {
+    if (!id) {
+      id = this.activeWorkbenchId;
+    }
+
+    if (!id) {
+      return;
+    }
+
+    const index = this.tabViewsMeta.workbenches.findIndex(w => w.id === id);
+    if (index === -1 || this.tabViewsMeta.workbenches.length === 1) {
+      return;
+    }
+    const targetWorkbench = this.tabViewsMeta.workbenches[index];
+
+    if (targetWorkbench.pinned) {
+      return;
+    }
+
+    const workbenches = this.tabViewsMeta.workbenches.toSpliced(index, 1);
+    // if the active view is closed, switch to the next view (index unchanged)
+    // if the new index is out of bound, switch to the last view
+    let activeWorkbenchKey = this.activeWorkbenchId;
+
+    if (id === activeWorkbenchKey) {
+      activeWorkbenchKey = workbenches[index]?.id ?? workbenches.at(-1)?.id;
+    }
+
+    if (!activeWorkbenchKey) {
+      return;
+    }
+
+    this.showTab(activeWorkbenchKey).catch(logger.error);
+
+    this.patchTabViewsMeta({
+      workbenches,
+      activeWorkbenchId: activeWorkbenchKey,
+    });
+
+    this.tabAction$.next({
+      type: 'close-tab',
+      payload: id,
+    });
+
+    this.closedWorkbenches.push(targetWorkbench);
+
+    setTimeout(() => {
+      const view = this.tabViewsMap.get(id);
+      this.tabViewsMap.delete(id);
+
+      if (this.mainWindow && view) {
+        this.mainWindow.contentView.removeChildView(view);
+        view?.webContents.close();
+      }
+    }, 500); // delay a bit to get rid of the flicker
+  };
+
+  undoCloseTab = async () => {
+    if (this.closedWorkbenches.length === 0) {
+      return;
+    }
+
+    const workbench = this.closedWorkbenches.pop();
+
+    if (workbench) {
+      await this.addTab({
+        basename: workbench.basename,
+        view: workbench.views,
+      });
+    }
+  };
+
+  addTab = async (option?: AddTabOption) => {
+    if (!option) {
+      option = {
+        basename: '/',
+        view: {
+          title: 'New Tab',
+        },
+      };
+    }
+    const workbenches = this.tabViewsMeta.workbenches;
+    const newKey = this.generateViewId('app');
+    const views = (
+      Array.isArray(option.view) ? option.view : [option.view]
+    ).map(v => {
+      return {
+        ...v,
+        id: nanoid(),
+      };
+    });
+    const workbench: WorkbenchMeta = {
+      basename: option.basename,
+      activeViewIndex: 0,
+      views: views,
+      id: newKey,
+      pinned: false,
+    };
+
+    this.patchTabViewsMeta({
+      activeWorkbenchId: newKey,
+      workbenches: [...workbenches, workbench],
+    });
+    await this.showTab(newKey);
+    this.tabAction$.next({
+      type: 'add-tab',
+      payload: workbench,
+    });
+    return {
+      ...option,
+      key: newKey,
+    };
+  };
+
+  loadTab = async (id: string): Promise<WebContentsView | undefined> => {
+    if (!this.tabViewsMeta.workbenches.some(w => w.id === id)) {
+      return;
+    }
+
+    let view = this.tabViewsMap.get(id);
+    if (!view) {
+      view = await this.createAndAddView('app', id);
+      const workbench = this.tabViewsMeta.workbenches.find(w => w.id === id);
+      const viewMeta = workbench?.views[workbench.activeViewIndex];
+      if (workbench && viewMeta) {
+        const url = new URL(
+          workbench.basename + (viewMeta.path?.pathname ?? ''),
+          mainWindowOrigin
+        );
+        url.hash = viewMeta.path?.hash ?? '';
+        url.search = viewMeta.path?.search ?? '';
+        logger.info(`loading tab ${id} at ${url.href}`);
+        view.webContents.loadURL(url.href).catch(logger.error);
+      }
+    }
+    return view;
+  };
+
+  showTab = async (id: string): Promise<WebContentsView | undefined> => {
+    if (this.activeWorkbenchId !== id) {
+      // todo: this will cause the shell view to be on top and flickers the screen
+      // this.appTabsUIReady$.next(
+      //   new Set([...this.appTabsUIReady$.value].filter(key => key !== id))
+      // );
+      this.patchTabViewsMeta({
+        activeWorkbenchId: id,
+      });
+    }
+    this.reorderViews();
+    let view = this.tabViewsMap.get(id);
+    if (!view) {
+      view = await this.loadTab(id);
+    }
+    this.reorderViews();
+    if (view) {
+      this.resizeView(view);
+    }
+    return view;
+  };
+
+  pinTab = (key: string, shouldPin: boolean) => {
+    // move the pinned tab to the last index of the pinned tabs
+    const [pinned, unPinned] = partition(
+      this.tabViewsMeta.workbenches,
+      w => w.pinned
+    );
+
+    const workbench = this.tabViewsMeta.workbenches.find(w => w.id === key);
+    if (!workbench) {
+      return;
+    }
+
+    this.tabAction$.next({
+      type: 'pin-tab',
+      payload: { key, shouldPin },
+    });
+
+    if (workbench.pinned && !shouldPin) {
+      this.patchTabViewsMeta({
+        workbenches: [
+          ...pinned.filter(w => w.id !== key),
+          { ...workbench, pinned: false },
+          ...unPinned,
+        ],
+      });
+    } else if (!workbench.pinned && shouldPin) {
+      this.patchTabViewsMeta({
+        workbenches: [
+          ...pinned,
+          { ...workbench, pinned: true },
+          ...unPinned.filter(w => w.id !== key),
+        ],
+      });
+    }
+  };
+
+  activateView = async (tabId: string, viewIndex: number) => {
+    this.tabAction$.next({
+      type: 'activate-view',
+      payload: { tabId, viewIndex },
+    });
+    this.updateWorkbenchMeta(tabId, {
+      activeViewIndex: viewIndex,
+    });
+    await this.showTab(tabId);
+  };
+
+  separateView = (tabId: string, viewIndex: number) => {
+    const tabMeta = this.tabViewsMeta.workbenches.find(w => w.id === tabId);
+    if (!tabMeta) {
+      return;
+    }
+    this.tabAction$.next({
+      type: 'separate-view',
+      payload: { tabId, viewIndex },
+    });
+    const newTabMeta: WorkbenchMeta = {
+      ...tabMeta,
+      activeViewIndex: 0,
+      views: [tabMeta.views[viewIndex]],
+    };
+    this.updateWorkbenchMeta(tabId, {
+      views: tabMeta.views.toSpliced(viewIndex, 1),
+    });
+    addTab(newTabMeta).catch(logger.error);
+  };
+
+  openInSplitView = (tabId: string) => {
+    const tabMeta = this.tabViewsMeta.workbenches.find(w => w.id === tabId);
+    if (!tabMeta) {
+      return;
+    }
+    this.tabAction$.next({
+      type: 'open-in-split-view',
+      payload: { tabId },
+    });
+  };
+
+  reorderViews = () => {
+    if (this.mainWindow) {
+      // if tab ui of the current active view is not ready,
+      // make sure shell view is on top
+      const activeView = this.activeWorkbenchView;
+      const ready = this.activeWorkbenchId
+        ? this.appTabsUIReady$.value.has(this.activeWorkbenchId)
+        : false;
+
+      // inactive < active view (not ready) < shell < active view (ready)
+      const getScore = (view: View) => {
+        if (view === this.shellView) {
+          return 2;
+        }
+        if (view === activeView) {
+          return ready ? 3 : 1;
+        }
+        return 0;
+      };
+
+      [...this.tabViewsMap.values()]
+        .toSorted((a, b) => getScore(a) - getScore(b))
+        .forEach((view, index) => {
+          this.mainWindow?.contentView.addChildView(view, index);
+        });
+    }
+  };
+
+  setup = () => {
+    const windowReadyToShow$ = this.mainWindowManager.mainWindow$.pipe(
+      filter(w => !!w)
+    );
+
+    const disposables: Unsubscribable[] = [];
+    disposables.push(
+      windowReadyToShow$.subscribe(w => {
+        handleWebContentsResize().catch(logger.error);
+
+        const screenSizeChangeEvents = ['resize', 'maximize', 'unmaximize'];
+        const onResize = () => {
+          if (this.activeWorkbenchView) {
+            this.resizeView(this.activeWorkbenchView);
+          }
+          if (this.shellView) {
+            this.resizeView(this.shellView);
+          }
+        };
+        screenSizeChangeEvents.forEach(event => {
+          w.on(event as any, onResize);
+        });
+
+        // add shell view
+        this.createAndAddView('shell').catch(logger.error);
+        (async () => {
+          if (this.tabViewsMeta.workbenches.length === 0) {
+            // create a default view (e.g., on first launch)
+            await this.addTab();
+          } else {
+            const defaultTabId = this.activeWorkbenchId;
+            if (defaultTabId) await this.showTab(defaultTabId);
+          }
+        })().catch(logger.error);
+      })
+    );
+
+    disposables.push(
+      this.tabsBoundingRect$.subscribe(rect => {
+        if (rect) {
+          this.reorderViews();
+        }
+      })
+    );
+
+    app.on('ready', () => {
+      // bind CMD/CTRL+1~8 to switch tabs
+      // bind CMD/CTRL+9 to switch to the last tab
+      [1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => {
+        const shortcut = `CommandOrControl+${n}`;
+        const listener = () => {
+          if (!this.mainWindow?.isFocused()) {
+            return;
+          }
+          const item = this.tabViewsMeta.workbenches.at(n === 9 ? -1 : n - 1);
+          if (item) {
+            this.showTab(item.id).catch(logger.error);
+          }
+        };
+        globalShortcut.register(shortcut, listener);
+        disposables.push({
+          unsubscribe: () => globalShortcut.unregister(shortcut),
+        });
+      });
+    });
+
+    app.on('before-quit', () => {
+      disposables.forEach(d => d.unsubscribe());
+    });
+  };
+
+  setCookie = async (cookie: CookiesSetDetails) => {
+    const views = this.allViews;
+    if (!views) {
+      return;
+    }
+    logger.info('setting cookie to main window view(s)', cookie);
+    for (const view of views) {
+      await view.webContents.session.cookies.set(cookie);
+    }
+  };
+
+  removeCookie = async (url: string, name: string) => {
+    const views = this.allViews;
+    if (!views) {
+      return;
+    }
+    logger.info('removing cookie from main window view(s)', { url, name });
+    for (const view of views) {
+      await view.webContents.session.cookies.remove(url, name);
+    }
+  };
+
+  getCookie = (url?: string, name?: string) => {
+    // all webviews share the same session
+    const view = this.allViews?.at(0);
+    if (!view) {
+      return;
+    }
+    return view.webContents.session.cookies.get({
+      url,
+      name,
+    });
+  };
+
+  getViewById = (id: string) => {
+    if (id === 'shell') {
+      return this.shellView;
+    } else {
+      return this.tabViewsMap.get(id);
+    }
+  };
+
+  resizeView = (view: View) => {
+    // app view will take full w/h of the main window
+    view.setBounds({
+      x: 0,
+      y: 0,
+      width: this.mainWindow?.getContentBounds().width ?? 0,
+      height: this.mainWindow?.getContentBounds().height ?? 0,
+    });
+  };
+
+  private readonly generateViewId = (type: 'app' | 'shell') => {
+    return type === 'shell' ? 'shell' : `app-${nanoid()}`;
+  };
+
+  private readonly createAndAddView = async (
+    type: 'app' | 'shell',
+    viewId = this.generateViewId(type)
+  ) => {
+    if (this.shellView && type === 'shell') {
+      logger.error('shell view is already created');
+    }
+
+    const start = performance.now();
+
+    const additionalArguments = await getAdditionalArguments();
+    const helperProcessManager = await ensureHelperProcess();
+    // will be added to appInfo
+    additionalArguments.push(`--view-id=${viewId}`);
+
+    const view = new WebContentsView({
+      webPreferences: {
+        webgl: true,
+        transparent: true,
+        contextIsolation: true,
+        sandbox: false,
+        spellcheck: false, // TODO(@pengx17): enable?
+        preload: join(__dirname, './preload.js'), // this points to the bundled preload module
+        // serialize exposed meta that to be used in preload
+        additionalArguments: additionalArguments,
+      },
+    });
+
+    this.webViewsMap$.next(this.tabViewsMap.set(viewId, view));
+    let unsub = () => {};
+
+    // shell process do not need to connect to helper process
+    if (type !== 'shell') {
+      view.webContents.on('did-finish-load', () => {
+        unsub = helperProcessManager.connectRenderer(view.webContents);
+      });
+      view.webContents.on('did-start-loading', () => {
+        // means the view is reloaded
+        this.appTabsUIReady$.next(
+          new Set([...this.appTabsUIReady$.value].filter(key => key !== viewId))
+        );
+      });
+    } else {
+      view.webContents.on('focus', () => {
+        globalThis.setTimeout(() => {
+          // when shell is focused, focus the active app view instead (to make sure global keybindings work)
+          this.activeWorkbenchView?.webContents.focus();
+        });
+      });
+
+      view.webContents.loadURL(shellViewUrl).catch(logger.error);
+      if (isDev) {
+        view.webContents.openDevTools();
+      }
+    }
+
+    view.webContents.on('destroyed', () => {
+      unsub();
+      this.webViewsMap$.next(
+        new Map(
+          [...this.tabViewsMap.entries()].filter(([key]) => key !== viewId)
+        )
+      );
+      // if all views are destroyed, close the app
+      // should only happen in tests
+      if (this.tabViewsMap.size === 0) {
+        app.quit();
+      }
+    });
+
+    this.resizeView(view);
+    // reorder will add to main window when loaded
+    this.reorderViews();
+
+    logger.info(`view ${viewId} created in ${performance.now() - start}ms`);
+    return view;
+  };
+}
+
+export async function setCookie(cookie: CookiesSetDetails): Promise<void>;
+export async function setCookie(origin: string, cookie: string): Promise<void>;
+
+export async function setCookie(
+  arg0: CookiesSetDetails | string,
+  arg1?: string
+) {
+  const details =
+    typeof arg1 === 'string' && typeof arg0 === 'string'
+      ? parseCookie(arg0, arg1)
+      : arg0;
+
+  logger.info('setting cookie to main window', details);
+
+  if (typeof details !== 'object') {
+    throw new Error('invalid cookie details');
+  }
+  return WebContentViewsManager.instance.setCookie(details);
+}
+
+export async function removeCookie(url: string, name: string): Promise<void> {
+  return WebContentViewsManager.instance.removeCookie(url, name);
+}
+
+export async function getCookie(url?: string, name?: string) {
+  return WebContentViewsManager.instance.getCookie(url, name);
+}
+
+// there is no proper way to listen to webContents resize event
+// we will rely on window.resize event in renderer instead
+export async function handleWebContentsResize() {
+  // right now when window is resized, we will relocate the traffic light positions
+  if (isMacOS()) {
+    const window = await getMainWindow();
+    const factor = window?.webContents.getZoomFactor() || 1;
+    window?.setWindowButtonPosition({ x: 20 * factor, y: 24 * factor - 6 });
+  }
+}
+
+export function onTabViewsMetaChanged(
+  fn: (appViewMeta: TabViewsMetaSchema) => void
+) {
+  const sub = WebContentViewsManager.instance.tabViewsMeta$.subscribe(meta => {
+    fn(meta);
+  });
+  return () => {
+    sub.unsubscribe();
+  };
+}
+
+export const onTabShellViewActiveChange = (fn: (active: boolean) => void) => {
+  const sub = combineLatest([
+    WebContentViewsManager.instance.appTabsUIReady$,
+    WebContentViewsManager.instance.activeWorkbenchId$,
+  ]).subscribe(([ready, active]) => {
+    fn(!ready.has(active));
+  });
+
+  return () => {
+    sub.unsubscribe();
+  };
+};
+
+export const getTabsStatus = () => {
+  return firstValueFrom(WebContentViewsManager.instance.tabsStatus$);
+};
+
+export const onTabsStatusChange = (
+  fn: (
+    tabs: {
+      id: string;
+      active: boolean;
+      loaded: boolean;
+      ready: boolean;
+      pinned: boolean;
+      activeViewIndex: number;
+      views: WorkbenchViewMeta[];
+    }[]
+  ) => void
+) => {
+  const sub = WebContentViewsManager.instance.tabsStatus$.subscribe(tabs => {
+    fn(tabs);
+  });
+
+  return () => {
+    sub.unsubscribe();
+  };
+};
+
+export const updateWorkbenchMeta = (
+  id: string,
+  meta: Partial<Omit<WorkbenchMeta, 'id'>>
+) => {
+  WebContentViewsManager.instance.updateWorkbenchMeta(id, meta);
+};
+export const getWorkbenchMeta = (id: string) => {
+  return TabViewsMetaState.value.workbenches.find(w => w.id === id);
+};
+export const getTabViewsMeta = () => TabViewsMetaState.value;
+export const isActiveTab = (wc: WebContents) => {
+  return (
+    wc.id ===
+    WebContentViewsManager.instance.activeWorkbenchView?.webContents.id
+  );
+};
+export const addTab = WebContentViewsManager.instance.addTab;
+export const showTab = WebContentViewsManager.instance.showTab;
+export const closeTab = WebContentViewsManager.instance.closeTab;
+export const undoCloseTab = WebContentViewsManager.instance.undoCloseTab;
+export const activateView = WebContentViewsManager.instance.activateView;
+
+export const onTabAction = (fn: (event: TabAction) => void) => {
+  const { unsubscribe } =
+    WebContentViewsManager.instance.tabAction$.subscribe(fn);
+
+  return unsubscribe;
+};
+
+export const onActiveTabChanged = (fn: (tabId: string) => void) => {
+  const sub = WebContentViewsManager.instance.activeWorkbenchId$.subscribe(fn);
+  return () => {
+    sub.unsubscribe();
+  };
+};
+
+export const showDevTools = (id?: string) => {
+  const view = id
+    ? WebContentViewsManager.instance.getViewById(id)
+    : WebContentViewsManager.instance.activeWorkbenchView;
+  if (view) {
+    view.webContents.openDevTools();
+  }
+};
+
+export const onTabsBoundingRectChanged = (
+  fn: (rect: Rectangle | null) => void
+) => {
+  const sub = WebContentViewsManager.instance.tabsBoundingRect$.subscribe(fn);
+  return () => {
+    sub.unsubscribe();
+  };
+};
+
+export const getTabsBoundingRect = () => {
+  return WebContentViewsManager.instance.tabsBoundingRect;
+};
+
+export const updateTabsBoundingRect = (wc: WebContents, rect: Rectangle) => {
+  try {
+    if (isActiveTab(wc)) {
+      WebContentViewsManager.instance.tabsBoundingRect = rect;
+    }
+    const viewId = WebContentViewsManager.instance.getViewIdFromWebContentsId(
+      wc.id
+    );
+    if (viewId) {
+      WebContentViewsManager.instance.setTabUIReady(viewId);
+    }
+  } catch (err) {
+    logger.error(err);
+  }
+};
+
+export const showTabContextMenu = async (tabId: string, viewIndex: number) => {
+  const workbenches = WebContentViewsManager.instance.tabViewsMeta.workbenches;
+  const unpinned = workbenches.filter(w => !w.pinned);
+  const tabMeta = workbenches.find(w => w.id === tabId);
+  if (!tabMeta) {
+    return;
+  }
+
+  const template: Parameters<typeof Menu.buildFromTemplate>[0] = [
+    tabMeta.pinned
+      ? {
+          label: 'Unpin tab',
+          click: () => {
+            WebContentViewsManager.instance.pinTab(tabId, false);
+          },
+        }
+      : {
+          label: 'Pin tab',
+          click: () => {
+            WebContentViewsManager.instance.pinTab(tabId, true);
+          },
+        },
+    {
+      label: 'Refresh tab',
+      click: () => {
+        WebContentViewsManager.instance
+          .getViewById(tabId)
+          ?.webContents.reload();
+      },
+    },
+    {
+      label: 'Duplicate tab',
+      click: () => {
+        addTab(tabMeta).catch(logger.error);
+      },
+    },
+
+    { type: 'separator' },
+
+    tabMeta.views.length > 1
+      ? {
+          label: 'Separate tabs',
+          click: () => {
+            WebContentViewsManager.instance.separateView(tabId, viewIndex);
+          },
+        }
+      : {
+          label: 'Open in split view',
+          click: () => {
+            WebContentViewsManager.instance.openInSplitView(tabId);
+          },
+        },
+
+    ...(unpinned.length > 0
+      ? ([
+          { type: 'separator' },
+          {
+            label: 'Close tab',
+            click: () => {
+              closeTab(tabId).catch(logger.error);
+            },
+          },
+          {
+            label: 'Close other tabs',
+            click: () => {
+              const tabsToRetain =
+                WebContentViewsManager.instance.tabViewsMeta.workbenches.filter(
+                  w => w.id === tabId || w.pinned
+                );
+
+              WebContentViewsManager.instance.patchTabViewsMeta({
+                workbenches: tabsToRetain,
+              });
+            },
+          },
+        ] as const)
+      : []),
+  ];
+  const menu = Menu.buildFromTemplate(template);
+  menu.popup();
+};
diff --git a/packages/frontend/electron/src/preload/electron-api.ts b/packages/frontend/electron/src/preload/electron-api.ts
index 30e3614895ae9..ae6773155fafd 100644
--- a/packages/frontend/electron/src/preload/electron-api.ts
+++ b/packages/frontend/electron/src/preload/electron-api.ts
@@ -73,10 +73,13 @@ schema = isDev ? 'affine-dev' : schema;
 
 export const appInfo = {
   electron: true,
-  windowName: process.argv
-    .find(arg => arg.startsWith('--window-name='))
-    ?.split('=')[1],
-  schema,
+  windowName:
+    process.argv.find(arg => arg.startsWith('--window-name='))?.split('=')[1] ??
+    'unknown',
+  viewId:
+    process.argv.find(arg => arg.startsWith('--view-id='))?.split('=')[1] ??
+    'unknown',
+  schema: `${schema}`,
 };
 
 function getMainAPIs() {
diff --git a/packages/frontend/web/src/app.tsx b/packages/frontend/web/src/app.tsx
index 97136daea35f3..38d4b272d1af8 100644
--- a/packages/frontend/web/src/app.tsx
+++ b/packages/frontend/web/src/app.tsx
@@ -7,6 +7,7 @@ import { GlobalLoading } from '@affine/component/global-loading';
 import { AppFallback } from '@affine/core/components/affine/app-container';
 import { configureCommonModules } from '@affine/core/modules';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
+import { configureBrowserWorkbenchModule } from '@affine/core/modules/workbench';
 import {
   configureBrowserWorkspaceFlavours,
   configureIndexedDBWorkspaceEngineStorageProvider,
@@ -70,6 +71,7 @@ let languageLoadingPromise: Promise<void> | null = null;
 
 const framework = new Framework();
 configureCommonModules(framework);
+configureBrowserWorkbenchModule(framework);
 configureLocalStorageStateStorageImpls(framework);
 configureBrowserWorkspaceFlavours(framework);
 configureIndexedDBWorkspaceEngineStorageProvider(framework);
diff --git a/packages/frontend/web/src/polyfill/set-immediate.ts b/packages/frontend/web/src/polyfill/set-immediate.ts
new file mode 100644
index 0000000000000..b8f042569a083
--- /dev/null
+++ b/packages/frontend/web/src/polyfill/set-immediate.ts
@@ -0,0 +1 @@
+import 'setimmediate';
diff --git a/tests/affine-desktop-cloud/package.json b/tests/affine-desktop-cloud/package.json
index d05fb9b8817f8..a78dffcbc83e6 100644
--- a/tests/affine-desktop-cloud/package.json
+++ b/tests/affine-desktop-cloud/package.json
@@ -2,7 +2,7 @@
   "name": "@affine-test/affine-desktop-cloud",
   "private": true,
   "scripts": {
-    "e2e": "DEBUG=pw:browser yarn playwright test"
+    "e2e": "yarn playwright test"
   },
   "devDependencies": {
     "@affine-test/fixtures": "workspace:*",
diff --git a/tests/affine-desktop/e2e/basic.spec.ts b/tests/affine-desktop/e2e/basic.spec.ts
index 12b34d1cb3534..b4f559fff2a71 100644
--- a/tests/affine-desktop/e2e/basic.spec.ts
+++ b/tests/affine-desktop/e2e/basic.spec.ts
@@ -1,10 +1,8 @@
 import { test } from '@affine-test/kit/electron';
-import { withCtrlOrMeta } from '@affine-test/kit/utils/keyboard';
 import {
   clickNewPageButton,
   createLinkedPage,
   getBlockSuiteEditorTitle,
-  waitForEmptyEditor,
 } from '@affine-test/kit/utils/page-logic';
 import {
   clickSideBarCurrentWorkspaceBanner,
@@ -14,73 +12,53 @@ import type { Page } from '@playwright/test';
 import { expect } from '@playwright/test';
 
 const historyShortcut = async (page: Page, command: 'goBack' | 'goForward') => {
-  await withCtrlOrMeta(page, () =>
-    page.keyboard.press(command === 'goBack' ? '[' : ']', { delay: 50 })
+  await page.keyboard.press(
+    command === 'goBack' ? 'ControlOrMeta+[' : 'ControlOrMeta+]'
   );
 };
 
 test('new page', async ({ page, workspace }) => {
-  await page.getByTestId('sidebar-new-page-button').click();
-  await page.waitForSelector('v-line');
+  await clickNewPageButton(page);
   const flavour = (await workspace.current()).meta.flavour;
   expect(flavour).toBe('local');
 });
 
 test('app sidebar router forward/back', async ({ page }) => {
-  {
-    // create pages
-    await page.waitForTimeout(500);
-    await clickNewPageButton(page);
-    await page.waitForSelector('v-line');
-    const title = getBlockSuiteEditorTitle(page);
-    await title.focus();
-    await title.pressSequentially('test1', {
-      delay: 100,
-    });
-    await page.waitForTimeout(500);
-    await page.getByTestId('sidebar-new-page-button').click({
-      delay: 100,
-    });
-    await page.waitForSelector('v-line');
+  // create pages
+  await page.waitForTimeout(500);
+  await clickNewPageButton(page);
+  const title = getBlockSuiteEditorTitle(page);
+  await title.focus();
+  await title.pressSequentially('test1', {
+    delay: 100,
+  });
+  await page.waitForTimeout(500);
+  await clickNewPageButton(page);
 
-    await title.focus();
-    await title.pressSequentially('test2', {
-      delay: 100,
-    });
-    await page.waitForTimeout(500);
-    await page.getByTestId('sidebar-new-page-button').click({
-      delay: 100,
-    });
-    await page.waitForSelector('v-line');
-    await title.focus();
-    await title.pressSequentially('test3', {
-      delay: 100,
-    });
-  }
-  {
-    await expect(getBlockSuiteEditorTitle(page)).toHaveText('test3');
-  }
+  await title.focus();
+  await title.pressSequentially('test2', {
+    delay: 100,
+  });
+  await page.waitForTimeout(500);
+  await clickNewPageButton(page);
+  await title.focus();
+  await title.pressSequentially('test3', {
+    delay: 100,
+  });
+  await expect(getBlockSuiteEditorTitle(page)).toHaveText('test3');
 
   await page.click('[data-testid="app-navigation-button-back"]');
   await page.click('[data-testid="app-navigation-button-back"]');
-  {
-    await expect(getBlockSuiteEditorTitle(page)).toHaveText('test1');
-  }
+  await expect(getBlockSuiteEditorTitle(page)).toHaveText('test1');
   await page.click('[data-testid="app-navigation-button-forward"]');
   await page.click('[data-testid="app-navigation-button-forward"]');
-  {
-    await expect(getBlockSuiteEditorTitle(page)).toHaveText('test3');
-  }
+  await expect(getBlockSuiteEditorTitle(page)).toHaveText('test3');
   await historyShortcut(page, 'goBack');
   await historyShortcut(page, 'goBack');
-  {
-    await expect(getBlockSuiteEditorTitle(page)).toHaveText('test1');
-  }
+  await expect(getBlockSuiteEditorTitle(page)).toHaveText('test1');
   await historyShortcut(page, 'goForward');
   await historyShortcut(page, 'goForward');
-  {
-    await expect(getBlockSuiteEditorTitle(page)).toHaveText('test3');
-  }
+  await expect(getBlockSuiteEditorTitle(page)).toHaveText('test3');
 });
 
 test('clientBorder value should disable by default on window', async ({
@@ -133,6 +111,8 @@ test('windows only check', async ({ page }) => {
 });
 
 test('delete workspace', async ({ page }) => {
+  await clickNewPageButton(page);
+
   await clickSideBarCurrentWorkspaceBanner(page);
   await page.getByTestId('new-workspace').click();
   await page.getByTestId('create-workspace-input').fill('Delete Me');
@@ -159,8 +139,7 @@ test('delete workspace', async ({ page }) => {
   await page.getByTestId('delete-workspace-button').click();
   await page.getByTestId('delete-workspace-input').fill('Delete Me');
   await page.getByTestId('delete-workspace-confirm-button').click();
-  await page.waitForTimeout(1000);
-  expect(await page.getByTestId('workspace-name').textContent()).toBe(
+  await expect(page.getByTestId('workspace-name')).toContainText(
     'Demo Workspace'
   );
 });
@@ -192,17 +171,14 @@ async function enableSplitView(page: Page) {
 
 test('open split view', async ({ page }) => {
   await enableSplitView(page);
-  await page.getByTestId('sidebar-new-page-button').click({
-    delay: 100,
-  });
-  await waitForEmptyEditor(page);
+  await clickNewPageButton(page);
   await page.waitForTimeout(500);
   await page.keyboard.press('Enter');
   await createLinkedPage(page, 'hi from another page');
   await page
     .locator('.affine-reference-title:has-text("hi from another page")')
     .click({
-      modifiers: [process.platform === 'darwin' ? 'Meta' : 'Control'],
+      modifiers: ['ControlOrMeta', 'Alt'],
     });
   await expect(page.locator('.doc-title-container')).toHaveCount(2);
 });
diff --git a/tests/affine-desktop/package.json b/tests/affine-desktop/package.json
index f6fd339aaef1f..f77b665fe8984 100644
--- a/tests/affine-desktop/package.json
+++ b/tests/affine-desktop/package.json
@@ -2,7 +2,7 @@
   "name": "@affine-test/affine-desktop",
   "private": true,
   "scripts": {
-    "e2e": "DEBUG=\"pw:*\" yarn playwright test"
+    "e2e": "yarn playwright test"
   },
   "devDependencies": {
     "@affine-test/fixtures": "workspace:*",
diff --git a/tests/affine-desktop/playwright.config.ts b/tests/affine-desktop/playwright.config.ts
index cceccc56e4138..d415817cca790 100644
--- a/tests/affine-desktop/playwright.config.ts
+++ b/tests/affine-desktop/playwright.config.ts
@@ -16,6 +16,7 @@ import type { PlaywrightTestConfig } from '@playwright/test';
 const config: PlaywrightTestConfig = {
   testDir: './e2e',
   fullyParallel: true,
+  workers: 2,
   timeout: process.env.CI ? 50_000 : 30_000,
   outputDir: testResultDir,
   use: {
diff --git a/tests/kit/electron.ts b/tests/kit/electron.ts
index c9b589566076f..da293ac465c5c 100644
--- a/tests/kit/electron.ts
+++ b/tests/kit/electron.ts
@@ -1,17 +1,12 @@
 import crypto from 'node:crypto';
 import { join, resolve } from 'node:path';
 
-import type { Page } from '@playwright/test';
+import { expect, type Page } from '@playwright/test';
 import fs from 'fs-extra';
 import type { ElectronApplication } from 'playwright';
 import { _electron as electron } from 'playwright';
 
-import {
-  enableCoverage,
-  istanbulTempDir,
-  test as base,
-  testResultDir,
-} from './playwright';
+import { test as base, testResultDir } from './playwright';
 import { removeWithRetry } from './utils/utils';
 
 const projectRoot = join(__dirname, '..', '..');
@@ -23,8 +18,30 @@ function generateUUID() {
 
 type RoutePath = 'setting';
 
+const getPageId = async (page: Page) => {
+  return page.evaluate(() => {
+    return (window.appInfo as any)?.viewId as string;
+  });
+};
+
+const isActivePage = async (page: Page) => {
+  return page.evaluate(async () => {
+    return await (window as any).apis?.ui.isActiveTab();
+  });
+};
+
+const getActivePage = async (pages: Page[]) => {
+  for (const page of pages) {
+    if (await isActivePage(page)) {
+      return page;
+    }
+  }
+  return null;
+};
+
 export const test = base.extend<{
   electronApp: ElectronApplication;
+  shell: Page;
   appInfo: {
     appPath: string;
     appData: string;
@@ -34,88 +51,89 @@ export const test = base.extend<{
     goto: (path: RoutePath) => Promise<void>;
   };
 }>({
+  shell: async ({ electronApp }, use) => {
+    await expect.poll(() => electronApp.windows().length > 1).toBeTruthy();
+
+    for (const page of electronApp.windows()) {
+      const viewId = await getPageId(page);
+      if (viewId === 'shell') {
+        await use(page);
+        break;
+      }
+    }
+  },
   page: async ({ electronApp }, use) => {
-    const page = await electronApp.firstWindow();
+    await expect
+      .poll(() => {
+        return electronApp.windows().length > 1;
+      })
+      .toBeTruthy();
+
+    const page = await getActivePage(electronApp.windows());
+
+    if (!page) {
+      throw new Error('No active page found');
+    }
+
+    // wait for blocksuite to be loaded
+    await page.waitForSelector('v-line');
+
     await page.evaluate(() => {
       window.localStorage.setItem('dismissAiOnboarding', 'true');
       window.localStorage.setItem('dismissAiOnboardingEdgeless', 'true');
       window.localStorage.setItem('dismissAiOnboardingLocal', 'true');
     });
-    // wait for blocksuite to be loaded
-    await page.waitForSelector('v-line');
-    if (enableCoverage) {
-      await fs.promises.mkdir(istanbulTempDir, { recursive: true });
-      await page.exposeFunction(
-        'collectIstanbulCoverage',
-        (coverageJSON?: string) => {
-          if (coverageJSON)
-            fs.writeFileSync(
-              join(
-                istanbulTempDir,
-                `playwright_coverage_${generateUUID()}.json`
-              ),
-              coverageJSON
-            );
-        }
-      );
-    }
+
+    await page.reload();
+
     await use(page as Page);
-    if (enableCoverage) {
-      await page.evaluate(() =>
-        // @ts-expect-error
-        window.collectIstanbulCoverage(JSON.stringify(window.__coverage__))
-      );
-    }
-    await page.close();
   },
   // eslint-disable-next-line no-empty-pattern
   electronApp: async ({}, use) => {
-    // a random id to avoid conflicts between tests
-    const id = generateUUID();
-    const ext = process.platform === 'win32' ? '.cmd' : '';
-    const dist = resolve(electronRoot, 'dist');
-    const clonedDist = resolve(electronRoot, 'e2e-dist-' + id);
-    await fs.copy(dist, clonedDist);
-    const packageJson = await fs.readJSON(
-      resolve(electronRoot, 'package.json')
-    );
-    // overwrite the app name
-    packageJson.name = 'affine-test-' + id;
-    // overwrite the path to the main script
-    packageJson.main = './main.js';
-    // write to the cloned dist
-    await fs.writeJSON(resolve(clonedDist, 'package.json'), packageJson);
-
-    const env: Record<string, string> = {};
-    for (const [key, value] of Object.entries(process.env)) {
-      if (value) {
-        env[key] = value;
+    try {
+      // a random id to avoid conflicts between tests
+      const id = generateUUID();
+      const dist = resolve(electronRoot, 'dist');
+      const clonedDist = resolve(electronRoot, 'e2e-dist-' + id);
+      await fs.copy(dist, clonedDist);
+      const packageJson = await fs.readJSON(
+        resolve(electronRoot, 'package.json')
+      );
+      // overwrite the app name
+      packageJson.name = 'affine-test-' + id;
+      // overwrite the path to the main script
+      packageJson.main = './main.js';
+      // write to the cloned dist
+      await fs.writeJSON(resolve(clonedDist, 'package.json'), packageJson);
+
+      const env: Record<string, string> = {};
+      for (const [key, value] of Object.entries(process.env)) {
+        if (value) {
+          env[key] = value;
+        }
       }
-    }
 
-    if (process.env.DEV_SERVER_URL) {
-      env.DEV_SERVER_URL = process.env.DEV_SERVER_URL;
-    }
+      env.SKIP_ONBOARDING = '1';
 
-    env.SKIP_ONBOARDING = '1';
-
-    const electronApp = await electron.launch({
-      args: [clonedDist],
-      env,
-      executablePath: resolve(
-        projectRoot,
-        'node_modules',
-        '.bin',
-        `electron${ext}`
-      ),
-      cwd: clonedDist,
-      recordVideo: {
-        dir: testResultDir,
-      },
-      colorScheme: 'light',
-    });
-    await use(electronApp);
-    try {
+      const electronApp = await electron.launch({
+        args: [clonedDist],
+        env,
+        cwd: clonedDist,
+        recordVideo: {
+          dir: testResultDir,
+        },
+        colorScheme: 'light',
+      });
+
+      await use(electronApp);
+      console.log('Cleaning up...');
+      const pages = electronApp.windows();
+      for (let i = 0; i < pages.length; i++) {
+        const page = pages[i];
+        await page.close();
+        console.log(`Closed page ${i + 1}/${pages.length}`);
+      }
+      await electronApp.close();
       await removeWithRetry(clonedDist);
     } catch (error) {
       console.log(error);
@@ -132,3 +150,8 @@ export const test = base.extend<{
     await use(appInfo);
   },
 });
+
+// eslint-disable-next-line no-empty-pattern
+test.afterEach(({}, testInfo) => {
+  console.log('cleaning up for ' + testInfo);
+});
diff --git a/tools/cli/src/bin/build.ts b/tools/cli/src/bin/build.ts
index 05f042e10499e..92712158a0ebb 100644
--- a/tools/cli/src/bin/build.ts
+++ b/tools/cli/src/bin/build.ts
@@ -29,14 +29,14 @@ const getChannel = () => {
   }
 };
 
-let entry: string | undefined;
+let entry: BuildFlags['entry'];
 
 const { DISTRIBUTION } = process.env;
 
 const cwd = getCwdFromDistribution(DISTRIBUTION);
 
 if (DISTRIBUTION === 'desktop') {
-  entry = './index.tsx';
+  entry = { app: './index.tsx', shell: './shell/index.tsx' };
 }
 
 const flags = {
diff --git a/tools/cli/src/bin/dev.ts b/tools/cli/src/bin/dev.ts
index 36d273e13b831..12895cab50348 100644
--- a/tools/cli/src/bin/dev.ts
+++ b/tools/cli/src/bin/dev.ts
@@ -111,7 +111,10 @@ const cwd = getCwdFromDistribution(flags.distribution);
 process.env.DISTRIBUTION = flags.distribution;
 
 if (flags.distribution === 'desktop') {
-  flags.entry = join(cwd, 'index.tsx');
+  flags.entry = {
+    app: join(cwd, 'index.tsx'),
+    shell: join(cwd, 'shell/index.tsx'),
+  };
 }
 
 if (buildFlags.debugBlockSuite) {
diff --git a/tools/cli/src/config/index.ts b/tools/cli/src/config/index.ts
index 453cbb571fc52..0035fb39dabbb 100644
--- a/tools/cli/src/config/index.ts
+++ b/tools/cli/src/config/index.ts
@@ -4,5 +4,5 @@ export type BuildFlags = {
   channel: 'stable' | 'beta' | 'canary' | 'internal';
   coverage?: boolean;
   localBlockSuite?: string;
-  entry?: string;
+  entry?: string | { [key: string]: string };
 };
diff --git a/tools/cli/src/webpack/config.ts b/tools/cli/src/webpack/config.ts
index c7055a23e7a3b..bc1a70eb2188a 100644
--- a/tools/cli/src/webpack/config.ts
+++ b/tools/cli/src/webpack/config.ts
@@ -368,6 +368,9 @@ export const createConfiguration: (
         ? new WebpackS3Plugin()
         : null,
     ]),
+    stats: {
+      errorDetails: true,
+    },
 
     optimization: OptimizeOptionOptions(buildFlags),
 
diff --git a/tools/cli/src/webpack/webpack.config.ts b/tools/cli/src/webpack/webpack.config.ts
index 889c545676440..e1b0b21fecd43 100644
--- a/tools/cli/src/webpack/webpack.config.ts
+++ b/tools/cli/src/webpack/webpack.config.ts
@@ -33,23 +33,30 @@ export function createWebpackConfig(cwd: string, flags: BuildFlags) {
   const runtimeConfig = getRuntimeConfig(flags);
   console.log('runtime config', runtimeConfig);
   const config = createConfiguration(cwd, flags, runtimeConfig);
+  const entry =
+    typeof flags.entry === 'string' || !flags.entry
+      ? {
+          app: flags.entry ?? resolve(cwd, 'src/index.tsx'),
+        }
+      : flags.entry;
+
+  const createHTMLPlugin = (entryName = 'app') => {
+    return new HTMLPlugin({
+      template: join(rootPath, 'webpack', 'template.html'),
+      inject: 'body',
+      scriptLoading: 'module',
+      minify: false,
+      chunks: [entryName],
+      filename: `${entryName === 'app' ? 'index' : entryName}.html`, // main entry should take name index.html
+      templateParameters: {
+        GIT_SHORT_SHA: gitShortHash(),
+        DESCRIPTION,
+      },
+    });
+  };
+
   return merge(config, {
-    entry: {
-      [flags.distribution]: flags.entry ?? resolve(cwd, 'src/index.tsx'),
-    },
-    plugins: [
-      new HTMLPlugin({
-        template: join(rootPath, 'webpack', 'template.html'),
-        inject: 'body',
-        scriptLoading: 'module',
-        minify: false,
-        chunks: 'all',
-        filename: 'index.html',
-        templateParameters: {
-          GIT_SHORT_SHA: gitShortHash(),
-          DESCRIPTION,
-        },
-      }),
-    ],
+    entry: entry,
+    plugins: Object.keys(entry).map(createHTMLPlugin),
   });
 }