Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

refactor(editor): separate lit and slot in global (#10666)

Saul-Mirone84e2dda3f831
diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json
index 2c1b265582..12f4f25171 100644
--- a/blocksuite/affine/all/package.json
+++ b/blocksuite/affine/all/package.json
@@ -32,6 +32,8 @@
"./global/di": "./src/global/di.ts",
"./global/types": "./src/global/types.ts",
"./global/gfx": "./src/global/gfx.ts",
+ "./global/slot": "./src/global/slot.ts",
+ "./global/lit": "./src/global/lit.ts",
"./store": "./src/store/index.ts",
"./store/test": "./src/store/test.ts",
"./inline": "./src/inline/index.ts",
diff --git a/blocksuite/affine/all/src/global/lit.ts b/blocksuite/affine/all/src/global/lit.ts
new file mode 100644
index 0000000000..4f768d3fd9
--- /dev/null
+++ b/blocksuite/affine/all/src/global/lit.ts
@@ -0,0 +1 @@
+export * from '@blocksuite/global/lit';
diff --git a/blocksuite/affine/all/src/global/slot.ts b/blocksuite/affine/all/src/global/slot.ts
new file mode 100644
index 0000000000..258a19a836
--- /dev/null
+++ b/blocksuite/affine/all/src/global/slot.ts
@@ -0,0 +1 @@
+export * from '@blocksuite/global/slot';
diff --git a/blocksuite/affine/block-bookmark/src/components/bookmark-card.ts b/blocksuite/affine/block-bookmark/src/components/bookmark-card.ts
index 7746a61eb7..cca6df1854 100644
--- a/blocksuite/affine/block-bookmark/src/components/bookmark-card.ts
+++ b/blocksuite/affine/block-bookmark/src/components/bookmark-card.ts
@@ -3,7 +3,7 @@ import { WebIcon16 } from '@blocksuite/affine-components/icons';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import { getHostName } from '@blocksuite/affine-shared/utils';
import { BlockSelection, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { OpenInNewIcon } from '@blocksuite/icons/lit';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-callout/src/emoji-menu.ts b/blocksuite/affine/block-callout/src/emoji-menu.ts
index c9cf0c33d9..3e06187c49 100644
--- a/blocksuite/affine/block-callout/src/emoji-menu.ts
+++ b/blocksuite/affine/block-callout/src/emoji-menu.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import data from '@emoji-mart/data';
import { Picker } from 'emoji-mart';
import { html, LitElement, type PropertyValues } from 'lit';
diff --git a/blocksuite/affine/block-code/src/clipboard/index.ts b/blocksuite/affine/block-code/src/clipboard/index.ts
index e59f9618dd..f97abaa724 100644
--- a/blocksuite/affine/block-code/src/clipboard/index.ts
+++ b/blocksuite/affine/block-code/src/clipboard/index.ts
@@ -14,7 +14,7 @@ import {
Clipboard,
type UIEventHandler,
} from '@blocksuite/block-std';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
export class CodeClipboardController {
private _clipboard!: Clipboard;
diff --git a/blocksuite/affine/block-code/src/code-toolbar/components/code-toolbar.ts b/blocksuite/affine/block-code/src/code-toolbar/components/code-toolbar.ts
index b4af76f53d..2528b96978 100644
--- a/blocksuite/affine/block-code/src/code-toolbar/components/code-toolbar.ts
+++ b/blocksuite/affine/block-code/src/code-toolbar/components/code-toolbar.ts
@@ -4,7 +4,8 @@ import type {
MenuItemGroup,
} from '@blocksuite/affine-components/toolbar';
import { renderGroups } from '@blocksuite/affine-components/toolbar';
-import { noop, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { noop } from '@blocksuite/global/utils';
import { MoreVerticalIcon } from '@blocksuite/icons/lit';
import { flip, offset } from '@floating-ui/dom';
import { css, html, LitElement } from 'lit';
diff --git a/blocksuite/affine/block-code/src/code-toolbar/components/lang-button.ts b/blocksuite/affine/block-code/src/code-toolbar/components/lang-button.ts
index 09315fd200..2416062e63 100644
--- a/blocksuite/affine/block-code/src/code-toolbar/components/lang-button.ts
+++ b/blocksuite/affine/block-code/src/code-toolbar/components/lang-button.ts
@@ -5,7 +5,8 @@ import {
} from '@blocksuite/affine-components/filterable-list';
import { ArrowDownIcon } from '@blocksuite/affine-components/icons';
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
-import { noop, SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { noop } from '@blocksuite/global/utils';
import { css, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-data-view/src/block-meta/base.ts b/blocksuite/affine/block-data-view/src/block-meta/base.ts
index 9ff59d20ba..0d84493c7f 100644
--- a/blocksuite/affine/block-data-view/src/block-meta/base.ts
+++ b/blocksuite/affine/block-data-view/src/block-meta/base.ts
@@ -1,5 +1,5 @@
import type { PropertyMetaConfig } from '@blocksuite/data-view';
-import type { Disposable } from '@blocksuite/global/utils';
+import type { Disposable } from '@blocksuite/global/slot';
import type { Block, BlockModel } from '@blocksuite/store';
type PropertyMeta<
diff --git a/blocksuite/affine/block-data-view/src/data-source.ts b/blocksuite/affine/block-data-view/src/data-source.ts
index 1ce001eb2b..b5e0af22e4 100644
--- a/blocksuite/affine/block-data-view/src/data-source.ts
+++ b/blocksuite/affine/block-data-view/src/data-source.ts
@@ -11,7 +11,7 @@ import type { EditorHost } from '@blocksuite/block-std';
import { DataSourceBase, type PropertyMetaConfig } from '@blocksuite/data-view';
import { propertyPresets } from '@blocksuite/data-view/property-presets';
import { BlockSuiteError } from '@blocksuite/global/exceptions';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type { Block, Store } from '@blocksuite/store';
import type { BlockMeta } from './block-meta/base.js';
diff --git a/blocksuite/affine/block-database/src/components/title/index.ts b/blocksuite/affine/block-database/src/components/title/index.ts
index b71bbb9b94..dcbe6cfa22 100644
--- a/blocksuite/affine/block-database/src/components/title/index.ts
+++ b/blocksuite/affine/block-database/src/components/title/index.ts
@@ -1,6 +1,6 @@
import { stopPropagation } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { Text } from '@blocksuite/store';
import { css, html } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-database/src/detail-panel/block-renderer.ts b/blocksuite/affine/block-database/src/detail-panel/block-renderer.ts
index 2a6742ad89..f706e80496 100644
--- a/blocksuite/affine/block-database/src/detail-panel/block-renderer.ts
+++ b/blocksuite/affine/block-database/src/detail-panel/block-renderer.ts
@@ -6,7 +6,7 @@ import type {
KanbanSingleView,
TableSingleView,
} from '@blocksuite/data-view/view-presets';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-database/src/detail-panel/note-renderer.ts b/blocksuite/affine/block-database/src/detail-panel/note-renderer.ts
index c132370863..72f5d55048 100644
--- a/blocksuite/affine/block-database/src/detail-panel/note-renderer.ts
+++ b/blocksuite/affine/block-database/src/detail-panel/note-renderer.ts
@@ -11,7 +11,7 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { createDefaultDoc, matchModels } from '@blocksuite/affine-shared/utils';
import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std';
import type { DetailSlotProps, SingleView } from '@blocksuite/data-view';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { BaseTextAttributes } from '@blocksuite/inline';
import { computed } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts b/blocksuite/affine/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts
index 829404c261..322de08b83 100644
--- a/blocksuite/affine/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts
+++ b/blocksuite/affine/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts
@@ -4,7 +4,7 @@ import {
isGfxBlockComponent,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { html, nothing } from 'lit';
import { property, queryAsync } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/blocksuite/affine/block-frame/src/frame-manager.ts b/blocksuite/affine/block-frame/src/frame-manager.ts
index b7543e92a1..817708760e 100644
--- a/blocksuite/affine/block-frame/src/frame-manager.ts
+++ b/blocksuite/affine/block-frame/src/frame-manager.ts
@@ -20,7 +20,7 @@ import {
type IVec,
type SerializedXYWH,
} from '@blocksuite/global/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { type BlockModel, Text } from '@blocksuite/store';
import * as Y from 'yjs';
diff --git a/blocksuite/affine/block-image/src/components/image-block-fallback.ts b/blocksuite/affine/block-image/src/components/image-block-fallback.ts
index 83a59d2458..94332c3c1c 100644
--- a/blocksuite/affine/block-image/src/components/image-block-fallback.ts
+++ b/blocksuite/affine/block-image/src/components/image-block-fallback.ts
@@ -1,7 +1,7 @@
import type { ImageBlockModel } from '@blocksuite/affine-model';
import { humanFileSize } from '@blocksuite/affine-shared/utils';
import { modelContext, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { consume } from '@lit/context';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-image/src/components/page-image-block.ts b/blocksuite/affine/block-image/src/components/page-image-block.ts
index 3a37e22710..89c806b494 100644
--- a/blocksuite/affine/block-image/src/components/page-image-block.ts
+++ b/blocksuite/affine/block-image/src/components/page-image-block.ts
@@ -13,7 +13,7 @@ import {
ShadowlessElement,
TextSelection,
} from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { BaseSelection } from '@blocksuite/store';
import { css, html, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-note/src/components/edgeless-note-background.ts b/blocksuite/affine/block-note/src/components/edgeless-note-background.ts
index 066dbf55ed..1b82d49559 100644
--- a/blocksuite/affine/block-note/src/components/edgeless-note-background.ts
+++ b/blocksuite/affine/block-note/src/components/edgeless-note-background.ts
@@ -23,7 +23,7 @@ import {
} from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { clamp, Point } from '@blocksuite/global/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { consume } from '@lit/context';
import { computed } from '@preact/signals-core';
diff --git a/blocksuite/affine/block-note/src/components/edgeless-note-mask.ts b/blocksuite/affine/block-note/src/components/edgeless-note-mask.ts
index 1764da6c91..11997ab166 100644
--- a/blocksuite/affine/block-note/src/components/edgeless-note-mask.ts
+++ b/blocksuite/affine/block-note/src/components/edgeless-note-mask.ts
@@ -1,7 +1,7 @@
import type { NoteBlockModel } from '@blocksuite/affine-model';
import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std';
import { almostEqual, Bound } from '@blocksuite/global/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-note/src/components/edgeless-page-block-title.ts b/blocksuite/affine/block-note/src/components/edgeless-page-block-title.ts
index e27f7d016b..476c4c112d 100644
--- a/blocksuite/affine/block-note/src/components/edgeless-page-block-title.ts
+++ b/blocksuite/affine/block-note/src/components/edgeless-page-block-title.ts
@@ -6,7 +6,7 @@ import {
ShadowlessElement,
stdContext,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { consume } from '@lit/context';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-paragraph/src/heading-icon.ts b/blocksuite/affine/block-paragraph/src/heading-icon.ts
index 3edc80369c..2c573de330 100644
--- a/blocksuite/affine/block-paragraph/src/heading-icon.ts
+++ b/blocksuite/affine/block-paragraph/src/heading-icon.ts
@@ -8,7 +8,7 @@ import {
} from '@blocksuite/affine-components/icons';
import type { ParagraphBlockModel } from '@blocksuite/affine-model';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { cssVarV2 } from '@toeverything/theme/v2';
import { css, html, nothing, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/clipboard/page-clipboard.ts b/blocksuite/affine/block-root/src/clipboard/page-clipboard.ts
index 2cdbaed15f..83188d3e1d 100644
--- a/blocksuite/affine/block-root/src/clipboard/page-clipboard.ts
+++ b/blocksuite/affine/block-root/src/clipboard/page-clipboard.ts
@@ -15,7 +15,7 @@ import {
retainFirstModelCommand,
} from '@blocksuite/affine-shared/commands';
import type { UIEventHandler } from '@blocksuite/block-std';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import type { BlockSnapshot, Store } from '@blocksuite/store';
import { ReadOnlyClipboard } from './readonly-clipboard';
diff --git a/blocksuite/affine/block-root/src/clipboard/readonly-clipboard.ts b/blocksuite/affine/block-root/src/clipboard/readonly-clipboard.ts
index 78b6aee186..862346e4d6 100644
--- a/blocksuite/affine/block-root/src/clipboard/readonly-clipboard.ts
+++ b/blocksuite/affine/block-root/src/clipboard/readonly-clipboard.ts
@@ -14,7 +14,7 @@ import {
getSelectedModelsCommand,
} from '@blocksuite/affine-shared/commands';
import type { BlockComponent, UIEventHandler } from '@blocksuite/block-std';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { ClipboardAdapter } from './adapter.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/clipboard/clipboard.ts b/blocksuite/affine/block-root/src/edgeless/clipboard/clipboard.ts
index b80746ac90..9956fae928 100644
--- a/blocksuite/affine/block-root/src/edgeless/clipboard/clipboard.ts
+++ b/blocksuite/affine/block-root/src/edgeless/clipboard/clipboard.ts
@@ -57,7 +57,8 @@ import {
type SerializedXYWH,
Vec,
} from '@blocksuite/global/gfx';
-import { assertType, DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import {
type BlockSnapshot,
BlockSnapshotSchema,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts
index 77290877c3..028d519041 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts
@@ -41,7 +41,7 @@ import {
toDegree,
Vec,
} from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { FrameIcon, PageIcon } from '@blocksuite/icons/lit';
import { consume } from '@lit/context';
import { baseTheme } from '@toeverything/theme';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts b/blocksuite/affine/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts
index 1ecd9a5924..82e915c588 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts
@@ -27,7 +27,8 @@ import { type BlockStdScope, stdContext } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import type { Bound, IVec } from '@blocksuite/global/gfx';
import { Vec } from '@blocksuite/global/gfx';
-import { DisposableGroup, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import {
ArrowUpBigIcon,
PlusIcon,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/connector/connector-handle.ts b/blocksuite/affine/block-root/src/edgeless/components/connector/connector-handle.ts
index c315c529ac..7c665f909a 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/connector/connector-handle.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/connector/connector-handle.ts
@@ -10,7 +10,8 @@ import {
} from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { Vec } from '@blocksuite/global/gfx';
-import { DisposableGroup, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import type { Store } from '@blocksuite/store';
import { consume } from '@lit/context';
import { css, html, LitElement } from 'lit';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/frame/frame-preview.ts b/blocksuite/affine/block-root/src/edgeless/components/frame/frame-preview.ts
index d918fa60f8..c47a516e60 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/frame/frame-preview.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/frame/frame-preview.ts
@@ -8,7 +8,8 @@ import {
} from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { Bound, deserializeXYWH } from '@blocksuite/global/gfx';
-import { DisposableGroup, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { type Query, type Store } from '@blocksuite/store';
import { css, html, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/note-slicer/index.ts b/blocksuite/affine/block-root/src/edgeless/components/note-slicer/index.ts
index 693bf042ec..8994c93430 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/note-slicer/index.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/note-slicer/index.ts
@@ -11,7 +11,7 @@ import { getRectByBlockComponent } from '@blocksuite/affine-shared/utils';
import { WidgetComponent } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { deserializeXYWH, Point, serializeXYWH } from '@blocksuite/global/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { ScissorsIcon } from '@blocksuite/icons/lit';
import { css, html, nothing, type PropertyValues } from 'lit';
import { state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/panel/card-style-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/panel/card-style-panel.ts
index 8c9226814a..258595ac10 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/panel/card-style-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/panel/card-style-panel.ts
@@ -1,5 +1,5 @@
import type { EmbedCardStyle } from '@blocksuite/affine-model';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement, nothing, type TemplateResult } from 'lit';
import { property } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/panel/line-width-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/panel/line-width-panel.ts
index 9b78fc3617..70e6e34a93 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/panel/line-width-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/panel/line-width-panel.ts
@@ -1,6 +1,6 @@
import { LINE_WIDTHS, LineWidth } from '@blocksuite/affine-model';
import { on, once } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement, nothing, type PropertyValues } from 'lit';
import { property, query } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/panel/note-display-mode-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/panel/note-display-mode-panel.ts
index 689ec0aac7..de18dd12d9 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/panel/note-display-mode-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/panel/note-display-mode-panel.ts
@@ -1,6 +1,6 @@
import { NoteDisplayMode } from '@blocksuite/affine-model';
import { stopPropagation } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { EdgelessIcon, PageIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/panel/note-shadow-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/panel/note-shadow-panel.ts
index db3a70d084..db89b39d56 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/panel/note-shadow-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/panel/note-shadow-panel.ts
@@ -1,5 +1,5 @@
import { ColorScheme, NoteShadow } from '@blocksuite/affine-model';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/panel/shape-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/panel/shape-panel.ts
index ee0d2e0a54..0e5149a68e 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/panel/shape-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/panel/shape-panel.ts
@@ -1,5 +1,5 @@
import { ShapeStyle } from '@blocksuite/affine-model';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/panel/stroke-style-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/panel/stroke-style-panel.ts
index 0c135f4f5b..4b2402adbf 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/panel/stroke-style-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/panel/stroke-style-panel.ts
@@ -1,6 +1,6 @@
import { type ColorScheme, type StrokeStyle } from '@blocksuite/affine-model';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts b/blocksuite/affine/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts
index 68f92cfa24..52941fed3e 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts
@@ -55,8 +55,8 @@ import {
deserializeXYWH,
normalizeDegAngle,
} from '@blocksuite/global/gfx';
-import type { Disposable } from '@blocksuite/global/utils';
-import { assertType, Slot } from '@blocksuite/global/utils';
+import { type Disposable, Slot } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import { css, html, nothing } from 'lit';
import { state } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts
index 0fed07f2fd..1da6a41b50 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts
@@ -11,7 +11,7 @@ import {
ShadowlessElement,
} from '@blocksuite/block-std';
import { Bound, Vec } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts
index 06bf28695d..895c8c9b60 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts
@@ -10,7 +10,7 @@ import {
ShadowlessElement,
} from '@blocksuite/block-std';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { cssVarV2 } from '@toeverything/theme/v2';
import { css, html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts
index 5a63615fae..c9b7a01c76 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts
@@ -10,7 +10,7 @@ import {
ShadowlessElement,
} from '@blocksuite/block-std';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts
index cdaf58d60a..0b894fbf77 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts
@@ -12,7 +12,7 @@ import {
ShadowlessElement,
} from '@blocksuite/block-std';
import { Bound, toRadian, Vec } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-text-editor.ts b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-text-editor.ts
index 29459721de..0ddb475a0d 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-text-editor.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/text/edgeless-text-editor.ts
@@ -11,7 +11,7 @@ import {
ShadowlessElement,
} from '@blocksuite/block-std';
import { Bound, toRadian, Vec } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts
index ffd23b7f0d..482a0ef9f4 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts
@@ -6,7 +6,7 @@ import {
} from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { computed } from '@preact/signals-core';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts
index 665bd1f568..7e519460fe 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts
@@ -2,7 +2,7 @@ import {
EditPropsStore,
ThemeProvider,
} from '@blocksuite/affine-shared/services';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { computed } from '@preact/signals-core';
import { css, html, LitElement } from 'lit';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/draggable/types.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/draggable/types.ts
index bece03ac68..a1853d2509 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/draggable/types.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/draggable/types.ts
@@ -1,5 +1,5 @@
import type { Bound } from '@blocksuite/global/gfx';
-import type { DisposableClass } from '@blocksuite/global/utils';
+import type { DisposableClass } from '@blocksuite/global/lit';
import type { TemplateResult } from 'lit';
import type { EdgelessRootBlockComponent } from '../../../../edgeless-root-block.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/slide-menu.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/slide-menu.ts
index 21be6f60b8..6b8b781e4c 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/slide-menu.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/common/slide-menu.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { ArrowRightSmallIcon } from '@blocksuite/icons/lit';
import { consume } from '@lit/context';
import { css, html, LitElement } from 'lit';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts
index ee603e3c57..ea006a9380 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts
@@ -6,7 +6,7 @@ import {
} from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
ConnectorCIcon,
ConnectorEIcon,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts
index 620698d866..eef9363f75 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts
@@ -1,6 +1,6 @@
import { ConnectorMode, getConnectorModeName } from '@blocksuite/affine-model';
import { EditPropsStore } from '@blocksuite/affine-shared/services';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
ConnectorCIcon,
ConnectorEIcon,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/context.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/context.ts
index 85266b56c8..c78760ca9d 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/context.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/context.ts
@@ -1,5 +1,5 @@
import type { ColorScheme } from '@blocksuite/affine-model';
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import { createContext } from '@lit/context';
import type { EdgelessToolbarWidget } from './edgeless-toolbar.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts
index d8477ead2f..cd405f98bd 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts
@@ -16,7 +16,7 @@ import {
import { stopPropagation } from '@blocksuite/affine-shared/utils';
import { WidgetComponent } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import {
ArrowLeftSmallIcon,
ArrowRightSmallIcon,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts
index e13e23fd13..28b8c15a50 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts
@@ -1,5 +1,5 @@
import { LassoMode } from '@blocksuite/affine-shared/types';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { effect } from '@preact/signals-core';
import { css, html, LitElement } from 'lit';
import { query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts
index 14054f416a..d0429a05a5 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts
@@ -9,7 +9,7 @@ import type { BlockStdScope } from '@blocksuite/block-std';
import { modelContext, stdContext } from '@blocksuite/block-std';
import { ErrorCode } from '@blocksuite/global/exceptions';
import type { Bound } from '@blocksuite/global/gfx';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { consume } from '@lit/context';
import { computed } from '@preact/signals-core';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts
index 04a31fb71b..020be2ab5b 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts
@@ -9,7 +9,7 @@ import {
} from '@blocksuite/affine-shared/services';
import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx';
import type { Bound } from '@blocksuite/global/gfx';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { computed } from '@preact/signals-core';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/mixins/tool.mixin.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/mixins/tool.mixin.ts
index 46df3e0300..4e231b2fc5 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/mixins/tool.mixin.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/mixins/tool.mixin.ts
@@ -5,11 +5,11 @@ import type {
ToolController,
} from '@blocksuite/block-std/gfx';
import {
- type Constructor,
// oxlint-disable-next-line no-unused-vars
type DisposableClass,
WithDisposable,
-} from '@blocksuite/global/utils';
+} from '@blocksuite/global/lit';
+import type { Constructor } from '@blocksuite/global/utils';
import { consume } from '@lit/context';
import { effect } from '@preact/signals-core';
import { cssVar } from '@toeverything/theme';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/note/note-senior-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/note/note-senior-button.ts
index 6ed0aa4337..7a3c4f1c5e 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/note/note-senior-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/note/note-senior-button.ts
@@ -7,7 +7,7 @@ import {
EditPropsStore,
ThemeProvider,
} from '@blocksuite/affine-shared/services';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { computed } from '@preact/signals-core';
import { css, html, LitElement } from 'lit';
import { state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-button.ts
index 5478805c0f..7b6ce4d311 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-button.ts
@@ -1,6 +1,6 @@
import type { FrameBlockModel } from '@blocksuite/affine-model';
import { createButtonPopper } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { LayerIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts
index 1de5cfbe14..dc42c77abe 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts
@@ -1,10 +1,7 @@
import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
import { generateKeyBetweenV2 } from '@blocksuite/block-std/gfx';
-import {
- DisposableGroup,
- SignalWatcher,
- WithDisposable,
-} from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts
index 65be1692e2..b2c9c03fd5 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts
@@ -1,6 +1,6 @@
import { EditPropsStore } from '@blocksuite/affine-shared/services';
import { createButtonPopper } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { SettingsIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts
index bb9edbf1d0..5d95fdf6b9 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts
@@ -7,7 +7,7 @@ import type { FrameBlockModel } from '@blocksuite/affine-model';
import { EditPropsStore } from '@blocksuite/affine-shared/services';
import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx';
import { Bound, clamp } from '@blocksuite/global/gfx';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
EndPointArrowIcon,
ExpandCloseIcon,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts
index 52208fed74..ac6c4e34b5 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts
@@ -12,7 +12,7 @@ import {
TelemetryProvider,
ThemeProvider,
} from '@blocksuite/affine-shared/services';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts
index be45758cc5..2f56f2b671 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts
@@ -12,7 +12,7 @@ import {
ThemeProvider,
} from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { StyleGeneralIcon, StyleScribbleIcon } from '@blocksuite/icons/lit';
import { computed, effect, type Signal, signal } from '@preact/signals-core';
import { css, html, LitElement } from 'lit';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts
index fa425a0cc8..975da47d46 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts
@@ -1,5 +1,5 @@
import { type ShapeName, ShapeType } from '@blocksuite/affine-model';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { css, html, LitElement } from 'lit';
import { ShapeTool } from '../../../gfx-tool/shape-tool.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts
index 57bf1ab563..e281b2bc0e 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts
@@ -9,7 +9,8 @@ import {
type ShapeStyle,
} from '@blocksuite/affine-model';
import { Bound } from '@blocksuite/global/gfx';
-import { sleep, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { sleep } from '@blocksuite/global/utils';
import {
css,
html,
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts
index 1cb0792466..273759c37c 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts
@@ -3,7 +3,7 @@ import {
once,
requestConnectedFrame,
} from '@blocksuite/affine-shared/utils';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { css, html, LitElement } from 'lit';
import { query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/template-panel.ts b/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/template-panel.ts
index 1fe5c60c43..f57cc94e54 100644
--- a/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/template-panel.ts
+++ b/blocksuite/affine/block-root/src/edgeless/components/toolbar/template/template-panel.ts
@@ -11,7 +11,7 @@ import {
stopPropagation,
} from '@blocksuite/affine-shared/utils';
import type { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/edgeless/gfx-tool/default-tool.ts b/blocksuite/affine/block-root/src/edgeless/gfx-tool/default-tool.ts
index fcef083b07..e13d80eb2b 100644
--- a/blocksuite/affine/block-root/src/edgeless/gfx-tool/default-tool.ts
+++ b/blocksuite/affine/block-root/src/edgeless/gfx-tool/default-tool.ts
@@ -43,7 +43,8 @@ import {
} from '@blocksuite/block-std/gfx';
import type { IVec } from '@blocksuite/global/gfx';
import { Bound, getCommonBoundWithRotation, Vec } from '@blocksuite/global/gfx';
-import { DisposableGroup, noop } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
+import { noop } from '@blocksuite/global/utils';
import { effect } from '@preact/signals-core';
import clamp from 'lodash-es/clamp';
import last from 'lodash-es/last';
diff --git a/blocksuite/affine/block-root/src/edgeless/services/template.ts b/blocksuite/affine/block-root/src/edgeless/services/template.ts
index afdee7b623..f41e742c80 100644
--- a/blocksuite/affine/block-root/src/edgeless/services/template.ts
+++ b/blocksuite/affine/block-root/src/edgeless/services/template.ts
@@ -4,7 +4,8 @@ import type {
} from '@blocksuite/affine-block-surface';
import type { ConnectorElementModel } from '@blocksuite/affine-model';
import { Bound, getCommonBound } from '@blocksuite/global/gfx';
-import { assertType, Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import {
type BlockModel,
type BlockSnapshot,
diff --git a/blocksuite/affine/block-root/src/edgeless/utils/tool-overlay.ts b/blocksuite/affine/block-root/src/edgeless/utils/tool-overlay.ts
index 86a4a4fb57..10b07fb6b9 100644
--- a/blocksuite/affine/block-root/src/edgeless/utils/tool-overlay.ts
+++ b/blocksuite/affine/block-root/src/edgeless/utils/tool-overlay.ts
@@ -14,12 +14,8 @@ import { ThemeProvider } from '@blocksuite/affine-shared/services';
import type { GfxController, GfxToolsMap } from '@blocksuite/block-std/gfx';
import type { XYWH } from '@blocksuite/global/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import {
- assertType,
- DisposableGroup,
- noop,
- Slot,
-} from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
+import { assertType, noop } from '@blocksuite/global/utils';
import { effect } from '@preact/signals-core';
import type { ShapeTool } from '../gfx-tool/shape-tool.js';
diff --git a/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts b/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts
index af1e0408e9..1d6f41c9ca 100644
--- a/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts
@@ -1,6 +1,6 @@
import { createLitPortal } from '@blocksuite/affine-components/portal';
import { stopPropagation } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { offset } from '@floating-ui/dom';
import { css, html, LitElement, nothing } from 'lit';
diff --git a/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts b/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts
index 7a776dcfc5..761d3ece0c 100644
--- a/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts
+++ b/blocksuite/affine/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts
@@ -1,6 +1,6 @@
import { stopPropagation } from '@blocksuite/affine-shared/utils';
import { ZOOM_STEP } from '@blocksuite/block-std/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { MinusIcon, PlusIcon, ViewBarIcon } from '@blocksuite/icons/lit';
import { effect } from '@preact/signals-core';
import { baseTheme } from '@toeverything/theme';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/add-frame-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/add-frame-button.ts
index 80cbf4c6ce..493a7ee448 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/add-frame-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/add-frame-button.ts
@@ -2,7 +2,7 @@ import { MindmapElementModel } from '@blocksuite/affine-model';
import { TelemetryProvider } from '@blocksuite/affine-shared/services';
import type { GfxModel } from '@blocksuite/block-std/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { FrameIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/add-group-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/add-group-button.ts
index c6496e2ae8..ef6456428c 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/add-group-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/add-group-button.ts
@@ -3,7 +3,7 @@ import {
MindmapElementModel,
} from '@blocksuite/affine-model';
import type { GfxModel } from '@blocksuite/block-std/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { GroupingIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/align-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/align-button.ts
index 8d3b70e122..31681ba98e 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/align-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/align-button.ts
@@ -7,7 +7,7 @@ import {
import { MindmapElementModel } from '@blocksuite/affine-model';
import type { GfxModel } from '@blocksuite/block-std/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
AlignBottomIcon,
AlignHorizontalCenterIcon,
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-attachment-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-attachment-button.ts
index 747e55dc79..3f006cf38d 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-attachment-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-attachment-button.ts
@@ -22,7 +22,7 @@ import {
ToolbarContext,
} from '@blocksuite/affine-shared/services';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TemplateResult } from 'lit';
import { html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-brush-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-brush-button.ts
index aa9ba1b1a8..7cb1cd4e34 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-brush-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-brush-button.ts
@@ -19,7 +19,7 @@ import {
} from '@blocksuite/affine-model';
import { FeatureFlagService } from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { when } from 'lit/directives/when.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-connector-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-connector-button.ts
index 9922b8d60a..bf2a8f5b4b 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-connector-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-connector-button.ts
@@ -25,7 +25,7 @@ import {
} from '@blocksuite/affine-model';
import { FeatureFlagService } from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
AddTextIcon,
ConnectorCIcon,
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts
index 4870f932da..5e375fa3fb 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts
@@ -55,7 +55,7 @@ import {
import { getHostName, referenceToNode } from '@blocksuite/affine-shared/utils';
import type { BlockStdScope } from '@blocksuite/block-std';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement, nothing, type TemplateResult } from 'lit';
import { property, state } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-frame-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-frame-button.ts
index fa21c2b61c..f5c9b3e0ab 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-frame-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-frame-button.ts
@@ -23,7 +23,7 @@ import type { ColorEvent } from '@blocksuite/affine-shared/utils';
import { matchModels } from '@blocksuite/affine-shared/utils';
import { GfxExtensionIdentifier } from '@blocksuite/block-std/gfx';
import { deserializeXYWH, serializeXYWH } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { EditIcon, PageIcon, UngroupIcon } from '@blocksuite/icons/lit';
import { html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-group-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-group-button.ts
index b1cff00381..475da06edb 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-group-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-group-button.ts
@@ -8,7 +8,7 @@ import {
} from '@blocksuite/affine-model';
import { matchModels } from '@blocksuite/affine-shared/utils';
import { deserializeXYWH, serializeXYWH } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { EditIcon, PageIcon, UngroupIcon } from '@blocksuite/icons/lit';
import { html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-image-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-image-button.ts
index 701087eb12..9a17ad3c8c 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-image-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-image-button.ts
@@ -4,7 +4,7 @@ import {
} from '@blocksuite/affine-block-image';
import { CaptionIcon, DownloadIcon } from '@blocksuite/affine-components/icons';
import type { ImageBlockModel } from '@blocksuite/affine-model';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-mindmap-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-mindmap-button.ts
index bd2487aec6..3b303220de 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-mindmap-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-mindmap-button.ts
@@ -11,7 +11,7 @@ import type {
} from '@blocksuite/affine-model';
import { LayoutType, MindmapStyle } from '@blocksuite/affine-model';
import { EditPropsStore } from '@blocksuite/affine-shared/services';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { RadiantIcon, RightLayoutIcon, StyleIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing, type TemplateResult } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-note-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-note-button.ts
index 3fda891ec9..14dc9003ff 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-note-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-note-button.ts
@@ -31,7 +31,7 @@ import {
ThemeProvider,
} from '@blocksuite/affine-shared/services';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
AutoHeightIcon,
CornerIcon,
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-shape-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-shape-button.ts
index b06ebd8857..5a192ecd81 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-shape-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-shape-button.ts
@@ -29,7 +29,7 @@ import {
} from '@blocksuite/affine-model';
import { FeatureFlagService } from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
AddTextIcon,
ShapeIcon,
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-text-menu.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-text-menu.ts
index 2906c7c381..7f40f041c0 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-text-menu.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-text-menu.ts
@@ -32,7 +32,7 @@ import {
import { FeatureFlagService } from '@blocksuite/affine-shared/services';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
TextAlignCenterIcon,
TextAlignLeftIcon,
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/lock-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/lock-button.ts
index c9c4b2012f..9357a849b8 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/lock-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/lock-button.ts
@@ -8,7 +8,7 @@ import {
} from '@blocksuite/affine-shared/services';
import type { BlockStdScope } from '@blocksuite/block-std';
import type { GfxModel } from '@blocksuite/block-std/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { LockIcon, UnlockIcon } from '@blocksuite/icons/lit';
import { html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/more-menu/button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/more-menu/button.ts
index 2243330bf8..44d0a0a1c9 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/more-menu/button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/more-menu/button.ts
@@ -1,7 +1,7 @@
import type { MenuItemGroup } from '@blocksuite/affine-components/toolbar';
import { renderGroups } from '@blocksuite/affine-components/toolbar';
import type { GfxModel } from '@blocksuite/block-std/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { MoreHorizontalIcon, MoreVerticalIcon } from '@blocksuite/icons/lit';
import { html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/release-from-group-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/release-from-group-button.ts
index d4a8757ef0..c90ac29277 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/release-from-group-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/release-from-group-button.ts
@@ -1,5 +1,5 @@
import { GroupElementModel } from '@blocksuite/affine-model';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { ReleaseFromGroupIcon } from '@blocksuite/icons/lit';
import { html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts b/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts
index a43b99308f..068c6f97d3 100644
--- a/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts
+++ b/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts
@@ -3,7 +3,7 @@ import {
requiredProperties,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { html, nothing, type PropertyValues } from 'lit';
import { property } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts b/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts
index 658aa117a3..c72a59759b 100644
--- a/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts
+++ b/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts
@@ -5,7 +5,7 @@ import {
requiredProperties,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { ArrowLeftBigIcon, KeyboardIcon } from '@blocksuite/icons/lit';
import { effect, type Signal, signal } from '@preact/signals-core';
import { html } from 'lit';
diff --git a/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/position-controller.ts b/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/position-controller.ts
index 69bd9e8ce9..3b8323f489 100644
--- a/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/position-controller.ts
+++ b/blocksuite/affine/block-root/src/widgets/keyboard-toolbar/position-controller.ts
@@ -1,6 +1,6 @@
import { type VirtualKeyboardProvider } from '@blocksuite/affine-shared/services';
import type { BlockStdScope, ShadowlessElement } from '@blocksuite/block-std';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { effect, type Signal } from '@preact/signals-core';
import type { ReactiveController, ReactiveControllerHost } from 'lit';
diff --git a/blocksuite/affine/block-root/src/widgets/linked-doc/import-doc/import-doc.ts b/blocksuite/affine/block-root/src/widgets/linked-doc/import-doc/import-doc.ts
index 2a5a2366ba..c791fcf221 100644
--- a/blocksuite/affine/block-root/src/widgets/linked-doc/import-doc/import-doc.ts
+++ b/blocksuite/affine/block-root/src/widgets/linked-doc/import-doc/import-doc.ts
@@ -7,7 +7,7 @@ import {
NotionIcon,
} from '@blocksuite/affine-components/icons';
import { openFileOrFiles } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { Schema, Workspace } from '@blocksuite/store';
import { html, LitElement, type PropertyValues } from 'lit';
import { query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-root/src/widgets/linked-doc/linked-doc-popover.ts b/blocksuite/affine/block-root/src/widgets/linked-doc/linked-doc-popover.ts
index ff80d9d501..8e96d591db 100644
--- a/blocksuite/affine/block-root/src/widgets/linked-doc/linked-doc-popover.ts
+++ b/blocksuite/affine/block-root/src/widgets/linked-doc/linked-doc-popover.ts
@@ -12,7 +12,7 @@ import {
} from '@blocksuite/affine-shared/utils';
import { PropTypes, requiredProperties } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { effect } from '@preact/signals-core';
import { css, html, LitElement, nothing } from 'lit';
diff --git a/blocksuite/affine/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts b/blocksuite/affine/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts
index 21231b1135..a0f22ad045 100644
--- a/blocksuite/affine/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts
+++ b/blocksuite/affine/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts
@@ -8,7 +8,7 @@ import {
getViewportElement,
} from '@blocksuite/affine-shared/utils';
import { PropTypes, requiredProperties } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { signal } from '@preact/signals-core';
import { html, LitElement, nothing } from 'lit';
diff --git a/blocksuite/affine/block-root/src/widgets/slash-menu/index.ts b/blocksuite/affine/block-root/src/widgets/slash-menu/index.ts
index 88df1ea7a2..72bc82daca 100644
--- a/blocksuite/affine/block-root/src/widgets/slash-menu/index.ts
+++ b/blocksuite/affine/block-root/src/widgets/slash-menu/index.ts
@@ -4,7 +4,8 @@ import {
} from '@blocksuite/affine-components/rich-text';
import type { UIEventStateContext } from '@blocksuite/block-std';
import { TextSelection, WidgetComponent } from '@blocksuite/block-std';
-import { assertType, DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import { InlineEditor } from '@blocksuite/inline';
import debounce from 'lodash-es/debounce';
diff --git a/blocksuite/affine/block-root/src/widgets/slash-menu/slash-menu-popover.ts b/blocksuite/affine/block-root/src/widgets/slash-menu/slash-menu-popover.ts
index 81b546240e..f0a30ff68f 100644
--- a/blocksuite/affine/block-root/src/widgets/slash-menu/slash-menu-popover.ts
+++ b/blocksuite/affine/block-root/src/widgets/slash-menu/slash-menu-popover.ts
@@ -13,7 +13,7 @@ import {
isFuzzyMatch,
substringMatchScore,
} from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { autoPlacement, offset } from '@floating-ui/dom';
import { html, LitElement, nothing, type PropertyValues } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-surface-ref/src/portal/generic-block.ts b/blocksuite/affine/block-surface-ref/src/portal/generic-block.ts
index 2700bc5b09..e678551a66 100644
--- a/blocksuite/affine/block-surface-ref/src/portal/generic-block.ts
+++ b/blocksuite/affine/block-surface-ref/src/portal/generic-block.ts
@@ -12,7 +12,7 @@ import type {
} from '@blocksuite/affine-model';
import { ShadowlessElement } from '@blocksuite/block-std';
import { Bound } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { css, type TemplateResult } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-surface-ref/src/portal/note.ts b/blocksuite/affine/block-surface-ref/src/portal/note.ts
index b7568f8bce..4a691ed8d5 100644
--- a/blocksuite/affine/block-surface-ref/src/portal/note.ts
+++ b/blocksuite/affine/block-surface-ref/src/portal/note.ts
@@ -18,7 +18,7 @@ import {
ShadowlessElement,
} from '@blocksuite/block-std';
import { deserializeXYWH } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { type BlockModel, type Query } from '@blocksuite/store';
import { css, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-surface-ref/src/surface-ref-block.ts b/blocksuite/affine/block-surface-ref/src/surface-ref-block.ts
index 3e400f1eda..91e5922daf 100644
--- a/blocksuite/affine/block-surface-ref/src/surface-ref-block.ts
+++ b/blocksuite/affine/block-surface-ref/src/surface-ref-block.ts
@@ -41,7 +41,7 @@ import {
deserializeXYWH,
type SerializedXYWH,
} from '@blocksuite/global/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { DeleteIcon, EdgelessIcon, FrameIcon } from '@blocksuite/icons/lit';
import type { BaseSelection, Store } from '@blocksuite/store';
import { css, html, nothing, type TemplateResult } from 'lit';
diff --git a/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts b/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts
index 5022b8ecdf..7691d529cd 100644
--- a/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts
+++ b/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts
@@ -1,6 +1,6 @@
import type { FrameBlockModel } from '@blocksuite/affine-model';
import { createIdentifier } from '@blocksuite/global/di';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type { ExtensionType } from '@blocksuite/store';
export const EdgelessLegacySlotIdentifier = createIdentifier<{
diff --git a/blocksuite/affine/block-surface/src/renderer/canvas-renderer.ts b/blocksuite/affine/block-surface/src/renderer/canvas-renderer.ts
index 1d0051a0e9..9d9b2e2f7e 100644
--- a/blocksuite/affine/block-surface/src/renderer/canvas-renderer.ts
+++ b/blocksuite/affine/block-surface/src/renderer/canvas-renderer.ts
@@ -8,7 +8,7 @@ import type {
} from '@blocksuite/block-std/gfx';
import type { IBound } from '@blocksuite/global/gfx';
import { getBoundWithRotation, intersects } from '@blocksuite/global/gfx';
-import { DisposableGroup, Slot } from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
import last from 'lodash-es/last';
import type { SurfaceElementModel } from '../element-model/base.js';
diff --git a/blocksuite/affine/block-surface/src/surface-block.ts b/blocksuite/affine/block-surface/src/surface-block.ts
index 2300f47176..4b1f55d50e 100644
--- a/blocksuite/affine/block-surface/src/surface-block.ts
+++ b/blocksuite/affine/block-surface/src/surface-block.ts
@@ -7,7 +7,7 @@ import {
type Viewport,
} from '@blocksuite/block-std/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import { css, html } from 'lit';
import { query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-surface/src/surface-model.ts b/blocksuite/affine/block-surface/src/surface-model.ts
index 28487480a5..fbe6c5cda5 100644
--- a/blocksuite/affine/block-surface/src/surface-model.ts
+++ b/blocksuite/affine/block-surface/src/surface-model.ts
@@ -4,7 +4,7 @@ import type {
} from '@blocksuite/affine-model';
import type { SurfaceBlockProps } from '@blocksuite/block-std/gfx';
import { SurfaceBlockModel as BaseSurfaceModel } from '@blocksuite/block-std/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { BlockSchemaExtension, defineBlockSchema } from '@blocksuite/store';
import * as Y from 'yjs';
diff --git a/blocksuite/affine/block-table/src/add-button.ts b/blocksuite/affine/block-table/src/add-button.ts
index 48e01602f3..9b52ed707e 100644
--- a/blocksuite/affine/block-table/src/add-button.ts
+++ b/blocksuite/affine/block-table/src/add-button.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { PlusIcon } from '@blocksuite/icons/lit';
import {
autoPlacement,
diff --git a/blocksuite/affine/block-table/src/selection-layer.ts b/blocksuite/affine/block-table/src/selection-layer.ts
index 440cfeca5b..ba14a163d3 100644
--- a/blocksuite/affine/block-table/src/selection-layer.ts
+++ b/blocksuite/affine/block-table/src/selection-layer.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { computed, effect, signal } from '@preact/signals-core';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/block-table/src/table-cell.ts b/blocksuite/affine/block-table/src/table-cell.ts
index 85d5b83dd8..c078d2e60a 100644
--- a/blocksuite/affine/block-table/src/table-cell.ts
+++ b/blocksuite/affine/block-table/src/table-cell.ts
@@ -14,7 +14,7 @@ import { cssVarV2 } from '@blocksuite/affine-shared/theme';
import { getViewportElement } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
import { IS_MAC } from '@blocksuite/global/env';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
ArrowDownBigIcon,
ArrowLeftBigIcon,
diff --git a/blocksuite/affine/components/src/block-selection/index.ts b/blocksuite/affine/components/src/block-selection/index.ts
index e15c8347c7..7d2aa3efaf 100644
--- a/blocksuite/affine/components/src/block-selection/index.ts
+++ b/blocksuite/affine/components/src/block-selection/index.ts
@@ -1,4 +1,4 @@
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { css, LitElement, type PropertyValues } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/components/src/caption/block-caption.ts b/blocksuite/affine/components/src/caption/block-caption.ts
index b1370e87fd..a3260fb709 100644
--- a/blocksuite/affine/components/src/caption/block-caption.ts
+++ b/blocksuite/affine/components/src/caption/block-caption.ts
@@ -7,7 +7,7 @@ import {
ShadowlessElement,
stdContext,
} from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel, Store } from '@blocksuite/store';
import { Text } from '@blocksuite/store';
import { consume } from '@lit/context';
diff --git a/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts b/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts
index b483fc2bb2..35b3d5986b 100644
--- a/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts
+++ b/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts
@@ -8,7 +8,7 @@ import {
requiredProperties,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { PaletteIcon } from '@blocksuite/icons/lit';
import {
computed,
diff --git a/blocksuite/affine/components/src/color-picker/button.ts b/blocksuite/affine/components/src/color-picker/button.ts
index babcba4e8c..5496a9f566 100644
--- a/blocksuite/affine/components/src/color-picker/button.ts
+++ b/blocksuite/affine/components/src/color-picker/button.ts
@@ -1,7 +1,7 @@
import type { ColorScheme, Palette } from '@blocksuite/affine-model';
import { DefaultTheme, resolveColor } from '@blocksuite/affine-model';
import type { ColorEvent } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { html, LitElement } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { choose } from 'lit/directives/choose.js';
diff --git a/blocksuite/affine/components/src/color-picker/color-picker.ts b/blocksuite/affine/components/src/color-picker/color-picker.ts
index 27bd4652b0..aad3992448 100644
--- a/blocksuite/affine/components/src/color-picker/color-picker.ts
+++ b/blocksuite/affine/components/src/color-picker/color-picker.ts
@@ -1,7 +1,7 @@
import type { Color } from '@blocksuite/affine-model';
import { on, once, stopPropagation } from '@blocksuite/affine-shared/utils';
import { clamp } from '@blocksuite/global/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { batch, computed, signal } from '@preact/signals-core';
import { html, LitElement } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/components/src/context-menu/item.ts b/blocksuite/affine/components/src/context-menu/item.ts
index cb7e62cc08..34baeec6ee 100644
--- a/blocksuite/affine/components/src/context-menu/item.ts
+++ b/blocksuite/affine/components/src/context-menu/item.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { property } from 'lit/decorators.js';
import type { Menu } from './menu.js';
diff --git a/blocksuite/affine/components/src/context-menu/menu-renderer.ts b/blocksuite/affine/components/src/context-menu/menu-renderer.ts
index 0cd1bd2d3e..d061c0d876 100644
--- a/blocksuite/affine/components/src/context-menu/menu-renderer.ts
+++ b/blocksuite/affine/components/src/context-menu/menu-renderer.ts
@@ -1,7 +1,7 @@
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
import { IS_MOBILE } from '@blocksuite/global/env';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
ArrowLeftBigIcon,
ArrowLeftSmallIcon,
diff --git a/blocksuite/affine/components/src/date-picker/date-picker.ts b/blocksuite/affine/components/src/date-picker/date-picker.ts
index 6e14f1ce2f..2860778b6e 100644
--- a/blocksuite/affine/components/src/date-picker/date-picker.ts
+++ b/blocksuite/affine/components/src/date-picker/date-picker.ts
@@ -1,5 +1,5 @@
import { clamp } from '@blocksuite/global/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { isSameDay, isSameMonth, isToday } from 'date-fns';
import {
html,
diff --git a/blocksuite/affine/components/src/doc-title/doc-title.ts b/blocksuite/affine/components/src/doc-title/doc-title.ts
index 2849d6263c..2d1c94501a 100644
--- a/blocksuite/affine/components/src/doc-title/doc-title.ts
+++ b/blocksuite/affine/components/src/doc-title/doc-title.ts
@@ -8,7 +8,7 @@ import {
} from '@blocksuite/affine-model';
import { matchModels } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { Store } from '@blocksuite/store';
import { effect } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts
index 8badc9b435..da101657dc 100644
--- a/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts
+++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts
@@ -1,6 +1,6 @@
import { stopPropagation } from '@blocksuite/affine-shared/utils';
import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { html } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts
index e89aff2d6c..7c1d0ae883 100644
--- a/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts
+++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts
@@ -3,7 +3,7 @@ import { isValidUrl, stopPropagation } from '@blocksuite/affine-shared/utils';
import type { EditorHost } from '@blocksuite/block-std';
import { ShadowlessElement } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { html } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts
index d7ff6c4ba4..f357f74670 100644
--- a/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts
+++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts
@@ -20,11 +20,8 @@ import type {
BlockStdScope,
EditorHost,
} from '@blocksuite/block-std';
-import {
- nextTick,
- SignalWatcher,
- WithDisposable,
-} from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { nextTick } from '@blocksuite/global/utils';
import { autoUpdate, computePosition, flip, offset } from '@floating-ui/dom';
import { computed, signal } from '@preact/signals-core';
import { css, html, LitElement } from 'lit';
diff --git a/blocksuite/affine/components/src/filterable-list/index.ts b/blocksuite/affine/components/src/filterable-list/index.ts
index 2389ddc785..3353645476 100644
--- a/blocksuite/affine/components/src/filterable-list/index.ts
+++ b/blocksuite/affine/components/src/filterable-list/index.ts
@@ -1,5 +1,5 @@
import { PAGE_HEADER_HEIGHT } from '@blocksuite/affine-shared/consts';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { DoneIcon, SearchIcon } from '@blocksuite/icons/lit';
import { autoPlacement, offset, type Placement, size } from '@floating-ui/dom';
import { html, LitElement, nothing } from 'lit';
diff --git a/blocksuite/affine/components/src/hover/controller.ts b/blocksuite/affine/components/src/hover/controller.ts
index 12214ce407..a066c19f00 100644
--- a/blocksuite/affine/components/src/hover/controller.ts
+++ b/blocksuite/affine/components/src/hover/controller.ts
@@ -1,4 +1,4 @@
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import type { ReactiveController, ReactiveElement } from 'lit';
import {
diff --git a/blocksuite/affine/components/src/peek/type.ts b/blocksuite/affine/components/src/peek/type.ts
index 3a8d43bbd8..7073f9b4a8 100644
--- a/blocksuite/affine/components/src/peek/type.ts
+++ b/blocksuite/affine/components/src/peek/type.ts
@@ -1,5 +1,5 @@
import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std';
-import type { DisposableClass } from '@blocksuite/global/utils';
+import type { DisposableClass } from '@blocksuite/global/lit';
import type { LitElement, TemplateResult } from 'lit';
export type PeekableClass = { std: BlockStdScope } & DisposableClass &
diff --git a/blocksuite/affine/components/src/portal/helper.ts b/blocksuite/affine/components/src/portal/helper.ts
index 87f1e0951f..2260307e32 100644
--- a/blocksuite/affine/components/src/portal/helper.ts
+++ b/blocksuite/affine/components/src/portal/helper.ts
@@ -1,5 +1,5 @@
import { BlockSuiteError } from '@blocksuite/global/exceptions';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import {
autoUpdate,
computePosition,
diff --git a/blocksuite/affine/components/src/portal/types.ts b/blocksuite/affine/components/src/portal/types.ts
index 6ed049e4fa..2c98c41459 100644
--- a/blocksuite/affine/components/src/portal/types.ts
+++ b/blocksuite/affine/components/src/portal/types.ts
@@ -1,4 +1,4 @@
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import type {
AutoUpdateOptions,
ComputePositionConfig,
diff --git a/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts b/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts
index afec20cd12..36b9ef22db 100644
--- a/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts
+++ b/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts
@@ -1,5 +1,5 @@
import { createIdentifier } from '@blocksuite/global/di';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type { ExtensionType } from '@blocksuite/store';
import type { RefNodeSlots } from '../inline/index.js';
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-node.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-node.ts
index 5422ba628b..08ee4ec421 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-node.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-node.ts
@@ -7,7 +7,7 @@ import {
ShadowlessElement,
TextSelection,
} from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
type DeltaInsert,
INLINE_ROOT_ATTR,
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-popup.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-popup.ts
index 3c2c7cea88..3abaebb82a 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-popup.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/footnote-node/footnote-popup.ts
@@ -6,7 +6,7 @@ import {
} from '@blocksuite/affine-shared/services';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import type { BlockStdScope } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { DualLinkIcon, LinkIcon } from '@blocksuite/icons/lit';
import { computed, signal } from '@preact/signals-core';
import { css, html, LitElement, type TemplateResult } from 'lit';
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-editor-menu.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-editor-menu.ts
index 6adf3cbe6a..57b2b80367 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-editor-menu.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-editor-menu.ts
@@ -2,7 +2,8 @@ import { ColorScheme } from '@blocksuite/affine-model';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import { unsafeCSSVar } from '@blocksuite/affine-shared/theme';
import { type BlockStdScope, ShadowlessElement } from '@blocksuite/block-std';
-import { noop, SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { noop } from '@blocksuite/global/utils';
import { DoneIcon } from '@blocksuite/icons/lit';
import { effect, type Signal, signal } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-node.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-node.ts
index a7b5e008ed..0a9b13a392 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-node.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/latex-node/latex-node.ts
@@ -5,7 +5,7 @@ import {
type BlockStdScope,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
type DeltaInsert,
type InlineEditor,
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/affine-link.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/affine-link.ts
index de8b1bb9bb..d85dc3e4f7 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/affine-link.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/affine-link.ts
@@ -6,7 +6,7 @@ import {
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std';
import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
type DeltaInsert,
INLINE_ROOT_ATTR,
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/link-popup/link-popup.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/link-popup/link-popup.ts
index 0ef80f8582..d20c1138d2 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/link-popup/link-popup.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/link-node/link-popup/link-popup.ts
@@ -4,7 +4,7 @@ import {
stopPropagation,
} from '@blocksuite/affine-shared/utils';
import { type BlockStdScope, TextSelection } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { DoneIcon } from '@blocksuite/icons/lit';
import type { InlineRange } from '@blocksuite/inline/types';
import { computePosition, inline, offset, shift } from '@floating-ui/dom';
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-node.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-node.ts
index afc7f19e05..40944e39c0 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-node.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-node.ts
@@ -14,7 +14,7 @@ import {
} from '@blocksuite/affine-shared/utils';
import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std';
import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { LinkedPageIcon } from '@blocksuite/icons/lit';
import {
type DeltaInsert,
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts
index 7ec0ebda76..8b42e0cdb7 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts
@@ -9,7 +9,7 @@ import { FONT_XS, PANEL_BASE } from '@blocksuite/affine-shared/styles';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { stopPropagation } from '@blocksuite/affine-shared/utils';
import { type BlockStdScope, ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { DoneIcon, ResetIcon } from '@blocksuite/icons/lit';
import type { InlineRange } from '@blocksuite/inline';
import { computePosition, inline, offset, shift } from '@floating-ui/dom';
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/types.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/types.ts
index de47129c7b..6159e305bb 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/types.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/types.ts
@@ -1,7 +1,7 @@
import type { ReferenceInfo } from '@blocksuite/affine-model';
import type { OpenDocMode } from '@blocksuite/affine-shared/services';
import type { EditorHost } from '@blocksuite/block-std';
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
export type DocLinkClickedEvent = ReferenceInfo & {
// default is active view
diff --git a/blocksuite/affine/components/src/rich-text/rich-text.ts b/blocksuite/affine/components/src/rich-text/rich-text.ts
index 1fcb742c29..bcb75fca04 100644
--- a/blocksuite/affine/components/src/rich-text/rich-text.ts
+++ b/blocksuite/affine/components/src/rich-text/rich-text.ts
@@ -1,6 +1,6 @@
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
type AttributeRenderer,
type DeltaInsert,
diff --git a/blocksuite/affine/components/src/toggle-button/toggle-button.ts b/blocksuite/affine/components/src/toggle-button/toggle-button.ts
index bc368ce3ca..f601a4b0d1 100644
--- a/blocksuite/affine/components/src/toggle-button/toggle-button.ts
+++ b/blocksuite/affine/components/src/toggle-button/toggle-button.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { ToggleDownIcon, ToggleRightIcon } from '@blocksuite/icons/lit';
import { css, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/components/src/toolbar/menu-button.ts b/blocksuite/affine/components/src/toolbar/menu-button.ts
index ffc0b286b9..363f540d1e 100644
--- a/blocksuite/affine/components/src/toolbar/menu-button.ts
+++ b/blocksuite/affine/components/src/toolbar/menu-button.ts
@@ -1,6 +1,6 @@
import { PANEL_BASE } from '@blocksuite/affine-shared/styles';
import { createButtonPopper } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import {
css,
html,
diff --git a/blocksuite/affine/components/src/toolbar/toolbar.ts b/blocksuite/affine/components/src/toolbar/toolbar.ts
index 6ed94ae69f..4bcbb87c4c 100644
--- a/blocksuite/affine/components/src/toolbar/toolbar.ts
+++ b/blocksuite/affine/components/src/toolbar/toolbar.ts
@@ -1,6 +1,6 @@
import { PANEL_BASE } from '@blocksuite/affine-shared/styles';
import { stopPropagation } from '@blocksuite/affine-shared/utils';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement } from 'lit';
export class EditorToolbar extends WithDisposable(LitElement) {
diff --git a/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts b/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts
index cd06957713..01352826a4 100644
--- a/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts
+++ b/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts
@@ -7,7 +7,7 @@ import {
requiredProperties,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import { ArrowDownSmallIcon } from '@blocksuite/icons/lit';
import type { ReadonlySignal, Signal } from '@preact/signals-core';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/common/properties.ts b/blocksuite/affine/data-view/src/core/common/properties.ts
index 54529ac29c..f26abff3e9 100644
--- a/blocksuite/affine/data-view/src/core/common/properties.ts
+++ b/blocksuite/affine/data-view/src/core/common/properties.ts
@@ -4,7 +4,7 @@ import {
type PopupTarget,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { InvisibleIcon, ViewIcon } from '@blocksuite/icons/lit';
import { computed } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/data-view/src/core/component/button/button.ts b/blocksuite/affine/data-view/src/core/component/button/button.ts
index c3814bffa2..fb42cc8150 100644
--- a/blocksuite/affine/data-view/src/core/component/button/button.ts
+++ b/blocksuite/affine/data-view/src/core/component/button/button.ts
@@ -1,6 +1,6 @@
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { css, html, type TemplateResult } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts b/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts
index bcdecaea51..7b2d8b85e5 100644
--- a/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts
+++ b/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { css, html, type PropertyValues, type TemplateResult } from 'lit';
import { property, query, queryAll, state } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts
index 859e1d4257..f40076ee0e 100644
--- a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts
+++ b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts
@@ -9,7 +9,7 @@ import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { rangeWrap } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
import { IS_MOBILE } from '@blocksuite/global/env';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
CloseIcon,
DeleteIcon,
diff --git a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts
index 91bbcb76a6..d9b5f690d2 100644
--- a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts
+++ b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts
@@ -1,6 +1,6 @@
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css } from 'lit';
import { property, query } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/data-view/src/core/data-view.ts b/blocksuite/affine/data-view/src/core/data-view.ts
index b58a7f32bf..00e229ec6c 100644
--- a/blocksuite/affine/data-view/src/core/data-view.ts
+++ b/blocksuite/affine/data-view/src/core/data-view.ts
@@ -4,7 +4,7 @@ import type {
} from '@blocksuite/affine-shared/services';
import { ShadowlessElement } from '@blocksuite/block-std';
import { IS_MOBILE } from '@blocksuite/global/env';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { computed, type ReadonlySignal } from '@preact/signals-core';
import { css, unsafeCSS } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/detail/detail.ts b/blocksuite/affine/data-view/src/core/detail/detail.ts
index dd9de5966d..d45a62b73c 100644
--- a/blocksuite/affine/data-view/src/core/detail/detail.ts
+++ b/blocksuite/affine/data-view/src/core/detail/detail.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
ArrowDownBigIcon,
ArrowUpBigIcon,
diff --git a/blocksuite/affine/data-view/src/core/detail/field.ts b/blocksuite/affine/data-view/src/core/detail/field.ts
index c0e02d49d6..723efb042b 100644
--- a/blocksuite/affine/data-view/src/core/detail/field.ts
+++ b/blocksuite/affine/data-view/src/core/detail/field.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
DeleteIcon,
DuplicateIcon,
diff --git a/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts b/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts
index a589a9b2c9..0a19e85d16 100644
--- a/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts
+++ b/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts b/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts
index 608762b8ec..867c97267e 100644
--- a/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts
+++ b/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { property } from 'lit/decorators.js';
import type { GroupRenderProps } from '../types.js';
diff --git a/blocksuite/affine/data-view/src/core/group-by/setting.ts b/blocksuite/affine/data-view/src/core/group-by/setting.ts
index 2332a27603..453492286d 100644
--- a/blocksuite/affine/data-view/src/core/group-by/setting.ts
+++ b/blocksuite/affine/data-view/src/core/group-by/setting.ts
@@ -6,7 +6,7 @@ import {
type PopupTarget,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { DeleteIcon } from '@blocksuite/icons/lit';
import { computed } from '@preact/signals-core';
import { css, html, unsafeCSS } from 'lit';
diff --git a/blocksuite/affine/data-view/src/core/property/base-cell.ts b/blocksuite/affine/data-view/src/core/property/base-cell.ts
index 054d8bbceb..42256460b8 100644
--- a/blocksuite/affine/data-view/src/core/property/base-cell.ts
+++ b/blocksuite/affine/data-view/src/core/property/base-cell.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { computed } from '@preact/signals-core';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/property/types.ts b/blocksuite/affine/data-view/src/core/property/types.ts
index 06333ae3f4..8dce4a46ea 100644
--- a/blocksuite/affine/data-view/src/core/property/types.ts
+++ b/blocksuite/affine/data-view/src/core/property/types.ts
@@ -1,4 +1,4 @@
-import type { Disposable } from '@blocksuite/global/utils';
+import type { Disposable } from '@blocksuite/global/slot';
import type { DataSource } from '../data-source/base.js';
import type { TypeInstance } from '../logical/type.js';
diff --git a/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts b/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts
index 32e42bb103..cd23c0a966 100644
--- a/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts
+++ b/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import type { TemplateResult } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts b/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts
index 284f635e46..0c43d7d5a0 100644
--- a/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts
+++ b/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import type { LitElement, PropertyValues, TemplateResult } from 'lit';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/core/view/data-view-base.ts b/blocksuite/affine/data-view/src/core/view/data-view-base.ts
index 440b0e629e..d5f2595759 100644
--- a/blocksuite/affine/data-view/src/core/view/data-view-base.ts
+++ b/blocksuite/affine/data-view/src/core/view/data-view-base.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { property } from 'lit/decorators.js';
import type { DataViewSelection } from '../types.js';
diff --git a/blocksuite/affine/data-view/src/core/view/types.ts b/blocksuite/affine/data-view/src/core/view/types.ts
index dcb175c90d..f27f5a917f 100644
--- a/blocksuite/affine/data-view/src/core/view/types.ts
+++ b/blocksuite/affine/data-view/src/core/view/types.ts
@@ -8,7 +8,7 @@ import type {
EventName,
UIEventHandler,
} from '@blocksuite/block-std';
-import type { Disposable } from '@blocksuite/global/utils';
+import type { Disposable } from '@blocksuite/global/slot';
import type { ReadonlySignal } from '@preact/signals-core';
import type { DataSource } from '../common/index.js';
diff --git a/blocksuite/affine/data-view/src/core/widget/widget-base.ts b/blocksuite/affine/data-view/src/core/widget/widget-base.ts
index e284852372..bd857a833b 100644
--- a/blocksuite/affine/data-view/src/core/widget/widget-base.ts
+++ b/blocksuite/affine/data-view/src/core/widget/widget-base.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { property } from 'lit/decorators.js';
import type { DataViewInstance } from '../view/types.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts
index 8c1f7f5b61..34be5bd981 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts
@@ -1,7 +1,7 @@
import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu';
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { css } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts
index 7072343252..bfb2156276 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts
@@ -2,7 +2,7 @@
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { computed, effect } from '@preact/signals-core';
import { css } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts
index 52dd078648..c72ccd098f 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { AddCursorIcon } from '@blocksuite/icons/lit';
import { css, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts
index bcfcb0b2cc..eaf0dab277 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts
@@ -1,6 +1,6 @@
import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { css } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts
index f58be98175..3b90dc2a31 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts
@@ -1,7 +1,7 @@
// related component
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { css } from 'lit';
import { property, state } from 'lit/decorators.js';
import { createRef } from 'lit/directives/ref.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts
index d49e75744b..99ae379ab7 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { AddCursorIcon } from '@blocksuite/icons/lit';
import { css, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts
index ebf21f4ad3..50ba4e6a3c 100644
--- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts
+++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { css } from 'lit';
import { property } from 'lit/decorators.js';
import { html } from 'lit/static-html.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts
index aa29beaf35..3108229e4a 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { computed, effect } from '@preact/signals-core';
import { css } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts
index 5455ded7c3..03ffaac349 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts
@@ -6,7 +6,7 @@ import {
} from '@blocksuite/affine-components/context-menu';
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
DeleteIcon,
DuplicateIcon,
diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts
index 9d06404271..344cb646c7 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { PlusIcon } from '@blocksuite/icons/lit';
import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts
index f453d7a7b6..e479bc5ea3 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts
@@ -1,6 +1,6 @@
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { PlusIcon } from '@blocksuite/icons/lit';
import { css, type TemplateResult } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts
index b31527d033..e7796e80b6 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts
@@ -1,7 +1,7 @@
import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu';
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { css, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts
index fb4c497df4..d0671807a6 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { computed } from '@preact/signals-core';
import { css } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts
index ff5a012a17..496de0ba7f 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { computed, effect } from '@preact/signals-core';
import type { ReactiveController } from 'lit';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts
index 1d3e784796..628d4acca6 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts
@@ -4,7 +4,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { PlusIcon } from '@blocksuite/icons/lit';
import { effect } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts
index e446d524c7..5468d18a3c 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts
@@ -1,7 +1,6 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { getScrollContainer } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { PlusIcon } from '@blocksuite/icons/lit';
import { autoUpdate } from '@floating-ui/dom';
import { nothing, type TemplateResult } from 'lit';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts
index 83e466f7c5..29dd6199c2 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { css } from 'lit';
import { property } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts
index 9a4e2404d3..ccbbdc91e2 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts
@@ -5,7 +5,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
DeleteIcon,
DuplicateIcon,
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/number-format-bar.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/number-format-bar.ts
index 16c83f54d3..941da05b68 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/number-format-bar.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/number-format-bar.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts
index 37c06f7e88..568d86ea84 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts
@@ -1,6 +1,6 @@
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts
index 48d9c3043d..fb17236ee0 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { CheckBoxCheckSolidIcon, CheckBoxUnIcon } from '@blocksuite/icons/lit';
import { computed, type ReadonlySignal } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts
index 381b98eb90..6e37754aab 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts
@@ -1,6 +1,6 @@
import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit';
import { css, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts
index f936f5da27..0065840660 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts
index 69dc56b13f..30f6c2e08d 100644
--- a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts
+++ b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts
@@ -5,7 +5,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { ArrowDownSmallIcon } from '@blocksuite/icons/lit';
import { Text } from '@blocksuite/store';
import { autoPlacement, offset } from '@floating-ui/dom';
diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts
index 33cd434083..dde7fedc83 100644
--- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts
+++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts
@@ -7,7 +7,7 @@ import {
subMenuMiddleware,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
ArrowDownSmallIcon,
ArrowRightSmallIcon,
diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts
index 90e1004844..c4a55e9222 100644
--- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts
+++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts
@@ -6,7 +6,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
ArrowDownSmallIcon,
ConvertIcon,
diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts
index 97741b0a2c..ccf0bb05fd 100644
--- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts
+++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts
@@ -3,7 +3,7 @@ import {
popupTargetFromElement,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
ArrowDownSmallIcon,
FilterIcon,
diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts
index 1f88d21543..c3a1eb7f88 100644
--- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts
+++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts
@@ -7,7 +7,7 @@ import {
subMenuMiddleware,
} from '@blocksuite/affine-components/context-menu';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
import {
ArrowDownSmallIcon,
ConvertIcon,
diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts
index edfc6a291a..288d736cec 100644
--- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts
+++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts
@@ -6,7 +6,7 @@ import {
} from '@blocksuite/affine-components/context-menu';
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
ArrowDownSmallIcon,
CloseIcon,
diff --git a/blocksuite/affine/fragment-frame-panel/src/body/frame-panel-body.ts b/blocksuite/affine/fragment-frame-panel/src/body/frame-panel-body.ts
index dff58016ca..0a0bdb9a6b 100644
--- a/blocksuite/affine/fragment-frame-panel/src/body/frame-panel-body.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/body/frame-panel-body.ts
@@ -10,11 +10,8 @@ import {
GfxControllerIdentifier,
} from '@blocksuite/block-std/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import {
- DisposableGroup,
- SignalWatcher,
- WithDisposable,
-} from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import type { Store } from '@blocksuite/store';
import { css, html, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title-editor.ts b/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title-editor.ts
index 6e7d80b50d..bd1ab6381c 100644
--- a/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title-editor.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title-editor.ts
@@ -1,7 +1,7 @@
import type { RichText } from '@blocksuite/affine-components/rich-text';
import type { FrameBlockModel } from '@blocksuite/affine-model';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title.ts b/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title.ts
index e57b95774f..507d345b65 100644
--- a/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/card/frame-card-title.ts
@@ -1,6 +1,7 @@
import type { FrameBlockModel } from '@blocksuite/affine-model';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { DisposableGroup, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { css, html, type PropertyValues } from 'lit';
import { property, query } from 'lit/decorators.js';
import type * as Y from 'yjs';
diff --git a/blocksuite/affine/fragment-frame-panel/src/card/frame-card.ts b/blocksuite/affine/fragment-frame-panel/src/card/frame-card.ts
index 2ef332c73d..a74d0f0af2 100644
--- a/blocksuite/affine/fragment-frame-panel/src/card/frame-card.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/card/frame-card.ts
@@ -1,7 +1,7 @@
import type { FrameBlockModel } from '@blocksuite/affine-model';
import { on, once } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/blocksuite/affine/fragment-frame-panel/src/frame-panel.ts b/blocksuite/affine/fragment-frame-panel/src/frame-panel.ts
index a090c8c8af..f4550aaf44 100644
--- a/blocksuite/affine/fragment-frame-panel/src/frame-panel.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/frame-panel.ts
@@ -1,5 +1,5 @@
import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/fragment-frame-panel/src/header/frame-panel-header.ts b/blocksuite/affine/fragment-frame-panel/src/header/frame-panel-header.ts
index ece85ad423..4345f5689f 100644
--- a/blocksuite/affine/fragment-frame-panel/src/header/frame-panel-header.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/header/frame-panel-header.ts
@@ -7,7 +7,8 @@ import {
import { createButtonPopper } from '@blocksuite/affine-shared/utils';
import type { EditorHost } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
-import { DisposableGroup, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { PresentationIcon, SettingsIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/fragment-frame-panel/src/header/frames-setting-menu.ts b/blocksuite/affine/fragment-frame-panel/src/header/frames-setting-menu.ts
index ef316011ce..009ecbceee 100644
--- a/blocksuite/affine/fragment-frame-panel/src/header/frames-setting-menu.ts
+++ b/blocksuite/affine/fragment-frame-panel/src/header/frames-setting-menu.ts
@@ -4,7 +4,7 @@ import {
EditPropsStore,
} from '@blocksuite/affine-shared/services';
import type { EditorHost } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, LitElement, type PropertyValues } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/fragment-outline/src/body/outline-notice.ts b/blocksuite/affine/fragment-outline/src/body/outline-notice.ts
index e1754efac7..600e28b899 100644
--- a/blocksuite/affine/fragment-outline/src/body/outline-notice.ts
+++ b/blocksuite/affine/fragment-outline/src/body/outline-notice.ts
@@ -1,6 +1,6 @@
import { NoteDisplayMode } from '@blocksuite/affine-model';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { CloseIcon, SortIcon } from '@blocksuite/icons/lit';
import { consume } from '@lit/context';
import { effect, signal } from '@preact/signals-core';
diff --git a/blocksuite/affine/fragment-outline/src/body/outline-panel-body.ts b/blocksuite/affine/fragment-outline/src/body/outline-panel-body.ts
index f96aa0a3c5..fe215ed682 100644
--- a/blocksuite/affine/fragment-outline/src/body/outline-panel-body.ts
+++ b/blocksuite/affine/fragment-outline/src/body/outline-panel-body.ts
@@ -5,7 +5,7 @@ import { matchModels } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement, SurfaceSelection } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { consume } from '@lit/context';
import { effect, signal } from '@preact/signals-core';
diff --git a/blocksuite/affine/fragment-outline/src/card/outline-card.ts b/blocksuite/affine/fragment-outline/src/card/outline-card.ts
index 4e1ccafd5b..099fa1d36f 100644
--- a/blocksuite/affine/fragment-outline/src/card/outline-card.ts
+++ b/blocksuite/affine/fragment-outline/src/card/outline-card.ts
@@ -1,7 +1,7 @@
import { type NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model';
import { createButtonPopper } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { ArrowDownSmallIcon, InvisibleIcon } from '@blocksuite/icons/lit';
import type { BlockModel } from '@blocksuite/store';
import { consume, ContextProvider } from '@lit/context';
diff --git a/blocksuite/affine/fragment-outline/src/card/outline-preview.ts b/blocksuite/affine/fragment-outline/src/card/outline-preview.ts
index d956fa4d54..41f64eb4a2 100644
--- a/blocksuite/affine/fragment-outline/src/card/outline-preview.ts
+++ b/blocksuite/affine/fragment-outline/src/card/outline-preview.ts
@@ -11,7 +11,8 @@ import type {
import { DocDisplayMetaProvider } from '@blocksuite/affine-shared/services';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { noop, SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { noop } from '@blocksuite/global/utils';
import { LinkedPageIcon } from '@blocksuite/icons/lit';
import type { DeltaInsert } from '@blocksuite/inline';
import type { BlockModel } from '@blocksuite/store';
diff --git a/blocksuite/affine/fragment-outline/src/header/outline-panel-header.ts b/blocksuite/affine/fragment-outline/src/header/outline-panel-header.ts
index e03a95f6a5..1dab2896dd 100644
--- a/blocksuite/affine/fragment-outline/src/header/outline-panel-header.ts
+++ b/blocksuite/affine/fragment-outline/src/header/outline-panel-header.ts
@@ -1,6 +1,6 @@
import { createButtonPopper } from '@blocksuite/affine-shared/utils';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { SettingsIcon, SortIcon } from '@blocksuite/icons/lit';
import { consume } from '@lit/context';
import { signal } from '@preact/signals-core';
diff --git a/blocksuite/affine/fragment-outline/src/header/outline-setting-menu.ts b/blocksuite/affine/fragment-outline/src/header/outline-setting-menu.ts
index 171f50d4a1..0de9703d2d 100644
--- a/blocksuite/affine/fragment-outline/src/header/outline-setting-menu.ts
+++ b/blocksuite/affine/fragment-outline/src/header/outline-setting-menu.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { consume } from '@lit/context';
import { html } from 'lit';
diff --git a/blocksuite/affine/fragment-outline/src/mobile-outline-panel.ts b/blocksuite/affine/fragment-outline/src/mobile-outline-panel.ts
index a8add1d349..35e2fc39e7 100644
--- a/blocksuite/affine/fragment-outline/src/mobile-outline-panel.ts
+++ b/blocksuite/affine/fragment-outline/src/mobile-outline-panel.ts
@@ -11,7 +11,7 @@ import {
PropTypes,
requiredProperties,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel } from '@blocksuite/store';
import { signal } from '@preact/signals-core';
import { css, html, LitElement, nothing } from 'lit';
diff --git a/blocksuite/affine/fragment-outline/src/outline-panel.ts b/blocksuite/affine/fragment-outline/src/outline-panel.ts
index 7fffd086cf..0b14b57f56 100644
--- a/blocksuite/affine/fragment-outline/src/outline-panel.ts
+++ b/blocksuite/affine/fragment-outline/src/outline-panel.ts
@@ -5,7 +5,7 @@ import {
requiredProperties,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { provide } from '@lit/context';
import { effect, signal } from '@preact/signals-core';
import { html, type PropertyValues } from 'lit';
diff --git a/blocksuite/affine/fragment-outline/src/outline-viewer.ts b/blocksuite/affine/fragment-outline/src/outline-viewer.ts
index 064a74b024..c48248d05e 100644
--- a/blocksuite/affine/fragment-outline/src/outline-viewer.ts
+++ b/blocksuite/affine/fragment-outline/src/outline-viewer.ts
@@ -7,7 +7,7 @@ import {
requiredProperties,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { TocIcon } from '@blocksuite/icons/lit';
import { provide } from '@lit/context';
import { signal } from '@preact/signals-core';
diff --git a/blocksuite/affine/fragment-outline/src/utils/scroll.ts b/blocksuite/affine/fragment-outline/src/utils/scroll.ts
index ee2bfbee11..ed4e9fabf6 100644
--- a/blocksuite/affine/fragment-outline/src/utils/scroll.ts
+++ b/blocksuite/affine/fragment-outline/src/utils/scroll.ts
@@ -4,7 +4,7 @@ import { DocModeProvider } from '@blocksuite/affine-shared/services';
import type { Viewport } from '@blocksuite/affine-shared/types';
import type { EditorHost } from '@blocksuite/block-std';
import { clamp } from '@blocksuite/global/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { getHeadingBlocksFromDoc } from './query.js';
diff --git a/blocksuite/affine/shared/src/services/doc-display-meta-service.ts b/blocksuite/affine/shared/src/services/doc-display-meta-service.ts
index 56f62caed0..dc04ea7a82 100644
--- a/blocksuite/affine/shared/src/services/doc-display-meta-service.ts
+++ b/blocksuite/affine/shared/src/services/doc-display-meta-service.ts
@@ -1,7 +1,7 @@
import type { AliasInfo, ReferenceParams } from '@blocksuite/affine-model';
import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/block-std';
import { type Container, createIdentifier } from '@blocksuite/global/di';
-import type { Disposable } from '@blocksuite/global/utils';
+import type { Disposable } from '@blocksuite/global/slot';
import {
AliasIcon,
BlockLinkIcon,
diff --git a/blocksuite/affine/shared/src/services/doc-mode-service.ts b/blocksuite/affine/shared/src/services/doc-mode-service.ts
index 3c786ce1dd..8df1ab32e0 100644
--- a/blocksuite/affine/shared/src/services/doc-mode-service.ts
+++ b/blocksuite/affine/shared/src/services/doc-mode-service.ts
@@ -1,7 +1,8 @@
import type { DocMode } from '@blocksuite/affine-model';
import type { Container } from '@blocksuite/global/di';
import { createIdentifier } from '@blocksuite/global/di';
-import { type Disposable, noop, Slot } from '@blocksuite/global/utils';
+import { type Disposable, Slot } from '@blocksuite/global/slot';
+import { noop } from '@blocksuite/global/utils';
import type { ExtensionType } from '@blocksuite/store';
import { Extension } from '@blocksuite/store';
diff --git a/blocksuite/affine/shared/src/services/edit-props-store.ts b/blocksuite/affine/shared/src/services/edit-props-store.ts
index e8d9d270a3..3504846ae5 100644
--- a/blocksuite/affine/shared/src/services/edit-props-store.ts
+++ b/blocksuite/affine/shared/src/services/edit-props-store.ts
@@ -1,11 +1,8 @@
import { ColorSchema } from '@blocksuite/affine-model';
import { type BlockStdScope, LifeCycleWatcher } from '@blocksuite/block-std';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import {
- type DeepPartial,
- DisposableGroup,
- Slot,
-} from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
+import type { DeepPartial } from '@blocksuite/global/utils';
import { computed, type Signal, signal } from '@preact/signals-core';
import clonedeep from 'lodash-es/cloneDeep';
import mergeWith from 'lodash-es/mergeWith';
diff --git a/blocksuite/affine/shared/src/services/page-viewport-service.ts b/blocksuite/affine/shared/src/services/page-viewport-service.ts
index 5e4734869c..1880271a7b 100644
--- a/blocksuite/affine/shared/src/services/page-viewport-service.ts
+++ b/blocksuite/affine/shared/src/services/page-viewport-service.ts
@@ -1,5 +1,5 @@
import { createIdentifier } from '@blocksuite/global/di';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type { ExtensionType } from '@blocksuite/store';
import type { Viewport } from '../types';
diff --git a/blocksuite/affine/shared/src/utils/button-popper.ts b/blocksuite/affine/shared/src/utils/button-popper.ts
index 6c0cf25f28..bc5c30f095 100644
--- a/blocksuite/affine/shared/src/utils/button-popper.ts
+++ b/blocksuite/affine/shared/src/utils/button-popper.ts
@@ -1,4 +1,4 @@
-import type { Disposable } from '@blocksuite/global/utils';
+import type { Disposable } from '@blocksuite/global/slot';
import {
autoPlacement,
autoUpdate,
diff --git a/blocksuite/affine/shared/src/viewport-renderer/viewport-renderer.ts b/blocksuite/affine/shared/src/viewport-renderer/viewport-renderer.ts
index 3b46f599dc..279e0b0266 100644
--- a/blocksuite/affine/shared/src/viewport-renderer/viewport-renderer.ts
+++ b/blocksuite/affine/shared/src/viewport-renderer/viewport-renderer.ts
@@ -8,7 +8,7 @@ import {
type GfxViewportElement,
} from '@blocksuite/block-std/gfx';
import type { Container, ServiceIdentifier } from '@blocksuite/global/di';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import debounce from 'lodash-es/debounce';
import {
diff --git a/blocksuite/affine/widget-drag-handle/src/drag-handle.ts b/blocksuite/affine/widget-drag-handle/src/drag-handle.ts
index 6c8fef0d61..c08779256f 100644
--- a/blocksuite/affine/widget-drag-handle/src/drag-handle.ts
+++ b/blocksuite/affine/widget-drag-handle/src/drag-handle.ts
@@ -8,7 +8,7 @@ import {
import { type BlockComponent, WidgetComponent } from '@blocksuite/block-std';
import type { GfxModel } from '@blocksuite/block-std/gfx';
import type { IVec, Point, Rect } from '@blocksuite/global/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { computed, type ReadonlySignal, signal } from '@preact/signals-core';
import { html, nothing } from 'lit';
import { query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/widget-frame-title/src/frame-title.ts b/blocksuite/affine/widget-frame-title/src/frame-title.ts
index 6bef64f62f..4f29fa9229 100644
--- a/blocksuite/affine/widget-frame-title/src/frame-title.ts
+++ b/blocksuite/affine/widget-frame-title/src/frame-title.ts
@@ -13,7 +13,7 @@ import {
} from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { Bound, type SerializedXYWH } from '@blocksuite/global/gfx';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { consume } from '@lit/context';
import { themeToVar } from '@toeverything/theme/v2';
import { LitElement } from 'lit';
diff --git a/blocksuite/framework/block-std/src/__tests__/test-editor.ts b/blocksuite/framework/block-std/src/__tests__/test-editor.ts
index 1deec7e642..cdc58497e2 100644
--- a/blocksuite/framework/block-std/src/__tests__/test-editor.ts
+++ b/blocksuite/framework/block-std/src/__tests__/test-editor.ts
@@ -1,4 +1,4 @@
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { ExtensionType, Store } from '@blocksuite/store';
import { html } from 'lit';
import { customElement, property } from 'lit/decorators.js';
diff --git a/blocksuite/framework/block-std/src/event/control/keyboard.ts b/blocksuite/framework/block-std/src/event/control/keyboard.ts
index d40b649a63..95f2cea19d 100644
--- a/blocksuite/framework/block-std/src/event/control/keyboard.ts
+++ b/blocksuite/framework/block-std/src/event/control/keyboard.ts
@@ -1,5 +1,5 @@
import { IS_ANDROID, IS_MAC } from '@blocksuite/global/env';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import {
type UIEventHandler,
diff --git a/blocksuite/framework/block-std/src/event/dispatcher.ts b/blocksuite/framework/block-std/src/event/dispatcher.ts
index 886824d9f0..1b4a43fafa 100644
--- a/blocksuite/framework/block-std/src/event/dispatcher.ts
+++ b/blocksuite/framework/block-std/src/event/dispatcher.ts
@@ -1,5 +1,5 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { LifeCycleWatcher } from '../extension/index.js';
import { KeymapIdentifier } from '../identifier.js';
diff --git a/blocksuite/framework/block-std/src/extension/service.ts b/blocksuite/framework/block-std/src/extension/service.ts
index fd435d30c4..632a367f7c 100644
--- a/blocksuite/framework/block-std/src/extension/service.ts
+++ b/blocksuite/framework/block-std/src/extension/service.ts
@@ -1,6 +1,6 @@
import type { Container } from '@blocksuite/global/di';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { Extension } from '@blocksuite/store';
import type { EventName, UIEventHandler } from '../event/index.js';
diff --git a/blocksuite/framework/block-std/src/gfx/controller.ts b/blocksuite/framework/block-std/src/gfx/controller.ts
index 8101b01cf8..e2881fce05 100644
--- a/blocksuite/framework/block-std/src/gfx/controller.ts
+++ b/blocksuite/framework/block-std/src/gfx/controller.ts
@@ -4,7 +4,8 @@ import {
getCommonBoundWithRotation,
type IBound,
} from '@blocksuite/global/gfx';
-import { assertType, DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import type { BlockModel } from '@blocksuite/store';
import { Signal } from '@preact/signals-core';
import last from 'lodash-es/last';
diff --git a/blocksuite/framework/block-std/src/gfx/keyboard.ts b/blocksuite/framework/block-std/src/gfx/keyboard.ts
index c6428ae5a0..d4e6065ad5 100644
--- a/blocksuite/framework/block-std/src/gfx/keyboard.ts
+++ b/blocksuite/framework/block-std/src/gfx/keyboard.ts
@@ -1,4 +1,4 @@
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { Signal } from '@preact/signals-core';
import type { BlockStdScope } from '../scope/block-std-scope.js';
diff --git a/blocksuite/framework/block-std/src/gfx/layer.ts b/blocksuite/framework/block-std/src/gfx/layer.ts
index 40aa682fa3..e0ae725b33 100644
--- a/blocksuite/framework/block-std/src/gfx/layer.ts
+++ b/blocksuite/framework/block-std/src/gfx/layer.ts
@@ -1,5 +1,6 @@
import { Bound } from '@blocksuite/global/gfx';
-import { assertType, DisposableGroup, Slot } from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import type { Store } from '@blocksuite/store';
import { generateKeyBetween } from 'fractional-indexing';
import last from 'lodash-es/last';
diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts b/blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts
index 25c41846d0..04b8dce6ee 100644
--- a/blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts
+++ b/blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts
@@ -13,7 +13,7 @@ import {
type SerializedXYWH,
type XYWH,
} from '@blocksuite/global/gfx';
-import { DisposableGroup, Slot } from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
import { createMutex } from 'lib0/mutex';
import isEqual from 'lodash-es/isEqual';
import * as Y from 'yjs';
diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts b/blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts
index 1c385ce47a..5bb87dd2d5 100644
--- a/blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts
+++ b/blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts
@@ -1,9 +1,5 @@
-import {
- assertType,
- type Constructor,
- DisposableGroup,
- Slot,
-} from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
+import { assertType, type Constructor } from '@blocksuite/global/utils';
import type { Boxed } from '@blocksuite/store';
import { BlockModel, nanoid } from '@blocksuite/store';
import { signal } from '@preact/signals-core';
diff --git a/blocksuite/framework/block-std/src/gfx/selection.ts b/blocksuite/framework/block-std/src/gfx/selection.ts
index 1121b82048..8f12ed2bb1 100644
--- a/blocksuite/framework/block-std/src/gfx/selection.ts
+++ b/blocksuite/framework/block-std/src/gfx/selection.ts
@@ -2,7 +2,8 @@ import {
getCommonBoundWithRotation,
type IPoint,
} from '@blocksuite/global/gfx';
-import { assertType, DisposableGroup, Slot } from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
+import { assertType } from '@blocksuite/global/utils';
import groupBy from 'lodash-es/groupBy';
import {
diff --git a/blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts b/blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts
index a6be3795ab..2a8486e8bb 100644
--- a/blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts
+++ b/blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts
@@ -1,7 +1,7 @@
import type { ServiceIdentifier } from '@blocksuite/global/di';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
import type { IBound, IPoint } from '@blocksuite/global/gfx';
-import { DisposableGroup, Slot } from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
import { Signal } from '@preact/signals-core';
import type { PointerEventState } from '../../event/index.js';
diff --git a/blocksuite/framework/block-std/src/gfx/tool/tool.ts b/blocksuite/framework/block-std/src/gfx/tool/tool.ts
index aa9e06e4f6..2e0e1581a3 100644
--- a/blocksuite/framework/block-std/src/gfx/tool/tool.ts
+++ b/blocksuite/framework/block-std/src/gfx/tool/tool.ts
@@ -1,6 +1,6 @@
import { type Container, createIdentifier } from '@blocksuite/global/di';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { Extension } from '@blocksuite/store';
import type { PointerEventState } from '../../event/index.js';
diff --git a/blocksuite/framework/block-std/src/gfx/view/view-manager.ts b/blocksuite/framework/block-std/src/gfx/view/view-manager.ts
index 1fe83f045a..341b7feb51 100644
--- a/blocksuite/framework/block-std/src/gfx/view/view-manager.ts
+++ b/blocksuite/framework/block-std/src/gfx/view/view-manager.ts
@@ -1,4 +1,4 @@
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { onSurfaceAdded } from '../../utils/gfx.js';
import type { GfxController } from '../controller.js';
diff --git a/blocksuite/framework/block-std/src/gfx/view/view.ts b/blocksuite/framework/block-std/src/gfx/view/view.ts
index 00607d517a..b851863976 100644
--- a/blocksuite/framework/block-std/src/gfx/view/view.ts
+++ b/blocksuite/framework/block-std/src/gfx/view/view.ts
@@ -1,7 +1,7 @@
import { type Container, createIdentifier } from '@blocksuite/global/di';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
import type { Bound, IVec } from '@blocksuite/global/gfx';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { DisposableGroup } from '@blocksuite/global/slot';
import type { Extension } from '@blocksuite/store';
import type { PointerEventState } from '../../event/index.js';
diff --git a/blocksuite/framework/block-std/src/gfx/viewport-element.ts b/blocksuite/framework/block-std/src/gfx/viewport-element.ts
index 102522771d..7866137edf 100644
--- a/blocksuite/framework/block-std/src/gfx/viewport-element.ts
+++ b/blocksuite/framework/block-std/src/gfx/viewport-element.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/framework/block-std/src/gfx/viewport.ts b/blocksuite/framework/block-std/src/gfx/viewport.ts
index 0f2adf1d8d..9d35019219 100644
--- a/blocksuite/framework/block-std/src/gfx/viewport.ts
+++ b/blocksuite/framework/block-std/src/gfx/viewport.ts
@@ -5,7 +5,7 @@ import {
type IVec,
Vec,
} from '@blocksuite/global/gfx';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import { signal } from '@preact/signals-core';
import debounce from 'lodash-es/debounce';
diff --git a/blocksuite/framework/block-std/src/spec/slots.ts b/blocksuite/framework/block-std/src/spec/slots.ts
index 63a41b7663..63b75b7931 100644
--- a/blocksuite/framework/block-std/src/spec/slots.ts
+++ b/blocksuite/framework/block-std/src/spec/slots.ts
@@ -1,4 +1,4 @@
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type { BlockService } from '../extension/service.js';
import type { BlockComponent, WidgetComponent } from '../view/index.js';
diff --git a/blocksuite/framework/block-std/src/view/element/block-component.ts b/blocksuite/framework/block-std/src/view/element/block-component.ts
index 864278faf8..d226402afa 100644
--- a/blocksuite/framework/block-std/src/view/element/block-component.ts
+++ b/blocksuite/framework/block-std/src/view/element/block-component.ts
@@ -1,5 +1,5 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { type BlockModel, type BlockViewType, Store } from '@blocksuite/store';
import { consume, provide } from '@lit/context';
import { computed } from '@preact/signals-core';
diff --git a/blocksuite/framework/block-std/src/view/element/lit-host.ts b/blocksuite/framework/block-std/src/view/element/lit-host.ts
index 0f0cf3e310..63a4dbe817 100644
--- a/blocksuite/framework/block-std/src/view/element/lit-host.ts
+++ b/blocksuite/framework/block-std/src/view/element/lit-host.ts
@@ -3,7 +3,8 @@ import {
ErrorCode,
handleError,
} from '@blocksuite/global/exceptions';
-import { SignalWatcher, Slot, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
+import { Slot } from '@blocksuite/global/slot';
import {
type BlockModel,
Store,
diff --git a/blocksuite/framework/block-std/src/view/element/widget-component.ts b/blocksuite/framework/block-std/src/view/element/widget-component.ts
index 7d5f9cfbcc..5a390ef8f0 100644
--- a/blocksuite/framework/block-std/src/view/element/widget-component.ts
+++ b/blocksuite/framework/block-std/src/view/element/widget-component.ts
@@ -1,4 +1,4 @@
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { BlockModel, Store } from '@blocksuite/store';
import { consume } from '@lit/context';
import { LitElement } from 'lit';
diff --git a/blocksuite/framework/block-std/src/view/view-store.ts b/blocksuite/framework/block-std/src/view/view-store.ts
index e11d92cd1d..d0b41907fa 100644
--- a/blocksuite/framework/block-std/src/view/view-store.ts
+++ b/blocksuite/framework/block-std/src/view/view-store.ts
@@ -1,4 +1,4 @@
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import { LifeCycleWatcher } from '../extension/index.js';
import type { BlockComponent, WidgetComponent } from './element/index.js';
diff --git a/blocksuite/framework/global/package.json b/blocksuite/framework/global/package.json
index cfa18c93d3..0e74721a93 100644
--- a/blocksuite/framework/global/package.json
+++ b/blocksuite/framework/global/package.json
@@ -16,7 +16,9 @@
"./exceptions": "./src/exceptions/index.ts",
"./di": "./src/di/index.ts",
"./types": "./src/types/index.ts",
- "./gfx": "./src/gfx/index.ts"
+ "./gfx": "./src/gfx/index.ts",
+ "./slot": "./src/slot/index.ts",
+ "./lit": "./src/lit/index.ts"
},
"typesVersions": {
"*": {
@@ -37,6 +39,12 @@
],
"gfx": [
"dist/gfx/index.d.ts"
+ ],
+ "slot": [
+ "dist/slot/index.d.ts"
+ ],
+ "lit": [
+ "dist/lit/index.d.ts"
]
}
},
diff --git a/blocksuite/framework/global/src/__tests__/slot.unit.spec.ts b/blocksuite/framework/global/src/__tests__/slot.unit.spec.ts
index b0c6440a25..1db9fee9dd 100644
--- a/blocksuite/framework/global/src/__tests__/slot.unit.spec.ts
+++ b/blocksuite/framework/global/src/__tests__/slot.unit.spec.ts
@@ -1,6 +1,6 @@
import { describe, expect, test, vi } from 'vitest';
-import { Slot } from '../utils/slot.js';
+import { Slot } from '../slot/slot.js';
describe('slot', () => {
test('init', () => {
diff --git a/blocksuite/framework/global/src/lit/index.ts b/blocksuite/framework/global/src/lit/index.ts
new file mode 100644
index 0000000000..9fc9315e17
--- /dev/null
+++ b/blocksuite/framework/global/src/lit/index.ts
@@ -0,0 +1,2 @@
+export * from './signal-watcher.js';
+export * from './with-disposable.js';
diff --git a/blocksuite/framework/global/src/utils/signal-watcher.ts b/blocksuite/framework/global/src/lit/signal-watcher.ts
similarity index 100%
rename from blocksuite/framework/global/src/utils/signal-watcher.ts
rename to blocksuite/framework/global/src/lit/signal-watcher.ts
diff --git a/blocksuite/framework/global/src/utils/with-disposable.ts b/blocksuite/framework/global/src/lit/with-disposable.ts
similarity index 92%
rename from blocksuite/framework/global/src/utils/with-disposable.ts
rename to blocksuite/framework/global/src/lit/with-disposable.ts
index 869e5f1350..24d7cf0959 100644
--- a/blocksuite/framework/global/src/utils/with-disposable.ts
+++ b/blocksuite/framework/global/src/lit/with-disposable.ts
@@ -1,7 +1,7 @@
import type { LitElement } from 'lit';
-import { DisposableGroup } from './disposable.js';
-import type { Constructor } from './types.js';
+import { DisposableGroup } from '../slot/disposable.js';
+import type { Constructor } from '../utils/types.js';
// See https://lit.dev/docs/composition/mixins/#mixins-in-typescript
// This definition should be exported, see https://github.com/microsoft/TypeScript/issues/30355#issuecomment-839834550
diff --git a/blocksuite/framework/global/src/utils/disposable.ts b/blocksuite/framework/global/src/slot/disposable.ts
similarity index 100%
rename from blocksuite/framework/global/src/utils/disposable.ts
rename to blocksuite/framework/global/src/slot/disposable.ts
diff --git a/blocksuite/framework/global/src/slot/index.ts b/blocksuite/framework/global/src/slot/index.ts
new file mode 100644
index 0000000000..314daecf98
--- /dev/null
+++ b/blocksuite/framework/global/src/slot/index.ts
@@ -0,0 +1,2 @@
+export * from './disposable.js';
+export * from './slot.js';
diff --git a/blocksuite/framework/global/src/utils/slot.ts b/blocksuite/framework/global/src/slot/slot.ts
similarity index 100%
rename from blocksuite/framework/global/src/utils/slot.ts
rename to blocksuite/framework/global/src/slot/slot.ts
diff --git a/blocksuite/framework/global/src/utils/index.ts b/blocksuite/framework/global/src/utils/index.ts
index de21f56879..91ae773d52 100644
--- a/blocksuite/framework/global/src/utils/index.ts
+++ b/blocksuite/framework/global/src/utils/index.ts
@@ -1,8 +1,4 @@
export * from './crypto.js';
-export * from './disposable.js';
export * from './function.js';
export * from './logger.js';
-export * from './signal-watcher.js';
-export * from './slot.js';
export * from './types.js';
-export * from './with-disposable.js';
diff --git a/blocksuite/framework/inline/src/components/v-element.ts b/blocksuite/framework/inline/src/components/v-element.ts
index 0cc195560a..4d9d683682 100644
--- a/blocksuite/framework/inline/src/components/v-element.ts
+++ b/blocksuite/framework/inline/src/components/v-element.ts
@@ -1,5 +1,6 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { DisposableGroup, SignalWatcher } from '@blocksuite/global/utils';
+import { SignalWatcher } from '@blocksuite/global/lit';
+import { DisposableGroup } from '@blocksuite/global/slot';
import { effect, signal } from '@preact/signals-core';
import { html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/framework/inline/src/inline-editor.ts b/blocksuite/framework/inline/src/inline-editor.ts
index 97eef6512d..be26d89b57 100644
--- a/blocksuite/framework/inline/src/inline-editor.ts
+++ b/blocksuite/framework/inline/src/inline-editor.ts
@@ -1,5 +1,5 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { DisposableGroup, Slot } from '@blocksuite/global/utils';
+import { DisposableGroup, Slot } from '@blocksuite/global/slot';
import { type Signal, signal } from '@preact/signals-core';
import { nothing, render, type TemplateResult } from 'lit';
import type * as Y from 'yjs';
diff --git a/blocksuite/framework/store/src/__tests__/collection.unit.spec.ts b/blocksuite/framework/store/src/__tests__/collection.unit.spec.ts
index fd0049c99b..b386e111b6 100644
--- a/blocksuite/framework/store/src/__tests__/collection.unit.spec.ts
+++ b/blocksuite/framework/store/src/__tests__/collection.unit.spec.ts
@@ -1,6 +1,4 @@
-// checkout https://vitest.dev/guide/debugging.html for debugging tests
-
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import { assert, beforeEach, describe, expect, it, vi } from 'vitest';
import { applyUpdate, type Doc, encodeStateAsUpdate } from 'yjs';
diff --git a/blocksuite/framework/store/src/__tests__/yjs.unit.spec.ts b/blocksuite/framework/store/src/__tests__/yjs.unit.spec.ts
index bdee1482aa..095950db4f 100644
--- a/blocksuite/framework/store/src/__tests__/yjs.unit.spec.ts
+++ b/blocksuite/framework/store/src/__tests__/yjs.unit.spec.ts
@@ -1,4 +1,4 @@
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import { describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/blocksuite/framework/store/src/extension/selection/selection-extension.ts b/blocksuite/framework/store/src/extension/selection/selection-extension.ts
index 258141c1f6..874d9e9822 100644
--- a/blocksuite/framework/store/src/extension/selection/selection-extension.ts
+++ b/blocksuite/framework/store/src/extension/selection/selection-extension.ts
@@ -1,5 +1,5 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import { computed, signal } from '@preact/signals-core';
import type { Store } from '../../model';
diff --git a/blocksuite/framework/store/src/model/block/block-model.ts b/blocksuite/framework/store/src/model/block/block-model.ts
index 384fbffc7a..af7ef59a5b 100644
--- a/blocksuite/framework/store/src/model/block/block-model.ts
+++ b/blocksuite/framework/store/src/model/block/block-model.ts
@@ -1,4 +1,4 @@
-import { type Disposable, Slot } from '@blocksuite/global/utils';
+import { type Disposable, Slot } from '@blocksuite/global/slot';
import { computed, type Signal, signal } from '@preact/signals-core';
import type { Text } from '../../reactive/index.js';
diff --git a/blocksuite/framework/store/src/model/doc.ts b/blocksuite/framework/store/src/model/doc.ts
index 9eeb10d8ad..5be2a5a9a2 100644
--- a/blocksuite/framework/store/src/model/doc.ts
+++ b/blocksuite/framework/store/src/model/doc.ts
@@ -1,4 +1,4 @@
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import type * as Y from 'yjs';
import type { AwarenessStore } from '../yjs/awareness.js';
diff --git a/blocksuite/framework/store/src/model/store/store.ts b/blocksuite/framework/store/src/model/store/store.ts
index ade4a7ac5c..77fc72e606 100644
--- a/blocksuite/framework/store/src/model/store/store.ts
+++ b/blocksuite/framework/store/src/model/store/store.ts
@@ -1,6 +1,7 @@
import { Container, type ServiceProvider } from '@blocksuite/global/di';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { type Disposable, Slot } from '@blocksuite/global/utils';
+import type { Disposable } from '@blocksuite/global/slot';
+import { Slot } from '@blocksuite/global/slot';
import { computed, signal } from '@preact/signals-core';
import type { ExtensionType } from '../../extension/extension.js';
diff --git a/blocksuite/framework/store/src/model/workspace-meta.ts b/blocksuite/framework/store/src/model/workspace-meta.ts
index 58eec4fc86..d8096a5613 100644
--- a/blocksuite/framework/store/src/model/workspace-meta.ts
+++ b/blocksuite/framework/store/src/model/workspace-meta.ts
@@ -1,4 +1,4 @@
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
export type Tag = {
id: string;
diff --git a/blocksuite/framework/store/src/model/workspace.ts b/blocksuite/framework/store/src/model/workspace.ts
index 6c4590cf09..8f2dcd0d0f 100644
--- a/blocksuite/framework/store/src/model/workspace.ts
+++ b/blocksuite/framework/store/src/model/workspace.ts
@@ -1,4 +1,4 @@
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import type { BlobEngine } from '@blocksuite/sync';
import type { Awareness } from 'y-protocols/awareness.js';
import type * as Y from 'yjs';
diff --git a/blocksuite/framework/store/src/reactive/flat-native-y.ts b/blocksuite/framework/store/src/reactive/flat-native-y.ts
index 4b459e1c66..bccf776d80 100644
--- a/blocksuite/framework/store/src/reactive/flat-native-y.ts
+++ b/blocksuite/framework/store/src/reactive/flat-native-y.ts
@@ -1,5 +1,5 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { type Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import { signal } from '@preact/signals-core';
import {
Array as YArray,
diff --git a/blocksuite/framework/store/src/test/test-doc.ts b/blocksuite/framework/store/src/test/test-doc.ts
index 9f2ef136aa..5290236b5d 100644
--- a/blocksuite/framework/store/src/test/test-doc.ts
+++ b/blocksuite/framework/store/src/test/test-doc.ts
@@ -1,4 +1,4 @@
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import { signal } from '@preact/signals-core';
import * as Y from 'yjs';
diff --git a/blocksuite/framework/store/src/test/test-meta.ts b/blocksuite/framework/store/src/test/test-meta.ts
index 6e916ce376..aad37debcb 100644
--- a/blocksuite/framework/store/src/test/test-meta.ts
+++ b/blocksuite/framework/store/src/test/test-meta.ts
@@ -1,4 +1,4 @@
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type * as Y from 'yjs';
import type {
diff --git a/blocksuite/framework/store/src/test/test-workspace.ts b/blocksuite/framework/store/src/test/test-workspace.ts
index c2e3ec782c..2948e3933f 100644
--- a/blocksuite/framework/store/src/test/test-workspace.ts
+++ b/blocksuite/framework/store/src/test/test-workspace.ts
@@ -1,5 +1,6 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { NoopLogger, Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
+import { NoopLogger } from '@blocksuite/global/utils';
import {
AwarenessEngine,
type AwarenessSource,
diff --git a/blocksuite/framework/store/src/transformer/middleware.ts b/blocksuite/framework/store/src/transformer/middleware.ts
index 78f8ea193a..b37eae5bce 100644
--- a/blocksuite/framework/store/src/transformer/middleware.ts
+++ b/blocksuite/framework/store/src/transformer/middleware.ts
@@ -1,4 +1,4 @@
-import type { Slot } from '@blocksuite/global/utils';
+import type { Slot } from '@blocksuite/global/slot';
import type { BlockModel, DraftModel, Store } from '../model/index.js';
import type { AssetsManager } from './assets.js';
diff --git a/blocksuite/framework/store/src/transformer/transformer.ts b/blocksuite/framework/store/src/transformer/transformer.ts
index 0030703456..7f0e3b2305 100644
--- a/blocksuite/framework/store/src/transformer/transformer.ts
+++ b/blocksuite/framework/store/src/transformer/transformer.ts
@@ -1,5 +1,6 @@
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import { nextTick, Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
+import { nextTick } from '@blocksuite/global/utils';
import {
BlockModel,
diff --git a/blocksuite/framework/sync/src/doc/engine.ts b/blocksuite/framework/sync/src/doc/engine.ts
index 5c3491efb2..c94e0fc764 100644
--- a/blocksuite/framework/sync/src/doc/engine.ts
+++ b/blocksuite/framework/sync/src/doc/engine.ts
@@ -1,4 +1,5 @@
-import { type Logger, Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
+import type { Logger } from '@blocksuite/global/utils';
import type { Doc } from 'yjs';
import { SharedPriorityTarget } from '../utils/async-queue.js';
diff --git a/blocksuite/framework/sync/src/doc/peer.ts b/blocksuite/framework/sync/src/doc/peer.ts
index 7c21b84d12..e7b5d1b95d 100644
--- a/blocksuite/framework/sync/src/doc/peer.ts
+++ b/blocksuite/framework/sync/src/doc/peer.ts
@@ -1,4 +1,5 @@
-import { type Logger, Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
+import type { Logger } from '@blocksuite/global/utils';
import isEqual from 'lodash-es/isEqual';
import type { Doc } from 'yjs';
import {
diff --git a/blocksuite/integration-test/src/editors/editor-container.ts b/blocksuite/integration-test/src/editors/editor-container.ts
index d246ba7a40..547d9bc807 100644
--- a/blocksuite/integration-test/src/editors/editor-container.ts
+++ b/blocksuite/integration-test/src/editors/editor-container.ts
@@ -1,6 +1,6 @@
import { BlockStdScope, ShadowlessElement } from '@blocksuite/block-std';
import { type DocMode, ThemeProvider } from '@blocksuite/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
type BlockModel,
type ExtensionType,
diff --git a/blocksuite/playground/apps/_common/components/adapters-panel.ts b/blocksuite/playground/apps/_common/components/adapters-panel.ts
index 649fb5d125..d3d9fe687b 100644
--- a/blocksuite/playground/apps/_common/components/adapters-panel.ts
+++ b/blocksuite/playground/apps/_common/components/adapters-panel.ts
@@ -14,7 +14,7 @@ import {
PlainTextAdapterFactoryIdentifier,
titleMiddleware,
} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import type { DocSnapshot } from '@blocksuite/store';
import { effect } from '@preact/signals-core';
diff --git a/blocksuite/playground/apps/_common/components/attachment-viewer-panel.ts b/blocksuite/playground/apps/_common/components/attachment-viewer-panel.ts
index baac5266f3..baaa4806d4 100644
--- a/blocksuite/playground/apps/_common/components/attachment-viewer-panel.ts
+++ b/blocksuite/playground/apps/_common/components/attachment-viewer-panel.ts
@@ -2,7 +2,7 @@
import type { AttachmentBlockModel } from '@blocksuite/affine-model';
import { humanFileSize } from '@blocksuite/affine-shared/utils';
import { getAttachmentFileIcon } from '@blocksuite/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
ArrowDownBigIcon,
ArrowUpBigIcon,
diff --git a/blocksuite/playground/apps/_common/components/custom-frame-panel.ts b/blocksuite/playground/apps/_common/components/custom-frame-panel.ts
index ca81625c4b..6c2f511f1d 100644
--- a/blocksuite/playground/apps/_common/components/custom-frame-panel.ts
+++ b/blocksuite/playground/apps/_common/components/custom-frame-panel.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import { effect } from '@preact/signals-core';
import { css, html, nothing } from 'lit';
diff --git a/blocksuite/playground/apps/_common/components/custom-outline-panel.ts b/blocksuite/playground/apps/_common/components/custom-outline-panel.ts
index 9605bcb54c..abb64795e4 100644
--- a/blocksuite/playground/apps/_common/components/custom-outline-panel.ts
+++ b/blocksuite/playground/apps/_common/components/custom-outline-panel.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import { css, html, nothing } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
diff --git a/blocksuite/playground/apps/_common/components/custom-outline-viewer.ts b/blocksuite/playground/apps/_common/components/custom-outline-viewer.ts
index 5fad333875..92459401b4 100644
--- a/blocksuite/playground/apps/_common/components/custom-outline-viewer.ts
+++ b/blocksuite/playground/apps/_common/components/custom-outline-viewer.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import { css, html, LitElement, nothing } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
diff --git a/blocksuite/playground/apps/_common/components/docs-panel.ts b/blocksuite/playground/apps/_common/components/docs-panel.ts
index d7eba04c0b..33e34b119a 100644
--- a/blocksuite/playground/apps/_common/components/docs-panel.ts
+++ b/blocksuite/playground/apps/_common/components/docs-panel.ts
@@ -4,7 +4,7 @@ import {
createDefaultDoc,
GenerateDocUrlProvider,
} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import type { Doc, Workspace } from '@blocksuite/store';
import { css, html, nothing } from 'lit';
diff --git a/blocksuite/playground/apps/_common/mock-services.ts b/blocksuite/playground/apps/_common/mock-services.ts
index 1814f70ee6..860911ae61 100644
--- a/blocksuite/playground/apps/_common/mock-services.ts
+++ b/blocksuite/playground/apps/_common/mock-services.ts
@@ -11,7 +11,7 @@ import {
type ThemeExtension,
toast,
} from '@blocksuite/blocks';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/global/slot';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import { type Workspace } from '@blocksuite/store';
import { Signal, signal } from '@preact/signals-core';
diff --git a/blocksuite/playground/apps/comment/comment-input.ts b/blocksuite/playground/apps/comment/comment-input.ts
index 93e933661e..23336add7e 100644
--- a/blocksuite/playground/apps/comment/comment-input.ts
+++ b/blocksuite/playground/apps/comment/comment-input.ts
@@ -1,6 +1,6 @@
import { ShadowlessElement, TextSelection } from '@blocksuite/block-std';
import type { RichText } from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import * as Y from 'yjs';
diff --git a/blocksuite/playground/apps/comment/comment-panel.ts b/blocksuite/playground/apps/comment/comment-panel.ts
index 614f77eb64..3acb2be607 100644
--- a/blocksuite/playground/apps/comment/comment-panel.ts
+++ b/blocksuite/playground/apps/comment/comment-panel.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement, TextSelection } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { TestAffineEditorContainer } from '@blocksuite/integration-test';
import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts
index 19f45a63d7..2b1a562a8d 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts
@@ -1,5 +1,5 @@
import type { EditorHost } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import {
ArrowDownBigIcon as ArrowDownIcon,
ArrowUpBigIcon as ArrowUpIcon,
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/chat-text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/chat-text.ts
index 613fe8fd87..aab230305b 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/chat-text.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/chat-text.ts
@@ -3,7 +3,7 @@ import './action-wrapper';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
import type { SpecBuilder } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts
index cb6cca8a9e..f259797e4e 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts
@@ -2,7 +2,7 @@ import './action-wrapper';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts
index 097acf0950..40e73db4d9 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts
@@ -2,7 +2,7 @@ import './action-wrapper';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts
index c64ab750f7..6081a626f6 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts
@@ -2,7 +2,7 @@ import './action-wrapper';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts
index d4c5751927..87df531b77 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts
@@ -2,7 +2,7 @@ import './action-wrapper';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts
index b50920a47a..7925c3da18 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts
@@ -3,7 +3,7 @@ import '../../messages/slides-renderer';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts
index e538547576..46cc8bc8ff 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts
@@ -1,7 +1,7 @@
import './action-wrapper';
import type { EditorHost } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/ai-loading.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/ai-loading.ts
index a15096a3f7..93a8d3ef29 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/ai-loading.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/ai-loading.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts
index 877e141ee7..2a897aef02 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts
@@ -3,7 +3,7 @@ import {
ShadowlessElement,
} from '@blocksuite/affine/block-std';
import { createLitPortal } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { PlusIcon } from '@blocksuite/icons/lit';
import { flip, offset } from '@floating-ui/dom';
import { css, html, nothing, type PropertyValues } from 'lit';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts
index 2cfd196381..25a57b56fc 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts
@@ -1,7 +1,7 @@
import { stopPropagation } from '@affine/core/utils';
import type { EditorHost } from '@blocksuite/affine/block-std';
import { openFileOrFiles, unsafeCSSVarV2 } from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import {
BroomIcon,
CloseIcon,
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts
index 931985bd09..2a348bcb01 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts
@@ -6,7 +6,7 @@ import {
isInsidePageEditor,
type SpecBuilder,
} from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import type { BaseSelection } from '@blocksuite/affine/store';
import {
AiIcon,
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts
index ec7373871f..a0e75684ef 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts
@@ -3,7 +3,7 @@ import {
type LinkedMenuGroup,
scrollbarStyle,
} from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { SearchIcon } from '@blocksuite/icons/lit';
import type { DocMeta } from '@blocksuite/store';
import { css, html } from 'lit';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts
index 7c4c9de3ca..1820329126 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts
@@ -1,5 +1,5 @@
import { ShadowlessElement } from '@blocksuite/affine/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { CloseIcon } from '@blocksuite/icons/lit';
import { css, html, type TemplateResult } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts
index a6994e2800..340ae61908 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts
@@ -2,7 +2,7 @@ import {
type EditorHost,
ShadowlessElement,
} from '@blocksuite/affine/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { Signal } from '@preact/signals-core';
import { html, type PropertyValues } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts
index ca19def1c0..b23324e7fe 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts
@@ -1,6 +1,6 @@
import { ShadowlessElement } from '@blocksuite/affine/block-std';
import { getAttachmentFileIcon } from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts
index aa69eaa94d..c6e83df8c4 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts
@@ -7,7 +7,7 @@ import {
NotificationProvider,
type SpecBuilder,
} from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import type { Store } from '@blocksuite/affine/store';
import { HelpIcon, InformationIcon } from '@blocksuite/icons/lit';
import { type Signal, signal } from '@preact/signals-core';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts
index bfc7807a66..0a23485dc5 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts
@@ -4,7 +4,7 @@ import {
requiredProperties,
} from '@blocksuite/affine/block-std';
import { createLitPortal } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { flip, offset } from '@floating-ui/dom';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts
index eb8eb7e63a..061880f19e 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts
@@ -4,7 +4,7 @@ import {
requiredProperties,
} from '@blocksuite/affine/block-std';
import { ArrowRightIcon, EnterIcon } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts
index 487969929e..ab489a28ce 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts
@@ -4,7 +4,7 @@ import {
requiredProperties,
} from '@blocksuite/affine/block-std';
import { EnterIcon } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts
index 29efed7c82..688f91415f 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts
@@ -3,7 +3,7 @@ import {
ShadowlessElement,
} from '@blocksuite/affine/block-std';
import { scrollbarStyle } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import type { PropertyValues } from 'lit';
import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts
index f4a6964a72..00e217d9d8 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts
@@ -2,7 +2,7 @@ import './ask-ai-panel';
import { type EditorHost } from '@blocksuite/affine/block-std';
import { createLitPortal, HoverController } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { flip, offset } from '@floating-ui/dom';
import { css, html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-icon.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-icon.ts
index 7ba0878505..90f20d76fa 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-icon.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-icon.ts
@@ -1,5 +1,5 @@
import { AIStarIcon } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts
index 33ef20e6a1..d46d178f5b 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts
@@ -1,6 +1,6 @@
import { type EditorHost } from '@blocksuite/affine/block-std';
import { DocModeProvider, scrollbarStyle } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { cssVar } from '@toeverything/theme';
import { css, html, LitElement, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts
index dcb5c9776e..41a9021eb4 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts
@@ -4,7 +4,7 @@ import {
TextSelection,
} from '@blocksuite/affine/block-std';
import { createLitPortal } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { flip, offset } from '@floating-ui/dom';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts b/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts
index 6250386b61..33dddc7211 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts
@@ -9,7 +9,8 @@ import {
Tooltip,
unsafeCSSVarV2,
} from '@blocksuite/affine/blocks';
-import { noop, WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
+import { noop } from '@blocksuite/affine/global/utils';
import { CopyIcon, MoreHorizontalIcon, ResetIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts
index f25995803c..be347f3ec7 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts
@@ -14,7 +14,7 @@ import {
PageEditorBlockSpecs,
} from '@blocksuite/affine/blocks';
import { Container, type ServiceProvider } from '@blocksuite/affine/global/di';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import type {
ExtensionType,
Query,
diff --git a/packages/frontend/core/src/blocksuite/ai/messages/error.ts b/packages/frontend/core/src/blocksuite/ai/messages/error.ts
index dfb631940f..ee5c59812d 100644
--- a/packages/frontend/core/src/blocksuite/ai/messages/error.ts
+++ b/packages/frontend/core/src/blocksuite/ai/messages/error.ts
@@ -1,6 +1,6 @@
import { type EditorHost } from '@blocksuite/affine/block-std';
import { scrollbarStyle, unsafeCSSVarV2 } from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { InformationIcon, ToggleDownIcon } from '@blocksuite/icons/lit';
import { signal } from '@preact/signals-core';
import { baseTheme } from '@toeverything/theme';
diff --git a/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts b/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts
index 95549e3eb3..3dbc030eeb 100644
--- a/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts
+++ b/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts
@@ -1,7 +1,7 @@
import { WorkspaceImpl } from '@affine/core/modules/workspace/impls/workspace';
import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std';
import { SpecProvider } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import type { Store } from '@blocksuite/affine/store';
import { css, html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts
index e535d31e47..f3260f008a 100644
--- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts
+++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts
@@ -11,7 +11,7 @@ import {
type SurfaceBlockModel,
} from '@blocksuite/affine/blocks';
import type { ServiceProvider } from '@blocksuite/affine/global/di';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { Schema, type Store } from '@blocksuite/affine/store';
import { css, html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts
index c2304d3519..5e8259057c 100644
--- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts
+++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts
@@ -1,6 +1,6 @@
import { BlockService } from '@blocksuite/affine/block-std';
import { RootBlockSchema } from '@blocksuite/affine/blocks';
-import { Slot } from '@blocksuite/affine/global/utils';
+import { Slot } from '@blocksuite/affine/global/slot';
export class MindmapService extends BlockService {
static override readonly flavour = RootBlockSchema.model.flavour;
diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts
index ba8e1bf1ed..f304b1ad88 100644
--- a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts
+++ b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts
@@ -1,6 +1,6 @@
import type { EditorHost } from '@blocksuite/affine/block-std';
import { openFileOrFiles, unsafeCSSVarV2 } from '@blocksuite/affine/blocks';
-import { SignalWatcher } from '@blocksuite/affine/global/utils';
+import { SignalWatcher } from '@blocksuite/affine/global/lit';
import { BroomIcon, ImageIcon, PublishIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts b/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts
index a051f2b488..7ff4bc9764 100644
--- a/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts
+++ b/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts
@@ -1,5 +1,5 @@
import type { EditorHost } from '@blocksuite/affine/block-std';
-import { Slot } from '@blocksuite/affine/global/utils';
+import { Slot } from '@blocksuite/affine/global/slot';
import { captureException } from '@sentry/react';
import type { ChatContextValue } from '../chat-panel/chat-context';
diff --git a/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts b/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts
index 257475409d..f07b5827f5 100644
--- a/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts
+++ b/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts
@@ -10,7 +10,7 @@ import {
Bound,
getCommonBoundWithRotation,
} from '@blocksuite/affine/global/gfx';
-import { Slot } from '@blocksuite/affine/global/utils';
+import { Slot } from '@blocksuite/affine/global/slot';
import {
AFFINE_AI_PANEL_WIDGET,
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/divider.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/divider.ts
index d02ab9c95f..e85616add2 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/divider.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/divider.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement } from 'lit';
export class AIPanelDivider extends WithDisposable(LitElement) {
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts
index 83e1ece913..88e1ab8931 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts
@@ -5,7 +5,7 @@ import {
NotificationProvider,
WarningIcon,
} from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts
index a6df565f67..e31287a7bd 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts
@@ -4,7 +4,7 @@ import {
LightLoadingIcon,
unsafeCSSVar,
} from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { baseTheme } from '@toeverything/theme';
import {
css,
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts
index e673fa6344..228586657e 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts
@@ -1,5 +1,5 @@
import type { EditorHost } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts
index 2d9bf37559..4702173ddd 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts
@@ -1,5 +1,5 @@
import type { EditorHost } from '@blocksuite/affine/block-std';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts
index 7e855ef5b0..e4701fe54e 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts
@@ -1,6 +1,6 @@
import type { ColorScheme } from '@blocksuite/affine/blocks';
import { AIStarIconWithAnimation, AIStopIcon } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { baseTheme } from '@toeverything/theme';
import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/input.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/input.ts
index a66c7fd0d6..88088d5aae 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/input.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/input.ts
@@ -3,7 +3,7 @@ import {
stopPropagation,
unsafeCSSVarV2,
} from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { PublishIcon, SendIcon } from '@blocksuite/icons/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts
index 099483bd26..b2103220c5 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts
@@ -1,6 +1,6 @@
import type { EditorHost } from '@blocksuite/affine/block-std';
import { on, scrollbarStyle, stopPropagation } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts
index 2e9d5a9a1f..519b87d38e 100644
--- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts
+++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts
@@ -4,7 +4,7 @@ import {
isGfxGroupCompatibleModel,
} from '@blocksuite/affine/block-std/gfx';
import { AIStarIcon, sortEdgelessElements } from '@blocksuite/affine/blocks';
-import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/lit';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx
index 029a39cf1c..08089bb429 100644
--- a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx
+++ b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx
@@ -11,7 +11,7 @@ import {
ImageProxyService,
LinkPreviewerService,
} from '@blocksuite/affine/blocks';
-import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { DisposableGroup } from '@blocksuite/affine/global/slot';
import type { Store } from '@blocksuite/affine/store';
import { Slot } from '@radix-ui/react-slot';
import { useLiveData, useService } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts b/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts
index 976bcb640b..5b9b5b50e9 100644
--- a/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts
+++ b/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts
@@ -3,7 +3,7 @@ import {
EdgelessEditorBlockSpecs,
ThemeProvider,
} from '@blocksuite/affine/blocks';
-import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import type { Store } from '@blocksuite/affine/store';
import { css, html, nothing, type TemplateResult } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/editors/page-editor.ts b/packages/frontend/core/src/blocksuite/editors/page-editor.ts
index d49c712ef1..d20cf21090 100644
--- a/packages/frontend/core/src/blocksuite/editors/page-editor.ts
+++ b/packages/frontend/core/src/blocksuite/editors/page-editor.ts
@@ -4,11 +4,8 @@ import {
ShadowlessElement,
} from '@blocksuite/affine/block-std';
import { PageEditorBlockSpecs, ThemeProvider } from '@blocksuite/affine/blocks';
-import {
- noop,
- SignalWatcher,
- WithDisposable,
-} from '@blocksuite/affine/global/utils';
+import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
+import { noop } from '@blocksuite/affine/global/utils';
import type { Store } from '@blocksuite/affine/store';
import { css, html, nothing } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts
index a5e034585c..da593cb029 100644
--- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts
+++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts
@@ -26,7 +26,7 @@ import type {
Container,
ServiceIdentifier,
} from '@blocksuite/affine/global/di';
-import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { DisposableGroup } from '@blocksuite/affine/global/slot';
import type { ExtensionType } from '@blocksuite/affine/store';
import { batch, signal } from '@preact/signals-core';
import type { FrameworkProvider } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts
index 7817da7fd9..5713d504cf 100644
--- a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts
+++ b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts
@@ -1,5 +1,5 @@
import { DebugLogger } from '@affine/debug';
-import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { DisposableGroup } from '@blocksuite/affine/global/slot';
import type { Store, Workspace } from '@blocksuite/affine/store';
import { useEffect, useState } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts b/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
index 753bc073b5..aa23c32e4f 100644
--- a/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
+++ b/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
@@ -1,5 +1,5 @@
import { DebugLogger } from '@affine/debug';
-import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { DisposableGroup } from '@blocksuite/affine/global/slot';
import type { Store, Workspace } from '@blocksuite/affine/store';
import { useEffect, useState } from 'react';
diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
index 02463469d8..ebc8c8efac 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
@@ -22,7 +22,7 @@ import { RefNodeSlotsProvider } from '@blocksuite/affine/blocks';
import {
type Disposable,
DisposableGroup,
-} from '@blocksuite/affine/global/utils';
+} from '@blocksuite/affine/global/slot';
import {
AiIcon,
FrameIcon,
diff --git a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx
index 61929d9d76..fe253df018 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx
@@ -26,7 +26,7 @@ import {
DocModes,
RefNodeSlotsProvider,
} from '@blocksuite/affine/blocks';
-import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { DisposableGroup } from '@blocksuite/affine/global/slot';
import { Logo1Icon } from '@blocksuite/icons/rc';
import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
import clsx from 'clsx';
diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
index 016f782823..adf2afef6d 100644
--- a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
@@ -28,7 +28,7 @@ import {
LinkPreviewerService,
RefNodeSlotsProvider,
} from '@blocksuite/affine/blocks';
-import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { DisposableGroup } from '@blocksuite/affine/global/slot';
import {
FrameworkScope,
useLiveData,
diff --git a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx
index b6f2189362..3b5763626b 100644
--- a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx
+++ b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx
@@ -14,7 +14,7 @@ import { Bound } from '@blocksuite/affine/global/gfx';
import {
type Disposable,
DisposableGroup,
-} from '@blocksuite/affine/global/utils';
+} from '@blocksuite/affine/global/slot';
import {
FrameworkScope,
useLiveData,
diff --git a/packages/frontend/core/src/modules/workspace/impls/doc.ts b/packages/frontend/core/src/modules/workspace/impls/doc.ts
index f042f7bf18..fd4b2ee4ec 100644
--- a/packages/frontend/core/src/modules/workspace/impls/doc.ts
+++ b/packages/frontend/core/src/modules/workspace/impls/doc.ts
@@ -1,5 +1,5 @@
import { SpecProvider } from '@blocksuite/affine/blocks';
-import { Slot } from '@blocksuite/affine/global/utils';
+import { Slot } from '@blocksuite/affine/global/slot';
import {
AwarenessStore,
type Doc,
diff --git a/packages/frontend/core/src/modules/workspace/impls/meta.ts b/packages/frontend/core/src/modules/workspace/impls/meta.ts
index e0c9ed3dff..fd0b48857d 100644
--- a/packages/frontend/core/src/modules/workspace/impls/meta.ts
+++ b/packages/frontend/core/src/modules/workspace/impls/meta.ts
@@ -1,4 +1,4 @@
-import { Slot } from '@blocksuite/affine/global/utils';
+import { Slot } from '@blocksuite/affine/global/slot';
import {
createYProxy,
type DocMeta,
diff --git a/packages/frontend/core/src/modules/workspace/impls/workspace.ts b/packages/frontend/core/src/modules/workspace/impls/workspace.ts
index 650d3b1885..44e285ca53 100644
--- a/packages/frontend/core/src/modules/workspace/impls/workspace.ts
+++ b/packages/frontend/core/src/modules/workspace/impls/workspace.ts
@@ -2,7 +2,8 @@ import {
BlockSuiteError,
ErrorCode,
} from '@blocksuite/affine/global/exceptions';
-import { NoopLogger, Slot } from '@blocksuite/affine/global/utils';
+import { Slot } from '@blocksuite/affine/global/slot';
+import { NoopLogger } from '@blocksuite/affine/global/utils';
import {
type CreateBlocksOptions,
type Doc,