diff --git a/apps/electron/src/renderer/components/CanvasView.tsx b/apps/electron/src/renderer/components/CanvasView.tsx
index a2e1b70f5..ea2a0fe0a 100644
--- a/apps/electron/src/renderer/components/CanvasView.tsx
+++ b/apps/electron/src/renderer/components/CanvasView.tsx
@@ -6,8 +6,7 @@ import type { CanvasHandle, CanvasNode, Rect } from '@xnetjs/canvas'
 import { Canvas, createNode } from '@xnetjs/canvas'
 import { CanvasSchema } from '@xnetjs/data'
 import { useNode, useIdentity } from '@xnetjs/react'
-import { IconButton } from '@xnetjs/ui'
-import { Compass, Database, FileText, Maximize2, StickyNote } from 'lucide-react'
+import { Database, FileText, StickyNote } from 'lucide-react'
 import React, {
   forwardRef,
   useCallback,
@@ -19,6 +18,8 @@ import React, {
 } from 'react'
 import {
   createCanvasShellNoteProperties,
+  getCanvasShellNotePlacement,
+  getLinkedDocumentPlacement,
   isCanvasShellNote,
   shouldRenderCanvasShellCard,
   type LinkedDocType,
@@ -154,12 +155,7 @@ export const CanvasView = forwardRef<CanvasViewHandle, CanvasViewProps>(function
     const nodesMap = doc.getMap<CanvasNode>('nodes')
     const noteNode = createNode(
       'card',
-      {
-        x: viewport.x - 160,
-        y: viewport.y - 100,
-        width: 320,
-        height: 180
-      },
+      getCanvasShellNotePlacement(viewport),
       createCanvasShellNoteProperties()
     )
 
@@ -172,19 +168,10 @@ export const CanvasView = forwardRef<CanvasViewHandle, CanvasViewProps>(function
 
       const viewport = canvasRef.current.getViewportSnapshot()
       const nodesMap = doc.getMap<CanvasNode>('nodes')
-      const linkedNode = createNode(
-        'embed',
-        {
-          x: viewport.x - (document.type === 'database' ? 220 : 180),
-          y: viewport.y - 120,
-          width: document.type === 'database' ? 440 : 360,
-          height: document.type === 'database' ? 260 : 220
-        },
-        {
-          title: document.title,
-          linkedType: document.type
-        }
-      )
+      const linkedNode = createNode('embed', getLinkedDocumentPlacement(viewport, document.type), {
+        title: document.title,
+        linkedType: document.type
+      })
       linkedNode.linkedNodeId = document.id
       nodesMap.set(linkedNode.id, linkedNode)
     },
@@ -257,25 +244,6 @@ export const CanvasView = forwardRef<CanvasViewHandle, CanvasViewProps>(function
         </div>
       ) : null}
 
-      <div className="pointer-events-none absolute bottom-24 right-6 z-20 flex items-center gap-2">
-        <div className="pointer-events-auto rounded-[24px] border border-border/70 bg-background/80 p-2 shadow-xl backdrop-blur-xl">
-          <IconButton
-            icon={<Maximize2 size={16} />}
-            label="Fit canvas to content"
-            onClick={() => canvasRef.current?.fitToContent(80)}
-            className="h-10 w-10 rounded-2xl"
-          />
-        </div>
-        <div className="pointer-events-auto rounded-[24px] border border-border/70 bg-background/80 p-2 shadow-xl backdrop-blur-xl">
-          <IconButton
-            icon={<Compass size={16} />}
-            label="Reset canvas view"
-            onClick={() => canvasRef.current?.resetView()}
-            className="h-10 w-10 rounded-2xl"
-          />
-        </div>
-      </div>
-
       <div className="h-full">
         <Canvas
           ref={canvasRef}
@@ -287,6 +255,18 @@ export const CanvasView = forwardRef<CanvasViewHandle, CanvasViewProps>(function
             minZoom: 0.1,
             maxZoom: 4
           }}
+          showNavigationTools
+          navigationToolsPosition="bottom-right"
+          navigationToolsShowZoomLabel={false}
+          navigationToolsStyle={{
+            bottom: 24,
+            right: 24,
+            borderRadius: 24,
+            background: 'rgba(255, 255, 255, 0.8)',
+            backdropFilter: 'blur(16px)',
+            boxShadow: '0 18px 38px rgba(15, 23, 42, 0.12)',
+            border: '1px solid rgba(148, 163, 184, 0.28)'
+          }}
           renderNode={(node) => {
             const linkedDocument = node.linkedNodeId
               ? documentMap.get(node.linkedNodeId)
diff --git a/apps/electron/src/renderer/components/DatabaseView.test.tsx b/apps/electron/src/renderer/components/DatabaseView.test.tsx
new file mode 100644
index 000000000..415237f98
--- /dev/null
+++ b/apps/electron/src/renderer/components/DatabaseView.test.tsx
@@ -0,0 +1,233 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import { fireEvent, render, screen } from '@testing-library/react'
+import React from 'react'
+import { describe, beforeEach, expect, it, vi } from 'vitest'
+import * as Y from 'yjs'
+import { DatabaseView } from './DatabaseView'
+
+const mockUpdate = vi.fn()
+const mockCreate = vi.fn()
+
+const mockUseNode = vi.fn()
+const mockUseIdentity = vi.fn()
+const mockUseMutate = vi.fn()
+const mockUseQuery = vi.fn()
+const mockUseDatabaseComments = vi.fn()
+
+vi.mock('@xnetjs/data', () => ({
+  DatabaseSchema: {
+    schema: {
+      '@id': 'xnet://schema/database'
+    }
+  },
+  decodeAnchor: vi.fn(() => ({})),
+  buildDatabaseSchema: vi.fn((docId: string) => ({
+    '@id': `xnet://schema/${docId}`
+  })),
+  createInitialSchemaMetadata: vi.fn((name: string) => ({
+    version: 1,
+    name,
+    createdAt: 0,
+    updatedAt: 0,
+    history: []
+  })),
+  bumpSchemaVersion: vi.fn((metadata: { version: number }) => ({
+    ...metadata,
+    version: metadata.version + 1
+  })),
+  getVersionBumpType: vi.fn(() => 'minor'),
+  cloneSchema: vi.fn((columns: unknown[]) => columns),
+  createVersionEntry: vi.fn(() => ({
+    version: 1,
+    timestamp: 0,
+    changes: []
+  })),
+  pruneVersionHistory: vi.fn((history: unknown[]) => history)
+}))
+
+vi.mock('@xnetjs/react', () => ({
+  useNode: (...args: unknown[]) => mockUseNode(...args),
+  useIdentity: (...args: unknown[]) => mockUseIdentity(...args),
+  useMutate: (...args: unknown[]) => mockUseMutate(...args),
+  useQuery: (...args: unknown[]) => mockUseQuery(...args)
+}))
+
+vi.mock('@xnetjs/views', () => ({
+  TableView: () => <div data-testid="table-view">table view</div>,
+  BoardView: () => <div data-testid="board-view">board view</div>,
+  CardDetailModal: () => null,
+  AddColumnModal: () => null,
+  SchemaInfoModal: () => null,
+  CloneSchemaModal: () => null,
+  useDatabaseComments: (...args: unknown[]) => mockUseDatabaseComments(...args)
+}))
+
+vi.mock('@xnetjs/ui', async () => {
+  const ReactModule = await import('react')
+
+  function Menu({
+    trigger,
+    children
+  }: {
+    trigger: React.ReactNode
+    children: React.ReactNode
+  }): React.ReactElement {
+    const [open, setOpen] = ReactModule.useState(false)
+
+    if (!ReactModule.isValidElement(trigger)) {
+      return <div>{children}</div>
+    }
+
+    return (
+      <div>
+        {ReactModule.cloneElement(trigger, {
+          onClick: () => setOpen((prev) => !prev)
+        })}
+        {open ? <div data-testid="mock-menu">{children}</div> : null}
+      </div>
+    )
+  }
+
+  return {
+    CommentPopover: () => null,
+    CommentsSidebar: ({ open }: { open: boolean }) => (
+      <div data-testid="comments-sidebar">{open ? 'open' : 'closed'}</div>
+    ),
+    Menu,
+    MenuItem: ({ children, onSelect }: { children: React.ReactNode; onSelect?: () => void }) => (
+      <button type="button" onClick={onSelect}>
+        {children}
+      </button>
+    ),
+    MenuLabel: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+    MenuSeparator: () => <hr />
+  }
+})
+
+vi.mock('./ShareButton', () => ({
+  ShareButton: ({ docId }: { docId: string }) => (
+    <button type="button" data-testid="share-button">
+      Share {docId}
+    </button>
+  )
+}))
+
+vi.mock('./PresenceAvatars', () => ({
+  PresenceAvatars: () => <div data-testid="presence-avatars">presence</div>
+}))
+
+function createAwarenessMock() {
+  return {
+    clientID: 1,
+    getStates: () => new Map<number, Record<string, unknown>>(),
+    setLocalStateField: vi.fn(),
+    on: vi.fn(),
+    off: vi.fn()
+  }
+}
+
+function createDatabaseDoc(): Y.Doc {
+  const doc = new Y.Doc()
+  const dataMap = doc.getMap('data')
+
+  dataMap.set('columns', [
+    {
+      id: 'title',
+      name: 'Title',
+      type: 'text'
+    },
+    {
+      id: 'status',
+      name: 'Status',
+      type: 'select',
+      options: ['Todo', 'Done']
+    }
+  ])
+  dataMap.set('rows', [
+    {
+      id: 'row-1',
+      values: {
+        title: 'First row',
+        status: 'Todo'
+      }
+    }
+  ])
+  dataMap.set('schema', {
+    version: 1,
+    name: 'Focus DB',
+    createdAt: 0,
+    updatedAt: 0,
+    history: []
+  })
+
+  return doc
+}
+
+describe('DatabaseView minimal chrome', () => {
+  beforeEach(() => {
+    mockUpdate.mockReset()
+    mockCreate.mockReset()
+
+    mockUseIdentity.mockReturnValue({ did: 'did:xnet:test' })
+    mockUseMutate.mockReturnValue({ create: mockCreate })
+    mockUseQuery.mockReturnValue({ data: [] })
+    mockUseDatabaseComments.mockReturnValue({
+      threads: [],
+      cellCommentCounts: new Map(),
+      unresolvedCount: 2,
+      commentOnCell: vi.fn(),
+      getThreadsForCell: vi.fn(() => []),
+      replyTo: vi.fn(),
+      resolveThread: vi.fn(),
+      reopenThread: vi.fn(),
+      deleteComment: vi.fn(),
+      editComment: vi.fn()
+    })
+    mockUseNode.mockReturnValue({
+      data: { title: 'Focus DB' },
+      doc: createDatabaseDoc(),
+      loading: false,
+      update: mockUpdate,
+      presence: [{ did: 'did:xnet:peer', color: '#22c55e' }],
+      awareness: createAwarenessMock()
+    })
+  })
+
+  it('renders the compact focus controls and moves sharing into the overflow menu', async () => {
+    render(<DatabaseView docId="db-1" minimalChrome />)
+
+    expect(await screen.findByDisplayValue('Focus DB')).toBeTruthy()
+    expect(screen.getByTestId('presence-avatars')).toBeTruthy()
+    expect(screen.getByRole('button', { name: /add row/i })).toBeTruthy()
+    expect(screen.getByRole('button', { name: /comments/i })).toBeTruthy()
+    expect(screen.getByRole('button', { name: /open database actions/i })).toBeTruthy()
+    expect(screen.queryByTestId('share-button')).toBeNull()
+
+    fireEvent.click(screen.getByRole('button', { name: /open database actions/i }))
+
+    expect(screen.getByText('Schema info')).toBeTruthy()
+    expect(screen.getByText('Clone schema')).toBeTruthy()
+    expect(screen.getByTestId('share-button')).toBeTruthy()
+  })
+
+  it('keeps comments accessible from the compact toolbar', async () => {
+    render(<DatabaseView docId="db-1" minimalChrome />)
+
+    expect((await screen.findByTestId('comments-sidebar')).textContent).toContain('closed')
+
+    fireEvent.click(screen.getByRole('button', { name: /comments/i }))
+
+    expect(screen.getByTestId('comments-sidebar').textContent).toContain('open')
+  })
+
+  it('preserves the richer header outside focused mode', async () => {
+    render(<DatabaseView docId="db-1" />)
+
+    expect(await screen.findByDisplayValue('Focus DB')).toBeTruthy()
+    expect(screen.getByTestId('share-button')).toBeTruthy()
+    expect(screen.queryByRole('button', { name: /open database actions/i })).toBeNull()
+  })
+})
diff --git a/apps/electron/src/renderer/components/DatabaseView.tsx b/apps/electron/src/renderer/components/DatabaseView.tsx
index 50ff187bc..efc8973de 100644
--- a/apps/electron/src/renderer/components/DatabaseView.tsx
+++ b/apps/electron/src/renderer/components/DatabaseView.tsx
@@ -28,7 +28,15 @@ import {
   type SchemaVersionEntry
 } from '@xnetjs/data'
 import { useNode, useIdentity, useMutate, useQuery } from '@xnetjs/react'
-import { CommentPopover, CommentsSidebar, type CommentThreadData } from '@xnetjs/ui'
+import {
+  CommentPopover,
+  CommentsSidebar,
+  Menu,
+  MenuItem,
+  MenuLabel,
+  MenuSeparator,
+  type CommentThreadData
+} from '@xnetjs/ui'
 import {
   TableView,
   BoardView,
@@ -40,10 +48,9 @@ import {
   type ViewConfig,
   type TableRow,
   type CellPresence,
-  type ColumnUpdate,
   type NewColumnDefinition
 } from '@xnetjs/views'
-import { Table, LayoutGrid, Plus, Info, Copy } from 'lucide-react'
+import { Table, LayoutGrid, Plus, Info, Copy, Ellipsis, MessageSquare } from 'lucide-react'
 import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react'
 import * as Y from 'yjs'
 import { PresenceAvatars } from './PresenceAvatars'
@@ -117,6 +124,118 @@ function buildDefaultBoardView(columns: StoredColumn[]): ViewConfig {
   }
 }
 
+function DatabaseViewModeToggle({
+  viewMode,
+  onChange,
+  compact = false
+}: {
+  viewMode: ViewMode
+  onChange: (mode: ViewMode) => void
+  compact?: boolean
+}): React.ReactElement {
+  return (
+    <div
+      className={[
+        'flex items-center rounded-full bg-accent/80',
+        compact ? 'p-0.5' : 'rounded-md p-1'
+      ].join(' ')}
+    >
+      <button
+        type="button"
+        onClick={() => onChange('table')}
+        className={[
+          'flex items-center gap-1 rounded-full transition-colors',
+          compact ? 'px-2.5 py-1 text-xs' : 'px-2 py-1 text-sm',
+          viewMode === 'table'
+            ? 'bg-background text-foreground shadow-sm'
+            : 'text-muted-foreground hover:text-foreground'
+        ].join(' ')}
+        aria-pressed={viewMode === 'table'}
+      >
+        <Table size={14} />
+        <span>Table</span>
+      </button>
+
+      <button
+        type="button"
+        onClick={() => onChange('board')}
+        className={[
+          'flex items-center gap-1 rounded-full transition-colors',
+          compact ? 'px-2.5 py-1 text-xs' : 'px-2 py-1 text-sm',
+          viewMode === 'board'
+            ? 'bg-background text-foreground shadow-sm'
+            : 'text-muted-foreground hover:text-foreground'
+        ].join(' ')}
+        aria-pressed={viewMode === 'board'}
+      >
+        <LayoutGrid size={14} />
+        <span>Board</span>
+      </button>
+    </div>
+  )
+}
+
+function DatabaseOverflowMenu({
+  docId,
+  columnsCount,
+  rowsCount,
+  schemaMetadata,
+  onOpenSchemaInfo,
+  onOpenCloneSchema
+}: {
+  docId: string
+  columnsCount: number
+  rowsCount: number
+  schemaMetadata: DatabaseSchemaMetadata | null
+  onOpenSchemaInfo: () => void
+  onOpenCloneSchema: () => void
+}): React.ReactElement {
+  return (
+    <Menu
+      trigger={
+        <button
+          type="button"
+          aria-label="Open database actions"
+          className="flex h-10 w-10 items-center justify-center rounded-full border border-border/70 bg-background/80 text-muted-foreground shadow-sm transition-colors hover:bg-accent hover:text-foreground"
+        >
+          <Ellipsis size={16} />
+        </button>
+      }
+      align="end"
+      sideOffset={8}
+      className="min-w-[240px]"
+    >
+      <MenuLabel>Database</MenuLabel>
+      {schemaMetadata && (
+        <MenuItem onSelect={onOpenSchemaInfo}>
+          <span className="flex w-full items-center gap-2">
+            <Info size={14} />
+            <span className="flex-1">Schema info</span>
+            <span className="text-xs font-mono text-muted-foreground">
+              v{schemaMetadata.version}
+            </span>
+          </span>
+        </MenuItem>
+      )}
+      {columnsCount > 0 && (
+        <MenuItem onSelect={onOpenCloneSchema}>
+          <span className="flex w-full items-center gap-2">
+            <Copy size={14} />
+            <span className="flex-1">Clone schema</span>
+            <span className="text-xs text-muted-foreground">{rowsCount} rows</span>
+          </span>
+        </MenuItem>
+      )}
+
+      <MenuSeparator />
+      <MenuLabel>Share</MenuLabel>
+      <div className="px-1 py-1">
+        <ShareButton docId={docId} docType="database" />
+      </div>
+    </Menu>
+  )
+}
+
 export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps) {
   const { did } = useIdentity()
 
@@ -1387,6 +1506,11 @@ export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps
     setSelectedCardId(null)
   }, [])
 
+  const minimalCommentCountLabel =
+    commentUnresolvedCount > 0
+      ? `${commentUnresolvedCount} unresolved comment${commentUnresolvedCount !== 1 ? 's' : ''}`
+      : 'Open comments'
+
   if (loading || !doc) {
     return (
       <div className="flex items-center justify-center h-full">
@@ -1400,17 +1524,63 @@ export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps
     return (
       <div ref={containerRef} className="flex-1 flex flex-col overflow-hidden">
         {/* Toolbar */}
-        <div className="flex items-center gap-2 p-3 border-b border-border bg-secondary">
+        <div
+          className={[
+            'flex items-center gap-2 border-b border-border',
+            minimalChrome ? 'bg-background/80 px-5 py-3 backdrop-blur-xl' : 'bg-secondary p-3'
+          ].join(' ')}
+        >
           <input
             type="text"
-            className="text-lg font-semibold border-none bg-transparent text-foreground outline-none placeholder:text-muted-foreground"
+            className={[
+              'border-none bg-transparent text-foreground outline-none placeholder:text-muted-foreground',
+              minimalChrome ? 'text-base font-semibold' : 'text-lg font-semibold'
+            ].join(' ')}
             value={database?.title || ''}
             onChange={(e) => update({ title: e.target.value })}
             placeholder="Untitled"
           />
-          <PresenceAvatars presence={presence} localDid={did} />
+
+          {minimalChrome ? (
+            presence.length > 0 ? (
+              <div className="scale-90">
+                <PresenceAvatars presence={presence} localDid={did} />
+              </div>
+            ) : null
+          ) : (
+            <PresenceAvatars presence={presence} localDid={did} />
+          )}
+
           <div className="flex-1" />
-          <ShareButton docId={docId} docType="database" />
+
+          {minimalChrome ? (
+            <>
+              <button
+                type="button"
+                onClick={() => setSidebarOpen((prev) => !prev)}
+                className="flex items-center gap-2 rounded-full border border-border/70 bg-background/80 px-3 py-2 text-sm text-muted-foreground shadow-sm transition-colors hover:bg-accent hover:text-foreground"
+                title={minimalCommentCountLabel}
+              >
+                <MessageSquare size={14} />
+                <span>Comments</span>
+                {commentUnresolvedCount > 0 && (
+                  <span className="rounded-full bg-amber-500/15 px-1.5 py-0.5 text-xs text-amber-600">
+                    {commentUnresolvedCount}
+                  </span>
+                )}
+              </button>
+              <DatabaseOverflowMenu
+                docId={docId}
+                columnsCount={columns.length}
+                rowsCount={rows.length}
+                schemaMetadata={schemaMetadata}
+                onOpenSchemaInfo={() => setSchemaInfoModalOpen(true)}
+                onOpenCloneSchema={() => setCloneSchemaModalOpen(true)}
+              />
+            </>
+          ) : (
+            <ShareButton docId={docId} docType="database" />
+          )}
         </div>
 
         {/* Empty state */}
@@ -1449,9 +1619,16 @@ export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps
           placeholder="Untitled"
         />
 
-        {!minimalChrome && <PresenceAvatars presence={presence} localDid={did} />}
+        {minimalChrome ? (
+          presence.length > 0 ? (
+            <div className="scale-90">
+              <PresenceAvatars presence={presence} localDid={did} />
+            </div>
+          ) : null
+        ) : (
+          <PresenceAvatars presence={presence} localDid={did} />
+        )}
 
-        {/* Schema version badge */}
         {!minimalChrome && schemaMetadata && (
           <button
             className="flex items-center gap-1 px-2 py-0.5 text-xs font-mono text-muted-foreground hover:text-foreground bg-accent rounded transition-colors cursor-pointer"
@@ -1463,7 +1640,6 @@ export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps
           </button>
         )}
 
-        {/* Clone button */}
         {!minimalChrome && columns.length > 0 && (
           <button
             className="flex items-center gap-1 px-2 py-0.5 text-xs text-muted-foreground hover:text-foreground bg-accent rounded transition-colors cursor-pointer"
@@ -1478,7 +1654,7 @@ export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps
         {!minimalChrome && commentUnresolvedCount > 0 && (
           <button
             className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors cursor-pointer"
-            title={`${commentUnresolvedCount} unresolved comment${commentUnresolvedCount !== 1 ? 's' : ''}`}
+            title={minimalCommentCountLabel}
             onClick={() => setSidebarOpen((prev) => !prev)}
           >
             <span className="text-amber-500">{commentUnresolvedCount}</span>
@@ -1488,41 +1664,52 @@ export function DatabaseView({ docId, minimalChrome = false }: DatabaseViewProps
 
         <div className="flex-1" />
 
-        {/* View switcher */}
-        <div className="flex items-center rounded-md bg-accent p-1">
-          <button
-            onClick={() => setViewMode('table')}
-            className={`flex items-center gap-1 px-2 py-1 rounded text-sm transition-colors ${
-              viewMode === 'table'
-                ? 'bg-background text-foreground'
-                : 'text-muted-foreground hover:text-foreground'
-            }`}
-          >
-            <Table size={14} />
-            <span>Table</span>
-          </button>
-          <button
-            onClick={() => setViewMode('board')}
-            className={`flex items-center gap-1 px-2 py-1 rounded text-sm transition-colors ${
-              viewMode === 'board'
-                ? 'bg-background text-foreground'
-                : 'text-muted-foreground hover:text-foreground'
-            }`}
-          >
-            <LayoutGrid size={14} />
-            <span>Board</span>
-          </button>
-        </div>
+        <DatabaseViewModeToggle
+          viewMode={viewMode}
+          onChange={setViewMode}
+          compact={minimalChrome}
+        />
 
         <button
           onClick={handleAddRow}
-          className="flex items-center gap-1 px-3 py-1.5 bg-primary text-white rounded-md text-sm hover:bg-primary-hover transition-colors"
+          className={[
+            'flex items-center gap-1 bg-primary text-primary-foreground transition-colors hover:bg-primary/90',
+            minimalChrome ? 'rounded-full px-3.5 py-2 shadow-sm' : 'rounded-md px-3 py-1.5'
+          ].join(' ')}
         >
           <Plus size={14} />
-          <span>New</span>
+          <span>{minimalChrome ? 'Add row' : 'New'}</span>
         </button>
 
-        {!minimalChrome && <ShareButton docId={docId} docType="database" />}
+        {minimalChrome ? (
+          <button
+            type="button"
+            onClick={() => setSidebarOpen((prev) => !prev)}
+            className="flex items-center gap-2 rounded-full border border-border/70 bg-background/80 px-3 py-2 text-sm text-muted-foreground shadow-sm transition-colors hover:bg-accent hover:text-foreground"
+            title={minimalCommentCountLabel}
+          >
+            <MessageSquare size={14} />
+            <span>Comments</span>
+            {commentUnresolvedCount > 0 && (
+              <span className="rounded-full bg-amber-500/15 px-1.5 py-0.5 text-xs text-amber-600">
+                {commentUnresolvedCount}
+              </span>
+            )}
+          </button>
+        ) : (
+          <ShareButton docId={docId} docType="database" />
+        )}
+
+        {minimalChrome && (
+          <DatabaseOverflowMenu
+            docId={docId}
+            columnsCount={columns.length}
+            rowsCount={rows.length}
+            schemaMetadata={schemaMetadata}
+            onOpenSchemaInfo={() => setSchemaInfoModalOpen(true)}
+            onOpenCloneSchema={() => setCloneSchemaModalOpen(true)}
+          />
+        )}
       </div>
 
       {/* View content + Sidebar horizontal layout */}
diff --git a/apps/electron/src/renderer/lib/canvas-shell.test.ts b/apps/electron/src/renderer/lib/canvas-shell.test.ts
index 4ae60b0f1..67f5e42bc 100644
--- a/apps/electron/src/renderer/lib/canvas-shell.test.ts
+++ b/apps/electron/src/renderer/lib/canvas-shell.test.ts
@@ -1,7 +1,8 @@
-import { createNode } from '@xnetjs/canvas'
 import { describe, expect, it } from 'vitest'
 import {
   createCanvasShellNoteProperties,
+  getCanvasShellNotePlacement,
+  getLinkedDocumentPlacement,
   isCanvasShellNote,
   shouldRenderCanvasShellCard
 } from './canvas-shell'
@@ -9,19 +10,28 @@ import {
 describe('canvas-shell', () => {
   describe('isCanvasShellNote', () => {
     it('returns true for shell-created note cards', () => {
-      const node = createNode('card', {}, createCanvasShellNoteProperties())
+      const node = {
+        type: 'card',
+        properties: createCanvasShellNoteProperties()
+      }
 
       expect(isCanvasShellNote(node)).toBe(true)
     })
 
     it('returns false for generic card nodes', () => {
-      const node = createNode('card', {}, { title: 'Generic card' })
+      const node = {
+        type: 'card',
+        properties: { title: 'Generic card' }
+      }
 
       expect(isCanvasShellNote(node)).toBe(false)
     })
 
     it('returns false for non-card nodes', () => {
-      const node = createNode('embed', {}, { title: 'Linked page' })
+      const node = {
+        type: 'embed',
+        properties: { title: 'Linked page' }
+      }
 
       expect(isCanvasShellNote(node)).toBe(false)
     })
@@ -29,8 +39,11 @@ describe('canvas-shell', () => {
 
   describe('shouldRenderCanvasShellCard', () => {
     it('renders linked documents with shell cards', () => {
-      const node = createNode('embed', {}, { title: 'Linked page' })
-      node.linkedNodeId = 'page-1'
+      const node = {
+        type: 'embed',
+        properties: { title: 'Linked page' },
+        linkedNodeId: 'page-1'
+      }
 
       expect(shouldRenderCanvasShellCard(node, { id: 'page-1', title: 'Page', type: 'page' })).toBe(
         true
@@ -38,9 +51,45 @@ describe('canvas-shell', () => {
     })
 
     it('does not render generic cards with shell chrome', () => {
-      const node = createNode('card', {}, { title: 'Generic card' })
+      const node = {
+        type: 'card',
+        properties: { title: 'Generic card' }
+      }
 
       expect(shouldRenderCanvasShellCard(node)).toBe(false)
     })
   })
+
+  describe('placement helpers', () => {
+    const viewport = {
+      x: 240,
+      y: 180,
+      zoom: 1.25
+    }
+
+    it('centers shell notes on the current viewport', () => {
+      const placement = getCanvasShellNotePlacement(viewport)
+
+      expect(placement.x + placement.width / 2).toBe(viewport.x)
+      expect(placement.y + placement.height / 2).toBe(viewport.y)
+    })
+
+    it('centers new pages on the current viewport', () => {
+      const placement = getLinkedDocumentPlacement(viewport, 'page')
+
+      expect(placement.x + placement.width / 2).toBe(viewport.x)
+      expect(placement.y + placement.height / 2).toBe(viewport.y)
+      expect(placement.width).toBe(360)
+      expect(placement.height).toBe(220)
+    })
+
+    it('centers new databases on the current viewport', () => {
+      const placement = getLinkedDocumentPlacement(viewport, 'database')
+
+      expect(placement.x + placement.width / 2).toBe(viewport.x)
+      expect(placement.y + placement.height / 2).toBe(viewport.y)
+      expect(placement.width).toBe(440)
+      expect(placement.height).toBe(260)
+    })
+  })
 })
diff --git a/apps/electron/src/renderer/lib/canvas-shell.ts b/apps/electron/src/renderer/lib/canvas-shell.ts
index 240339393..a2c9a3481 100644
--- a/apps/electron/src/renderer/lib/canvas-shell.ts
+++ b/apps/electron/src/renderer/lib/canvas-shell.ts
@@ -8,8 +8,33 @@ export type LinkedDocumentItem = {
   type: LinkedDocType
 }
 
+export type CanvasViewportSnapshot = {
+  x: number
+  y: number
+  zoom: number
+}
+
 const SHELL_NOTE_ROLE = 'canvas-note'
 
+const CANVAS_SHELL_NOTE_SIZE = {
+  width: 320,
+  height: 180
+}
+
+const LINKED_DOCUMENT_SIZES: Record<
+  Exclude<LinkedDocType, 'canvas'>,
+  { width: number; height: number }
+> = {
+  page: {
+    width: 360,
+    height: 220
+  },
+  database: {
+    width: 440,
+    height: 260
+  }
+}
+
 export function createCanvasShellNoteProperties(): Record<string, unknown> {
   return {
     title: 'Untitled Note',
@@ -27,3 +52,34 @@ export function shouldRenderCanvasShellCard(
 ): boolean {
   return Boolean(linkedDocument) || isCanvasShellNote(node)
 }
+
+export function getCanvasShellNotePlacement(viewport: CanvasViewportSnapshot): {
+  x: number
+  y: number
+  width: number
+  height: number
+} {
+  return {
+    x: viewport.x - CANVAS_SHELL_NOTE_SIZE.width / 2,
+    y: viewport.y - CANVAS_SHELL_NOTE_SIZE.height / 2,
+    ...CANVAS_SHELL_NOTE_SIZE
+  }
+}
+
+export function getLinkedDocumentPlacement(
+  viewport: CanvasViewportSnapshot,
+  type: Exclude<LinkedDocType, 'canvas'>
+): {
+  x: number
+  y: number
+  width: number
+  height: number
+} {
+  const size = LINKED_DOCUMENT_SIZES[type]
+
+  return {
+    x: viewport.x - size.width / 2,
+    y: viewport.y - size.height / 2,
+    ...size
+  }
+}
diff --git a/apps/electron/vitest.config.ts b/apps/electron/vitest.config.ts
index b02cff516..a3b5c6be9 100644
--- a/apps/electron/vitest.config.ts
+++ b/apps/electron/vitest.config.ts
@@ -1,10 +1,11 @@
+import { resolve } from 'path'
 import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
     globals: true,
     environment: 'node',
-    include: ['src/**/*.test.ts'],
+    include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
     testTimeout: 10000,
     server: {
       deps: {
@@ -12,5 +13,20 @@ export default defineConfig({
         external: ['better-sqlite3', 'electron']
       }
     }
+  },
+  resolve: {
+    alias: {
+      '@testing-library/react': resolve(
+        __dirname,
+        '../../packages/editor/node_modules/@testing-library/react'
+      ),
+      '@xnetjs/canvas': resolve(__dirname, '../../packages/canvas/src/index.ts'),
+      '@xnetjs/data': resolve(__dirname, '../../packages/data/src/index.ts'),
+      '@xnetjs/devtools': resolve(__dirname, '../../packages/devtools/src/index.ts'),
+      '@xnetjs/identity': resolve(__dirname, '../../packages/identity/src/index.ts'),
+      '@xnetjs/react': resolve(__dirname, '../../packages/react/src/index.ts'),
+      '@xnetjs/ui': resolve(__dirname, '../../packages/ui/src/index.ts'),
+      '@xnetjs/views': resolve(__dirname, '../../packages/views/src/index.ts')
+    }
   }
 })
diff --git a/docs/explorations/0104_[_]_EXPLORE_DRAMATICALLY_SIMPLIFYING_THE_UX_AROUND_A_CANVAS_FIRST_PRIMARY_APP_INSPIRED_BY_AFFINE_MINIMIZING_BUTTONS_AND_CHROME_WITH_ZOOM_IN_DOCUMENTS_AND_DATABASES.md b/docs/explorations/0104_[-]_EXPLORE_DRAMATICALLY_SIMPLIFYING_THE_UX_AROUND_A_CANVAS_FIRST_PRIMARY_APP_INSPIRED_BY_AFFINE_MINIMIZING_BUTTONS_AND_CHROME_WITH_ZOOM_IN_DOCUMENTS_AND_DATABASES.md
similarity index 98%
rename from docs/explorations/0104_[_]_EXPLORE_DRAMATICALLY_SIMPLIFYING_THE_UX_AROUND_A_CANVAS_FIRST_PRIMARY_APP_INSPIRED_BY_AFFINE_MINIMIZING_BUTTONS_AND_CHROME_WITH_ZOOM_IN_DOCUMENTS_AND_DATABASES.md
rename to docs/explorations/0104_[-]_EXPLORE_DRAMATICALLY_SIMPLIFYING_THE_UX_AROUND_A_CANVAS_FIRST_PRIMARY_APP_INSPIRED_BY_AFFINE_MINIMIZING_BUTTONS_AND_CHROME_WITH_ZOOM_IN_DOCUMENTS_AND_DATABASES.md
index 56ea29c72..55358f5f6 100644
--- a/docs/explorations/0104_[_]_EXPLORE_DRAMATICALLY_SIMPLIFYING_THE_UX_AROUND_A_CANVAS_FIRST_PRIMARY_APP_INSPIRED_BY_AFFINE_MINIMIZING_BUTTONS_AND_CHROME_WITH_ZOOM_IN_DOCUMENTS_AND_DATABASES.md
+++ b/docs/explorations/0104_[-]_EXPLORE_DRAMATICALLY_SIMPLIFYING_THE_UX_AROUND_A_CANVAS_FIRST_PRIMARY_APP_INSPIRED_BY_AFFINE_MINIMIZING_BUTTONS_AND_CHROME_WITH_ZOOM_IN_DOCUMENTS_AND_DATABASES.md
@@ -501,19 +501,19 @@ Only after the shell works:
 - [x] Represent pages and databases as linked canvas nodes using existing `linkedNodeId` direction.
 - [x] Replace hard view switching with zoom-in/zoom-out shell transitions.
 - [x] Compress `PageView` header chrome into lightweight contextual controls.
-- [ ] Compress `DatabaseView` controls into a compact dock plus popovers.
-- [ ] Reuse or adapt `NavigationTools` for persistent bottom-corner canvas navigation.
+- [x] Compress `DatabaseView` controls into a compact dock plus popovers.
+- [x] Reuse or adapt `NavigationTools` for persistent bottom-corner canvas navigation.
 - [x] Move advanced/rare actions into command palette or secondary menus.
 - [x] Add onboarding copy that teaches exactly three interactions: create, open, zoom out.
 
 ## Validation Checklist 🧪
 
 - [x] Verify the app always lands on a canvas, including first-run and empty-workspace flows.
-- [ ] Verify a new page/database appears at the current viewport center.
+- [x] Verify a new page/database appears at the current viewport center.
 - [ ] Verify opening a linked object preserves spatial context and restores it on exit.
 - [ ] Verify keyboard-only flows still work: command palette, open, rename, zoom out, undo/redo.
 - [ ] Verify comment, share, and presence affordances remain discoverable without persistent sidebars.
-- [ ] Verify database-focused workflows still expose row/view/schema operations in two interactions or fewer.
+- [x] Verify database-focused workflows still expose row/view/schema operations in two interactions or fewer.
 - [ ] Verify the shell remains usable on small laptop widths without bringing back a sidebar.
 - [ ] Verify reduced-motion mode falls back from zoom animation to clean state swaps.
 - [ ] Verify Playwright/Electron manual checks cover canvas home, page focus, database focus, and collaboration affordances.
diff --git a/packages/canvas/src/__tests__/canvas-navigation-shell.test.tsx b/packages/canvas/src/__tests__/canvas-navigation-shell.test.tsx
new file mode 100644
index 000000000..79fab5b01
--- /dev/null
+++ b/packages/canvas/src/__tests__/canvas-navigation-shell.test.tsx
@@ -0,0 +1,144 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import React from 'react'
+import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import * as Y from 'yjs'
+import { Canvas } from '../renderer/Canvas'
+import { createViewport } from '../spatial'
+
+const mockUseCanvas = vi.fn()
+
+vi.mock('../hooks/useCanvas', () => ({
+  useCanvas: (...args: unknown[]) => mockUseCanvas(...args)
+}))
+
+vi.mock('../layers', () => ({
+  createGridLayer: () => ({
+    resize: vi.fn(),
+    render: vi.fn(),
+    destroy: vi.fn()
+  })
+}))
+
+vi.mock('../comments/CommentOverlay', () => ({
+  CommentOverlay: () => null
+}))
+
+vi.mock('../edges/CanvasEdgeComponent', () => ({
+  CanvasEdgeComponent: () => null
+}))
+
+vi.mock('../nodes/CanvasNodeComponent', () => ({
+  CanvasNodeComponent: ({ children }: { children?: React.ReactNode }) => <div>{children}</div>,
+  calculateLOD: () => 'full'
+}))
+
+beforeAll(() => {
+  class ResizeObserverMock {
+    observe() {}
+    disconnect() {}
+  }
+
+  vi.stubGlobal('ResizeObserver', ResizeObserverMock)
+  Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
+    configurable: true,
+    get() {
+      return 800
+    }
+  })
+  Object.defineProperty(HTMLElement.prototype, 'clientHeight', {
+    configurable: true,
+    get() {
+      return 600
+    }
+  })
+})
+
+function createCanvasMock() {
+  const viewport = createViewport({ x: 100, y: 80, zoom: 1 })
+  viewport.width = 800
+  viewport.height = 600
+
+  return {
+    nodes: [],
+    edges: [],
+    selectedNodeIds: new Set<string>(),
+    selectedEdgeIds: new Set<string>(),
+    viewport,
+    addNode: vi.fn(),
+    updateNodePosition: vi.fn(),
+    updateNodePositions: vi.fn(),
+    removeNode: vi.fn(),
+    removeNodes: vi.fn(),
+    addEdge: vi.fn(),
+    removeEdge: vi.fn(),
+    selectNode: vi.fn(),
+    selectNodes: vi.fn(),
+    selectEdge: vi.fn(),
+    selectAll: vi.fn(),
+    clearSelection: vi.fn(),
+    deleteSelected: vi.fn(),
+    pan: vi.fn(),
+    zoomAt: vi.fn(),
+    fitToContent: vi.fn(),
+    fitToRect: vi.fn(),
+    resetView: vi.fn(),
+    getViewportSnapshot: vi.fn(() => ({ x: 100, y: 80, zoom: 1 })),
+    setViewportSnapshot: vi.fn(),
+    autoLayout: vi.fn(),
+    layoutSelected: vi.fn(),
+    findNodeAt: vi.fn(),
+    findNodesInRect: vi.fn(),
+    getVisibleNodes: vi.fn(() => []),
+    store: {
+      getBounds: vi.fn(() => ({ x: 50, y: 20, width: 200, height: 120 })),
+      getVisibleNodes: vi.fn(() => []),
+      getNode: vi.fn()
+    }
+  }
+}
+
+describe('Canvas navigation shell', () => {
+  beforeEach(() => {
+    mockUseCanvas.mockReset()
+  })
+
+  it('renders the shared navigation tools when requested', () => {
+    mockUseCanvas.mockReturnValue(createCanvasMock())
+
+    render(
+      <Canvas
+        doc={new Y.Doc()}
+        showNavigationTools
+        navigationToolsPosition="bottom-right"
+        navigationToolsShowZoomLabel={false}
+      />
+    )
+
+    expect(screen.getByRole('button', { name: /zoom in/i })).toBeTruthy()
+    expect(screen.getByRole('button', { name: /zoom out/i })).toBeTruthy()
+    expect(screen.getByRole('button', { name: /fit to content/i })).toBeTruthy()
+    expect(screen.getByRole('button', { name: /reset view/i })).toBeTruthy()
+    expect(screen.queryByText('100%')).toBeNull()
+  })
+
+  it('routes navigation tool actions through the viewport snapshot API', () => {
+    const canvasMock = createCanvasMock()
+    mockUseCanvas.mockReturnValue(canvasMock)
+
+    render(<Canvas doc={new Y.Doc()} showNavigationTools />)
+
+    fireEvent.click(screen.getByRole('button', { name: /fit to content/i }))
+    fireEvent.click(screen.getByRole('button', { name: /reset view/i }))
+
+    expect(canvasMock.setViewportSnapshot).toHaveBeenNthCalledWith(1, {
+      x: 150,
+      y: 80,
+      zoom: 1
+    })
+    expect(canvasMock.setViewportSnapshot).toHaveBeenNthCalledWith(2, {
+      x: 0,
+      y: 0,
+      zoom: 1
+    })
+  })
+})
diff --git a/packages/canvas/src/components/NavigationTools.tsx b/packages/canvas/src/components/NavigationTools.tsx
index 7db5062fc..80a607688 100644
--- a/packages/canvas/src/components/NavigationTools.tsx
+++ b/packages/canvas/src/components/NavigationTools.tsx
@@ -12,7 +12,7 @@ import { Viewport } from '../spatial/index'
 
 export interface NavigationToolsProps {
   /** Current viewport state */
-  viewport: Viewport
+  viewport: Pick<Viewport, 'x' | 'y' | 'zoom' | 'width' | 'height'>
   /** Bounds of all canvas content (for fit-to-content) */
   canvasBounds: Rect | null
   /** Callback when viewport should change */
@@ -23,6 +23,8 @@ export interface NavigationToolsProps {
   showZoomLabel?: boolean
   /** Optional CSS class name */
   className?: string
+  /** Optional style overrides for the toolbar container */
+  style?: React.CSSProperties
 }
 
 // ─── Navigation Tools Component ───────────────────────────────────────────────
@@ -33,7 +35,8 @@ export function NavigationTools({
   onViewportChange,
   position = 'bottom-left',
   showZoomLabel = true,
-  className
+  className,
+  style
 }: NavigationToolsProps) {
   const zoomIn = useCallback(() => {
     const newZoom = Math.min(viewport.zoom * 1.5, 4)
@@ -74,7 +77,10 @@ export function NavigationTools({
 
   const zoomPercent = Math.round(viewport.zoom * 100)
 
-  const positionStyles = getPositionStyles(position)
+  const positionStyles = {
+    ...getPositionStyles(position),
+    ...style
+  }
 
   return (
     <div className={`navigation-tools ${className ?? ''}`} style={positionStyles}>
diff --git a/packages/canvas/src/renderer/Canvas.tsx b/packages/canvas/src/renderer/Canvas.tsx
index 63273a9b7..07feaaa58 100644
--- a/packages/canvas/src/renderer/Canvas.tsx
+++ b/packages/canvas/src/renderer/Canvas.tsx
@@ -16,6 +16,7 @@ import React, {
 } from 'react'
 import * as Y from 'yjs'
 import { CommentOverlay } from '../comments/CommentOverlay'
+import { NavigationTools } from '../components/NavigationTools'
 import { CanvasEdgeComponent } from '../edges/CanvasEdgeComponent'
 import { useCanvas } from '../hooks/useCanvas'
 import { createGridLayer, type GridLayer } from '../layers'
@@ -81,6 +82,16 @@ export interface CanvasProps {
   canvasNodeId?: string
   /** Schema IRI of the canvas (optimization for comments) */
   canvasSchema?: string
+  /** Render built-in canvas navigation tools */
+  showNavigationTools?: boolean
+  /** Position for the built-in navigation tools */
+  navigationToolsPosition?: 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right'
+  /** Show the zoom percentage inside the built-in navigation tools */
+  navigationToolsShowZoomLabel?: boolean
+  /** Optional class name for the built-in navigation tools */
+  navigationToolsClassName?: string
+  /** Optional style overrides for the built-in navigation tools */
+  navigationToolsStyle?: React.CSSProperties
 }
 
 /**
@@ -169,7 +180,12 @@ export const Canvas = forwardRef<CanvasHandle, CanvasProps>(function Canvas(
     className,
     style,
     canvasNodeId,
-    canvasSchema
+    canvasSchema,
+    showNavigationTools = false,
+    navigationToolsPosition = 'bottom-left',
+    navigationToolsShowZoomLabel = true,
+    navigationToolsClassName,
+    navigationToolsStyle
   },
   ref
 ) {
@@ -558,6 +574,21 @@ export const Canvas = forwardRef<CanvasHandle, CanvasProps>(function Canvas(
     [nodes]
   )
 
+  const canvasBounds = useMemo(() => canvas.store.getBounds(), [canvas.store, nodes])
+
+  const handleNavigationViewportChange = useCallback(
+    (changes: { x?: number; y?: number; zoom?: number }) => {
+      const snapshot = canvas.getViewportSnapshot()
+
+      canvas.setViewportSnapshot({
+        x: changes.x ?? snapshot.x,
+        y: changes.y ?? snapshot.y,
+        zoom: changes.zoom ?? snapshot.zoom
+      })
+    },
+    [canvas]
+  )
+
   // Container styles
   const containerStyle: React.CSSProperties = {
     position: 'relative',
@@ -654,7 +685,17 @@ export const Canvas = forwardRef<CanvasHandle, CanvasProps>(function Canvas(
         />
       )}
 
-      {/* Minimap could go here */}
+      {showNavigationTools && (
+        <NavigationTools
+          viewport={viewport}
+          canvasBounds={canvasBounds}
+          onViewportChange={handleNavigationViewportChange}
+          position={navigationToolsPosition}
+          showZoomLabel={navigationToolsShowZoomLabel}
+          className={navigationToolsClassName}
+          style={navigationToolsStyle}
+        />
+      )}
     </div>
   )
 })
diff --git a/packages/canvas/vitest.config.ts b/packages/canvas/vitest.config.ts
index add9a49ba..deb3abab4 100644
--- a/packages/canvas/vitest.config.ts
+++ b/packages/canvas/vitest.config.ts
@@ -10,7 +10,9 @@ export default defineConfig({
   resolve: {
     alias: {
       // Mock mermaid for tests (optional peer dependency)
-      mermaid: path.resolve(__dirname, 'src/__mocks__/mermaid.ts')
+      mermaid: path.resolve(__dirname, 'src/__mocks__/mermaid.ts'),
+      '@xnetjs/data': path.resolve(__dirname, '../data/src/index.ts'),
+      '@xnetjs/react': path.resolve(__dirname, '../react/src/index.ts')
     }
   }
 })
diff --git a/vitest.config.ts b/vitest.config.ts
index 3e7352d70..7b03a0f57 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -4,7 +4,39 @@ import { defineConfig } from 'vitest/config'
 // (each shard only sees partial coverage, so thresholds will always fail)
 const skipThresholds = process.env.CI === 'true'
 
+const workspaceAliases = {
+  '@xnetjs/canvas': new URL('./packages/canvas/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/cli': new URL('./packages/cli/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/core': new URL('./packages/core/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/crypto': new URL('./packages/crypto/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/data': new URL('./packages/data/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/data-bridge': new URL('./packages/data-bridge/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/devtools': new URL('./packages/devtools/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/editor': new URL('./packages/editor/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/formula': new URL('./packages/formula/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/history': new URL('./packages/history/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/hub': new URL('./packages/hub/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/identity': new URL('./packages/identity/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/network': new URL('./packages/network/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/plugins': new URL('./packages/plugins/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/query': new URL('./packages/query/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/react': new URL('./packages/react/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/sdk': new URL('./packages/sdk/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/sqlite/memory': new URL('./packages/sqlite/src/adapters/memory.ts', import.meta.url)
+    .pathname,
+  '@xnetjs/sqlite': new URL('./packages/sqlite/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/storage': new URL('./packages/storage/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/sync': new URL('./packages/sync/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/telemetry': new URL('./packages/telemetry/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/ui': new URL('./packages/ui/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/vectors': new URL('./packages/vectors/src/index.ts', import.meta.url).pathname,
+  '@xnetjs/views': new URL('./packages/views/src/index.ts', import.meta.url).pathname
+}
+
 export default defineConfig({
+  resolve: {
+    alias: workspaceAliases
+  },
   test: {
     globals: true,
     testTimeout: 10000,