diff --git a/FILESYSTEM.md b/FILESYSTEM.md
index 8b5e009..458b3cf 100644
--- a/FILESYSTEM.md
+++ b/FILESYSTEM.md
@@ -54,13 +54,15 @@ uses its isolated profile only when an explicit browser binary is configured.
 ```
 ├── auth/           # Authentication store
 ├── base/           # DBAPIClient, base utilities
-├── client/         # Client model & API
 ├── config/         # Configuration adapters & schema
 ├── database/       # Supabase relation types plus stable database/runtime-contract adapters
 ├── extension/      # Extension lifecycle, Module Federation
 ├── info-base/      # Block, Relation, Storage, Resolvers
 ├── libs/           # Third-party integrations (AI)
 ├── obsrv/          # Observability (logging)
+├── organization/   # Organization capability entry points
+├── peer/           # Peer discovery, protocols, outbounds, and delegation
+├── semantic-retrieval/ # Semantic retrieval capability entry point
 ├── sink/           # Output processing (graph layouts)
 ├── source/         # Source, CollectJob, CollectAt
 ├── utils/          # Vue prop helpers, utilities
@@ -72,11 +74,11 @@ uses its isolated profile only when an explicit browser binary is configured.
 
 ```
 ├── components/     # Vue components by domain
-│   ├── client/     # Client management
 │   ├── common/     # Shared components
 │   ├── extension/  # Extension UI
 │   ├── info-base/  # Block, Relation, Graph
 │   ├── obsrv/      # Log viewer
+│   ├── peer/       # Technical Peer management (product UI says “client”)
 │   └── source/     # Source management
 ├── composables/    # Vue composition functions
 ├── locales/        # i18n translations
diff --git a/apps/client-web/AGENTS.md b/apps/client-web/AGENTS.md
index 29e7358..340bf23 100644
--- a/apps/client-web/AGENTS.md
+++ b/apps/client-web/AGENTS.md
@@ -20,7 +20,7 @@ Web client for InKCre - GUI for system management and visualization.
 - info-base - Graph: block, relation, storage, resolver
 - sink - Output/visualization
 - extension - Plugin system
-- client - Multi-client management
+- peer - Technical Peer management; keep product-facing UI language as “client”
 - obsrv - Observability/logging
 
 ## Directory Structure
@@ -44,7 +44,7 @@ src/
 - The application has no Hono/Worker runtime and no `/api/config` endpoint.
 - Bootstrap config is validated and persisted in this origin's localStorage.
 - A fresh origin has no environment default. Static output and source maps contain no InKCre
-  environment origin or client identity.
+  environment origin or Peer identity.
 - The user-supplied JWT signing credential is masked, never logged, and excluded from portable
   config exports.
 - Start through the root `pnpm dev` command so SVC and Portless preserve worktree identity.
diff --git a/apps/client-web/ARCHITECTURE.md b/apps/client-web/ARCHITECTURE.md
index 207c8fb..9d821ab 100644
--- a/apps/client-web/ARCHITECTURE.md
+++ b/apps/client-web/ARCHITECTURE.md
@@ -1,318 +1,108 @@
 # InKCre Client-Web Architecture
 
-## Table of Contents
-
-1. System Overview
-2. Technology Stack
-3. High-Level Architecture
-4. Architecture Patterns
-5. Directory Structure
-6. Core Systems
-7. Data Flow
-
----
-
-## System Overview
-
-InKCre Client-Web is a web-based application for information collection, organization, and visualization. It provides a GUI for managing the InKCre system, featuring graph-based storage, extensible plugins, and real-time visualization.
-
-**Core Capabilities:**
-
-- Automated data collection with scheduled jobs
-- Knowledge graph with blocks and relations
-- Module Federation-**based** extensions
-- Multi-client peer network
-- Interactive graph layouts
-- Pluggable content handling
-
-**Business Domains:**
-
-- **Source**: Data input pipeline
-- **Info-Base**: Graph-based knowledge system
-- **Extension**: Plugin architecture
-- **Client**: Multi-client management
-- **Obsrv**: Observability and logging
-
----
-
-## Technology Stack
-
-**Core Framework:**
-
-- Vue 3 (Composition API)
-- TypeScript (strict typing)
-- Vite (build tool)
-- SCSS + UnoCSS (styling)
-
-**State & Routing:**
-
-- Pinia (global state)
-- Vue Router (navigation)
-
-**Data Layer:**
-
-- Zod (validation and type inference)
-- PostgREST client (database access)
-
-**Extension System:**
-
-- Module Federation (dynamic loading)
-
-**Visualization:**
-
-- Vue Flow (graph rendering)
-- D3.js (layouts)
-
-**APIs:**
-
-- PostgREST and core-py (external services)
-- JOSE (authentication)
-
----
-
-## High-Level Architecture
-
-```
-┌─────────────────────────────────────────────────────────────────────┐
-│                         InKCre Client-Web                            │
-│                                                                       │
-│  ┌──────────────────────────────────────────────────────────────┐  │
-│  │                         Vue App                               │  │
-│  │  ┌────────────────────────────────────────────────────────┐  │  │
-│  │  │                    Views Layer                          │  │  │
-│  │  │  (Settings, Sources, Extensions, Info-Base Graph)       │  │  │
-│  │  └────────────────────────────────────────────────────────┘  │  │
-│  │  ┌────────────────────────────────────────────────────────┐  │  │
-│  │  │                 Components Layer                        │  │  │
-│  │  │   ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌─────────┐  │  │  │
-│  │  │   │  Source  │ │ Info-Base│ │Extension │ │ Client  │  │  │  │
-│  │  │   │Components│ │Components│ │Components│ │ Comps   │  │  │  │
-│  │  │   └──────────┘ └──────────┘ └──────────┘ └─────────┘  │  │  │
-│  │  └────────────────────────────────────────────────────────┘  │  │
-│  │  ┌────────────────────────────────────────────────────────┐  │  │
-│  │  │               Business Logic Layer                      │  │  │
-│  │  │   ┌─────────────────────────────────────────────────┐  │  │  │
-│  │  │   │           BusinessClass Pattern                  │  │  │  │
-│  │  │   │  (Source, Client, Extension, Block, Relation)    │  │  │  │
-│  │  │   │  - Zod Schema + TypeScript Class                 │  │  │  │
-│  │  │   │  - Static API clients (DBAPIClient, CoreAPIClient)│ │  │  │
-│  │  │   │  - Static registries for instances               │  │  │  │
-│  │  │   └─────────────────────────────────────────────────┘  │  │  │
-│  │  │   ┌─────────────────────────────────────────────────┐  │  │  │
-│  │  │   │        Extension System (Module Federation)      │  │  │  │
-│  │  │   │  - Dynamic remote loading                        │  │  │  │
-│  │  │   │  - Lifecycle management (DISCOVERED → ACTIVE)    │  │  │  │
-│  │  │   │  - Registry pattern for Storages/Resolvers       │  │  │  │
-│  │  │   └─────────────────────────────────────────────────┘  │  │  │
-│  │  │   ┌─────────────────────────────────────────────────┐  │  │  │
-│  │  │   │         Info-Base Subsystems                     │  │  │  │
-│  │  │   │  - Storage: Content retrieval (http, local, etc) │  │  │  │
-│  │  │   │  - Resolver: Content rendering (text, image, etc)│  │  │  │
-│  │  │   │  - Graph: Force/Dagre/Circular layouts           │  │  │  │
-│  │  │   └─────────────────────────────────────────────────┘  │  │  │
-│  │  └────────────────────────────────────────────────────────┘  │  │
-│  └──────────────────────────────────────────────────────────────┘  │
-│                                                                       │
-│  ┌──────────────────────────────────────────────────────────────┐  │
-│  │                      API Layer (Dual)                         │  │
-│  │  ┌──────────────────────────┐  ┌────────────────────────┐    │  │
-│  │  │     DBAPIClient          │  │   CoreAPIClient        │    │  │
-│  │  │  (PostgREST via Supabase)│  │   (REST to core-py)    │    │  │
-│  │  │  - Direct DB queries      │  │   - Complex operations │    │  │
-│  │  │  - CRUD operations        │  │   - Business logic     │    │  │
-│  │  └──────────────────────────┘  └────────────────────────┘    │  │
-│  └──────────────────────────────────────────────────────────────┘  │
-│                                                                       │
-│  ┌──────────────────────────────────────────────────────────────┐  │
-│  │                  State Management (Pinia)                     │  │
-│  │   - Auth Store (JWT tokens, user state)                       │  │
-│  └──────────────────────────────────────────────────────────────┘  │
-│                                                                       │
-│  ┌──────────────────────────────────────────────────────────────┐  │
-│  │              Config System (zod-config)                        │  │
-│  │   - Browser-local validated bootstrap config                   │  │
-│  │   - Explicit application-owned initialization                  │  │
-│  └──────────────────────────────────────────────────────────────┘  │
-└─────────────────────────────────────────────────────────────────────┘
-                                    │
-                                    ▼
-        ┌───────────────────────────────────────────────┐
-        │          Backend Services                      │
-        │  ┌──────────────────┐  ┌──────────────────┐   │
-        │  │  PostgreSQL DB   │  │   core-py API    │   │
-        │  │  (via PostgREST) │  │   (REST Server)  │   │
-        │  └──────────────────┘  └──────────────────┘   │
-        └───────────────────────────────────────────────┘
+Client-Web is a static Vue application and an equal InKCre database Peer. “Client” remains the
+product-facing name; code and technical documentation use **Peer** for the deployment identity used
+by discovery and delegation.
+
+## Topology
+
+```text
+Vue view/component
+  ├─ database fact/query ──> domain Active Record ──> DBAPIClient ──> PostgREST/PostgreSQL
+  └─ business capability ──> domain manager ──> PeerManager.delegate(exact capability)
+                                      │
+                                      └─ live Peer advertisement ──> protocol outbound
+                                                                       │
+                                                                       └─ provider inbound
+                                                                            └─ local domain execution
 ```
 
-### Data Flow Overview
-
-1. User interaction triggers Vue components
-2. Components invoke BusinessClass methods
-3. BusinessClass uses DBAPIClient or CoreAPIClient
-4. API clients communicate with backend
-5. Responses update reactive UI
-
----
-
-## Architecture Patterns
-
-### 1. BusinessClass Pattern
-
-Combines Zod schemas with TypeScript classes for type-safe entities. Provides runtime validation, centralized API access, and instance registries.
+The database and capability paths are intentionally separate. Client-Web does not have a generic
+Core API client, a generic capability invoke endpoint, or a delegation job table.
 
-**Key Features:**
+## Technical Domains
 
-- Single source of truth for types and validation
-- Static API clients per entity
-- Consistent CRUD operations
+- `info-base`: Block, Relation, Storage, Resolver, graph visualization, and content hydration.
+- `source`: source facts and collection-job visibility.
+- `extension`: local Module Federation lifecycle and exact remote extension management.
+- `peer`: Peer Active Record, capability discovery, protocol outbounds, and one-shot delegation.
+- `semantic-retrieval`: typed facade for `core.semantic_retrieval.v1`.
+- `organization`: typed facade for `core.organization.rumination.v1`.
+- `obsrv`: runtime logs and diagnostics.
 
-### 2. Dual API Architecture
+## Peer Delegation
 
-Two separate API clients for different access patterns:
-
-**DBAPIClient (PostgREST):**
-
-- Direct database queries
-- Fast CRUD operations
-- Simple list and filter queries
-
-**CoreAPIClient (REST):**
-
-- Complex business logic
-- Validation and orchestration
-- Batch operations and workflows
-
-**Decision Criteria:**
-
-- Use DBAPIClient for simple, performance-critical operations
-- Use CoreAPIClient for complex logic requiring backend processing
-
-### 3. Module Federation Extension System
-
-Dynamic plugin loading with lifecycle management. Extensions register custom storages and resolvers.
-
-**Lifecycle:**
-DISCOVERED → LOADING → LOADED → INITIALIZING → READY → ACTIVATING → ACTIVE
-
-**Benefits:**
-
-- Runtime extensibility
-- Shared dependencies
-- Strong isolation
-
-### 4. Registry Pattern (Storage & Resolver)
-
-Decorator-based registration for pluggable content handling. Extensions can add new content types with custom retrieval and rendering logic.
-
-**Storage:** Handles content fetching (HTTP, local, external APIs)
-**Resolver:** Handles content transformation and rendering
-
-### 5. Config System
-
-The static web application explicitly initializes the shared config store with its localStorage
-adapter before mounting Vue. The browser origin owns the PostgREST URL, client ID, and user-provided
-JWT signing credential; an empty origin does not inherit a production or development environment.
-There is no HTTP config endpoint, environment adapter, runtime adapter switching, or compiled
-environment profile.
-
----
-
-## Directory Structure
+`PeerManager.delegate(capability, payload, routeToPeer)` discovers unexpired advertisements using
+PostgreSQL time. An advertisement contains an exact capability ID plus one inbound interface:
 
+```text
+{
+  id,
+  inbound: {
+    protocol,
+    parameters
+  }
+}
 ```
-client-web/
-├── docs/                 # Domain documentation
-├── public/               # Static assets
-├── src/
-│   ├── components/       # Vue components by domain
-│   │   ├── source/
-│   │   ├── info-base/
-│   │   ├── extension/
-│   │   └── common/
-│   ├── composables/      # Vue composition functions
-│   ├── locales/          # Internationalization
-│   ├── views/            # Routed views and settings
-│   ├── core.ts           # Explicit core/config initialization
-│   └── main.ts           # Vue entry
-├── package.json
-├── vite.config.ts
-└── tsconfig.json
-```
-
----
-
-## Core Systems
-
-### Business Layer
-
-Implements domain entities using BusinessClass pattern. Each entity has:
-
-- Zod schema for validation
-- Static API clients
-- Instance registries
-- CRUD methods
-
-**Key Entities:**
-
-- **Source**: Data collection configurations
-- **Client**: InKCre client instances
-- **Extension**: Plugin modules
-- **Block**: Information units in graph
-- **Relation**: Connections between blocks
-
-### Extension System
-
-Module Federation-based plugins with lifecycle management. Extensions can:
-
-- Register custom resolvers for new content types
-- Register custom storages for data retrieval
-- Add UI components
-- Extend business logic
-
-### Component Architecture
-
-Organized by business domain:
 
-- Domain-specific components for each business area
-- Shared common components
-- Type-safe props using prop factories
+The protocol selects a registered outbound. `core.peer.protocol.http.v1` carries normalized query,
+headers, and optional JSON body; its static method and URL live only in inbound parameters. Peer JWT
+authentication is part of that protocol. `routeToPeer` is caller-local routing state and never
+enters the business payload.
 
-### State Management
+Automatic failover is allowed only after explicit
+`InkCre-Peer-Execution: not-executed`. Browser Fetch rejection cannot prove that dispatch did not
+occur, so it becomes `PeerOutcomeUnknown` and is never retried automatically. Exact-target routing
+never substitutes a different Peer.
 
-Pinia stores for global state:
+## Domain Inbounds and Outbounds
 
-- Auth store for JWT tokens and user state
-- Local reactive state for component-specific data
+Transport and business direction are different views of the same call:
 
-### Configuration
+- SemanticRetrievalOutbound is the caller-side `SemanticRetrievalManager` plus the selected Peer
+  protocol outbound.
+- SemanticRetrievalInbound is the provider route plus its non-delegating local semantic retrieval
+  implementation.
+- Organization rumination and Extension management follow the same structure.
 
-- localStorage is the web runtime authority.
-- Zod validates config before persistence and use.
-- Static artifacts and source maps contain no InKCre environment origin or client identity.
-- Portable export excludes the JWT signing credential.
-- JWTs remain memory-only and are signed from the user-owned browser credential.
+Domain managers own request and response models. PeerManager understands only exact capability
+delegation and transport construction; it does not understand semantic retrieval, organization, or
+extensions.
 
----
+## Configuration and Authentication
 
-## Data Flow
+The static application initializes browser-local meta config before mounting Vue:
 
-### Read Flow
+- PostgREST URL;
+- current technical Peer ID (presented as Client ID in the UI);
+- user-owned JWT signing secret.
 
-User action → View component → BusinessClass.list() → DBAPIClient → PostgREST → Database → Response → Zod validation → Reactive UI update
+The current Peer's deployment config is read from its database row. Static artifacts contain no
+deployment origin, Peer identity, or JWT credential. JWTs are memory-only and use the generated
+Peer contract.
 
-### Write Flow
+Local development runs core-py and PostgREST through the tracked database runtime. The deployment
+orchestrator writes the core-py Peer's `config.http_public_base_url` through PostgREST, then waits
+for core-py to publish the three exact capability advertisements and a live lease. The URL is not
+an environment-variable authority.
 
-User action → Component → BusinessClass instance → CoreAPIClient → core-py API → Validation & business logic → Database write → Response → UI update
+## Extension Management
 
-### Extension Flow
+For the current browser Peer, extension lifecycle and config changes may directly update shared
+state and local Module Federation runtime. Managing another Peer delegates
+`core.extension.management.v1` to that exact Peer. The old per-Client REST URL and generic request
+method do not exist.
 
-Extension activation → Register remote → Load module → Initialize (register handlers) → Activate (start tasks) → Features available
+## Rumination UI
 
-### Content Resolution Flow
+BlockDetailsPanel exposes explicit rumination. Success reloads the graph and reselects the focal
+Block. `PeerOutcomeUnknown` is shown distinctly and is not retried or reported as success.
 
-Block display → Get resolver → Fetch storage content → Resolve content → Cache result → Render via content component
+## Build Contract
 
----
+- Vue 3, TypeScript, Vite, Pinia, Vue Router, Vue Flow, SCSS, and UnoCSS.
+- `@inkcre/core` is source-aliased in workspace development and built as ESM by tsdown.
+- The checked database contract generates relation types and Peer JWT/runtime metadata.
+- The deployable output is an environment-neutral static artifact.
 
-**Last Updated**: July 23, 2026
+**Last Updated**: August 7, 2026
diff --git a/apps/client-web/docs/development.md b/apps/client-web/docs/development.md
index 59d6c66..6d4173b 100644
--- a/apps/client-web/docs/development.md
+++ b/apps/client-web/docs/development.md
@@ -27,8 +27,9 @@ remote is sufficient.
 
 ## Browser-local configuration
 
-The settings page is the sole runtime authority for the PostgREST URL, client ID, and user-owned
-JWT signing secret. A fresh origin has no default service or client identity. The secret is masked
+The settings page is the sole runtime authority for the PostgREST URL, technical Peer ID (shown as
+Client ID in the product UI), and user-owned JWT signing secret. A fresh origin has no default
+service or Peer identity. The secret is masked
 and omitted from portable exports. Do not add a hardcoded endpoint, Vite environment variable,
 Worker binding, or shared Cloudflare secret for runtime configuration.
 
diff --git a/apps/client-web/src/components/AGENTS.md b/apps/client-web/src/components/AGENTS.md
index 4bc5610..75122e2 100644
--- a/apps/client-web/src/components/AGENTS.md
+++ b/apps/client-web/src/components/AGENTS.md
@@ -4,12 +4,13 @@ Read [/.github/instructions/component.instructions.md](/.github/instructions/com
 
 ## Quick Reference
 
-- client: clientList
+- peer: peerList, peerCard (product-facing copy may still say “client”)
 - common: AppSidePanel
 - extension: extensionCard, installExtension
 - info-base: BlockNode, BlockDetailsPanel, resolvers/*
 - obsrv: LogEntry, LogsViewer
-- source: sourceCard, sourceForm, collectAtForm, collectJobForm
+- source: sourceCard, sourceForm
+- job: JobCard
 
 ## Component Pattern
 
diff --git a/apps/client-web/src/components/ARCHITECTURE.md b/apps/client-web/src/components/ARCHITECTURE.md
index 67696f2..9c40ba3 100644
--- a/apps/client-web/src/components/ARCHITECTURE.md
+++ b/apps/client-web/src/components/ARCHITECTURE.md
@@ -89,10 +89,10 @@ Components are grouped by business domain:
 
 ```
 components/
-├── client/          # Client-related components
 ├── extension/       # Extension management
 ├── info-base/       # Information base (blocks, relations)
 ├── obsrv/           # Observation/logging
+├── peer/            # Technical Peer management; UI copy remains product-facing
 ├── source/          # Data sources
 └── common/          # Shared utilities
 ```
diff --git a/apps/client-web/src/components/FILESYSTEM.md b/apps/client-web/src/components/FILESYSTEM.md
index 2654715..fbde0a0 100644
--- a/apps/client-web/src/components/FILESYSTEM.md
+++ b/apps/client-web/src/components/FILESYSTEM.md
@@ -1,8 +1,6 @@
 ```
 src/components/
 ├── AGENTS.md                   # Component guidelines
-├── client/                     # Client domain
-│   └── clientList/
 ├── common/                     # Shared components
 │   ├── AGENTS.md
 │   └── AppSidePanel/
@@ -18,6 +16,9 @@ src/components/
 │   ├── AGENTS.md
 │   ├── LogEntry/
 │   └── LogsViewer/
+├── peer/                       # Technical Peer domain
+│   ├── peerCard/
+│   └── peerList/
 └── source/                     # Source domain
     ├── collectAtForm/
     ├── sourceCard/
diff --git a/apps/client-web/src/components/client/clientCard/clientCard.md b/apps/client-web/src/components/client/clientCard/clientCard.md
deleted file mode 100644
index afe539e..0000000
--- a/apps/client-web/src/components/client/clientCard/clientCard.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# clientCard
-
-## Rationale
-
-Display and edit a single client in the client list.
-
-## Goals
-
-Allow users to view client details and edit client name and URL.
-
-## Key Concepts
-
-Client management, health status.
-
-## Specification
-
-Shows client name, ID, URL, and status. Has edit mode with inputs for name and URL, save/cancel buttons.
-
-## Implementation
-
-Uses reactive editing state, emits updated on save.
-
-### Props
-
-- `client` (`Client`, required): The client object
-- `status` (`"online" | "offline" | "unknown"`, required): Health status
-
-### Events
-
-- `updated()`: Emitted after successful save
diff --git a/apps/client-web/src/components/client/clientCard/clientCard.vue b/apps/client-web/src/components/client/clientCard/clientCard.vue
deleted file mode 100644
index f4b001a..0000000
--- a/apps/client-web/src/components/client/clientCard/clientCard.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { InkButton, InkInput, InkDialog, InkJsonEditor } from '@inkcre/ui-web'
-import { Client, CreateClientForm } from '@inkcre/core'
-import { clientCardProps, clientCardEmits } from './clientCard'
-
-const props = defineProps(clientCardProps)
-const emit = defineEmits(clientCardEmits)
-
-const { t } = useI18n()
-
-const configPopupOpen = ref(false)
-const configModel = computed({
-  get: () => JSON.stringify(props.client.config ?? {}, null, 2),
-  set: (newValue: string) => {
-    props.client.config = JSON.parse(newValue)
-  },
-})
-
-const saveClient = async () => {
-  try {
-    const form = new CreateClientForm(props.client)
-    await form.upsert()
-    emit('updated')
-  } catch (error) {
-    console.error('Failed to update client:', error)
-    alert('Failed to update client')
-  }
-}
-
-const onEditConfigClick = () => {
-  configPopupOpen.value = true
-}
-
-const onConfirmConfig = async () => {
-  try {
-    await props.client.saveConfig()
-    emit('updated')
-    configPopupOpen.value = false
-  } catch (error) {
-    console.error('Failed to update client config:', error)
-    alert('Failed to update client config')
-  }
-}
-
-const getStatusText = (status: 'online' | 'offline' | 'unknown') => {
-  const statusMap = {
-    online: t('client.statusOnline'),
-    offline: t('client.statusOffline'),
-    unknown: t('client.statusUnknown'),
-  }
-  return statusMap[status]
-}
-</script>
-
-<template>
-  <div class="client-card">
-    <div class="client-card__item-info">
-      <InkInput v-model="client.name" type="inline" @confirm="saveClient" />
-      <span class="client-card__item-id">{{ client.id }}</span>
-      <InkInput v-model="client.rest_api_url" type="inline" @confirm="saveClient" />
-      <InkButton :text="t('client.editConfig')" size="sm" @click="onEditConfigClick" />
-    </div>
-    <span :class="['client-card__item-status', `client-card__item-status--${status}`]">
-      {{ getStatusText(status) }}
-    </span>
-
-    <InkDialog
-      v-model="configPopupOpen"
-      :title="t('client.editConfigTitle')"
-      @confirm="onConfirmConfig"
-    >
-      <InkJsonEditor v-model="configModel" />
-    </InkDialog>
-  </div>
-</template>
-
-<style lang="scss" scoped src="./clientCard.scss" />
diff --git a/apps/client-web/src/components/client/clientList/clientList.scss b/apps/client-web/src/components/client/clientList/clientList.scss
deleted file mode 100644
index a9226d8..0000000
--- a/apps/client-web/src/components/client/clientList/clientList.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-.client-list {
-  display: flex;
-  flex-direction: column;
-  gap: sys-var(space, md);
-
-  &__header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: sys-var(space, md);
-    border-bottom: 1px solid sys-var(color, border, base);
-  }
-
-  &__title {
-    @include apply-font(title-lg);
-    margin: 0;
-    color: sys-var(color, text, base);
-  }
-
-  &__actions {
-    display: flex;
-    gap: sys-var(space, sm);
-  }
-
-  &__list {
-    display: flex;
-    flex-direction: column;
-    gap: sys-var(space, sm);
-  }
-
-  &__item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: sys-var(space, md);
-    border: 1px solid sys-var(color, border, base);
-    background-color: sys-var(color, surface, base);
-  }
-
-  &__item-info {
-    display: flex;
-    flex-direction: column;
-    gap: sys-var(space, xs);
-  }
-
-  &__item-name {
-    @include apply-font(body-lg);
-    color: sys-var(color, text, base);
-  }
-
-  &__item-id {
-    @include apply-font(label-sm, mono);
-    color: sys-var(color, text, subtle);
-  }
-
-  &__item-url {
-    @include apply-font(label-sm);
-    color: sys-var(color, text, subtle);
-  }
-
-  &__item-status {
-    @include apply-font(label-md);
-    padding: sys-var(space, xs) sys-var(space, sm);
-    border-radius: sys-var(radius, sm);
-
-    &--online {
-      background-color: sys-var(color, success, surface);
-      color: sys-var(color, success, base);
-    }
-
-    &--offline {
-      background-color: sys-var(color, danger, surface);
-      color: sys-var(color, danger, base);
-    }
-
-    &--unknown {
-      background-color: sys-var(color, surface, subtle);
-      color: sys-var(color, text, subtle);
-    }
-  }
-
-  &__empty {
-    @include apply-font(body-lg);
-    color: sys-var(color, text, subtle);
-    text-align: center;
-    padding: sys-var(space, xl);
-  }
-}
diff --git a/apps/client-web/src/components/client/clientList/clientList.ts b/apps/client-web/src/components/client/clientList/clientList.ts
deleted file mode 100644
index 2cbc6ed..0000000
--- a/apps/client-web/src/components/client/clientList/clientList.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Props - none needed for this component (self-contained)
-export const clientListProps = {}
-
-// Emits - none needed (read-only display)
-export const clientListEmits = {}
diff --git a/apps/client-web/src/components/client/clientList/clientList.vue b/apps/client-web/src/components/client/clientList/clientList.vue
deleted file mode 100644
index dda19f0..0000000
--- a/apps/client-web/src/components/client/clientList/clientList.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { useAsyncState } from '@vueuse/core'
-import { InkButton, InkLoading } from '@inkcre/ui-web'
-import { Client } from '@inkcre/core'
-import ClientCard from '../clientCard/clientCard.vue'
-
-const { t } = useI18n()
-
-// --- data ---
-const {
-  state: clients,
-  execute: refreshClients,
-  isLoading: clientsLoading,
-} = useAsyncState(() => Client.list(), [], { immediate: true })
-
-const clientHealthStatus = ref<Record<string, 'online' | 'offline' | 'unknown'>>({})
-const healthCheckLoading = ref(false)
-
-// --- methods ---
-const checkAllHealth = async () => {
-  healthCheckLoading.value = true
-  const results: Record<string, 'online' | 'offline' | 'unknown'> = {}
-  await Promise.all(
-    clients.value.map(async (client) => {
-      results[client.id] = client.rest_api_url ? await client.ping() : 'unknown'
-    })
-  )
-  clientHealthStatus.value = results
-  healthCheckLoading.value = false
-}
-
-const getStatusText = (status: 'online' | 'offline' | 'unknown') => {
-  const statusMap = {
-    online: t('client.statusOnline'),
-    offline: t('client.statusOffline'),
-    unknown: t('client.statusUnknown'),
-  }
-  return statusMap[status]
-}
-
-const getClientStatus = (clientId: string) => {
-  return clientHealthStatus.value[clientId] || 'unknown'
-}
-</script>
-
-<template>
-  <section class="client-list">
-    <div class="client-list__header">
-      <h2 class="client-list__title">{{ t('client.listTitle') }}</h2>
-      <div class="client-list__actions">
-        <InkButton
-          :text="t('client.refresh')"
-          size="sm"
-          :loading="clientsLoading"
-          @click="() => refreshClients()"
-        />
-        <InkButton
-          :text="t('client.checkHealth')"
-          size="sm"
-          :loading="healthCheckLoading"
-          @click="checkAllHealth"
-        />
-      </div>
-    </div>
-
-    <InkLoading v-if="clientsLoading && clients.length === 0" />
-
-    <div v-else-if="clients.length === 0" class="client-list__empty">
-      {{ t('client.noClients') }}
-    </div>
-
-    <div v-else class="client-list__list">
-      <ClientCard
-        v-for="client in clients"
-        :key="client.id"
-        :client="client"
-        :status="getClientStatus(client.id)"
-        @updated="refreshClients"
-      />
-    </div>
-  </section>
-</template>
-
-<style lang="scss" scoped src="./clientList.scss" />
diff --git a/apps/client-web/src/components/extension/extensionCard/extensionCard.ts b/apps/client-web/src/components/extension/extensionCard/extensionCard.ts
index 69708ae..10b4085 100644
--- a/apps/client-web/src/components/extension/extensionCard/extensionCard.ts
+++ b/apps/client-web/src/components/extension/extensionCard/extensionCard.ts
@@ -1,10 +1,10 @@
 import { Extension, makeExtensionProp } from '@inkcre/core'
-import { makeClientRefProp } from '@inkcre/core'
+import { makePeerRefProp } from '@inkcre/core'
 
 // --- Props ---
 export const extensionCardProps = {
   extension: makeExtensionProp(),
-  clientId: makeClientRefProp(),
+  peerId: makePeerRefProp(),
 }
 
 // --- Emits ---
diff --git a/apps/client-web/src/components/extension/extensionCard/extensionCard.vue b/apps/client-web/src/components/extension/extensionCard/extensionCard.vue
index 995ea02..772b1f1 100644
--- a/apps/client-web/src/components/extension/extensionCard/extensionCard.vue
+++ b/apps/client-web/src/components/extension/extensionCard/extensionCard.vue
@@ -26,18 +26,18 @@ const toggleModel = computed({
   get: () => {
     return togglePromise.value
       ? togglePromise.value
-      : props.extension.isEnabledForClient(props.clientId)
+      : props.extension.isEnabledForPeer(props.peerId)
   },
   set: async (newValue: boolean) => {
     togglePromise.value = (async () => {
-      if (props.extension.isEnabledForClient(props.clientId)) {
-        await props.extension.disableForClient(props.clientId)
+      if (props.extension.isEnabledForPeer(props.peerId)) {
+        await props.extension.disableForPeer(props.peerId)
       } else {
-        await props.extension.enableForClient(props.clientId)
+        await props.extension.enableForPeer(props.peerId)
       }
       emit('toggle', props.extension)
       togglePromise.value = null
-      return props.extension.isEnabledForClient(props.clientId)
+      return props.extension.isEnabledForPeer(props.peerId)
     })()
   },
 })
@@ -50,7 +50,7 @@ const onConfirmConfig = () => {
   if (props.extension) {
     configPopupOpen.value = (async () => {
       try {
-        const updatedExtension = await props.extension.updateConfig(props.clientId)
+        const updatedExtension = await props.extension.updateConfig(props.peerId)
         emit('edit-config', updatedExtension)
         return false // close dialog
       } catch (error) {
diff --git a/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.scss b/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.scss
deleted file mode 100644
index 6d03dd2..0000000
--- a/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.scss
+++ /dev/null
@@ -1,98 +0,0 @@
-.block-details-panel {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  background: var(--ink-bg-primary, #ffffff);
-
-  &__header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 16px 20px;
-    border-bottom: 1px solid var(--ink-border-primary, #e5e7eb);
-  }
-
-  &__title {
-    margin: 0;
-    font-size: 16px;
-    font-weight: 600;
-    color: var(--ink-text-primary, #1f2937);
-  }
-
-  &__body {
-    flex: 1;
-    overflow-y: auto;
-    padding: 16px 20px;
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-  }
-
-  &__value {
-    font-size: 14px;
-    color: var(--ink-text-primary, #1f2937);
-
-    &--resolver {
-      font-family: monospace;
-      background: var(--ink-bg-secondary, #f3f4f6);
-      padding: 2px 8px;
-      border-radius: 4px;
-      font-size: 12px;
-    }
-  }
-
-  &__content-section {
-    margin-top: 8px;
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-  }
-
-  &__content-label {
-    font-size: 13px;
-    font-weight: 500;
-    color: var(--ink-text-secondary, #6b7280);
-  }
-
-  &__content {
-    padding: 12px;
-    background: var(--ink-bg-secondary, #f9fafb);
-    border: 1px solid var(--ink-border-primary, #e5e7eb);
-    border-radius: 6px;
-    font-size: 14px;
-    line-height: 1.6;
-    color: var(--ink-text-primary, #1f2937);
-    word-break: break-word;
-
-    :deep(p) {
-      margin: 0 0 8px;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    :deep(code) {
-      background: var(--ink-bg-tertiary, #e5e7eb);
-      padding: 1px 4px;
-      border-radius: 3px;
-      font-size: 13px;
-    }
-
-    :deep(a) {
-      color: var(--ink-accent-primary, #3b82f6);
-      text-decoration: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-
-  &__no-content {
-    padding: 24px;
-    text-align: center;
-    color: var(--ink-text-tertiary, #9ca3af);
-    font-style: italic;
-  }
-}
diff --git a/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.ts b/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.ts
deleted file mode 100644
index f9c3603..0000000
--- a/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { Block } from '@inkcre/core'
-import type { Relation } from '@inkcre/core'
-
-export interface BlockDetailsPanelProps {
-  block: Block
-  relations?: Relation[]
-}
-
-export const blockDetailsPanelEmits = {
-  close: () => true,
-} as const
diff --git a/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.vue b/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.vue
deleted file mode 100644
index 1a5b95c..0000000
--- a/apps/client-web/src/components/info-base/BlockDetailsPanel/BlockDetailsPanel.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<script setup lang="ts">
-import { computed, onMounted, onUnmounted } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { InkButton, InkField } from '@inkcre/ui-web'
-import type { BlockDetailsPanelProps } from './BlockDetailsPanel'
-import { blockDetailsPanelEmits } from './BlockDetailsPanel'
-import BlockContent from '@/components/info-base/block/BlockContent/BlockContent.vue'
-import dayjs from 'dayjs'
-
-const props = withDefaults(defineProps<BlockDetailsPanelProps>(), {
-  relations: () => [],
-})
-const emit = defineEmits(blockDetailsPanelEmits)
-const { t } = useI18n()
-
-const formattedCreatedAt = computed(() =>
-  props.block.created_at ? dayjs(props.block.created_at).format('YYYY-MM-DD HH:mm') : '-'
-)
-
-const formattedUpdatedAt = computed(() =>
-  props.block.updated_at ? dayjs(props.block.updated_at).format('YYYY-MM-DD HH:mm') : '-'
-)
-
-const onClose = () => {
-  emit('close')
-}
-
-const onKeyDown = (e: KeyboardEvent) => {
-  if (e.key === 'Escape') {
-    onClose()
-  }
-}
-
-onMounted(() => {
-  document.addEventListener('keydown', onKeyDown)
-})
-
-onUnmounted(() => {
-  document.removeEventListener('keydown', onKeyDown)
-})
-</script>
-
-<template>
-  <div class="block-details-panel">
-    <div class="block-details-panel__header">
-      <h3 class="block-details-panel__title">
-        {{ t('infoBase.blockDetails.title') }}
-      </h3>
-      <InkButton icon="i-mdi-close" theme="subtle" type="square" @click="onClose" />
-    </div>
-
-    <div class="block-details-panel__body">
-      <InkField :label="t('infoBase.blockDetails.id')" layout="inline">
-        <span class="block-details-panel__value">#{{ block.id }}</span>
-      </InkField>
-
-      <InkField :label="t('infoBase.blockDetails.resolver')" layout="inline">
-        <span class="block-details-panel__value block-details-panel__value--resolver">
-          {{ block.resolver }}
-        </span>
-      </InkField>
-
-      <InkField :label="t('infoBase.blockDetails.created')" layout="inline">
-        <span class="block-details-panel__value">{{ formattedCreatedAt }}</span>
-      </InkField>
-
-      <InkField :label="t('infoBase.blockDetails.updated')" layout="inline">
-        <span class="block-details-panel__value">{{ formattedUpdatedAt }}</span>
-      </InkField>
-
-      <InkField v-if="block.storage" :label="t('infoBase.blockDetails.storage')" layout="inline">
-        <span class="block-details-panel__value">#{{ block.storage }}</span>
-      </InkField>
-
-      <div class="block-details-panel__content-section">
-        <div class="block-details-panel__content-label">
-          {{ t('infoBase.blockDetails.content') }}
-        </div>
-        <div class="block-details-panel__content">
-          <BlockContent :block="block" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped src="./BlockDetailsPanel.scss" />
diff --git a/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.scss b/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.scss
new file mode 100644
index 0000000..41cfb0f
--- /dev/null
+++ b/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.scss
@@ -0,0 +1,51 @@
+.block-inspector-popup {
+  width: min(420px, 92vw);
+  height: 100%;
+  background: var(--ink-bg-primary, #fff);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 20px;
+    border-bottom: 1px solid var(--ink-border-primary, #e5e7eb);
+
+    h3 {
+      margin: 0;
+      font-size: 16px;
+    }
+  }
+
+  &__body,
+  &__state {
+    padding: 20px;
+  }
+
+  &__body {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  &__state {
+    display: flex;
+    min-height: 160px;
+    align-items: center;
+    justify-content: center;
+    color: var(--ink-text-secondary, #6b7280);
+  }
+
+  &__actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    padding-top: 12px;
+    border-top: 1px solid var(--ink-border-primary, #e5e7eb);
+
+    p {
+      width: 100%;
+      margin: 0;
+      font-size: 13px;
+    }
+  }
+}
diff --git a/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.ts b/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.ts
new file mode 100644
index 0000000..a43a1bc
--- /dev/null
+++ b/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.ts
@@ -0,0 +1,9 @@
+import type { BlockRef } from '@inkcre/core'
+
+export interface BlockInspectorPopupProps {
+  block: BlockRef
+}
+
+export const blockInspectorPopupEmits = {
+  ruminated: () => true,
+} as const
diff --git a/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.vue b/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.vue
new file mode 100644
index 0000000..fdbce2c
--- /dev/null
+++ b/apps/client-web/src/components/info-base/BlockInspectorPopup/BlockInspectorPopup.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { computed, ref, shallowRef, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+import dayjs from 'dayjs'
+import { InkButton, InkField, InkLoading, InkPopup } from '@inkcre/ui-web'
+import { Block, getInfoBaseRouter, OrganizationManager, PeerOutcomeUnknown } from '@inkcre/core'
+
+import type { BlockInspectorPopupProps } from './BlockInspectorPopup'
+import { blockInspectorPopupEmits } from './BlockInspectorPopup'
+
+const props = defineProps<BlockInspectorPopupProps>()
+const emit = defineEmits(blockInspectorPopupEmits)
+const { t } = useI18n()
+const router = getInfoBaseRouter()
+
+const open = ref(true)
+const status = ref<'loading' | 'success' | 'missing' | 'error'>('loading')
+const block = shallowRef<Block | null>(null)
+const error = shallowRef<Error | null>(null)
+const isRuminating = ref(false)
+const ruminationOutcome = ref<'success' | 'error' | 'outcome-unknown' | null>(null)
+let generation = 0
+
+const formattedCreatedAt = computed(() =>
+  block.value?.created_at ? dayjs(block.value.created_at).format('YYYY-MM-DD HH:mm') : '-'
+)
+const formattedUpdatedAt = computed(() =>
+  block.value?.updated_at ? dayjs(block.value.updated_at).format('YYYY-MM-DD HH:mm') : '-'
+)
+
+watch(
+  () => props.block,
+  async (blockRef) => {
+    const current = ++generation
+    status.value = 'loading'
+    block.value = null
+    error.value = null
+    try {
+      const loaded = await Block.find(blockRef)
+      if (current !== generation) return
+      block.value = loaded
+      status.value = loaded ? 'success' : 'missing'
+    } catch (cause) {
+      if (current !== generation) return
+      error.value = cause instanceof Error ? cause : new Error(String(cause))
+      status.value = 'error'
+    }
+  },
+  { immediate: true }
+)
+
+function close(): void {
+  void router.back()
+}
+
+function onOpenChange(value: boolean): void {
+  open.value = value
+  if (!value) close()
+}
+
+function viewSolvedContent(): void {
+  void router.push({ name: 'solved-content', block: props.block })
+}
+
+async function ruminate(): Promise<void> {
+  isRuminating.value = true
+  ruminationOutcome.value = null
+  try {
+    await OrganizationManager.ruminate(props.block)
+    ruminationOutcome.value = 'success'
+    emit('ruminated')
+  } catch (cause) {
+    ruminationOutcome.value = cause instanceof PeerOutcomeUnknown ? 'outcome-unknown' : 'error'
+  } finally {
+    isRuminating.value = false
+  }
+}
+</script>
+
+<template>
+  <InkPopup :open="open" position="right" @update:open="onOpenChange">
+    <section class="block-inspector-popup">
+      <header class="block-inspector-popup__header">
+        <h3>{{ t('infoBase.blockInspector.title') }}</h3>
+        <InkButton icon="i-mdi-close" theme="subtle" type="square" @click="close" />
+      </header>
+
+      <div v-if="status === 'loading'" class="block-inspector-popup__state"><InkLoading /></div>
+      <div v-else-if="status === 'missing'" class="block-inspector-popup__state">
+        {{ t('infoBase.blockInspector.missing', { block: props.block }) }}
+      </div>
+      <div v-else-if="status === 'error'" class="block-inspector-popup__state">
+        {{ error?.message }}
+      </div>
+
+      <div v-else-if="block" class="block-inspector-popup__body">
+        <InkField :label="t('infoBase.blockInspector.id')" layout="inline"
+          >#{{ block.id }}</InkField
+        >
+        <InkField :label="t('infoBase.blockInspector.resolver')" layout="inline">
+          <code>{{ block.resolver }}</code>
+        </InkField>
+        <InkField :label="t('infoBase.blockInspector.created')" layout="inline">
+          {{ formattedCreatedAt }}
+        </InkField>
+        <InkField :label="t('infoBase.blockInspector.updated')" layout="inline">
+          {{ formattedUpdatedAt }}
+        </InkField>
+        <InkField
+          v-if="block.storage !== null"
+          :label="t('infoBase.blockInspector.storage')"
+          layout="inline"
+        >
+          #{{ block.storage }}
+        </InkField>
+
+        <div class="block-inspector-popup__actions">
+          <InkButton
+            :text="t('infoBase.blockInspector.viewContent')"
+            theme="primary"
+            @click="viewSolvedContent"
+          />
+          <InkButton
+            :text="t('infoBase.blockInspector.ruminate')"
+            :loading="isRuminating"
+            @click="ruminate"
+          />
+          <p v-if="ruminationOutcome">
+            {{ t(`infoBase.blockInspector.rumination.${ruminationOutcome}`) }}
+          </p>
+        </div>
+      </div>
+    </section>
+  </InkPopup>
+</template>
+
+<style lang="scss" scoped src="./BlockInspectorPopup.scss" />
diff --git a/apps/client-web/src/components/info-base/BlockNode/BlockNode.vue b/apps/client-web/src/components/info-base/BlockNode/BlockNode.vue
index 45e4830..d53c406 100644
--- a/apps/client-web/src/components/info-base/BlockNode/BlockNode.vue
+++ b/apps/client-web/src/components/info-base/BlockNode/BlockNode.vue
@@ -2,7 +2,6 @@
 import { Handle, Position } from '@vue-flow/core'
 import type { BlockNodeProps } from './BlockNode'
 import { blockNodeEmits } from './BlockNode'
-import BlockContent from '../block/BlockContent/BlockContent.vue'
 
 const props = defineProps<BlockNodeProps>()
 const emit = defineEmits(blockNodeEmits)
@@ -20,7 +19,10 @@ const onNodeClick = () => {
   <Handle type="source" :position="Position.Right" class="block-node__handle" />
 
   <div class="block-node" :class="{ 'block-node--selected': selected }" @click="onNodeClick">
-    <BlockContent :block="props.data.block" />
+    <div class="block-node__content">
+      <span class="block-node__resolver">{{ props.data.block.resolver }}</span>
+      <span class="block-node__preview">{{ props.data.preview }}</span>
+    </div>
   </div>
 </template>
 
diff --git a/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.scss b/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.scss
new file mode 100644
index 0000000..b8a5df8
--- /dev/null
+++ b/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.scss
@@ -0,0 +1,39 @@
+.solved-content-popup {
+  display: flex;
+  flex-direction: column;
+  width: min(900px, 94vw);
+  max-height: 88vh;
+  background: var(--ink-bg-primary, #fff);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 20px;
+    border-bottom: 1px solid var(--ink-border-primary, #e5e7eb);
+
+    h3 {
+      margin: 0;
+      font-size: 16px;
+    }
+  }
+
+  &__controls {
+    display: flex;
+    gap: 8px;
+  }
+
+  &__content {
+    overflow: auto;
+    padding: 20px;
+  }
+
+  &__state {
+    display: flex;
+    min-height: 240px;
+    align-items: center;
+    justify-content: center;
+    padding: 20px;
+    color: var(--ink-text-secondary, #6b7280);
+  }
+}
diff --git a/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.ts b/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.ts
new file mode 100644
index 0000000..7738601
--- /dev/null
+++ b/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.ts
@@ -0,0 +1,5 @@
+import type { BlockRef } from '@inkcre/core'
+
+export interface SolvedContentPopupProps {
+  block: BlockRef
+}
diff --git a/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.vue b/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.vue
new file mode 100644
index 0000000..20e3c21
--- /dev/null
+++ b/apps/client-web/src/components/info-base/SolvedContentPopup/SolvedContentPopup.vue
@@ -0,0 +1,110 @@
+<script setup lang="ts">
+import { onUnmounted, ref, shallowRef, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { InkButton, InkLoading, InkPopup } from '@inkcre/ui-web'
+import { Block, getInfoBaseRouter, Resolver } from '@inkcre/core'
+
+import SolvedContentRenderer from '@/components/info-base/SolvedContentRenderer/SolvedContentRenderer.vue'
+import type { SolvedContentPopupProps } from './SolvedContentPopup'
+
+const props = defineProps<SolvedContentPopupProps>()
+const { t } = useI18n()
+const router = getInfoBaseRouter()
+
+const open = ref(true)
+const status = ref<'loading' | 'success' | 'missing' | 'error'>('loading')
+const resolver = shallowRef<Resolver | null>(null)
+const solvedContent = shallowRef<unknown>(null)
+const error = shallowRef<Error | null>(null)
+let generation = 0
+
+async function load(refresh = false): Promise<void> {
+  const current = ++generation
+  const previous = resolver.value
+  resolver.value = null
+  solvedContent.value = null
+  error.value = null
+  status.value = 'loading'
+  await previous?.dispose()
+
+  let next: Resolver | null = null
+  try {
+    const block = await Block.find(props.block)
+    if (current !== generation) return
+    if (!block) {
+      status.value = 'missing'
+      return
+    }
+    const resolverClass = Resolver.getClass(block.resolver)
+    next = new resolverClass(block)
+    const solved = await next.getSolvedContent({ refresh, materializeMissing: false })
+    if (current !== generation) {
+      await next.dispose()
+      return
+    }
+    resolver.value = next
+    solvedContent.value = solved
+    status.value = 'success'
+  } catch (cause) {
+    await next?.dispose()
+    if (current !== generation) return
+    error.value = cause instanceof Error ? cause : new Error(String(cause))
+    status.value = 'error'
+  }
+}
+
+watch(
+  () => props.block,
+  () => void load(),
+  { immediate: true }
+)
+onUnmounted(() => {
+  generation += 1
+  void resolver.value?.dispose()
+})
+
+function close(): void {
+  void router.back()
+}
+
+function onOpenChange(value: boolean): void {
+  open.value = value
+  if (!value) close()
+}
+</script>
+
+<template>
+  <InkPopup :open="open" position="center" @update:open="onOpenChange">
+    <section class="solved-content-popup">
+      <header class="solved-content-popup__header">
+        <h3>{{ t('infoBase.solvedContent.title') }}</h3>
+        <div class="solved-content-popup__controls">
+          <InkButton
+            icon="i-mdi-refresh"
+            theme="subtle"
+            type="square"
+            :disabled="status === 'loading'"
+            @click="load(true)"
+          />
+          <InkButton icon="i-mdi-close" theme="subtle" type="square" @click="close" />
+        </div>
+      </header>
+
+      <div v-if="status === 'loading'" class="solved-content-popup__state"><InkLoading /></div>
+      <div v-else-if="status === 'missing'" class="solved-content-popup__state">
+        {{ t('infoBase.solvedContent.missing', { block: props.block }) }}
+      </div>
+      <div v-else-if="status === 'error'" class="solved-content-popup__state">
+        {{ error?.message }}
+      </div>
+      <SolvedContentRenderer
+        v-else-if="resolver"
+        class="solved-content-popup__content"
+        :resolver="resolver"
+        :solved-content="solvedContent"
+      />
+    </section>
+  </InkPopup>
+</template>
+
+<style lang="scss" scoped src="./SolvedContentPopup.scss" />
diff --git a/apps/client-web/src/components/info-base/SolvedContentRenderer/SolvedContentRenderer.ts b/apps/client-web/src/components/info-base/SolvedContentRenderer/SolvedContentRenderer.ts
new file mode 100644
index 0000000..948a3ca
--- /dev/null
+++ b/apps/client-web/src/components/info-base/SolvedContentRenderer/SolvedContentRenderer.ts
@@ -0,0 +1,6 @@
+import type { Resolver } from '@inkcre/core'
+
+export interface SolvedContentRendererProps {
+  resolver: Resolver
+  solvedContent: unknown
+}
diff --git a/apps/client-web/src/components/info-base/SolvedContentRenderer/SolvedContentRenderer.vue b/apps/client-web/src/components/info-base/SolvedContentRenderer/SolvedContentRenderer.vue
new file mode 100644
index 0000000..0c805dd
--- /dev/null
+++ b/apps/client-web/src/components/info-base/SolvedContentRenderer/SolvedContentRenderer.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Resolver } from '@inkcre/core'
+
+import type { SolvedContentRendererProps } from './SolvedContentRenderer'
+
+const props = defineProps<SolvedContentRendererProps>()
+const renderer = computed(
+  () => Resolver.getClass(props.resolver.block.resolver).solvedContentRenderer
+)
+</script>
+
+<template>
+  <component :is="renderer" :resolver="resolver" :solved-content="solvedContent" />
+</template>
diff --git a/apps/client-web/src/components/info-base/block/BlockContent/BlockContent.scss b/apps/client-web/src/components/info-base/block/BlockContent/BlockContent.scss
deleted file mode 100644
index d2999e7..0000000
--- a/apps/client-web/src/components/info-base/block/BlockContent/BlockContent.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-.block-content {
-  &__loading {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    gap: sys-var(space, sm);
-    width: 100%;
-    height: 100%;
-    min-height: 60px;
-    background: sys-var(color, surface, subtle);
-  }
-
-  &__error {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    gap: sys-var(space, xs);
-    width: 100%;
-    height: 100%;
-    min-height: 60px;
-    padding: sys-var(space, md);
-    background: sys-var(color, surface, subtle);
-  }
-
-  &__error-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
-    background: sys-var(color, status, error);
-    color: white;
-    @include apply-font(label-lg);
-    font-weight: 600;
-  }
-
-  &__error-text {
-    @include apply-font(label-sm);
-    color: sys-var(color, text, subtle);
-    text-align: center;
-    word-break: break-word;
-  }
-
-  &__fallback {
-    @include apply-font(label-lg);
-    color: sys-var(color, text, subtle);
-    padding: sys-var(space, sm) sys-var(space, md);
-    word-break: break-word;
-  }
-}
diff --git a/apps/client-web/src/components/info-base/block/BlockContent/BlockContent.vue b/apps/client-web/src/components/info-base/block/BlockContent/BlockContent.vue
deleted file mode 100644
index 47e1a1c..0000000
--- a/apps/client-web/src/components/info-base/block/BlockContent/BlockContent.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref } from 'vue'
-import { Resolver } from '@inkcre/core'
-import type { Block } from '@inkcre/core'
-import { InkLoading } from '@inkcre/ui-web'
-
-const props = defineProps<{
-  block: Block
-}>()
-
-// --- data ---
-const solvedContent = ref<any>(null)
-const resolverCls = Resolver.getClass(props.block.resolver)
-const resolver = new resolverCls(props.block)
-
-// --- computed ---
-const state = resolver.solvedContentState
-const isLoading = computed(() => state.value.status === 'loading')
-const isError = computed(() => state.value.status === 'error')
-const isIdle = computed(() => state.value.status === 'idle')
-
-onMounted(async () => {
-  solvedContent.value = await resolver.getSolvedContent()
-})
-
-onUnmounted(async () => {
-  await resolver.dispose()
-})
-</script>
-
-<template>
-  <div
-    class="block-content"
-    :class="{
-      'block-content--loading': isLoading,
-      'block-content--error': isError,
-    }"
-  >
-    <!-- Loading State -->
-    <div v-if="isLoading || isIdle" class="block-content__loading">
-      <ink-loading size="sm" />
-    </div>
-
-    <!-- Error State -->
-    <div v-else-if="isError" class="block-content__error">
-      <span class="block-content__error-icon">!</span>
-      <span class="block-content__error-text">
-        {{ state.error?.message || 'Failed to load content' }}
-      </span>
-    </div>
-
-    <!-- Success State - Render actual content component -->
-    <component
-      v-else-if="solvedContent"
-      :is="resolverCls.contentComp"
-      :solvedContent="solvedContent"
-    />
-
-    <!-- Fallback for unknown state -->
-    <div v-else class="block-content__fallback">
-      {{ block.content }}
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped src="./BlockContent.scss" />
diff --git a/apps/client-web/src/components/info-base/resolvers/ContentAudio.vue b/apps/client-web/src/components/info-base/resolvers/ContentAudio.vue
new file mode 100644
index 0000000..0146e86
--- /dev/null
+++ b/apps/client-web/src/components/info-base/resolvers/ContentAudio.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import type { AudioSolvedContent, SolvedContentRendererProps } from '@inkcre/core'
+
+defineProps<SolvedContentRendererProps<AudioSolvedContent>>()
+</script>
+
+<template>
+  <div class="content-audio">
+    <audio :src="solvedContent.objectUrl" controls preload="metadata" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.content-audio {
+  padding: sys-var(space, sm);
+  background: sys-var(color, surface, subtle);
+
+  audio {
+    display: block;
+    width: 100%;
+  }
+}
+</style>
diff --git a/apps/client-web/src/components/info-base/resolvers/ContentFile.vue b/apps/client-web/src/components/info-base/resolvers/ContentFile.vue
new file mode 100644
index 0000000..620b22d
--- /dev/null
+++ b/apps/client-web/src/components/info-base/resolvers/ContentFile.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { ByteSolvedContent, SolvedContentRendererProps } from '@inkcre/core'
+
+const props = defineProps<SolvedContentRendererProps<ByteSolvedContent>>()
+
+const label = computed(() => props.resolver.block.resolver.split('.')[1]?.toUpperCase() ?? 'FILE')
+</script>
+
+<template>
+  <div class="content-file">
+    <span class="content-file__label">{{ label }}</span>
+    <span class="content-file__size">{{ solvedContent.byte_size }} bytes</span>
+    <a :href="solvedContent.objectUrl" target="_blank" rel="noopener">Open</a>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.content-file {
+  display: flex;
+  align-items: center;
+  gap: sys-var(space, sm);
+  padding: sys-var(space, sm) sys-var(space, md);
+  background: sys-var(color, surface, subtle);
+
+  &__label {
+    @include apply-font(label-sm, true);
+  }
+
+  &__size {
+    color: sys-var(color, text, subtle);
+  }
+}
+</style>
diff --git a/apps/client-web/src/components/info-base/resolvers/ContentHtml.vue b/apps/client-web/src/components/info-base/resolvers/ContentHtml.vue
index 3d4d978..f9d8e8b 100644
--- a/apps/client-web/src/components/info-base/resolvers/ContentHtml.vue
+++ b/apps/client-web/src/components/info-base/resolvers/ContentHtml.vue
@@ -1,35 +1,14 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import type { ContentCompProps } from '@inkcre/core'
-import type { HtmlContent } from '@inkcre/core'
-
-type HtmlRawContent = string | HtmlContent
-
-const props = defineProps<ContentCompProps<HtmlRawContent>>()
+import type { SolvedContentRendererProps } from '@inkcre/core'
+const props = defineProps<SolvedContentRendererProps<string>>()
 
 const displayContent = computed(() => {
-  let html: string
-  let title: string | undefined
-
-  if (typeof props.solvedContent === 'string') {
-    html = props.solvedContent
-  } else {
-    const content = props.solvedContent as HtmlContent
-    html = content.html
-    title = content.title
-  }
-
-  // If we have a title, show that
-  if (title) {
-    return { type: 'title' as const, text: title }
-  }
-
-  // Extract text content from HTML for preview
-  const textContent = stripHtml(html)
+  const textContent = stripHtml(props.solvedContent)
   const maxLen = 80
   const preview = textContent.length > maxLen ? textContent.slice(0, maxLen) + '...' : textContent
 
-  return { type: 'preview' as const, text: preview || '[HTML]' }
+  return preview || '[HTML]'
 })
 
 function stripHtml(html: string): string {
@@ -45,12 +24,7 @@ function stripHtml(html: string): string {
 <template>
   <div class="content-html">
     <div class="content-html__badge">HTML</div>
-    <div v-if="displayContent.type === 'title'" class="content-html__title">
-      {{ displayContent.text }}
-    </div>
-    <div v-else class="content-html__preview">
-      {{ displayContent.text }}
-    </div>
+    <div class="content-html__preview">{{ displayContent }}</div>
   </div>
 </template>
 
diff --git a/apps/client-web/src/components/info-base/resolvers/ContentImage.vue b/apps/client-web/src/components/info-base/resolvers/ContentImage.vue
index aa071c4..31a6e03 100644
--- a/apps/client-web/src/components/info-base/resolvers/ContentImage.vue
+++ b/apps/client-web/src/components/info-base/resolvers/ContentImage.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import type { ContentCompProps } from '@inkcre/core'
+import type { SolvedContentRendererProps } from '@inkcre/core'
+import type { ImageSolvedContent } from '@inkcre/core'
 
-// ImageResolver transforms Blob to Object URL string
-const props = defineProps<ContentCompProps<string>>()
+const props = defineProps<SolvedContentRendererProps<ImageSolvedContent>>()
 
 const imageError = ref(false)
 
@@ -16,7 +16,7 @@ const onError = () => {
   <div class="content-image">
     <img
       v-if="!imageError"
-      :src="props.solvedContent"
+      :src="props.solvedContent.objectUrl"
       alt="Block image"
       class="content-image__img"
       @error="onError"
diff --git a/apps/client-web/src/components/info-base/resolvers/ContentText.vue b/apps/client-web/src/components/info-base/resolvers/ContentText.vue
index 73b4dc8..c782180 100644
--- a/apps/client-web/src/components/info-base/resolvers/ContentText.vue
+++ b/apps/client-web/src/components/info-base/resolvers/ContentText.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import type { ContentCompProps } from '@inkcre/core'
+import type { SolvedContentRendererProps } from '@inkcre/core'
 
-const props = defineProps<ContentCompProps<string>>()
+const props = defineProps<SolvedContentRendererProps<string>>()
 
 const displayText = computed(() => {
   const text = props.solvedContent
diff --git a/apps/client-web/src/components/info-base/resolvers/ContentVideo.vue b/apps/client-web/src/components/info-base/resolvers/ContentVideo.vue
index 5522904..218ddeb 100644
--- a/apps/client-web/src/components/info-base/resolvers/ContentVideo.vue
+++ b/apps/client-web/src/components/info-base/resolvers/ContentVideo.vue
@@ -1,94 +1,23 @@
 <script setup lang="ts">
-import { ref, computed } from 'vue'
-import type { ContentCompProps } from '@inkcre/core'
-import type { VideoContent } from '@inkcre/core'
+import type { SolvedContentRendererProps, VideoSolvedContent } from '@inkcre/core'
 
-type VideoRawContent = string | VideoContent
-
-const props = defineProps<ContentCompProps<VideoRawContent>>()
-
-const thumbnailError = ref(false)
-
-const thumbnailUrl = computed(() => {
-  if (typeof props.solvedContent !== 'string') {
-    const content = props.solvedContent as VideoContent
-    if (content.thumbnailUrl) {
-      return content.thumbnailUrl
-    }
-  }
-  return null
-})
-
-const onThumbnailError = () => {
-  thumbnailError.value = true
-}
+defineProps<SolvedContentRendererProps<VideoSolvedContent>>()
 </script>
 
 <template>
   <div class="content-video">
-    <img
-      v-if="thumbnailUrl && !thumbnailError"
-      :src="thumbnailUrl"
-      alt="Video thumbnail"
-      class="content-video__thumbnail"
-      @error="onThumbnailError"
-    />
-    <div v-else class="content-video__placeholder">
-      <span class="content-video__icon">
-        <svg
-          width="24"
-          height="24"
-          viewBox="0 0 24 24"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path d="M8 5v14l11-7L8 5z" fill="currentColor" />
-        </svg>
-      </span>
-    </div>
-    <div class="content-video__badge">VIDEO</div>
+    <video :src="solvedContent.objectUrl" controls preload="metadata" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .content-video {
-  position: relative;
-  border-radius: sys-var(radius, none);
-  overflow: hidden;
   background: sys-var(color, surface, subtle);
-  display: flex;
-  align-items: center;
-  justify-content: center;
 
-  &__thumbnail {
+  video {
+    display: block;
     width: 100%;
-    height: 100%;
-    object-fit: cover;
-  }
-
-  &__placeholder {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-    background: sys-var(color, surface, subtle);
-  }
-
-  &__icon {
-    color: sys-var(color, text, subtle);
-    opacity: 0.6;
-  }
-
-  &__badge {
-    position: absolute;
-    bottom: 4px;
-    right: 4px;
-    padding: 2px 6px;
-    background: rgba(0, 0, 0, 0.6);
-    color: white;
-    @include apply-font(label-sm, true);
-    border-radius: 2px;
+    max-height: 240px;
   }
 }
 </style>
diff --git a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.md b/apps/client-web/src/components/job/JobCard/JobCard.md
similarity index 53%
rename from apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.md
rename to apps/client-web/src/components/job/JobCard/JobCard.md
index 95d3411..0ea3b59 100644
--- a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.md
+++ b/apps/client-web/src/components/job/JobCard/JobCard.md
@@ -1,12 +1,12 @@
-# sourceCollectJobCard
+# JobCard
 
 ## Rationale
 
-Provides a card component to display source collect job information in a list.
+Provides a card component to display Job information in a list.
 
 ## Goals
 
-Display collect job details in a consistent, clickable card format.
+Display Job details in a consistent, clickable card format.
 
 ## Specification
 
@@ -18,7 +18,7 @@ Display collect job details in a consistent, clickable card format.
 
 ### Props
 
-- `job` (`SourceCollectJob`, required): The job data to display
+- `job` (`Job`, required): The job data to display
 
 ### Events
 
diff --git a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.scss b/apps/client-web/src/components/job/JobCard/JobCard.scss
similarity index 97%
rename from apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.scss
rename to apps/client-web/src/components/job/JobCard/JobCard.scss
index 8e8f570..a1ed03d 100644
--- a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.scss
+++ b/apps/client-web/src/components/job/JobCard/JobCard.scss
@@ -1,4 +1,4 @@
-.source-collect-job-card {
+.job-card {
   display: flex;
   flex-direction: column;
   gap: sys-var(space, xs);
diff --git a/apps/client-web/src/components/job/JobCard/JobCard.ts b/apps/client-web/src/components/job/JobCard/JobCard.ts
new file mode 100644
index 0000000..5d723a4
--- /dev/null
+++ b/apps/client-web/src/components/job/JobCard/JobCard.ts
@@ -0,0 +1,15 @@
+import type { PropType } from 'vue'
+import { Job } from '@inkcre/core'
+
+// --- Props ---
+export const jobCardProps = {
+  job: {
+    type: Object as PropType<Job>,
+    required: true,
+  },
+} as const
+
+// --- Emits ---
+export const jobCardEmits = {
+  click: () => true,
+} as const
diff --git a/apps/client-web/src/components/job/JobCard/JobCard.vue b/apps/client-web/src/components/job/JobCard/JobCard.vue
new file mode 100644
index 0000000..b053967
--- /dev/null
+++ b/apps/client-web/src/components/job/JobCard/JobCard.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { jobCardProps, jobCardEmits } from './JobCard'
+import { JobStatus } from '@inkcre/core'
+import dayjs from 'dayjs'
+
+const props = defineProps(jobCardProps)
+const emit = defineEmits(jobCardEmits)
+const { t } = useI18n()
+
+// --- computed ---
+const statusColor = computed(() => {
+  switch (props.job.status) {
+    case JobStatus.PENDING:
+      return 'status--pending'
+    case JobStatus.RUNNING:
+      return 'status--running'
+    case JobStatus.FINISHED:
+      return 'status--finished'
+    case JobStatus.FAILED:
+      return 'status--failed'
+    default:
+      return ''
+  }
+})
+
+// --- methods ---
+const formatDate = (date: Date | null) => {
+  if (!date) return t('job.notAvailable')
+  return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
+}
+
+const onClick = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="job-card" @click="onClick">
+    <div class="job-card__header">
+      <span class="job-card__id">#{{ job.id }}</span>
+      <span class="job-card__status" :class="statusColor">
+        {{ job.status }}
+      </span>
+    </div>
+    <div class="job-card__dates">
+      <span class="job-card__date">
+        {{ t('job.createdAt') }}: {{ formatDate(job.created_at) }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped src="./JobCard.scss" />
diff --git a/apps/client-web/src/components/obsrv/LogsViewer/LogsViewer.md b/apps/client-web/src/components/obsrv/LogsViewer/LogsViewer.md
index fc78479..3024062 100644
--- a/apps/client-web/src/components/obsrv/LogsViewer/LogsViewer.md
+++ b/apps/client-web/src/components/obsrv/LogsViewer/LogsViewer.md
@@ -42,6 +42,6 @@ The component displays logs filtered by trace ID in a scrollable container. It s
 - Loading state indicator appears only when polling is active
 - Error state shows inline error message instead of logs
 - Auto-scroll to bottom via CSS (no JavaScript scroll management)
-- Reuses existing log styles from sourceCollectJob.scss
+- Uses its own presentation-neutral log styles
 - Integrates LogEntry component for individual log rendering
 - Watches traceId changes and reloads logs accordingly
diff --git a/apps/client-web/src/components/peer/peerCard/peerCard.md b/apps/client-web/src/components/peer/peerCard/peerCard.md
new file mode 100644
index 0000000..b420f76
--- /dev/null
+++ b/apps/client-web/src/components/peer/peerCard/peerCard.md
@@ -0,0 +1,5 @@
+# peerCard
+
+Displays one technical Peer while retaining the product-facing “client” language. Name and
+owner config are editable shared facts；online status comes from database-time lease filtering，
+not an ad-hoc health endpoint。
diff --git a/apps/client-web/src/components/client/clientCard/clientCard.scss b/apps/client-web/src/components/peer/peerCard/peerCard.scss
similarity index 77%
rename from apps/client-web/src/components/client/clientCard/clientCard.scss
rename to apps/client-web/src/components/peer/peerCard/peerCard.scss
index 4bb3995..0a84125 100644
--- a/apps/client-web/src/components/client/clientCard/clientCard.scss
+++ b/apps/client-web/src/components/peer/peerCard/peerCard.scss
@@ -1,4 +1,4 @@
-.client-card {
+.peer-card {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -12,17 +12,12 @@
     gap: sys-var(space, xs);
   }
 
-  &__item-name {
-    @include apply-font(body-lg);
-    color: sys-var(color, text, base);
-  }
-
   &__item-id {
     @include apply-font(label-sm, mono);
     color: sys-var(color, text, subtle);
   }
 
-  &__item-url {
+  &__item-capabilities {
     @include apply-font(label-sm);
     color: sys-var(color, text, subtle);
   }
@@ -47,15 +42,4 @@
       color: sys-var(color, text, subtle);
     }
   }
-
-  &__edit {
-    display: flex;
-    flex-direction: column;
-    gap: sys-var(space, xs);
-  }
-
-  &__edit-actions {
-    display: flex;
-    gap: sys-var(space, sm);
-  }
 }
diff --git a/apps/client-web/src/components/client/clientCard/clientCard.ts b/apps/client-web/src/components/peer/peerCard/peerCard.ts
similarity index 52%
rename from apps/client-web/src/components/client/clientCard/clientCard.ts
rename to apps/client-web/src/components/peer/peerCard/peerCard.ts
index d49e8e8..aaa03bd 100644
--- a/apps/client-web/src/components/client/clientCard/clientCard.ts
+++ b/apps/client-web/src/components/peer/peerCard/peerCard.ts
@@ -1,14 +1,14 @@
 import { type PropType } from 'vue'
-import { Client } from '@inkcre/core'
+import { Peer } from '@inkcre/core'
 
-export const clientCardProps = {
-  client: { type: Object as PropType<Client>, required: true },
+export const peerCardProps = {
+  peer: { type: Object as PropType<Peer>, required: true },
   status: {
     type: String as PropType<'online' | 'offline' | 'unknown'>,
     required: true,
   },
 } as const
 
-export const clientCardEmits = {
+export const peerCardEmits = {
   updated: () => true,
 } as const
diff --git a/apps/client-web/src/components/peer/peerCard/peerCard.vue b/apps/client-web/src/components/peer/peerCard/peerCard.vue
new file mode 100644
index 0000000..0173bd0
--- /dev/null
+++ b/apps/client-web/src/components/peer/peerCard/peerCard.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { InkButton, InkDialog, InkInput, InkJsonEditor } from '@inkcre/ui-web'
+import { peerCardEmits, peerCardProps } from './peerCard'
+
+const props = defineProps(peerCardProps)
+const emit = defineEmits(peerCardEmits)
+const { t } = useI18n()
+
+const configPopupOpen = ref(false)
+const configModel = computed({
+  get: () => JSON.stringify(props.peer.config ?? {}, null, 2),
+  set: (newValue: string) => {
+    props.peer.config = JSON.parse(newValue)
+  },
+})
+
+const savePeer = async () => {
+  try {
+    await props.peer.save()
+    emit('updated')
+  } catch (error) {
+    console.error('Failed to update Peer:', error)
+    alert('Failed to update client')
+  }
+}
+
+const onConfirmConfig = async () => {
+  try {
+    await props.peer.saveConfig()
+    emit('updated')
+    configPopupOpen.value = false
+  } catch (error) {
+    console.error('Failed to update Peer config:', error)
+    alert('Failed to update client config')
+  }
+}
+
+const getStatusText = (status: 'online' | 'offline' | 'unknown') => {
+  const statusMap = {
+    online: t('client.statusOnline'),
+    offline: t('client.statusOffline'),
+    unknown: t('client.statusUnknown'),
+  }
+  return statusMap[status]
+}
+</script>
+
+<template>
+  <div class="peer-card">
+    <div class="peer-card__item-info">
+      <InkInput v-model="peer.name" type="inline" @confirm="savePeer" />
+      <span class="peer-card__item-id">{{ peer.id }}</span>
+      <span class="peer-card__item-capabilities">
+        {{ peer.capabilities.length }} capabilities
+      </span>
+      <InkButton :text="t('client.editConfig')" size="sm" @click="configPopupOpen = true" />
+    </div>
+    <span :class="['peer-card__item-status', `peer-card__item-status--${status}`]">
+      {{ getStatusText(status) }}
+    </span>
+
+    <InkDialog
+      v-model="configPopupOpen"
+      :title="t('client.editConfigTitle')"
+      @confirm="onConfirmConfig"
+    >
+      <InkJsonEditor v-model="configModel" :schema="peer.config_schema" />
+    </InkDialog>
+  </div>
+</template>
+
+<style lang="scss" scoped src="./peerCard.scss" />
diff --git a/apps/client-web/src/components/peer/peerList/peerList.scss b/apps/client-web/src/components/peer/peerList/peerList.scss
new file mode 100644
index 0000000..61bce24
--- /dev/null
+++ b/apps/client-web/src/components/peer/peerList/peerList.scss
@@ -0,0 +1,37 @@
+.peer-list {
+  display: flex;
+  flex-direction: column;
+  gap: sys-var(space, md);
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: sys-var(space, md);
+    border-bottom: 1px solid sys-var(color, border, base);
+  }
+
+  &__title {
+    @include apply-font(title-lg);
+    margin: 0;
+    color: sys-var(color, text, base);
+  }
+
+  &__actions {
+    display: flex;
+    gap: sys-var(space, sm);
+  }
+
+  &__list {
+    display: flex;
+    flex-direction: column;
+    gap: sys-var(space, sm);
+  }
+
+  &__empty {
+    @include apply-font(body-lg);
+    color: sys-var(color, text, subtle);
+    text-align: center;
+    padding: sys-var(space, xl);
+  }
+}
diff --git a/apps/client-web/src/components/peer/peerList/peerList.ts b/apps/client-web/src/components/peer/peerList/peerList.ts
new file mode 100644
index 0000000..f5db428
--- /dev/null
+++ b/apps/client-web/src/components/peer/peerList/peerList.ts
@@ -0,0 +1,2 @@
+export const peerListProps = {}
+export const peerListEmits = {}
diff --git a/apps/client-web/src/components/peer/peerList/peerList.vue b/apps/client-web/src/components/peer/peerList/peerList.vue
new file mode 100644
index 0000000..04386a1
--- /dev/null
+++ b/apps/client-web/src/components/peer/peerList/peerList.vue
@@ -0,0 +1,69 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useAsyncState } from '@vueuse/core'
+import { InkButton, InkLoading } from '@inkcre/ui-web'
+import { Peer, PeerManager } from '@inkcre/core'
+import PeerCard from '../peerCard/peerCard.vue'
+
+const { t } = useI18n()
+const {
+  state: peers,
+  execute: refreshPeers,
+  isLoading: peersLoading,
+} = useAsyncState(() => Peer.list(), [], { immediate: true })
+const livePeers = ref(new Set<string>())
+const healthCheckLoading = ref(false)
+
+const checkAllHealth = async () => {
+  healthCheckLoading.value = true
+  try {
+    livePeers.value = new Set((await PeerManager.listLive()).map((peer) => peer.id))
+  } finally {
+    healthCheckLoading.value = false
+  }
+}
+
+const getPeerStatus = (peer: Peer): 'online' | 'offline' | 'unknown' => {
+  if (peer.lease_expires_at === null) return 'unknown'
+  return livePeers.value.has(peer.id) ? 'online' : 'offline'
+}
+</script>
+
+<template>
+  <section class="peer-list">
+    <div class="peer-list__header">
+      <h2 class="peer-list__title">{{ t('client.listTitle') }}</h2>
+      <div class="peer-list__actions">
+        <InkButton
+          :text="t('client.refresh')"
+          size="sm"
+          :loading="peersLoading"
+          @click="() => refreshPeers()"
+        />
+        <InkButton
+          :text="t('client.checkHealth')"
+          size="sm"
+          :loading="healthCheckLoading"
+          @click="checkAllHealth"
+        />
+      </div>
+    </div>
+
+    <InkLoading v-if="peersLoading && peers.length === 0" />
+    <div v-else-if="peers.length === 0" class="peer-list__empty">
+      {{ t('client.noClients') }}
+    </div>
+    <div v-else class="peer-list__list">
+      <PeerCard
+        v-for="peer in peers"
+        :key="peer.id"
+        :peer="peer"
+        :status="getPeerStatus(peer)"
+        @updated="refreshPeers"
+      />
+    </div>
+  </section>
+</template>
+
+<style lang="scss" scoped src="./peerList.scss" />
diff --git a/apps/client-web/src/components/source/collectAtForm/collectAtForm.md b/apps/client-web/src/components/source/collectAtForm/collectAtForm.md
deleted file mode 100644
index 8433507..0000000
--- a/apps/client-web/src/components/source/collectAtForm/collectAtForm.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# collectAtForm
-
-## Rationale
-
-A form component to edit the collect_at schedule of a source.
-
-## Goals
-
-Allow users to set the day of week, hour, and minute for source collection.
-
-## Key Concepts
-
-- CollectAt: schedule with day_of_week, hour, minute
-
-## Specification
-
-## Implementation
-
-### Props
-
-- `modelValue` (`CollectAt`, required)：The current collect_at object
diff --git a/apps/client-web/src/components/source/collectAtForm/collectAtForm.scss b/apps/client-web/src/components/source/collectAtForm/collectAtForm.scss
deleted file mode 100644
index 7ed5208..0000000
--- a/apps/client-web/src/components/source/collectAtForm/collectAtForm.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.collect-at-form {
-  display: flex;
-  flex-direction: column;
-  gap: sys-var(space, sm);
-
-  &__null-placeholder {
-    @include apply-font(body-md);
-    color: sys-var(color, text, subtle);
-  }
-}
diff --git a/apps/client-web/src/components/source/collectAtForm/collectAtForm.ts b/apps/client-web/src/components/source/collectAtForm/collectAtForm.ts
deleted file mode 100644
index b4a6cac..0000000
--- a/apps/client-web/src/components/source/collectAtForm/collectAtForm.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { PropType } from 'vue'
-import { CollectAt } from '@inkcre/core'
-
-export const collectAtFormProps = {
-  modelValue: {
-    type: Object as PropType<CollectAt | null>,
-    default: null,
-  },
-}
-
-export const collectAtFormEmits = ['update:modelValue']
diff --git a/apps/client-web/src/components/source/collectAtForm/collectAtForm.vue b/apps/client-web/src/components/source/collectAtForm/collectAtForm.vue
deleted file mode 100644
index 3058fa3..0000000
--- a/apps/client-web/src/components/source/collectAtForm/collectAtForm.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script setup lang="ts">
-import { computed, ref } from 'vue'
-import { CollectAt } from '@inkcre/core'
-import { collectAtFormProps, collectAtFormEmits } from './collectAtForm'
-import { InkDropdown } from '@inkcre/ui-web'
-
-const props = defineProps(collectAtFormProps)
-const emit = defineEmits(collectAtFormEmits)
-
-// --- computed ---
-const dayOfWeekModel = computed({
-  get: () => props.modelValue?.day_of_week ?? -1,
-  set: (value: number) => {
-    if (props.modelValue) {
-      props.modelValue.day_of_week = value === -1 ? null : value
-    }
-  },
-})
-
-const hourModel = computed({
-  get: () => props.modelValue?.hour ?? -1,
-  set: (value: number) => {
-    if (props.modelValue) {
-      props.modelValue.hour = value === -1 ? null : value
-    }
-  },
-})
-
-const minuteModel = computed({
-  get: () => props.modelValue?.minute ?? 0,
-  set: (value: number) => {
-    if (props.modelValue) {
-      props.modelValue.minute = value
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="collect-at-form">
-    <template v-if="modelValue">
-      <InkDropdown v-model="dayOfWeekModel" :options="CollectAt.DayOfWeekOptions" />
-      <InkDropdown v-model="hourModel" :options="CollectAt.HourOptions" />
-      <InkDropdown v-model="minuteModel" :options="CollectAt.MinuteOptions" />
-    </template>
-  </div>
-</template>
-
-<style lang="scss" scoped src="./collectAtForm.scss" />
diff --git a/apps/client-web/src/components/source/collectJobForm/collectJobForm.md b/apps/client-web/src/components/source/collectJobForm/collectJobForm.md
deleted file mode 100644
index 21b1345..0000000
--- a/apps/client-web/src/components/source/collectJobForm/collectJobForm.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# collectJobForm
-
-## Rationale
-
-Provides a form interface to configure a source collect job.
-
-## Goals
-
-Allow users to configure collect job settings including config object.
-
-## Specification
-
-- Pure form component with v-model support
-- Provides config editor (InkJsonEditor)
-- No create/submit buttons - just form fields
-- Parent component handles submission
-
-## Implementation
-
-### Props
-
-- `modelValue` (`SourceCollectJobForm`, required): The form data object
-
-### Events
-
-- `update:modelValue(form: SourceCollectJobForm)`: Emitted when form data changes
diff --git a/apps/client-web/src/components/source/collectJobForm/collectJobForm.scss b/apps/client-web/src/components/source/collectJobForm/collectJobForm.scss
deleted file mode 100644
index a0ba3b0..0000000
--- a/apps/client-web/src/components/source/collectJobForm/collectJobForm.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.collect-job-form {
-  display: flex;
-  flex-direction: column;
-  gap: sys-var(space, md);
-}
diff --git a/apps/client-web/src/components/source/collectJobForm/collectJobForm.ts b/apps/client-web/src/components/source/collectJobForm/collectJobForm.ts
deleted file mode 100644
index 2c4d060..0000000
--- a/apps/client-web/src/components/source/collectJobForm/collectJobForm.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { PropType } from 'vue'
-import { SourceCollectJobForm } from '@inkcre/core'
-
-// --- Props ---
-export const collectJobFormProps = {
-  modelValue: {
-    type: Object as PropType<SourceCollectJobForm>,
-    required: true,
-  },
-} as const
-
-// --- Emits ---
-export const collectJobFormEmits = {
-  'update:modelValue': (_form: SourceCollectJobForm) => true,
-} as const
diff --git a/apps/client-web/src/components/source/collectJobForm/collectJobForm.vue b/apps/client-web/src/components/source/collectJobForm/collectJobForm.vue
deleted file mode 100644
index 823ed24..0000000
--- a/apps/client-web/src/components/source/collectJobForm/collectJobForm.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { InkForm, InkJsonEditor } from '@inkcre/ui-web'
-import { collectJobFormProps, collectJobFormEmits } from './collectJobForm'
-
-const props = defineProps(collectJobFormProps)
-const emit = defineEmits(collectJobFormEmits)
-const { t } = useI18n()
-
-const configJson = computed<string>({
-  get: () => {
-    return JSON.stringify(props.modelValue.config || {}, null, 2)
-  },
-  set: (newVal: string) => {
-    props.modelValue.config = JSON.parse(newVal)
-  },
-})
-</script>
-
-<template>
-  <InkForm class="collect-job-form">
-    <InkJsonEditor
-      v-model="configJson"
-      :label="t('collectJob.config')"
-      :placeholder="t('source.configPlaceholder')"
-      :rows="6"
-    />
-  </InkForm>
-</template>
-
-<style lang="scss" scoped src="./collectJobForm.scss" />
diff --git a/apps/client-web/src/components/source/createSource/createSource.vue b/apps/client-web/src/components/source/createSource/createSource.vue
index d3c74c0..9a968d6 100644
--- a/apps/client-web/src/components/source/createSource/createSource.vue
+++ b/apps/client-web/src/components/source/createSource/createSource.vue
@@ -3,7 +3,7 @@ import { reactive } from 'vue'
 import { InkButton } from '@inkcre/ui-web'
 import sourceForm from '../sourceForm/sourceForm.vue'
 import { createSourceEmits } from './createSource'
-import { CollectAt, SourceForm } from '@inkcre/core'
+import { SourceForm } from '@inkcre/core'
 import { refManualReset } from '@vueuse/core'
 
 const emit = defineEmits(createSourceEmits)
@@ -15,7 +15,8 @@ const form = refManualReset(() =>
       nickname: '',
       type: '',
       config: {},
-      collect_at: CollectAt.parse({}),
+      state: {},
+      storage: null,
     })
   )
 )
diff --git a/apps/client-web/src/components/source/sourceCard/sourceCard.vue b/apps/client-web/src/components/source/sourceCard/sourceCard.vue
index 858614d..b6a0373 100644
--- a/apps/client-web/src/components/source/sourceCard/sourceCard.vue
+++ b/apps/client-web/src/components/source/sourceCard/sourceCard.vue
@@ -2,27 +2,10 @@
 import { computed, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import {
-  InkField,
-  InkButton,
-  InkInput,
-  InkPicker,
-  InkPopup,
-  InkSwitch,
-  InkJsonEditor,
-  InkDoubleCheck,
-} from '@inkcre/ui-web'
-import collectAtForm from '@/components/source/collectAtForm/collectAtForm.vue'
+import { InkButton, InkInput, InkPopup, InkJsonEditor, InkDoubleCheck } from '@inkcre/ui-web'
 import { sourceCardEmits, type SourceCardProps } from './sourceCard'
-import {
-  CollectAt,
-  Source,
-  SourceCollectJob,
-  SourceCollectJobForm,
-  SourceCollectJobStatus,
-  SourceType,
-} from '@inkcre/core'
-import { useCloned, computedAsync } from '@vueuse/core'
+import { Job, JobManager, JobStatus, Source, SourceType } from '@inkcre/core'
+import { computedAsync } from '@vueuse/core'
 
 const props = defineProps<SourceCardProps>()
 const emit = defineEmits(sourceCardEmits)
@@ -53,29 +36,24 @@ const sourceType = computedAsync(
   { shallow: false }
 )
 const latestOpenJob = computedAsync(
-  async (): Promise<SourceCollectJob | null> => {
+  async (): Promise<Job | null> => {
     if (sourceData.value?.id) {
-      return await SourceCollectJob.getLatestOpenBySource(sourceData.value.id)
+      const jobs = await Job.getBySource(sourceData.value.id)
+      return (
+        jobs.find((job) => job.status === JobStatus.PENDING || job.status === JobStatus.RUNNING) ??
+        null
+      )
     }
     return null
   },
   null,
   { shallow: true }
 )
-const collectAtModel = ref<CollectAt | null>(null)
 const configPopupOpen = ref(false)
 const configModel = ref('')
 const nicknameModel = ref('')
 
 // --- watchers ---
-watch(
-  () => sourceData.value?.collect_at,
-  (newVal) => {
-    collectAtModel.value = newVal ? useCloned(newVal).cloned.value : null
-  },
-  { immediate: true }
-)
-
 watch(
   () => sourceData.value?.nickname,
   (newVal) => {
@@ -89,19 +67,6 @@ const formattedConfig = computed(() => {
   return JSON.stringify(sourceData.value?.config || {}, null, 2)
 })
 
-const toggleAutoCollect = computed({
-  get: () => collectAtModel.value != null,
-  set: (value: boolean) => {
-    if (value) {
-      if (collectAtModel.value == null) {
-        collectAtModel.value = CollectAt.parse({})
-      }
-    } else {
-      collectAtModel.value = null
-    }
-  },
-})
-
 // --- methods ---
 const onNicknameSave = (newNickname: string) => {
   if (sourceData.value) {
@@ -116,36 +81,20 @@ const onEditConfig = () => {
 }
 
 const onRunNow = async () => {
-  const form = new SourceCollectJobForm({
+  const job = await JobManager.create('core.source.collect.v1', {
     source: sourceData.value!.id,
-    created_at: new Date(),
-    started_at: null,
-    closed_at: null,
-    status: SourceCollectJobStatus.PENDING,
-    state: {},
     config: {},
   })
-  const job = await form.create()
-  router.push(`/sources/collectJob/${job.id}`)
+  router.push(`/jobs/${job.id}`)
 }
 
 const onDelete = () => {
   emit('delete', sourceData.value!)
 }
 
-const onConfirmCollectAt = () => {
-  sourceData.value!.collect_at = useCloned(collectAtModel.value).cloned.value
-  sourceData.value!.save()
-}
-
-const onConfirmCollectAtAndClose = (closePopup: () => void) => {
-  onConfirmCollectAt()
-  closePopup()
-}
-
 const onCheckOpenJob = () => {
   if (latestOpenJob.value) {
-    router.push(`/sources/collectJob/${latestOpenJob.value.id}`)
+    router.push(`/jobs/${latestOpenJob.value.id}`)
   }
 }
 
@@ -194,34 +143,6 @@ const onConfirmConfig = () => {
       </div>
     </div>
 
-    <InkField
-      class="source-card__collect-at"
-      label="Will run collect at"
-      layout="inline"
-      @click.stop
-    >
-      <InkPicker
-        :modelValue="sourceData.collect_at"
-        :formatter="(val: CollectAt | null) => (val ? CollectAt.format(val) : 'click to set')"
-        displayValueAs="inline-text"
-      >
-        <template #default="{ closePopup }">
-          <div class="collect-at__title">Config source auto collecting</div>
-          <collectAtForm v-if="collectAtModel !== null" v-model="collectAtModel" />
-          <div v-else>Auto collect off.</div>
-          <div class="collect-at__actions">
-            <InkSwitch v-model="toggleAutoCollect" size="md" />
-            <InkButton text="Cancel" theme="subtle" @click="closePopup" />
-            <InkButton
-              text="Confirm"
-              theme="primary"
-              @click="onConfirmCollectAtAndClose(closePopup)"
-            />
-          </div>
-        </template>
-      </InkPicker>
-    </InkField>
-
     <div class="source-card__config">
       <pre class="source-card__config-text">{{ formattedConfig }}</pre>
     </div>
diff --git a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.ts b/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.ts
deleted file mode 100644
index 8a0c403..0000000
--- a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { PropType } from 'vue'
-import { SourceCollectJob } from '@inkcre/core'
-
-// --- Props ---
-export const sourceCollectJobCardProps = {
-  job: {
-    type: Object as PropType<SourceCollectJob>,
-    required: true,
-  },
-} as const
-
-// --- Emits ---
-export const sourceCollectJobCardEmits = {
-  click: () => true,
-} as const
diff --git a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.vue b/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.vue
deleted file mode 100644
index 8d6baeb..0000000
--- a/apps/client-web/src/components/source/sourceCollectJobCard/sourceCollectJobCard.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { sourceCollectJobCardProps, sourceCollectJobCardEmits } from './sourceCollectJobCard'
-import { SourceCollectJobStatus } from '@inkcre/core'
-import dayjs from 'dayjs'
-
-const props = defineProps(sourceCollectJobCardProps)
-const emit = defineEmits(sourceCollectJobCardEmits)
-const { t } = useI18n()
-
-// --- computed ---
-const statusColor = computed(() => {
-  switch (props.job.status) {
-    case SourceCollectJobStatus.PENDING:
-      return 'status--pending'
-    case SourceCollectJobStatus.RUNNING:
-      return 'status--running'
-    case SourceCollectJobStatus.FINISHED:
-      return 'status--finished'
-    case SourceCollectJobStatus.FAILED:
-      return 'status--failed'
-    default:
-      return ''
-  }
-})
-
-// --- methods ---
-const formatDate = (date: Date | null) => {
-  if (!date) return t('collectJob.notAvailable')
-  return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
-}
-
-const onClick = () => {
-  emit('click')
-}
-</script>
-
-<template>
-  <div class="source-collect-job-card" @click="onClick">
-    <div class="source-collect-job-card__header">
-      <span class="source-collect-job-card__id">#{{ job.id }}</span>
-      <span class="source-collect-job-card__status" :class="statusColor">
-        {{ job.status }}
-      </span>
-    </div>
-    <div class="source-collect-job-card__dates">
-      <span class="source-collect-job-card__date">
-        {{ t('collectJob.createdAt') }}: {{ formatDate(job.created_at) }}
-      </span>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped src="./sourceCollectJobCard.scss" />
diff --git a/apps/client-web/src/components/source/sourceForm/sourceForm.vue b/apps/client-web/src/components/source/sourceForm/sourceForm.vue
index f25c7e1..7e6109f 100644
--- a/apps/client-web/src/components/source/sourceForm/sourceForm.vue
+++ b/apps/client-web/src/components/source/sourceForm/sourceForm.vue
@@ -1,17 +1,8 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
-import {
-  InkInput,
-  InkJsonEditor,
-  InkField,
-  InkSwitch,
-  InkDropdown,
-  type DropdownOption,
-  InkForm,
-} from '@inkcre/ui-web'
-import collectAtForm from '@/components/source/collectAtForm/collectAtForm.vue'
+import { computed, ref } from 'vue'
+import { InkInput, InkJsonEditor, InkDropdown, type DropdownOption, InkForm } from '@inkcre/ui-web'
 import { sourceFormProps, sourceFormEmits } from './sourceForm'
-import { CollectAt, SourceType } from '@inkcre/core'
+import { SourceType } from '@inkcre/core'
 import { useI18n } from 'vue-i18n'
 
 const props = defineProps(sourceFormProps)
@@ -21,20 +12,6 @@ const { t } = useI18n()
 // --- data ---
 const sourceTypes = ref<(DropdownOption & SourceType)[]>([])
 
-// --- computed ---
-const toggleAutoCollect = computed({
-  get: () => props.modelValue.collect_at != null,
-  set: (value: boolean) => {
-    if (value) {
-      if (props.modelValue.collect_at == null) {
-        props.modelValue.collect_at = CollectAt.parse({})
-      }
-    } else {
-      props.modelValue.collect_at = null
-    }
-  },
-})
-
 const configJson = computed<string>({
   get: () => {
     return JSON.stringify(props.modelValue.config, null, 2)
@@ -70,21 +47,6 @@ const loadSourceTypes = async (): Promise<(DropdownOption & SourceType)[]> => {
       :label="t('source.type')"
     />
 
-    <InkField :label="t('source.collectAt')" prop="collect_at">
-      <template #label-right>
-        <div class="flex flex-row flex-1 justify-end">
-          <InkSwitch v-model="toggleAutoCollect" size="xs" />
-        </div>
-      </template>
-      <collectAtForm
-        v-if="props.modelValue.collect_at != null"
-        v-model="props.modelValue.collect_at"
-      />
-      <!-- <span v-else class="source-form__collect-at-placeholder">
-        {{ t("source.collectAtOff") }}
-      </span> -->
-    </InkField>
-
     <InkJsonEditor
       v-model="configJson"
       :schema="currentSourceType?.config_schema"
diff --git a/apps/client-web/src/core.ts b/apps/client-web/src/core.ts
index 47f1855..69a757f 100644
--- a/apps/client-web/src/core.ts
+++ b/apps/client-web/src/core.ts
@@ -9,10 +9,18 @@ import {
   configStore,
   localStorageAdapter,
   setMFImplementation,
+  registerCoreResolvers,
   TextResolver,
+  AudioResolver,
+  EpubResolver,
+  FileResolver,
   ImageResolver,
+  PdfResolver,
   VideoResolver,
   HtmlResolver,
+  ZipResolver,
+  PeerManager,
+  JobManager,
 } from '@inkcre/core'
 import { createInstance } from '@module-federation/enhanced/runtime'
 import * as InKCreCore from '@inkcre/core'
@@ -26,6 +34,8 @@ import ContentText from '@/components/info-base/resolvers/ContentText.vue'
 import ContentImage from '@/components/info-base/resolvers/ContentImage.vue'
 import ContentVideo from '@/components/info-base/resolvers/ContentVideo.vue'
 import ContentHtml from '@/components/info-base/resolvers/ContentHtml.vue'
+import ContentAudio from '@/components/info-base/resolvers/ContentAudio.vue'
+import ContentFile from '@/components/info-base/resolvers/ContentFile.vue'
 
 // ============================================================================
 // Resolver Component Registration
@@ -36,10 +46,16 @@ import ContentHtml from '@/components/info-base/resolvers/ContentHtml.vue'
  * Each resolver needs a Vue component to render content.
  */
 export function setupResolvers(): void {
-  TextResolver.contentComp = ContentText
-  ImageResolver.contentComp = ContentImage
-  VideoResolver.contentComp = ContentVideo
-  HtmlResolver.contentComp = ContentHtml
+  TextResolver.solvedContentRenderer = ContentText
+  AudioResolver.solvedContentRenderer = ContentAudio
+  EpubResolver.solvedContentRenderer = ContentFile
+  FileResolver.solvedContentRenderer = ContentFile
+  ImageResolver.solvedContentRenderer = ContentImage
+  PdfResolver.solvedContentRenderer = ContentFile
+  VideoResolver.solvedContentRenderer = ContentVideo
+  HtmlResolver.solvedContentRenderer = ContentHtml
+  ZipResolver.solvedContentRenderer = ContentFile
+  registerCoreResolvers()
 
   console.log('[Core] Resolver components registered')
 }
@@ -135,8 +151,14 @@ export function initializeModuleFederation(): void {
  */
 export async function initializeCore(): Promise<void> {
   await configStore.initializeMeta(localStorageAdapter)
-  await configStore.loadClientConfig()
+  await configStore.loadPeerConfig()
+  PeerManager.setupBuiltinOutbounds()
+  JobManager.startWorker()
   setupResolvers()
   initializeModuleFederation()
   console.log('[Core] Initialization complete')
 }
+
+export function shutdownCore(): void {
+  JobManager.stopWorker()
+}
diff --git a/apps/client-web/src/locales/messages/en.json b/apps/client-web/src/locales/messages/en.json
index 50b7343..f269cab 100644
--- a/apps/client-web/src/locales/messages/en.json
+++ b/apps/client-web/src/locales/messages/en.json
@@ -53,7 +53,7 @@
     "id": "ID",
     "collectAt": "Collect At",
     "config": "Config",
-    "collectJobs": "Collect Jobs",
+    "jobs": "Jobs",
     "newJob": "New Job",
     "newJobTitle": "Create New Collect Job",
     "newJobDescription": "Create a new collect job for this source. The job will be queued and executed as soon as possible.",
@@ -80,8 +80,8 @@
     "editConfigTitle": "Edit Extension Configuration",
     "versionPlaceholder": "like 0.1.0 or optional for latest"
   },
-  "collectJob": {
-    "title": "Collect Job Details",
+  "job": {
+    "title": "Job Details",
     "jobId": "Job ID",
     "status": "Status",
     "source": "Source",
@@ -95,7 +95,7 @@
     "stop": "Stop",
     "retry": "Retry",
     "notAvailable": "N/A",
-    "notFound": "Collect job not found",
+    "notFound": "Job not found",
     "sourceNotFound": "Source not found"
   },
   "logs": {
@@ -117,15 +117,25 @@
     "editConfig": "Edit Config"
   },
   "infoBase": {
-    "blockDetails": {
-      "title": "Block Details",
+    "blockInspector": {
+      "title": "Block Inspector",
       "id": "ID",
       "resolver": "Resolver",
       "created": "Created At",
       "updated": "Updated At",
       "storage": "Storage",
-      "content": "Content",
-      "noContent": "No content"
+      "missing": "Block #{block} no longer exists.",
+      "viewContent": "View content",
+      "ruminate": "Ruminate",
+      "rumination": {
+        "success": "The info base was reconsidered and the graph was refreshed.",
+        "error": "Rumination failed. The graph was not changed by a confirmed result.",
+        "outcome-unknown": "The provider may have completed the request. Refresh and inspect the graph before trying again."
+      }
+    },
+    "solvedContent": {
+      "title": "Content",
+      "missing": "Block #{block} no longer exists."
     },
     "graph": {
       "empty": "No blocks to display",
diff --git a/apps/client-web/src/locales/messages/zh-CN.json b/apps/client-web/src/locales/messages/zh-CN.json
index 503f9ac..9205d4e 100644
--- a/apps/client-web/src/locales/messages/zh-CN.json
+++ b/apps/client-web/src/locales/messages/zh-CN.json
@@ -53,7 +53,7 @@
     "id": "ID",
     "collectAt": "采集时间",
     "config": "配置",
-    "collectJobs": "采集任务",
+    "jobs": "任务",
     "newJob": "新建任务",
     "newJobTitle": "创建新采集任务",
     "newJobDescription": "为此数据源创建新的采集任务。该任务将被加入队列并尽快执行。",
@@ -79,8 +79,8 @@
     "editConfig": "编辑配置",
     "editConfigTitle": "编辑扩展配置"
   },
-  "collectJob": {
-    "title": "采集任务详情",
+  "job": {
+    "title": "任务详情",
     "jobId": "任务 ID",
     "status": "状态",
     "source": "数据源",
@@ -94,7 +94,7 @@
     "stop": "停止",
     "retry": "重试",
     "notAvailable": "不可用",
-    "notFound": "未找到采集任务",
+    "notFound": "未找到任务",
     "sourceNotFound": "未找到数据源"
   },
   "logs": {
@@ -115,15 +115,25 @@
     "noClients": "暂无注册客户端"
   },
   "infoBase": {
-    "blockDetails": {
-      "title": "区块详情",
+    "blockInspector": {
+      "title": "区块检查器",
       "id": "ID",
       "resolver": "解析器",
       "created": "创建时间",
       "updated": "更新时间",
       "storage": "存储",
-      "content": "内容",
-      "noContent": "暂无内容"
+      "missing": "区块 #{block} 已不存在。",
+      "viewContent": "查看内容",
+      "ruminate": "反刍",
+      "rumination": {
+        "success": "已重新理解这条信息，并刷新信息图。",
+        "error": "反刍失败，没有得到可确认的图变更。",
+        "outcome-unknown": "提供方可能已经完成请求。再次执行前，请先刷新并检查信息图。"
+      }
+    },
+    "solvedContent": {
+      "title": "内容",
+      "missing": "区块 #{block} 已不存在。"
     },
     "graph": {
       "empty": "没有找到块",
diff --git a/apps/client-web/src/main.ts b/apps/client-web/src/main.ts
index 8d04cf5..77603a3 100644
--- a/apps/client-web/src/main.ts
+++ b/apps/client-web/src/main.ts
@@ -2,7 +2,8 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import i18n from './locales'
 import router from './router'
-import { store } from '@inkcre/core'
+import { setInfoBaseRouter, store } from '@inkcre/core'
+import { createInfoBaseRouterAdapter } from './router'
 
 // 样式
 import 'uno.css'
@@ -14,9 +15,10 @@ const app = createApp(App)
 app.use(i18n)
 app.use(store)
 app.use(router)
+setInfoBaseRouter(createInfoBaseRouterAdapter(router))
 
 // Initialize core package
-import { initializeCore } from './core'
+import { initializeCore, shutdownCore } from './core'
 await initializeCore()
 app.mount('#app')
 
@@ -27,5 +29,6 @@ Extension.startup().catch((error) => {
 })
 
 window.addEventListener('beforeunload', () => {
+  shutdownCore()
   void Extension.shutdown()
 })
diff --git a/apps/client-web/src/router.ts b/apps/client-web/src/router.ts
index ddffaa9..5dec9cc 100644
--- a/apps/client-web/src/router.ts
+++ b/apps/client-web/src/router.ts
@@ -1,10 +1,11 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import type { Router, RouteLocationNormalizedLoaded } from 'vue-router'
 import type { InkRouter } from '@inkcre/ui-web'
+import type { InfoBaseRoute, InfoBaseRouter } from '@inkcre/core'
 import start from '@/views/start/start.vue'
 import sources from '@/views/sources/sources.vue'
 import source from '@/views/sources/source/source.vue'
-import sourceCollectJob from '@/views/sources/sourceCollectJob/sourceCollectJob.vue'
+import job from '@/views/jobs/job/job.vue'
 import extensions from '@/views/extensions/extensions.vue'
 import infoBaseGraph from '@/views/info-base/graph/graph.vue'
 import settings from '@/views/settings/settings.vue'
@@ -24,9 +25,9 @@ const router = createRouter({
       component: sources,
     },
     {
-      path: '/sources/collectJob/:id',
-      name: 'SourceCollectJob',
-      component: sourceCollectJob,
+      path: '/jobs/:id',
+      name: 'Job',
+      component: job,
     },
     {
       path: '/sources/:id',
@@ -40,7 +41,17 @@ const router = createRouter({
     },
     {
       path: '/info-base/graph',
-      name: 'InfoBaseGraph',
+      name: 'InfoBaseGraphOverview',
+      component: infoBaseGraph,
+    },
+    {
+      path: '/info-base/graph/blocks/:block/content',
+      name: 'InfoBaseGraphSolvedContent',
+      component: infoBaseGraph,
+    },
+    {
+      path: '/info-base/graph/blocks/:block',
+      name: 'InfoBaseGraphBlock',
       component: infoBaseGraph,
     },
     {
@@ -62,3 +73,38 @@ export function createInkRouterAdapter(
     currentName: computed(() => (route.name as string) || null),
   }
 }
+
+function parseBlockRef(value: unknown): number | null {
+  const block = typeof value === 'string' && value !== '' ? Number(value) : Number.NaN
+  return Number.isSafeInteger(block) ? block : null
+}
+
+export function createInfoBaseRouterAdapter(router: Router): InfoBaseRouter {
+  return {
+    current: computed<InfoBaseRoute | null>(() => {
+      const current = router.currentRoute.value
+      if (current.name === 'InfoBaseGraphOverview') return { name: 'overview' }
+      if (current.name !== 'InfoBaseGraphBlock' && current.name !== 'InfoBaseGraphSolvedContent') {
+        return null
+      }
+      const block = parseBlockRef(current.params.block)
+      if (block === null) return null
+      return current.name === 'InfoBaseGraphBlock'
+        ? { name: 'block', block }
+        : { name: 'solved-content', block }
+    }),
+    async push(route) {
+      if (route.name === 'overview') {
+        await router.push({ name: 'InfoBaseGraphOverview' })
+        return
+      }
+      await router.push({
+        name: route.name === 'block' ? 'InfoBaseGraphBlock' : 'InfoBaseGraphSolvedContent',
+        params: { block: String(route.block) },
+      })
+    },
+    back() {
+      router.back()
+    },
+  }
+}
diff --git a/apps/client-web/src/storages/index.ts b/apps/client-web/src/storages/index.ts
index 1e0e04b..9e6434d 100644
--- a/apps/client-web/src/storages/index.ts
+++ b/apps/client-web/src/storages/index.ts
@@ -6,14 +6,8 @@
  */
 
 // Import all storage handlers to trigger @Storage.registry decorator
-import {
-  HttpImageStorage,
-  HttpVideoStorage,
-  HttpTextStorage,
-  HttpHtmlStorage,
-  HttpJsonStorage,
-} from '@inkcre/core'
+import { HttpStorage, PostgreSQLBinaryStorage } from '@inkcre/core'
 
 // Handlers are auto-registered via decorator, no need to do anything else
 // Just ensure they're imported
-export { HttpImageStorage, HttpVideoStorage, HttpTextStorage, HttpHtmlStorage, HttpJsonStorage }
+export { HttpStorage, PostgreSQLBinaryStorage }
diff --git a/apps/client-web/src/views/extensions/extensions.vue b/apps/client-web/src/views/extensions/extensions.vue
index 2eacb66..de7f4fe 100644
--- a/apps/client-web/src/views/extensions/extensions.vue
+++ b/apps/client-web/src/views/extensions/extensions.vue
@@ -4,11 +4,11 @@ import { useAsyncState } from '@vueuse/core'
 import extensionCard from '@/components/extension/extensionCard/extensionCard.vue'
 import installExtension from '@/components/extension/installExtension/installExtension.vue'
 import { InkLoading, InkDropdown } from '@inkcre/ui-web'
-import { Client } from '@inkcre/core'
+import { Peer } from '@inkcre/core'
 import { Extension, configStore } from '@inkcre/core'
 
 // --- data ---
-const selectedClientId = ref<string>(configStore.metaConfig.INKCRE_CLIENT_ID)
+const selectedPeerId = ref<string>(configStore.metaConfig.INKCRE_PEER_ID)
 
 const {
   state: extensions,
@@ -35,8 +35,8 @@ const updExtension = (updatedExtension: Extension) => {
     <div class="extensions-view__list">
       <div class="extensions-view__header">
         <InkDropdown
-          v-model="selectedClientId"
-          :refresher="Client.listAsOptions"
+          v-model="selectedPeerId"
+          :refresher="Peer.listAsOptions"
           :label="'Client ID'"
           :placeholder="'Select a client'"
         />
@@ -50,7 +50,7 @@ const updExtension = (updatedExtension: Extension) => {
         v-else
         :key="extension.id"
         :extension="extension"
-        :client-id="selectedClientId"
+        :peer-id="selectedPeerId"
         @toggle="updExtension"
         @edit-config="updExtension"
       />
diff --git a/apps/client-web/src/views/info-base/graph/graph.vue b/apps/client-web/src/views/info-base/graph/graph.vue
index 9724097..e4aa7d6 100644
--- a/apps/client-web/src/views/info-base/graph/graph.vue
+++ b/apps/client-web/src/views/info-base/graph/graph.vue
@@ -4,16 +4,17 @@ import { useI18n } from 'vue-i18n'
 import { VueFlow, useVueFlow } from '@vue-flow/core'
 import { Background } from '@vue-flow/background'
 import { MiniMap } from '@vue-flow/minimap'
-import { InkPopup, InkLoading, InkButton } from '@inkcre/ui-web'
+import { InkLoading, InkButton } from '@inkcre/ui-web'
 import { useElementSize } from '@vueuse/core'
 
 import BlockNodeComponent from '@/components/info-base/BlockNode/BlockNode.vue'
 import RelationEdgeComponent from '@/components/info-base/RelationEdge/RelationEdge.vue'
-import BlockDetailsPanel from '@/components/info-base/BlockDetailsPanel/BlockDetailsPanel.vue'
+import BlockInspectorPopup from '@/components/info-base/BlockInspectorPopup/BlockInspectorPopup.vue'
+import SolvedContentPopup from '@/components/info-base/SolvedContentPopup/SolvedContentPopup.vue'
 import CommunityNavigator from '@/components/info-base/CommunityNavigator/CommunityNavigator.vue'
 import LayoutSelector from '@/components/info-base/LayoutSelector/LayoutSelector.vue'
 
-import { Block } from '@inkcre/core'
+import { Block, getInfoBaseRouter } from '@inkcre/core'
 import { Relation } from '@inkcre/core'
 import { LayoutType } from '@inkcre/core'
 
@@ -30,6 +31,7 @@ import {
 } from '@inkcre/core'
 
 const { t } = useI18n()
+const infoBaseRouter = getInfoBaseRouter()
 
 // Container ref for sizing
 const containerRef = ref<HTMLElement | null>(null)
@@ -78,17 +80,10 @@ const filteredLinks = computed<SimulationLink[]>(() => {
   return links.value.filter((link) => nodeIds.has(link.source) && nodeIds.has(link.target))
 })
 
-// Selected block for details panel
-const selectedBlock = ref<Block | null>(null)
-const selectedBlockRelations = ref<Relation[]>([])
-const isPanelOpen = computed({
-  get: () => selectedBlock.value !== null,
-  set: (val) => {
-    if (!val) {
-      selectedBlock.value = null
-      selectedBlockRelations.value = []
-    }
-  },
+const currentInfoBaseRoute = computed(() => infoBaseRouter.current.value)
+const focalBlock = computed(() => {
+  const current = currentInfoBaseRoute.value
+  return current && current.name !== 'overview' ? current.block : null
 })
 
 // Vue Flow instance
@@ -149,9 +144,16 @@ const loadData = async () => {
     // Transform blocks to nodes with relations
     allNodes.value = blocks.map((block) => {
       const blockRelations = blockRelationsMap.get(block.id) ?? []
-      // Use block.content as preview (truncated)
-      const preview = block.content.length > 50 ? block.content.slice(0, 50) + '...' : block.content
-      return blockToNode(block, preview, blockRelations)
+      const preview =
+        block.storage === null
+          ? block.content.length > 50
+            ? block.content.slice(0, 50) + '...'
+            : block.content
+          : 'Stored content — select to open'
+      return {
+        ...blockToNode(block, preview, blockRelations),
+        selected: block.id === focalBlock.value,
+      }
     })
 
     // Transform relations to edges and links
@@ -169,18 +171,23 @@ const loadData = async () => {
 
 // Handle node selection
 const onNodeSelect = (blockId: number) => {
-  const node = allNodes.value.find((n: BlockNode) => n.data?.block.id === blockId)
-  if (node?.data) {
-    selectedBlock.value = node.data.block
-    selectedBlockRelations.value = node.data.relations
-  }
+  void infoBaseRouter.push({ name: 'block', block: blockId })
 }
 
-// Handle panel close
-const onPanelClose = () => {
-  selectedBlock.value = null
+const onRuminated = async () => {
+  await loadData()
 }
 
+watch(focalBlock, (blockRef) => {
+  allNodes.value = allNodes.value.map((node) => ({
+    ...node,
+    selected: node.data?.block.id === blockRef,
+  }))
+  if (blockRef !== null && allNodes.value.some((node) => node.data?.block.id === blockRef)) {
+    setTimeout(() => fitView({ ...fitViewOptions, nodes: [String(blockRef)] }), 100)
+  }
+})
+
 // Fit view options with max zoom limit to prevent over-zooming on small communities
 const fitViewOptions = { padding: 0.2, maxZoom: 1.5 }
 
@@ -334,17 +341,17 @@ onMounted(() => {
           :mask-color="'rgba(0, 0, 0, 0.1)'"
         />
       </VueFlow>
-
-      <InkPopup v-model:open="isPanelOpen" position="right">
-        <BlockDetailsPanel
-          v-if="selectedBlock"
-          :block="selectedBlock"
-          :relations="selectedBlockRelations"
-          style="width: 400px"
-          @close="onPanelClose"
-        />
-      </InkPopup>
     </template>
+
+    <BlockInspectorPopup
+      v-if="currentInfoBaseRoute?.name === 'block'"
+      :block="currentInfoBaseRoute.block"
+      @ruminated="onRuminated"
+    />
+    <SolvedContentPopup
+      v-else-if="currentInfoBaseRoute?.name === 'solved-content'"
+      :block="currentInfoBaseRoute.block"
+    />
   </div>
 </template>
 
diff --git a/apps/client-web/src/views/sources/sourceCollectJob/sourceCollectJob.scss b/apps/client-web/src/views/jobs/job/job.scss
similarity index 99%
rename from apps/client-web/src/views/sources/sourceCollectJob/sourceCollectJob.scss
rename to apps/client-web/src/views/jobs/job/job.scss
index 352114e..133446f 100644
--- a/apps/client-web/src/views/sources/sourceCollectJob/sourceCollectJob.scss
+++ b/apps/client-web/src/views/jobs/job/job.scss
@@ -1,4 +1,4 @@
-.collect-job-view {
+.job-view {
   display: flex;
   flex-direction: row;
   gap: sys-var(space, xl);
diff --git a/apps/client-web/src/views/sources/sourceCollectJob/sourceCollectJob.vue b/apps/client-web/src/views/jobs/job/job.vue
similarity index 69%
rename from apps/client-web/src/views/sources/sourceCollectJob/sourceCollectJob.vue
rename to apps/client-web/src/views/jobs/job/job.vue
index 024bf39..de610d4 100644
--- a/apps/client-web/src/views/sources/sourceCollectJob/sourceCollectJob.vue
+++ b/apps/client-web/src/views/jobs/job/job.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { computed, ref, watch, onUnmounted } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useAsyncState } from '@vueuse/core'
 import { useEAsyncState } from '@/composables/use-async-state'
 import { InkLoading, InkButton, InkField } from '@inkcre/ui-web'
 import LogsViewer from '@/components/obsrv/LogsViewer/LogsViewer.vue'
-import { SourceCollectJob, SourceCollectJobStatus, Source } from '@inkcre/core'
+import { Job, JobStatus, Source } from '@inkcre/core'
 import dayjs from 'dayjs'
 
 const route = useRoute()
@@ -21,7 +21,7 @@ const {
   state: job,
   isLoading: jobLoading,
   execute: refetchJob,
-} = useEAsyncState(() => SourceCollectJob.get(jobId.value), null, {
+} = useEAsyncState(() => Job.get(jobId.value), null, {
   immediate: true,
   useLast: true,
 })
@@ -32,8 +32,9 @@ const {
   isLoading: sourceLoading,
 } = useAsyncState(
   async () => {
-    if (job.value?.source) {
-      return await Source.get(job.value.source)
+    const sourceRef = job.value?.parameters.source
+    if (typeof sourceRef === 'number') {
+      return await Source.get(sourceRef)
     }
     return null
   },
@@ -45,13 +46,7 @@ const {
 const enableLogsPolling = computed(() => isRunning.value)
 
 // --- computed ---
-const isRunning = computed(() => job.value?.status === SourceCollectJobStatus.RUNNING)
-
-const isPending = computed(() => job.value?.status === SourceCollectJobStatus.PENDING)
-
-const isFinished = computed(() => job.value?.status === SourceCollectJobStatus.FINISHED)
-
-const isFailed = computed(() => job.value?.status === SourceCollectJobStatus.FAILED)
+const isRunning = computed(() => job.value?.status === JobStatus.RUNNING)
 
 const formattedState = computed(() => {
   return JSON.stringify(job.value?.state || {}, null, 2)
@@ -60,13 +55,13 @@ const formattedState = computed(() => {
 const statusColor = computed(() => {
   if (!job.value) return ''
   switch (job.value.status) {
-    case SourceCollectJobStatus.PENDING:
+    case JobStatus.PENDING:
       return 'status--pending'
-    case SourceCollectJobStatus.RUNNING:
+    case JobStatus.RUNNING:
       return 'status--running'
-    case SourceCollectJobStatus.FINISHED:
+    case JobStatus.FINISHED:
       return 'status--finished'
-    case SourceCollectJobStatus.FAILED:
+    case JobStatus.FAILED:
       return 'status--failed'
     default:
       return ''
@@ -75,13 +70,13 @@ const statusColor = computed(() => {
 
 // --- methods ---
 const formatDate = (date: Date | null) => {
-  if (!date) return t('collectJob.notAvailable')
+  if (!date) return t('job.notAvailable')
   return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
 }
 
 // --- watchers ---
 watch(
-  () => job.value?.source,
+  () => job.value?.parameters.source,
   (newSourceId) => {
     if (newSourceId) {
       refetchSource()
@@ -91,9 +86,9 @@ watch(
 )
 
 watch(
-  [() => job.value?.status, () => job.value?.isFinal],
+  [() => job.value?.status, () => job.value?.isTerminal],
   ([newStatus]) => {
-    if (!newStatus || job.value?.isFinal) {
+    if (!newStatus || job.value?.isTerminal) {
       // Clear polling when job reaches final state or status becomes null
       if (jobPollingIntervalId.value) {
         clearInterval(jobPollingIntervalId.value)
@@ -116,7 +111,7 @@ watch(
   () => pollingInterval.value,
   (newInterval) => {
     // Update interval if polling is active and not in final state
-    if (jobPollingIntervalId.value && !job.value?.isFinal) {
+    if (jobPollingIntervalId.value && !job.value?.isTerminal) {
       clearInterval(jobPollingIntervalId.value)
       jobPollingIntervalId.value = setInterval(() => {
         refetchJob()
@@ -134,23 +129,23 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <main class="collect-job-view">
-    <div v-if="!job" class="collect-job-view__loading">
+  <main class="job-view">
+    <div v-if="!job" class="job-view__loading">
       <InkLoading />
     </div>
     <!-- Content -->
     <template v-else-if="job">
       <!-- Left Section: Metadata -->
-      <section class="collect-job-view__metadata">
+      <section class="job-view__metadata">
         <div class="metadata__header">
-          <h2 class="metadata__title">{{ t('collectJob.title') }}</h2>
+          <h2 class="metadata__title">{{ t('job.title') }}</h2>
         </div>
 
-        <InkField :label="t('collectJob.jobId')">
+        <InkField :label="t('job.jobId')">
           <span class="metadata__value">{{ job.id }}</span>
         </InkField>
 
-        <InkField :label="t('collectJob.status')">
+        <InkField :label="t('job.status')">
           <div class="flex items-center gap-2">
             <span class="metadata__value" :class="statusColor">
               {{ job.status }}
@@ -159,7 +154,7 @@ onUnmounted(() => {
           </div>
         </InkField>
 
-        <InkField :label="t('collectJob.source')">
+        <InkField :label="t('job.source')">
           <div v-if="sourceLoading" class="metadata__value">
             {{ t('common.loading') }}
           </div>
@@ -171,45 +166,45 @@ onUnmounted(() => {
             </div>
           </div>
           <span v-else class="metadata__value">
-            {{ t('collectJob.sourceNotFound') }}
+            {{ t('job.sourceNotFound') }}
           </span>
         </InkField>
 
-        <InkField :label="t('collectJob.createdAt')">
+        <InkField :label="t('job.createdAt')">
           <span class="metadata__value">{{ formatDate(job.created_at) }}</span>
         </InkField>
 
-        <InkField :label="t('collectJob.startedAt')">
+        <InkField :label="t('job.startedAt')">
           <span class="metadata__value">{{ formatDate(job.started_at) }}</span>
         </InkField>
 
-        <InkField :label="t('collectJob.closedAt')">
+        <InkField :label="t('job.closedAt')">
           <span class="metadata__value">{{ formatDate(job.closed_at) }}</span>
         </InkField>
 
-        <InkField :label="t('collectJob.state')">
+        <InkField :label="t('job.state')">
           <pre class="metadata__value whitespace-pre">{{ formattedState }}</pre>
         </InkField>
       </section>
 
       <!-- Right Section: Logs -->
-      <section class="collect-job-view__logs">
-        <h3 class="collect-job-view__logs__title">{{ t('logs.title') }}</h3>
+      <section class="job-view__logs">
+        <h3 class="job-view__logs__title">{{ t('logs.title') }}</h3>
         <LogsViewer
           v-if="job"
           class="flex-1 w-full"
-          :trace-id="`source_collect_job.${job.id}`"
+          :trace-id="`job.${job.id}`"
           :enable-polling="enableLogsPolling"
           :polling-interval="pollingInterval"
         />
       </section>
     </template>
     <!-- TODO: use inkPlaceholder -->
-    <div v-else class="collect-job-view__error">
-      <span>{{ t('collectJob.notFound') }}</span>
+    <div v-else class="job-view__error">
+      <span>{{ t('job.notFound') }}</span>
       <InkButton :text="t('common.back')" theme="subtle" size="sm" @click="$router.back()" />
     </div>
   </main>
 </template>
 
-<style lang="scss" scoped src="./sourceCollectJob.scss" />
+<style lang="scss" scoped src="./job.scss" />
diff --git a/apps/client-web/src/views/settings/settings.vue b/apps/client-web/src/views/settings/settings.vue
index a332af6..6ceb766 100644
--- a/apps/client-web/src/views/settings/settings.vue
+++ b/apps/client-web/src/views/settings/settings.vue
@@ -5,6 +5,7 @@ import { InkForm, InkInput, InkButton, InkDoubleCheck } from '@inkcre/ui-web'
 import { configStore, MetaConfigSchema, type MetaConfig } from '@inkcre/core'
 import { setLocale, SUPPORT_LOCALES, LOCALE_NAMES, type SupportLocale } from '@/locales'
 import i18n from '@/locales'
+import PeerList from '@/components/peer/peerList/peerList.vue'
 
 const { t } = useI18n()
 
@@ -34,7 +35,7 @@ const onSave = async () => {
     const validated = MetaConfigSchema.parse(metaFormConfig)
     Object.assign(configStore.metaConfig, validated)
     await configStore.saveMeta()
-    await configStore.loadClientConfig()
+    await configStore.loadPeerConfig()
     alert(t('settings.saveSuccess'))
   } catch (error) {
     console.error('Failed to save config:', error)
@@ -55,7 +56,7 @@ const onExport = () => {
     containsCredential: false,
     metaConfig: {
       INKCRE_PGREST_URL: configStore.metaConfig.INKCRE_PGREST_URL,
-      INKCRE_CLIENT_ID: configStore.metaConfig.INKCRE_CLIENT_ID,
+      INKCRE_PEER_ID: configStore.metaConfig.INKCRE_PEER_ID,
     },
   }
   const configJson = JSON.stringify(portableConfig, null, 2)
@@ -91,7 +92,7 @@ const onFileSelected = async (event: Event) => {
       })
       Object.assign(configStore.metaConfig, validated)
       await configStore.saveMeta()
-      await configStore.loadClientConfig()
+      await configStore.loadPeerConfig()
       Object.assign(metaFormConfig, configStore.metaConfig)
       alert(t('settings.saveSuccess'))
     } catch (error) {
@@ -134,7 +135,7 @@ const onFileSelected = async (event: Event) => {
       </label>
 
       <InkInput
-        v-model="metaFormConfig.INKCRE_CLIENT_ID"
+        v-model="metaFormConfig.INKCRE_PEER_ID"
         :label="t('settings.clientId')"
         placeholder="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
       />
@@ -168,6 +169,8 @@ const onFileSelected = async (event: Event) => {
     </div>
     <p class="settings-view__export-note">{{ t('settings.exportExcludesSecret') }}</p>
 
+    <PeerList />
+
     <!-- Hidden file input for import -->
     <input
       ref="fileInput"
diff --git a/apps/client-web/src/views/sources/source/source.md b/apps/client-web/src/views/sources/source/source.md
index b95eadb..eccaf9a 100644
--- a/apps/client-web/src/views/sources/source/source.md
+++ b/apps/client-web/src/views/sources/source/source.md
@@ -2,39 +2,40 @@
 
 ## Rationale
 
-Provides a detailed view of a single source with its configuration and associated collect jobs.
+Provides a detailed view of one Source with its configuration, Jobs, and ordinary collection Crons.
 
 ## Goals
 
 - Display comprehensive source information
 - Allow inline editing of nickname and config
-- List all collect jobs for this source with pagination
+- List Jobs whose parameters reference this Source
+- Create ordinary and historical collection Jobs
+- Create, run, and delete ordinary collection Crons
 - Provide actions to create new jobs and delete the source
 
 ## Specification
 
 ### Layout
 
-- Two-panel layout (left: source details, right: collect jobs)
-- Similar to SourceCollectJob view layout
+- Two-panel layout (left: Source details, right: scheduling and Jobs)
 
 ### Left Panel (Source Details)
 
 - Source type, nickname, and ID
 - Inline nickname editing (using InkInput)
 - Config display and editing (using InkJsonEditor with save button)
-- Collect at schedule display
 - Delete action button
 
-### Right Panel (Collect Jobs List)
+### Right Panel (Scheduling and Jobs)
 
 - "New Job" button at the top (full width)
-- List of collect jobs with pagination
+- Cron controls and current schedules
+- List of Jobs for this Source
 - Each job shows: ID, status, created date, and clickable link to job detail
-- Pagination controls at the bottom
 
 ### Actions
 
-- New Job: Opens center popup with title, newCollectJob component, and cancel/create buttons
+- New Job: chooses ordinary collection or historical backfill, validates its JSON config, and creates a global Job
+- Schedule: creates an ordinary collection Cron from a five-field schedule
 - Delete: Deletes the source and navigates back to sources list
 - Save Config: Saves the edited configuration
diff --git a/apps/client-web/src/views/sources/source/source.vue b/apps/client-web/src/views/sources/source/source.vue
index f7806c8..22b7eff 100644
--- a/apps/client-web/src/views/sources/source/source.vue
+++ b/apps/client-web/src/views/sources/source/source.vue
@@ -1,140 +1,102 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
+import { computed, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useAsyncState } from '@vueuse/core'
 import { useEAsyncState } from '@/composables/use-async-state'
-import { InkLoading, InkButton, InkDoubleCheck, InkPopup, InkPagination } from '@inkcre/ui-web'
-import sourceForm from '@/components/source/sourceForm/sourceForm.vue'
-import collectJobForm from '@/components/source/collectJobForm/collectJobForm.vue'
-import sourceCollectJobCard from '@/components/source/sourceCollectJobCard/sourceCollectJobCard.vue'
 import {
-  Source,
-  SourceCollectJob,
-  SourceCollectJobForm,
-  SourceCollectJobStatus,
-} from '@inkcre/core'
-import type { PaginationState } from '@/views/sources/source/source'
+  InkLoading,
+  InkButton,
+  InkDoubleCheck,
+  InkPopup,
+  InkJsonEditor,
+  InkDropdown,
+  InkInput,
+} from '@inkcre/ui-web'
+import sourceForm from '@/components/source/sourceForm/sourceForm.vue'
+import JobCard from '@/components/job/JobCard/JobCard.vue'
+import { Cron, CronForm, Job, JobManager, Source, SourceType } from '@inkcre/core'
 
 const route = useRoute()
 const router = useRouter()
 const { t } = useI18n()
-
-// --- data ---
 const sourceId = computed(() => Number(route.params.id))
 const newJobPopupOpen = ref(false)
-const jobForm = ref<SourceCollectJobForm>(
-  SourceCollectJobForm.parse({
-    source: sourceId.value,
-    created_at: new Date(),
-    started_at: null,
-    closed_at: null,
-    status: SourceCollectJobStatus.PENDING,
-    state: {},
-    config: {},
-  })
-)
+const jobKind = ref<'ordinary' | 'backfill'>('ordinary')
+const jobConfig = ref('{}')
+const cronSchedule = ref('0 * * * *')
 
-const pagination = ref<PaginationState>({
-  page: 1,
-  pageSize: 10,
-  total: 0,
+const { state: source } = useEAsyncState(() => Source.get(sourceId.value), null, {
+  immediate: true,
+  useLast: true,
 })
-
-const { state: source, execute: refetchSource } = useEAsyncState(
-  () => Source.get(sourceId.value),
+const { state: sourceType } = useEAsyncState(
+  async () => (source.value ? SourceType.get(source.value.type) : null),
   null,
   { immediate: true, useLast: true }
 )
-
 const {
-  state: collectJobs,
-  execute: refetchCollectJobs,
-  isLoading: collectJobsLoading,
-} = useAsyncState(
-  async () => {
-    const offset = (pagination.value.page - 1) * pagination.value.pageSize
-    const result = await SourceCollectJob.getBySource(sourceId.value, {
-      limit: pagination.value.pageSize,
-      offset,
-      order: 'desc',
-    })
-    pagination.value.total = result.count
-    return result.data
-  },
+  state: jobs,
+  execute: refetchJobs,
+  isLoading: jobsLoading,
+} = useAsyncState(() => Job.getBySource(sourceId.value), [], { shallow: false })
+const { state: crons, execute: refetchCrons } = useAsyncState(
+  () => Cron.getBySource(sourceId.value),
   [],
   { shallow: false }
 )
 
-// --- computed ---
-const totalPages = computed(() => Math.ceil(pagination.value.total / pagination.value.pageSize))
-
-// --- methods ---
-const onSaveSource = async () => {
-  await source.value!.save()
-}
+const jobSchema = computed(() =>
+  jobKind.value === 'ordinary'
+    ? sourceType.value?.collect_config_schema
+    : sourceType.value?.backfill_config_schema
+)
 
+const onSaveSource = async () => source.value?.save()
 const onDelete = async () => {
-  await source.value!.delete()
-  router.push('/sources')
+  await source.value?.delete()
+  await router.push('/sources')
 }
-
 const onNewJob = () => {
-  // Reset form
-  jobForm.value = SourceCollectJobForm.parse({
-    source: sourceId.value,
-    created_at: new Date(),
-    started_at: null,
-    closed_at: null,
-    status: SourceCollectJobStatus.PENDING,
-    state: {},
-    config: {},
-  })
+  jobKind.value = 'ordinary'
+  jobConfig.value = '{}'
   newJobPopupOpen.value = true
 }
-
 const onCreateJob = async () => {
-  try {
-    const job = await jobForm.value.create()
-    newJobPopupOpen.value = false
-    router.push(`/sources/collectJob/${job.id}`)
-  } catch (error) {
-    console.error('Failed to create job:', error)
-    // TODO: Show error toast to user
-  }
+  const type = jobKind.value === 'ordinary' ? 'core.source.collect.v1' : 'core.source.backfill.v1'
+  const job = await JobManager.create(type, {
+    source: sourceId.value,
+    config: JSON.parse(jobConfig.value),
+  })
+  newJobPopupOpen.value = false
+  await refetchJobs()
+  await router.push(`/jobs/${job.id}`)
 }
-
-const goToJob = (jobId: number) => {
-  router.push(`/sources/collectJob/${jobId}`)
+const onCreateCron = async () => {
+  await new CronForm({
+    schedule: cronSchedule.value,
+    enabled: true,
+    job_type: 'core.source.collect.v1',
+    job_parameters: { source: sourceId.value, config: {} },
+    job_timeout_seconds: null,
+  }).create()
+  await refetchCrons()
 }
-
-const goToPage = (page: number) => {
-  pagination.value.page = page
+const onDeleteCron = async (cron: Cron) => {
+  await cron.delete()
+  await refetchCrons()
 }
-
-// --- watchers ---
-watch(
-  () => pagination.value.page,
-  () => {
-    refetchCollectJobs()
-  }
-)
 </script>
 
 <template>
   <main class="source-view">
-    <div v-if="!source" class="source-view__loading">
-      <InkLoading />
-    </div>
-    <template v-else-if="source">
-      <!-- Left Section: Source Details -->
+    <div v-if="!source" class="source-view__loading"><InkLoading /></div>
+    <template v-else>
       <section class="source-view__details">
         <div class="details__header">
           <h2 class="details__title">{{ t('source.detailTitle') }}</h2>
         </div>
-
         <sourceForm v-model="source" class="overflow-y-auto" />
-
         <div class="details__actions">
           <InkDoubleCheck
             :title="t('source.deleteConfirmTitle')"
@@ -149,10 +111,9 @@ watch(
         </div>
       </section>
 
-      <!-- Right Section: Collect Jobs -->
       <section class="source-view__jobs">
         <div class="jobs__header">
-          <h3 class="jobs__title">{{ t('source.collectJobs') }}</h3>
+          <h3 class="jobs__title">{{ t('source.jobs') }}</h3>
           <InkButton
             :text="t('source.newJob')"
             theme="primary"
@@ -161,39 +122,51 @@ watch(
             @click="onNewJob"
           />
         </div>
-
-        <div v-if="collectJobsLoading" class="jobs__loading">
-          <InkLoading />
+        <div class="flex flex-col gap-2 border-b pb-4">
+          <div class="flex gap-2 items-end">
+            <InkInput v-model="cronSchedule" label="Cron schedule" />
+            <InkButton text="Schedule ordinary collect" theme="subtle" @click="onCreateCron" />
+          </div>
+          <div v-for="cron in crons" :key="cron.id" class="flex gap-2 items-center text-sm">
+            <code>{{ cron.schedule }}</code>
+            <span>{{ cron.enabled ? 'enabled' : 'disabled' }}</span>
+            <InkButton text="Run now" size="sm" theme="subtle" @click="cron.runNow()" />
+            <InkButton text="Delete" size="sm" theme="danger" @click="onDeleteCron(cron)" />
+          </div>
         </div>
-        <div v-else-if="collectJobs.length === 0" class="jobs__empty">
+        <div v-if="jobsLoading" class="jobs__loading"><InkLoading /></div>
+        <div v-else-if="jobs.length === 0" class="jobs__empty">
           <span>{{ t('source.noJobs') }}</span>
         </div>
         <div class="jobs__list">
-          <sourceCollectJobCard
-            v-for="job in collectJobs"
+          <JobCard
+            v-for="job in jobs"
             :key="job.id"
             :job="job"
-            @click="goToJob(job.id)"
+            @click="router.push(`/jobs/${job.id}`)"
           />
         </div>
-
-        <InkPagination
-          v-if="totalPages > 1"
-          class="jobs__pagination"
-          type="text"
-          :totalPages="totalPages"
-          :currentPage="pagination.page"
-          @page-change="goToPage"
-        />
       </section>
     </template>
   </main>
 
-  <!-- New Job Popup -->
   <InkPopup v-model:open="newJobPopupOpen" position="center">
     <div class="new-job-popup">
       <h3 class="new-job-popup__title">{{ t('source.newJobTitle') }}</h3>
-      <collectJobForm v-model="jobForm" />
+      <InkDropdown
+        v-model="jobKind"
+        :options="[
+          { label: 'Ordinary collect', value: 'ordinary' },
+          { label: 'Historical backfill', value: 'backfill' },
+        ]"
+        label="Collection intent"
+      />
+      <InkJsonEditor
+        v-model="jobConfig"
+        :schema="jobSchema ?? undefined"
+        :label="t('job.config')"
+        :rows="6"
+      />
       <div class="new-job-popup__actions">
         <InkButton :text="t('common.cancel')" theme="subtle" @click="newJobPopupOpen = false" />
         <InkButton :text="t('common.confirm')" theme="primary" @click="onCreateJob" />
diff --git a/apps/client-webext/components/info-base/ArcsEditor/ArcsEditor.vue b/apps/client-webext/components/info-base/ArcsEditor/ArcsEditor.vue
index 30c895a..695a199 100644
--- a/apps/client-webext/components/info-base/ArcsEditor/ArcsEditor.vue
+++ b/apps/client-webext/components/info-base/ArcsEditor/ArcsEditor.vue
@@ -24,7 +24,7 @@ function addArc() {
     created_at: undefined,
     updated_at: undefined,
     storage: null,
-    resolver: 'text',
+    resolver: 'core.text.v1',
     content: '',
   })
   const newArc = new ArcForm(
diff --git a/apps/client-webext/entrypoints/taking-note.sidepanel/TakingNote.vue b/apps/client-webext/entrypoints/taking-note.sidepanel/TakingNote.vue
index 4b5ce67..484051c 100644
--- a/apps/client-webext/entrypoints/taking-note.sidepanel/TakingNote.vue
+++ b/apps/client-webext/entrypoints/taking-note.sidepanel/TakingNote.vue
@@ -19,7 +19,7 @@ const form = ref(
       created_at: undefined,
       updated_at: undefined,
       storage: null,
-      resolver: 'text',
+      resolver: 'core.text.v1',
       content: '',
     })
   )
@@ -64,8 +64,8 @@ watch(
               new BlockForm({
                 created_at: undefined,
                 updated_at: undefined,
-                storage: null,
-                resolver: 'url',
+                storage: -1,
+                resolver: 'core.html.v1',
                 content: newUrl,
               })
             )
diff --git a/apps/client-webext/logic/storage.ts b/apps/client-webext/logic/storage.ts
index 8e74372..35206b4 100644
--- a/apps/client-webext/logic/storage.ts
+++ b/apps/client-webext/logic/storage.ts
@@ -17,7 +17,7 @@ const metaAdapter = createWebextAdapter({
 
 export async function initializeExtensionConfig(): Promise<void> {
   await configStore.initializeMeta(metaAdapter)
-  await configStore.loadClientConfig()
+  await configStore.loadPeerConfig()
 }
 
 // Re-export the schema-owned types while keeping persistence extension-local.
diff --git a/docs/_shared b/docs/_shared
index a0ba0d4..067c60a 160000
--- a/docs/_shared
+++ b/docs/_shared
@@ -1 +1 @@
-Subproject commit a0ba0d415dbda735ce7da06145354f49c7bedecd
+Subproject commit 067c60a1160d45110e51f18994c5d7dfdc21f305
diff --git a/docs/info-base/ARCHITECTURE.md b/docs/info-base/ARCHITECTURE.md
index 9bda8b0..0028956 100644
--- a/docs/info-base/ARCHITECTURE.md
+++ b/docs/info-base/ARCHITECTURE.md
@@ -1,354 +1,178 @@
-# Info-Base Architecture
-
-## Table of Contents
-
-- Overview
-- Block Architecture
-- Relation Architecture
-- Storage System
-- Resolver System
-- Graph Operations
-- Layout System
-- Extension Points
-
----
-
-## Overview
-
-The **info-base** is InKCre's knowledge graph subsystem, providing a flexible graph-based information model with pluggable content types and storage backends.
-
-### Core Concepts
-
-```
-┌──────────────────────────────────────────────┐
-│           Knowledge Graph                     │
-│                                               │
-│  ┌───────┐         ┌───────┐                │
-│  │ Block │────────→│ Block │                │
-│  │ (Node)│         │ (Node)│                │
-│  └───┬───┘         └───────┘                │
-│      │                                        │
-│      │ Relation (Edge)                       │
-│      ↓                                        │
-│  ┌───────┐                                   │
-│  │ Block │                                   │
-│  └───────┘                                   │
-└──────────────────────────────────────────────┘
-
-Block:    Information unit (node)
-Relation: Connection between blocks (edge)
-Storage:  Where block content is stored
-Resolver: How block content is displayed
-```
-
-### Key Features
-
-- **Graph-based**: Blocks as nodes, relations as edges
-- **Typed Content**: Resolver system for different content types
-- **Pluggable Storage**: Abstract storage layer (URL, Blob, Text, etc.)
-- **Lazy Loading**: On-demand content and relation fetching
-- **Extensible**: Extensions can add custom resolvers/storages
-- **Visualization**: Vue Flow integration with multiple layouts
-
-### Star Graph Pattern
-
-Each block can be resolved with its **star graph** - the block plus all directly connected relations:
-
-```
-       ┌─────────┐
-       │ Block A │
-       └────┬────┘
-            │
-    ┌───────┼───────┐
-    │       │       │
-┌───▼───┐ ┌─▼─────┐ ┌▼───────┐
-│Block B│ │Block C│ │Block D │
-└───────┘ └───────┘ └────────┘
-
-Star Graph = {Block A, Relations to B/C/D}
-```
-
----
-
-## Block Architecture
-
-### Data Model
-
-Blocks represent information units with the following key fields:
-
-| Field        | Type           | Purpose                                                     |
-| ------------ | -------------- | ----------------------------------------------------------- |
-| `id`         | number         | Unique identifier                                           |
-| `created_at` | Date           | Creation timestamp                                          |
-| `updated_at` | Date           | Last modification timestamp                                 |
-| `storage`    | number \| null | FK to Storage table (null = inline content)                 |
-| `resolver`   | string         | Resolver type identifier (e.g., "text", "image", "tweet")   |
-| `content`    | string         | Raw content if `storage` is null, otherwise storage key/URL |
-
-### Content Resolution
-
-**Two-tier resolution**:
-
-1. **Storage Layer** (optional): Fetch actual content if `storage` is set
-2. **Resolver Layer**: Process and transform content for display
-
-```
-Block
-  ↓
-storage != null?
-  ├─ Yes → Storage.getRawContent()
-  └─ No  → Use block.content directly
-  ↓
-Resolver._getSolvedContent()
-  ↓
-ContentComponent (Vue)
+# Client-Web Info-Base Architecture
+
+## Purpose
+
+Describe the peer-local info-base implementation shared by `@inkcre/core` and the browser
+applications. Shared product authority lives in the InKCre docs Hub; this document owns
+TypeScript models, PostgREST mechanics, resolver/runtime handles, and rendering boundaries.
+
+## Peer Topology
+
+```text
+PostgreSQL / PostgREST protocol
+            |
+            v
+  Block + Relation models
+            |
+   Block.getHydratedContent()
+            |
+       exact Resolver
+            |
+ safe solved value / browser handle
+            |
+       Vue component
 ```
 
-### Lifecycle
-
-Blocks support standard CRUD operations: create, read, update, delete. Relations are cascade-deleted when blocks are removed.
-
----
+Client-web is a database-protocol peer, not a thin frontend that delegates every semantic
+operation to core-py. Schema/migration authority remains in core-py, while admitted read/write,
+storage hydration, resolver interpretation, and rendering execute locally.
 
-## Relation Architecture
+## Persisted Graph
 
-### Data Model
+### Block
 
-Relations connect blocks with the following key fields:
+| Field                       | Meaning                                               |
+| --------------------------- | ----------------------------------------------------- |
+| `id`                        | local graph identity                                  |
+| `created_at` / `updated_at` | block-row persistence time                            |
+| `resolver`                  | exact resolver contract version                       |
+| `storage`                   | selected storage record, or `null` for inline content |
+| `content`                   | inline string or opaque storage pointer               |
 
-| Field        | Type     | Purpose                             |
-| ------------ | -------- | ----------------------------------- |
-| `id`         | number   | Unique identifier                   |
-| `created_at` | Date     | Creation timestamp                  |
-| `source`     | BlockRef | Source block (from)                 |
-| `target`     | BlockRef | Target block (to)                   |
-| `type`       | string   | Relation type/semantics (optional)  |
-| `metadata`   | Record   | Additional relation data (optional) |
+Do not render `block.content` directly unless `storage === null` and the exact resolver contract
+uses that inline value. A storage pointer is mechanics, never authored text.
 
-### Directionality
+### Relation
 
-Relations are **directed**: `source → target`
+Relations are directed graph authority with `from_`, `to_`, and contract-owned `content`.
+`includeIn` means the subject block is `to_`; `includeOut` means it is `from_`. These options
+filter direct relations and do not request recursive graph traversal.
 
-Query patterns:
+Relation payload grammar belongs to its extension/canonical contract. The UI must not invent a
+universal relation-type registry or infer ownership from direction alone.
 
-- Outgoing: Relations from a block
-- Incoming: Relations to a block
-- Bidirectional: All relations involving a block
+## Block Hydration
 
-### Relation Types
+`Block.getHydratedContent({ refresh = false })` returns:
 
-Relation types are domain-specific:
+- `string` when the block is inline;
+- `Uint8Array` when a configured storage resolves the opaque pointer.
 
-- `"references"` - Citations or links
-- `"childOf"` - Hierarchical parent-child
-- `"relatedTo"` - General association
-- `"derivedFrom"` - Transformation or derivation
-
-Extensions can define custom types.
-
----
+The private cache key is `(storage, content)`. Cache properties are non-enumerable so Zod/
+transport projections never persist them. A changed pointer misses naturally; `refresh` bypasses
+and replaces the current instance snapshot. No cross-instance or cross-peer invalidation is
+promised, and storage-backed bytes may change without changing `block.updated_at`.
 
 ## Storage System
 
-### Purpose
+Storage handlers turn a pointer into bytes. They do not decide MIME, filename, information kind,
+or resolver ID.
 
-The **Storage system** abstracts content retrieval, allowing blocks to reference content stored externally rather than inline.
+### Generic HTTP
 
-### Architecture
-
-```
-┌─────────────────────────────────────────┐
-│  Storage (Abstract Base Class)          │
-│  - id, type, config                     │
-│  - getRawContent() → Promise<string>    │
-└────────────┬────────────────────────────┘
-             │ extends
-      ┌──────┴──────┬──────────┬──────────┐
-      │             │          │          │
-┌─────▼──────┐ ┌───▼───┐ ┌────▼────┐ ┌───▼────┐
-│URLStorage  │ │Blob   │ │Text     │ │Custom  │
-│(HTTP)      │ │Storage│ │Storage  │ │(Ext)   │
-└────────────┘ └───────┘ └─────────┘ └────────┘
-```
+`HttpStorage` accepts only HTTP(S), enforces timeout/redirect policy and both declared/received
+byte limits, then returns `Uint8Array`. It does not branch on `Content-Type`.
 
-### Storage Registry
+### PostgreSQL Binary
 
-**Decorator-based registration** allows extensions to add new storage types. Each storage type implements `getRawContent()` for content retrieval.
+`PostgreSQLBinaryStorage` is a complete browser-peer byte capability:
 
-### Key Differences
+- create: raw `application/octet-stream` RPC returns UUID and storage-owned pointer JSON;
+- read: raw RPC returns `application/octet-stream`;
+- update: exact `storage_blobs` UUID row update, pointer remains stable;
+- delete: exact UUID row delete.
 
-- **Inline vs External**: Null storage uses `block.content`; set storage delegates to storage handler
-- **Type-specific Config**: Each storage type has configurable parameters
-- **Error Handling**: Storage layer provides consistent error handling and logging
+`storage_blobs` is the backing relation, not a storage type or semantic block. The storage
+handler alone parses/serializes `{ "blob_id": "..." }`; callers persist only its opaque string.
+Storage C/R/U/D never queries or rewrites blocks.
 
----
+Authentication and origins come from browser-owned runtime config. `rawPostgrestFetch()` reuses
+the current JWT/origin authority but exposes a byte-capable response rather than forcing JSON.
 
 ## Resolver System
 
-### Purpose
-
-**Resolvers** define how block content is processed and displayed. Each resolver type handles a specific content format.
+Resolvers interpret hydrated content plus required relations. `Resolver.getClass(id)` is exact;
+there is no first/default fallback. Registration is idempotent only for the same class and rejects
+collisions.
 
-### Architecture
+The shared exact IDs are:
 
+```text
+core.text.v1   core.html.v1   core.image.v1
+core.audio.v1  core.video.v1  core.pdf.v1
+core.epub.v1   core.zip.v1    core.file.v1
 ```
-┌─────────────────────────────────────────────┐
-│  BaseResolver (Abstract)                    │
-│  - type, contentComp                        │
-│  - getSolvedContent() → caching             │
-│  - _getSolvedContent() → subclass impl      │
-└───────────────┬─────────────────────────────┘
-                │ extends
-      ┌─────────┴─────┬───────────┬────────┐
-      │               │           │        │
-┌─────▼─────┐  ┌──────▼───┐ ┌────▼───┐  ┌─▼────────┐
-│Text       │  │Image     │ │HTML    │  │Tweet     │
-│Resolver   │  │Resolver  │ │Resolver│  │(Extension)
-└───────────┘  └──────────┘ └────────┘  └──────────┘
-```
-
-### Resolver Interface
-
-Resolvers provide:
-
-- Content processing and caching
-- Lazy relation loading
-- Vue component integration
-- Loading state management
-
-### Content Component Pattern
-
-Content components receive standardized props:
-
-- `resolver`: Resolver instance
-- `solvedContent`: Processed content
-
-### Resolver Registry
-
-The `Resolver` base class now hosts the registry itself using `Resolver.register`, `Resolver.registry`, and `Resolver.getClass` so implementations can self-register their `type` and the UI can resolve them by identifier.
-
-### Resolver Lifecycle
-
-1. Create resolver instance
-2. Fetch and process content (with caching)
-3. Display via Vue component
-4. Dispose on cleanup
-
----
-
-## Graph Operations
-
-### Graph Data Structure
 
-Uses **graphology** library for graph operations, converting blocks to nodes and relations to edges.
+Core bootstrap registers all nine independently of Module Federation extension loading.
+Extensions register their own namespaced, versioned decoders.
 
-### Community Detection
+### Capability Outcomes
 
-**Louvain Algorithm** groups related blocks into communities for visualization and analysis.
+Every concrete resolver implements:
 
-### Shortest Path
-
-Bidirectional search finds shortest paths between blocks.
-
-### Topology Detection
-
-Analyzes graph structure to identify:
-
-- DAG (Directed Acyclic Graph)
-- Tree
-- Star
-- General graphs
-
-### CRUD Operations
-
-- **Create**: Add blocks and relations
-- **Read**: Query by ID, recent, or relationships
-- **Update**: Modify block/relation properties
-- **Delete**: Remove with cascade handling
-
-### Performance
-
-- Lazy loading prevents unnecessary fetches
-- Caching reduces redundant processing
-- Batch operations for bulk updates
-- Pagination for large datasets
-
----
-
-## Layout System
-
-### Layout Manager Architecture
-
-The **Layout Manager** auto-detects graph topology and selects appropriate algorithms.
-
-```
-┌───────────────────────────────────────────┐
-│         useLayoutManager                  │
-│  - Auto-detect topology                   │
-│  - Select appropriate layout              │
-│  - Apply layout and update positions      │
-└───────────┬───────────────────────────────┘
-            │ uses
-    ┌───────┴───────┬──────────┬──────────┐
-    │               │          │          │
-┌───▼────┐  ┌──────▼───┐  ┌───▼───┐  ┌───▼────┐
-│Force   │  │Dagre     │  │Circular│  │Radial  │
-│Layout  │  │(Layered) │  │Layout  │  │Layout  │
-└────────┘  └──────────┘  └────────┘  └────────┘
+```ts
+getText(options?: ProjectionOptions): Promise<string | null>
+getStrForEmbedding(options?: ProjectionOptions): Promise<string | null>
 ```
 
-### Available Layouts
+- `UnknownResolverError`: no exact decoder is registered;
+- `UnsupportedResolverCapability`: the decoder does not provide that projection;
+- `null`: capability exists but the block has no meaningful value;
+- `''`: an actual empty value, not a generic fallback.
 
-| Layout       | Best For             | Description                      |
-| ------------ | -------------------- | -------------------------------- |
-| **Force**    | General graphs       | Physics simulation, organic feel |
-| **Dagre**    | DAGs, Trees          | Hierarchical layered layout      |
-| **Circular** | Cycles, Small graphs | Nodes arranged in circle         |
-| **Radial**   | Star, Hierarchies    | Concentric circles from root     |
-| **Grid**     | Large graphs         | Uniform grid arrangement         |
-| **Auto**     | Any                  | Auto-detect topology and choose  |
+Do not collapse these outcomes into an empty preview or reinterpret an unknown ID.
 
-### Key Differences
+### Effect Vocabulary
 
-- **Force-Directed**: Physics-based, good for organic layouts but computationally intensive
-- **Hierarchical (Dagre)**: Layered approach ideal for DAGs and trees
-- **Circular/Radial**: Space-efficient for dense or hierarchical graphs
-- **Grid**: Predictable positioning for large, uniform datasets
+- `refresh`: bypass and replace a local hydration/relation/solved snapshot;
+- `materializeMissing`: permit creation only when a required derivation is absent;
+- `recompute`: reserved for an explicit organization command that regenerates an existing
+  derivation;
+- `invalidate`: discard cache without loading replacement.
 
-### Vue Flow Integration
+Do not add `force` or `reload` aliases for these effects.
 
-Layouts update node positions in Vue Flow graphs, supporting manual and automatic modes.
+### Media Matching
 
----
+`Resolver.matchMediaType()` normalizes one candidate MIME and returns an installed exact core
+resolver ID or `null`. Source/protocol adapters own evidence order and explicit
+`core.file.v1` fallback; the manager does not own one universal classification ladder.
 
-## Extension Points
+## Browser Runtime Handles
 
-### Custom Resolvers
+Image/audio/video/PDF/EPUB/ZIP/file resolvers hydrate bytes locally and may expose safe Blob or
+Object URL handles. These handles are private runtime state, not solved graph authority, and are
+revoked on resolver refresh, disposal, and resolver-cache eviction.
 
-Extensions register resolvers using decorators:
+HTML is rendered as a text preview/source action. It is not passed to `v-html` without a separate
+sanitizer contract. Parser-derived facts may remain `null` when the browser does not have a
+proportionate local parser; open/render/download remains a real capability.
 
-```typescript
-@BaseResolver.registry('customType')
-export class CustomResolver extends BaseResolver {
-  // Implement content processing
-}
-```
+`BlockContent.vue` resolves exact class setup errors visibly, loads solved content, passes it to
+the registered component, and disposes the resolver on unmount. Graph/editor surfaces must use
+this path rather than falling back to the persisted pointer string.
 
-### Custom Storage
+## Resolver Cache
 
-Extensions add storage types:
+`ResolverCache` owns reusable resolver instances by block identity/update snapshot. Eviction and
+replacement call `dispose()` so object URLs and other handles cannot leak. Resolver-internal solved
+content and relation caches still obey `refresh`; cache reuse does not change authority.
 
-```typescript
-@Storage.registry('customStorage')
-export class CustomStorage extends Storage {
-  // Implement content retrieval
-}
-```
+## Extension Producer Rules
 
-### Extension Lifecycle
+- Emit exact, versioned resolver IDs.
+- Store protocol/source identity and declared metadata in canonical metadata/root blocks.
+- Put actual media/document bytes in an exact semantic content block, optionally storage-backed.
+- Keep associations in relations rather than copying attachment/reference IDs into root content.
+- Never choose a semantic storage type; storage is bytes-only mechanics.
 
-Extensions initialize during startup, registering types that become available system-wide. Deactivation cleans up resources.
+Twitter and browser-extension producers have been cut over to these exact semantic IDs. Retired
+bare IDs and media-specific HTTP storage handlers are not compatibility fallbacks.
 
----
+## Verification
 
-**Last Updated**: January 2, 2026
+- `packages/core` tests prove inline/storage hydration, refresh, exact registration, typed
+  capability outcomes, semantic resolver handles, object URL cleanup, HTTP limits, and PostgreSQL
+  binary C/R/U/D.
+- database-contract generation tests prove admitted relation/function projection.
+- repository `pnpm check` proves TypeScript, Vue, unit tests, formatting/lint, and production builds.
diff --git a/docs/resolver.md b/docs/resolver.md
index 299e24c..ce08a5e 100644
--- a/docs/resolver.md
+++ b/docs/resolver.md
@@ -1,5 +1,9 @@
-# 解析器
+# Resolver Notes
 
-- 解析器是用于解析不同类型的块内容，提供统一的接口以对块进行展示、修改等操作
-- 块通过其 `resolver` 字段指定解析器
-- 解析器可以通过插件载入
+The durable client-web resolver architecture is owned by
+[Client-Web Info-Base Architecture](info-base/ARCHITECTURE.md#resolver-system)。
+
+Resolvers are exact, versioned interpreters of hydrated block content and direct relations；they
+are not merely display components。Unknown resolver、unsupported capability、supported-null and
+authored-empty are distinct outcomes。New code uses `refresh` and `materializeMissing` with the
+stable semantics recorded by that architecture document。
diff --git a/extensions/mail/index.html b/extensions/mail/index.html
new file mode 100644
index 0000000..fa207c8
--- /dev/null
+++ b/extensions/mail/index.html
@@ -0,0 +1,2 @@
+<div id="app"></div>
+<script type="module" src="/src/main.ts"></script>
diff --git a/extensions/mail/package.json b/extensions/mail/package.json
new file mode 100644
index 0000000..eaf65d1
--- /dev/null
+++ b/extensions/mail/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@inkcre/ext-mail",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview",
+    "type-check": "vue-tsc --noEmit"
+  },
+  "dependencies": {
+    "@inkcre/core": "workspace:*",
+    "dompurify": "^3.4.13"
+  },
+  "devDependencies": {
+    "@inkcre/ext-dev-utils": "workspace:*",
+    "@inkcre/ui-web": "1.2.2",
+    "@module-federation/vite": "^1.1.0",
+    "@vitejs/plugin-vue": "^6.0.1",
+    "@vitejs/plugin-vue-jsx": "^5.1.2",
+    "@vue/tsconfig": "^0.7.0",
+    "sass-embedded": "^1.90.0",
+    "typescript": "catalog:",
+    "vite": "^7.0.6",
+    "vue-tsc": "catalog:",
+    "zod": "^4.1.12"
+  },
+  "peerDependencies": {
+    "@vueuse/core": "^14.0.0",
+    "pinia": "^3.0.0",
+    "vue": "^3.5.0",
+    "vue-router": "^4.5.0",
+    "zod": "^4.1.0"
+  }
+}
diff --git a/extensions/mail/src/DevApp.vue b/extensions/mail/src/DevApp.vue
new file mode 100644
index 0000000..754c1f2
--- /dev/null
+++ b/extensions/mail/src/DevApp.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import { DevLayout } from '@inkcre/ext-dev-utils'
+</script>
+
+<template>
+  <DevLayout extension-name="Mail Extension">
+    <RouterView />
+  </DevLayout>
+</template>
diff --git a/extensions/mail/src/components/contentEmail/contentEmail.scss b/extensions/mail/src/components/contentEmail/contentEmail.scss
new file mode 100644
index 0000000..cb3a182
--- /dev/null
+++ b/extensions/mail/src/components/contentEmail/contentEmail.scss
@@ -0,0 +1,91 @@
+.content-email {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  color: var(--ink-text-primary, #111827);
+
+  &__header {
+    border-bottom: 1px solid var(--ink-border-primary, #e5e7eb);
+    padding-bottom: 16px;
+
+    h2 {
+      margin: 0 0 8px;
+      font-size: 20px;
+    }
+
+    time,
+    p {
+      color: var(--ink-text-secondary, #6b7280);
+    }
+
+    dl {
+      display: grid;
+      grid-template-columns: max-content minmax(0, 1fr);
+      gap: 4px 12px;
+    }
+
+    dt {
+      text-transform: capitalize;
+      color: var(--ink-text-secondary, #6b7280);
+    }
+
+    dd {
+      margin: 0;
+      overflow-wrap: anywhere;
+    }
+  }
+
+  &__html {
+    width: 100%;
+    min-height: 420px;
+    border: 1px solid var(--ink-border-primary, #e5e7eb);
+    background: #fff;
+  }
+
+  &__text {
+    margin: 0;
+    white-space: pre-wrap;
+    overflow-wrap: anywhere;
+    font: inherit;
+  }
+
+  &__parts,
+  &__references {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+
+    h3 {
+      margin: 0;
+      font-size: 15px;
+    }
+  }
+
+  &__part {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    gap: 12px;
+    padding: 12px;
+    border: 1px solid var(--ink-border-primary, #e5e7eb);
+    border-radius: 6px;
+
+    div {
+      display: flex;
+      min-width: 0;
+      flex: 1;
+      flex-direction: column;
+    }
+
+    span,
+    p {
+      color: var(--ink-text-secondary, #6b7280);
+    }
+
+    p {
+      width: 100%;
+      margin: 0;
+    }
+  }
+}
diff --git a/extensions/mail/src/components/contentEmail/contentEmail.vue b/extensions/mail/src/components/contentEmail/contentEmail.vue
new file mode 100644
index 0000000..d0b08c3
--- /dev/null
+++ b/extensions/mail/src/components/contentEmail/contentEmail.vue
@@ -0,0 +1,189 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { InkButton } from '@inkcre/ui-web'
+import DOMPurify from 'dompurify'
+import { getInfoBaseRouter, type SolvedContentRendererProps } from '@inkcre/core'
+
+import type { EmailResolver } from '../../resolver'
+import type { SolvedEmail, SolvedMimePart } from '../../schema'
+
+const props = defineProps<SolvedContentRendererProps<SolvedEmail, EmailResolver>>()
+const router = getInfoBaseRouter()
+const email = ref(props.solvedContent)
+const materializing = ref<Set<number>>(new Set())
+const materializeErrors = ref<Map<number, string>>(new Map())
+
+watch(
+  () => props.solvedContent,
+  (value) => {
+    email.value = value
+  }
+)
+
+const participants = computed(() => {
+  const grouped = new Map<string, string[]>()
+  for (const participant of [...email.value.participants].sort(
+    (left, right) => left.relation.order - right.relation.order
+  )) {
+    const values = grouped.get(participant.relation.role) ?? []
+    const name = participant.relation.display_name
+    const address = participant.address.solvedContent.address
+    values.push(name ? `${name} <${address}>` : address)
+    grouped.set(participant.relation.role, values)
+  }
+  return [...grouped.entries()]
+})
+
+const htmlBody = computed(() =>
+  email.value.bodies.find((body) => body.block.resolver === 'core.html.v1')
+)
+const textBody = computed(() =>
+  email.value.bodies.find((body) => body.block.resolver === 'core.text.v1')
+)
+
+function objectUrl(part: SolvedMimePart): string | null {
+  const solved = part.content?.solvedContent
+  if (!solved || typeof solved !== 'object' || !('objectUrl' in solved)) return null
+  return typeof solved.objectUrl === 'string' ? solved.objectUrl : null
+}
+
+const isolatedHtml = computed(() => {
+  if (!htmlBody.value) return ''
+  const sanitized = DOMPurify.sanitize(htmlBody.value.solvedContent, {
+    FORBID_TAGS: ['script', 'style', 'iframe', 'object', 'embed', 'form', 'link', 'meta', 'base'],
+    FORBID_ATTR: ['style', 'srcset', 'poster', 'background', 'formaction'],
+  })
+  const document = new DOMParser().parseFromString(sanitized, 'text/html')
+  const cidUrls = new Map<string, string>()
+  for (const embedded of email.value.embedded) {
+    if (embedded.body.id !== htmlBody.value.block.id) continue
+    const url = objectUrl(embedded.mimePart.solvedContent)
+    if (url) cidUrls.set(embedded.reference.toLowerCase(), url)
+  }
+
+  for (const element of document.querySelectorAll<HTMLElement>('[src]')) {
+    const source = element.getAttribute('src')?.trim() ?? ''
+    const local = cidUrls.get(source.toLowerCase())
+    if (element instanceof HTMLImageElement && local) element.src = local
+    else element.removeAttribute('src')
+  }
+  for (const anchor of document.querySelectorAll<HTMLAnchorElement>('a[href]')) {
+    const href = anchor.getAttribute('href') ?? ''
+    try {
+      const target = new URL(href)
+      if (!['http:', 'https:'].includes(target.protocol)) throw new Error('unsupported link')
+      anchor.href = target.href
+      anchor.target = '_blank'
+      anchor.rel = 'noopener noreferrer'
+    } catch {
+      anchor.removeAttribute('href')
+      anchor.removeAttribute('target')
+    }
+  }
+  return `<!doctype html><html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src blob:"></head><body>${document.body.innerHTML}</body></html>`
+})
+
+async function materialize(block: number): Promise<void> {
+  materializing.value = new Set(materializing.value).add(block)
+  const errors = new Map(materializeErrors.value)
+  errors.delete(block)
+  materializeErrors.value = errors
+  try {
+    email.value = await props.resolver.materializeMimePart(block)
+  } catch (cause) {
+    errors.set(block, cause instanceof Error ? cause.message : String(cause))
+    materializeErrors.value = errors
+  } finally {
+    const active = new Set(materializing.value)
+    active.delete(block)
+    materializing.value = active
+  }
+}
+
+function navigate(block: number): void {
+  void router.push({ name: 'block', block })
+}
+</script>
+
+<template>
+  <article class="content-email">
+    <header class="content-email__header">
+      <h2>{{ email.root.subject || '(no subject)' }}</h2>
+      <time v-if="email.root.authored_at">{{ email.root.authored_at.toLocaleString() }}</time>
+      <dl>
+        <template v-for="[role, values] in participants" :key="role">
+          <dt>{{ role.replace(/_/g, ' ') }}</dt>
+          <dd>{{ values.join(', ') }}</dd>
+        </template>
+      </dl>
+      <p v-if="email.mailboxes.length">
+        {{ email.mailboxes.map((item) => item.mailbox.solvedContent.name).join(', ') }}
+        <span v-if="email.flags.length">
+          · {{ email.flags.map((item) => item.flag.solvedContent.name).join(', ') }}</span
+        >
+      </p>
+    </header>
+
+    <iframe
+      v-if="htmlBody"
+      :key="isolatedHtml"
+      class="content-email__html"
+      title="Email HTML body"
+      sandbox="allow-popups allow-popups-to-escape-sandbox"
+      :srcdoc="isolatedHtml"
+    />
+    <pre v-else-if="textBody" class="content-email__text">{{ textBody.solvedContent }}</pre>
+    <p v-else class="content-email__empty">No body content</p>
+
+    <section v-if="email.mimeParts.length" class="content-email__parts">
+      <h3>Attachments and inline content</h3>
+      <article v-for="part in email.mimeParts" :key="part.block.id" class="content-email__part">
+        <div>
+          <strong>{{
+            part.solvedContent.root.filename ||
+            part.solvedContent.root.description ||
+            part.solvedContent.root.media_type
+          }}</strong>
+          <span>{{ part.solvedContent.root.media_type }}</span>
+        </div>
+        <a
+          v-if="objectUrl(part.solvedContent)"
+          :href="objectUrl(part.solvedContent) || undefined"
+          target="_blank"
+          rel="noopener noreferrer"
+          >Open</a
+        >
+        <InkButton
+          v-else
+          text="Download"
+          :loading="materializing.has(part.block.id)"
+          @click="materialize(part.block.id)"
+        />
+        <p v-if="materializeErrors.get(part.block.id)">
+          {{ materializeErrors.get(part.block.id) }}
+        </p>
+      </article>
+    </section>
+
+    <section
+      v-if="email.parents.length || email.references.length"
+      class="content-email__references"
+    >
+      <h3>Conversation</h3>
+      <InkButton
+        v-for="target in email.parents"
+        :key="`parent-${target.block.id}`"
+        :text="`View reply target: ${target.solvedContent.subject || target.solvedContent.message_id || `#${target.block.id}`}`"
+        @click="navigate(target.block.id)"
+      />
+      <InkButton
+        v-for="target in email.references"
+        :key="`reference-${target.block.id}`"
+        :text="`View reference: ${target.solvedContent.subject || target.solvedContent.message_id || `#${target.block.id}`}`"
+        @click="navigate(target.block.id)"
+      />
+    </section>
+  </article>
+</template>
+
+<style scoped lang="scss" src="./contentEmail.scss" />
diff --git a/extensions/mail/src/components/contentMailFact/contentMailFact.vue b/extensions/mail/src/components/contentMailFact/contentMailFact.vue
new file mode 100644
index 0000000..e28127b
--- /dev/null
+++ b/extensions/mail/src/components/contentMailFact/contentMailFact.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { SolvedContentRendererProps } from '@inkcre/core'
+
+const props = defineProps<SolvedContentRendererProps<Record<string, unknown>>>()
+const entries = computed(() =>
+  Object.entries(props.solvedContent).filter(([, value]) => value !== null && value !== '')
+)
+</script>
+
+<template>
+  <dl class="content-mail-fact">
+    <template v-for="[name, value] in entries" :key="name">
+      <dt>{{ name.replace(/_/g, ' ') }}</dt>
+      <dd>{{ Array.isArray(value) ? value.join(', ') : value }}</dd>
+    </template>
+  </dl>
+</template>
+
+<style scoped lang="scss">
+.content-mail-fact {
+  display: grid;
+  grid-template-columns: max-content minmax(0, 1fr);
+  gap: 8px 16px;
+  margin: 0;
+
+  dt {
+    color: var(--ink-text-secondary, #6b7280);
+    text-transform: capitalize;
+  }
+
+  dd {
+    margin: 0;
+    overflow-wrap: anywhere;
+  }
+}
+</style>
diff --git a/extensions/mail/src/components/contentMimePart/contentMimePart.vue b/extensions/mail/src/components/contentMimePart/contentMimePart.vue
new file mode 100644
index 0000000..644f503
--- /dev/null
+++ b/extensions/mail/src/components/contentMimePart/contentMimePart.vue
@@ -0,0 +1,69 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { InkButton } from '@inkcre/ui-web'
+import type { SolvedContentRendererProps } from '@inkcre/core'
+
+import type { MailMimePartResolver } from '../../resolver'
+import type { SolvedMimePart } from '../../schema'
+
+const props = defineProps<SolvedContentRendererProps<SolvedMimePart, MailMimePartResolver>>()
+const content = ref(props.solvedContent)
+const loading = ref(false)
+const error = ref<Error | null>(null)
+
+async function materialize(): Promise<void> {
+  loading.value = true
+  error.value = null
+  try {
+    content.value = await props.resolver.getSolvedContent({
+      refresh: true,
+      materializeMissing: true,
+    })
+  } catch (cause) {
+    error.value = cause instanceof Error ? cause : new Error(String(cause))
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
+<template>
+  <div class="content-mime-part">
+    <strong>{{
+      content.root.filename || content.root.description || content.root.media_type
+    }}</strong>
+    <span>{{ content.root.media_type }}</span>
+    <span v-if="content.root.encoded_size !== null"
+      >{{ content.root.encoded_size }} bytes encoded</span
+    >
+    <a
+      v-if="
+        content.content &&
+        typeof content.content.solvedContent === 'object' &&
+        content.content.solvedContent &&
+        'objectUrl' in content.content.solvedContent
+      "
+      :href="String(content.content.solvedContent.objectUrl)"
+      target="_blank"
+      rel="noopener noreferrer"
+      >Open</a
+    >
+    <InkButton v-else text="Download content" :loading="loading" @click="materialize" />
+    <p v-if="error">{{ error.message }}</p>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.content-mime-part {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 8px;
+
+  span,
+  p {
+    margin: 0;
+    color: var(--ink-text-secondary, #6b7280);
+  }
+}
+</style>
diff --git a/extensions/mail/src/index.ts b/extensions/mail/src/index.ts
new file mode 100644
index 0000000..7940cd2
--- /dev/null
+++ b/extensions/mail/src/index.ts
@@ -0,0 +1,12 @@
+import type { ExtensionModule } from '@inkcre/core'
+
+import './resolver'
+
+const Extension: ExtensionModule = {
+  async initialize() {},
+  async activate() {},
+  async deactivate() {},
+  async dispose() {},
+}
+
+export default Extension
diff --git a/extensions/mail/src/main.ts b/extensions/mail/src/main.ts
new file mode 100644
index 0000000..1c10cbf
--- /dev/null
+++ b/extensions/mail/src/main.ts
@@ -0,0 +1,16 @@
+import { bootstrapExtension } from '@inkcre/ext-dev-utils'
+import '@inkcre/ui-web/styles'
+
+import App from './DevApp.vue'
+import Extension from './index'
+
+void bootstrapExtension({
+  rootComponent: App,
+  extensionModule: Extension,
+  routes: [
+    {
+      path: '/',
+      component: () => import('./views/DevHome.vue'),
+    },
+  ],
+}).catch((error) => console.error('Failed to bootstrap Mail extension:', error))
diff --git a/extensions/mail/src/resolver.ts b/extensions/mail/src/resolver.ts
new file mode 100644
index 0000000..84398aa
--- /dev/null
+++ b/extensions/mail/src/resolver.ts
@@ -0,0 +1,278 @@
+import { markRaw } from 'vue'
+import {
+  Block,
+  PeerManager,
+  PeerProtocolResponseSchema,
+  Relation,
+  Resolver,
+  ResolverCache,
+  type ProjectionOptions,
+} from '@inkcre/core'
+
+import ContentEmail from './components/contentEmail/contentEmail.vue'
+import ContentMailFact from './components/contentMailFact/contentMailFact.vue'
+import ContentMimePart from './components/contentMimePart/contentMimePart.vue'
+import {
+  CanonicalEmailAddressSchema,
+  CanonicalEmailSchema,
+  CanonicalMailFlagSchema,
+  CanonicalMailboxSchema,
+  CanonicalMimePartSchema,
+  ComponentRelationSchema,
+  ContainsRelationSchema,
+  EmbeddedReferenceRelationSchema,
+  ParticipantRelationSchema,
+  parseJson,
+  type CanonicalEmailAddress,
+  type CanonicalMailFlag,
+  type CanonicalMailbox,
+  type SolvedBlock,
+  type SolvedEmail,
+  type SolvedMimePart,
+} from './schema'
+
+export const MAIL_MIME_PART_MATERIALIZE_CAPABILITY = 'extensions.mail.mime_part.materialize.v1'
+
+async function solveBlock<Content>(
+  block: Block,
+  options: ProjectionOptions
+): Promise<SolvedBlock<Content>> {
+  const resolver = await ResolverCache.getResolver(block)
+  return {
+    block,
+    solvedContent: (await resolver.getSolvedContent({
+      ...options,
+      materializeMissing: false,
+    })) as Content,
+  }
+}
+
+function parseRelation(content: string): unknown | null {
+  try {
+    return parseJson(content)
+  } catch {
+    return null
+  }
+}
+
+async function relatedBlocks(relations: Relation[], focal: number): Promise<Map<number, Block>> {
+  const refs = new Set(
+    relations.map((relation) => (relation.from_ === focal ? relation.to_ : relation.from_))
+  )
+  const blocks = await Promise.all([...refs].map((ref) => Block.find(ref)))
+  return new Map(
+    blocks.filter((block): block is Block => block !== null).map((block) => [block.id, block])
+  )
+}
+
+export class EmailResolver extends Resolver<string, SolvedEmail> {
+  static readonly type = 'extensions.mail.email.v1'
+  static readonly solvedContentRenderer = markRaw(ContentEmail)
+
+  static {
+    Resolver.register(EmailResolver.type, EmailResolver)
+  }
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<SolvedEmail> {
+    const root = CanonicalEmailSchema.parse(parseJson(await this.getRawContent(options)))
+    const relations = await this.getRelations({ refresh: options.refresh })
+    const blocks = await relatedBlocks(relations, this.block.id)
+    const result: SolvedEmail = {
+      root,
+      bodies: [],
+      mimeParts: [],
+      participants: [],
+      mailboxes: [],
+      flags: [],
+      parents: [],
+      references: [],
+      embedded: [],
+    }
+
+    for (const relation of relations) {
+      const outgoing = relation.from_ === this.block.id
+      const related = blocks.get(outgoing ? relation.to_ : relation.from_)
+      if (!related) continue
+
+      if (outgoing) {
+        const component = ComponentRelationSchema.safeParse(parseRelation(relation.content))
+        if (component.success && component.data.role === 'body') {
+          if (!['core.text.v1', 'core.html.v1'].includes(related.resolver)) continue
+          result.bodies.push({
+            ...(await solveBlock<string>(related, options)),
+            relation: component.data,
+          })
+          continue
+        }
+        if (component.success && component.data.role !== 'body') {
+          if (related.resolver !== MailMimePartResolver.type) continue
+          result.mimeParts.push({
+            ...(await solveBlock<SolvedMimePart>(related, options)),
+            relation: component.data,
+          })
+          continue
+        }
+
+        const participant = ParticipantRelationSchema.safeParse(parseRelation(relation.content))
+        if (participant.success && related.resolver === EmailAddressResolver.type) {
+          result.participants.push({
+            relation: participant.data,
+            address: await solveBlock<CanonicalEmailAddress>(related, options),
+          })
+          continue
+        }
+        if (related.resolver === EmailResolver.type && relation.content.startsWith('parent:')) {
+          result.parents.push({
+            block: related,
+            solvedContent: CanonicalEmailSchema.parse(parseJson(related.content)),
+          })
+        } else if (
+          related.resolver === EmailResolver.type &&
+          relation.content.startsWith('reference:')
+        ) {
+          result.references.push({
+            block: related,
+            solvedContent: CanonicalEmailSchema.parse(parseJson(related.content)),
+          })
+        }
+        continue
+      }
+
+      const contains = ContainsRelationSchema.safeParse(parseRelation(relation.content))
+      if (contains.success && related.resolver === MailboxResolver.type) {
+        result.mailboxes.push({
+          relation: contains.data,
+          mailbox: await solveBlock<CanonicalMailbox>(related, options),
+        })
+      } else if (relation.content === 'tags' && related.resolver === MailFlagResolver.type) {
+        result.flags.push({ flag: await solveBlock<CanonicalMailFlag>(related, options) })
+      }
+    }
+
+    const mimeParts = new Map(result.mimeParts.map((part) => [part.block.id, part]))
+    for (const body of result.bodies.filter((item) => item.block.resolver === 'core.html.v1')) {
+      for (const relation of await Relation.getByBlock(body.block.id)) {
+        if (relation.from_ !== body.block.id) continue
+        const embedded = EmbeddedReferenceRelationSchema.safeParse(parseRelation(relation.content))
+        const mimePart = mimeParts.get(relation.to_)
+        if (embedded.success && mimePart) {
+          result.embedded.push({
+            body: body.block,
+            reference: embedded.data.reference,
+            mimePart,
+          })
+        }
+      }
+    }
+    return result
+  }
+
+  async materializeMimePart(blockRef: number): Promise<SolvedEmail> {
+    const block = await Block.get(blockRef)
+    if (block.resolver !== MailMimePartResolver.type) {
+      throw new TypeError(`Block ${blockRef} is not a Mail MIME part`)
+    }
+    const resolver = await ResolverCache.getResolver<MailMimePartResolver>(block)
+    await resolver.getSolvedContent({ refresh: true, materializeMissing: true })
+    return this.getSolvedContent({ refresh: true, materializeMissing: false })
+  }
+
+  async getText(options: ProjectionOptions = {}): Promise<string> {
+    const email = await this.getSolvedContent(options)
+    const body = email.bodies.find((item) => item.block.resolver === 'core.text.v1')
+    return [email.root.subject, body?.solvedContent].filter(Boolean).join('\n\n') || 'email'
+  }
+
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string> {
+    return this.getText(options)
+  }
+}
+
+abstract class JsonMailResolver<Content> extends Resolver<string, Content> {
+  abstract readonly schema: { parse(value: unknown): Content }
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<Content> {
+    return this.schema.parse(parseJson(await this.getRawContent(options)))
+  }
+
+  async getText(options: ProjectionOptions = {}): Promise<string> {
+    return JSON.stringify(await this.getSolvedContent(options))
+  }
+
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string> {
+    return this.getText(options)
+  }
+}
+
+export class MailboxResolver extends JsonMailResolver<CanonicalMailbox> {
+  static readonly type = 'extensions.mail.mailbox.v1'
+  static readonly solvedContentRenderer = markRaw(ContentMailFact)
+  readonly schema = CanonicalMailboxSchema
+
+  static {
+    Resolver.register(MailboxResolver.type, MailboxResolver)
+  }
+}
+
+export class EmailAddressResolver extends JsonMailResolver<CanonicalEmailAddress> {
+  static readonly type = 'extensions.mail.email_address.v1'
+  static readonly solvedContentRenderer = markRaw(ContentMailFact)
+  readonly schema = CanonicalEmailAddressSchema
+
+  static {
+    Resolver.register(EmailAddressResolver.type, EmailAddressResolver)
+  }
+}
+
+export class MailFlagResolver extends JsonMailResolver<CanonicalMailFlag> {
+  static readonly type = 'extensions.mail.flag.v1'
+  static readonly solvedContentRenderer = markRaw(ContentMailFact)
+  readonly schema = CanonicalMailFlagSchema
+
+  static {
+    Resolver.register(MailFlagResolver.type, MailFlagResolver)
+  }
+}
+
+export class MailMimePartResolver extends Resolver<string, SolvedMimePart> {
+  static readonly type = 'extensions.mail.mime_part.v1'
+  static readonly solvedContentRenderer = markRaw(ContentMimePart)
+
+  static {
+    Resolver.register(MailMimePartResolver.type, MailMimePartResolver)
+  }
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<SolvedMimePart> {
+    const root = CanonicalMimePartSchema.parse(parseJson(await this.getRawContent(options)))
+    const relations = await this.getRelations({
+      refresh: options.refresh,
+      includeIn: false,
+      includeOut: true,
+    })
+    const contentRelation = relations.find((relation) => relation.content === 'content')
+    if (contentRelation) {
+      const child = await Block.find(contentRelation.to_)
+      if (child) return { root, content: await solveBlock(child, options) }
+    }
+    if (!options.materializeMissing) return { root, content: null }
+
+    const delegated = await PeerManager.delegate(MAIL_MIME_PART_MATERIALIZE_CAPABILITY, {
+      body: { block: this.block.id },
+    })
+    const response = PeerProtocolResponseSchema.parse(delegated)
+    if (response.status !== 200 || !Object.prototype.hasOwnProperty.call(response, 'body')) {
+      throw new Error(`Mail materialization Peer returned HTTP ${response.status}`)
+    }
+    const child = Block.parse(response.body)
+    return { root, content: await solveBlock(child, options) }
+  }
+
+  async getText(options: ProjectionOptions = {}): Promise<string> {
+    const { root } = await this.getSolvedContent({ ...options, materializeMissing: false })
+    return [root.filename, root.description, root.media_type].filter(Boolean).join('\n')
+  }
+
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string> {
+    return this.getText(options)
+  }
+}
diff --git a/extensions/mail/src/schema.ts b/extensions/mail/src/schema.ts
new file mode 100644
index 0000000..3839f03
--- /dev/null
+++ b/extensions/mail/src/schema.ts
@@ -0,0 +1,96 @@
+import { z } from 'zod'
+import type { Block } from '@inkcre/core'
+
+export const CanonicalEmailSchema = z.strictObject({
+  message_id: z.string().nullable().default(null),
+  email_id: z.string().nullable().default(null),
+  subject: z.string().nullable().default(null),
+  authored_at: z.coerce.date().nullable().default(null),
+})
+export type CanonicalEmail = z.infer<typeof CanonicalEmailSchema>
+
+export const CanonicalMailboxSchema = z.strictObject({
+  name: z.string(),
+  special_uses: z.array(z.string()).default([]),
+  mailbox_id: z.string().nullable().default(null),
+})
+export type CanonicalMailbox = z.infer<typeof CanonicalMailboxSchema>
+
+export const CanonicalEmailAddressSchema = z.strictObject({ address: z.string() })
+export type CanonicalEmailAddress = z.infer<typeof CanonicalEmailAddressSchema>
+
+export const CanonicalMailFlagSchema = z.strictObject({
+  name: z.string(),
+  description: z.string().nullable().default(null),
+})
+export type CanonicalMailFlag = z.infer<typeof CanonicalMailFlagSchema>
+
+export const CanonicalMimePartSchema = z.strictObject({
+  media_type: z.string(),
+  charset: z.string().nullable().default(null),
+  filename: z.string().nullable().default(null),
+  content_id: z.string().nullable().default(null),
+  description: z.string().nullable().default(null),
+  transfer_encoding: z.string().nullable().default(null),
+  encoded_size: z.number().int().nonnegative().nullable().default(null),
+  content_location: z.string().nullable().default(null),
+})
+export type CanonicalMimePart = z.infer<typeof CanonicalMimePartSchema>
+
+export const ComponentRelationSchema = z.strictObject({
+  role: z.enum(['body', 'attachment', 'inline']),
+  part_id: z.string(),
+})
+export type ComponentRelation = z.infer<typeof ComponentRelationSchema>
+
+export const ParticipantRelationSchema = z.strictObject({
+  role: z.enum(['from', 'sender', 'reply_to', 'to', 'cc', 'bcc']),
+  order: z.number().int().nonnegative(),
+  display_name: z.string().nullable().default(null),
+})
+export type ParticipantRelation = z.infer<typeof ParticipantRelationSchema>
+
+export const ContainsRelationSchema = z.strictObject({
+  type: z.literal('contains'),
+  uid_validity: z.number().int().positive(),
+  uid: z.number().int().positive(),
+})
+export type ContainsRelation = z.infer<typeof ContainsRelationSchema>
+
+export const EmbeddedReferenceRelationSchema = z.strictObject({
+  type: z.literal('embeds'),
+  reference: z.string(),
+})
+
+export interface SolvedBlock<Content = unknown> {
+  block: Block
+  solvedContent: Content
+}
+
+export interface SolvedMimePart {
+  root: CanonicalMimePart
+  content: SolvedBlock | null
+}
+
+export interface SolvedEmail {
+  root: CanonicalEmail
+  bodies: Array<SolvedBlock<string> & { relation: ComponentRelation }>
+  mimeParts: Array<SolvedBlock<SolvedMimePart> & { relation: ComponentRelation }>
+  participants: Array<{
+    relation: ParticipantRelation
+    address: SolvedBlock<CanonicalEmailAddress>
+  }>
+  mailboxes: Array<{ relation: ContainsRelation; mailbox: SolvedBlock<CanonicalMailbox> }>
+  flags: Array<{ flag: SolvedBlock<CanonicalMailFlag> }>
+  parents: Array<SolvedBlock<CanonicalEmail>>
+  references: Array<SolvedBlock<CanonicalEmail>>
+  embedded: Array<{
+    body: Block
+    reference: string
+    mimePart: SolvedBlock<SolvedMimePart>
+  }>
+}
+
+export function parseJson(value: string): unknown {
+  return JSON.parse(value)
+}
diff --git a/extensions/mail/src/views/DevHome.vue b/extensions/mail/src/views/DevHome.vue
new file mode 100644
index 0000000..bc9800f
--- /dev/null
+++ b/extensions/mail/src/views/DevHome.vue
@@ -0,0 +1,6 @@
+<template>
+  <main>
+    <h1>Mail Extension</h1>
+    <p>Registers canonical Email, Mailbox, EmailAddress, MailFlag, and MIME-part resolvers.</p>
+  </main>
+</template>
diff --git a/extensions/mail/tsconfig.json b/extensions/mail/tsconfig.json
new file mode 100644
index 0000000..c133d16
--- /dev/null
+++ b/extensions/mail/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "compilerOptions": {
+    "outDir": "./dist/types",
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo",
+    "jsx": "preserve",
+    "jsxImportSource": "vue",
+    "skipLibCheck": true,
+    "paths": {
+      "@/*": ["../../apps/client-web/src/*"],
+      "@inkcre/core": ["../../packages/core/src/index.ts"],
+      "@inkcre/core/*": ["../../packages/core/src/*"]
+    }
+  },
+  "include": ["src/**/*", "src/**/*.vue"]
+}
diff --git a/extensions/mail/vite.config.ts b/extensions/mail/vite.config.ts
new file mode 100644
index 0000000..548de9a
--- /dev/null
+++ b/extensions/mail/vite.config.ts
@@ -0,0 +1,68 @@
+import { fileURLToPath } from 'node:url'
+import path from 'node:path'
+import { defineConfig, searchForWorkspaceRoot } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import { federation } from '@module-federation/vite'
+
+import mfShared from '../mf-shared'
+import {
+  createUiSourceAliases,
+  isPathInside,
+  resolveUiSourceForVite,
+  uiSourceDedupe,
+} from '../../scripts/ui-source.mjs'
+
+const extensionRoot = fileURLToPath(new URL('.', import.meta.url))
+const extensionComponents = fileURLToPath(new URL('./src/components', import.meta.url))
+
+export default defineConfig(async ({ command }) => {
+  const uiSource = await resolveUiSourceForVite(command)
+  const uiSourceComponents = uiSource ? path.resolve(uiSource.root, 'src/components') : null
+
+  return {
+    plugins: [
+      vue(),
+      vueJsx(),
+      federation({
+        name: 'extension.mail',
+        filename: 'remoteEntry.js',
+        exposes: { '.': path.resolve(__dirname, './src/index.ts') },
+        shared: mfShared,
+      }),
+    ],
+    resolve: {
+      alias: uiSource ? createUiSourceAliases(uiSource) : [],
+      ...(uiSource ? { dedupe: uiSourceDedupe } : {}),
+    },
+    ...(uiSource
+      ? {
+          optimizeDeps: { exclude: ['@inkcre/ui-web'] },
+          server: {
+            fs: { allow: [searchForWorkspaceRoot(extensionRoot), uiSource.root] },
+          },
+        }
+      : {}),
+    base: '/mail/client-web/',
+    build: {
+      target: 'esnext',
+      outDir: 'dist/client-web',
+      sourcemap: true,
+    },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          additionalData: (source: string, file: string) => {
+            if (
+              isPathInside(extensionComponents, file) ||
+              (uiSourceComponents && isPathInside(uiSourceComponents, file))
+            ) {
+              return `@use "@inkcre/ui-web/styles/mixins" as *;@use "@inkcre/ui-web/styles/functions" as *;${source}`
+            }
+            return source
+          },
+        },
+      },
+    },
+  }
+})
diff --git a/extensions/twitter/src/components/contentTweet/contentTweet.vue b/extensions/twitter/src/components/contentTweet/contentTweet.vue
index 3436188..da3c952 100644
--- a/extensions/twitter/src/components/contentTweet/contentTweet.vue
+++ b/extensions/twitter/src/components/contentTweet/contentTweet.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import { type Tweet } from '../../schema'
-import type { ContentCompProps } from '@inkcre/core'
+import type { SolvedContentRendererProps } from '@inkcre/core'
 
-const props = defineProps<ContentCompProps<Tweet>>()
+const props = defineProps<SolvedContentRendererProps<Tweet>>()
 
 // Track failed image loads
 const failedAttachments = ref<Set<number>>(new Set())
@@ -49,7 +49,7 @@ const isAttachmentFailed = (index: number) => {
 <template>
   <div class="content-tweet__header">
     <span class="content-tweet__icon">𝕏</span>
-    <span class="content-tweet__user">@{{ props.solvedContent.user_id }}</span>
+    <span class="content-tweet__user">@{{ props.solvedContent.user_id ?? 'unknown' }}</span>
   </div>
   <div class="content-tweet__text">{{ displayText }}</div>
   <div v-if="attachmentCount > 0" class="content-tweet__media">
diff --git a/extensions/twitter/src/resolver.ts b/extensions/twitter/src/resolver.ts
index 141075e..aa27ac9 100644
--- a/extensions/twitter/src/resolver.ts
+++ b/extensions/twitter/src/resolver.ts
@@ -12,7 +12,7 @@
  */
 
 import { markRaw } from 'vue'
-import { Resolver, ResolverCache } from '@inkcre/core'
+import { Resolver, ResolverCache, type ProjectionOptions } from '@inkcre/core'
 import {
   TweetSchema,
   type Tweet,
@@ -22,15 +22,15 @@ import {
 import ContentTweet from './components/contentTweet/contentTweet.vue'
 
 export class TweetResolver extends Resolver<string, Tweet> {
-  static readonly type = 'extensions.twitter.tweet'
-  static readonly contentComp = markRaw(ContentTweet)
+  static readonly type = 'extensions.twitter.tweet.v1'
+  static readonly solvedContentRenderer = markRaw(ContentTweet)
 
   static {
     Resolver.register(TweetResolver.type, TweetResolver)
   }
 
-  protected async _getSolvedContent(): Promise<Tweet> {
-    const rawContent = await this.getRawContent()
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<Tweet> {
+    const rawContent = await this.getRawContent(options)
     const tweet = TweetSchema.parse(JSON.parse(rawContent))
 
     // If attachments are already populated, return as-is
@@ -42,6 +42,7 @@ export class TweetResolver extends Resolver<string, Tweet> {
     const attachmentRelations = await this.getRelations({
       includeOut: true,
       includeIn: false,
+      refresh: options.refresh,
     })
 
     const attachmentPatterns = [RELATION_ATTACHMENT_PHOTO, RELATION_ATTACHMENT_VIDEO]
@@ -65,11 +66,15 @@ export class TweetResolver extends Resolver<string, Tweet> {
 
           // Use ResolverCache to get resolver for attachment block
           const attachmentResolver = await ResolverCache.getResolver(attachmentBlock)
-          const attachmentContent = await attachmentResolver.getSolvedContent()
+          const attachmentContent = await attachmentResolver.getSolvedContent(options)
 
-          // Content should be ObjectURL string (from ImageResolver or VideoResolver)
-          if (typeof attachmentContent === 'string') {
-            attachments.push(attachmentContent)
+          if (
+            typeof attachmentContent === 'object' &&
+            attachmentContent !== null &&
+            'objectUrl' in attachmentContent &&
+            typeof attachmentContent.objectUrl === 'string'
+          ) {
+            attachments.push(attachmentContent.objectUrl)
           }
         } catch (error) {
           // Log error but continue with other attachments
@@ -91,4 +96,12 @@ export class TweetResolver extends Resolver<string, Tweet> {
 
     return tweet
   }
+
+  async getText(options: ProjectionOptions = {}): Promise<string> {
+    return (await this.getSolvedContent(options)).text
+  }
+
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string> {
+    return this.getText(options)
+  }
 }
diff --git a/extensions/twitter/src/schema.ts b/extensions/twitter/src/schema.ts
index 987d03b..a10e615 100644
--- a/extensions/twitter/src/schema.ts
+++ b/extensions/twitter/src/schema.ts
@@ -29,9 +29,12 @@ export const TweetVideoSchema = z.object({
 // Tweet schema
 export const TweetSchema = z.object({
   id: z.number(),
-  user_id: z.string(),
+  user_id: z.string().nullable().optional(),
+  conversation_id: z.number().nullable().optional(),
+  quote: z.number().nullable().optional(),
   text: z.string(), // Contains mentions, hashtags, and URLs as plain text
   attachments: z.array(z.string()).optional(), // Array of ObjectURLs (blob URLs)
+  links: z.array(z.string()).optional(),
 })
 
 // Type exports
diff --git a/packages/core/AGENTS.md b/packages/core/AGENTS.md
index c6fe3b2..4eeb38f 100644
--- a/packages/core/AGENTS.md
+++ b/packages/core/AGENTS.md
@@ -15,7 +15,8 @@ Shared logic package for InKCre applications and extensions.
 - `peer` - Peer Active Record, discovery, protocols, and exact capability delegation
 - `semantic-retrieval` - Semantic retrieval capability facade
 - `sink/graph` - Graph layouts & algorithms
-- `source` - Source, CollectJob, CollectAt
+- `source` - Source and Source runtime integration
+- `job` / `cron` - global asynchronous work and schedule models
 - `utils` - Vue prop helpers
 
 ## Key Patterns
diff --git a/packages/core/src/base/db-api.ts b/packages/core/src/base/db-api.ts
index 862ead2..0ccb677 100644
--- a/packages/core/src/base/db-api.ts
+++ b/packages/core/src/base/db-api.ts
@@ -15,6 +15,10 @@ function encodeTransportValue<Value>(value: unknown): Value {
   return JSON.parse(encoded) as Value
 }
 
+function normalizePostgrestBaseUrl(value: string): string {
+  return value.replace(/\/+$/, '')
+}
+
 /**
  * API Error class for handling API request errors
  */
@@ -29,6 +33,55 @@ export class APIError extends Error {
   }
 }
 
+export type RawPostgrestRequestOptions = RequestInit & {
+  schema?: 'inkcre'
+  baseUrl?: string
+}
+
+/**
+ * Execute a PostgREST request whose body or response is not JSON.
+ *
+ * The regular PostgREST client remains the owner of relational/JSON queries;
+ * this seam exists for admitted media contracts such as raw bytea RPCs.
+ */
+export async function rawPostgrestFetch(
+  path: string,
+  options: RawPostgrestRequestOptions = {}
+): Promise<Response> {
+  const { schema = 'inkcre', baseUrl, ...init } = options
+  const configuredBaseUrl = baseUrl ?? sharedConfigStore.metaConfig.INKCRE_PGREST_URL
+  if (!configuredBaseUrl) {
+    throw new APIError('PostgREST URL is not configured.', 0)
+  }
+
+  const normalizedBaseUrl = configuredBaseUrl.endsWith('/')
+    ? configuredBaseUrl
+    : `${configuredBaseUrl}/`
+  const url = new URL(path.replace(/^\//, ''), normalizedBaseUrl)
+  const token = await authStore.getToken()
+  const headers = new Headers(init.headers)
+  headers.set('Authorization', `Bearer ${token}`)
+  headers.set('Accept-Profile', schema)
+  headers.set('Content-Profile', schema)
+
+  const response = await fetch(url, { ...init, headers })
+  if (!response.ok) {
+    const errorResponse = response.clone()
+    let details: unknown
+    try {
+      details = await errorResponse.json()
+    } catch {
+      details = await response.clone().text()
+    }
+    throw new APIError(
+      `PostgREST request failed with status ${response.status}.`,
+      response.status,
+      details
+    )
+  }
+  return response
+}
+
 /**
  * Database API Client - Pure PostgREST wrapper for database operations.
  *
@@ -37,7 +90,7 @@ export class APIError extends Error {
  * - Automatic authentication via authStore
  * - Reactive config updates via configStore
  *
- * For Core API requests (HTTP endpoints), use the Client active record instead.
+ * Business HTTP execution belongs to its domain facade and PeerManager, not this database seam.
  *
  * @template DT - Data type for the records in the specified relation
  */
@@ -59,7 +112,7 @@ export class DBAPIClient<
     public schemaName: 'inkcre' = 'inkcre',
     baseUrl: string = ''
   ) {
-    super(baseUrl, {
+    super(normalizePostgrestBaseUrl(baseUrl), {
       schema: schemaName,
       // Custom fetch to dynamically inject auth token on each request
       fetch: async (input, init) => {
@@ -75,7 +128,7 @@ export class DBAPIClient<
       watch(
         () => this.configStore.metaConfig.INKCRE_PGREST_URL,
         (newVal) => {
-          this.url = newVal
+          this.url = normalizePostgrestBaseUrl(newVal)
         },
         { immediate: true }
       )
diff --git a/packages/core/src/client/client.ts b/packages/core/src/client/client.ts
deleted file mode 100644
index 7972520..0000000
--- a/packages/core/src/client/client.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-import { z } from 'zod'
-import { Z } from 'zod-class'
-import { DBAPIClient, APIError } from '../base/db-api'
-import { makeStringProp, makeObjectProp } from '../utils/vue-props'
-import { authStore } from '../auth'
-import { configStore } from '../config'
-
-export type ClientRef = string
-export const makeClientProp = (v?: any) => makeObjectProp<Client>(v)
-export const makeClientRefProp = (v?: any) => makeStringProp<ClientRef>(v)
-export const ClientRefZ = z.uuid()
-
-/**
- * Client Active Record
- *
- * Clients represent API endpoints in the system. Each client has a REST API URL
- * and provides methods for making authenticated requests to that endpoint.
- *
- * This class consolidates both peer-to-peer communication and Core API requests.
- * To make a request, instantiate a Client by ID and use the request methods.
- */
-export class Client extends Z.class({
-  id: ClientRefZ.default(() => crypto.randomUUID()),
-  /** Client Nickname */
-  name: z.string(),
-  labels: z.array(z.string()).default([]),
-  rest_api_url: z.url().nullable().default(null),
-  config: z.looseObject({}).default({}),
-  config_schema: z.looseObject({}).default({}),
-  created_at: z.coerce.date().default(() => new Date()),
-}) {
-  static dbApi: DBAPIClient<'clients', Client> = new DBAPIClient<'clients', Client>(
-    'clients',
-    Client
-  )
-
-  /**
-   * Get a single client by ID
-   */
-  static async get(id: ClientRef): Promise<Client> {
-    return Client.parse((await Client.dbApi.from().select().eq('id', id).single()).data)
-  }
-
-  /**
-   * List all clients
-   */
-  static async list(): Promise<Client[]> {
-    const results = await Client.dbApi.from().select().order('name', { ascending: true })
-    return (results.data ?? []).map((item) => Client.parse(item))
-  }
-
-  /**
-   * List clients formatted as options for select inputs
-   */
-  static async listAsOptions(): Promise<Array<{ label: string; value: ClientRef }>> {
-    const clients = await Client.list()
-    return clients.map((client) => ({
-      label: client.name,
-      value: client.id,
-    }))
-  }
-
-  /**
-   * Get the self/core client from config (INKCRE_CLIENT_ID).
-   * This client is used for Core API requests.
-   */
-  static async getSelf(): Promise<Client> {
-    const clientId = configStore.metaConfig.INKCRE_CLIENT_ID
-    if (!clientId) {
-      throw new Error('INKCRE_CLIENT_ID is not configured')
-    }
-    return Client.get(clientId)
-  }
-
-  /**
-   * Get auth headers for requests
-   */
-  private async getAuthHeaders(): Promise<Record<string, string>> {
-    return {
-      Authorization: `Bearer ${await authStore.getToken()}`,
-    }
-  }
-
-  /**
-   * Ping client to check online status
-   */
-  async ping(): Promise<'online' | 'offline'> {
-    if (!this.rest_api_url) {
-      return 'offline'
-    }
-    try {
-      const response = await fetch(`${this.rest_api_url}/health`, {
-        method: 'GET',
-        signal: AbortSignal.timeout(5000), // 5s timeout
-      })
-      return response.ok ? 'online' : 'offline'
-    } catch (error) {
-      console.error(`[Client] Ping failed for ${this.id}:`, error)
-      return 'offline'
-    }
-  }
-
-  /**
-   * Make a request to this client's REST API endpoint.
-   *
-   * Supports full HTTP request capabilities including:
-   * - Multiple HTTP methods (GET, POST, PUT, PATCH, DELETE)
-   * - JSON body or FormData/Blob
-   * - Query parameters
-   * - Schema-based response parsing
-   * - Automatic authentication
-   * - Token refresh on 401 errors
-   *
-   * @param options Request options
-   * @returns Parsed response data
-   * @throws APIError if the request fails
-   */
-  async request<T = any>(options: {
-    method: string
-    path: string
-    body?: any
-    query?: Record<string, any>
-    resBodySchema?: { parse<T>(input: unknown): T }
-  }): Promise<T> {
-    const { method, path, body, query, resBodySchema } = options
-
-    if (!this.rest_api_url) {
-      throw new Error(`Client ${this.id} does not have a REST API URL configured.`)
-    }
-
-    const url = new URL(`${this.rest_api_url}${path}`)
-    const headers = await this.getAuthHeaders()
-
-    const config: RequestInit = {
-      method,
-      headers,
-    }
-
-    if (body !== undefined) {
-      if (
-        typeof body === 'object' &&
-        body !== null &&
-        !(body instanceof FormData) &&
-        !(body instanceof Blob) &&
-        !(body instanceof ArrayBuffer)
-      ) {
-        // JSON
-        config.body = JSON.stringify(body)
-        headers['Content-Type'] = 'application/json'
-      } else {
-        // FormData / Blob / string / ArrayBuffer
-        config.body = body
-      }
-    }
-
-    if (query) {
-      Object.entries(query).forEach(([key, value]) => {
-        url.searchParams.append(key, String(value))
-      })
-    }
-
-    try {
-      const response = await fetch(url, config)
-
-      if (!response.ok) {
-        let errorMessage = `HTTP ${response.status}: ${response.statusText}`
-        let responseData
-
-        try {
-          responseData = await response.json()
-          if (responseData.message) {
-            errorMessage = responseData.message
-          } else if (responseData.error) {
-            errorMessage = responseData.error
-          }
-        } catch {
-          // If response is not JSON, use status text
-        }
-
-        // If unauthorized, try refreshing token and retry once
-        if (response.status === 401) {
-          try {
-            await authStore.refreshToken()
-            const retryResponse = await fetch(url, {
-              ...config,
-              headers: { ...(await this.getAuthHeaders()) },
-            })
-
-            if (retryResponse.ok) {
-              const retryData = await retryResponse.json()
-              return resBodySchema ? resBodySchema.parse(retryData) : retryData
-            }
-          } catch (retryError) {
-            console.warn('[Client] Token refresh and retry failed:', retryError)
-          }
-        }
-
-        throw new APIError(errorMessage, response.status, responseData)
-      }
-
-      const responseData = await response.json()
-      return resBodySchema ? resBodySchema.parse(responseData) : responseData
-    } catch (error) {
-      if (error instanceof APIError) {
-        throw error
-      }
-      throw new APIError(error instanceof Error ? error.message : 'Network error', 0)
-    }
-  }
-
-  /**
-   * Convenience method for GET requests
-   */
-  async get<T = any>(
-    path: string,
-    query?: Record<string, any>,
-    resBodySchema?: { parse<T>(input: unknown): T }
-  ): Promise<T> {
-    return this.request<T>({ method: 'GET', path, query, resBodySchema })
-  }
-
-  /**
-   * Convenience method for POST requests
-   */
-  async post<T = any>(
-    path: string,
-    body?: any,
-    resBodySchema?: { parse<T>(input: unknown): T }
-  ): Promise<T> {
-    return this.request<T>({ method: 'POST', path, body, resBodySchema })
-  }
-
-  /**
-   * Convenience method for PUT requests
-   */
-  async put<T = any>(
-    path: string,
-    body?: any,
-    resBodySchema?: { parse<T>(input: unknown): T }
-  ): Promise<T> {
-    return this.request<T>({ method: 'PUT', path, body, resBodySchema })
-  }
-
-  /**
-   * Convenience method for PATCH requests
-   */
-  async patch<T = any>(
-    path: string,
-    body?: any,
-    resBodySchema?: { parse<T>(input: unknown): T }
-  ): Promise<T> {
-    return this.request<T>({ method: 'PATCH', path, body, resBodySchema })
-  }
-
-  /**
-   * Convenience method for DELETE requests
-   */
-  async delete<T = any>(path: string, resBodySchema?: { parse<T>(input: unknown): T }): Promise<T> {
-    return this.request<T>({ method: 'DELETE', path, resBodySchema })
-  }
-
-  /**
-   * Save only the config field to the database
-   */
-  async saveConfig(): Promise<void> {
-    await Client.dbApi.upsert({ id: this.id, config: this.config }).select().single()
-  }
-}
-
-/**
- * Form for creating clients
- */
-export class CreateClientForm extends Z.class({
-  ...Client.shape,
-}) {
-  async upsert(): Promise<Client> {
-    return Client.parse((await Client.dbApi.upsert(this).select().single()).data)
-  }
-}
diff --git a/packages/core/src/client/index.ts b/packages/core/src/client/index.ts
deleted file mode 100644
index 83dae76..0000000
--- a/packages/core/src/client/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './client'
diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
index fab9deb..ba75ad6 100644
--- a/packages/core/src/config/index.ts
+++ b/packages/core/src/config/index.ts
@@ -2,14 +2,14 @@
  * Configuration module - Pinia-based config store
  *
  * This module provides a Pinia store for managing application configuration,
- * separated into MetaConfig (bootstrap) and ClientConfig (runtime) as distinct state items.
+ * separated into MetaConfig (bootstrap) and PeerConfig (runtime) as distinct state items.
  *
  * **MetaConfig** (State: `metaConfig`): Contains bootstrap configuration needed to initialize the app
  * - INKCRE_PGREST_URL: PostgreSQL/PostgREST base URL
  * - INKCRE_JWT_SECRET: JWT signing secret
- * - INKCRE_CLIENT_ID: Current client UUID
+ * - INKCRE_PEER_ID: Current technical Peer UUID
  *
- * **ClientConfig** (State: `config`): Contains runtime application configuration
+ * **PeerConfig** (State: `peerConfig`): Contains runtime application configuration
  * - extension_registry_url: Extension registry URL
  * - ai:
  *   - llmProviders: LLM provider configurations
diff --git a/packages/core/src/config/schema.test.ts b/packages/core/src/config/schema.test.ts
index f8318fa..38c3039 100644
--- a/packages/core/src/config/schema.test.ts
+++ b/packages/core/src/config/schema.test.ts
@@ -7,7 +7,7 @@ describe('MetaConfigSchema', () => {
     expect(MetaConfigSchema.parse({})).toEqual({
       INKCRE_PGREST_URL: '',
       INKCRE_JWT_SECRET: '',
-      INKCRE_CLIENT_ID: '',
+      INKCRE_PEER_ID: '',
     })
   })
 
@@ -15,17 +15,17 @@ describe('MetaConfigSchema', () => {
     expect(
       MetaConfigSchema.parse({
         INKCRE_PGREST_URL: 'https://database.example.test/',
-        INKCRE_CLIENT_ID: '00000000-0000-4000-8000-000000000002',
+        INKCRE_PEER_ID: '00000000-0000-4000-8000-000000000002',
       })
     ).toMatchObject({
       INKCRE_PGREST_URL: 'https://database.example.test/',
-      INKCRE_CLIENT_ID: '00000000-0000-4000-8000-000000000002',
+      INKCRE_PEER_ID: '00000000-0000-4000-8000-000000000002',
     })
 
     expect(
       MetaConfigSchema.safeParse({
         INKCRE_PGREST_URL: 'not-a-url',
-        INKCRE_CLIENT_ID: 'not-a-uuid',
+        INKCRE_PEER_ID: 'not-a-uuid',
       }).success
     ).toBe(false)
   })
diff --git a/packages/core/src/config/schema.ts b/packages/core/src/config/schema.ts
index 3ef29f5..f4dcd32 100644
--- a/packages/core/src/config/schema.ts
+++ b/packages/core/src/config/schema.ts
@@ -35,12 +35,12 @@ export const AIConfigSchema = z.object({
  * Contains URLs and secrets needed to fetch and initialize app config
  */
 const UnconfiguredUrlSchema = z.union([z.literal(''), z.url()])
-const UnconfiguredClientIdSchema = z.union([z.literal(''), z.uuid()])
+const UnconfiguredPeerIdSchema = z.union([z.literal(''), z.uuid()])
 
 export const MetaConfigSchema = z.object({
   INKCRE_PGREST_URL: UnconfiguredUrlSchema.default(''),
   INKCRE_JWT_SECRET: z.string().default(''),
-  INKCRE_CLIENT_ID: UnconfiguredClientIdSchema.default(''),
+  INKCRE_PEER_ID: UnconfiguredPeerIdSchema.default(''),
 })
 
 export type MetaConfig = z.infer<typeof MetaConfigSchema>
@@ -49,12 +49,13 @@ export type MetaConfig = z.infer<typeof MetaConfigSchema>
  * App configuration schema (runtime)
  * Contains extension registry URL, AI settings, and runtime app configuration
  */
-export const ClientConfigSchema = z.object({
+export const PeerConfigSchema = z.object({
   extension_registry_url: z.url().default(''),
+  peer_http_timeout_ms: z.number().int().positive().default(30_000),
   ai: AIConfigSchema.default(() => AIConfigSchema.parse({})),
 })
 
 /**
  * Config type
  */
-export type ClientConfig = z.infer<typeof ClientConfigSchema>
+export type PeerConfig = z.infer<typeof PeerConfigSchema>
diff --git a/packages/core/src/config/store.ts b/packages/core/src/config/store.ts
index c5d2884..9fdd641 100644
--- a/packages/core/src/config/store.ts
+++ b/packages/core/src/config/store.ts
@@ -2,11 +2,11 @@ import { defineStore } from 'pinia'
 import { ref, shallowRef } from 'vue'
 import { store } from '../store'
 import type { ConfigAdapterWithWrite } from './types'
-import { ClientConfigSchema, MetaConfigSchema, type ClientConfig, type MetaConfig } from './schema'
+import { MetaConfigSchema, PeerConfigSchema, type MetaConfig, type PeerConfig } from './schema'
 import { loadConfig as zodLoadConfig } from 'zod-config'
 
-// Lazy import Client to avoid circular imports
-const lazyClient = async () => (await import('../client/client')).Client
+// Lazy import Peer to avoid circular imports
+const lazyPeer = async () => (await import('../peer/peer')).Peer
 
 const unconfiguredAdapter: ConfigAdapterWithWrite = {
   name: 'unconfigured',
@@ -17,12 +17,12 @@ const unconfiguredAdapter: ConfigAdapterWithWrite = {
 }
 
 /**
- * Config store, includes metaConfig and clientConfig, managing their loading and saving.
+ * Config store, includes metaConfig and peerConfig, managing their loading and saving.
  */
 export const useConfigStore = defineStore('inkcre-config', () => {
   const metaAdapter = shallowRef<ConfigAdapterWithWrite>(unconfiguredAdapter)
   const metaConfig = ref<MetaConfig>(MetaConfigSchema.parse({}))
-  const clientConfig = ref<ClientConfig>(ClientConfigSchema.parse({}))
+  const peerConfig = ref<PeerConfig>(PeerConfigSchema.parse({}))
   const isLoading = ref(false)
   const error = ref<Error | null>(null)
 
@@ -45,19 +45,19 @@ export const useConfigStore = defineStore('inkcre-config', () => {
     }
   }
 
-  async function loadClientConfig(): Promise<void> {
-    if (!metaConfig.value.INKCRE_CLIENT_ID) {
-      clientConfig.value = ClientConfigSchema.parse({})
+  async function loadPeerConfig(): Promise<void> {
+    if (!metaConfig.value.INKCRE_PEER_ID) {
+      peerConfig.value = PeerConfigSchema.parse({})
       return
     }
 
-    const Client = await lazyClient()
+    const Peer = await lazyPeer()
     try {
-      const loaded = await Client.getSelf()
-      clientConfig.value = ClientConfigSchema.parse(loaded.config)
+      const loaded = await Peer.getSelf()
+      peerConfig.value = PeerConfigSchema.parse(loaded.config)
     } catch {
-      clientConfig.value = ClientConfigSchema.parse({})
-      console.error('[Config] Failed to load client config.')
+      peerConfig.value = PeerConfigSchema.parse({})
+      console.error('[Config] Failed to load Peer config.')
     }
   }
 
@@ -74,18 +74,18 @@ export const useConfigStore = defineStore('inkcre-config', () => {
 
   async function resetMeta(): Promise<void> {
     metaConfig.value = MetaConfigSchema.parse({})
-    clientConfig.value = ClientConfigSchema.parse({})
+    peerConfig.value = PeerConfigSchema.parse({})
     await saveMeta()
   }
 
   return {
     metaConfig,
-    clientConfig,
+    peerConfig,
     metaAdapter,
     isLoading,
     error,
     initializeMeta,
-    loadClientConfig,
+    loadPeerConfig,
     saveMeta,
     resetMeta,
   }
diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
index 0c296f7..1086eb1 100644
--- a/packages/core/src/config/types.ts
+++ b/packages/core/src/config/types.ts
@@ -13,4 +13,4 @@ export interface ConfigAdapterWithWrite extends ConfigAdapter {
 export const CONFIG_STORAGE_KEY = 'inkcre_app_config'
 
 // Re-export Config, AppConfig and MetaConfig types from schema for convenience
-export type { ClientConfig, MetaConfig } from './schema'
+export type { MetaConfig, PeerConfig } from './schema'
diff --git a/packages/core/src/cron/cron.ts b/packages/core/src/cron/cron.ts
new file mode 100644
index 0000000..a47bc70
--- /dev/null
+++ b/packages/core/src/cron/cron.ts
@@ -0,0 +1,60 @@
+import { z } from 'zod'
+import { Z } from 'zod-class'
+import { DBAPIClient } from '../base/db-api'
+import { JobManager } from '../job'
+
+const JsonObjectSchema = z.record(z.string(), z.unknown())
+
+export class Cron extends Z.class({
+  id: z.number().int(),
+  schedule: z.string(),
+  enabled: z.boolean(),
+  job_type: z.string(),
+  job_parameters: JsonObjectSchema,
+  job_timeout_seconds: z.number().int().positive().nullable(),
+  last_job: z.number().int().nullable(),
+  last_scheduled_for: z.coerce.date().nullable(),
+  created_at: z.coerce.date(),
+  updated_at: z.coerce.date(),
+}) {
+  static dbApi = new DBAPIClient<'crons', Cron>('crons', Cron)
+
+  static async getAll(): Promise<Cron[]> {
+    return ((await this.dbApi.from().select().order('created_at')).data ?? []).map((item) =>
+      Cron.parse(item)
+    )
+  }
+
+  static async getBySource(source: number): Promise<Cron[]> {
+    const result = await this.dbApi
+      .from()
+      .select()
+      .contains('job_parameters', { source })
+      .order('created_at')
+    return (result.data ?? []).map((item) => Cron.parse(item))
+  }
+
+  async runNow() {
+    return JobManager.create(
+      this.job_type,
+      this.job_parameters,
+      this.job_timeout_seconds ?? undefined
+    )
+  }
+
+  async delete(): Promise<void> {
+    await Cron.dbApi.from().delete().eq('id', this.id)
+  }
+}
+
+export class CronForm extends Z.class({
+  schedule: z.string(),
+  enabled: z.boolean().default(true),
+  job_type: z.string(),
+  job_parameters: JsonObjectSchema,
+  job_timeout_seconds: z.number().int().positive().nullable().default(null),
+}) {
+  async create(): Promise<Cron> {
+    return Cron.parse((await Cron.dbApi.insert(this).select().single()).data)
+  }
+}
diff --git a/packages/core/src/cron/index.ts b/packages/core/src/cron/index.ts
new file mode 100644
index 0000000..f3f4b9a
--- /dev/null
+++ b/packages/core/src/cron/index.ts
@@ -0,0 +1 @@
+export * from './cron'
diff --git a/packages/core/src/database/database.generated.ts b/packages/core/src/database/database.generated.ts
index b823436..aa8a8a3 100644
--- a/packages/core/src/database/database.generated.ts
+++ b/packages/core/src/database/database.generated.ts
@@ -3,30 +3,179 @@ export type Json = string | number | boolean | null | { [key: string]: Json | un
 export type Database = {
   inkcre: {
     Tables: {
+      agents: {
+        Row: {
+          created_at: string
+          id: number
+          max_model_calls_per_turn: number
+          model: number
+          name: string
+          system_prompt: string
+          tool_choice: Json | null
+          tools: string[]
+          updated_at: string
+        }
+        Insert: {
+          created_at?: string
+          id?: number
+          max_model_calls_per_turn: number
+          model: number
+          name: string
+          system_prompt: string
+          tool_choice?: Json | null
+          tools?: string[]
+          updated_at?: string
+        }
+        Update: {
+          created_at?: string
+          id?: number
+          max_model_calls_per_turn?: number
+          model?: number
+          name?: string
+          system_prompt?: string
+          tool_choice?: Json | null
+          tools?: string[]
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'agents_model_fkey'
+            columns: ['model']
+            referencedRelation: 'ai_models'
+            referencedColumns: ['id']
+          },
+        ]
+      }
+      ai_dialects: {
+        Row: {
+          config_schema: Json
+          description: string
+          id: string
+        }
+        Insert: {
+          config_schema?: Json
+          description: string
+          id: string
+        }
+        Update: {
+          config_schema?: Json
+          description?: string
+          id?: string
+        }
+        Relationships: []
+      }
+      ai_models: {
+        Row: {
+          capabilities: Json
+          created_at: string
+          enabled: boolean
+          id: number
+          name: string | null
+          native_model_id: string
+          provider: number
+          updated_at: string
+        }
+        Insert: {
+          capabilities: Json
+          created_at?: string
+          enabled?: boolean
+          id?: number
+          name?: string | null
+          native_model_id: string
+          provider: number
+          updated_at?: string
+        }
+        Update: {
+          capabilities?: Json
+          created_at?: string
+          enabled?: boolean
+          id?: number
+          name?: string | null
+          native_model_id?: string
+          provider?: number
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'ai_models_provider_fkey'
+            columns: ['provider']
+            referencedRelation: 'ai_providers'
+            referencedColumns: ['id']
+          },
+        ]
+      }
+      ai_providers: {
+        Row: {
+          config: Json
+          created_at: string
+          dialect: string
+          enabled: boolean
+          id: number
+          name: string
+          updated_at: string
+        }
+        Insert: {
+          config?: Json
+          created_at?: string
+          dialect: string
+          enabled?: boolean
+          id?: number
+          name: string
+          updated_at?: string
+        }
+        Update: {
+          config?: Json
+          created_at?: string
+          dialect?: string
+          enabled?: boolean
+          id?: number
+          name?: string
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'ai_providers_dialect_fkey'
+            columns: ['dialect']
+            referencedRelation: 'ai_dialects'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       block_embeddings: {
         Row: {
+          block: number
+          created_at: string
           embedding: string
-          id: number
-          updated_at: string | null
+          profile: number
+          updated_at: string
         }
         Insert: {
+          block: number
+          created_at?: string
           embedding: string
-          id: number
-          updated_at?: string | null
+          profile: number
+          updated_at?: string
         }
         Update: {
+          block?: number
+          created_at?: string
           embedding?: string
-          id?: number
-          updated_at?: string | null
+          profile?: number
+          updated_at?: string
         }
         Relationships: [
           {
-            foreignKeyName: 'block_embeddings_id_fkey'
-            columns: ['id']
-            isOneToOne: true
+            foreignKeyName: 'block_embeddings_block_fkey'
+            columns: ['block']
             referencedRelation: 'blocks'
             referencedColumns: ['id']
           },
+          {
+            foreignKeyName: 'block_embeddings_profile_fkey'
+            columns: ['profile']
+            referencedRelation: 'embedding_profiles'
+            referencedColumns: ['id']
+          },
         ]
       }
       blocks: {
@@ -58,42 +207,121 @@ export type Database = {
           {
             foreignKeyName: 'blocks_storage_fkey'
             columns: ['storage']
-            isOneToOne: false
             referencedRelation: 'storages'
             referencedColumns: ['id']
           },
         ]
       }
-      clients: {
+      configs: {
         Row: {
-          config: Json
-          config_schema: Json
-          created_at: string | null
-          id: string
-          labels: string[] | null
-          name: string
-          rest_api_url: string | null
+          created_at: string
+          key: string
+          schema: string
+          updated_at: string
+          value: Json
         }
         Insert: {
-          config?: Json
-          config_schema: Json
-          created_at?: string | null
-          id: string
-          labels?: string[] | null
-          name: string
-          rest_api_url?: string | null
+          created_at?: string
+          key: string
+          schema: string
+          updated_at?: string
+          value: Json
         }
         Update: {
-          config?: Json
-          config_schema?: Json
-          created_at?: string | null
-          id?: string
-          labels?: string[] | null
-          name?: string
-          rest_api_url?: string | null
+          created_at?: string
+          key?: string
+          schema?: string
+          updated_at?: string
+          value?: Json
         }
         Relationships: []
       }
+      crons: {
+        Row: {
+          created_at: string
+          enabled: boolean
+          id: number
+          job_parameters: Json
+          job_timeout_seconds: number | null
+          job_type: string
+          last_job: number | null
+          last_scheduled_for: string | null
+          schedule: string
+          updated_at: string
+        }
+        Insert: {
+          created_at?: string
+          enabled?: boolean
+          id?: number
+          job_parameters?: Json
+          job_timeout_seconds?: number | null
+          job_type: string
+          last_job?: number | null
+          last_scheduled_for?: string | null
+          schedule: string
+          updated_at?: string
+        }
+        Update: {
+          created_at?: string
+          enabled?: boolean
+          id?: number
+          job_parameters?: Json
+          job_timeout_seconds?: number | null
+          job_type?: string
+          last_job?: number | null
+          last_scheduled_for?: string | null
+          schedule?: string
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'crons_job_type_fkey'
+            columns: ['job_type']
+            referencedRelation: 'job_types'
+            referencedColumns: ['id']
+          },
+          {
+            foreignKeyName: 'crons_last_job_fkey'
+            columns: ['last_job']
+            referencedRelation: 'jobs'
+            referencedColumns: ['id']
+          },
+        ]
+      }
+      embedding_profiles: {
+        Row: {
+          ai_model: number
+          created_at: string
+          dimensions: number
+          id: number
+          name: string | null
+          updated_at: string
+        }
+        Insert: {
+          ai_model: number
+          created_at?: string
+          dimensions: number
+          id?: number
+          name?: string | null
+          updated_at?: string
+        }
+        Update: {
+          ai_model?: number
+          created_at?: string
+          dimensions?: number
+          id?: number
+          name?: string | null
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'embedding_profiles_ai_model_fkey'
+            columns: ['ai_model']
+            referencedRelation: 'ai_models'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       extensions: {
         Row: {
           config: Json | null
@@ -121,6 +349,70 @@ export type Database = {
         }
         Relationships: []
       }
+      job_types: {
+        Row: {
+          default_timeout_seconds: number
+          description: string
+          id: string
+          parameters_schema: Json
+        }
+        Insert: {
+          default_timeout_seconds: number
+          description: string
+          id: string
+          parameters_schema?: Json
+        }
+        Update: {
+          default_timeout_seconds?: number
+          description?: string
+          id?: string
+          parameters_schema?: Json
+        }
+        Relationships: []
+      }
+      jobs: {
+        Row: {
+          closed_at: string | null
+          created_at: string
+          id: number
+          parameters: Json
+          started_at: string | null
+          state: Json
+          status: Database['inkcre']['Enums']['jobstatus']
+          timeout_seconds: number
+          type: string
+        }
+        Insert: {
+          closed_at?: string | null
+          created_at?: string
+          id?: number
+          parameters?: Json
+          started_at?: string | null
+          state?: Json
+          status?: Database['inkcre']['Enums']['jobstatus']
+          timeout_seconds: number
+          type: string
+        }
+        Update: {
+          closed_at?: string | null
+          created_at?: string
+          id?: number
+          parameters?: Json
+          started_at?: string | null
+          state?: Json
+          status?: Database['inkcre']['Enums']['jobstatus']
+          timeout_seconds?: number
+          type?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'jobs_type_fkey'
+            columns: ['type']
+            referencedRelation: 'job_types'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       logs: {
         Row: {
           attributes: Json
@@ -154,27 +446,74 @@ export type Database = {
         }
         Relationships: []
       }
+      peers: {
+        Row: {
+          capabilities: Json
+          config: Json
+          config_schema: Json
+          created_at: string
+          id: string
+          labels: string[]
+          lease_expires_at: string | null
+          name: string
+          updated_at: string
+        }
+        Insert: {
+          capabilities?: Json
+          config?: Json
+          config_schema: Json
+          created_at?: string
+          id: string
+          labels?: string[]
+          lease_expires_at?: string | null
+          name: string
+          updated_at?: string
+        }
+        Update: {
+          capabilities?: Json
+          config?: Json
+          config_schema?: Json
+          created_at?: string
+          id?: string
+          labels?: string[]
+          lease_expires_at?: string | null
+          name?: string
+          updated_at?: string
+        }
+        Relationships: []
+      }
       relation_embeddings: {
         Row: {
+          created_at: string
           embedding: string
-          id: number
-          updated_at: string | null
+          profile: number
+          relation: number
+          updated_at: string
         }
         Insert: {
+          created_at?: string
           embedding: string
-          id: number
-          updated_at?: string | null
+          profile: number
+          relation: number
+          updated_at?: string
         }
         Update: {
+          created_at?: string
           embedding?: string
-          id?: number
-          updated_at?: string | null
+          profile?: number
+          relation?: number
+          updated_at?: string
         }
         Relationships: [
           {
-            foreignKeyName: 'relation_embeddings_id_fkey'
-            columns: ['id']
-            isOneToOne: true
+            foreignKeyName: 'relation_embeddings_profile_fkey'
+            columns: ['profile']
+            referencedRelation: 'embedding_profiles'
+            referencedColumns: ['id']
+          },
+          {
+            foreignKeyName: 'relation_embeddings_relation_fkey'
+            columns: ['relation']
             referencedRelation: 'relations'
             referencedColumns: ['id']
           },
@@ -206,14 +545,12 @@ export type Database = {
           {
             foreignKeyName: 'relations_from__fkey'
             columns: ['from_']
-            isOneToOne: false
             referencedRelation: 'blocks'
             referencedColumns: ['id']
           },
           {
             foreignKeyName: 'relations_to__fkey'
             columns: ['to_']
-            isOneToOne: false
             referencedRelation: 'blocks'
             referencedColumns: ['id']
           },
@@ -221,113 +558,116 @@ export type Database = {
       }
       sources: {
         Row: {
-          collect_at: Json | null
+          block: number | null
           config: Json
+          created_at: string
           id: number
           nickname: string | null
           state: Json
+          storage: number | null
           type: string | null
+          updated_at: string
         }
         Insert: {
-          collect_at?: Json | null
+          block?: number | null
           config?: Json
+          created_at?: string
           id?: number
           nickname?: string | null
           state?: Json
+          storage?: number | null
           type?: string | null
+          updated_at?: string
         }
         Update: {
-          collect_at?: Json | null
+          block?: number | null
           config?: Json
+          created_at?: string
           id?: number
           nickname?: string | null
           state?: Json
+          storage?: number | null
           type?: string | null
+          updated_at?: string
         }
         Relationships: [
           {
-            foreignKeyName: 'sources_type_fkey'
-            columns: ['type']
-            isOneToOne: false
-            referencedRelation: 'sources_types'
+            foreignKeyName: 'sources_block_fkey'
+            columns: ['block']
+            referencedRelation: 'blocks'
             referencedColumns: ['id']
           },
-        ]
-      }
-      sources_collect_jobs: {
-        Row: {
-          closed_at: string | null
-          config: Json | null
-          created_at: string | null
-          id: number
-          source: number | null
-          started_at: string | null
-          state: Json | null
-          status: Database['inkcre']['Enums']['sourcecollectjobstatus']
-        }
-        Insert: {
-          closed_at?: string | null
-          config?: Json | null
-          created_at?: string | null
-          id?: number
-          source?: number | null
-          started_at?: string | null
-          state?: Json | null
-          status?: Database['inkcre']['Enums']['sourcecollectjobstatus']
-        }
-        Update: {
-          closed_at?: string | null
-          config?: Json | null
-          created_at?: string | null
-          id?: number
-          source?: number | null
-          started_at?: string | null
-          state?: Json | null
-          status?: Database['inkcre']['Enums']['sourcecollectjobstatus']
-        }
-        Relationships: [
           {
-            foreignKeyName: 'sources_collect_jobs_source_fkey'
-            columns: ['source']
-            isOneToOne: false
-            referencedRelation: 'sources'
+            foreignKeyName: 'sources_storage_fkey'
+            columns: ['storage']
+            referencedRelation: 'storages'
+            referencedColumns: ['id']
+          },
+          {
+            foreignKeyName: 'sources_type_fkey'
+            columns: ['type']
+            referencedRelation: 'sources_types'
             referencedColumns: ['id']
           },
         ]
       }
       sources_types: {
         Row: {
+          backfill_config_schema: Json | null
+          collect_config_schema: Json
           config_schema: Json
           description: string | null
           id: string
         }
         Insert: {
+          backfill_config_schema?: Json | null
+          collect_config_schema?: Json
           config_schema?: Json
           description?: string | null
           id: string
         }
         Update: {
+          backfill_config_schema?: Json | null
+          collect_config_schema?: Json
           config_schema?: Json
           description?: string | null
           id?: string
         }
         Relationships: []
       }
+      storage_blobs: {
+        Row: {
+          data: string
+          id: string
+        }
+        Insert: {
+          data: string
+          id?: string
+        }
+        Update: {
+          data?: string
+          id?: string
+        }
+        Relationships: []
+      }
       storage_types: {
         Row: {
           config_schema: Json
           description: string
           id: string
+          writable: boolean
         }
         Insert: {
           config_schema?: Json
           description: string
           id: string
+          writable?: boolean
         }
         Update: {
           config_schema?: Json
           description?: string
           id?: string
+          writable?: boolean
         }
         Relationships: []
       }
@@ -354,7 +694,6 @@ export type Database = {
           {
             foreignKeyName: 'storages_type_fkey'
             columns: ['type']
-            isOneToOne: false
             referencedRelation: 'storage_types'
             referencedColumns: ['id']
           },
@@ -365,10 +704,14 @@ export type Database = {
       [_ in never]: never
     }
     Functions: {
-      [_ in never]: never
+      read_storage_blob: { Args: { blob_id: string }; Returns: unknown }
+      renew_peer_lease: {
+        Args: { peer: string; ttl_seconds: number }
+        Returns: string
+      }
     }
     Enums: {
-      sourcecollectjobstatus: 'pending' | 'running' | 'finished' | 'failed'
+      jobstatus: 'pending' | 'running' | 'finished' | 'failed' | 'timed_out' | 'aborted'
     }
     CompositeTypes: {
       [_ in never]: never
@@ -494,7 +837,7 @@ export type CompositeTypes<
 export const Constants = {
   inkcre: {
     Enums: {
-      sourcecollectjobstatus: ['pending', 'running', 'finished', 'failed'],
+      jobstatus: ['pending', 'running', 'finished', 'failed', 'timed_out', 'aborted'],
     },
   },
 } as const
diff --git a/packages/core/src/database/runtime-contract.generated.json b/packages/core/src/database/runtime-contract.generated.json
index a8bf4e5..e5b389b 100644
--- a/packages/core/src/database/runtime-contract.generated.json
+++ b/packages/core/src/database/runtime-contract.generated.json
@@ -14,54 +14,302 @@
   "jwt": {
     "algorithm": "HS256",
     "audience": "inkcre-api",
-    "issuer": "inkcre-client",
+    "issuer": "inkcre-peer",
     "maximum_lifetime_seconds": 86400,
     "required_claims": ["role", "iss", "aud", "iat", "exp"],
     "role": "authenticated"
   },
+  "migration_heads": ["77cd53ad8080"],
   "profiles": ["runtime", "development"],
   "protocol": {
     "format": 1,
-    "functions": {},
+    "functions": {
+      "create_storage_blob": {
+        "arguments": [{ "name": null, "type": { "format": "bytea", "kind": "string" } }],
+        "request_media_type": "application/octet-stream",
+        "returns": { "format": "uuid", "kind": "string" },
+        "returns_set": false,
+        "volatility": "volatile"
+      },
+      "read_storage_blob": {
+        "arguments": [{ "name": "blob_id", "type": { "format": "uuid", "kind": "string" } }],
+        "response_media_type": "application/octet-stream",
+        "returns": {
+          "database_type": "inkcre.\"application/octet-stream\"",
+          "format": "bytea",
+          "kind": "string"
+        },
+        "returns_set": false,
+        "volatility": "stable"
+      },
+      "renew_peer_lease": {
+        "arguments": [
+          { "name": "peer", "type": { "format": "uuid", "kind": "string" } },
+          { "name": "ttl_seconds", "type": { "format": "integer", "kind": "number" } }
+        ],
+        "returns": {
+          "database_type": "timestamp with time zone",
+          "format": "date-time",
+          "kind": "string"
+        },
+        "returns_set": false,
+        "volatility": "volatile"
+      }
+    },
     "relations": {
-      "block_embeddings": {
+      "agents": {
         "columns": {
-          "embedding": {
+          "created_at": {
             "generated": false,
-            "has_default": false,
+            "has_default": true,
             "nullable": false,
-            "type": {
-              "items": {
-                "kind": "number"
-              },
-              "kind": "array"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           },
           "id": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
+          },
+          "max_model_calls_per_turn": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "model": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "name": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "system_prompt": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "tool_choice": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "kind": "json" }
+          },
+          "tools": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "items": { "kind": "string" }, "kind": "array" }
           },
           "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          }
+        },
+        "relationships": [
+          {
+            "columns": ["model"],
+            "foreign_key_name": "agents_model_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "ai_models"
+          }
+        ]
+      },
+      "ai_dialects": {
+        "columns": {
+          "config_schema": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "description": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "id": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          }
+        },
+        "relationships": []
+      },
+      "ai_models": {
+        "columns": {
+          "capabilities": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "enabled": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "boolean" }
+          },
+          "id": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "name": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
+          },
+          "native_model_id": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "provider": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          }
+        },
+        "relationships": [
+          {
+            "columns": ["provider"],
+            "foreign_key_name": "ai_models_provider_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "ai_providers"
+          }
+        ]
+      },
+      "ai_providers": {
+        "columns": {
+          "config": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "dialect": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "enabled": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "boolean" }
+          },
+          "id": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "name": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
         "relationships": [
           {
-            "columns": ["id"],
-            "foreign_key_name": "block_embeddings_id_fkey",
+            "columns": ["dialect"],
+            "foreign_key_name": "ai_providers_dialect_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "ai_dialects"
+          }
+        ]
+      },
+      "block_embeddings": {
+        "columns": {
+          "block": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "embedding": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "items": { "kind": "number" }, "kind": "array" }
+          },
+          "profile": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          }
+        },
+        "relationships": [
+          {
+            "columns": ["block"],
+            "foreign_key_name": "block_embeddings_block_fkey",
             "one_to_one": false,
             "referenced_columns": ["id"],
             "referenced_relation": "blocks"
+          },
+          {
+            "columns": ["profile"],
+            "foreign_key_name": "block_embeddings_profile_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "embedding_profiles"
           }
         ]
       },
@@ -71,51 +319,37 @@
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "created_at": {
             "generated": false,
             "has_default": true,
             "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           },
           "id": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "resolver": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "storage": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "updated_at": {
             "generated": false,
             "has_default": true,
             "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
         "relationships": [
@@ -128,128 +362,309 @@
           }
         ]
       },
-      "clients": {
+      "configs": {
         "columns": {
-          "config": {
+          "created_at": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           },
-          "config_schema": {
+          "key": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "schema": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "updated_at": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           },
+          "value": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "json" }
+          }
+        },
+        "relationships": []
+      },
+      "crons": {
+        "columns": {
           "created_at": {
             "generated": false,
             "has_default": true,
-            "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           },
-          "id": {
+          "enabled": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "format": "uuid",
-              "kind": "string"
-            }
+            "type": { "kind": "boolean" }
           },
-          "labels": {
+          "id": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "job_parameters": {
             "generated": false,
             "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "job_timeout_seconds": {
+            "generated": false,
+            "has_default": false,
             "nullable": true,
-            "type": {
-              "items": {
-                "kind": "string"
-              },
-              "kind": "array"
-            }
+            "type": { "kind": "number" }
           },
-          "name": {
+          "job_type": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
-          "rest_api_url": {
+          "last_job": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "number" }
+          },
+          "last_scheduled_for": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "schedule": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
-        "relationships": []
+        "relationships": [
+          {
+            "columns": ["job_type"],
+            "foreign_key_name": "crons_job_type_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "job_types"
+          },
+          {
+            "columns": ["last_job"],
+            "foreign_key_name": "crons_last_job_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "jobs"
+          }
+        ]
+      },
+      "embedding_profiles": {
+        "columns": {
+          "ai_model": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "dimensions": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "id": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "name": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "kind": "string" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          }
+        },
+        "relationships": [
+          {
+            "columns": ["ai_model"],
+            "foreign_key_name": "embedding_profiles_ai_model_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "ai_models"
+          }
+        ]
       },
       "extensions": {
         "columns": {
           "config": {
             "generated": false,
             "has_default": true,
-            "nullable": true,
-            "type": {
-              "kind": "json"
-            }
+            "nullable": true,
+            "type": { "kind": "json" }
+          },
+          "config_schema": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "kind": "json" }
+          },
+          "enabled": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "items": { "format": "uuid", "kind": "string" }, "kind": "array" }
+          },
+          "id": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "nickname": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "kind": "string" }
+          },
+          "version": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          }
+        },
+        "relationships": []
+      },
+      "job_types": {
+        "columns": {
+          "default_timeout_seconds": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "description": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "id": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "parameters_schema": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          }
+        },
+        "relationships": []
+      },
+      "jobs": {
+        "columns": {
+          "closed_at": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "id": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
+          },
+          "parameters": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
           },
-          "config_schema": {
+          "started_at": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           },
-          "enabled": {
+          "state": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "items": {
-                "format": "uuid",
-                "kind": "string"
-              },
-              "kind": "array"
-            }
+            "type": { "kind": "json" }
           },
-          "id": {
+          "status": {
             "generated": false,
-            "has_default": false,
+            "has_default": true,
             "nullable": false,
             "type": {
-              "kind": "string"
+              "kind": "enum",
+              "values": ["pending", "running", "finished", "failed", "timed_out", "aborted"]
             }
           },
-          "nickname": {
+          "timeout_seconds": {
             "generated": false,
             "has_default": false,
-            "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "nullable": false,
+            "type": { "kind": "number" }
           },
-          "version": {
+          "type": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           }
         },
-        "relationships": []
+        "relationships": [
+          {
+            "columns": ["type"],
+            "foreign_key_name": "jobs_type_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "job_types"
+          }
+        ]
       },
       "logs": {
         "columns": {
@@ -257,105 +672,156 @@
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "json" }
           },
           "body": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "id": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "severity_number": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "severity_text": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "span_id": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "timestamp": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           },
           "trace_id": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
+          }
+        },
+        "relationships": []
+      },
+      "peers": {
+        "columns": {
+          "capabilities": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "config": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "config_schema": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "id": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "uuid", "kind": "string" }
+          },
+          "labels": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "items": { "kind": "string" }, "kind": "array" }
+          },
+          "lease_expires_at": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "format": "date-time", "kind": "string" }
+          },
+          "name": {
+            "generated": false,
+            "has_default": false,
+            "nullable": false,
+            "type": { "kind": "string" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
         "relationships": []
       },
       "relation_embeddings": {
         "columns": {
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
+          },
           "embedding": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "items": {
-                "kind": "number"
-              },
-              "kind": "array"
-            }
+            "type": { "items": { "kind": "number" }, "kind": "array" }
           },
-          "id": {
+          "profile": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
+          },
+          "relation": {
+            "generated": true,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "number" }
           },
           "updated_at": {
             "generated": false,
-            "has_default": false,
-            "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
         "relationships": [
           {
-            "columns": ["id"],
-            "foreign_key_name": "relation_embeddings_id_fkey",
+            "columns": ["profile"],
+            "foreign_key_name": "relation_embeddings_profile_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "embedding_profiles"
+          },
+          {
+            "columns": ["relation"],
+            "foreign_key_name": "relation_embeddings_relation_fkey",
             "one_to_one": false,
             "referenced_columns": ["id"],
             "referenced_relation": "relations"
@@ -368,42 +834,31 @@
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "from_": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "id": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "to_": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "updated_at": {
             "generated": false,
             "has_default": true,
             "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
         "relationships": [
@@ -425,56 +880,76 @@
       },
       "sources": {
         "columns": {
-          "collect_at": {
+          "block": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "number" }
           },
           "config": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "json" }
+          },
+          "created_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           },
           "id": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "nickname": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "state": {
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "json" }
+          },
+          "storage": {
+            "generated": false,
+            "has_default": false,
+            "nullable": true,
+            "type": { "kind": "number" }
           },
           "type": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
+          },
+          "updated_at": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "format": "date-time", "kind": "string" }
           }
         },
         "relationships": [
+          {
+            "columns": ["block"],
+            "foreign_key_name": "sources_block_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "blocks"
+          },
+          {
+            "columns": ["storage"],
+            "foreign_key_name": "sources_storage_fkey",
+            "one_to_one": false,
+            "referenced_columns": ["id"],
+            "referenced_relation": "storages"
+          },
           {
             "columns": ["type"],
             "foreign_key_name": "sources_type_fkey",
@@ -484,112 +959,54 @@
           }
         ]
       },
-      "sources_collect_jobs": {
+      "sources_types": {
         "columns": {
-          "closed_at": {
-            "generated": false,
-            "has_default": false,
-            "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
-          },
-          "config": {
+          "backfill_config_schema": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "json" }
           },
-          "created_at": {
+          "collect_config_schema": {
             "generated": false,
-            "has_default": false,
-            "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
-          },
-          "id": {
-            "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "json" }
           },
-          "source": {
+          "config_schema": {
             "generated": false,
-            "has_default": false,
-            "nullable": true,
-            "type": {
-              "kind": "number"
-            }
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "json" }
           },
-          "started_at": {
+          "description": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "format": "date-time",
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
-          "state": {
+          "id": {
             "generated": false,
             "has_default": false,
-            "nullable": true,
-            "type": {
-              "kind": "json"
-            }
-          },
-          "status": {
-            "generated": false,
-            "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "enum",
-              "values": ["pending", "running", "finished", "failed"]
-            }
+            "type": { "kind": "string" }
           }
         },
-        "relationships": [
-          {
-            "columns": ["source"],
-            "foreign_key_name": "sources_collect_jobs_source_fkey",
-            "one_to_one": false,
-            "referenced_columns": ["id"],
-            "referenced_relation": "sources"
-          }
-        ]
+        "relationships": []
       },
-      "sources_types": {
+      "storage_blobs": {
         "columns": {
-          "config_schema": {
-            "generated": false,
-            "has_default": true,
-            "nullable": false,
-            "type": {
-              "kind": "json"
-            }
-          },
-          "description": {
+          "data": {
             "generated": false,
             "has_default": false,
-            "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "nullable": false,
+            "type": { "format": "bytea", "kind": "string" }
           },
           "id": {
             "generated": false,
-            "has_default": false,
+            "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "format": "uuid", "kind": "string" }
           }
         },
         "relationships": []
@@ -600,25 +1017,25 @@
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "json" }
           },
           "description": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "id": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
+          },
+          "writable": {
+            "generated": false,
+            "has_default": true,
+            "nullable": false,
+            "type": { "kind": "boolean" }
           }
         },
         "relationships": []
@@ -629,33 +1046,25 @@
             "generated": false,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "json"
-            }
+            "type": { "kind": "json" }
           },
           "id": {
             "generated": true,
             "has_default": true,
             "nullable": false,
-            "type": {
-              "kind": "number"
-            }
+            "type": { "kind": "number" }
           },
           "nickname": {
             "generated": false,
             "has_default": false,
             "nullable": true,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           },
           "type": {
             "generated": false,
             "has_default": false,
             "nullable": false,
-            "type": {
-              "kind": "string"
-            }
+            "type": { "kind": "string" }
           }
         },
         "relationships": [
@@ -671,6 +1080,6 @@
     },
     "schema": "inkcre"
   },
-  "revision": "peer-database-runtime-v1",
-  "source_revision": "02a5d2c435208bac9035071434f1dde0b5ee4c78"
+  "revision": "mail-source-job-runtime-v1",
+  "source_revision": "unknown"
 }
diff --git a/packages/core/src/database/runtime-contract.test.ts b/packages/core/src/database/runtime-contract.test.ts
index 47c2b9d..40260db 100644
--- a/packages/core/src/database/runtime-contract.test.ts
+++ b/packages/core/src/database/runtime-contract.test.ts
@@ -6,7 +6,7 @@ describe('database runtime contract', () => {
   it('contains only environment-neutral protocol and JWT metadata', () => {
     expect(databaseRuntimeContract).toEqual({
       format: 1,
-      revision: 'peer-database-runtime-v1',
+      revision: 'mail-source-job-runtime-v1',
       protocol: {
         format: 1,
         schema: 'inkcre',
diff --git a/packages/core/src/extension/base.test.ts b/packages/core/src/extension/base.test.ts
index d51d1a8..400d7aa 100644
--- a/packages/core/src/extension/base.test.ts
+++ b/packages/core/src/extension/base.test.ts
@@ -1,16 +1,26 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
-import { Client } from '../client/client'
-import { Extension } from './base'
+import { PeerManager } from '../peer'
+import { Extension, ExtensionState } from './base'
 
 afterEach(() => {
   vi.restoreAllMocks()
 })
 
 describe('Extension.updateConfig', () => {
-  it('uses the peer-authenticated core extension config endpoint', async () => {
-    const request = vi.fn().mockResolvedValue({ id: 'memos' })
-    vi.spyOn(Client, 'get').mockResolvedValue({ request } as unknown as Client)
+  it('uses exact-target extension management delegation', async () => {
+    const delegate = vi.spyOn(PeerManager, 'delegate').mockResolvedValue({
+      status: 200,
+      headers: {},
+      body: {
+        id: 'memos',
+        version: '0.1.0',
+        enabled: [],
+        nickname: 'Memos',
+        config: { personal_access_token: `memos_pat_${'A'.repeat(32)}` },
+        config_schema: null,
+      },
+    })
     const extension = Extension.parse({
       id: 'memos',
       version: '0.1.0',
@@ -20,14 +30,37 @@ describe('Extension.updateConfig', () => {
       config_schema: null,
     })
     const patch = { personal_access_token: `memos_pat_${'A'.repeat(32)}` }
+    const peer = '00000000-0000-0000-0000-000000000001'
+
+    await extension.updateConfig(peer, patch)
 
-    await extension.updateConfig('00000000-0000-0000-0000-000000000001', patch)
+    expect(delegate).toHaveBeenCalledWith(
+      'core.extension.management.v1',
+      { body: { action: 'patch_config', extension: 'memos', patch } },
+      peer
+    )
+  })
+})
 
-    expect(request).toHaveBeenCalledOnce()
-    expect(request).toHaveBeenCalledWith({
-      method: 'PUT',
-      path: '/extensions/memos/config',
-      body: patch,
+describe('Extension runtime state', () => {
+  it('initializes isolated runtime state for parsed database models', () => {
+    const data = {
+      id: 'memos',
+      version: '0.1.0',
+      enabled: [],
+      nickname: 'Memos',
+      config: {},
+      config_schema: null,
+    }
+    const first = Extension.parse(data)
+    const second = Extension.parse(data)
+
+    expect(first.runtimeState.value).toEqual({
+      status: ExtensionState.DISCOVERED,
+      error: null,
     })
+    first.setState(ExtensionState.LOADING)
+
+    expect(second.runtimeState.value.status).toBe(ExtensionState.DISCOVERED)
   })
 })
diff --git a/packages/core/src/extension/base.ts b/packages/core/src/extension/base.ts
index f932347..fe095b4 100644
--- a/packages/core/src/extension/base.ts
+++ b/packages/core/src/extension/base.ts
@@ -10,10 +10,18 @@ import { Z } from 'zod-class'
 import { ref, type Ref } from 'vue'
 import { DBAPIClient } from '../base/db-api'
 import { makeStringProp, makeObjectProp } from '../utils/vue-props'
-import { Client, type ClientRef } from '../client/client'
 import { configStore as sharedConfigStore } from '../config'
+import {
+  type JsonValue,
+  JsonValueSchema,
+  PeerManager,
+  PeerProtocolResponseSchema,
+  type PeerRef,
+} from '../peer'
 import { getMFImplementation } from './module-federation'
 
+export const EXTENSION_MANAGEMENT_CAPABILITY = 'core.extension.management.v1'
+
 // ============================================================================
 // Extension Lifecycle State
 // ============================================================================
@@ -55,7 +63,7 @@ export interface ExtensionModule {
   initialize?(): Promise<void>
 
   /**
-   * Called when the extension is activated (enabled for a client).
+   * Called when the extension is activated (enabled for a Peer).
    * Use for registering resolvers, handlers, and other runtime hooks.
    */
   activate?(): Promise<void>
@@ -98,7 +106,7 @@ export const ExtensionRefZ = z.string()
 export class Extension extends Z.class({
   id: ExtensionRefZ,
   version: z.string(),
-  enabled: z.array(z.string()).optional().default([]), // uuid array for client IDs
+  enabled: z.array(z.string()).optional().default([]), // UUID array for Peer IDs
   nickname: z.string().nullable(),
   config: z.looseObject({}).default({}),
   config_schema: z.looseObject({}).nullable(),
@@ -117,20 +125,24 @@ export class Extension extends Z.class({
   // ============================================================================
 
   /**
-   * Extension instances registry for the local client.
+   * Extension instances registry for the local Peer.
    *
-   * IMPORTANT: This map assumes all instances belong to the current local client
-   * (identified by `CONFIG.value.INKCRE_CLIENT_ID`). Do not use this registry
-   * to manage extensions for remote clients.
+   * IMPORTANT: This map assumes all instances belong to the current local Peer
+   * (identified by `metaConfig.INKCRE_PEER_ID`). Do not use this registry
+   * to manage extensions for remote Peers.
    */
   private static _instances: Map<ExtensionRef, Extension> = new Map()
 
+  /**
+   * Runtime-only state cannot use a class-field initializer because zod-class
+   * creates parsed models without running those initializers.
+   */
+  private static _runtimeStates = new WeakMap<Extension, Ref<ExtensionRuntimeState>>()
+
   private static getEnabledInstances(): Extension[] {
-    const clientId = sharedConfigStore.metaConfig.INKCRE_CLIENT_ID
-    if (!clientId) return []
-    return Array.from(Extension._instances.values()).filter((ext) =>
-      ext.isEnabledForClient(clientId)
-    )
+    const peer = sharedConfigStore.metaConfig.INKCRE_PEER_ID
+    if (!peer) return []
+    return Array.from(Extension._instances.values()).filter((ext) => ext.isEnabledForPeer(peer))
   }
 
   /**
@@ -144,10 +156,17 @@ export class Extension extends Z.class({
   // Runtime State (not persisted, reactive)
   // ============================================================================
 
-  readonly runtimeState: Ref<ExtensionRuntimeState> = ref({
-    status: ExtensionState.DISCOVERED,
-    error: null,
-  })
+  get runtimeState(): Ref<ExtensionRuntimeState> {
+    let state = Extension._runtimeStates.get(this)
+    if (!state) {
+      state = ref({
+        status: ExtensionState.DISCOVERED,
+        error: null,
+      })
+      Extension._runtimeStates.set(this, state)
+    }
+    return state
+  }
 
   module: ExtensionModule | null = null
 
@@ -187,16 +206,24 @@ export class Extension extends Z.class({
   // Instance Methods (existing)
   // ============================================================================
 
-  isEnabledForClient(clientId: ClientRef): boolean {
-    return this.enabled.includes(clientId)
+  isEnabledForPeer(peer: PeerRef): boolean {
+    return this.enabled.includes(peer)
   }
 
-  async updateConfig(clientId: ClientRef, config?: Record<string, any>): Promise<Extension> {
-    const client = await Client.get(clientId)
-    return await client.request({
-      method: 'PUT',
-      path: `/extensions/${this.id}/config`,
-      body: config || this.config,
+  async updateConfig(peer: PeerRef, config?: Record<string, unknown>): Promise<Extension> {
+    const patch = config ?? this.config
+    if (sharedConfigStore.metaConfig.INKCRE_PEER_ID === peer) {
+      const result = await Extension.dbApi
+        .update({ config: patch })
+        .eq('id', this.id)
+        .select()
+        .single()
+      return Extension.parse(result.data)
+    }
+    return this.manageRemote(peer, {
+      action: 'patch_config',
+      extension: this.id,
+      patch: JsonValueSchema.parse(patch),
     })
   }
 
@@ -332,7 +359,7 @@ export class Extension extends Z.class({
    * Convention: ${registryUrl}/${extensionId}/client-web/remoteEntry.js?version=${version}
    */
   getRemoteEntryUrl(): string {
-    const registryUrl = sharedConfigStore.clientConfig.extension_registry_url
+    const registryUrl = sharedConfigStore.peerConfig.extension_registry_url
     if (!registryUrl) {
       throw new Error('Extension registry URL is not configured (extension_registry_url)')
     }
@@ -380,11 +407,11 @@ export class Extension extends Z.class({
   // Enable/Disable Methods (with lifecycle)
   // ============================================================================
 
-  async enableForClient(clientId: ClientRef): Promise<void> {
-    console.log(`[Extension] Enabling ${this.id} for client ${clientId}`)
+  async enableForPeer(peer: PeerRef): Promise<void> {
+    console.log(`[Extension] Enabling ${this.id} for Peer ${peer}`)
 
-    if (sharedConfigStore.metaConfig.INKCRE_CLIENT_ID === clientId) {
-      // Local client
+    if (sharedConfigStore.metaConfig.INKCRE_PEER_ID === peer) {
+      // Local Peer
 
       // Activate if ready, or load->init->activate if discovered
       if (this.runtimeState.value.status === ExtensionState.READY) {
@@ -397,32 +424,26 @@ export class Extension extends Z.class({
 
       // Update local database after successful enable
       if (this.runtimeState.value.status === ExtensionState.ACTIVE) {
-        this.enabled.push(clientId)
+        this.enabled.push(peer)
         await Extension.dbApi.update({ enabled: this.enabled }).eq('id', this.id)
       } else {
-        throw new Error(`Failed to enable extension ${this.id} for local client`)
+        throw new Error(`Failed to enable extension ${this.id} for local Peer`)
       }
     } else {
-      // Remote client: call remote API
-      const client = await Client.get(clientId)
-      await client.request({
-        method: 'POST',
-        path: `/extensions/${this.id}/enable`,
+      const updated = await this.manageRemote(peer, {
+        action: 'enable',
+        extension: this.id,
       })
-
-      // Update local enabled array
-      if (!this.enabled.includes(clientId)) {
-        this.enabled.push(clientId)
-      }
+      this.enabled = updated.enabled
     }
 
-    console.log(`[Extension] ${this.id} enabled for client ${clientId}`)
+    console.log(`[Extension] ${this.id} enabled for Peer ${peer}`)
   }
 
-  async disableForClient(clientId: ClientRef): Promise<void> {
-    console.log(`[Extension] Disabling ${this.id} for client ${clientId}`)
+  async disableForPeer(peer: PeerRef): Promise<void> {
+    console.log(`[Extension] Disabling ${this.id} for Peer ${peer}`)
 
-    if (sharedConfigStore.metaConfig.INKCRE_CLIENT_ID === clientId) {
+    if (sharedConfigStore.metaConfig.INKCRE_PEER_ID === peer) {
       // Deactivate if active
       if (this.runtimeState.value.status === ExtensionState.ACTIVE) {
         await this.deactivate()
@@ -430,30 +451,36 @@ export class Extension extends Z.class({
 
       // Update local database after successful disable
       if (this.runtimeState.value.status === ExtensionState.READY) {
-        const index = this.enabled.indexOf(clientId)
+        const index = this.enabled.indexOf(peer)
         if (index !== -1) {
           this.enabled.splice(index, 1)
         }
         await Extension.dbApi.update({ enabled: this.enabled }).eq('id', this.id)
       } else {
-        throw new Error(`Failed to disable extension ${this.id} for local client`)
+        throw new Error(`Failed to disable extension ${this.id} for local Peer`)
       }
     } else {
-      // Remote client: call remote API
-      const client = await Client.get(clientId)
-      await client.request({
-        method: 'POST',
-        path: `/extensions/${this.id}/disable`,
+      const updated = await this.manageRemote(peer, {
+        action: 'disable',
+        extension: this.id,
       })
-
-      // Update local enabled array
-      const index = this.enabled.indexOf(clientId)
-      if (index !== -1) {
-        this.enabled.splice(index, 1)
-      }
+      this.enabled = updated.enabled
     }
 
-    console.log(`[Extension] ${this.id} disabled for client ${clientId}`)
+    console.log(`[Extension] ${this.id} disabled for Peer ${peer}`)
+  }
+
+  private async manageRemote(peer: PeerRef, command: JsonValue): Promise<Extension> {
+    const delegated = await PeerManager.delegate(
+      EXTENSION_MANAGEMENT_CAPABILITY,
+      { body: command },
+      peer
+    )
+    const response = PeerProtocolResponseSchema.parse(delegated)
+    if (response.status !== 200 || !Object.prototype.hasOwnProperty.call(response, 'body')) {
+      throw new Error(`Extension management Peer returned HTTP ${response.status}`)
+    }
+    return Extension.parse(response.body)
   }
 
   // ============================================================================
@@ -569,7 +596,7 @@ export class Extension extends Z.class({
 export class InstallExtensionForm extends Z.class({
   id: ExtensionRefZ,
   version: z.string().optional(),
-  enabled: z.array(z.string()).optional(), // optional initial enabled client IDs
+  enabled: z.array(z.string()).optional(), // optional initial enabled Peer IDs
 }) {
   /**
    * Install if not exist
diff --git a/packages/core/src/extension/index.ts b/packages/core/src/extension/index.ts
index 02ceda6..e6998be 100644
--- a/packages/core/src/extension/index.ts
+++ b/packages/core/src/extension/index.ts
@@ -4,6 +4,7 @@ export {
   type ExtensionModule,
   type ExtensionRuntimeState,
   Extension,
+  EXTENSION_MANAGEMENT_CAPABILITY,
   InstallExtensionForm,
   type ExtensionRef,
   ExtensionRefZ,
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 9a32a34..2d2cdb9 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -22,6 +22,7 @@ export {
   type ExtensionRuntimeState,
   // Extension model
   Extension,
+  EXTENSION_MANAGEMENT_CAPABILITY,
   InstallExtensionForm,
   type ExtensionRef,
   // Module Federation
@@ -35,31 +36,72 @@ export {
   makeExtensionProp,
 } from './extension'
 
-// Client
+// Peer discovery and delegation
 export {
-  Client,
-  CreateClientForm,
-  type ClientRef,
-  makeClientProp,
-  makeClientRefProp,
-} from './client'
+  Peer,
+  PeerManager,
+  PeerHTTPOutbound,
+  CapabilityDelegationUnavailable,
+  PeerOutcomeUnknown,
+  PeerProtocolError,
+  PeerRequestNotExecuted,
+  PEER_EXECUTION_HEADER,
+  PEER_HTTP_PROTOCOL,
+  type CapabilityID,
+  type JsonValue,
+  type PeerProtocolRequest,
+  type PeerProtocolResponse,
+  PeerProtocolResponseSchema,
+  type PeerRef,
+  makePeerProp,
+  makePeerRefProp,
+} from './peer'
+
+// Peer-delivered business capabilities
+export {
+  SemanticRetrievalManager,
+  SemanticRetrievalDelegationError,
+  SemanticRetrievalRequestSchema,
+  SemanticRetrievalResultSchema,
+  VectorRetrievalOptionsSchema,
+  SEMANTIC_RETRIEVAL_CAPABILITY,
+  type SemanticRetrievalRequest,
+  type SemanticRetrievalResult,
+} from './semantic-retrieval'
+export {
+  OrganizationManager,
+  OrganizationDelegationError,
+  RUMINATION_CAPABILITY,
+} from './organization'
 
 // Source
 export {
   Source,
   SourceForm,
   SourceType,
-  CollectAt,
-  SourceCollectJob,
-  SourceCollectJobForm,
-  SourceCollectJobStatus,
+  SourceManager,
+  SOURCE_COLLECT_JOB_TYPE,
+  SOURCE_BACKFILL_JOB_TYPE,
+  type SourceImplementation,
   type SourceRef,
   type SourceTypeRef,
-  type SourceCollectJobRef,
   makeSourceProp,
   makeSourceRefProp,
 } from './source'
 
+// Durable background execution and recurring definitions
+export {
+  Job,
+  JobType,
+  JobManager,
+  JobStatus,
+  DuplicateJobHandlerError,
+  type JobHandler,
+  type JobRef,
+  type JobTypeRef,
+} from './job'
+export { Cron, CronForm } from './cron'
+
 // Observability
 export { Log, type LogRef } from './obsrv'
 
@@ -78,16 +120,44 @@ export {
   makeRelationRefProp,
   // Resolver protocols
   type ResolverContentState,
-  type ContentCompProps,
+  type SolvedContentRendererProps,
+  type InfoBaseRoute,
+  type InfoBaseRouter,
+  setInfoBaseRouter,
+  getInfoBaseRouter,
   // Resolver implementations
   Resolver,
   ResolverCache,
+  CORE_RESOLVER_IDS,
+  DuplicateResolverRegistrationError,
+  ResolverContractError,
+  ResolverContentError,
+  UnknownResolverError,
+  UnsupportedResolverCapability,
+  type CoreResolverId,
+  type ProjectionOptions,
   TextResolver,
+  AudioResolver,
+  EpubResolver,
+  FileResolver,
   ImageResolver,
+  PdfResolver,
   VideoResolver,
   HtmlResolver,
+  ZipResolver,
+  registerCoreResolvers,
+  type AudioSolvedContent,
+  type ByteSolvedContent,
+  type EpubSolvedContent,
+  type FileSolvedContent,
+  type HtmlRawContent,
+  type ImageSolvedContent,
+  type PdfSolvedContent,
+  type VideoSolvedContent,
+  type ZipSolvedContent,
   // Storage protocols
   Storage,
+  WritableStorage,
   StorageType,
   type StorageTypeRef,
   StorageTypeRefZ,
@@ -95,13 +165,11 @@ export {
   StorageRefZ,
   type IStorageBlock,
   // HTTP storage implementations
-  HttpImageStorage,
-  HttpVideoStorage,
-  HttpTextStorage,
-  HttpHtmlStorage,
-  HttpJsonStorage,
-  type VideoContent,
-  type HtmlContent,
+  HttpStorage,
+  StorageContentTooLargeError,
+  PostgreSQLBinaryStorage,
+  type HttpStorageConfig,
+  type PostgreSQLBlobPointer,
 } from './info-base'
 
 // Sink (Output formatters)
@@ -110,14 +178,14 @@ export * from './sink/graph'
 // Configuration
 export {
   configStore,
-  ClientConfigSchema,
+  PeerConfigSchema,
   MetaConfigSchema,
   AIConfigSchema,
   LLMProviderConfigSchema,
   localStorageAdapter,
   createWebextAdapter,
   CONFIG_STORAGE_KEY,
-  type ClientConfig,
+  type PeerConfig,
   type MetaConfig,
   type ProviderType,
   type LLMProviderConfig,
diff --git a/packages/core/src/info-base/block.test.ts b/packages/core/src/info-base/block.test.ts
new file mode 100644
index 0000000..74b5943
--- /dev/null
+++ b/packages/core/src/info-base/block.test.ts
@@ -0,0 +1,75 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import { authStore } from '../auth'
+import { configStore } from '../config'
+import { Block } from './block'
+import { Storage } from './storages/base'
+
+function storedBlock(): Block {
+  return Block.parse({
+    id: 17,
+    storage: -4,
+    resolver: 'core.file.v1',
+    content: '{"blob_id":"00000000-0000-0000-0000-000000000017"}',
+  })
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+  configStore.metaConfig.INKCRE_PGREST_URL = ''
+  authStore.token.value = undefined
+})
+
+describe('Block database access', () => {
+  it('normalizes a runtime PostgREST base URL before relation requests', async () => {
+    const fetcher = vi.fn(async (_input: RequestInfo | URL, _init?: RequestInit) =>
+      Response.json([])
+    )
+    vi.stubGlobal('fetch', fetcher)
+    authStore.token.value = 'peer-token'
+    configStore.metaConfig.INKCRE_PGREST_URL = 'http://database.example.test///'
+    await nextTick()
+
+    await expect(Block.getAll()).resolves.toEqual([])
+
+    expect(String(fetcher.mock.calls[0][0])).toBe('http://database.example.test/blocks?select=*')
+  })
+})
+
+describe('Block hydration', () => {
+  it('returns inline authored content without a storage lookup', async () => {
+    const lookup = vi.spyOn(Storage, 'get')
+    const block = Block.parse({
+      id: 1,
+      storage: null,
+      resolver: 'core.text.v1',
+      content: 'authored',
+    })
+
+    await expect(block.getHydratedContent()).resolves.toBe('authored')
+    expect(lookup).not.toHaveBeenCalled()
+  })
+
+  it('caches one instance snapshot and replaces it on refresh', async () => {
+    const getRawContent = vi
+      .fn()
+      .mockResolvedValueOnce(new Uint8Array([1, 2]))
+      .mockResolvedValueOnce(new Uint8Array([3, 4]))
+    vi.spyOn(Storage, 'get').mockResolvedValue({
+      type: 'postgresql_binary',
+      getRawContent,
+    } as unknown as Storage<Uint8Array>)
+    const block = storedBlock()
+
+    await expect(block.getHydratedContent()).resolves.toEqual(new Uint8Array([1, 2]))
+    await expect(block.getHydratedContent()).resolves.toEqual(new Uint8Array([1, 2]))
+    expect(getRawContent).toHaveBeenCalledTimes(1)
+    await expect(block.getHydratedContent({ refresh: true })).resolves.toEqual(
+      new Uint8Array([3, 4])
+    )
+    expect(getRawContent).toHaveBeenCalledTimes(2)
+    expect(JSON.stringify(block)).not.toContain('hydratedContent')
+  })
+})
diff --git a/packages/core/src/info-base/block.ts b/packages/core/src/info-base/block.ts
index 780b546..ab8f607 100644
--- a/packages/core/src/info-base/block.ts
+++ b/packages/core/src/info-base/block.ts
@@ -2,12 +2,18 @@ import { z } from 'zod'
 import { Z } from 'zod-class'
 import { DBAPIClient } from '../base/db-api'
 import { makeNumberProp, makeObjectProp } from '../utils/vue-props'
+import { Storage } from './storages/base'
 
 export type BlockRef = number
 export const makeBlockProp = (v?: any) => makeObjectProp<Block>(v)
 export const makeBlockRefProp = (v?: any) => makeNumberProp<BlockRef>(v)
 export const BlockRefZ = z.number()
 
+export type HydratedBlockContent = string | Uint8Array
+export type HydrationOptions = {
+  refresh?: boolean
+}
+
 /**
  * Block represents a unit of information in the info-base.
  * Each block has a resolver that determines how to display/interpret its content.
@@ -29,8 +35,18 @@ export class Block extends Z.class({
 }) {
   static dbApi: DBAPIClient<'blocks', Block> = new DBAPIClient<'blocks', Block>('blocks', Block)
 
+  declare private _hydratedContent?: HydratedBlockContent
+  declare private _hydratedContentSource?: string
+
   static async get(id: BlockRef): Promise<Block> {
-    return Block.parse((await this.dbApi.from().select().eq('id', id)).data?.[0])
+    const block = await this.find(id)
+    if (!block) throw new Error(`Block ${id} does not exist`)
+    return block
+  }
+
+  static async find(id: BlockRef): Promise<Block | null> {
+    const row = (await this.dbApi.from().select().eq('id', id).maybeSingle()).data
+    return row ? Block.parse(row) : null
   }
 
   static async getAll(): Promise<Block[]> {
@@ -48,6 +64,41 @@ export class Block extends Z.class({
   public async update(): Promise<Block> {
     return Block.dbApi.first(await Block.dbApi.upsert(this).select())
   }
+
+  public async getHydratedContent(options: HydrationOptions = {}): Promise<HydratedBlockContent> {
+    const source = `${this.storage ?? 'inline'}\0${this.content}`
+    if (!options.refresh && this._hydratedContentSource === source) {
+      return this._hydratedContent as HydratedBlockContent
+    }
+
+    let hydratedContent: HydratedBlockContent
+    if (this.storage === null) {
+      hydratedContent = this.content
+    } else {
+      const storage = await Storage.get<Uint8Array>(this.storage)
+      const storedContent = await storage.getRawContent(this)
+      if (!(storedContent instanceof Uint8Array)) {
+        throw new TypeError(`Storage ${storage.type} must return Uint8Array content.`)
+      }
+      hydratedContent = storedContent
+    }
+
+    Object.defineProperties(this, {
+      _hydratedContent: {
+        configurable: true,
+        enumerable: false,
+        value: hydratedContent,
+        writable: true,
+      },
+      _hydratedContentSource: {
+        configurable: true,
+        enumerable: false,
+        value: source,
+        writable: true,
+      },
+    })
+    return hydratedContent
+  }
 }
 
 export class BlockForm extends Z.class({
diff --git a/packages/core/src/info-base/index.ts b/packages/core/src/info-base/index.ts
index 82d2b92..7dda2f4 100644
--- a/packages/core/src/info-base/index.ts
+++ b/packages/core/src/info-base/index.ts
@@ -1,6 +1,7 @@
 // Models
 export * from './block'
 export * from './relation'
+export * from './router'
 
 // Resolvers
 export * as resolvers from './resolvers'
@@ -8,12 +9,35 @@ export {
   Resolver,
   ResolverCache,
   TextResolver,
+  AudioResolver,
+  EpubResolver,
+  FileResolver,
   ImageResolver,
+  PdfResolver,
   VideoResolver,
   HtmlResolver,
+  ZipResolver,
+  registerCoreResolvers,
   // Resolver base types and utilities
   type ResolverContentState,
-  type ContentCompProps,
+  type SolvedContentRendererProps,
+  CORE_RESOLVER_IDS,
+  DuplicateResolverRegistrationError,
+  ResolverContractError,
+  ResolverContentError,
+  UnknownResolverError,
+  UnsupportedResolverCapability,
+  type CoreResolverId,
+  type ProjectionOptions,
+  type AudioSolvedContent,
+  type ByteSolvedContent,
+  type EpubSolvedContent,
+  type FileSolvedContent,
+  type HtmlRawContent,
+  type ImageSolvedContent,
+  type PdfSolvedContent,
+  type VideoSolvedContent,
+  type ZipSolvedContent,
 } from './resolvers'
 
 // Storages
@@ -21,6 +45,7 @@ export * as storages from './storages'
 export {
   // Storage base class and types
   Storage,
+  WritableStorage,
   StorageType,
   type StorageTypeRef,
   StorageTypeRefZ,
@@ -28,12 +53,9 @@ export {
   StorageRefZ,
   type IStorageBlock,
   // HTTP storage implementations
-  HttpImageStorage,
-  HttpVideoStorage,
-  HttpTextStorage,
-  HttpHtmlStorage,
-  HttpJsonStorage,
+  HttpStorage,
+  StorageContentTooLargeError,
+  PostgreSQLBinaryStorage,
   type HttpStorageConfig,
-  type VideoContent,
-  type HtmlContent,
+  type PostgreSQLBlobPointer,
 } from './storages'
diff --git a/packages/core/src/info-base/resolvers/actual-content.ts b/packages/core/src/info-base/resolvers/actual-content.ts
new file mode 100644
index 0000000..35cbab7
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/actual-content.ts
@@ -0,0 +1,29 @@
+export interface ByteSolvedContent {
+  content: Uint8Array
+  byte_size: number
+  detected_media_type: string | null
+  objectUrl: string
+}
+
+export class ActualContentHandle {
+  private objectUrl: string | null = null
+
+  replace(content: Uint8Array, mediaType?: string): ByteSolvedContent {
+    this.dispose()
+    const blob = new Blob([content as BlobPart], mediaType ? { type: mediaType } : undefined)
+    this.objectUrl = URL.createObjectURL(blob)
+    return {
+      content,
+      byte_size: content.byteLength,
+      detected_media_type: null,
+      objectUrl: this.objectUrl,
+    }
+  }
+
+  dispose(): void {
+    if (this.objectUrl) {
+      URL.revokeObjectURL(this.objectUrl)
+      this.objectUrl = null
+    }
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/audio.ts b/packages/core/src/info-base/resolvers/audio.ts
new file mode 100644
index 0000000..3b64653
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/audio.ts
@@ -0,0 +1,42 @@
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
+import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
+
+export interface AudioSolvedContent extends ByteSolvedContent {
+  container: string | null
+  codec: string | null
+  duration_ms: number | null
+  channels: number | null
+  sample_rate_hz: number | null
+  bitrate_bps: number | null
+}
+
+export class AudioResolver extends Resolver<Uint8Array, AudioSolvedContent> {
+  static readonly type = 'core.audio.v1'
+  private readonly actualContent = new ActualContentHandle()
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<AudioSolvedContent> {
+    const rawContent = await this.getRawContent(options)
+    return {
+      ...this.actualContent.replace(rawContent),
+      container: null,
+      codec: null,
+      duration_ms: null,
+      channels: null,
+      sample_rate_hz: null,
+      bitrate_bps: null,
+    }
+  }
+
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(AudioResolver.type, 'text')
+  }
+
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(AudioResolver.type, 'embedding text')
+  }
+
+  async dispose(): Promise<void> {
+    this.actualContent.dispose()
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/base.ts b/packages/core/src/info-base/resolvers/base.ts
index ee04eec..09474a3 100644
--- a/packages/core/src/info-base/resolvers/base.ts
+++ b/packages/core/src/info-base/resolvers/base.ts
@@ -7,7 +7,7 @@
  *
  * Architecture:
  * - Resolver instances are created per-block with optional relations
- * - Each resolver has a contentComp Vue component for rendering
+ * - Each resolver has a presentation-neutral solvedContentRenderer
  * - Resolver stores resolver classes statically and provides factory methods
  * - This implementation integrates with Block, Relation, and Storage models
  */
@@ -15,10 +15,11 @@
 import { ref, type Component, type Ref } from 'vue'
 import type { Block } from '../block'
 import type { Relation } from '../relation'
-
-// DEBUG
-const instanceId = Math.random().toString(36).substring(7)
-console.log(`[Core Init] Loading Core module. Instance ID: ${instanceId}`)
+import {
+  DuplicateResolverRegistrationError,
+  type ProjectionOptions,
+  UnknownResolverError,
+} from './contracts'
 
 // ============================================================================
 // Resolver Content State
@@ -38,12 +39,15 @@ export interface ResolverContentState {
 // ============================================================================
 
 /**
- * Props passed to contentComp Vue components.
+ * Props passed to presentation-neutral solved-content renderers.
  * Components receive the resolver instance and pre-resolved content.
  */
-export interface ContentCompProps<SolvedContentT = any> {
+export interface SolvedContentRendererProps<
+  SolvedContentT = any,
+  ResolverT extends Resolver<any, SolvedContentT> = Resolver<any, SolvedContentT>,
+> {
   /** The resolver instance (provides access to block and relations) */
-  resolver: Resolver<any, SolvedContentT>
+  resolver: ResolverT
   solvedContent: SolvedContentT
 }
 
@@ -54,7 +58,7 @@ export interface ContentCompProps<SolvedContentT = any> {
 export interface ResolverClass {
   new (block: Block, relations?: Relation[]): Resolver
   readonly type: string
-  contentComp: Component
+  solvedContentRenderer: Component
 }
 
 /**
@@ -64,45 +68,77 @@ export interface ResolverClass {
  * This class merges the protocol-level BaseResolver with info-base-specific DB integration.
  *
  * Subclasses must:
- * - Set static `type` and `contentComp`
+ * - Set static `type` and `solvedContentRenderer`
  * - Override `_getSolvedContent()` for content transformation
  *
  * @template RawContentT - The type of raw content from storage
  * @template SolvedContentT - The type of content after processing
  */
-export class Resolver<RawContentT = any, SolvedContentT = RawContentT> {
+export abstract class Resolver<RawContentT = unknown, SolvedContentT = RawContentT> {
   /** Resolver type identifier */
   static readonly type: string
 
   /** Vue component for rendering - settable by applications */
-  static contentComp: Component
+  static solvedContentRenderer: Component
 
   private static resolverClasses: Map<string, ResolverClass> = new Map()
-  private static defaultResolverType: string | null = null
-
   static register(type: string, resolverClass: ResolverClass): void {
-    this.resolverClasses.set(type, resolverClass)
-    console.log('[Resolver] Registered resolver:', type)
-
-    if (!this.defaultResolverType) {
-      console.log('[Resolver] Set default resolver to:', type)
-      this.defaultResolverType = type
+    if (resolverClass.type !== type) {
+      throw new TypeError(
+        `Resolver class ${resolverClass.name} declares ${resolverClass.type}, not ${type}.`
+      )
+    }
+    const existing = this.resolverClasses.get(type)
+    if (existing === resolverClass) return
+    if (existing) {
+      throw new DuplicateResolverRegistrationError(type, existing.name, resolverClass.name)
     }
+    this.resolverClasses.set(type, resolverClass)
   }
 
   static getClass(type: string): ResolverClass {
-    return this.resolverClasses.get(type) || this.resolverClasses.get(this.defaultResolverType!)!
+    const resolverClass = this.resolverClasses.get(type)
+    if (!resolverClass) throw new UnknownResolverError(type)
+    return resolverClass
+  }
+
+  static matchMediaType(mediaType: string | null | undefined): string | null {
+    if (mediaType == null) return null
+    const normalized = mediaType.split(';', 1)[0]!.trim().toLowerCase()
+    if (
+      !normalized ||
+      ['application/octet-stream', 'binary/octet-stream', 'application/binary'].includes(normalized)
+    ) {
+      return null
+    }
+
+    const exact: Record<string, string> = {
+      'text/plain': 'core.text.v1',
+      'text/html': 'core.html.v1',
+      'application/xhtml+xml': 'core.html.v1',
+      'application/pdf': 'core.pdf.v1',
+      'application/epub+zip': 'core.epub.v1',
+      'application/zip': 'core.zip.v1',
+      'application/x-zip-compressed': 'core.zip.v1',
+    }
+    const family: Record<string, string> = {
+      image: 'core.image.v1',
+      audio: 'core.audio.v1',
+      video: 'core.video.v1',
+    }
+    const resolverId = exact[normalized] ?? family[normalized.split('/', 1)[0]!]
+    return resolverId && this.resolverClasses.has(resolverId) ? resolverId : null
   }
 
   readonly block: Block
   protected _relations: Relation[] | null
 
-  protected _rawContent: RawContentT | null = null
   readonly solvedContentState: Ref<ResolverContentState> = ref({
     status: 'idle',
     error: null,
   })
-  protected _solvedContent: SolvedContentT | null = null
+  declare protected _solvedContent: SolvedContentT
+  private _hasSolvedContent = false
 
   /**
    * Create a resolver instance for a block.
@@ -112,10 +148,6 @@ export class Resolver<RawContentT = any, SolvedContentT = RawContentT> {
   constructor(block: Block, relations?: Relation[]) {
     this.block = block as Block
     this._relations = relations ?? null // null means not loaded yet
-
-    if (block.storage === null) {
-      this._rawContent = block.content as RawContentT
-    }
   }
 
   /**
@@ -125,16 +157,11 @@ export class Resolver<RawContentT = any, SolvedContentT = RawContentT> {
    * @param options.includeOut - Include relations where block is from_ (outgoing relations)
    */
   async getRelations(
-    options?: { force?: boolean; includeIn?: boolean; includeOut?: boolean } | boolean
+    options: { refresh?: boolean; includeIn?: boolean; includeOut?: boolean } = {}
   ): Promise<Relation[]> {
-    // Handle backward compatibility: boolean parameter is force
-    const {
-      force = false,
-      includeIn = true,
-      includeOut = true,
-    } = typeof options === 'boolean' ? { force: options } : (options ?? {})
-
-    if (this._relations === null || force) {
+    const { refresh = false, includeIn = true, includeOut = true } = options
+
+    if (this._relations === null || refresh) {
       // Dynamic import to avoid circular dependency
       const { Relation } = await import('../relation')
       this._relations = (await Relation.getByBlock(this.block.id)) as Relation[]
@@ -158,26 +185,16 @@ export class Resolver<RawContentT = any, SolvedContentT = RawContentT> {
    * Get raw content (lazy-loaded).
    * Fetches from Storage if block.storage is set, otherwise returns block.content.
    */
-  async getRawContent(force = false): Promise<RawContentT> {
-    if (!this._rawContent || force) {
-      if (this.block.storage === null) {
-        this._rawContent = this.block.content as RawContentT
-      } else {
-        // Dynamic import to avoid circular dependency
-        const { Storage } = await import('../storages/base')
-        const storage = await Storage.get<RawContentT>(this.block.storage)
-        this._rawContent = await storage.getRawContent(this.block)
-      }
-    }
-    return this._rawContent
+  async getRawContent(options: Pick<ProjectionOptions, 'refresh'> = {}): Promise<RawContentT> {
+    return this.block.getHydratedContent(options) as Promise<RawContentT>
   }
 
   /**
    * Get solved content (lazy-loading).
    * Manages content state transitions.
    */
-  async getSolvedContent(force = false): Promise<SolvedContentT> {
-    if (this._solvedContent && !force) {
+  async getSolvedContent(options: ProjectionOptions = {}): Promise<SolvedContentT> {
+    if (this._hasSolvedContent && !options.refresh) {
       return this._solvedContent
     }
     if (this.solvedContentState.value.status === 'loading') {
@@ -187,7 +204,8 @@ export class Resolver<RawContentT = any, SolvedContentT = RawContentT> {
     try {
       this.solvedContentState.value.status = 'loading'
       this.solvedContentState.value.error = null
-      this._solvedContent = await this._getSolvedContent()
+      this._solvedContent = await this._getSolvedContent(options)
+      this._hasSolvedContent = true
       this.solvedContentState.value.status = 'success'
       return this._solvedContent
     } catch (error) {
@@ -202,10 +220,14 @@ export class Resolver<RawContentT = any, SolvedContentT = RawContentT> {
    * Transform raw content into solved content.
    * Override in subclasses to implement specific logic.
    */
-  protected _getSolvedContent(): Promise<SolvedContentT> {
-    return this.getRawContent() as unknown as Promise<SolvedContentT>
+  protected _getSolvedContent(options: ProjectionOptions): Promise<SolvedContentT> {
+    return this.getRawContent(options) as unknown as Promise<SolvedContentT>
   }
 
+  abstract getText(options?: ProjectionOptions): Promise<string | null>
+
+  abstract getStrForEmbedding(options?: ProjectionOptions): Promise<string | null>
+
   /**
    * Cleanup when resolver is no longer needed.
    * Override in subclasses if cleanup is required.
diff --git a/packages/core/src/info-base/resolvers/cache.ts b/packages/core/src/info-base/resolvers/cache.ts
index 3a93db7..3d58628 100644
--- a/packages/core/src/info-base/resolvers/cache.ts
+++ b/packages/core/src/info-base/resolvers/cache.ts
@@ -49,6 +49,7 @@ export class ResolverCache {
         return cached.resolver as T
       }
       // Block was updated, invalidate cache entry
+      void cached.resolver.dispose()
       this.cache.delete(block.id)
     }
 
@@ -71,6 +72,7 @@ export class ResolverCache {
    * @param blockId - The block ID to invalidate
    */
   static invalidate(blockId: number): void {
+    void this.cache.get(blockId)?.resolver.dispose()
     this.cache.delete(blockId)
   }
 
@@ -79,6 +81,7 @@ export class ResolverCache {
    * Use cautiously - should only be needed for testing or major state changes.
    */
   static clear(): void {
+    for (const entry of this.cache.values()) void entry.resolver.dispose()
     this.cache.clear()
   }
 
diff --git a/packages/core/src/info-base/resolvers/contracts.test.ts b/packages/core/src/info-base/resolvers/contracts.test.ts
new file mode 100644
index 0000000..87b5af9
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/contracts.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, it } from 'vitest'
+
+import { Block } from '../block'
+import { Resolver } from './base'
+import {
+  CORE_RESOLVER_IDS,
+  DuplicateResolverRegistrationError,
+  type ProjectionOptions,
+  UnknownResolverError,
+  UnsupportedResolverCapability,
+} from './contracts'
+import { ImageResolver } from './image'
+import { registerCoreResolvers } from './index'
+
+class ProjectionResolver extends Resolver<string, string> {
+  static readonly type = 'tests.resolver.projection.v1'
+
+  async getText(options: ProjectionOptions = {}): Promise<string | null> {
+    const content = await this.getSolvedContent(options)
+    return content === 'supported-null' ? null : content
+  }
+
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string | null> {
+    return this.getText(options)
+  }
+}
+
+function block(content: string, resolver = ProjectionResolver.type): Block {
+  return Block.parse({ id: 17, storage: null, resolver, content })
+}
+
+describe('resolver contracts', () => {
+  it('uses exact lookup, idempotent registration, and collision rejection', () => {
+    Resolver.register(ProjectionResolver.type, ProjectionResolver)
+    expect(() => Resolver.register(ProjectionResolver.type, ProjectionResolver)).not.toThrow()
+    expect(Resolver.getClass(ProjectionResolver.type)).toBe(ProjectionResolver)
+
+    class CollisionResolver extends ProjectionResolver {}
+    Object.defineProperty(CollisionResolver, 'type', { value: ProjectionResolver.type })
+    expect(() => Resolver.register(ProjectionResolver.type, CollisionResolver)).toThrow(
+      DuplicateResolverRegistrationError
+    )
+    expect(() => Resolver.getClass('tests.resolver.unknown.v1')).toThrow(UnknownResolverError)
+  })
+
+  it('distinguishes supported-null, authored-empty, and unsupported', async () => {
+    await expect(new ProjectionResolver(block('supported-null')).getText()).resolves.toBeNull()
+    await expect(new ProjectionResolver(block('')).getText()).resolves.toBe('')
+    await expect(
+      new ImageResolver(block('inline', ImageResolver.type)).getText()
+    ).rejects.toBeInstanceOf(UnsupportedResolverCapability)
+  })
+
+  it('replaces the resolver snapshot only when refresh is explicit', async () => {
+    const source = block('first')
+    const resolver = new ProjectionResolver(source)
+
+    await expect(resolver.getSolvedContent()).resolves.toBe('first')
+    source.content = 'second'
+    await expect(resolver.getSolvedContent()).resolves.toBe('first')
+    await expect(resolver.getSolvedContent({ refresh: true })).resolves.toBe('second')
+  })
+
+  it('registers exactly the nine versioned core IDs', () => {
+    registerCoreResolvers()
+
+    for (const resolverId of CORE_RESOLVER_IDS) {
+      expect(Resolver.getClass(resolverId).type).toBe(resolverId)
+    }
+    for (const retiredId of ['text', 'html', 'image', 'video']) {
+      expect(() => Resolver.getClass(retiredId)).toThrow(UnknownResolverError)
+    }
+  })
+
+  it('matches normalized specific media types without choosing file fallback', () => {
+    registerCoreResolvers()
+
+    expect(Resolver.matchMediaType('IMAGE/PNG; charset=ignored')).toBe('core.image.v1')
+    expect(Resolver.matchMediaType('application/pdf')).toBe('core.pdf.v1')
+    expect(Resolver.matchMediaType('application/octet-stream')).toBeNull()
+    expect(Resolver.matchMediaType('application/vnd.example.unknown')).toBeNull()
+  })
+})
diff --git a/packages/core/src/info-base/resolvers/contracts.ts b/packages/core/src/info-base/resolvers/contracts.ts
new file mode 100644
index 0000000..fd0029d
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/contracts.ts
@@ -0,0 +1,60 @@
+export const CORE_RESOLVER_IDS = [
+  'core.text.v1',
+  'core.html.v1',
+  'core.image.v1',
+  'core.audio.v1',
+  'core.video.v1',
+  'core.pdf.v1',
+  'core.epub.v1',
+  'core.zip.v1',
+  'core.file.v1',
+] as const
+
+export type CoreResolverId = (typeof CORE_RESOLVER_IDS)[number]
+
+export type ProjectionOptions = {
+  refresh?: boolean
+  materializeMissing?: boolean
+}
+
+export class ResolverContractError extends Error {}
+
+export class ResolverContentError extends ResolverContractError {
+  constructor(
+    readonly resolverId: string,
+    readonly reason: string
+  ) {
+    super(`Resolver ${resolverId} rejected content: ${reason}.`)
+    this.name = 'ResolverContentError'
+  }
+}
+
+export class UnknownResolverError extends ResolverContractError {
+  constructor(readonly resolverId: string) {
+    super(`Unknown resolver ID: ${resolverId}`)
+    this.name = 'UnknownResolverError'
+  }
+}
+
+export class DuplicateResolverRegistrationError extends ResolverContractError {
+  constructor(
+    readonly resolverId: string,
+    readonly existing: string,
+    readonly attempted: string
+  ) {
+    super(
+      `Resolver ID ${resolverId} is already registered by ${existing}; cannot register ${attempted}.`
+    )
+    this.name = 'DuplicateResolverRegistrationError'
+  }
+}
+
+export class UnsupportedResolverCapability extends ResolverContractError {
+  constructor(
+    readonly resolverId: string,
+    readonly capability: string
+  ) {
+    super(`Resolver ${resolverId} does not support ${capability}.`)
+    this.name = 'UnsupportedResolverCapability'
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/decode.ts b/packages/core/src/info-base/resolvers/decode.ts
new file mode 100644
index 0000000..9c99236
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/decode.ts
@@ -0,0 +1,43 @@
+import { ResolverContentError } from './contracts'
+
+const UTF8_BOM = [0xef, 0xbb, 0xbf]
+const UTF16_LE_BOM = [0xff, 0xfe]
+const UTF16_BE_BOM = [0xfe, 0xff]
+
+function startsWith(content: Uint8Array, prefix: number[]): boolean {
+  return prefix.every((byte, index) => content[index] === byte)
+}
+
+function decodeStrict(content: Uint8Array, encoding: string, resolverId: string): string {
+  try {
+    return new TextDecoder(encoding, { fatal: true }).decode(content)
+  } catch {
+    throw new ResolverContentError(resolverId, `invalid ${encoding} text`)
+  }
+}
+
+export function decodeUnicode(content: string | Uint8Array, resolverId: string): string {
+  if (typeof content === 'string') return content
+  if (startsWith(content, UTF8_BOM)) return decodeStrict(content, 'utf-8', resolverId)
+  if (startsWith(content, UTF16_LE_BOM)) return decodeStrict(content, 'utf-16le', resolverId)
+  if (startsWith(content, UTF16_BE_BOM)) return decodeStrict(content, 'utf-16be', resolverId)
+  return decodeStrict(content, 'utf-8', resolverId)
+}
+
+export function decodeHtml(content: string | Uint8Array, resolverId: string): string {
+  if (typeof content === 'string') return content
+  if (
+    startsWith(content, UTF8_BOM) ||
+    startsWith(content, UTF16_LE_BOM) ||
+    startsWith(content, UTF16_BE_BOM)
+  ) {
+    return decodeUnicode(content, resolverId)
+  }
+
+  const prefix = new TextDecoder('ascii').decode(content.slice(0, 4096))
+  const declared =
+    /<meta\s+[^>]*charset\s*=\s*["']?\s*([a-zA-Z0-9._-]+)/i.exec(prefix)?.[1] ??
+    /<meta\s+[^>]*content\s*=\s*["'][^"']*charset=([a-zA-Z0-9._-]+)/i.exec(prefix)?.[1] ??
+    'utf-8'
+  return decodeStrict(content, declared, resolverId)
+}
diff --git a/packages/core/src/info-base/resolvers/epub.ts b/packages/core/src/info-base/resolvers/epub.ts
new file mode 100644
index 0000000..b8d5bc0
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/epub.ts
@@ -0,0 +1,46 @@
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
+import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
+
+export interface EpubSolvedContent extends ByteSolvedContent {
+  epub_version: string | null
+  title: string | null
+  creators: string[] | null
+  languages: string[] | null
+  modified_at: Date | null
+  manifest_count: number | null
+  spine_count: number | null
+  has_navigation: boolean | null
+}
+
+export class EpubResolver extends Resolver<Uint8Array, EpubSolvedContent> {
+  static readonly type = 'core.epub.v1'
+  private readonly actualContent = new ActualContentHandle()
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<EpubSolvedContent> {
+    const rawContent = await this.getRawContent(options)
+    return {
+      ...this.actualContent.replace(rawContent, 'application/epub+zip'),
+      epub_version: null,
+      title: null,
+      creators: null,
+      languages: null,
+      modified_at: null,
+      manifest_count: null,
+      spine_count: null,
+      has_navigation: null,
+    }
+  }
+
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(EpubResolver.type, 'text')
+  }
+
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(EpubResolver.type, 'embedding text')
+  }
+
+  async dispose(): Promise<void> {
+    this.actualContent.dispose()
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/file.ts b/packages/core/src/info-base/resolvers/file.ts
new file mode 100644
index 0000000..ae50a4a
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/file.ts
@@ -0,0 +1,26 @@
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
+import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
+
+export type FileSolvedContent = ByteSolvedContent
+
+export class FileResolver extends Resolver<Uint8Array, FileSolvedContent> {
+  static readonly type = 'core.file.v1'
+  private readonly actualContent = new ActualContentHandle()
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<FileSolvedContent> {
+    return this.actualContent.replace(await this.getRawContent(options))
+  }
+
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(FileResolver.type, 'text')
+  }
+
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(FileResolver.type, 'embedding text')
+  }
+
+  async dispose(): Promise<void> {
+    this.actualContent.dispose()
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/html.ts b/packages/core/src/info-base/resolvers/html.ts
index 25dc4f3..85c6c68 100644
--- a/packages/core/src/info-base/resolvers/html.ts
+++ b/packages/core/src/info-base/resolvers/html.ts
@@ -2,31 +2,36 @@
  * Core HTML Resolver
  *
  * Handles HTML content from various sources.
- * Apps must extend this class and provide contentComp Vue component.
+ * Apps bind a presentation-neutral solved-content renderer.
  */
 
 import { Resolver } from './base'
+import type { ProjectionOptions } from './contracts'
+import { decodeHtml } from './decode'
 
-export interface HtmlContent {
-  html: string
-  sourceUrl: string
-  title?: string
-}
-
-export type HtmlRawContent = string | HtmlContent
+export type HtmlRawContent = string | Uint8Array
 
 /**
  * Abstract HTML resolver with logic implementation.
- * Apps must extend and provide contentComp.
+ * Apps bind the renderer without changing this Resolver contract.
  */
-export class HtmlResolver extends Resolver<HtmlRawContent> {
-  static readonly type = 'html'
+export class HtmlResolver extends Resolver<HtmlRawContent, string> {
+  static readonly type = 'core.html.v1'
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<string> {
+    return decodeHtml(await this.getRawContent(options), HtmlResolver.type)
+  }
 
-  static {
-    Resolver.register('html', this)
+  async getText(options: ProjectionOptions = {}): Promise<string> {
+    const source = await this.getSolvedContent(options)
+    const text =
+      typeof DOMParser === 'undefined'
+        ? source.replace(/<[^>]+>/g, ' ')
+        : (new DOMParser().parseFromString(source, 'text/html').body.textContent ?? '')
+    return text.replace(/\s+/g, ' ').trim()
   }
 
-  protected async _getSolvedContent(): Promise<HtmlRawContent> {
-    return this.getRawContent()
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string> {
+    return this.getText(options)
   }
 }
diff --git a/packages/core/src/info-base/resolvers/image.ts b/packages/core/src/info-base/resolvers/image.ts
index 7546c07..a4df7b8 100644
--- a/packages/core/src/info-base/resolvers/image.ts
+++ b/packages/core/src/info-base/resolvers/image.ts
@@ -1,41 +1,38 @@
-/**
- * Core Image Resolver
- *
- * Handles image content from various sources.
- * Converts Blob to Object URL for display.
- * Apps must extend this class and provide contentComp Vue component.
- */
-
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
 import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
+
+export interface ImageSolvedContent extends ByteSolvedContent {
+  format: string | null
+  width: number | null
+  height: number | null
+  frame_count: number | null
+}
 
-/**
- * Abstract image resolver with logic implementation.
- * Expects raw content to be Blob, solved content to be Object URL.
- * Apps must extend and provide contentComp.
- */
-export class ImageResolver extends Resolver<Blob, string> {
-  static readonly type = 'image'
-  protected _objectUrl: string | null = null
+export class ImageResolver extends Resolver<Uint8Array, ImageSolvedContent> {
+  static readonly type = 'core.image.v1'
+  private readonly actualContent = new ActualContentHandle()
 
-  static {
-    Resolver.register('image', this)
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<ImageSolvedContent> {
+    const rawContent = await this.getRawContent(options)
+    return {
+      ...this.actualContent.replace(rawContent),
+      format: null,
+      width: null,
+      height: null,
+      frame_count: null,
+    }
   }
 
-  protected async _getSolvedContent(): Promise<string> {
-    const rawContent = await this.getRawContent()
-    this._objectUrl = URL.createObjectURL(rawContent)
-    return this._objectUrl
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(ImageResolver.type, 'text')
+  }
+
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(ImageResolver.type, 'embedding text')
   }
 
-  /**
-   * ObjectURL requires explicit revocation to free memory.
-   * Check `chrome://blob-internals/` to see active Blob URLs.
-   * Run `fetch(_objectUrl)` to confirm revocation.
-   */
   async dispose(): Promise<void> {
-    if (this._objectUrl) {
-      URL.revokeObjectURL(this._objectUrl)
-      this._objectUrl = null
-    }
+    this.actualContent.dispose()
   }
 }
diff --git a/packages/core/src/info-base/resolvers/index.ts b/packages/core/src/info-base/resolvers/index.ts
index bde1013..19d6776 100644
--- a/packages/core/src/info-base/resolvers/index.ts
+++ b/packages/core/src/info-base/resolvers/index.ts
@@ -4,14 +4,58 @@ export {
   Resolver,
   // Protocol interfaces
   type ResolverContentState,
-  type ContentCompProps,
+  type SolvedContentRendererProps,
 } from './base'
 
+export {
+  CORE_RESOLVER_IDS,
+  DuplicateResolverRegistrationError,
+  ResolverContentError,
+  ResolverContractError,
+  UnknownResolverError,
+  UnsupportedResolverCapability,
+  type CoreResolverId,
+  type ProjectionOptions,
+} from './contracts'
+
 // Cache system
 export { ResolverCache } from './cache'
 
 // Concrete resolver implementations
 export { TextResolver } from './text'
-export { ImageResolver } from './image'
-export { VideoResolver, type VideoContent, type VideoRawContent } from './video'
-export { HtmlResolver, type HtmlContent, type HtmlRawContent } from './html'
+export { HtmlResolver, type HtmlRawContent } from './html'
+export { ImageResolver, type ImageSolvedContent } from './image'
+export { AudioResolver, type AudioSolvedContent } from './audio'
+export { VideoResolver, type VideoSolvedContent } from './video'
+export { PdfResolver, type PdfSolvedContent } from './pdf'
+export { EpubResolver, type EpubSolvedContent } from './epub'
+export { ZipResolver, type ZipSolvedContent } from './zip'
+export { FileResolver, type FileSolvedContent } from './file'
+export type { ByteSolvedContent } from './actual-content'
+
+import { AudioResolver } from './audio'
+import { Resolver } from './base'
+import { EpubResolver } from './epub'
+import { FileResolver } from './file'
+import { HtmlResolver } from './html'
+import { ImageResolver } from './image'
+import { PdfResolver } from './pdf'
+import { TextResolver } from './text'
+import { VideoResolver } from './video'
+import { ZipResolver } from './zip'
+
+export function registerCoreResolvers(): void {
+  for (const resolverClass of [
+    TextResolver,
+    HtmlResolver,
+    ImageResolver,
+    AudioResolver,
+    VideoResolver,
+    PdfResolver,
+    EpubResolver,
+    ZipResolver,
+    FileResolver,
+  ]) {
+    Resolver.register(resolverClass.type, resolverClass)
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/pdf.ts b/packages/core/src/info-base/resolvers/pdf.ts
new file mode 100644
index 0000000..1ebae64
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/pdf.ts
@@ -0,0 +1,40 @@
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
+import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
+
+export interface PdfSolvedContent extends ByteSolvedContent {
+  pdf_version: string | null
+  page_count: number | null
+  is_encrypted: boolean | null
+  title: string | null
+  author: string | null
+}
+
+export class PdfResolver extends Resolver<Uint8Array, PdfSolvedContent> {
+  static readonly type = 'core.pdf.v1'
+  private readonly actualContent = new ActualContentHandle()
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<PdfSolvedContent> {
+    const rawContent = await this.getRawContent(options)
+    return {
+      ...this.actualContent.replace(rawContent, 'application/pdf'),
+      pdf_version: null,
+      page_count: null,
+      is_encrypted: null,
+      title: null,
+      author: null,
+    }
+  }
+
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(PdfResolver.type, 'text')
+  }
+
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(PdfResolver.type, 'embedding text')
+  }
+
+  async dispose(): Promise<void> {
+    this.actualContent.dispose()
+  }
+}
diff --git a/packages/core/src/info-base/resolvers/semantic-content.test.ts b/packages/core/src/info-base/resolvers/semantic-content.test.ts
new file mode 100644
index 0000000..5293789
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/semantic-content.test.ts
@@ -0,0 +1,81 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { Block } from '../block'
+import { Resolver } from './base'
+import { HtmlResolver } from './html'
+import { ImageResolver } from './image'
+import { TextResolver } from './text'
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+function block(resolver: string): Block {
+  return Block.parse({ id: 41, storage: -4, resolver, content: 'opaque-pointer' })
+}
+
+describe('semantic content resolvers', () => {
+  it('decodes storage-backed text strictly and preserves authored empty text', async () => {
+    const stored = block(TextResolver.type)
+    vi.spyOn(stored, 'getHydratedContent').mockResolvedValue(
+      new TextEncoder().encode('storage text')
+    )
+
+    await expect(new TextResolver(stored).getSolvedContent()).resolves.toBe('storage text')
+    const empty = Block.parse({ id: 42, storage: null, resolver: TextResolver.type, content: '' })
+    await expect(new TextResolver(empty).getText()).resolves.toBe('')
+  })
+
+  it('decodes HTML source and derives text without rendering markup', async () => {
+    const source = block(HtmlResolver.type)
+    vi.spyOn(source, 'getHydratedContent').mockResolvedValue(
+      new TextEncoder().encode('<main>Semantic <strong>content</strong></main>')
+    )
+    const resolver = new HtmlResolver(source)
+
+    await expect(resolver.getSolvedContent()).resolves.toContain('<strong>content</strong>')
+    await expect(resolver.getText()).resolves.toContain('Semantic content')
+  })
+
+  it('owns and revokes object URLs on refresh and disposal', async () => {
+    const createObjectURL = vi
+      .fn()
+      .mockReturnValueOnce('blob:first')
+      .mockReturnValueOnce('blob:second')
+    const revokeObjectURL = vi.fn()
+    vi.stubGlobal('URL', { createObjectURL, revokeObjectURL })
+    const source = block(ImageResolver.type)
+    vi.spyOn(source, 'getHydratedContent')
+      .mockResolvedValueOnce(new Uint8Array([1]))
+      .mockResolvedValueOnce(new Uint8Array([2]))
+    const resolver = new ImageResolver(source)
+
+    await expect(resolver.getSolvedContent()).resolves.toMatchObject({
+      byte_size: 1,
+      detected_media_type: null,
+      objectUrl: 'blob:first',
+    })
+    await expect(resolver.getSolvedContent({ refresh: true })).resolves.toMatchObject({
+      byte_size: 1,
+      objectUrl: 'blob:second',
+    })
+    expect(revokeObjectURL).toHaveBeenCalledWith('blob:first')
+
+    await resolver.dispose()
+    expect(revokeObjectURL).toHaveBeenCalledWith('blob:second')
+  })
+
+  it('disposes cached resolver handles when cache entries are evicted', async () => {
+    const { ResolverCache } = await import('./cache')
+    const dispose = vi.spyOn(ImageResolver.prototype, 'dispose')
+    Resolver.register(ImageResolver.type, ImageResolver)
+    const source = block(ImageResolver.type)
+
+    await ResolverCache.getResolver(source)
+    ResolverCache.invalidate(source.id)
+
+    expect(dispose).toHaveBeenCalledOnce()
+    ResolverCache.clear()
+  })
+})
diff --git a/packages/core/src/info-base/resolvers/text.ts b/packages/core/src/info-base/resolvers/text.ts
index 26e933d..4d72574 100644
--- a/packages/core/src/info-base/resolvers/text.ts
+++ b/packages/core/src/info-base/resolvers/text.ts
@@ -2,23 +2,29 @@
  * Text Resolver
  *
  * Handles plain text content (characters, numbers, punctuation - no formatting).
- * Apps must extend this class and provide contentComp Vue component.
+ * Apps bind a presentation-neutral solved-content renderer.
  */
 
 import { Resolver } from './base'
+import type { ProjectionOptions } from './contracts'
+import { decodeUnicode } from './decode'
 
 /**
  * Abstract text resolver with logic implementation.
- * Apps must extend and provide contentComp.
+ * Apps bind the renderer without changing this Resolver contract.
  */
-export class TextResolver extends Resolver<string> {
-  static readonly type = 'text'
+export class TextResolver extends Resolver<string | Uint8Array, string> {
+  static readonly type = 'core.text.v1'
 
-  static {
-    Resolver.register('text', this)
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<string> {
+    return decodeUnicode(await this.getRawContent(options), TextResolver.type)
   }
 
-  protected async _getSolvedContent(): Promise<string> {
-    return this.getRawContent()
+  async getText(options: ProjectionOptions = {}): Promise<string> {
+    return this.getSolvedContent(options)
+  }
+
+  async getStrForEmbedding(options: ProjectionOptions = {}): Promise<string> {
+    return this.getText(options)
   }
 }
diff --git a/packages/core/src/info-base/resolvers/video.ts b/packages/core/src/info-base/resolvers/video.ts
index b9861ce..2c55f66 100644
--- a/packages/core/src/info-base/resolvers/video.ts
+++ b/packages/core/src/info-base/resolvers/video.ts
@@ -1,32 +1,42 @@
-/**
- * Core Video Resolver
- *
- * Handles video content from various sources.
- * Apps must extend this class and provide contentComp Vue component.
- */
-
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
 import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
 
-export interface VideoContent {
-  url: string
-  mimeType: string
-  thumbnailUrl?: string
+export interface VideoSolvedContent extends ByteSolvedContent {
+  container: string | null
+  video_codec: string | null
+  duration_ms: number | null
+  width: number | null
+  height: number | null
+  frame_rate: number | null
 }
 
-export type VideoRawContent = string | VideoContent
+export class VideoResolver extends Resolver<Uint8Array, VideoSolvedContent> {
+  static readonly type = 'core.video.v1'
+  private readonly actualContent = new ActualContentHandle()
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<VideoSolvedContent> {
+    const rawContent = await this.getRawContent(options)
+    return {
+      ...this.actualContent.replace(rawContent),
+      container: null,
+      video_codec: null,
+      duration_ms: null,
+      width: null,
+      height: null,
+      frame_rate: null,
+    }
+  }
 
-/**
- * Abstract video resolver with logic implementation.
- * Apps must extend and provide contentComp.
- */
-export class VideoResolver extends Resolver<VideoRawContent> {
-  static readonly type = 'video'
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(VideoResolver.type, 'text')
+  }
 
-  static {
-    Resolver.register('video', this)
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(VideoResolver.type, 'embedding text')
   }
 
-  protected async _getSolvedContent(): Promise<VideoRawContent> {
-    return this.getRawContent()
+  async dispose(): Promise<void> {
+    this.actualContent.dispose()
   }
 }
diff --git a/packages/core/src/info-base/resolvers/zip.ts b/packages/core/src/info-base/resolvers/zip.ts
new file mode 100644
index 0000000..5e091c4
--- /dev/null
+++ b/packages/core/src/info-base/resolvers/zip.ts
@@ -0,0 +1,40 @@
+import { ActualContentHandle, type ByteSolvedContent } from './actual-content'
+import { Resolver } from './base'
+import { type ProjectionOptions, UnsupportedResolverCapability } from './contracts'
+
+export interface ZipSolvedContent extends ByteSolvedContent {
+  member_count: number | null
+  total_compressed_bytes: number | null
+  total_uncompressed_bytes: number | null
+  compression_methods: number[] | null
+  encrypted_member_count: number | null
+}
+
+export class ZipResolver extends Resolver<Uint8Array, ZipSolvedContent> {
+  static readonly type = 'core.zip.v1'
+  private readonly actualContent = new ActualContentHandle()
+
+  protected async _getSolvedContent(options: ProjectionOptions): Promise<ZipSolvedContent> {
+    const rawContent = await this.getRawContent(options)
+    return {
+      ...this.actualContent.replace(rawContent, 'application/zip'),
+      member_count: null,
+      total_compressed_bytes: null,
+      total_uncompressed_bytes: null,
+      compression_methods: null,
+      encrypted_member_count: null,
+    }
+  }
+
+  async getText(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(ZipResolver.type, 'text')
+  }
+
+  async getStrForEmbedding(_options: ProjectionOptions = {}): Promise<never> {
+    throw new UnsupportedResolverCapability(ZipResolver.type, 'embedding text')
+  }
+
+  async dispose(): Promise<void> {
+    this.actualContent.dispose()
+  }
+}
diff --git a/packages/core/src/info-base/router.ts b/packages/core/src/info-base/router.ts
new file mode 100644
index 0000000..a16738f
--- /dev/null
+++ b/packages/core/src/info-base/router.ts
@@ -0,0 +1,27 @@
+import type { DeepReadonly, Ref } from 'vue'
+
+import type { BlockRef } from './block'
+
+export type InfoBaseRoute =
+  | { name: 'overview' }
+  | { name: 'block'; block: BlockRef }
+  | { name: 'solved-content'; block: BlockRef }
+
+export interface InfoBaseRouter {
+  readonly current: DeepReadonly<Ref<InfoBaseRoute | null>>
+  push(route: InfoBaseRoute): void | Promise<void>
+  back(): void | Promise<void>
+}
+
+let implementation: InfoBaseRouter | null = null
+
+export function setInfoBaseRouter(router: InfoBaseRouter): void {
+  implementation = router
+}
+
+export function getInfoBaseRouter(): InfoBaseRouter {
+  if (!implementation) {
+    throw new Error('InfoBaseRouter is not configured. Call setInfoBaseRouter() first.')
+  }
+  return implementation
+}
diff --git a/packages/core/src/info-base/storages/base.ts b/packages/core/src/info-base/storages/base.ts
index 8637e2a..5e1590b 100644
--- a/packages/core/src/info-base/storages/base.ts
+++ b/packages/core/src/info-base/storages/base.ts
@@ -1,8 +1,8 @@
 /**
  * Info-Base Storage System
  *
- * Storages provide a unified interface to retrieve "real" content from block.content.
- * For example, HttpImageStorage fetches image bytes from a URL stored in block.content.
+ * Storages turn an opaque block pointer into bytes. Semantic interpretation belongs
+ * to the block resolver rather than a storage implementation.
  *
  * This module defines the Storage class with DB integration and registry pattern.
  */
@@ -65,7 +65,7 @@ export class StorageType extends Z.class({
 /**
  * Storage class - provides registry pattern, interface, and DB persistence.
  *
- * Subclasses implement _getRawContent to provide type-specific content retrieval.
+ * Subclasses implement _getRawContent to provide mechanics-specific byte retrieval.
  *
  * @template RawContentT - The type of content this storage returns
  */
@@ -142,21 +142,6 @@ export class Storage<RawContentT = unknown> {
     })
   }
 
-  /**
-   * Retrieve raw content for a block using its storage configuration.
-   * If block has no storage, returns block.content as passthrough.
-   *
-   * @param block - The block to retrieve content for
-   * @returns The raw content (type depends on storage handler)
-   */
-  static async fetchRawContent(block: IStorageBlock): Promise<unknown> {
-    if (block.storage === null || block.storage === undefined) {
-      return block.content
-    }
-    const storage = await Storage.get(block.storage)
-    return storage.getRawContent(block)
-  }
-
   // ============================================================================
   // Constructor
   // ============================================================================
@@ -191,12 +176,22 @@ export class Storage<RawContentT = unknown> {
   /**
    * Internal method to retrieve raw content.
    * Subclasses override this to provide type-specific content retrieval.
-   * Base implementation returns block.content as passthrough.
+   * Base instances are catalog projections and cannot hydrate block content.
    *
    * @param block - The block to retrieve content for
    * @returns The raw content
    */
   protected async _getRawContent(block: IStorageBlock): Promise<RawContentT> {
-    return block.content as RawContentT
+    throw new Error(
+      `Storage type ${this.type} does not implement byte hydration for block ${block.id}.`
+    )
   }
 }
+
+export abstract class WritableStorage<RawContentT> extends Storage<RawContentT> {
+  abstract createRawContent(content: RawContentT): Promise<string>
+
+  abstract updateRawContent(blockContent: string, content: RawContentT): Promise<boolean>
+
+  abstract deleteRawContent(blockContent: string): Promise<boolean>
+}
diff --git a/packages/core/src/info-base/storages/http.test.ts b/packages/core/src/info-base/storages/http.test.ts
new file mode 100644
index 0000000..9bc35db
--- /dev/null
+++ b/packages/core/src/info-base/storages/http.test.ts
@@ -0,0 +1,41 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { StorageContentTooLargeError, HttpStorage } from './http'
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+function storage(maximumBytes: number): HttpStorage {
+  return new HttpStorage({
+    id: -1,
+    type: 'http',
+    config: { max_response_bytes: maximumBytes },
+  })
+}
+
+describe('HttpStorage', () => {
+  it('returns opaque response bytes', async () => {
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(new Uint8Array([1, 2, 3]))))
+
+    await expect(
+      storage(3).getRawContent({ id: 1, storage: -1, content: 'https://example.test/file' })
+    ).resolves.toEqual(new Uint8Array([1, 2, 3]))
+  })
+
+  it('enforces the configured response limit', async () => {
+    vi.stubGlobal(
+      'fetch',
+      vi
+        .fn()
+        .mockResolvedValue(
+          new Response(new Uint8Array([1, 2, 3]), { headers: { 'Content-Length': '3' } })
+        )
+    )
+
+    await expect(
+      storage(2).getRawContent({ id: 1, storage: -1, content: 'https://example.test/file' })
+    ).rejects.toBeInstanceOf(StorageContentTooLargeError)
+  })
+})
diff --git a/packages/core/src/info-base/storages/http.ts b/packages/core/src/info-base/storages/http.ts
index b28c626..b5c12f1 100644
--- a/packages/core/src/info-base/storages/http.ts
+++ b/packages/core/src/info-base/storages/http.ts
@@ -1,241 +1,83 @@
-/**
- * HTTP-based Storage Handlers
- *
- * These handlers fetch content from URLs stored in block.content.
- */
-
 import { Storage, type IStorageBlock } from './base'
 
-// ============================================================================
-// HTTP Storage Configuration
-// ============================================================================
-
-export interface HttpStorageConfig {
-  timeout?: number // Request timeout in ms (default: 30000)
-  followRedirects?: boolean // Whether to follow redirects (default: true)
+export type HttpStorageConfig = {
+  timeout?: number
+  follow_redirects?: boolean
+  max_response_bytes?: number
 }
 
-const DEFAULT_TIMEOUT = 30000
+const DEFAULT_TIMEOUT_SECONDS = 30
+const DEFAULT_MAX_RESPONSE_BYTES = 64 * 1024 * 1024
 
-// ============================================================================
-// Base HTTP Storage
-// ============================================================================
+export class StorageContentTooLargeError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'StorageContentTooLargeError'
+  }
+}
 
-/**
- * Base class for HTTP-based storage handlers.
- * Provides common URL fetching functionality.
- */
-export abstract class HttpStorage<ContentT = unknown> extends Storage<ContentT> {
-  protected abstract readonly acceptHeader: string
+function positiveNumber(value: unknown, fallback: number): number {
+  return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : fallback
+}
 
-  /**
-   * Fetch content from URL with configured options.
-   */
-  protected async fetchUrl(url: string, config?: HttpStorageConfig): Promise<Response> {
-    const timeout = config?.timeout ?? DEFAULT_TIMEOUT
+/** Fetch opaque bytes over HTTP(S) without assigning content semantics. */
+export class HttpStorage extends Storage<Uint8Array> {
+  protected async _getRawContent(block: IStorageBlock): Promise<Uint8Array> {
+    const url = block.content.trim()
+    const parsedUrl = new URL(url)
+    if (!['http:', 'https:'].includes(parsedUrl.protocol)) {
+      throw new TypeError('HTTP storage pointer must use http:// or https://')
+    }
 
+    const config = this.config as HttpStorageConfig
+    const timeoutSeconds = positiveNumber(config.timeout, DEFAULT_TIMEOUT_SECONDS)
+    const maximumBytes = positiveNumber(config.max_response_bytes, DEFAULT_MAX_RESPONSE_BYTES)
     const controller = new AbortController()
-    const timeoutId = setTimeout(() => controller.abort(), timeout)
+    const timeoutId = setTimeout(() => controller.abort(), timeoutSeconds * 1000)
 
     try {
-      const response = await fetch(url, {
+      const response = await fetch(parsedUrl, {
         signal: controller.signal,
-        headers: {
-          Accept: this.acceptHeader,
-        },
-        redirect: config?.followRedirects !== false ? 'follow' : 'manual',
+        redirect: config.follow_redirects === false ? 'manual' : 'follow',
       })
-
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`)
       }
 
-      return response
-    } finally {
-      clearTimeout(timeoutId)
-    }
-  }
-}
-
-// ============================================================================
-// HTTP Image Storage
-// ============================================================================
-
-/**
- * Fetches image content from (http/https) URL.
- * Returns Blob.
- */
-export class HttpImageStorage extends HttpStorage<Blob> {
-  protected readonly acceptHeader = 'image/*'
-
-  protected async _getRawContent(block: IStorageBlock): Promise<Blob> {
-    const url = block.content.trim()
-    const response = await this.fetchUrl(url)
-    return await response.blob()
-  }
-
-  /** Base64 encoded image data */
-  public blobToDataUrl(blob: Blob): Promise<string> {
-    return new Promise((resolve, reject) => {
-      const reader = new FileReader()
-      reader.onloadend = () => resolve(reader.result as string)
-      reader.onerror = reject
-      reader.readAsDataURL(blob)
-    })
-  }
-}
-
-// ============================================================================
-// HTTP Video Storage
-// ============================================================================
-
-export interface VideoContent {
-  url: string
-  mimeType: string
-  thumbnailUrl?: string
-}
-
-/**
- * Fetches video content from URL.
- * Returns the URL for lazy loading (videos are typically streamed).
- */
-export class HttpVideoStorage extends HttpStorage<VideoContent> {
-  protected readonly acceptHeader = 'video/*'
-
-  protected async _getRawContent(block: IStorageBlock): Promise<VideoContent> {
-    const url = block.content.trim()
-
-    return {
-      url,
-      mimeType: this.inferMimeType(url),
-    }
-  }
-
-  private inferMimeType(url: string): string {
-    const ext = url.split('.').pop()?.toLowerCase().split('?')[0]
-    const mimeTypes: Record<string, string> = {
-      mp4: 'video/mp4',
-      webm: 'video/webm',
-      ogg: 'video/ogg',
-      ogv: 'video/ogg',
-      avi: 'video/x-msvideo',
-      mov: 'video/quicktime',
-      mkv: 'video/x-matroska',
-    }
-    return mimeTypes[ext || ''] || 'video/unknown'
-  }
-}
-
-// ============================================================================
-// HTTP Text Storage
-// ============================================================================
-
-export interface TextContent {
-  text: string
-  encoding?: string
-}
-
-/**
- * Fetches plain text content from URL.
- */
-export class HttpTextStorage extends HttpStorage<TextContent> {
-  protected readonly acceptHeader = 'text/plain'
-
-  protected async _getRawContent(block: IStorageBlock): Promise<TextContent> {
-    const url = block.content.trim()
-
-    const response = await this.fetchUrl(url)
-    const text = await response.text()
-    const encoding = response.headers.get('content-type')?.match(/charset=([^;]+)/)?.[1] || 'utf-8'
-
-    return {
-      text,
-      encoding,
-    }
-  }
-}
-
-// ============================================================================
-// HTTP HTML Storage
-// ============================================================================
-
-export interface HtmlContent {
-  html: string
-  sourceUrl: string
-  title?: string
-}
-
-/**
- * Fetches HTML content from URL.
- * Optionally extracts title and sanitizes content.
- */
-export class HttpHtmlStorage extends HttpStorage<HtmlContent> {
-  protected readonly acceptHeader = 'text/html'
-
-  protected async _getRawContent(block: IStorageBlock): Promise<HtmlContent> {
-    const url = block.content.trim()
-
-    const response = await this.fetchUrl(url)
-    let html = await response.text()
-
-    // Extract title
-    const titleMatch = html.match(/<title[^>]*>([^<]+)<\/title>/i)
-    const title = titleMatch ? titleMatch[1].trim() : undefined
-
-    // Basic sanitization - remove script tags and event handlers
-    html = this.sanitizeHtml(html)
-
-    return {
-      html,
-      sourceUrl: url,
-      title,
-    }
-  }
-
-  private sanitizeHtml(html: string): string {
-    // Basic sanitization - remove script tags and event handlers
-    // In production, use a proper sanitizer like DOMPurify
-    return html
-      .replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
-      .replace(/on\w+\s*=\s*["'][^"']*["']/gi, '')
-      .replace(/on\w+\s*=\s*[^\s>]+/gi, '')
-  }
-}
-
-// ============================================================================
-// HTTP JSON Storage
-// ============================================================================
-
-export interface JsonContent {
-  data: unknown
-  sourceUrl: string
-}
-
-/**
- * Fetches JSON content from URL.
- */
-export class HttpJsonStorage extends HttpStorage<JsonContent> {
-  protected readonly acceptHeader = 'application/json'
-
-  protected async _getRawContent(block: IStorageBlock): Promise<JsonContent> {
-    const url = block.content.trim()
+      const declaredLength = Number(response.headers.get('content-length'))
+      if (Number.isFinite(declaredLength) && declaredLength > maximumBytes) {
+        throw new StorageContentTooLargeError(
+          `HTTP response declares ${declaredLength} bytes; limit is ${maximumBytes}`
+        )
+      }
 
-    const response = await this.fetchUrl(url)
-    const data = await response.json()
+      if (!response.body) return new Uint8Array(await response.arrayBuffer())
+
+      const reader = response.body.getReader()
+      const chunks: Uint8Array[] = []
+      let received = 0
+      while (true) {
+        const { value, done } = await reader.read()
+        if (done) break
+        received += value.byteLength
+        if (received > maximumBytes) {
+          await reader.cancel()
+          throw new StorageContentTooLargeError(`HTTP response exceeded ${maximumBytes} bytes`)
+        }
+        chunks.push(value)
+      }
 
-    return {
-      data,
-      sourceUrl: url,
+      const content = new Uint8Array(received)
+      let offset = 0
+      for (const chunk of chunks) {
+        content.set(chunk, offset)
+        offset += chunk.byteLength
+      }
+      return content
+    } finally {
+      clearTimeout(timeoutId)
     }
   }
 }
 
-// ============================================================================
-// Register all HTTP storage handlers
-// ============================================================================
-
-Storage.register('http_image', HttpImageStorage)
-Storage.register('http_video', HttpVideoStorage)
-Storage.register('http_text', HttpTextStorage)
-Storage.register('http_html', HttpHtmlStorage)
-Storage.register('http_json', HttpJsonStorage)
+Storage.register('http', HttpStorage)
diff --git a/packages/core/src/info-base/storages/index.ts b/packages/core/src/info-base/storages/index.ts
index c78567d..207eba0 100644
--- a/packages/core/src/info-base/storages/index.ts
+++ b/packages/core/src/info-base/storages/index.ts
@@ -1,6 +1,7 @@
 // Base storage classes and types
 export {
   Storage,
+  WritableStorage,
   StorageType,
   type StorageTypeRef,
   StorageTypeRefZ,
@@ -10,16 +11,6 @@ export {
 } from './base'
 
 // HTTP storage implementations
-export {
-  HttpStorage,
-  HttpImageStorage,
-  HttpVideoStorage,
-  HttpTextStorage,
-  HttpHtmlStorage,
-  HttpJsonStorage,
-  type HttpStorageConfig,
-  type VideoContent,
-  type TextContent,
-  type HtmlContent,
-  type JsonContent,
-} from './http'
+export { HttpStorage, StorageContentTooLargeError, type HttpStorageConfig } from './http'
+
+export { PostgreSQLBinaryStorage, type PostgreSQLBlobPointer } from './postgresql'
diff --git a/packages/core/src/info-base/storages/postgresql.test.ts b/packages/core/src/info-base/storages/postgresql.test.ts
new file mode 100644
index 0000000..c29f2a5
--- /dev/null
+++ b/packages/core/src/info-base/storages/postgresql.test.ts
@@ -0,0 +1,71 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { authStore } from '../../auth'
+import { configStore } from '../../config'
+import { PostgreSQLBinaryStorage } from './postgresql'
+
+const BLOB_ID = '00000000-0000-4000-8000-000000000017'
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+  configStore.metaConfig.INKCRE_PGREST_URL = ''
+})
+
+function storage(): PostgreSQLBinaryStorage {
+  return new PostgreSQLBinaryStorage({
+    id: -4,
+    type: 'postgresql_binary',
+    config: {},
+  })
+}
+
+describe('PostgreSQLBinaryStorage', () => {
+  it('uses raw RPC create/read and row-exact update/delete', async () => {
+    configStore.metaConfig.INKCRE_PGREST_URL = 'https://database.example.test/'
+    vi.spyOn(authStore, 'getToken').mockResolvedValue('peer-token')
+    const requests: Array<{ url: URL; init: RequestInit }> = []
+    vi.stubGlobal(
+      'fetch',
+      vi.fn().mockImplementation(async (input: URL | RequestInfo, init: RequestInit = {}) => {
+        const url = new URL(input.toString())
+        requests.push({ url, init })
+        if (url.pathname.endsWith('/rpc/create_storage_blob')) {
+          return new Response(JSON.stringify(BLOB_ID), {
+            headers: { 'Content-Type': 'application/json' },
+          })
+        }
+        if (url.pathname.endsWith('/rpc/read_storage_blob')) {
+          return new Response(new Uint8Array([7, 8, 9]), {
+            headers: { 'Content-Type': 'application/octet-stream' },
+          })
+        }
+        if (init.method === 'PATCH' || init.method === 'DELETE') {
+          return new Response(JSON.stringify([{ id: BLOB_ID }]), {
+            headers: { 'Content-Type': 'application/json' },
+          })
+        }
+        throw new Error(`unexpected request: ${init.method} ${url}`)
+      })
+    )
+    const handler = storage()
+
+    const pointer = await handler.createRawContent(new Uint8Array([1, 2]))
+    expect(pointer).toBe(`{"blob_id":"${BLOB_ID}"}`)
+    await expect(handler.getRawContent({ id: 17, storage: -4, content: pointer })).resolves.toEqual(
+      new Uint8Array([7, 8, 9])
+    )
+    await expect(handler.updateRawContent(pointer, new Uint8Array([10, 255]))).resolves.toBe(true)
+    await expect(handler.deleteRawContent(pointer)).resolves.toBe(true)
+
+    expect(requests).toHaveLength(4)
+    expect(new Headers(requests[0].init.headers).get('Content-Type')).toBe(
+      'application/octet-stream'
+    )
+    expect(new Headers(requests[0].init.headers).get('Authorization')).toBe('Bearer peer-token')
+    expect(new Headers(requests[1].init.headers).get('Accept')).toBe('application/octet-stream')
+    expect(requests[2].url.searchParams.get('id')).toBe(`eq.${BLOB_ID}`)
+    expect(requests[2].init.body).toBe(JSON.stringify({ data: '\\x0aff' }))
+    expect(requests[3].url.searchParams.get('id')).toBe(`eq.${BLOB_ID}`)
+  })
+})
diff --git a/packages/core/src/info-base/storages/postgresql.ts b/packages/core/src/info-base/storages/postgresql.ts
new file mode 100644
index 0000000..1622ee4
--- /dev/null
+++ b/packages/core/src/info-base/storages/postgresql.ts
@@ -0,0 +1,78 @@
+import { z } from 'zod'
+
+import { APIError, DBAPIClient, rawPostgrestFetch } from '../../base/db-api'
+import { Storage, WritableStorage, type IStorageBlock } from './base'
+
+const PostgreSQLBlobPointerSchema = z.object({
+  blob_id: z.uuid(),
+})
+
+export type PostgreSQLBlobPointer = z.infer<typeof PostgreSQLBlobPointerSchema>
+
+function parsePointer(blockContent: string): PostgreSQLBlobPointer {
+  return PostgreSQLBlobPointerSchema.parse(JSON.parse(blockContent))
+}
+
+function serializePointer(pointer: PostgreSQLBlobPointer): string {
+  return JSON.stringify(PostgreSQLBlobPointerSchema.parse(pointer))
+}
+
+function postgresBytea(content: Uint8Array): string {
+  let hexadecimal = '\\x'
+  for (const byte of content) hexadecimal += byte.toString(16).padStart(2, '0')
+  return hexadecimal
+}
+
+/** PostgreSQL/PostgREST peer-local byte storage with a stable UUID pointer. */
+export class PostgreSQLBinaryStorage extends WritableStorage<Uint8Array> {
+  private static blobApi = new DBAPIClient<'storage_blobs'>('storage_blobs')
+
+  protected async _getRawContent(block: IStorageBlock): Promise<Uint8Array> {
+    const pointer = parsePointer(block.content)
+    const response = await rawPostgrestFetch('/rpc/read_storage_blob', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/octet-stream',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(pointer),
+    })
+    return new Uint8Array(await response.arrayBuffer())
+  }
+
+  async createRawContent(content: Uint8Array): Promise<string> {
+    const response = await rawPostgrestFetch('/rpc/create_storage_blob', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/octet-stream',
+      },
+      body: Uint8Array.from(content).buffer as ArrayBuffer,
+    })
+    const blobId = z.uuid().parse(await response.json())
+    return serializePointer({ blob_id: blobId })
+  }
+
+  async updateRawContent(blockContent: string, content: Uint8Array): Promise<boolean> {
+    const pointer = parsePointer(blockContent)
+    const { data, error } = await PostgreSQLBinaryStorage.blobApi
+      .update({ data: postgresBytea(content) })
+      .eq('id', pointer.blob_id)
+      .select('id')
+    if (error) throw new APIError(error.message, 400, error)
+    return data?.length === 1
+  }
+
+  async deleteRawContent(blockContent: string): Promise<boolean> {
+    const pointer = parsePointer(blockContent)
+    const { data, error } = await PostgreSQLBinaryStorage.blobApi
+      .from()
+      .delete()
+      .eq('id', pointer.blob_id)
+      .select('id')
+    if (error) throw new APIError(error.message, 400, error)
+    return data?.length === 1
+  }
+}
+
+Storage.register('postgresql_binary', PostgreSQLBinaryStorage)
diff --git a/packages/core/src/job/index.ts b/packages/core/src/job/index.ts
new file mode 100644
index 0000000..4e89870
--- /dev/null
+++ b/packages/core/src/job/index.ts
@@ -0,0 +1,2 @@
+export * from './job'
+export * from './manager'
diff --git a/packages/core/src/job/job.ts b/packages/core/src/job/job.ts
new file mode 100644
index 0000000..b4f5795
--- /dev/null
+++ b/packages/core/src/job/job.ts
@@ -0,0 +1,95 @@
+import { z } from 'zod'
+import { Z } from 'zod-class'
+import { DBAPIClient } from '../base/db-api'
+
+export const JobStatus = {
+  PENDING: 'pending',
+  RUNNING: 'running',
+  FINISHED: 'finished',
+  FAILED: 'failed',
+  TIMED_OUT: 'timed_out',
+  ABORTED: 'aborted',
+} as const
+export type JobStatusValue = (typeof JobStatus)[keyof typeof JobStatus]
+
+export type JobRef = number
+export const JobRefSchema = z.number().int()
+export type JobTypeRef = string
+
+const JsonObjectSchema = z.record(z.string(), z.unknown())
+
+export class JobType extends Z.class({
+  id: z.string(),
+  description: z.string(),
+  parameters_schema: JsonObjectSchema,
+  default_timeout_seconds: z.number().int().positive(),
+}) {
+  static dbApi = new DBAPIClient<'job_types', JobType>('job_types', JobType)
+
+  static async get(id: JobTypeRef): Promise<JobType> {
+    return JobType.parse((await this.dbApi.from().select().eq('id', id).single()).data)
+  }
+
+  static async getAll(): Promise<JobType[]> {
+    return ((await this.dbApi.from().select()).data ?? []).map((item) => JobType.parse(item))
+  }
+}
+
+export class Job extends Z.class({
+  id: JobRefSchema,
+  type: z.string(),
+  parameters: JsonObjectSchema,
+  state: JsonObjectSchema.default(() => ({})),
+  timeout_seconds: z.number().int().positive(),
+  status: z.enum([
+    JobStatus.PENDING,
+    JobStatus.RUNNING,
+    JobStatus.FINISHED,
+    JobStatus.FAILED,
+    JobStatus.TIMED_OUT,
+    JobStatus.ABORTED,
+  ]),
+  created_at: z.coerce.date(),
+  started_at: z.coerce.date().nullable(),
+  closed_at: z.coerce.date().nullable(),
+}) {
+  static dbApi = new DBAPIClient<'jobs', Job>('jobs', Job)
+
+  static async get(id: JobRef): Promise<Job> {
+    return Job.parse((await this.dbApi.from().select().eq('id', id).single()).data)
+  }
+
+  static async getAll(options: { limit?: number; status?: JobStatusValue } = {}): Promise<Job[]> {
+    let query = this.dbApi
+      .from()
+      .select()
+      .order('created_at', { ascending: false })
+      .limit(options.limit ?? 20)
+    if (options.status) query = query.eq('status', options.status)
+    return ((await query).data ?? []).map((item) => Job.parse(item))
+  }
+
+  static async getBySource(source: number, limit = 20): Promise<Job[]> {
+    const result = await this.dbApi
+      .from()
+      .select()
+      .contains('parameters', { source })
+      .order('created_at', { ascending: false })
+      .limit(limit)
+    return (result.data ?? []).map((item) => Job.parse(item))
+  }
+
+  static isTerminal(status: string): boolean {
+    const terminal: readonly string[] = [
+      JobStatus.FINISHED,
+      JobStatus.FAILED,
+      JobStatus.TIMED_OUT,
+      JobStatus.ABORTED,
+    ]
+    return terminal.includes(status)
+  }
+
+  get isTerminal(): boolean {
+    return Job.isTerminal(this.status)
+  }
+}
diff --git a/packages/core/src/job/manager.ts b/packages/core/src/job/manager.ts
new file mode 100644
index 0000000..764997b
--- /dev/null
+++ b/packages/core/src/job/manager.ts
@@ -0,0 +1,132 @@
+import { z } from 'zod'
+import { Job, JobStatus, JobType, type JobRef, type JobTypeRef } from './job'
+
+export interface JobHandler<Parameters extends z.ZodType = z.ZodType> {
+  parameters: Parameters
+  canHandle(parameters: z.output<Parameters>): boolean | Promise<boolean>
+  handle(job: Job, parameters: z.output<Parameters>, signal: AbortSignal): Promise<void>
+}
+
+export class DuplicateJobHandlerError extends Error {}
+
+export class JobManager {
+  private static handlers = new Map<JobTypeRef, JobHandler>()
+  private static active = new Set<JobRef>()
+  private static worker: ReturnType<typeof setInterval> | null = null
+
+  static registerHandler<Parameters extends z.ZodType>(
+    type: JobTypeRef,
+    handler: JobHandler<Parameters>
+  ): void {
+    const existing = this.handlers.get(type)
+    if (existing === handler) return
+    if (existing) throw new DuplicateJobHandlerError(`Job type ${type} already has a handler`)
+    this.handlers.set(type, handler)
+  }
+
+  static unregisterHandler(type: JobTypeRef): void {
+    this.handlers.delete(type)
+  }
+
+  static async create(
+    type: JobTypeRef,
+    parameters: Record<string, unknown>,
+    timeoutSeconds?: number
+  ): Promise<Job> {
+    const jobType = await JobType.get(type)
+    const handler = this.handlers.get(type)
+    const normalized = handler ? handler.parameters.parse(parameters) : parameters
+    const timeout = timeoutSeconds ?? jobType.default_timeout_seconds
+    if (!Number.isInteger(timeout) || timeout <= 0) {
+      throw new TypeError('Job timeout must be a positive number of seconds')
+    }
+    const result = await Job.dbApi
+      .insert({
+        type,
+        parameters: normalized,
+        timeout_seconds: timeout,
+        state: {},
+      })
+      .select()
+      .single()
+    return Job.parse(result.data)
+  }
+
+  private static async prepare(job: Job): Promise<[JobHandler, unknown] | null> {
+    const handler = this.handlers.get(job.type)
+    if (!handler) return null
+    const parsed = handler.parameters.safeParse(job.parameters)
+    if (!parsed.success || !(await handler.canHandle(parsed.data))) return null
+    return [handler, parsed.data]
+  }
+
+  private static async claim(job: Job): Promise<Job | null> {
+    const result = await Job.dbApi
+      .update({ status: JobStatus.RUNNING })
+      .eq('id', job.id)
+      .eq('status', JobStatus.PENDING)
+      .select()
+      .maybeSingle()
+    return result.data ? Job.parse(result.data) : null
+  }
+
+  private static async close(job: Job, status: string): Promise<boolean> {
+    const result = await Job.dbApi
+      .update({ status, state: job.state })
+      .eq('id', job.id)
+      .eq('status', JobStatus.RUNNING)
+      .select('id')
+    return (result.data?.length ?? 0) > 0
+  }
+
+  static async run(id: JobRef): Promise<boolean> {
+    if (this.active.has(id)) return false
+    const candidate = await Job.get(id)
+    const prepared = await this.prepare(candidate)
+    if (!prepared) return false
+    const claimed = await this.claim(candidate)
+    if (!claimed) return false
+
+    this.active.add(id)
+    const [handler, parameters] = prepared
+    const controller = new AbortController()
+    const timeout = setTimeout(() => controller.abort(), claimed.timeout_seconds * 1000)
+    try {
+      await handler.handle(claimed, parameters, controller.signal)
+      await this.close(
+        claimed,
+        controller.signal.aborted ? JobStatus.TIMED_OUT : JobStatus.FINISHED
+      )
+    } catch (error) {
+      claimed.state = {
+        ...claimed.state,
+        error: error instanceof Error ? error.message : String(error),
+      }
+      await this.close(claimed, controller.signal.aborted ? JobStatus.TIMED_OUT : JobStatus.FAILED)
+    } finally {
+      clearTimeout(timeout)
+      this.active.delete(id)
+    }
+    return true
+  }
+
+  static async check(): Promise<void> {
+    const pending = await Job.getAll({ status: JobStatus.PENDING, limit: 100 })
+    for (const job of pending) {
+      if (this.active.has(job.id) || !(await this.prepare(job))) continue
+      void this.run(job.id)
+    }
+  }
+
+  static startWorker(intervalMilliseconds = 30_000): void {
+    if (this.worker) return
+    void this.check()
+    this.worker = setInterval(() => void this.check(), intervalMilliseconds)
+  }
+
+  static stopWorker(): void {
+    if (!this.worker) return
+    clearInterval(this.worker)
+    this.worker = null
+  }
+}
diff --git a/packages/core/src/organization/index.ts b/packages/core/src/organization/index.ts
new file mode 100644
index 0000000..48d1a75
--- /dev/null
+++ b/packages/core/src/organization/index.ts
@@ -0,0 +1 @@
+export * from './main'
diff --git a/packages/core/src/organization/main.ts b/packages/core/src/organization/main.ts
new file mode 100644
index 0000000..eb4c45b
--- /dev/null
+++ b/packages/core/src/organization/main.ts
@@ -0,0 +1,28 @@
+import type { BlockRef } from '../info-base'
+import { type JsonValue, PeerManager, PeerProtocolResponseSchema, type PeerRef } from '../peer'
+
+export const RUMINATION_CAPABILITY = 'core.organization.rumination.v1'
+
+export class OrganizationDelegationError extends Error {}
+
+export class OrganizationManager {
+  static async ruminate(block: BlockRef, routeToPeer: PeerRef | null = null): Promise<void> {
+    const delegated = await PeerManager.delegate(
+      RUMINATION_CAPABILITY,
+      { body: { block } } as JsonValue,
+      routeToPeer
+    )
+    const response = PeerProtocolResponseSchema.safeParse(delegated)
+    if (
+      !response.success ||
+      response.data.status !== 204 ||
+      Object.prototype.hasOwnProperty.call(response.data, 'body')
+    ) {
+      throw new OrganizationDelegationError(
+        response.success
+          ? `Rumination Peer returned HTTP ${response.data.status}`
+          : 'Rumination Peer returned an invalid response'
+      )
+    }
+  }
+}
diff --git a/packages/core/src/peer/contracts.ts b/packages/core/src/peer/contracts.ts
new file mode 100644
index 0000000..da1d571
--- /dev/null
+++ b/packages/core/src/peer/contracts.ts
@@ -0,0 +1,100 @@
+import { z } from 'zod'
+
+export type JsonValue =
+  | string
+  | number
+  | boolean
+  | null
+  | { [key: string]: JsonValue }
+  | JsonValue[]
+
+export const JsonValueSchema: z.ZodType<JsonValue> = z.lazy(() =>
+  z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.null(),
+    z.array(JsonValueSchema),
+    z.record(z.string(), JsonValueSchema),
+  ])
+)
+
+export type CapabilityID = string
+export type PeerProtocolID = string
+
+export const PEER_HTTP_PROTOCOL = 'core.peer.protocol.http.v1'
+export const PEER_EXECUTION_HEADER = 'InkCre-Peer-Execution'
+export const PEER_NOT_EXECUTED = 'not-executed'
+
+export const PeerInboundInterfaceSchema = z.object({
+  protocol: z.string().min(1),
+  parameters: z.record(z.string(), JsonValueSchema),
+})
+
+export const PeerCapabilityAdvertisementSchema = z.object({
+  id: z.string().min(1),
+  inbound: PeerInboundInterfaceSchema,
+})
+
+export const PeerCapabilitySnapshotSchema = z
+  .array(PeerCapabilityAdvertisementSchema)
+  .superRefine((capabilities, context) => {
+    const ids = new Set<string>()
+    for (const capability of capabilities) {
+      if (ids.has(capability.id)) {
+        context.addIssue({
+          code: 'custom',
+          message: `Peer capability IDs must be unique: ${capability.id}`,
+        })
+      }
+      ids.add(capability.id)
+    }
+  })
+
+export type PeerCapabilityAdvertisement = z.infer<typeof PeerCapabilityAdvertisementSchema>
+
+const NormalizedMultimapSchema = z
+  .record(z.string().min(1), z.array(z.string()))
+  .superRefine((value, context) => {
+    const names = new Set<string>()
+    for (const rawName of Object.keys(value)) {
+      const name = rawName.toLowerCase()
+      if (names.has(name)) {
+        context.addIssue({
+          code: 'custom',
+          message: `normalized map contains duplicate name: ${name}`,
+        })
+      }
+      names.add(name)
+    }
+  })
+  .transform((value) =>
+    Object.fromEntries(Object.entries(value).map(([name, values]) => [name.toLowerCase(), values]))
+  )
+
+export const PeerProtocolRequestSchema = z.object({
+  query: NormalizedMultimapSchema.optional().default({}),
+  headers: NormalizedMultimapSchema.optional().default({}),
+  body: JsonValueSchema.optional(),
+})
+
+export const PeerProtocolResponseSchema = z.object({
+  status: z.number().int().min(100).max(599),
+  headers: NormalizedMultimapSchema.optional().default({}),
+  body: JsonValueSchema.optional(),
+})
+
+export type PeerProtocolRequest = z.infer<typeof PeerProtocolRequestSchema>
+export type PeerProtocolResponse = z.infer<typeof PeerProtocolResponseSchema>
+
+export interface PeerOutbound {
+  execute(payload: JsonValue): Promise<JsonValue>
+}
+
+export class PeerError extends Error {}
+export class DuplicatePeerRegistrationError extends PeerError {}
+export class CapabilityDelegationUnavailable extends PeerError {}
+export class PeerProtocolError extends PeerError {}
+export class PeerProtocolConfigurationError extends PeerProtocolError {}
+export class PeerRequestNotExecuted extends PeerProtocolError {}
+export class PeerOutcomeUnknown extends PeerProtocolError {}
diff --git a/packages/core/src/peer/http.test.ts b/packages/core/src/peer/http.test.ts
new file mode 100644
index 0000000..e943200
--- /dev/null
+++ b/packages/core/src/peer/http.test.ts
@@ -0,0 +1,99 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { authStore } from '../auth'
+import { configStore } from '../config'
+import { PEER_EXECUTION_HEADER, PeerOutcomeUnknown, PeerRequestNotExecuted } from './contracts'
+import { PeerHTTPOutbound } from './http'
+import { Peer } from './peer'
+
+const peer = Peer.parse({
+  id: '11111111-1111-4111-8111-111111111111',
+  name: 'provider',
+  labels: [],
+  config: {},
+  config_schema: {},
+  capabilities: [],
+  lease_expires_at: null,
+  created_at: '2026-01-01T00:00:00Z',
+  updated_at: '2026-01-01T00:00:00Z',
+})
+
+describe('PeerHTTPOutbound', () => {
+  beforeEach(() => {
+    configStore.peerConfig.peer_http_timeout_ms = 1000
+    authStore.token.value = 'peer-token'
+  })
+
+  it('normalizes query, headers, auth, body, and JSON response', async () => {
+    const fetcher = vi.fn(async (_input: RequestInfo | URL, _init?: RequestInit) =>
+      Response.json({ ok: true }, { status: 201, headers: { 'X-Provider': 'core-py' } })
+    )
+    const outbound = new PeerHTTPOutbound(
+      peer,
+      { method: 'post', url: 'https://peer.example.test/capability' },
+      fetcher
+    )
+
+    const result = await outbound.execute({
+      query: { tag: ['first', 'second'] },
+      headers: { 'x-domain': ['semantic-retrieval'] },
+      body: { query: 'knowledge graph' },
+    })
+
+    const [input, init] = fetcher.mock.calls[0]
+    const url = new URL(String(input))
+    const headers = new Headers(init?.headers)
+    expect(url.searchParams.getAll('tag')).toEqual(['first', 'second'])
+    expect(init?.method).toBe('POST')
+    expect(headers.get('Authorization')).toBe('Bearer peer-token')
+    expect(headers.get('X-Domain')).toBe('semantic-retrieval')
+    expect(init?.body).toBe(JSON.stringify({ query: 'knowledge graph' }))
+    expect(result).toEqual({
+      status: 201,
+      headers: { 'content-type': ['application/json'], 'x-provider': ['core-py'] },
+      body: { ok: true },
+    })
+  })
+
+  it('admits failover only after an explicit non-execution response', async () => {
+    const outbound = new PeerHTTPOutbound(
+      peer,
+      { method: 'POST', url: 'https://peer.example.test/capability' },
+      vi.fn(
+        async () =>
+          new Response(null, {
+            status: 503,
+            headers: { [PEER_EXECUTION_HEADER]: 'not-executed' },
+          })
+      )
+    )
+
+    await expect(outbound.execute({})).rejects.toBeInstanceOf(PeerRequestNotExecuted)
+  })
+
+  it('reports browser fetch rejection and response-read failure as outcome unknown', async () => {
+    const rejected = new PeerHTTPOutbound(
+      peer,
+      { method: 'POST', url: 'https://peer.example.test/capability' },
+      vi.fn(async () => {
+        throw new TypeError('Failed to fetch')
+      })
+    )
+    await expect(rejected.execute({})).rejects.toBeInstanceOf(PeerOutcomeUnknown)
+
+    const unreadable = new PeerHTTPOutbound(
+      peer,
+      { method: 'POST', url: 'https://peer.example.test/capability' },
+      vi.fn(
+        async () =>
+          ({
+            status: 200,
+            headers: new Headers(),
+            text: async () => {
+              throw new TypeError('stream interrupted')
+            },
+          }) as unknown as Response
+      )
+    )
+    await expect(unreadable.execute({})).rejects.toBeInstanceOf(PeerOutcomeUnknown)
+  })
+})
diff --git a/packages/core/src/peer/http.ts b/packages/core/src/peer/http.ts
new file mode 100644
index 0000000..15c1399
--- /dev/null
+++ b/packages/core/src/peer/http.ts
@@ -0,0 +1,136 @@
+import { z } from 'zod'
+import { authStore } from '../auth'
+import { configStore } from '../config'
+import {
+  PEER_EXECUTION_HEADER,
+  PEER_HTTP_PROTOCOL,
+  PEER_NOT_EXECUTED,
+  type JsonValue,
+  PeerOutcomeUnknown,
+  PeerProtocolConfigurationError,
+  PeerProtocolError,
+  PeerProtocolRequestSchema,
+  PeerProtocolResponseSchema,
+  PeerRequestNotExecuted,
+} from './contracts'
+import type { Peer } from './peer'
+
+const HTTP_TOKEN = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/
+const RESERVED_REQUEST_HEADERS = new Set([
+  'authorization',
+  'connection',
+  'content-length',
+  'host',
+  'keep-alive',
+  'proxy-authenticate',
+  'proxy-authorization',
+  'te',
+  'trailer',
+  'transfer-encoding',
+  'upgrade',
+])
+
+const PeerHTTPInboundParametersSchema = z.object({
+  method: z
+    .string()
+    .transform((value) => value.toUpperCase())
+    .refine((value) => HTTP_TOKEN.test(value), 'HTTP method must be one valid token'),
+  url: z.url().superRefine((value, context) => {
+    const url = new URL(value)
+    if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password || url.hash) {
+      context.addIssue({
+        code: 'custom',
+        message: 'Peer HTTP URL must be absolute HTTP(S) without credentials or fragment',
+      })
+    }
+  }),
+})
+
+type Fetch = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>
+
+export class PeerHTTPOutbound {
+  readonly protocol = PEER_HTTP_PROTOCOL
+  private readonly parameters: z.infer<typeof PeerHTTPInboundParametersSchema>
+
+  constructor(
+    private readonly peer: Peer,
+    parameters: Record<string, JsonValue>,
+    private readonly fetcher: Fetch = globalThis.fetch.bind(globalThis)
+  ) {
+    const parsed = PeerHTTPInboundParametersSchema.safeParse(parameters)
+    if (!parsed.success) {
+      throw new PeerProtocolConfigurationError(
+        `Peer ${peer.id} published invalid HTTP inbound parameters`
+      )
+    }
+    this.parameters = parsed.data
+  }
+
+  async execute(payload: JsonValue): Promise<JsonValue> {
+    const parsed = PeerProtocolRequestSchema.safeParse(payload)
+    if (!parsed.success) throw new PeerProtocolError('Invalid Peer HTTP request envelope')
+    const request = parsed.data
+    const url = new URL(this.parameters.url)
+    for (const [name, values] of Object.entries(request.query)) {
+      for (const value of values) url.searchParams.append(name, value)
+    }
+
+    const headers = new Headers()
+    for (const [name, values] of Object.entries(request.headers)) {
+      if (RESERVED_REQUEST_HEADERS.has(name)) {
+        throw new PeerProtocolError(`Peer HTTP payload attempted reserved header: ${name}`)
+      }
+      for (const value of values) headers.append(name, value)
+    }
+    headers.set('Authorization', `Bearer ${await authStore.getToken()}`)
+
+    let body: string | undefined
+    if (Object.prototype.hasOwnProperty.call(request, 'body')) {
+      body = JSON.stringify(request.body)
+      if (!headers.has('Content-Type')) headers.set('Content-Type', 'application/json')
+    }
+
+    let response: Response
+    try {
+      response = await this.fetcher(url, {
+        method: this.parameters.method,
+        headers,
+        body,
+        signal: AbortSignal.timeout(configStore.peerConfig.peer_http_timeout_ms),
+      })
+    } catch (error) {
+      throw new PeerOutcomeUnknown(
+        `Peer ${this.peer.id} dispatch may have executed: ${error instanceof Error ? error.message : 'fetch failed'}`
+      )
+    }
+
+    if (response.headers.get(PEER_EXECUTION_HEADER)?.trim().toLowerCase() === PEER_NOT_EXECUTED) {
+      throw new PeerRequestNotExecuted(`Peer ${this.peer.id} reported non-execution`)
+    }
+
+    const responseHeaders: Record<string, string[]> = {}
+    response.headers.forEach((value, name) => {
+      responseHeaders[name.toLowerCase()] = [value]
+    })
+    const responseEnvelope: Record<string, unknown> = {
+      status: response.status,
+      headers: responseHeaders,
+    }
+    let text: string
+    try {
+      text = await response.text()
+    } catch (error) {
+      throw new PeerOutcomeUnknown(
+        `Peer ${this.peer.id} response could not be read after dispatch: ${error instanceof Error ? error.message : 'response read failed'}`
+      )
+    }
+    if (text) {
+      try {
+        responseEnvelope.body = JSON.parse(text)
+      } catch {
+        throw new PeerProtocolError(`Peer ${this.peer.id} returned a non-JSON HTTP body`)
+      }
+    }
+    return PeerProtocolResponseSchema.parse(responseEnvelope) as JsonValue
+  }
+}
diff --git a/packages/core/src/peer/index.ts b/packages/core/src/peer/index.ts
new file mode 100644
index 0000000..9f6d5d4
--- /dev/null
+++ b/packages/core/src/peer/index.ts
@@ -0,0 +1,4 @@
+export * from './contracts'
+export * from './http'
+export * from './manager'
+export * from './peer'
diff --git a/packages/core/src/peer/manager.test.ts b/packages/core/src/peer/manager.test.ts
new file mode 100644
index 0000000..93ad613
--- /dev/null
+++ b/packages/core/src/peer/manager.test.ts
@@ -0,0 +1,121 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { configStore } from '../config'
+import {
+  CapabilityDelegationUnavailable,
+  PeerRequestNotExecuted,
+  type JsonValue,
+} from './contracts'
+import { PeerManager } from './manager'
+import { Peer } from './peer'
+
+const currentPeer = '00000000-0000-4000-8000-000000000001'
+const providerPeer = '11111111-1111-4111-8111-111111111111'
+const capability = 'test.semantic.v1'
+const protocol = 'test.peer.protocol.v1'
+
+function peerRow(capabilities: unknown[]) {
+  return {
+    id: providerPeer,
+    name: 'provider',
+    labels: [],
+    config: {},
+    config_schema: {},
+    capabilities,
+    lease_expires_at: '2099-01-01T00:00:00Z',
+    created_at: '2026-01-01T00:00:00Z',
+    updated_at: '2026-01-01T00:00:00Z',
+  }
+}
+
+function queryReturning(rows: unknown[]) {
+  const result = { data: rows, error: null, status: 200 }
+  const query = Promise.resolve(result) as Promise<typeof result> & {
+    select: ReturnType<typeof vi.fn>
+    gt: ReturnType<typeof vi.fn>
+    neq: ReturnType<typeof vi.fn>
+    eq: ReturnType<typeof vi.fn>
+  }
+  query.select = vi.fn(() => query)
+  query.gt = vi.fn(() => query)
+  query.neq = vi.fn(() => query)
+  query.eq = vi.fn(() => query)
+  return query
+}
+
+describe('PeerManager', () => {
+  beforeEach(() => {
+    configStore.metaConfig.INKCRE_PEER_ID = currentPeer
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('keeps builtin outbound setup idempotent', () => {
+    expect(() => {
+      PeerManager.setupBuiltinOutbounds()
+      PeerManager.setupBuiltinOutbounds()
+    }).not.toThrow()
+  })
+
+  it('delegates an unchanged payload to the exact selected Peer', async () => {
+    const query = queryReturning([
+      peerRow([
+        {
+          id: capability,
+          inbound: { protocol, parameters: { channel: 'test' } },
+        },
+      ]),
+    ])
+    vi.spyOn(Peer.dbApi, 'from').mockReturnValue(query as never)
+    let executed: JsonValue | undefined
+    PeerManager.registerOutbound(protocol, (peer, parameters) => {
+      expect(peer.id).toBe(providerPeer)
+      expect(parameters).toEqual({ channel: 'test' })
+      return {
+        execute: async (payload) => {
+          executed = payload
+          return { status: 204 }
+        },
+      }
+    })
+
+    const payload = { body: { block: 42 } }
+    await expect(PeerManager.delegate(capability, payload, providerPeer)).resolves.toEqual({
+      status: 204,
+    })
+    expect(executed).toEqual(payload)
+    expect(query.eq).toHaveBeenCalledWith('id', providerPeer)
+  })
+
+  it('does not substitute another Peer after exact-target non-execution', async () => {
+    const noExecutionProtocol = 'test.peer.protocol.non-execution.v1'
+    const query = queryReturning([
+      peerRow([
+        {
+          id: capability,
+          inbound: { protocol: noExecutionProtocol, parameters: {} },
+        },
+      ]),
+    ])
+    vi.spyOn(Peer.dbApi, 'from').mockReturnValue(query as never)
+    PeerManager.registerOutbound(noExecutionProtocol, () => ({
+      execute: async () => {
+        throw new PeerRequestNotExecuted('not executed')
+      },
+    }))
+
+    await expect(PeerManager.delegate(capability, {}, providerPeer)).rejects.toBeInstanceOf(
+      CapabilityDelegationUnavailable
+    )
+  })
+
+  it('skips malformed persisted capability snapshots at use time', async () => {
+    const query = queryReturning([peerRow([{ id: capability, inbound: null }])])
+    vi.spyOn(Peer.dbApi, 'from').mockReturnValue(query as never)
+
+    await expect(PeerManager.delegate(capability, {})).rejects.toBeInstanceOf(
+      CapabilityDelegationUnavailable
+    )
+  })
+})
diff --git a/packages/core/src/peer/manager.ts b/packages/core/src/peer/manager.ts
new file mode 100644
index 0000000..41a46f3
--- /dev/null
+++ b/packages/core/src/peer/manager.ts
@@ -0,0 +1,137 @@
+import { APIError } from '../base'
+import { configStore } from '../config'
+import { ZodError } from 'zod'
+import {
+  CapabilityDelegationUnavailable,
+  type CapabilityID,
+  DuplicatePeerRegistrationError,
+  type JsonValue,
+  type PeerOutbound,
+  PeerOutcomeUnknown,
+  PeerProtocolConfigurationError,
+  PeerRequestNotExecuted,
+} from './contracts'
+import { PeerHTTPOutbound } from './http'
+import { Peer, type PeerRef } from './peer'
+
+type PeerOutboundFactory = (peer: Peer, parameters: Record<string, JsonValue>) => PeerOutbound
+
+type Candidate = {
+  peer: Peer
+  protocol: string
+  parameters: Record<string, JsonValue>
+}
+
+const createPeerHTTPOutbound: PeerOutboundFactory = (peer, parameters) =>
+  new PeerHTTPOutbound(peer, parameters)
+
+export class PeerManager {
+  private static readonly outbounds = new Map<string, PeerOutboundFactory>()
+
+  static getCurrentPeerRef(): PeerRef {
+    const peer = configStore.metaConfig.INKCRE_PEER_ID
+    if (!peer) throw new Error('INKCRE_PEER_ID is not configured')
+    return peer
+  }
+
+  static registerOutbound(protocol: string, factory: PeerOutboundFactory): void {
+    const existing = PeerManager.outbounds.get(protocol)
+    if (existing === factory) return
+    if (existing) {
+      throw new DuplicatePeerRegistrationError(`Peer outbound ${protocol} is already registered`)
+    }
+    PeerManager.outbounds.set(protocol, factory)
+  }
+
+  static setupBuiltinOutbounds(): void {
+    PeerManager.registerOutbound('core.peer.protocol.http.v1', createPeerHTTPOutbound)
+  }
+
+  static async delegate(
+    capability: CapabilityID,
+    payload: JsonValue,
+    routeToPeer: PeerRef | null = null
+  ): Promise<JsonValue> {
+    const candidates = await PeerManager.candidates(capability, routeToPeer)
+    let attempted = 0
+    for (const candidate of candidates) {
+      const factory = PeerManager.outbounds.get(candidate.protocol)
+      if (!factory) continue
+      let outbound: PeerOutbound
+      try {
+        outbound = factory(candidate.peer, candidate.parameters)
+      } catch (error) {
+        if (error instanceof PeerProtocolConfigurationError) continue
+        throw error
+      }
+      attempted += 1
+      try {
+        return await outbound.execute(payload)
+      } catch (error) {
+        if (error instanceof PeerRequestNotExecuted) {
+          if (routeToPeer !== null) break
+          continue
+        }
+        if (error instanceof PeerOutcomeUnknown) throw error
+        throw error
+      }
+    }
+    throw new CapabilityDelegationUnavailable(
+      `No eligible Peer completed capability ${capability}; attempted=${attempted}`
+    )
+  }
+
+  static async listLive(): Promise<Peer[]> {
+    const result = await Peer.dbApi
+      .from()
+      .select()
+      .gt('lease_expires_at', 'now')
+      .order('name', { ascending: true })
+    if (result.error) throw new APIError(result.error.message, result.status, result.error)
+    return (result.data ?? []).map((row) => Peer.parse(row))
+  }
+
+  private static async candidates(
+    capability: CapabilityID,
+    routeToPeer: PeerRef | null
+  ): Promise<Candidate[]> {
+    let query = Peer.dbApi
+      .from()
+      .select()
+      .gt('lease_expires_at', 'now')
+      .neq('id', PeerManager.getCurrentPeerRef())
+    if (routeToPeer !== null) query = query.eq('id', routeToPeer)
+    const result = await query
+    if (result.error) throw new APIError(result.error.message, result.status, result.error)
+
+    const candidates: Candidate[] = []
+    for (const row of result.data ?? []) {
+      try {
+        const peer = Peer.parse(row)
+        const advertisement = peer
+          .capabilitySnapshot()
+          .find((candidate) => candidate.id === capability)
+        if (!advertisement || !PeerManager.outbounds.has(advertisement.inbound.protocol)) continue
+        candidates.push({
+          peer,
+          protocol: advertisement.inbound.protocol,
+          parameters: advertisement.inbound.parameters,
+        })
+      } catch (error) {
+        if (error instanceof ZodError) continue
+        throw error
+      }
+    }
+    return routeToPeer === null ? PeerManager.shuffled(candidates) : candidates
+  }
+
+  private static shuffled<Value>(values: Value[]): Value[] {
+    const shuffled = [...values]
+    for (let index = shuffled.length - 1; index > 0; index -= 1) {
+      const random = crypto.getRandomValues(new Uint32Array(1))[0] / 2 ** 32
+      const other = Math.floor(random * (index + 1))
+      ;[shuffled[index], shuffled[other]] = [shuffled[other], shuffled[index]]
+    }
+    return shuffled
+  }
+}
diff --git a/packages/core/src/peer/peer.ts b/packages/core/src/peer/peer.ts
new file mode 100644
index 0000000..7dfff3c
--- /dev/null
+++ b/packages/core/src/peer/peer.ts
@@ -0,0 +1,58 @@
+import { z } from 'zod'
+import { Z } from 'zod-class'
+import { DBAPIClient } from '../base'
+import { configStore } from '../config'
+import { makeObjectProp, makeStringProp } from '../utils/vue-props'
+import { PeerCapabilitySnapshotSchema } from './contracts'
+
+export type PeerRef = string
+export const PeerRefSchema = z.uuid()
+export const makePeerProp = (value?: Peer) => makeObjectProp<Peer>(value as Peer)
+export const makePeerRefProp = (value?: PeerRef) => makeStringProp<PeerRef>(value)
+
+export class Peer extends Z.class({
+  id: PeerRefSchema.default(() => crypto.randomUUID()),
+  name: z.string(),
+  labels: z.array(z.string()).default([]),
+  config: z.record(z.string(), z.unknown()).default({}),
+  config_schema: z.record(z.string(), z.unknown()).default({}),
+  capabilities: z.array(z.unknown()).default([]),
+  lease_expires_at: z.coerce.date().nullable().default(null),
+  created_at: z.coerce.date(),
+  updated_at: z.coerce.date(),
+}) {
+  static dbApi: DBAPIClient<'peers', Peer> = new DBAPIClient<'peers', Peer>('peers', Peer)
+
+  static async get(id: PeerRef): Promise<Peer> {
+    return Peer.parse((await Peer.dbApi.from().select().eq('id', id).single()).data)
+  }
+
+  static async list(): Promise<Peer[]> {
+    const result = await Peer.dbApi.from().select().order('name', { ascending: true })
+    return (result.data ?? []).map((item) => Peer.parse(item))
+  }
+
+  static async listAsOptions(): Promise<Array<{ label: string; value: PeerRef }>> {
+    return (await Peer.list()).map((peer) => ({ label: peer.name, value: peer.id }))
+  }
+
+  static async getSelf(): Promise<Peer> {
+    const peer = configStore.metaConfig.INKCRE_PEER_ID
+    if (!peer) throw new Error('INKCRE_PEER_ID is not configured')
+    return Peer.get(peer)
+  }
+
+  capabilitySnapshot() {
+    return PeerCapabilitySnapshotSchema.parse(this.capabilities)
+  }
+
+  async save(): Promise<void> {
+    await Peer.dbApi
+      .update({ name: this.name, labels: this.labels, config: this.config })
+      .eq('id', this.id)
+  }
+
+  async saveConfig(): Promise<void> {
+    await Peer.dbApi.update({ config: this.config }).eq('id', this.id)
+  }
+}
diff --git a/packages/core/src/semantic-retrieval/index.ts b/packages/core/src/semantic-retrieval/index.ts
new file mode 100644
index 0000000..48d1a75
--- /dev/null
+++ b/packages/core/src/semantic-retrieval/index.ts
@@ -0,0 +1 @@
+export * from './main'
diff --git a/packages/core/src/semantic-retrieval/main.ts b/packages/core/src/semantic-retrieval/main.ts
new file mode 100644
index 0000000..74ef634
--- /dev/null
+++ b/packages/core/src/semantic-retrieval/main.ts
@@ -0,0 +1,77 @@
+import { z } from 'zod'
+import { Block, Relation } from '../info-base'
+import { type JsonValue, PeerManager, PeerProtocolResponseSchema, type PeerRef } from '../peer'
+
+export const SEMANTIC_RETRIEVAL_CAPABILITY = 'core.semantic_retrieval.v1'
+
+export const VectorRetrievalOptionsSchema = z.object({
+  limit: z.number().int().min(1).max(100).default(20),
+  min_score: z.number().min(-1).max(1).nullable().default(null),
+  entity_types: z
+    .array(z.enum(['block', 'relation']))
+    .min(1)
+    .default(['block', 'relation']),
+})
+
+export const SemanticRetrievalRequestSchema = z.object({
+  query: z.string().trim().min(1),
+  profile: z.number().int().nullable().default(null),
+  options: VectorRetrievalOptionsSchema.default({
+    limit: 20,
+    min_score: null,
+    entity_types: ['block', 'relation'],
+  }),
+})
+
+export const SemanticRetrievalResultSchema = z.object({
+  profile: z.number().int(),
+  metric: z.literal('cosine'),
+  matches: z.array(
+    z.discriminatedUnion('type', [
+      z.object({ type: z.literal('block'), entity: Block, score: z.number().min(-1).max(1) }),
+      z.object({
+        type: z.literal('relation'),
+        entity: Relation,
+        score: z.number().min(-1).max(1),
+      }),
+    ])
+  ),
+})
+
+export type SemanticRetrievalRequest = z.input<typeof SemanticRetrievalRequestSchema>
+export type SemanticRetrievalResult = z.output<typeof SemanticRetrievalResultSchema>
+
+export class SemanticRetrievalDelegationError extends Error {}
+
+export class SemanticRetrievalManager {
+  static async retrieve(
+    request: SemanticRetrievalRequest,
+    routeToPeer: PeerRef | null = null
+  ): Promise<SemanticRetrievalResult> {
+    const normalized = SemanticRetrievalRequestSchema.parse(request)
+    const delegated = await PeerManager.delegate(
+      SEMANTIC_RETRIEVAL_CAPABILITY,
+      { body: normalized } as JsonValue,
+      routeToPeer
+    )
+    const response = PeerProtocolResponseSchema.safeParse(delegated)
+    if (
+      !response.success ||
+      response.data.status !== 200 ||
+      !Object.prototype.hasOwnProperty.call(response.data, 'body')
+    ) {
+      throw new SemanticRetrievalDelegationError(
+        response.success
+          ? `Semantic retrieval Peer returned HTTP ${response.data.status}`
+          : 'Semantic retrieval Peer returned an invalid response'
+      )
+    }
+    const result = SemanticRetrievalResultSchema.safeParse(response.data.body)
+    if (!result.success) {
+      throw new SemanticRetrievalDelegationError(
+        'Semantic retrieval Peer returned an invalid result'
+      )
+    }
+    return result.data
+  }
+}
diff --git a/packages/core/src/source/collect-at.ts b/packages/core/src/source/collect-at.ts
deleted file mode 100644
index db3fb14..0000000
--- a/packages/core/src/source/collect-at.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { z } from 'zod'
-import { Z } from 'zod-class'
-import dayjs from 'dayjs'
-
-export class CollectAt extends Z.class({
-  // 0 (Monday) to 6 (Sunday), null to run on every day
-  day_of_week: z.int().min(0).max(6).nullable().default(null),
-  // null to run on every hour
-  hour: z.int().min(0).max(23).nullable().default(null),
-  minute: z.int().min(0).max(59).default(0),
-}) {
-  static WEEKDAYS = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
-
-  static format(value: CollectAt): string {
-    const weekday = value.day_of_week === null ? 'every day' : CollectAt.WEEKDAYS[value.day_of_week]
-    const isEveryHour = value.hour === null
-    const timeDescription = isEveryHour
-      ? `every hour at minute ${value.minute}`
-      : `at ${dayjs().hour(value.hour!).minute(value.minute).format('HH:mm')}`
-    return `every ${weekday} ${timeDescription}`
-  }
-
-  /**
-   * Get day of week options as { label, value } pairs
-   * Apps can convert this to their UI framework's dropdown format
-   */
-  static get DayOfWeekOptions(): Array<{ label: string; value: number }> {
-    return [
-      { label: 'Every day', value: -1 },
-      ...CollectAt.WEEKDAYS.map((weekday, index) => ({
-        label: weekday,
-        value: index,
-      })),
-    ]
-  }
-
-  /**
-   * Get hour options as { label, value } pairs
-   * Apps can convert this to their UI framework's dropdown format
-   */
-  static get HourOptions(): Array<{ label: string; value: number }> {
-    return [
-      { label: 'every hour', value: -1 },
-      ...Array.from({ length: 24 }, (_, i) => ({
-        label: i.toString().padStart(2, '0'),
-        value: i,
-      })),
-    ]
-  }
-
-  /**
-   * Get minute options as { label, value } pairs
-   * Apps can convert this to their UI framework's dropdown format
-   */
-  static get MinuteOptions(): Array<{ label: string; value: number }> {
-    return Array.from({ length: 60 }, (_, i) => ({
-      label: i.toString().padStart(2, '0'),
-      value: i,
-    }))
-  }
-}
diff --git a/packages/core/src/source/collect-job.ts b/packages/core/src/source/collect-job.ts
deleted file mode 100644
index 29552f4..0000000
--- a/packages/core/src/source/collect-job.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { z } from 'zod'
-import { Z } from 'zod-class'
-import { DBAPIClient } from '../base/db-api'
-import { SourceRefZ, type SourceRef } from './source'
-import { Log } from '../obsrv/log'
-
-export const SourceCollectJobStatus = {
-  PENDING: 'pending',
-  RUNNING: 'running',
-  FINISHED: 'finished',
-  FAILED: 'failed',
-} as const
-
-export type SourceCollectJobRef = number
-export const SourceCollectJobRefZ = z.number()
-
-export class SourceCollectJob extends Z.class({
-  id: SourceCollectJobRefZ,
-  source: SourceRefZ,
-  created_at: z.coerce.date().default(() => new Date()),
-  started_at: z.coerce.date().nullable().default(null),
-  closed_at: z.coerce.date().nullable().default(null),
-  status: z
-    .enum([
-      SourceCollectJobStatus.PENDING,
-      SourceCollectJobStatus.RUNNING,
-      SourceCollectJobStatus.FINISHED,
-      SourceCollectJobStatus.FAILED,
-    ])
-    .default(SourceCollectJobStatus.PENDING),
-  state: z.looseObject({}).default(() => ({})),
-  config: z.looseObject({}).default(() => ({})),
-}) {
-  static dbApi: DBAPIClient<'sources_collect_jobs', SourceCollectJob> = new DBAPIClient<
-    'sources_collect_jobs',
-    SourceCollectJob
-  >('sources_collect_jobs', SourceCollectJob)
-
-  static async get(id: SourceCollectJobRef): Promise<SourceCollectJob> {
-    return SourceCollectJob.parse((await this.dbApi.from().select().eq('id', id).single()).data)
-  }
-
-  static async getBySource(
-    sourceId: SourceRef,
-    options?: {
-      limit?: number
-      offset?: number
-      order?: 'asc' | 'desc'
-    }
-  ): Promise<{ data: SourceCollectJob[]; count: number }> {
-    const { limit = 10, offset = 0, order = 'desc' } = options || {}
-    const query = this.dbApi
-      .from()
-      .select('*', { count: 'exact' })
-      .eq('source', sourceId)
-      .order('created_at', { ascending: order === 'asc' })
-      .range(offset, offset + limit - 1)
-
-    const result = await query
-    return {
-      data: (result.data || []).map((item) => SourceCollectJob.parse(item)),
-      count: result.count || 0,
-    }
-  }
-
-  static async getLatestOpenBySource(sourceId: SourceRef): Promise<SourceCollectJob | null> {
-    const result = await this.dbApi
-      .from()
-      .select()
-      .eq('source', sourceId)
-      .in('status', [SourceCollectJobStatus.PENDING, SourceCollectJobStatus.RUNNING])
-      .order('created_at', { ascending: false })
-      .limit(1)
-
-    if (result.data && result.data.length > 0) {
-      return SourceCollectJob.parse(result.data[0])
-    }
-    return null
-  }
-
-  public async getLogs(options?: { limit?: number; cursor?: number }): Promise<Log[]> {
-    return Log.getByTraceId(`source_collect_job.${this.id}`, options)
-  }
-
-  static isFinalStatus(status: string): boolean {
-    return status === SourceCollectJobStatus.FINISHED || status === SourceCollectJobStatus.FAILED
-  }
-
-  get isFinal(): boolean {
-    return SourceCollectJob.isFinalStatus(this.status)
-  }
-}
-
-export class SourceCollectJobForm extends Z.class({
-  ...SourceCollectJob.shape,
-  id: z.undefined(),
-}) {
-  public async create() {
-    return SourceCollectJob.parse(
-      (await SourceCollectJob.dbApi.insert(this).select().single()).data
-    )
-  }
-}
diff --git a/packages/core/src/source/index.ts b/packages/core/src/source/index.ts
index c4a3ae7..1e77ecd 100644
--- a/packages/core/src/source/index.ts
+++ b/packages/core/src/source/index.ts
@@ -1,4 +1,3 @@
-export * from './collect-at'
 export * from './source-type'
 export * from './source'
-export * from './collect-job'
+export * from './manager'
diff --git a/packages/core/src/source/manager.ts b/packages/core/src/source/manager.ts
new file mode 100644
index 0000000..de99ffb
--- /dev/null
+++ b/packages/core/src/source/manager.ts
@@ -0,0 +1,93 @@
+import { z } from 'zod'
+import { JobManager, type Job } from '../job'
+import { Source } from './source'
+
+export const SOURCE_COLLECT_JOB_TYPE = 'core.source.collect.v1'
+export const SOURCE_BACKFILL_JOB_TYPE = 'core.source.backfill.v1'
+
+const SourceCommandParameters = z.object({
+  source: z.number().int(),
+  config: z.record(z.string(), z.unknown()).default({}),
+})
+
+export interface SourceImplementation<
+  CollectConfig extends z.ZodType = z.ZodType,
+  BackfillConfig extends z.ZodType | null = z.ZodType | null,
+> {
+  collectConfig: CollectConfig
+  backfillConfig: BackfillConfig
+  collect(
+    source: Source,
+    job: Job,
+    config: z.output<CollectConfig>,
+    signal: AbortSignal
+  ): Promise<void>
+  backfill?: BackfillConfig extends z.ZodType
+    ? (
+        source: Source,
+        job: Job,
+        config: z.output<BackfillConfig>,
+        signal: AbortSignal
+      ) => Promise<void>
+    : never
+}
+
+export class SourceManager {
+  private static implementations = new Map<string, SourceImplementation>()
+
+  static register(type: string, implementation: SourceImplementation): void {
+    const existing = this.implementations.get(type)
+    if (existing === implementation) return
+    if (existing) throw new Error(`Source type ${type} is already registered`)
+    this.implementations.set(type, implementation)
+  }
+
+  static unregister(type: string): void {
+    this.implementations.delete(type)
+  }
+
+  static async resolve(sourceRef: number): Promise<[Source, SourceImplementation] | null> {
+    try {
+      const source = await Source.get(sourceRef)
+      const implementation = this.implementations.get(source.type)
+      return implementation ? [source, implementation] : null
+    } catch {
+      return null
+    }
+  }
+}
+
+JobManager.registerHandler(SOURCE_COLLECT_JOB_TYPE, {
+  parameters: SourceCommandParameters,
+  async canHandle(parameters) {
+    return (await SourceManager.resolve(parameters.source)) !== null
+  },
+  async handle(job, parameters, signal) {
+    const resolved = await SourceManager.resolve(parameters.source)
+    if (!resolved) throw new Error('Source implementation is unavailable')
+    const [source, implementation] = resolved
+    const config = implementation.collectConfig.parse(parameters.config)
+    await implementation.collect(source, job, config, signal)
+  },
+})
+
+JobManager.registerHandler(SOURCE_BACKFILL_JOB_TYPE, {
+  parameters: SourceCommandParameters,
+  async canHandle(parameters) {
+    const resolved = await SourceManager.resolve(parameters.source)
+    return resolved !== null && resolved[1].backfillConfig !== null && !!resolved[1].backfill
+  },
+  async handle(job, parameters, signal) {
+    const resolved = await SourceManager.resolve(parameters.source)
+    if (!resolved) {
+      throw new Error('Source backfill implementation is unavailable')
+    }
+    const [source, implementation] = resolved
+    const { backfillConfig, backfill } = implementation
+    if (!backfillConfig || !backfill) {
+      throw new Error('Source backfill implementation is unavailable')
+    }
+    const config = backfillConfig.parse(parameters.config)
+    await backfill(source, job, config, signal)
+  },
+})
diff --git a/packages/core/src/source/source-type.ts b/packages/core/src/source/source-type.ts
index 12de90e..f6f59c3 100644
--- a/packages/core/src/source/source-type.ts
+++ b/packages/core/src/source/source-type.ts
@@ -9,6 +9,8 @@ export class SourceType extends Z.class({
   id: SourceTypeRefZ,
   description: z.string(),
   config_schema: z.looseObject({}).default(() => ({})),
+  collect_config_schema: z.looseObject({}).default(() => ({})),
+  backfill_config_schema: z.looseObject({}).nullable(),
 }) {
   static dbApi: DBAPIClient<'sources_types', SourceType> = new DBAPIClient<
     'sources_types',
diff --git a/packages/core/src/source/source.ts b/packages/core/src/source/source.ts
index 6d19faf..d719cfa 100644
--- a/packages/core/src/source/source.ts
+++ b/packages/core/src/source/source.ts
@@ -2,8 +2,6 @@ import { z } from 'zod'
 import { Z } from 'zod-class'
 import { DBAPIClient } from '../base/db-api'
 import { makeNumberProp, makeObjectProp } from '../utils/vue-props'
-import { zinstance } from '../utils/zinstance'
-import { CollectAt } from './collect-at'
 import { SourceTypeRefZ } from './source-type'
 
 export type SourceRef = number
@@ -14,9 +12,13 @@ export const SourceRefZ = z.number()
 export class Source extends Z.class({
   id: SourceRefZ,
   type: SourceTypeRefZ,
-  nickname: z.string(),
+  nickname: z.string().nullable(),
   config: z.looseObject({}).default(() => ({})),
-  collect_at: zinstance<CollectAt>(CollectAt).nullable(),
+  state: z.looseObject({}).default(() => ({})),
+  storage: z.number().int().nullable(),
+  block: z.number().int().nullable(),
+  created_at: z.coerce.date(),
+  updated_at: z.coerce.date(),
 }) {
   static dbApi: DBAPIClient<'sources', Source> = new DBAPIClient<'sources', Source>(
     'sources',
@@ -41,8 +43,11 @@ export class Source extends Z.class({
 }
 
 export class SourceForm extends Z.class({
-  ...Source.shape,
-  id: z.undefined(),
+  type: SourceTypeRefZ,
+  nickname: z.string().nullable().default(null),
+  config: z.looseObject({}).default(() => ({})),
+  state: z.looseObject({}).default(() => ({})),
+  storage: z.number().int().nullable().default(null),
 }) {
   public async create() {
     return Source.parse((await Source.dbApi.insert(this).select().single()).data)
diff --git a/playwright.config.ts b/playwright.config.ts
index 08e2450..55a2f0c 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -20,6 +20,13 @@ export default defineConfig({
         baseURL: process.env.INKCRE_E2E_WEB_URL,
       },
     },
+    {
+      name: 'mail-info-base',
+      testMatch: 'mail-info-base.spec.ts',
+      use: {
+        baseURL: process.env.INKCRE_E2E_WEB_URL,
+      },
+    },
     {
       name: 'browser-extension',
       testMatch: 'browser-extension.spec.ts',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9705cee..5f85d48 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -344,6 +344,61 @@ importers:
         specifier: ^0.20.6
         version: 0.20.27(@rspack/core@2.1.5)(@types/node@22.17.2)(eslint@9.39.5(jiti@2.7.0))(jiti@2.7.0)(lightningcss@1.33.0)(oxc-parser@0.131.0)(rolldown@1.2.0)(rollup@4.59.0)(sass-embedded@1.90.0)(sass@1.101.6)
 
+  extensions/mail:
+    dependencies:
+      '@inkcre/core':
+        specifier: workspace:*
+        version: link:../../packages/core
+      '@vueuse/core':
+        specifier: ^14.0.0
+        version: 14.3.0(vue@3.5.40(typescript@5.9.3))
+      dompurify:
+        specifier: ^3.4.13
+        version: 3.4.13
+      pinia:
+        specifier: ^3.0.0
+        version: 3.0.3(typescript@5.9.3)(vue@3.5.40(typescript@5.9.3))
+      vue:
+        specifier: ^3.5.0
+        version: 3.5.40(typescript@5.9.3)
+      vue-router:
+        specifier: ^4.5.0
+        version: 4.5.1(vue@3.5.40(typescript@5.9.3))
+    devDependencies:
+      '@inkcre/ext-dev-utils':
+        specifier: workspace:*
+        version: link:../../packages/ext-dev-utils
+      '@inkcre/ui-web':
+        specifier: 1.2.2
+        version: 1.2.2(@codemirror/autocomplete@6.20.3)(@codemirror/commands@6.10.4)(@codemirror/lang-json@6.0.2)(@codemirror/lint@6.9.7)(@codemirror/state@6.7.1)(@codemirror/view@6.43.6)(@vueuse/core@14.3.0(vue@3.5.40(typescript@5.9.3)))(dayjs@1.11.21)(unocss@66.7.5(vite@7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6)))(vscode-json-languageservice@5.7.2)(vscode-languageserver-textdocument@1.0.12)(vue-router@4.5.1(vue@3.5.40(typescript@5.9.3)))(vue@3.5.40(typescript@5.9.3))
+      '@module-federation/vite':
+        specifier: ^1.1.0
+        version: 1.7.1(rollup@4.59.0)
+      '@vitejs/plugin-vue':
+        specifier: ^6.0.1
+        version: 6.0.3(vite@7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))
+      '@vitejs/plugin-vue-jsx':
+        specifier: ^5.1.2
+        version: 5.1.6(vite@7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))
+      '@vue/tsconfig':
+        specifier: ^0.7.0
+        version: 0.7.0(typescript@5.9.3)(vue@3.5.40(typescript@5.9.3))
+      sass-embedded:
+        specifier: ^1.90.0
+        version: 1.90.0
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+      vite:
+        specifier: ^7.0.6
+        version: 7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6)
+      vue-tsc:
+        specifier: 'catalog:'
+        version: 3.3.8(typescript@5.9.3)
+      zod:
+        specifier: ^4.1.12
+        version: 4.4.3
+
   extensions/twitter:
     dependencies:
       '@inkcre/core':
@@ -556,10 +611,6 @@ packages:
     resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.28.3':
-    resolution: {integrity: sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/generator@7.29.7':
     resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
     engines: {node: '>=6.9.0'}
@@ -678,11 +729,6 @@ packages:
     resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.28.3':
-    resolution: {integrity: sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.29.7':
     resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
     engines: {node: '>=6.0.0'}
@@ -717,12 +763,6 @@ packages:
     peerDependencies:
       '@babel/core': 7.29.7
 
-  '@babel/plugin-syntax-typescript@7.27.1':
-    resolution: {integrity: sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': 7.29.7
-
   '@babel/plugin-syntax-typescript@7.29.7':
     resolution: {integrity: sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==}
     engines: {node: '>=6.9.0'}
@@ -2328,6 +2368,9 @@ packages:
   '@types/semver@7.5.8':
     resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
 
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
   '@types/web-bluetooth@0.0.20':
     resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
 
@@ -2676,15 +2719,9 @@ packages:
   '@vue/compiler-dom@3.5.40':
     resolution: {integrity: sha512-pwkx4vqlqOspFstrcmzwkKLePVMD3PT65imRzLhanU2V1Fj4K13g6OXjanOyzw3aTAuRk84BOmY8f3rEHqPaVA==}
 
-  '@vue/compiler-sfc@3.5.19':
-    resolution: {integrity: sha512-YWCm1CYaJ+2RvNmhCwI7t3I3nU+hOrWGWMsn+Z/kmm1jy5iinnVtlmkiZwbLlbV1SRizX7vHsc0/bG5dj0zRTg==}
-
   '@vue/compiler-sfc@3.5.40':
     resolution: {integrity: sha512-gIf497P4kpuALcvs5n3AEg1Vdn0pSY4XbjASIfHNYF1/MP3T2Mf2STERTubysBxCRxzJGJYtF/O7vwJrxFB3Vw==}
 
-  '@vue/compiler-ssr@3.5.19':
-    resolution: {integrity: sha512-/wx0VZtkWOPdiQLWPeQeqpHWR/LuNC7bHfSX7OayBTtUy8wur6vT6EQIX6Et86aED6J+y8tTw43qo2uoqGg5sw==}
-
   '@vue/compiler-ssr@3.5.40':
     resolution: {integrity: sha512-rrE5xiXG663+vHCHa3J9p2z5OcBRjXmoqenprJxAFQxg5pSshzeBiCE6pu46axapRJ2Adk0YDA2BRZVjiHXnhg==}
 
@@ -3496,6 +3533,9 @@ packages:
     resolution: {integrity: sha512-gYzvtM72ZtxQO0T048kd6HWSbbGCNOUwcnfQ01cqIJ4X2IYKFFHZ5mKvrQETcFXxsRObZulDaKmy//R7TPtsBg==}
     engines: {node: '>=20.19.0'}
 
+  dompurify@3.4.13:
+    resolution: {integrity: sha512-2vmYIoqjze2d+kakP8S/nS5shfsl587kzwEjcGlTdiksUVgFHnFCsLYDVj/JNqJVOQZGSYBTmuycv0PodwmnMQ==}
+
   domutils@3.2.2:
     resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
 
@@ -6385,21 +6425,13 @@ snapshots:
       '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.1
+      debug: 4.4.3
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/generator@7.28.3':
-    dependencies:
-      '@babel/parser': 7.28.3
-      '@babel/types': 7.28.2
-      '@jridgewell/gen-mapping': 0.3.13
-      '@jridgewell/trace-mapping': 0.3.30
-      jsesc: 3.1.0
-
   '@babel/generator@7.29.7':
     dependencies:
       '@babel/parser': 7.29.7
@@ -6410,7 +6442,7 @@ snapshots:
 
   '@babel/helper-annotate-as-pure@7.27.3':
     dependencies:
-      '@babel/types': 7.28.2
+      '@babel/types': 7.29.7
 
   '@babel/helper-annotate-as-pure@7.29.7':
     dependencies:
@@ -6427,12 +6459,12 @@ snapshots:
   '@babel/helper-create-class-features-plugin@7.28.3(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/helper-annotate-as-pure': 7.27.3
+      '@babel/helper-annotate-as-pure': 7.29.7
       '@babel/helper-member-expression-to-functions': 7.27.1
       '@babel/helper-optimise-call-expression': 7.27.1
       '@babel/helper-replace-supers': 7.27.1(@babel/core@7.29.7)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/traverse': 7.28.3
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+      '@babel/traverse': 7.29.7
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -6456,8 +6488,8 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.27.1':
     dependencies:
-      '@babel/traverse': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
@@ -6493,7 +6525,7 @@ snapshots:
 
   '@babel/helper-optimise-call-expression@7.27.1':
     dependencies:
-      '@babel/types': 7.28.2
+      '@babel/types': 7.29.7
 
   '@babel/helper-optimise-call-expression@7.29.7':
     dependencies:
@@ -6506,9 +6538,9 @@ snapshots:
   '@babel/helper-replace-supers@7.27.1(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/helper-member-expression-to-functions': 7.27.1
-      '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/traverse': 7.28.3
+      '@babel/helper-member-expression-to-functions': 7.29.7
+      '@babel/helper-optimise-call-expression': 7.29.7
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
@@ -6523,8 +6555,8 @@ snapshots:
 
   '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
     dependencies:
-      '@babel/traverse': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
@@ -6550,10 +6582,6 @@ snapshots:
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
 
-  '@babel/parser@7.28.3':
-    dependencies:
-      '@babel/types': 7.29.7
-
   '@babel/parser@7.29.7':
     dependencies:
       '@babel/types': 7.29.7
@@ -6570,7 +6598,7 @@ snapshots:
   '@babel/plugin-syntax-decorators@7.27.1(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-plugin-utils': 7.29.7
 
   '@babel/plugin-syntax-import-attributes@7.27.1(@babel/core@7.29.7)':
     dependencies:
@@ -6585,12 +6613,7 @@ snapshots:
   '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/helper-plugin-utils': 7.27.1
-
-  '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.29.7)':
-    dependencies:
-      '@babel/core': 7.29.7
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-plugin-utils': 7.29.7
 
   '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7)':
     dependencies:
@@ -6604,7 +6627,7 @@ snapshots:
       '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
@@ -6623,8 +6646,8 @@ snapshots:
 
   '@babel/template@7.27.2':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/parser': 7.28.3
+      '@babel/code-frame': 7.29.7
+      '@babel/parser': 7.29.7
       '@babel/types': 7.29.7
 
   '@babel/template@7.29.7':
@@ -6635,13 +6658,13 @@ snapshots:
 
   '@babel/traverse@7.28.3':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/generator': 7.28.3
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
       '@babel/helper-globals': 7.28.0
-      '@babel/parser': 7.28.3
-      '@babel/template': 7.27.2
-      '@babel/types': 7.28.2
-      debug: 4.4.1
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -6653,7 +6676,7 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
-      debug: 4.4.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -7235,7 +7258,7 @@ snapshots:
       '@rollup/pluginutils': 5.2.0(rollup@4.59.0)
       defu: 6.1.7
       estree-walker: 2.0.2
-      magic-string: 0.30.17
+      magic-string: 0.30.21
       pathe: 1.1.2
     transitivePeerDependencies:
       - rollup
@@ -7674,7 +7697,7 @@ snapshots:
 
   '@rollup/pluginutils@5.2.0(rollup@4.59.0)':
     dependencies:
-      '@types/estree': 1.0.8
+      '@types/estree': 1.0.9
       estree-walker: 2.0.2
       picomatch: 4.0.5
     optionalDependencies:
@@ -7870,8 +7893,7 @@ snapshots:
 
   '@types/estree@1.0.8': {}
 
-  '@types/estree@1.0.9':
-    optional: true
+  '@types/estree@1.0.9': {}
 
   '@types/filesystem@0.0.36':
     dependencies:
@@ -7900,6 +7922,9 @@ snapshots:
 
   '@types/semver@7.5.8': {}
 
+  '@types/trusted-types@2.0.7':
+    optional: true
+
   '@types/web-bluetooth@0.0.20': {}
 
   '@types/web-bluetooth@0.0.21': {}
@@ -8140,10 +8165,10 @@ snapshots:
       vite: 7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6)
       vue: 3.5.40(typescript@5.9.3)
 
-  '@vitejs/plugin-vue@6.0.1(vite@8.1.5(@types/node@22.17.2)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))':
+  '@vitejs/plugin-vue@6.0.3(vite@7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))':
     dependencies:
-      '@rolldown/pluginutils': 1.0.0-beta.29
-      vite: 8.1.5(@types/node@22.17.2)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.90.0)(sass@1.101.6)
+      '@rolldown/pluginutils': 1.0.0-beta.53
+      vite: 7.3.6(@types/node@22.17.2)(jiti@2.7.0)(lightningcss@1.33.0)(sass-embedded@1.90.0)(sass@1.101.6)
       vue: 3.5.40(typescript@5.9.3)
 
   '@vitejs/plugin-vue@6.0.3(vite@8.1.5(@types/node@22.17.2)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))':
@@ -8269,10 +8294,10 @@ snapshots:
 
   '@vue/babel-plugin-jsx@2.0.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
       '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7)
-      '@babel/template': 7.27.2
+      '@babel/template': 7.29.7
       '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
       '@vue/babel-helper-vue-transform-on': 2.0.1
@@ -8285,21 +8310,21 @@ snapshots:
 
   '@vue/babel-plugin-resolve-type@1.5.0(@babel/core@7.29.7)':
     dependencies:
-      '@babel/code-frame': 7.27.1
+      '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.7
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/parser': 7.28.3
-      '@vue/compiler-sfc': 3.5.19
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/parser': 7.29.7
+      '@vue/compiler-sfc': 3.5.40
     transitivePeerDependencies:
       - supports-color
 
   '@vue/babel-plugin-resolve-type@2.0.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/code-frame': 7.27.1
+      '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.7
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
       '@babel/parser': 7.29.7
       '@vue/compiler-sfc': 3.5.40
     transitivePeerDependencies:
@@ -8307,7 +8332,7 @@ snapshots:
 
   '@vue/compiler-core@3.5.19':
     dependencies:
-      '@babel/parser': 7.28.3
+      '@babel/parser': 7.29.7
       '@vue/shared': 3.5.19
       entities: 4.5.0
       estree-walker: 2.0.2
@@ -8331,18 +8356,6 @@ snapshots:
       '@vue/compiler-core': 3.5.40
       '@vue/shared': 3.5.40
 
-  '@vue/compiler-sfc@3.5.19':
-    dependencies:
-      '@babel/parser': 7.28.3
-      '@vue/compiler-core': 3.5.19
-      '@vue/compiler-dom': 3.5.19
-      '@vue/compiler-ssr': 3.5.19
-      '@vue/shared': 3.5.19
-      estree-walker: 2.0.2
-      magic-string: 0.30.21
-      postcss: 8.5.18
-      source-map-js: 1.2.1
-
   '@vue/compiler-sfc@3.5.40':
     dependencies:
       '@babel/parser': 7.29.7
@@ -8355,11 +8368,6 @@ snapshots:
       postcss: 8.5.22
       source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.19':
-    dependencies:
-      '@vue/compiler-dom': 3.5.19
-      '@vue/shared': 3.5.19
-
   '@vue/compiler-ssr@3.5.40':
     dependencies:
       '@vue/compiler-dom': 3.5.40
@@ -8516,7 +8524,7 @@ snapshots:
 
   '@wxt-dev/module-vue@1.0.3(vite@8.1.5(@types/node@22.17.2)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))(wxt@0.20.27(@rspack/core@2.1.5)(@types/node@22.17.2)(eslint@9.39.5(jiti@2.7.0))(jiti@2.7.0)(lightningcss@1.33.0)(oxc-parser@0.131.0)(rolldown@1.2.0)(rollup@4.59.0)(sass-embedded@1.90.0)(sass@1.101.6))':
     dependencies:
-      '@vitejs/plugin-vue': 6.0.1(vite@8.1.5(@types/node@22.17.2)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))
+      '@vitejs/plugin-vue': 6.0.3(vite@8.1.5(@types/node@22.17.2)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.90.0)(sass@1.101.6))(vue@3.5.40(typescript@5.9.3))
       wxt: 0.20.27(@rspack/core@2.1.5)(@types/node@22.17.2)(eslint@9.39.5(jiti@2.7.0))(jiti@2.7.0)(lightningcss@1.33.0)(oxc-parser@0.131.0)(rolldown@1.2.0)(rollup@4.59.0)(sass-embedded@1.90.0)(sass@1.101.6)
     transitivePeerDependencies:
       - vite
@@ -8616,7 +8624,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -9041,7 +9049,6 @@ snapshots:
   debug@4.4.3:
     dependencies:
       ms: 2.1.3
-    optional: true
 
   deep-equal@1.0.1: {}
 
@@ -9111,6 +9118,10 @@ snapshots:
     dependencies:
       domelementtype: 3.0.0
 
+  dompurify@3.4.13:
+    optionalDependencies:
+      '@types/trusted-types': 2.0.7
+
   domutils@3.2.2:
     dependencies:
       dom-serializer: 2.0.0
@@ -9329,7 +9340,7 @@ snapshots:
 
   estree-walker@3.0.3:
     dependencies:
-      '@types/estree': 1.0.8
+      '@types/estree': 1.0.9
 
   esutils@2.0.3:
     optional: true
@@ -9684,7 +9695,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -9969,7 +9980,7 @@ snapshots:
 
   lighthouse-logger@2.0.2:
     dependencies:
-      debug: 4.4.1
+      debug: 4.4.3
       marky: 1.3.0
     transitivePeerDependencies:
       - supports-color
@@ -11045,7 +11056,7 @@ snapshots:
   streamroller@3.1.5:
     dependencies:
       date-format: 4.0.14
-      debug: 4.4.1
+      debug: 4.4.3
       fs-extra: 8.1.0
     transitivePeerDependencies:
       - supports-color
diff --git a/runtime/database.compose.yml b/runtime/database.compose.yml
index 9208980..d40250a 100644
--- a/runtime/database.compose.yml
+++ b/runtime/database.compose.yml
@@ -61,13 +61,13 @@ services:
       init:
         condition: service_completed_successfully
     environment:
-      CLIENT_BASE_URL: ${CORE_PUBLIC_URL:?CORE_PUBLIC_URL is required}
-      CLIENT_ID: 00000000-0000-4000-8000-000000000002
-      CLIENT_NAME: core-py-development
       DATABASE_URL: postgresql+psycopg://inkcre_core:${CORE_DATABASE_PASSWORD}@postgres:5432/inkcre
       INKCRE_ENV_FILE: ''
       JWT_SECRET: ${JWT_SECRET:?JWT_SECRET is required}
       OBSRV__LOGGING_BACKEND: none
+      PEER_ID: 00000000-0000-4000-8000-000000000002
+      PEER_LEASE_RENEW_INTERVAL_SECONDS: 1
+      PEER_NAME: core-py-development
       PORT: 8000
     ports:
       - '127.0.0.1:${CORE_PORT:-0}:8000'
diff --git a/scripts/check-local-runtime-contract.mjs b/scripts/check-local-runtime-contract.mjs
index fe3253b..9100bfb 100644
--- a/scripts/check-local-runtime-contract.mjs
+++ b/scripts/check-local-runtime-contract.mjs
@@ -249,13 +249,22 @@ for (const required of [
   'database-contract:/database-contract',
   '${POSTGRES_PORT:-0}',
   '${POSTGREST_PORT:-0}',
-  '${CORE_PUBLIC_URL:?CORE_PUBLIC_URL is required}',
+  'PEER_ID: 00000000-0000-4000-8000-000000000002',
+  'PEER_LEASE_RENEW_INTERVAL_SECONDS: 1',
 ]) {
   if (!databaseCompose.includes(required)) {
     errors.push(`database Compose is missing runtime contract fragment "${required}"`)
   }
 }
-for (const forbidden of ['5432:5432', '3000:3000', 'sleep ']) {
+for (const forbidden of [
+  '5432:5432',
+  '3000:3000',
+  'sleep ',
+  'CLIENT_BASE_URL:',
+  'CLIENT_ID:',
+  'CLIENT_NAME:',
+  'CORE_PUBLIC_URL:',
+]) {
   if (databaseCompose.includes(forbidden)) {
     errors.push(`database Compose contains forbidden fixed-order fragment "${forbidden}"`)
   }
diff --git a/scripts/check-package-contract.mjs b/scripts/check-package-contract.mjs
index 2603a31..9b646b8 100644
--- a/scripts/check-package-contract.mjs
+++ b/scripts/check-package-contract.mjs
@@ -25,6 +25,7 @@ await Promise.all(
     'apps/client-webext/.output/chrome-mv3/manifest.json',
     'apps/client-webext/.output/chrome-mv3/content-scripts/content.js',
     'apps/client-webext/.output/chrome-mv3/content-scripts/content.css',
+    'extensions/mail/dist/client-web/remoteEntry.js',
     'extensions/twitter/dist/client-web/remoteEntry.js',
   ].map((path) => requireFile(`${repoRoot}/${path}`))
 )
diff --git a/scripts/check-workspace-contract.mjs b/scripts/check-workspace-contract.mjs
index 8d50df0..4fc6d9b 100644
--- a/scripts/check-workspace-contract.mjs
+++ b/scripts/check-workspace-contract.mjs
@@ -30,6 +30,12 @@ const workspaces = [
     requiredScripts: ['build', 'build:firefox', 'dev', 'type-check'],
     builder: 'wxt',
   },
+  {
+    path: 'extensions/mail',
+    name: '@inkcre/ext-mail',
+    requiredScripts: ['build', 'dev', 'type-check'],
+    builder: 'vite',
+  },
   {
     path: 'extensions/twitter',
     name: '@inkcre/ext-twitter',
diff --git a/scripts/database-runtime-external.test.mjs b/scripts/database-runtime-external.test.mjs
index eec1bf1..684dc99 100644
--- a/scripts/database-runtime-external.test.mjs
+++ b/scripts/database-runtime-external.test.mjs
@@ -88,7 +88,7 @@ async function externalRuntime() {
   return { descriptor, runtime, directory }
 }
 
-test('external attachment preserves client and database instance identities', async () => {
+test('external attachment preserves local and database runtime identities', async () => {
   const { descriptor, runtime, directory } = await externalRuntime()
 
   const state = await runtimeState('fedcba9876543210', { create: true })
diff --git a/scripts/database-runtime-lib.mjs b/scripts/database-runtime-lib.mjs
index 110c293..1861d61 100644
--- a/scripts/database-runtime-lib.mjs
+++ b/scripts/database-runtime-lib.mjs
@@ -4,6 +4,7 @@ import { access, mkdir, rm, writeFile } from 'node:fs/promises'
 import { createServer } from 'node:net'
 import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { SignJWT } from 'jose'
 
 import {
   inspectCoreRelease,
@@ -23,6 +24,14 @@ import {
 } from './database-provider.mjs'
 
 export const repoRoot = fileURLToPath(new URL('..', import.meta.url))
+export const BROWSER_PEER_ID = '00000000-0000-4000-8000-000000000001'
+export const CORE_PEER_ID = '00000000-0000-4000-8000-000000000002'
+
+const CORE_CAPABILITIES = new Map([
+  ['core.semantic_retrieval.v1', { method: 'POST', path: '/semantic-retrieval' }],
+  ['core.organization.rumination.v1', { method: 'POST', path: '/organization/ruminate' }],
+  ['core.extension.management.v1', { method: 'POST', path: '/extension-management' }],
+])
 
 export function validateInstance(instance) {
   if (!/^[a-z0-9][a-z0-9-]{2,48}$/.test(instance)) {
@@ -77,8 +86,12 @@ async function writeRuntimeFiles(state, credentials) {
       schema_digest: state.schema_digest ?? null,
       protocol_schema: 'inkcre',
     },
+    peer: {
+      id: BROWSER_PEER_ID,
+      name: 'client-web-development',
+    },
     core: {
-      client_id: '00000000-0000-4000-8000-000000000002',
+      peer_id: CORE_PEER_ID,
       url: state.urls.core,
     },
     postgrest: {
@@ -101,7 +114,6 @@ async function writeRuntimeFiles(state, credentials) {
     POSTGRES_PORT: String(publishedPorts.postgres),
     CORE_PORT: String(publishedPorts.core),
     POSTGREST_PORT: String(publishedPorts.postgrest),
-    CORE_PUBLIC_URL: state.urls.core,
     INKCRE_REMOTE_DOCKER_BIN: state.provider.docker_bin ?? 'docker',
     ...Object.fromEntries(Object.entries(credentials).filter(([name]) => name !== 'format')),
   }
@@ -374,10 +386,96 @@ export async function runtimeIsReady(state, timeout = 3000) {
   return coreReady && postgrestReady
 }
 
+async function createPeerToken(secret) {
+  const contract = await readJson(
+    `${repoRoot}/packages/core/src/database/runtime-contract.generated.json`
+  )
+  const now = Math.floor(Date.now() / 1000)
+  return new SignJWT({ role: contract.jwt.role })
+    .setProtectedHeader({ alg: contract.jwt.algorithm })
+    .setIssuedAt(now)
+    .setExpirationTime(now + 60)
+    .setIssuer(contract.jwt.issuer)
+    .setAudience(contract.jwt.audience)
+    .sign(new TextEncoder().encode(secret))
+}
+
+function expectedCapabilityUrl(baseUrl, path) {
+  return new URL(path.replace(/^\//, ''), baseUrl).href
+}
+
+function hasExpectedCapabilities(peer, baseUrl) {
+  if (!Array.isArray(peer?.capabilities) || Date.parse(peer.lease_expires_at) <= Date.now()) {
+    return false
+  }
+  return [...CORE_CAPABILITIES].every(([id, expected]) => {
+    const advertisement = peer.capabilities.find((candidate) => candidate?.id === id)
+    return (
+      advertisement?.inbound?.protocol === 'core.peer.protocol.http.v1' &&
+      advertisement.inbound.parameters?.method === expected.method &&
+      advertisement.inbound.parameters?.url === expectedCapabilityUrl(baseUrl, expected.path)
+    )
+  })
+}
+
+export async function configureCorePeer(state, timeout = 35_000) {
+  const credentials = await runtimeCredentials(state.identity)
+  const authorization = `Bearer ${await createPeerToken(credentials.JWT_SECRET)}`
+  if (state.provider.kind !== 'external') {
+    const peerUrl = new URL(`peers?id=eq.${CORE_PEER_ID}`, state.urls.postgrest)
+    const response = await fetch(peerUrl, {
+      method: 'PATCH',
+      headers: {
+        Authorization: authorization,
+        'Content-Type': 'application/json',
+        Prefer: 'return=representation',
+      },
+      body: JSON.stringify({
+        config: { http_public_base_url: state.urls.core.replace(/\/$/, '') },
+      }),
+      signal: AbortSignal.timeout(3000),
+    })
+    if (!response.ok) {
+      throw new Error(`could not configure core Peer through PostgREST: HTTP ${response.status}`)
+    }
+    const updated = await response.json()
+    if (!Array.isArray(updated) || updated.length !== 1) {
+      throw new Error('core Peer registration was not available for runtime configuration')
+    }
+  }
+
+  const deadline = Date.now() + timeout
+  const queryUrl = new URL(
+    `peers?select=capabilities,lease_expires_at&id=eq.${CORE_PEER_ID}`,
+    state.urls.postgrest
+  )
+  while (Date.now() < deadline) {
+    const query = await fetch(queryUrl, {
+      headers: { Authorization: authorization },
+      signal: AbortSignal.timeout(3000),
+    })
+    if (query.ok) {
+      const peers = await query.json()
+      if (
+        Array.isArray(peers) &&
+        peers.length === 1 &&
+        hasExpectedCapabilities(peers[0], state.urls.core)
+      ) {
+        return
+      }
+    }
+    await new Promise((resolve) => setTimeout(resolve, 250))
+  }
+  throw new Error(`core Peer ${CORE_PEER_ID} did not publish its expected capabilities`)
+}
+
 export async function waitForRuntime(state, timeout = 120_000) {
   const deadline = Date.now() + timeout
   while (Date.now() < deadline) {
-    if (await runtimeIsReady(state)) return
+    if (await runtimeIsReady(state)) {
+      await configureCorePeer(state, Math.max(1, deadline - Date.now()))
+      return
+    }
     await new Promise((resolve) => setTimeout(resolve, 750))
   }
   throw new Error(`database runtime ${state.identity} did not become ready`)
diff --git a/scripts/database-runtime-peer.test.mjs b/scripts/database-runtime-peer.test.mjs
new file mode 100644
index 0000000..bbee83f
--- /dev/null
+++ b/scripts/database-runtime-peer.test.mjs
@@ -0,0 +1,75 @@
+import assert from 'node:assert/strict'
+import { mkdir, rm, writeFile } from 'node:fs/promises'
+import { afterEach, test, vi } from 'vitest'
+import { jwtVerify } from 'jose'
+
+import { CORE_PEER_ID, configureCorePeer, runtimeDirectory } from './database-runtime-lib.mjs'
+
+const instance = 'peer-runtime-test'
+const secret = 'peer-runtime-test-secret-at-least-32-bytes'
+const originalProvider = process.env.INKCRE_DATABASE_PROVIDER
+
+afterEach(async () => {
+  vi.unstubAllGlobals()
+  if (originalProvider === undefined) delete process.env.INKCRE_DATABASE_PROVIDER
+  else process.env.INKCRE_DATABASE_PROVIDER = originalProvider
+  await rm(runtimeDirectory(instance), { recursive: true, force: true })
+})
+
+test('local deployment configures and observes the core Peer advertisement', async () => {
+  process.env.INKCRE_DATABASE_PROVIDER = 'local'
+  const directory = runtimeDirectory(instance)
+  await mkdir(directory, { recursive: true })
+  await writeFile(`${directory}/credential.json`, JSON.stringify({ format: 1, JWT_SECRET: secret }))
+
+  const coreUrl = 'http://127.0.0.1:51002/'
+  const postgrestUrl = 'http://127.0.0.1:51003/'
+  let patchBody
+  let authorization
+  const fetcher = vi.fn(async (input, init = {}) => {
+    const url = new URL(input)
+    const headers = new Headers(init.headers)
+    authorization = headers.get('Authorization')
+    if (init.method === 'PATCH') {
+      patchBody = JSON.parse(String(init.body))
+      return Response.json([{ id: CORE_PEER_ID }], { status: 200 })
+    }
+    assert.equal(url.searchParams.get('id'), `eq.${CORE_PEER_ID}`)
+    return Response.json([
+      {
+        lease_expires_at: new Date(Date.now() + 60_000).toISOString(),
+        capabilities: [
+          ['core.extension.management.v1', '/extension-management'],
+          ['core.organization.rumination.v1', '/organization/ruminate'],
+          ['core.semantic_retrieval.v1', '/semantic-retrieval'],
+        ].map(([id, path]) => ({
+          id,
+          inbound: {
+            protocol: 'core.peer.protocol.http.v1',
+            parameters: { method: 'POST', url: new URL(path.slice(1), coreUrl).href },
+          },
+        })),
+      },
+    ])
+  })
+  vi.stubGlobal('fetch', fetcher)
+
+  await configureCorePeer({
+    identity: instance,
+    provider: { kind: 'local' },
+    urls: { core: coreUrl, postgrest: postgrestUrl },
+  })
+
+  assert.deepEqual(patchBody, {
+    config: { http_public_base_url: 'http://127.0.0.1:51002' },
+  })
+  assert.match(authorization, /^Bearer /)
+  const token = authorization.slice('Bearer '.length)
+  const verified = await jwtVerify(token, new TextEncoder().encode(secret), {
+    algorithms: ['HS256'],
+    audience: 'inkcre-api',
+    issuer: 'inkcre-peer',
+  })
+  assert.equal(verified.payload.role, 'authenticated')
+  assert.equal(fetcher.mock.calls.length, 2)
+})
diff --git a/tasks/organization-git-workflow/evidence/phase-6/README.md b/tasks/organization-git-workflow/evidence/phase-6/README.md
new file mode 100644
index 0000000..1f94a77
--- /dev/null
+++ b/tasks/organization-git-workflow/evidence/phase-6/README.md
@@ -0,0 +1,70 @@
+# Phase 6 Evidence
+
+Phase 6 closes repository-level Actions drift and performs the final governance audit. It does not
+change product code or repository-specific CI/CD topology.
+
+## Pre-mutation snapshot
+
+- Captured: 2026-08-09 through read-only GitHub REST requests against `InKCre/core-py`,
+  `InKCre/client-web`, `InKCre/ui`, and `InKCre/docs`.
+- Every checked-in external `uses:` reference is a full commit SHA with a readable version comment.
+  Local composite actions use local paths.
+- Every checked-in workflow declares its token permissions; write grants are limited to the jobs
+  that publish packages, create release pull requests, or deploy artifacts.
+- All repositories currently allow all Actions and report platform SHA enforcement disabled.
+- `core-py`: default token `write`; Actions PR approval enabled; fork approval `first_time_contributors`.
+- `client-web`: default token `read`; Actions PR approval disabled; fork approval
+  `all_external_contributors`.
+- `ui`: default token `read`; Actions PR approval enabled; fork approval `first_time_contributors`.
+- `docs`: default token `write`; Actions PR approval enabled; fork approval
+  `first_time_contributors`.
+- Main protection and merge methods already match the baseline in all four repositories.
+- Production is restricted to `main` in `core-py`, `ui`, and `docs`. The `client-web` production
+  environment has no deployment branch policy.
+
+## Approved target
+
+- Default token permission is `read` in all four repositories.
+- Actions cannot approve pull-request reviews in any repository.
+- Every external fork contributor requires maintainer approval before read-only, secret-free CI.
+- Platform SHA enforcement is enabled in all four repositories.
+- `client-web` production accepts only `main`.
+- Selected-actions allowlists remain optional and are not required for Phase 6 completion.
+
+## Applied settings and verification
+
+- All four repositories now report default token permission `read`, Actions PR approval disabled,
+  fork approval `all_external_contributors`, `allowed_actions=all`, and platform SHA enforcement
+  enabled.
+- `client-web` production now has exactly one custom branch policy: branch `main`.
+- Secret-free manual validation completed successfully on the exact current main revisions:
+  - `docs` `Website checks` run `31300335436` at `4c44cf16`;
+  - `ui` `UI checks` run `31300376700` at `f78df4c`;
+  - `core-py` `Repository and artifact checks` run `31300460833` at `531b0d28`;
+  - `client-web` `Client checks` run `31300570405` at `37546a51`.
+- The final remote scan found no unpinned external action reference: `core-py` has 13 external and
+  five local references; `client-web` has 46 external references; `ui` has 31; `docs` has 26.
+- Required checks remain strict and bound to GitHub Actions app `15368`; main protection or the UI
+  rulesets retain required pull requests, zero approvals, resolved conversations, linear history,
+  no bypass, no force push, and no deletion.
+- Merge commits remain disabled while squash and rebase remain available. Every production
+  environment now accepts only `main`.
+- The organization contribution files still resolve with the intended local overrides: core-py owns
+  its implementation-specific contribution guide, client-web owns its application-specific pull-
+  request template, and the organization defaults cover missing files.
+
+## Publication
+
+- `InKCre/.github` commit `510cdd3` publishes the all-external fork approval rule and the actual
+  environment-job credential boundary directly on its non-product governance `main`.
+- Documentation-only client-web PR #53 records the completed task state and this evidence without
+  changing product code, workflows, repository settings, or delivery behavior.
+
+## Rollback
+
+- Restore each repository's captured default token, PR approval, fork approval, Actions allow, and
+  SHA-enforcement values independently.
+- Remove only the newly created `client-web` production branch policy if that policy blocks the
+  documented main deployment controller.
+- Stop the rollout before mutating the next repository when a secret-free validation workflow cannot
+  start. Do not weaken branch protection or expose preview/production credentials to recover CI.
diff --git a/tasks/organization-git-workflow/implementation-plan.md b/tasks/organization-git-workflow/implementation-plan.md
index 573db63..93ad35d 100644
--- a/tasks/organization-git-workflow/implementation-plan.md
+++ b/tasks/organization-git-workflow/implementation-plan.md
@@ -1,6 +1,6 @@
 # Organization Git and GitHub Workflow Implementation Plan
 
-- **Status**: Phases 0-3 are complete. Phase 3 landed the core schema-bearing stable release foundation, the client stable resolver/typegen/real-service E2E contract, separate PR preview and exact-main delivery controllers, direct required-check names, and the accepted repository settings. Client PR #49 was admitted through a real one-entry merge queue; merge-group run `31256717813` passed all four required checks on synthetic commit `cc857104`, which became main. The temporary queue rule was then removed so GitHub does not force one merge method; squash remains the default and rebase remains available. Preview cleanup run `31256442627`, automatic cleanup run `31256837743`, and production runs `31256434332`/`31256836894` passed. Deferred full-stack preview bootstrap and live external-fork package-access probing are recorded rather than represented as finished. The reverted synchronized product series is preserved without conflicts in draft client-web #50 and core-py #45. Immediate fan-out, dependency-update pull requests, and a cross-repository GitHub App remain rejected. Phases 4-6 remain proposed and unauthorized.
+- **Status**: Phases 0-6 are complete. Phase 3 landed the core schema-bearing stable release foundation, the client stable resolver/typegen/real-service E2E contract, separate PR preview and exact-main delivery controllers, direct required-check names, and the accepted repository settings. Client PR #49 was admitted through a real one-entry merge queue; merge-group run `31256717813` passed all four required checks on synthetic commit `cc857104`, which became main. The temporary queue rule was then removed so GitHub does not force one merge method; squash remains the default and rebase remains available. Preview cleanup run `31256442627`, automatic cleanup run `31256837743`, and production runs `31256434332`/`31256836894` passed. Deferred full-stack preview bootstrap and live external-fork package-access probing are recorded rather than represented as finished. The reverted synchronized product series is preserved without conflicts in draft client-web #50 and core-py #45. Phase 4 independently aligned core-py governance through merged PR #46 and live-proved main CI, immutable publication, production admission, `stable`, and cleanup before removing its temporary worktree. Immediate fan-out, dependency-update pull requests, and a cross-repository GitHub App remain rejected. Phase 5 resolved release PR #34 and package `1.3.1`, published the check-name governance, merged runner-CD foundation PR #35 and sequential cutover PR #36, disabled Cloudflare automatic Git builds after dual-run proof, live-proved runner preview/cleanup and exact-main same-run production delivery, adopted `ui-web checks`, serialized release runs, and completed the UI ruleset/merge-method transition. Phase 6 applied and live-verified the four repositories' read-only workflow defaults, disabled Actions review approval, all-external fork approval, full-SHA enforcement, and the missing client-web production-main policy. Final settings and workflow audits pass; `.github` commit `510cdd3` publishes the final guardrail and client-web PR #53 records the completed task evidence.
 - **Control surface**: [`packet.md`](./packet.md) owns current task state and decisions. This file owns execution order, planned mutations, verification, and rollback.
 - **Durable owner**: `InKCre/.github` will own the organization Git and GitHub workflow standard. Repository code, tests, release mechanics, and profile-specific instructions remain with each repository.
 - **Enforcement scope**: `InKCre/core-py`, `InKCre/client-web`, `InKCre/ui`, and `InKCre/docs`. `InKCre/.github` is included only as the governance control plane.
@@ -34,7 +34,21 @@
 - Reject force pushes, deletion, and merge commits; require linear history.
 - Allow squash and rebase merges. Document squash as the normal choice and rebase as an intentional choice for curated commit series or stack maintenance.
 - Leave automatic branch deletion disabled while the stacked-PR workflow is being learned.
-- Preserve repository-specific check names and bind checks to the GitHub Actions app when the setting supports a source identity.
+- Name reported check contexts `<scope> <kind>` in lowercase. Use the repository name as `scope`
+  unless a monorepo job validates one independently understood application or package, in which case
+  use that application or package name. Validation kinds are `checks`, `tests`, and `e2e tests`:
+  `checks` is the aggregate code/build/package contract; use `tests` or `e2e tests` when those lanes
+  report independently. Delivery jobs use `preview`, `preview cleanup`, and `deployment`. Keep
+  implementation adjectives and internal architecture terms in step names and documentation rather
+  than public check names.
+- Treat required-context names as stable GitHub API. Bind them to the GitHub Actions app when the
+  setting supports a source identity, and migrate each existing repository only alongside a real
+  workflow change. Phase 5 applies this convention to `ui-web checks`; existing names in
+  `client-web`, `client-webext`, `core-py`, and `docs` remain unchanged until their next justified
+  workflow slice.
+- Repository-owned check contexts follow this naming convention. Provider-owned integration checks,
+  such as Cloudflare's fixed `Cloudflare Pages` context, retain the provider name and are documented
+  separately; do not create a duplicate wrapper job merely to rename them.
 - Treat an emergency rule change as audited break-glass work: state the reason and affected repository, obtain explicit authorization, restore the baseline immediately after recovery, and follow with a pull request. Do not maintain a routine administrator bypass.
 
 ## Stacked Pull-Request Convention
@@ -56,6 +70,7 @@
   - status-check and conversation semantics;
   - squash-default, rebase-allowed merge policy;
   - stacked pull-request procedure;
+  - stable `<scope> <kind>` public check naming for validation and delivery jobs;
   - candidate validation, preview delivery, release authority, and artifact identity;
   - GitHub Free enforcement and exception handling.
 - Add `CONTRIBUTING.md` as the concise contributor entrypoint. Link to `GOVERNANCE.md` and require repository-local verification commands.
@@ -149,13 +164,52 @@ GitHub uses defaults from a public `.github` repository only when a repository h
 
 ### `InKCre/ui` Package Profile
 
-- Keep `.github/workflows/ci.yml` as pull-request validation with required context `Reproducible workspace check` and Changesets validation.
+- Keep `.github/workflows/ci.yml` as pull-request validation and rename its aggregate required
+  context from `Reproducible workspace check` to `ui-web checks`. The job continues to own the
+  frozen workspace, generated-output, type, unit-test, build, packed-package, story, and Changesets
+  contracts; the simpler context name describes its public scope rather than every internal step.
 - Keep `.github/workflows/release-and-publish.yml` as the only package release authority on `main`:
   - serialize runs with one `ui-release-main` concurrency group;
   - use `cancel-in-progress: false` so a publication is never cancelled halfway;
   - continue using the built-in `GITHUB_TOKEN` as `NODE_AUTH_TOKEN` for GitHub Packages.
+- Migrate Histoire delivery from Cloudflare's Git pull integration to repository-owned runner push
+  without replacing the existing `inkcre-web-design` Pages project or its custom domain:
+  - export the current Pages project/build/domain/branch-control configuration before editing; use
+    `wrangler pages download config` in a disposable location or the authenticated Cloudflare API,
+    review the result, and never copy credentials into the repository;
+  - pin Wrangler in the workspace and check in a reviewed Pages configuration derived from the
+    existing project, with project name and `packages/web/.histoire/dist` output owned as code;
+  - keep `ui-web checks` secret-free and upload its exact successful Histoire output as a short-lived
+    artifact;
+  - add a trusted `workflow_run` preview controller that accepts only an open, same-repository pull
+    request targeting `main` at the exact checked head, downloads that artifact without executing
+    pull-request code, and pushes it to deterministic Cloudflare branch `pr-N`;
+  - add a trusted close controller that replaces the exact `pr-N` alias with a small `noindex`
+    tombstone; accept that older immutable Cloudflare deployments remain reachable;
+  - add a protected-main delivery workflow that checks out exact `main`, performs a focused Histoire
+    release build, transfers the same-run artifact to a production job, pushes it with Wrangler, and
+    smokes `https://design.inkcre.dev`;
+  - use repository `preview` and `production` environments, select the existing organization
+    Cloudflare credentials for `ui`, and set repository variable `CLOUDFLARE_PAGES_PROJECT` to
+    `inkcre-web-design`; separate preview and production tokens are not required for this static site;
+  - name repository-owned delivery jobs `ui-web preview`, `ui-web preview cleanup`, and
+    `ui-web deployment`; keep them as delivery evidence rather than merge-required contexts.
+- Cut over without downtime: keep Cloudflare automatic Git builds enabled while the runner delivery
+  foundation lands and proves one main push; prove runner preview on a subsequent non-stacked UI
+  pull request, then disable automatic preview and production builds, merge through the runner lane,
+  and verify the canonical site and close-time retirement. Previous deployments remain hosted
+  throughout the transition. The Cloudflare GitHub App is currently installed for all organization
+  repositories, so removing only `ui` access is not a Phase 5 exit condition; audit and narrow that
+  installation separately only when the other repositories' usage is known.
+- Treat package publication and Histoire delivery as parallel outputs of protected `main`. A failure
+  in one lane does not prove the other artifact invalid; record and repair the failed authority
+  without republishing the successful output solely to synchronize run IDs.
 - Resolve current release pull request #34 before tightening protection:
-  - immediately approve its `action_required` run or manually dispatch `.github/workflows/ci.yml` against `changeset-release/main`;
+  - prefer approving its existing `action_required` pull-request run so the PR-only Changesets
+    validation executes as well as the workspace check;
+  - use manual dispatch against `changeset-release/main` only as a fallback, because the current
+    workflow skips Changesets validation for `workflow_dispatch`; pair that fallback with an
+    explicit exact-head release-diff/Changesets validation;
   - verify that the successful `Reproducible workspace check` is attached to the exact release pull-request head SHA and GitHub Actions app identity.
 - Accept manual approval or dispatch as the initial low-frequency release-PR operating procedure.
 - If repeated release-PR updates make that procedure materially costly, automate in a separately approved slice with a dedicated GitHub App installed only on `InKCre/ui`:
@@ -165,9 +219,16 @@ GitHub uses defaults from a public `.github` repository only when a repository h
   - pass that token through `changesets/action`'s `with.github-token` input;
   - keep package publication on the built-in token;
   - do not use a classic PAT, execute pull-request head code under `pull_request_target`, or synthesize custom required checks.
-- Extend the existing repository rulesets so `main` requires a pull request, conversation resolution, linear history, the current strict required context, and no bypass. Preserve deletion and non-fast-forward protection.
+- After the Phase 5 workflow pull request reports successful `ui-web checks`, atomically replace the
+  old required context with `ui-web checks` bound to GitHub Actions app `15368`; do not add a second
+  compatibility job. In the same settings slice, extend the existing rulesets so `main` requires a
+  pull request, conversation resolution, linear history, the strict required context, and no bypass.
+  Preserve deletion and non-fast-forward protection.
 - Disable merge commits; retain squash and rebase. Changesets reads the final `.changeset` files, so either method preserves version intent.
 - In stacked package work, merge bottom-up and restack before checks. Never use `changeset-release/main` as the base of a feature stack.
+- Require maintainer approval before workflows from every external fork contributor run. Approval
+  permits only secret-free `ui-web checks`; the same-repository identity gate independently denies
+  runner preview delivery to forks.
 
 ### `InKCre/docs` Documentation-Site Profile
 
@@ -271,25 +332,73 @@ credential or a synthetic fork.
 
 ### Phase 4: Core Service Alignment
 
-- Land contribution-link and immutable-Action-pin changes without changing the core runtime topology.
-- Verify all four required contexts, preview identity and cleanup, GHCR publication, exact-current-main production guard, and Heroku health checks.
-- Enable linear history and repository merge-method settings after checks are green.
+- Do not use the intentionally unmergeable synchronized product PR #45 as the governance acceptance
+  vehicle. Create a dedicated clean branch/worktree from current `core-py/origin/main`, extract only
+  the contribution-link and immutable-Action-pin changes, and leave PR #45 draft and unchanged.
+- Keep the repository check scoped to program code and infrastructure configuration. Configure Ruff
+  centrally to exclude Markdown so populated Hub references and task prose cannot fail the code gate;
+  retain actionlint and the existing Python, lock, migration, settings, type, and test contracts.
+- Verify all four required contexts plus preview identity/delivery on the small governance pull
+  request. Do not copy PR #45's product-specific stale validation repairs into this slice.
+- After those checks are green, enable linear history, disable merge commits while retaining squash
+  and rebase, and merge the governance pull request through the protected path.
+- Use the resulting main runs to verify GHCR publication, exact-current-main production guard,
+  production health checks, and movement of `stable`; then verify preview cleanup and remove the
+  temporary worktree.
 - Rollback: revert documentation/pins through a pull request and restore merge settings. Do not roll back production artifacts solely to undo governance metadata.
 
 ### Phase 5: Package Repository Alignment
 
-- Resolve `ui` release pull request #34 with exact-head evidence.
-- Land release concurrency and any immutable-Action-pin changes.
-- Exercise a disposable two-level stack bottom-up; verify restacking, latest-base checks, squash-default behavior, and optional rebase merge without merge commits.
-- Extend the UI rulesets only after the release pull request can reliably obtain `Reproducible workspace check`.
+- Refresh and export UI repository settings plus the current `inkcre-web-design` Cloudflare project
+  configuration. Confirm the existing organization Cloudflare credential can address that project;
+  if it cannot, stop before cutover and create a project-scoped Pages token rather than weakening the
+  workflow or replacing the live project.
+- Amend organization governance with the `<scope> <kind>` check-context convention. Apply it only to
+  `ui` in this phase; do not reopen completed `client-web` or `core-py` workflow work merely to rename
+  contexts.
+- Resolve and merge `ui` release pull request #34 under its existing required-context name, with
+  exact-head pull-request-event evidence, before changing that name; verify the resulting package
+  publication, tag, release, main Release run, Cloudflare main deployment, and canonical Histoire
+  site. If the old `action_required` run can no longer be approved, use exact-head manual CI plus a
+  separate release-diff/Changesets validation rather than silently omitting the PR-only step.
+- Land the runner-CD foundation through the existing `Reproducible workspace check` context. Keep
+  every existing Action pin and pin each newly introduced artifact/deployment Action at its reviewed
+  immutable commit. Verify the existing `Cloudflare Pages` check and exact-head branch preview while
+  the pull integration remains active. After merge, verify the new runner-owned
+  `ui-web deployment` against `https://design.inkcre.dev` before disabling either Cloudflare build
+  lane.
+- Use a second sequential, non-stacked governance/release pull request for the `ui-web checks` rename
+  and non-cancelling `ui-release-main` concurrency. Wait for that exact head to report the successful
+  new GitHub-Actions-owned context while the old rule still blocks merge. Prove runner-owned
+  `ui-web preview` and its deterministic `pr-N` alias, disable Cloudflare automatic Git deployments,
+  atomically switch the required context and remaining rules, then merge and verify runner-only
+  production delivery and close-time preview retirement before considering any organization-wide
+  Cloudflare App access change.
+- Record manual exact-head dispatch or approval as the initial operating procedure for low-frequency
+  Changesets and design-token pull requests created by the built-in `GITHUB_TOKEN`.
+- Do not create synthetic pull requests solely to exercise stacking. Keep the documented bottom-up
+  restack procedure available for real stacked work, and validate it only when such work naturally
+  occurs.
+- Disable merge commits while retaining squash and rebase after the new required context is proven.
 - Treat dedicated GitHub App automation as a separate credential-bearing Impact Handshake after manual operating cost is observed.
-- Rollback: restore rulesets and revert workflow changes. Revoke the optional App installation and secret if that later slice fails; its issued token expires independently.
+- Rollback: before disabling automatic Cloudflare builds, retain the exported project/build settings.
+  If runner delivery fails before cutover, leave the pull integration active and revert the runner
+  workflow through a pull request. If it fails after cutover, re-enable automatic production and
+  preview builds first so `design.inkcre.dev` keeps receiving updates, then revert. Coordinate the
+  workflow job name and required-context rule so the ruleset never waits for a name the active
+  workflow cannot emit; restore the exported rulesets and merge settings as needed. Do not unpublish
+  an already successful package solely to roll back Histoire delivery. Revoke the optional release
+  App installation and secret if that later slice fails; its issued token expires independently.
 
 ### Phase 6: Actions Hardening and Final Audit
 
-- Change per-repository workflow defaults to read-only and disallow Actions approval of pull-request reviews.
-- Enforce immutable Action SHAs after the pin audit.
-- Pilot and then apply selected-actions allowlists one repository at a time.
+- Freeze each repository's Actions settings, fork policy, production branch policy, workflow action references, and rollback payload before mutation.
+- Change remaining per-repository workflow defaults to read-only and disallow Actions approval of pull-request reviews. Preserve explicit job-level write grants for release and deployment jobs.
+- Require maintainer approval before every external fork contributor's read-only, secret-free workflow run in all four repositories.
+- Enforce immutable Action SHAs after confirming every checked-in external Action is already pinned to a full commit SHA; local actions remain local references.
+- Add the missing `main`-only branch policy to the `client-web` production environment.
+- Treat selected-actions allowlists as optional defense in depth. If justified, probe only `docs` first with GitHub-owned Actions plus exact current third-party action patterns, then restore `allowed_actions=all` on any unexplained workflow-start failure. Do not make the allowlist a Phase 6 exit condition.
+- After each repository mutation, run a secret-free manual validation workflow and stop or restore that repository before continuing if it cannot start normally.
 - Run a final read-only audit against all common controls, profile-specific workflows, environment policies, templates, required-check sources, and merge methods.
 - Record any exception with owner, reason, compensating control, and review date in `GOVERNANCE.md`; do not hide drift in the task packet.
 - Exit condition: the final audit has no unexplained difference between the documented standard and live GitHub state.
@@ -309,7 +418,6 @@ credential or a synthetic fork.
   - a failed latest-head required check blocks merge;
   - unresolved review conversation blocks merge;
   - an eligible corrected pull request merges through squash by default;
-  - a two-level stack can be merged bottom-up after restacking;
   - pull-request previews are isolated and cleaned without production authority;
   - protected-main release workflows build, identify, deploy or publish, and verify their own outputs;
   - direct administrator push is unavailable under normal configuration.
diff --git a/tasks/organization-git-workflow/packet.md b/tasks/organization-git-workflow/packet.md
index 7fd71b1..5487142 100644
--- a/tasks/organization-git-workflow/packet.md
+++ b/tasks/organization-git-workflow/packet.md
@@ -3,8 +3,8 @@
 - **Objective**: establish one organization-level Git and pull-request workflow for the active `core-py`, `client-web`, `ui`, and `docs` repositories, with a shared governance baseline and repository-type-specific CI/CD profiles.
 - **Guardrails**: stay within GitHub Free; keep application, package, and documentation-site delivery semantics distinct; use `InKCre/.github` as the future GitHub-native governance owner without moving product or system truth out of `InKCre/docs`; do not introduce cross-repository changelog or change-set machinery; keep pull-request validation free of canonical publication and production authority; do not change code, repository settings, workflows, or remote state without a separate explicit start.
 - **Verification**: live GitHub settings and checked-in workflows for all four repositories match the approved baseline; required checks protect pull requests before merge; unresolved review conversations block merge; pull-request workflows do not publish canonical artifacts or mutate shared release environments; any post-merge workflow has a repository-specific release or deployment purpose; checked source and released artifact identity are stated accurately; the organization default contribution guide and pull-request template render from `InKCre/.github`; a final read-only audit finds no unexplained governance drift.
-- **Current Truth**: Phases 0-3 are complete. The Phase 3 acceptance anchor on `client-web/main` was `cc857104e07cc41bc77db19acf75676b0cb22d15`; later documentation-only merges may advance the branch without replacing that evidence. Pull-request and merge-group validation resolve core-py's production-admitted `stable` image once, generate Supabase types from its raw PostgreSQL schema artifact, run the real core service against fresh pgvector/PostgreSQL and PostgREST, and report the four direct required contexts `Workspace contract`, `Dependency review`, `client-web E2E`, and `client-webext E2E`. PR #49 and merge-group run `31256717813` live-proved all four checks on the synthetic current-main commit. Same-repository Pages preview, close-time stable-alias retirement, focused exact-main build, same-run artifact delivery, and production smoke are live-proven. Main protection now applies to administrators, requires resolved conversations and linear history, rejects force-push/deletion, and disables merge commits; Actions defaults are read-only, Actions cannot approve PRs, and every external fork run requires maintainer approval. The temporary one-entry merge queue was removed after the probe so squash remains the default rather than a forced merge method and rebase remains available. Core producer PRs #43/#44 and client PRs #40/#43/#45/#47/#48/#49 merged normally without administrator bypass. Deferred synchronized product work is preserved as mergeable draft PRs [client-web #50](https://github.com/InKCre/client-web/pull/50) and [core-py #45](https://github.com/InKCre/core-py/pull/45), with original snapshot branches retained.
-- **Next Step**: The matching `.github` governance amendment is published as `8018be3`. Proceed only under a separate start to the remaining `core-py`, `ui`, and organization-wide hardening phases. Review core-py #45 first; when its schema-bearing service reaches `stable`, rerun client-web #50 so generated types and real-service E2E become its admission proof. Keep PR #50 draft until then. Do not weaken E2E or restore the obsolete checked source/image/migration tuple.
+- **Current Truth**: Phases 0-6 are complete. The Phase 3 acceptance anchor on `client-web/main` was `cc857104e07cc41bc77db19acf75676b0cb22d15`; later documentation-only merges may advance the branch without replacing that evidence. Pull-request and merge-group validation resolve core-py's production-admitted `stable` image once, generate Supabase types from its raw PostgreSQL schema artifact, run the real core service against fresh pgvector/PostgreSQL and PostgREST, and report the four direct required contexts `Workspace contract`, `Dependency review`, `client-web E2E`, and `client-webext E2E`. PR #49 and merge-group run `31256717813` live-proved all four checks on the synthetic current-main commit. Same-repository Pages preview, close-time stable-alias retirement, focused exact-main build, same-run artifact delivery, and production smoke are live-proven. Client-web main protection applies to administrators, requires resolved conversations and linear history, rejects force-push/deletion, and disables merge commits; its Actions defaults are read-only, Actions cannot approve PRs, and every external fork run requires maintainer approval. The temporary one-entry merge queue was removed after the probe so squash remains the default rather than a forced merge method and rebase remains available. Core producer PRs #43/#44 and client PRs #40/#43/#45/#47/#48/#49 merged normally without administrator bypass. Deferred synchronized product work is preserved as mergeable draft PRs [client-web #50](https://github.com/InKCre/client-web/pull/50) and [core-py #45](https://github.com/InKCre/core-py/pull/45), with original snapshot branches retained. Core-py PR #45 was intentionally excluded from Phase 4 because its first product commit already changes the database contract. Independent [core-py PR #46](https://github.com/InKCre/core-py/pull/46) was squash-merged through the protected path as main `531b0d28`; it links organization governance, pins external Actions, and excludes Markdown from Ruff's code gate without changing runtime or database topology. PR required checks and preview were green in `31261340753`, `31261340743`, and `31261340759`; main CI `31261689850`, immutable publication `31261772024`, production `31261814390`, and close cleanup `31261690128`/`31261689954` all succeeded. GHCR digest `sha256:6c5899817a5eaaa899ea4070bde304ff8ebb46089e2f63930be08c199a468f5f` carries the exact main SHA, `main`, and `stable` tags after production admission. Core-py now requires linear history, disables merge commits, retains squash/rebase, and preserves all four strict GitHub-Actions-bound checks plus admin/conversation/no-force/no-delete controls. UI Phase 5 preserved Changesets package publication, moved Histoire preview and production delivery to repository-owned runner push, adopted `ui-web checks`, serialized release runs, disabled Cloudflare automatic Git builds, and enforced the same PR/conversation/linear/no-bypass merge baseline through repository rulesets. Phase 6 aligned repository-level Actions controls, added the missing client-web production policy, passed four live validation runs, published the final organization guardrail as `.github` commit `510cdd3`, and found no unexplained governance drift.
+- **Next Step**: Review and merge documentation-only [client-web PR #53](https://github.com/InKCre/client-web/pull/53), which records the already-complete governance rollout; it does not gate the live settings. Selected-actions allowlists remain optional and were not applied. Separately, when core-py PR #45's schema-bearing service is ready and reaches `stable`, rerun client-web #50; keep it draft until then.
 
 ## Target `client-web` Operating Model
 
@@ -89,7 +89,7 @@ leaving peer-dependent application code on main would remain a false green and i
   - `client-web` PR #29 checked synthetic merge commit `9cb69ce`; its tree `7bc0d1a` equals the final squash commit `400c581` tree, while the commit identities differ. The main run rebuilds that tree and `pages-deploy.yml` deploys the uploaded `client-web-dist` unchanged.
   - `core-py` CI builds and tests the Dockerfile's `artifact` target; `artifact-publish.yml` rebuilds that target for GHCR; `production-deploy.yml` separately builds `heroku-web`, `heroku-release`, and PostgREST images before delivery.
   - `docs` `Website checks` builds and uploads `inkcre-website-dist` on pull requests and main; `Pages deployment` downloads the successful current-main artifact without rebuilding. Current main run `31143401361` and deployment `31143435829` are green, but `Website contract` is not required because main is unprotected.
-  - `ui` requires `Reproducible workspace check` through a repository ruleset. Its main-only Changesets workflow creates a release PR when changesets exist and publishes `@inkcre/ui-web` after that PR reaches main. Release PR #34 is currently blocked because its bot-authored check run is `action_required` and the required context was not emitted.
+  - `ui` requires strict GitHub-Actions-owned `ui-web checks` through repository ruleset `19865127`. Its main-only Changesets workflow creates a release PR when changesets exist and publishes `@inkcre/ui-web` after that PR reaches main. Release runs are serialized without cancellation. The exact-head run for release PR #34 was manually approved, the check passed, and the merged release published `@inkcre/ui-web@1.3.1`; dedicated release-App automation remains deferred until repeated manual cost is demonstrated.
 - Decisions:
   - Scope is the four active repositories; `InKCre/.github` is the governance carrier and control-plane exception; GitHub Team is out of scope; cross-repository change-set and changelog coordination are out of scope.
   - Pull-request workflows validate candidate changes. They may use scoped delivery capability to create an isolated, deterministic, short-lived preview as validation evidence, but may not publish a canonical release, mutate a shared release environment, or exercise production authority. Preview writes still require a trusted controller, same-repository source, scoped credentials, deterministic naming, concurrency isolation, and cleanup. A persistent shared staging environment is part of the release lane rather than this preview exception.
@@ -116,6 +116,8 @@ leaving peer-dependent application code on main would remain a false green and i
   - `docs` pull-request validation includes an isolated Cloudflare Pages preview for successful same-repository pull requests. The preview uses the checked pull-request artifact through a trusted controller, deterministic PR namespace, `noindex`, concurrency isolation, and close-time retirement; it never becomes the production artifact. Closure replaces the live preview with a trusted `noindex` tombstone; older immutable deployments remain in Cloudflare history. Fork pull requests remain build/test only.
   - Unresolved review conversations should block merge. Merge commits should be disabled and linear history required. Squash is the documented default; rebase merge remains available for intentionally curated commit series and stacked-pull-request work. GitHub exposes allowed merge methods but no repository setting that makes squash the enforced UI default while rebase remains available, so the preference is a documented convention rather than a mechanical gate.
   - The initial rollout requires pull requests but zero approving reviews; conversation resolution and required checks remain mandatory. Automatic branch deletion stays disabled while stacked pull requests are being learned.
+  - Public GitHub check names use lowercase `<scope> <kind>`. `scope` is the repository or an independently understood application/package inside a monorepo. Validation kinds are `checks`, `tests`, and `e2e tests`; delivery jobs use `preview`, `preview cleanup`, and `deployment`. Public names identify ownership and evidence class, while detailed implementation terms remain step-level truth. Phase 5 adopts `ui-web checks` and the UI delivery names; existing client, extension, core, and docs contexts remain unchanged until a future justified workflow change.
+  - `ui` has deployment as well as package publication. Phase 5 reused the existing `inkcre-web-design` project and custom domain while moving Histoire build and delivery from Cloudflare's Git pull lane to runner-pushed, pinned-Wrangler workflows and checked-in Pages configuration. Secret-free `ui-web checks` supplies the exact preview artifact; a trusted same-repository controller deploys deterministic `pr-N`, close replaces that alias with a `noindex` tombstone, and protected main builds and pushes its own same-run artifact before canonical smoke. A dual-run main proof preceded the cutover; Cloudflare automatic preview and production builds are now disabled. The Cloudflare GitHub App remains connected with all-repository organization access, so narrowing that installation is deferred until other consumers are audited rather than risk changing unrelated repositories in Phase 5. Package release and Histoire delivery remain independent protected-main outputs; neither lane's success proves the other succeeded, and historical immutable previews remain reachable by Cloudflare design.
   - `.github` is not an active product repository and is outside the common branch-policy baseline. Phase 1 directly published its GitHub-native governance/community files to `main`, retired the superseded VitePress/Pages site, and moved the organization website link to `https://inkcre.dev`.
 - Open questions: whether the private core image is readable in an approved secret-free fork workflow or should become public; whether a future typed consumer actually needs a numeric pgvector override; how Heroku's registry reports the transferred image ID relative to the GHCR manifest; the final squash-commit title/body defaults; whether repeated `ui` release-PR approvals justify a separate repository-scoped GitHub App; and whether real stack frequency justifies stack tooling.
 - Work: [`implementation-plan.md`](./implementation-plan.md) contains the independent, phased mutation and verification plan.
diff --git a/tests/e2e/browser-extension.spec.ts b/tests/e2e/browser-extension.spec.ts
index b888ed4..30e9db3 100644
--- a/tests/e2e/browser-extension.spec.ts
+++ b/tests/e2e/browser-extension.spec.ts
@@ -29,7 +29,7 @@ test('built Chromium extension loads its real popup', async ({ context, page, ex
       })
     },
     {
-      INKCRE_CLIENT_ID: '063cd1df-c495-5006-a119-67aa633b26be',
+      INKCRE_PEER_ID: '063cd1df-c495-5006-a119-67aa633b26be',
       INKCRE_JWT_SECRET: 'client-webext-e2e-secret-at-least-32-bytes',
       INKCRE_PGREST_URL: 'http://127.0.0.1:9/',
     }
diff --git a/tests/e2e/mail-info-base.spec.ts b/tests/e2e/mail-info-base.spec.ts
new file mode 100644
index 0000000..21bc40f
--- /dev/null
+++ b/tests/e2e/mail-info-base.spec.ts
@@ -0,0 +1,177 @@
+import { expect, test } from '@playwright/test'
+import { SignJWT } from 'jose'
+
+const postgrestUrl = process.env.INKCRE_E2E_POSTGREST_URL!
+const jwtSecret = process.env.INKCRE_E2E_JWT_SECRET!
+const coreUrl = process.env.INKCRE_E2E_CORE_URL!
+
+type BlockRow = {
+  id: number
+  resolver: string
+  content: string
+}
+
+type RelationRow = {
+  from_: number
+  to_: number
+  content: string
+}
+
+type AcceptanceGraph = {
+  email: number
+  mimePart: number
+  parent: number
+}
+
+async function token(): Promise<string> {
+  return new SignJWT({ role: 'authenticated' })
+    .setProtectedHeader({ alg: 'HS256' })
+    .setIssuedAt()
+    .setExpirationTime('1h')
+    .setIssuer('inkcre-peer')
+    .setAudience('inkcre-api')
+    .sign(new TextEncoder().encode(jwtSecret))
+}
+
+async function rows<Row>(path: string): Promise<Row[]> {
+  const response = await fetch(new URL(path, postgrestUrl), {
+    headers: { Authorization: `Bearer ${await token()}` },
+  })
+  const body = await response.text()
+  expect(response.ok, body).toBe(true)
+  return JSON.parse(body) as Row[]
+}
+
+async function locateAcceptanceGraph(): Promise<AcceptanceGraph> {
+  const emails = await rows<BlockRow>(
+    'blocks?select=id,resolver,content&resolver=eq.extensions.mail.email.v1&order=id.desc'
+  )
+  for (const email of emails) {
+    const root = JSON.parse(email.content) as { message_id?: string }
+    if (root.message_id !== 'deep-module-reply@inkcre.acceptance') continue
+
+    const relations = await rows<RelationRow>(
+      `relations?select=from_,to_,content&or=(from_.eq.${email.id},to_.eq.${email.id})`
+    )
+    const component = relations.find((relation) => {
+      if (relation.from_ !== email.id) return false
+      try {
+        const content = JSON.parse(relation.content) as { role?: string }
+        return content.role === 'inline'
+      } catch {
+        return false
+      }
+    })
+    const parent = relations.find(
+      (relation) => relation.from_ === email.id && relation.content.startsWith('parent:')
+    )
+    if (!component || !parent) continue
+
+    const materialized = await rows<RelationRow>(
+      `relations?select=from_,to_,content&from_=eq.${component.to_}&content=eq.content`
+    )
+    if (materialized.length === 0) {
+      return { email: email.id, mimePart: component.to_, parent: parent.to_ }
+    }
+  }
+  throw new Error('The Mail acceptance graph has no unmaterialized inline MIME part')
+}
+
+test.beforeEach(async ({ page }) => {
+  await page.addInitScript(
+    ({ postgrestUrl, jwtSecret }) => {
+      try {
+        localStorage.setItem(
+          'inkcre_app_config',
+          JSON.stringify({
+            INKCRE_PGREST_URL: postgrestUrl,
+            INKCRE_JWT_SECRET: jwtSecret,
+            INKCRE_PEER_ID: '00000000-0000-4000-8000-000000000001',
+          })
+        )
+      } catch {
+        // Sandboxed email frames intentionally have no localStorage access.
+      }
+    },
+    { postgrestUrl, jwtSecret }
+  )
+})
+
+test('Mail is used through the generic InfoBase navigation host', async ({ page }) => {
+  const graph = await locateAcceptanceGraph()
+  const remoteEntry = page.waitForResponse(
+    (response) => response.url().includes('/mail/client-web/remoteEntry.js') && response.ok()
+  )
+  const trackerRequests: string[] = []
+  page.on('request', (request) => {
+    if (request.url().includes('tracker.invalid')) trackerRequests.push(request.url())
+  })
+
+  await page.goto('/info-base/graph')
+  await remoteEntry
+
+  const community = page.locator('.community-navigator__dropdown')
+  await community.locator('.ink-dropdown').click()
+  await community.locator('.ink-dropdown__option', { hasText: 'All Communities' }).click()
+  const graphNode = page.locator(`.vue-flow__node[data-id="${graph.email}"] .block-node`)
+  await expect(graphNode).toBeVisible()
+  await graphNode.click()
+  await expect(page).toHaveURL(new RegExp(`/info-base/graph/blocks/${graph.email}$`))
+  const inspector = page.locator('.block-inspector-popup')
+  await expect(inspector).toContainText(`#${graph.email}`)
+
+  await inspector.getByRole('button', { name: 'View content' }).click()
+  await expect(page).toHaveURL(new RegExp(`/info-base/graph/blocks/${graph.email}/content$`))
+  await expect(
+    page.getByRole('heading', {
+      name: 'Re: A deep module is measured by the promise it hides',
+    })
+  ).toBeVisible()
+
+  const html = page.frameLocator('iframe[title="Email HTML body"]')
+  await expect(
+    html.getByRole('heading', { name: 'Deep modules preserve a small promise' })
+  ).toBeVisible()
+  await expect(html.locator('script')).toHaveCount(0)
+  await expect(html.getByAltText('remote tracker')).not.toHaveAttribute('src')
+  await expect(html.getByAltText('Architecture map')).not.toHaveAttribute('src')
+  await expect(html.getByRole('link', { name: 'Read about information hiding' })).toHaveAttribute(
+    'target',
+    '_blank'
+  )
+  expect(await page.evaluate(() => '__mailAcceptanceScriptExecuted' in window)).toBe(false)
+  expect(trackerRequests).toEqual([])
+
+  const inlinePart = page.locator('.content-email__part', { hasText: 'architecture-map.png' })
+  const delegated = page.waitForRequest(
+    (request) =>
+      request.url() === `${coreUrl}mail/mime-parts/materialize` && request.method() === 'POST'
+  )
+  await inlinePart.getByRole('button', { name: 'Download' }).click()
+  const materializeRequest = await delegated
+  expect(materializeRequest.postDataJSON()).toEqual({ block: graph.mimePart })
+  await expect(inlinePart.getByRole('link', { name: 'Open' })).toBeVisible()
+  await expect(html.getByAltText('Architecture map')).toHaveAttribute('src', /^blob:/)
+  expect(trackerRequests).toEqual([])
+
+  await page.locator('.solved-content-popup__header button:has(.i-mdi-close)').click()
+  await expect(page).toHaveURL(new RegExp(`/info-base/graph/blocks/${graph.email}$`))
+  await expect(page.locator('.block-inspector-popup')).toContainText(`#${graph.email}`)
+  await page.locator('.block-inspector-popup').getByRole('button', { name: 'View content' }).click()
+  await expect(page).toHaveURL(new RegExp(`/info-base/graph/blocks/${graph.email}/content$`))
+  await expect(
+    page.getByRole('heading', {
+      name: 'Re: A deep module is measured by the promise it hides',
+    })
+  ).toBeVisible()
+
+  await page.getByRole('button', { name: /View reply target:/ }).click()
+  await expect(page).toHaveURL(new RegExp(`/info-base/graph/blocks/${graph.parent}$`))
+  await expect(page.locator('.block-inspector-popup')).toContainText(`#${graph.parent}`)
+
+  await page.locator('.block-inspector-popup__header button:has(.i-mdi-close)').click()
+  await expect(page).toHaveURL(new RegExp(`/info-base/graph/blocks/${graph.email}/content$`))
+
+  await page.goto('/info-base/graph/blocks/2147483647')
+  await expect(page.getByText('Block #2147483647 no longer exists.')).toBeVisible()
+})
diff --git a/tests/e2e/peer-database.spec.ts b/tests/e2e/peer-database.spec.ts
index 9c1e4b4..ad15ba2 100644
--- a/tests/e2e/peer-database.spec.ts
+++ b/tests/e2e/peer-database.spec.ts
@@ -10,7 +10,7 @@ async function token(secret = jwtSecret) {
     .setProtectedHeader({ alg: 'HS256' })
     .setIssuedAt()
     .setExpirationTime('1h')
-    .setIssuer('inkcre-client')
+    .setIssuer('inkcre-peer')
     .setAudience('inkcre-api')
     .sign(new TextEncoder().encode(secret))
 }
@@ -23,7 +23,7 @@ test.beforeEach(async ({ page }) => {
         JSON.stringify({
           INKCRE_PGREST_URL: postgrestUrl,
           INKCRE_JWT_SECRET: jwtSecret,
-          INKCRE_CLIENT_ID: '00000000-0000-4000-8000-000000000002',
+          INKCRE_PEER_ID: '00000000-0000-4000-8000-000000000001',
         })
       )
     },
@@ -37,41 +37,49 @@ test('built browser artifact reads and writes the peer protocol', async ({ page
 
   const authorization = `Bearer ${await token()}`
   const result = await page.evaluate(
-    async ({ postgrestUrl, authorization, coreUrl }) => {
+    async ({ postgrestUrl, authorization }) => {
       const read = await fetch(
-        `${postgrestUrl}clients?select=id,name&id=eq.00000000-0000-4000-8000-000000000002`,
+        `${postgrestUrl}peers?select=id,name&id=eq.00000000-0000-4000-8000-000000000001`,
         { headers: { Authorization: authorization } }
       )
-      const write = await fetch(`${postgrestUrl}clients`, {
+      const write = await fetch(`${postgrestUrl}peers?on_conflict=id`, {
         method: 'POST',
         headers: {
           Authorization: authorization,
           'Content-Type': 'application/json',
-          Prefer: 'return=representation',
+          Prefer: 'resolution=merge-duplicates,return=representation',
         },
         body: JSON.stringify({
           id: '11111111-1111-4111-8111-111111111111',
-          name: 'client-web-e2e',
+          name: 'peer-e2e',
           labels: ['e2e'],
-          rest_api_url: coreUrl,
           config: {},
           config_schema: {},
+          capabilities: [],
+          lease_expires_at: null,
         }),
       })
+      const writeBody = await write.json()
+      const cleanup = await fetch(
+        `${postgrestUrl}peers?id=eq.11111111-1111-4111-8111-111111111111`,
+        { method: 'DELETE', headers: { Authorization: authorization } }
+      )
       return {
         readStatus: read.status,
         readBody: await read.json(),
         writeStatus: write.status,
-        writeBody: await write.json(),
+        writeBody,
+        cleanupStatus: cleanup.status,
       }
     },
-    { postgrestUrl, authorization, coreUrl }
+    { postgrestUrl, authorization }
   )
 
   expect(result.readStatus).toBe(200)
   expect(result.readBody).toHaveLength(1)
   expect(result.writeStatus).toBe(201)
   expect(result.writeBody[0].id).toBe('11111111-1111-4111-8111-111111111111')
+  expect(result.cleanupStatus).toBe(204)
 })
 
 test('wrong and absent credentials are rejected', async ({ page }) => {
@@ -80,10 +88,10 @@ test('wrong and absent credentials are rejected', async ({ page }) => {
   )}`
   const statuses = await page.evaluate(
     async ({ postgrestUrl, wrongAuthorization }) => {
-      const wrong = await fetch(`${postgrestUrl}clients?select=id`, {
+      const wrong = await fetch(`${postgrestUrl}peers?select=id`, {
         headers: { Authorization: wrongAuthorization },
       })
-      const anonymous = await fetch(`${postgrestUrl}clients?select=id`)
+      const anonymous = await fetch(`${postgrestUrl}peers?select=id`)
       return [wrong.status, anonymous.status]
     },
     { postgrestUrl, wrongAuthorization }
@@ -91,3 +99,102 @@ test('wrong and absent credentials are rejected', async ({ page }) => {
 
   expect(statuses).toEqual([401, 401])
 })
+
+test('core Peer publishes and serves its exact capability inbounds', async ({ page }) => {
+  await page.goto('/')
+  const authorization = `Bearer ${await token()}`
+  const result = await page.evaluate(
+    async ({ postgrestUrl, authorization }) => {
+      const peersResponse = await fetch(
+        `${postgrestUrl}peers?select=capabilities,lease_expires_at&id=eq.00000000-0000-4000-8000-000000000002`,
+        { headers: { Authorization: authorization } }
+      )
+      const peers = await peersResponse.json()
+      const management = peers[0]?.capabilities?.find(
+        (capability: { id: string }) => capability.id === 'core.extension.management.v1'
+      )
+      const execution = await fetch(management.inbound.parameters.url, {
+        method: management.inbound.parameters.method,
+        headers: { Authorization: authorization, 'Content-Type': 'application/json' },
+        body: JSON.stringify({ action: 'disable', extension: 'not-installed-e2e-extension' }),
+      })
+      return {
+        peersStatus: peersResponse.status,
+        capabilities: peers[0]?.capabilities,
+        leaseExpiresAt: peers[0]?.lease_expires_at,
+        executionStatus: execution.status,
+      }
+    },
+    { postgrestUrl, authorization }
+  )
+
+  expect(result.peersStatus).toBe(200)
+  expect(Date.parse(result.leaseExpiresAt)).toBeGreaterThan(Date.now())
+  expect(result.capabilities).toEqual([
+    {
+      id: 'core.extension.management.v1',
+      inbound: {
+        protocol: 'core.peer.protocol.http.v1',
+        parameters: { method: 'POST', url: `${coreUrl}extension-management` },
+      },
+    },
+    {
+      id: 'core.organization.rumination.v1',
+      inbound: {
+        protocol: 'core.peer.protocol.http.v1',
+        parameters: { method: 'POST', url: `${coreUrl}organization/ruminate` },
+      },
+    },
+    {
+      id: 'core.semantic_retrieval.v1',
+      inbound: {
+        protocol: 'core.peer.protocol.http.v1',
+        parameters: { method: 'POST', url: `${coreUrl}semantic-retrieval` },
+      },
+    },
+  ])
+  expect(result.executionStatus).toBe(404)
+})
+
+test('BlockDetailsPanel delegates rumination through the discovered Peer', async ({ page }) => {
+  const authorization = `Bearer ${await token()}`
+  const content = `E2E rumination focal block ${Date.now()}`
+  const created = await fetch(`${postgrestUrl}blocks`, {
+    method: 'POST',
+    headers: {
+      Authorization: authorization,
+      'Content-Type': 'application/json',
+      Prefer: 'return=representation',
+    },
+    body: JSON.stringify({ content, resolver: 'core.text.v1', storage: null }),
+  })
+  expect(created.status).toBe(201)
+  const [block] = await created.json()
+
+  try {
+    await page.goto('/info-base/graph')
+    const node = page.locator('.block-node', { hasText: content })
+    await expect(node).toBeVisible()
+    await node.click()
+
+    const requestPromise = page.waitForRequest(
+      (request) =>
+        request.url() === `${coreUrl}organization/ruminate` && request.method() === 'POST'
+    )
+    await page.getByRole('button', { name: 'Ruminate' }).click()
+    const request = await requestPromise
+
+    expect(request.postDataJSON()).toEqual({ block: block.id })
+    await expect(
+      page.getByText(
+        'The provider may have completed the request. Refresh and inspect the graph before trying again.'
+      )
+    ).toBeVisible()
+  } finally {
+    const cleanup = await fetch(`${postgrestUrl}blocks?id=eq.${block.id}`, {
+      method: 'DELETE',
+      headers: { Authorization: authorization },
+    })
+    expect(cleanup.status).toBe(204)
+  }
+})