alinea 2.0.0-preview.0 → 2.0.0-preview.2

package/dist/bundled.d.ts

@@ -75,7 +75,21 @@ declare module 'alinea/adapter/next/context' {
 
   import { Config } from 'alinea/core/Config';
   import type { RequestContext } from 'alinea/core/Connection';
-  export function requestContext(config: Config): Promise<RequestContext>;
+  export function requestContext(config: Config, request?: Request): Promise<RequestContext>;
+  
+}
+
+declare module 'alinea/adapter/next/DevRemote' {
+
+  import type { RemoteConnection, RequestContext } from 'alinea/core/Connection';
+  import type { Config } from 'alinea/core/Config';
+  export function createDevRemote(context: RequestContext, config: Config): RemoteConnection;
+  
+}
+
+declare module 'alinea/adapter/next/ForwardCredentials' {
+
+  export function forwardDevelopmentCredentials(request: Request | undefined, apiKey: string, init?: RequestInit): RequestInit;
   
 }
 
@@ -83,6 +97,7 @@ declare module 'alinea/adapter/next/handler' {
 
   import { type BackendFactory, type BackendOptions } from 'alinea/backend/api/CreateBackend';
   import { type HandlerHooks } from 'alinea/backend/Handler';
+  import { Config } from 'alinea/core/Config';
   import { NextCMS } from 'alinea/adapter/next/cms';
   type Handler = (request: Request) => Promise<Response>;
   export interface NextHandlerOptions extends HandlerHooks {
@@ -90,6 +105,7 @@ declare module 'alinea/adapter/next/handler' {
       backend?: BackendFactory | BackendOptions;
   }
   export function createHandler(input: NextCMS | NextHandlerOptions): Handler;
+  export function handlerPathname(config: Config, requestUrl: URL): string;
   export {};
   
 }
@@ -465,30 +481,31 @@ declare module 'alinea/backend/HandleAction' {
 
 declare module 'alinea/backend/Handler' {
 
-  import type { Entry } from 'alinea/core';
   import type { CMS } from 'alinea/core/CMS';
-  import type { RemoteConnection, RequestContext } from 'alinea/core/Connection';
-  import type { LocalDB } from 'alinea/core/db/LocalDB';
+  import type { AuthedContext, RemoteConnection, RequestContext } from 'alinea/core/Connection';
+  import { LocalDB } from 'alinea/core/db/LocalDB';
+  import type { Mutation } from 'alinea/core/db/Mutation';
   export interface Handler {
       (request: Request, context: RequestContext): Promise<Response>;
   }
-  export type HookResponse<T = void> = void | T | Promise<T> | Promise<void>;
+  export type HookResponse<T = void> = void | T | Promise<void | T>;
+  export interface BeforeCommitContext {
+      mutations: ReadonlyArray<Mutation>;
+  }
+  export interface AfterCommitContext extends BeforeCommitContext {
+      sha: string;
+  }
   export interface HandlerHooks {
-      beforeCreate?(entry: Entry): HookResponse<Entry>;
-      afterCreate?(entry: Entry): HookResponse;
-      beforeUpdate?(entry: Entry): HookResponse<Entry>;
-      afterUpdate?(entry: Entry): HookResponse;
-      beforeArchive?(entryId: string): HookResponse;
-      afterArchive?(entryId: string): HookResponse;
-      beforeRemove?(entryId: string): HookResponse;
-      afterRemove?(entryId: string): HookResponse;
+      beforeCommit?(context: BeforeCommitContext): HookResponse<ReadonlyArray<Mutation>>;
+      afterCommit?(context: AfterCommitContext): HookResponse;
   }
   export interface HandlerOptions extends HandlerHooks {
       cms: CMS;
       db: LocalDB | Promise<LocalDB>;
       remote?: (context: RequestContext) => RemoteConnection;
+      forwardMutations?(request: Request, context: AuthedContext): Promise<Response | undefined>;
   }
-  export function createHandler({ cms, remote, db, ...hooks }: HandlerOptions): Handler;
+  export function createHandler({ cms, remote, db, forwardMutations, ...hooks }: HandlerOptions): Handler;
   
 }
 
@@ -523,10 +540,14 @@ declare module 'alinea/backend/Previews' {
 declare module 'alinea/backend/resolver/ParsePreview' {
 
   import type { LocalDB } from 'alinea/core/db/LocalDB';
-  import type { PreviewRequest } from 'alinea/core/Preview';
-  export function createPreviewParser(local: LocalDB): {
-      parse(preview: PreviewRequest, sync: () => Promise<unknown>): Promise<PreviewRequest | undefined>;
-  };
+  import { Entry } from 'alinea/core/Entry';
+  import type { PreviewRequest, PreviewUpdate } from 'alinea/core/Preview';
+  export interface DecodedEntryPreview {
+      entry: Entry;
+  }
+  export type DecodedPreviewRequest = PreviewUpdate | DecodedEntryPreview;
+  export function decodePreviewRequest(preview: PreviewRequest): Promise<DecodedPreviewRequest>;
+  export function applyPreview(local: LocalDB, preview: DecodedPreviewRequest): Promise<PreviewRequest | undefined>;
   
 }
 
@@ -688,6 +709,7 @@ declare module 'alinea/backend/router/Router' {
       function cookie(...cookies: Array<Cookie>): string;
       function compress(...routes: Array<Next<Request, Response | undefined>>): Route<Request, Response | undefined>;
   }
+  export function compressResponse(request: Request, response: Response): Response;
   export {};
   
 }
@@ -827,7 +849,7 @@ declare module 'alinea/cli/generate/DevDB' {
 
   import { Config } from 'alinea/core/Config';
   import type { UploadResponse } from 'alinea/core/Connection';
-  import { type CommitRequest } from 'alinea/core/db/CommitRequest';
+  import type { CommitRequest } from 'alinea/core/db/CommitRequest';
   import { LocalDB } from 'alinea/core/db/LocalDB';
   import { CachedFSSource } from 'alinea/core/source/FSSource';
   export interface DevDBOptions {
@@ -931,7 +953,7 @@ declare module 'alinea/cli/serve/CreateLocalServer' {
   import type { User } from 'alinea/core/User';
   import { type Request, Response } from '@alinea/iso';
   import type { ServeContext } from 'alinea/cli/serve/ServeContext';
-  export function createLocalServer({ cmd, configLocation, rootDir, staticDir, alineaDev, buildOptions, production, liveReload, buildId }: ServeContext, cms: CMS, handleApi: Handler, user: User): {
+  export function createLocalServer({ cmd, configLocation, rootDir, staticDir, alineaDev, buildOptions, production, liveReload, buildId, apiKey }: ServeContext, cms: CMS, handleApi: Handler, user: User): {
       close(): void;
       handle(input: Request): Promise<Response>;
   };
@@ -940,8 +962,8 @@ declare module 'alinea/cli/serve/CreateLocalServer' {
 
 declare module 'alinea/cli/serve/DevServer' {
 
-  import type { Request, Response } from '@alinea/iso';
-  import type { Config } from 'alinea/core/Config';
+  import { Config } from 'alinea/core/Config';
+  import { Request, type Response } from '@alinea/iso';
   import type { BuildOptions } from 'esbuild';
   export interface CreateDevServerOptions {
       cmd: 'dev' | 'build';
@@ -951,6 +973,7 @@ declare module 'alinea/cli/serve/DevServer' {
       buildOptions?: BuildOptions;
       alineaDev?: boolean;
       production?: boolean;
+      apiKey?: string;
       dashboardUrl: Promise<string>;
       onAfterGenerate?: (message: string, config: Config) => void;
   }
@@ -1032,6 +1055,7 @@ declare module 'alinea/cli/serve/ServeContext' {
       production: boolean;
       liveReload: LiveReload;
       buildId: string;
+      apiKey: string;
   }
   
 }
@@ -1044,6 +1068,7 @@ declare module 'alinea/cli/serve/StartServer' {
       respondWith(response: Response): Promise<void>;
   }
   export interface Server {
+      hostname: string;
       port: number;
       serve(abortController?: AbortController): AsyncIterable<RequestEvent>;
       close(): void;
@@ -1109,13 +1134,6 @@ declare module 'alinea/cli/util/EnsureNode' {
   
 }
 
-declare module 'alinea/cli/util/ExternalPlugin' {
-
-  import type { Plugin } from 'esbuild';
-  export function externalPlugin(cwd: string): Plugin;
-  
-}
-
 declare module 'alinea/cli/util/FindConfigFile' {
 
   export function findConfigFile(cwd: string): string | undefined;
@@ -1255,12 +1273,13 @@ declare module 'alinea/cloud/CloudRemote' {
   import { type Draft, type DraftKey } from 'alinea/core/Draft';
   import type { EntryRecord } from 'alinea/core/EntryRecord';
   import { ReadonlyTree } from 'alinea/core/source/Tree';
+  import type { GetBlobsOptions } from 'alinea/core/source/Source';
   import type { User, UserInput } from 'alinea/core/User';
   export class CloudRemote extends OAuth2 implements RemoteConnection {
       #private;
       constructor(context: RequestContext, config: Config);
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
       write(request: CommitRequest): Promise<{
           sha: string;
       }>;
@@ -1734,8 +1753,9 @@ declare module 'alinea/components/NumberField' {
   import { type LabelSharedProps } from 'alinea/components/Label';
   export interface NumberFieldProps extends Omit<NumberFieldPrimitiveProps, 'children'>, LabelSharedProps {
       steppers?: boolean;
+      placeholder?: string;
   }
-  export function NumberField({ steppers, ...props }: NumberFieldProps): import("react").JSX.Element;
+  export function NumberField({ steppers, placeholder, ...props }: NumberFieldProps): import("react").JSX.Element;
   
 }
 
@@ -2024,6 +2044,16 @@ declare module 'alinea/core/Auth' {
   
 }
 
+declare module 'alinea/core/BlobTransport' {
+
+  import { ReadableStream } from '@alinea/iso';
+  import type { GetBlobsOptions } from 'alinea/core/source/Source';
+  export const BLOB_SEQUENCE_CONTENT_TYPE = "application/cbor-seq";
+  export function encodeBlobSequence(blobs: AsyncIterable<[sha: string, blob: Uint8Array]>): ReadableStream<Uint8Array>;
+  export function decodeBlobSequence(stream: ReadableStream<Uint8Array>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+  
+}
+
 declare module 'alinea/core/Client' {
 
   import { type AuthResult } from 'alinea/cloud/AuthResult';
@@ -2035,6 +2065,7 @@ declare module 'alinea/core/Client' {
   import type { EntryRecord } from 'alinea/core/EntryRecord';
   import type { AnyQueryResult, GraphQuery } from 'alinea/core/Graph';
   import { ReadonlyTree } from 'alinea/core/source/Tree';
+  import type { GetBlobsOptions } from 'alinea/core/source/Source';
   import type { User, UserInput } from 'alinea/core/User';
   export type AuthenticateRequest = (request?: RequestInit) => RequestInit | undefined;
   export interface ClientOptions {
@@ -2065,7 +2096,7 @@ declare module 'alinea/core/Client' {
       revisions(file: string): Promise<Array<Revision>>;
       revisionData(file: string, revisionId: string): Promise<EntryRecord | undefined>;
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
       write(request: CommitRequest): Promise<{
           sha: string;
       }>;
@@ -2101,6 +2132,7 @@ declare module 'alinea/core/Config' {
   import { type Role } from 'alinea/core/Role';
   import { Root } from 'alinea/core/Root';
   import { Schema } from 'alinea/core/Schema';
+  import type { Tracer } from 'alinea/core/Trace';
   import { Type } from 'alinea/core/Type';
   import { Workspace, type WorkspaceInternal } from 'alinea/core/Workspace';
   /** Configuration options */
@@ -2130,10 +2162,13 @@ declare module 'alinea/core/Config' {
       publicDir?: string;
       /** Filename of the generated dashboard, defaults to admin.html */
       dashboardFile?: string;
+      /** Optional application-owned instrumentation for Alinea operations. */
+      tracer?: Tracer;
       auth?: Auth.View;
   }
   export namespace Config {
       function baseUrl(config: Config, env?: string): string | undefined;
+      function handlerUrl(config: Config): string;
       function adminPath(config: Config): string;
       function mainWorkspace(config: Config): WorkspaceInternal;
       function type(config: Config, name: string): Type | undefined;
@@ -2159,6 +2194,7 @@ declare module 'alinea/core/Connection' {
   import type { Draft, DraftKey } from 'alinea/core/Draft';
   import type { EntryRecord } from 'alinea/core/EntryRecord';
   import type { AnyQueryResult, GraphQuery } from 'alinea/core/Graph';
+  import type { GetBlobsOptions } from 'alinea/core/source/Source';
   import type { ReadonlyTree } from 'alinea/core/source/Tree';
   import type { User, UserInput } from 'alinea/core/User';
   export interface AuthApi {
@@ -2197,7 +2233,7 @@ declare module 'alinea/core/Connection' {
   }
   export interface SyncApi {
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncIterable<[sha: string, blob: Uint8Array]>;
   }
   export interface CommitApi {
       write(request: CommitRequest): Promise<{
@@ -2223,9 +2259,9 @@ declare module 'alinea/core/Connection' {
       isDev: boolean;
       handlerUrl: URL;
       apiKey: string;
-      user?: User;
-      token?: string;
+      applyAuth?(init?: RequestInit): RequestInit;
   }
+  export const developmentKeyHeader = "x-alinea-dev-key";
   export interface AuthedContext extends RequestContext {
       user: User;
       token: string;
@@ -2265,7 +2301,6 @@ declare module 'alinea/core/Connection' {
 declare module 'alinea/core/db/CommitRequest' {
 
   import type { Change, ChangeFile, ChangesBatch } from 'alinea/core/source/Change';
-  import type { ReadonlyTree } from 'alinea/core/source/Tree';
   import type { User } from 'alinea/core/User';
   import type { RemoveFileMutation, UploadFileMutation } from 'alinea/core/db/Mutation';
   export interface AddContent extends ChangeFile {
@@ -2283,10 +2318,8 @@ declare module 'alinea/core/db/CommitRequest' {
       user?: User;
       fromSha: string;
       intoSha: string;
-      checks: Array<[path: string, sha: string]>;
       changes: Array<CommitChange>;
   }
-  export function checkCommit(tree: ReadonlyTree, request: CommitRequest): void;
   
 }
 
@@ -2344,12 +2377,20 @@ declare module 'alinea/core/db/EntryIndex' {
       language?(language: EntryLanguageNode): boolean;
       entry?(entry: Entry): boolean;
   }
+  interface EntryNodeQuery {
+      ids?: ReadonlyArray<string>;
+      parentIds?: ReadonlyArray<string | null>;
+      urls?: ReadonlyArray<string>;
+      workspaces?: ReadonlyArray<string>;
+      roots?: ReadonlyArray<string>;
+      types?: ReadonlyArray<string>;
+  }
   export function combineConditions(a: EntryCondition, b: EntryCondition): EntryCondition;
   interface EntryVersionData {
       id: string;
       type: string;
       index: string;
-      searchableText: string;
+      searchableText?: string;
       title: string;
       data: Record<string, unknown>;
       seeded: string | null;
@@ -2417,6 +2458,7 @@ declare module 'alinea/core/db/EntryIndex' {
       nodes: Array<EntryNode>;
       constructor(config: Config, versionData: Map<string, EntryVersionData>, seeds: Map<string, Seed>);
       byId(id: string): EntryNode | undefined;
+      candidateNodes(query: EntryNodeQuery): Array<EntryNode> | undefined;
       get config(): Config;
       byDir(dir: string): EntryNode | undefined;
       entryByFilePath(filePath: string): Entry | undefined;
@@ -2429,6 +2471,7 @@ declare module 'alinea/core/db/EntryIndex' {
       initialSync: ReadonlyTree | undefined;
       graph: EntryGraph;
       constructor(config: Config);
+      clone(): EntryIndex;
       get sha(): string;
       filter(filter: EntryCondition): Iterable<Entry>;
       findFirst<T extends Record<string, unknown>>(filter: (entry: Entry) => boolean): Entry<T> | undefined;
@@ -2438,7 +2481,7 @@ declare module 'alinea/core/db/EntryIndex' {
       get references(): Promise<EntryReferenceIndex>;
       sync(source: Source): Promise<string>;
       syncWith(source: Source): Promise<string>;
-      indexChanges(batch: ChangesBatch): Promise<string>;
+      indexChanges(batch: ChangesBatch, targetTree?: ReadonlyTree): Promise<string>;
       seed(source: Source): Promise<void>;
       byId(id: string): EntryNode | undefined;
       fix(source: Source): Promise<void>;
@@ -2626,12 +2669,11 @@ declare module 'alinea/core/db/EntryTransaction' {
       removeFile(mutation: Op<RemoveFileMutation>): this;
       uploadFile(mutation: Op<UploadFileMutation>): this;
       description(): string;
-      apply(mutations: Array<Mutation>): void;
+      apply(mutations: ReadonlyArray<Mutation>): Promise<void>;
       toRequest(): Promise<{
           fromSha: string;
           intoSha: string;
           description: string;
-          checks: [path: string, sha: string][];
           changes: CommitChange[];
       }>;
   }
@@ -2702,7 +2744,8 @@ declare module 'alinea/core/db/LocalDB' {
   import type { AnyQueryResult, GraphQuery } from 'alinea/core/Graph';
   import type { Policy } from 'alinea/core/Role';
   import type { ChangesBatch } from 'alinea/core/source/Change';
-  import type { Source } from 'alinea/core/source/Source';
+  import type { GetBlobsOptions } from 'alinea/core/source/Source';
+  import { type Source } from 'alinea/core/source/Source';
   import { type CommitRequest } from 'alinea/core/db/CommitRequest';
   import { EntryIndex } from 'alinea/core/db/EntryIndex';
   import type { EntryReferenceQuery, EntryReferenceResult } from 'alinea/core/db/EntryReference';
@@ -2713,22 +2756,21 @@ declare module 'alinea/core/db/LocalDB' {
       config: Config;
       index: EntryIndex;
       source: Source;
-      constructor(config: Config, source?: Source);
+      constructor(config: Config, source?: Source, index?: EntryIndex);
       resolve<Query extends GraphQuery>(query: Query): Promise<AnyQueryResult<Query>>;
       referencesTo(query: EntryReferenceQuery): Promise<EntryReferenceResult>;
       get sha(): string;
       indexChanges(batch: ChangesBatch): Promise<string>;
       applyChanges(batch: ChangesBatch): Promise<void>;
       getTreeIfDifferent(sha: string): Promise<import("alinea/core/source/Tree").ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array<ArrayBufferLike>], any, any>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncIterable<[sha: string, blob: Uint8Array<ArrayBufferLike>]>;
       sync(): Promise<string>;
       syncWith(remote: SyncApi): Promise<string>;
       logEntries(): Promise<void>;
-      request(mutations: Array<Mutation>, policy?: Policy): Promise<{
+      request(mutations: ReadonlyArray<Mutation>, policy?: Policy): Promise<{
           fromSha: string;
           intoSha: string;
           description: string;
-          checks: [path: string, sha: string][];
           changes: import("alinea/core/db/CommitRequest").CommitChange[];
       }>;
       mutate(mutations: Array<Mutation>): Promise<{
@@ -3406,7 +3448,7 @@ declare module 'alinea/core/field/RichTextField' {
   import { Field, type FieldMeta, type FieldOptions } from 'alinea/core/Field';
   import type { InferStoredValue } from 'alinea/core/Infer';
   import { Schema } from 'alinea/core/Schema';
-  import { type TextDoc } from 'alinea/core/TextDoc';
+  import { Mark, type ElementNode, type TextDoc } from 'alinea/core/TextDoc';
   export type RichTextMutator<R> = {
       insert: (id: string, block: string) => void;
   };
@@ -3420,10 +3462,37 @@ declare module 'alinea/core/field/RichTextField' {
       private doc;
       constructor(doc?: TextDoc<Blocks>);
       add<Key extends keyof Blocks>(type: Key, block: RichTextBlockInput<Blocks, Key>): this;
-      addHtml(html: string): this;
+      addHtml(html: string, options?: ParseHTMLSyncOptions): this;
+      addHtmlAsync(html: string, options?: ParseHTMLAsyncOptions): Promise<this>;
       value(): TextDoc<Blocks>;
   }
-  export function parseHTML(html: string): TextDoc<any>;
+  export interface ParseHTMLTagHandler {
+      (attributes: Record<string, string>): ElementNode | undefined;
+  }
+  export interface ParseHTMLMarkHandler {
+      (attributes: Record<string, string>): Mark | undefined;
+  }
+  export interface ParseHTMLAsyncTagHandler {
+      (attributes: Record<string, string>): ElementNode | undefined | PromiseLike<ElementNode | undefined>;
+  }
+  export interface ParseHTMLAsyncMarkHandler {
+      (attributes: Record<string, string>): Mark | undefined | PromiseLike<Mark | undefined>;
+  }
+  export interface ParseHTMLSyncOptions {
+      tags?: Record<string, ParseHTMLTagHandler>;
+      marks?: Record<string, ParseHTMLMarkHandler>;
+  }
+  export interface ParseHTMLAsyncOptions {
+      tags?: Record<string, ParseHTMLAsyncTagHandler>;
+      marks?: Record<string, ParseHTMLAsyncMarkHandler>;
+  }
+  /**
+   * Parse HTML using handlers that may perform asynchronous work, such as
+   * importing remote images into a media directory.
+   */
+  export function parseHTMLAsync(html: string, options?: ParseHTMLAsyncOptions): Promise<TextDoc>;
+  /** Parse HTML synchronously. Async handlers are only supported by parseHTMLAsync. */
+  export function parseHTML(html: string, options?: ParseHTMLSyncOptions): TextDoc;
   
 }
 
@@ -3494,6 +3563,7 @@ declare module 'alinea/core/Graph' {
   import type { Condition, Filter } from 'alinea/core/Filter';
   import type { Infer, StoredRow } from 'alinea/core/Infer';
   import type { HasField } from 'alinea/core/Internal';
+  import type { OrderBy } from 'alinea/core/OrderBy';
   import type { Page } from 'alinea/core/Page';
   import type { PreviewRequest } from 'alinea/core/Preview';
   import type { Type } from 'alinea/core/Type';
@@ -3541,11 +3611,9 @@ declare module 'alinea/core/Graph' {
   }
   export type Projection = SelectContent | SelectObject;
   export type InferProjection<Selection> = InferSelection<Selection>;
-  export interface Order {
-      asc?: Expr<any>;
-      desc?: Expr<any>;
+  export type Order = OrderBy & {
       caseSensitive?: boolean;
-  }
+  };
   type InferSelection<Selection> = Selection extends GraphQuery & Edge ? Expand<AnyQueryResult<Selection>> : Selection extends Expr<infer V> ? V : {
       [K in keyof Selection]: Selection[K] extends Type<infer V> ? Type.Infer<V> : InferSelection<Selection[K]>;
   };
@@ -3807,6 +3875,8 @@ declare module 'alinea/core/ListRow' {
       _id: string;
       _type: string;
       _index: string;
+      _anchor?: string;
+      _label?: string;
   }
   export namespace ListRow {
       const id = "_id";
@@ -3859,6 +3929,7 @@ declare module 'alinea/core/media/MediaAltField' {
   export class MediaAltField extends ScalarField<MediaAltValue, MediaAltOptions> {
   }
   export function mediaAlt(label: string, options?: WithoutLabel<MediaAltOptions>): MediaAltField;
+  export function mediaAltText(value: MediaAltValue, locale?: string): string;
   
 }
 
@@ -3882,10 +3953,13 @@ declare module 'alinea/core/media/MediaLocation' {
       (meta: MediaUrlMeta): string;
   }
   export interface MediaPublicUrlMeta extends Omit<MediaUrlMeta, 'parentPaths'> {
-      entryUrl: string;
+      /** @deprecated Pass parentPaths directly when available. */
+      entryUrl?: string;
+      parentPaths?: Array<string>;
   }
   export interface MediaEntryUrlMeta {
-      entryUrl: string;
+      defaultUrl: string;
+      parentPaths: Array<string>;
       path: string;
       workspace: string;
       root: string;
@@ -4024,11 +4098,15 @@ declare module 'alinea/core/media/UploadLimits' {
 declare module 'alinea/core/OrderBy' {
 
   import type { Expr } from 'alinea/core/Expr';
-  export type OrderBy = {
+  export interface AscendingOrder {
       asc: Expr<any>;
-  } | {
+      desc?: never;
+  }
+  export interface DescendingOrder {
+      asc?: never;
       desc: Expr<any>;
-  };
+  }
+  export type OrderBy = AscendingOrder | DescendingOrder;
   
 }
 
@@ -4525,14 +4603,14 @@ declare module 'alinea/core/source/Change' {
 declare module 'alinea/core/source/CombinedSource' {
 
   import type { ChangesBatch } from 'alinea/core/source/Change';
-  import type { Source } from 'alinea/core/source/Source';
+  import type { GetBlobsOptions, Source } from 'alinea/core/source/Source';
   import { ReadonlyTree } from 'alinea/core/source/Tree';
   export class CombinedSource implements Source {
       #private;
       constructor(sources: Record<string, Source>);
       getTree(): Promise<ReadonlyTree>;
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
       applyChanges(batch: ChangesBatch): Promise<void>;
   }
   
@@ -4558,7 +4636,7 @@ declare module 'alinea/core/source/FilePatch' {
 declare module 'alinea/core/source/FSSource' {
 
   import type { ChangesBatch } from 'alinea/core/source/Change';
-  import type { Source } from 'alinea/core/source/Source';
+  import type { GetBlobsOptions, Source } from 'alinea/core/source/Source';
   import { ReadonlyTree, WriteableTree } from 'alinea/core/source/Tree';
   export class FSSource implements Source {
       #private;
@@ -4566,7 +4644,8 @@ declare module 'alinea/core/source/FSSource' {
       getTree(): Promise<ReadonlyTree>;
       getFile(current: ReadonlyTree, builder: WriteableTree, file: string): Promise<readonly [string, Uint8Array<ArrayBufferLike>] | undefined>;
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      readBlob(sha: string, file: string, signal?: AbortSignal): Promise<[sha: string, blob: Uint8Array]>;
       applyChanges(batch: ChangesBatch): Promise<void>;
   }
   export class CachedFSSource extends FSSource {
@@ -4576,7 +4655,7 @@ declare module 'alinea/core/source/FSSource' {
       getTree(): Promise<ReadonlyTree>;
       applyChanges(batch: ChangesBatch): Promise<void>;
       getFile(current: ReadonlyTree, builder: WriteableTree, file: string): Promise<readonly [string, Uint8Array<ArrayBufferLike>] | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
   }
   
 }
@@ -4599,7 +4678,7 @@ declare module 'alinea/core/source/GitDelta' {
 declare module 'alinea/core/source/GithubSource' {
 
   import type { ChangesBatch } from 'alinea/core/source/Change';
-  import type { Source } from 'alinea/core/source/Source';
+  import type { GetBlobsOptions, Source } from 'alinea/core/source/Source';
   import { ReadonlyTree } from 'alinea/core/source/Tree';
   export interface GithubSourceOptions {
       authToken: string;
@@ -4617,7 +4696,7 @@ declare module 'alinea/core/source/GithubSource' {
       getTree(): Promise<ReadonlyTree>;
       shaAt(ref: string): Promise<string>;
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
       applyChanges(batch: ChangesBatch): Promise<void>;
   }
   
@@ -4652,14 +4731,14 @@ declare module 'alinea/core/source/GitUtils' {
 declare module 'alinea/core/source/IndexedDBSource' {
 
   import type { ChangesBatch } from 'alinea/core/source/Change';
-  import type { Source } from 'alinea/core/source/Source';
+  import type { GetBlobsOptions, Source } from 'alinea/core/source/Source';
   import { ReadonlyTree } from 'alinea/core/source/Tree';
   export class IndexedDBSource implements Source {
       #private;
       constructor(indexedDB: IDBFactory, name: string);
       getTree(): Promise<ReadonlyTree>;
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
       applyChanges(batch: ChangesBatch): Promise<void>;
   }
   
@@ -4668,20 +4747,37 @@ declare module 'alinea/core/source/IndexedDBSource' {
 declare module 'alinea/core/source/MemorySource' {
 
   import type { ChangesBatch } from 'alinea/core/source/Change';
-  import type { Source } from 'alinea/core/source/Source';
+  import type { GetBlobsOptions, Source } from 'alinea/core/source/Source';
   import { ReadonlyTree } from 'alinea/core/source/Tree';
   export class MemorySource implements Source {
       #private;
       constructor(tree?: ReadonlyTree, blobs?: Map<string, Uint8Array>);
       getTree(): Promise<ReadonlyTree>;
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
       addBlob(contents: Uint8Array): Promise<string>;
       applyChanges(batch: ChangesBatch): Promise<void>;
   }
   
 }
 
+declare module 'alinea/core/source/OverlaySource' {
+
+  import type { ChangesBatch } from 'alinea/core/source/Change';
+  import type { GetBlobsOptions, Source } from 'alinea/core/source/Source';
+  import type { ReadonlyTree } from 'alinea/core/source/Tree';
+  export class OverlaySource implements Source {
+      #private;
+      constructor(source: Source, tree: ReadonlyTree);
+      static create(source: Source): Promise<OverlaySource>;
+      getTree(): Promise<ReadonlyTree>;
+      getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      applyChanges(batch: ChangesBatch): Promise<void>;
+  }
+  
+}
+
 declare module 'alinea/core/source/ShaMismatchError' {
 
   import { HttpError } from 'alinea/core/HttpError';
@@ -4697,9 +4793,12 @@ declare module 'alinea/core/source/Source' {
 
   import type { ChangesBatch } from 'alinea/core/source/Change';
   import type { ReadonlyTree } from 'alinea/core/source/Tree';
+  export interface GetBlobsOptions {
+      signal?: AbortSignal;
+  }
   export interface RemoteSource {
       getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;
-      getBlobs(shas: Array<string>): AsyncGenerator<[sha: string, blob: Uint8Array]>;
+      getBlobs(shas: ReadonlyArray<string>, options?: GetBlobsOptions): AsyncIterable<[sha: string, blob: Uint8Array]>;
   }
   export interface Source extends RemoteSource {
       getTree(): Promise<ReadonlyTree>;
@@ -4715,7 +4814,7 @@ declare module 'alinea/core/source/Source' {
       add(path: string, contents: Uint8Array): this;
       remove(path: string): this;
       rename(from: string, to: string): this;
-      compile(): Promise<{
+      compile(previous?: ReadonlyTree): Promise<{
           from: ReadonlyTree;
           into: ReadonlyTree;
           changes: (import("alinea/core/source/Change").DeleteChange | {
@@ -4910,6 +5009,17 @@ declare module 'alinea/core/TextDoc' {
   export namespace ElementNode {
       const content = "content";
   }
+  export interface ImageNode extends ElementNode {
+      _type: 'image';
+      _id?: string;
+      _link?: 'image';
+      _entry?: string;
+      src?: string;
+      alt?: string;
+      title?: string;
+      width?: number | string;
+      height?: number | string;
+  }
   export interface BlockNode {
       _id: string;
       _type: string;
@@ -4920,6 +5030,19 @@ declare module 'alinea/core/TextDoc' {
   
 }
 
+declare module 'alinea/core/Trace' {
+
+  import type { Config } from 'alinea/core/Config';
+  export interface Tracer {
+      <Result>(name: string, run: () => Promise<Result>): Promise<Result>;
+  }
+  export interface TraceSpan {
+      <Result>(operation: () => Promise<Result>): Promise<Result>;
+  }
+  export function trace(config: Config, name: string): TraceSpan;
+  
+}
+
 declare module 'alinea/core/Tracker' {
 
   import { Field, type FieldOptions } from 'alinea/core/Field';
@@ -4949,6 +5072,7 @@ declare module 'alinea/core/Trigger' {
 declare module 'alinea/core/Type' {
 
   import type { ComponentType } from 'react';
+  import type { Config } from 'alinea/core/Config';
   import type { EntryStatus } from 'alinea/core/Entry';
   import type { Expr } from 'alinea/core/Expr';
   import { Field, type EntryAnchorTarget, type FieldAnchorContext, type FieldBeforeSaveContext } from 'alinea/core/Field';
@@ -4961,7 +5085,9 @@ declare module 'alinea/core/Type' {
   import type { EntryReferenceTarget } from 'alinea/core/db/EntryReference';
   import type { SummaryProps } from 'alinea/core/media/Summary';
   import type { Expand } from 'alinea/core/util/Types';
-  export interface EntryUrlMeta {
+  export interface EntryUrlInput {
+      config: Config;
+      data: Record<string, unknown>;
       status: EntryStatus;
       path: string;
       parentPaths: Array<string>;
@@ -4969,6 +5095,9 @@ declare module 'alinea/core/Type' {
       workspace: string;
       root: string;
   }
+  export interface EntryUrlMeta extends EntryUrlInput {
+      defaultUrl: string;
+  }
   export type EntryDefaultView = 'edit' | 'overview';
   export type Type<Definition = object> = Definition & HasType;
   type TypeRow<Definition> = Expand<{
@@ -5101,9 +5230,15 @@ declare module 'alinea/core/util/Assert' {
 
 declare module 'alinea/core/util/Async' {
 
-  /** Accumulate all entries of an AsyncGenerator into an array */
-  export function accumulate<T>(gen: AsyncGenerator<T>): Promise<Array<T>>;
+  /** Accumulate all entries of an AsyncIterable into an array */
+  export function accumulate<T>(gen: AsyncIterable<T>): Promise<Array<T>>;
   export function toGenerator<T>(iterable: Iterable<T>): AsyncGenerator<T>;
+  export interface MapConcurrentOptions {
+      concurrency: number;
+      signal?: AbortSignal;
+  }
+  /** Map concurrently while yielding results as they complete. */
+  export function mapConcurrent<T, TResult>(iterable: Iterable<T>, mapper: (item: T, signal?: AbortSignal) => Promise<TResult>, options: MapConcurrentOptions): AsyncGenerator<TResult>;
   export function genEffect<T, TReturn>(gen: AsyncIterable<T, TReturn>, effect: (result: T) => void): AsyncIterable<T>;
   
 }
@@ -5266,7 +5401,7 @@ declare module 'alinea/core/util/EntryFilenames' {
 
   import type { Config } from 'alinea/core/Config';
   import { type Entry, type EntryStatus } from 'alinea/core/Entry';
-  import type { EntryUrlMeta, Type } from 'alinea/core/Type';
+  import type { EntryUrlInput, Type } from 'alinea/core/Type';
   export function entryInfo(fileName: string): [name: string, status: EntryStatus];
   export function entryChildrenDir(config: Config, entry: {
       workspace: string;
@@ -5290,7 +5425,7 @@ declare module 'alinea/core/util/EntryFilenames' {
       status: EntryStatus;
   }, parentPaths: Array<string>): string;
   export function entryFile(config: Config, entry: Entry): string;
-  export function entryUrl(type: Type, meta: EntryUrlMeta): string;
+  export function entryUrl(type: Type, meta: EntryUrlInput): string;
   export function pathSuffix(path: string, conflictingPaths: Array<string>): number | undefined;
   export function applySuffix(path: string, suffix: number): string;
   export function fileVersions(file: string): string[];
@@ -5890,8 +6025,9 @@ declare module 'alinea/dashboard/app/editor/FileEditor' {
   import type { Entry } from 'alinea/core/Entry';
   export interface FileEditorProps {
       entry: Pick<Entry, 'root' | 'url' | 'workspace'>;
+      parentPaths: Array<string>;
   }
-  export function FileEditor({ entry }: FileEditorProps): import("react").JSX.Element;
+  export function FileEditor({ entry, parentPaths }: FileEditorProps): import("react").JSX.Element;
   
 }
 
@@ -5915,7 +6051,7 @@ declare module 'alinea/dashboard/app/editor/FilePreview' {
 
 declare module 'alinea/dashboard/app/editor/MediaAltField.view' {
 
-  import type { MediaAltField } from 'alinea/core/media/MediaAltField';
+  import { type MediaAltField } from 'alinea/core/media/MediaAltField';
   export interface MediaAltFieldViewProps {
       field: MediaAltField;
   }
@@ -6046,7 +6182,7 @@ declare module 'alinea/dashboard/app/EntrySidebar' {
       onOpenChange?: (isOpen: boolean) => void;
   }
   export type EntrySidebarTab = 'preview' | 'history' | 'references';
-  export function entrySidebar(get: Getter, entry: EntryAtoms, localeData: EntryLocaleAtoms): Promise<EntrySidebarProps | undefined>;
+  export function entrySidebar(get: Getter, entry: EntryAtoms, localeData: EntryLocaleAtoms, isOpen?: boolean): Promise<EntrySidebarProps | undefined>;
   export function EntrySidebar({ entry, localeData, selectedTab, previousVersionsOpen, onOpenChange }: EntrySidebarProps): import("react").JSX.Element;
   export type EntrySidebarVersionStatus = EntryStatus | 'unpublished' | 'none';
   export interface EntrySidebarVersionRowProps {
@@ -6071,7 +6207,7 @@ declare module 'alinea/dashboard/app/EntrySidebarPreview' {
   }
   export function EntrySidebarPreview({ entry, localeData }: EntrySidebarPreviewProps): import("react").JSX.Element;
   export interface EntrySidebarBrowserPreviewProps {
-      localeData: Pick<EntryLocaleAtoms, 'previewUrl' | 'retryPreviewUrl'> & Partial<Pick<EntryLocaleAtoms, 'previewPayloadSignal' | 'updatePreviewPayload'>>;
+      localeData: Pick<EntryLocaleAtoms, 'previewUrlState' | 'retryPreviewUrl'> & Partial<Pick<EntryLocaleAtoms, 'previewPayloadSignal' | 'updatePreviewPayload'>>;
   }
   export function EntrySidebarBrowserPreview({ localeData }: EntrySidebarBrowserPreviewProps): import("react").JSX.Element;
   
@@ -6378,6 +6514,19 @@ declare module 'alinea/dashboard/app/pages/UsersPage' {
   
 }
 
+declare module 'alinea/dashboard/app/SidebarLayout' {
+
+  import { type ReactNode } from 'react';
+  export interface SidebarLayoutProps {
+      children: ReactNode;
+      sidebar: ReactNode;
+      side: 'left' | 'right';
+      visible?: boolean;
+  }
+  export function SidebarLayout({ children, sidebar, side, visible }: SidebarLayoutProps): import("react").JSX.Element;
+  
+}
+
 declare module 'alinea/dashboard/app/SidebarTree' {
 
   import { type Page } from 'alinea/dashboard/atoms/nav';
@@ -6751,6 +6900,15 @@ declare module 'alinea/dashboard/atoms/dashboard' {
 
   import type { SetStateAction } from 'react';
   export type DashboardTheme = 'system' | 'light' | 'dark';
+  export const dashboardMobileAtom: import("jotai").PrimitiveAtom<boolean> & {
+      init: boolean;
+  };
+  export const navigationSidebarWidthAtom: import("jotai").PrimitiveAtom<number> & {
+      init: number;
+  };
+  export const entrySidebarWidthAtom: import("jotai").PrimitiveAtom<number> & {
+      init: number;
+  };
   export const entrySidebarOpenAtom: import("jotai").PrimitiveAtom<boolean> & {
       init: boolean;
   };
@@ -6773,6 +6931,10 @@ declare module 'alinea/dashboard/atoms/editor' {
   import { Type } from 'alinea/core/Type';
   import type { Atom, WritableAtom } from 'jotai';
   import type { ComponentType, ReactNode } from 'react';
+  export interface ResolvedEditorImage {
+      src: string;
+      alt: string;
+  }
   export interface EditorNode {
       readOnly: boolean;
       nodes: WritableAtom<unknown, [unknown], void>;
@@ -6783,6 +6945,7 @@ declare module 'alinea/dashboard/atoms/editor' {
       anchors: Atom<Array<EntryAnchorTarget>>;
       node: EditorNode;
       parent?: EditorModel;
+      resolvedImages: ReadonlyMap<string, ResolvedEditorImage>;
       sections: Array<EditorSection>;
       type: Type;
       field(key: string): EditorField | undefined;
@@ -6813,10 +6976,11 @@ declare module 'alinea/dashboard/atoms/editor' {
       parent?: EntryEditor | undefined;
       resource?: Resource | undefined;
       policy?: Policy | undefined;
+      resolvedImages: ReadonlyMap<string, ResolvedEditorImage>;
       anchors: Atom<Array<EntryAnchorTarget>>;
       value: Atom<object>;
       sections: Array<EntryEditorSection>;
-      constructor(type: Type, node: EditorNode, parent?: EntryEditor | undefined, resource?: Resource | undefined, policy?: Policy | undefined);
+      constructor(type: Type, node: EditorNode, parent?: EntryEditor | undefined, resource?: Resource | undefined, policy?: Policy | undefined, resolvedImages?: ReadonlyMap<string, ResolvedEditorImage>);
       field: (key: string) => EntryEditorField | undefined;
       get(field: Field): EntryEditorField | undefined;
   }
@@ -6853,8 +7017,10 @@ declare module 'alinea/dashboard/atoms/entry' {
 
   import type { EntryReference, EntryReferenceScan } from 'alinea/core/db/EntryReference';
   import { Entry, EntryStatus } from 'alinea/core/Entry';
+  import type { Order } from 'alinea/core/Graph';
   import { type EntryDefaultView } from 'alinea/core/Type';
-  import { Atom } from 'jotai';
+  import { Atom, Getter } from 'jotai';
+  import type { ResolvedEditorImage } from 'alinea/dashboard/atoms/editor';
   import { ReactiveNode } from 'alinea/dashboard/atoms/ReactiveNode';
   interface EntryData {
       id: string;
@@ -6920,6 +7086,7 @@ declare module 'alinea/dashboard/atoms/entry' {
       historyReady: Atom<Promise<import("alinea/core/Connection").Revision[]>>;
       history: Atom<import("alinea/core/Connection").Revision[]>;
       selectedNode: Atom<Promise<ReactiveNode<object>>>;
+      richTextImages: Atom<Promise<Map<string, ResolvedEditorImage>>>;
       anchors: Atom<Promise<import("alinea/core/Field").EntryAnchorTarget[]>>;
       retryPreviewUrl: import("jotai").WritableAtom<null, [], void> & {
           init: null;
@@ -6975,7 +7142,7 @@ declare module 'alinea/dashboard/atoms/entry' {
           searchableText: string;
       } | undefined>;
       previewUrlReady: Atom<Promise<string | undefined>>;
-      previewUrl: Atom<string | undefined>;
+      previewUrlState: Atom<readonly [false, string | undefined] | readonly [true, string | undefined]>;
       previewPayloadSignal: Atom<(object | null | undefined)[]>;
       updatePreviewPayload: import("jotai").WritableAtom<null, [], Promise<string | undefined>> & {
           init: null;
@@ -7059,6 +7226,7 @@ declare module 'alinea/dashboard/atoms/entry' {
       parentId: Atom<string | null>;
       workspace: Atom<string>;
       root: Atom<string>;
+      parentPaths: Atom<string[]>;
       hasChildren: Atom<boolean>;
       canPublishParents: Atom<boolean>;
       parentUnpublished: Atom<boolean>;
@@ -7073,6 +7241,48 @@ declare module 'alinea/dashboard/atoms/entry' {
       id: string;
       constructor(id: string);
   }
+  export interface TreeEntrySummary {
+      id: string;
+      title: string;
+      type: string;
+      status: EntryStatus;
+      main: boolean;
+      locale: string | null;
+      parentId: string | null;
+      parents: Array<string>;
+      workspace: string;
+      root: string;
+      hasChildren: boolean;
+  }
+  interface TreeChildrenLocation {
+      workspace: string;
+      root: string;
+      parentId: string | null;
+  }
+  export function loadTreeChildren(get: Getter, location: TreeChildrenLocation, locale: string | null, orderBy?: Order | Array<Order>): Promise<Array<TreeEntryAtoms>>;
+  export class TreeEntryAtoms {
+      #private;
+      readonly id: string;
+      constructor(id: string);
+      ready: Atom<Promise<this>>;
+      raw: (locale: string | null) => Atom<Promise<Omit<TreeEntrySummary, "hasChildren">>>;
+      summary: (locale: string | null) => Atom<Promise<{
+          id: string;
+          title: string;
+          type: string;
+          status: EntryStatus;
+          main: boolean;
+          locale: string | null;
+          parentId: string | null;
+          parents: Array<string>;
+          workspace: string;
+          root: string;
+          hasChildren: boolean;
+      }>>;
+      parents: Atom<Promise<TreeEntryAtoms[]>>;
+      children: (locale: string | null) => Atom<Promise<TreeEntryAtoms[]>>;
+  }
+  export const treeEntryAtoms: (id: string) => TreeEntryAtoms;
   export {};
   
 }
@@ -7432,7 +7642,10 @@ declare module 'alinea/dashboard/atoms/nav' {
 
 declare module 'alinea/dashboard/atoms/preview' {
 
+  import type { LocalConnection } from 'alinea/core/Connection';
   import type { PreviewMetadata } from 'alinea/core/Preview';
+  export function getPreviewToken(client: LocalConnection): Promise<string | undefined>;
+  export function retryPreviewToken(client: LocalConnection): void;
   export const previewMetadataAtom: import("jotai").PrimitiveAtom<PreviewMetadata | undefined> & {
       init: PreviewMetadata | undefined;
   };
@@ -7487,7 +7700,7 @@ declare module 'alinea/dashboard/atoms/ReactiveNode' {
 
 declare module 'alinea/dashboard/atoms/root' {
 
-  import { type EntryStatus } from 'alinea/core/Entry';
+  import type { EntryStatus } from 'alinea/core/Entry';
   import type { RootData, RootI18n } from 'alinea/core/Root';
   import type { DragItem, DragTypes, DropOperation, DropTarget } from '@react-types/shared';
   import { type ExplorerAtoms } from 'alinea/dashboard/atoms/explorer';
@@ -7495,6 +7708,7 @@ declare module 'alinea/dashboard/atoms/root' {
   import type { ComponentType } from 'react';
   import type { DroppableCollectionInsertDropEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, Key } from 'react-aria-components';
   import { LucideFile } from 'alinea/dashboard/icons';
+  import { type TreeEntryAtoms } from 'alinea/dashboard/atoms/entry';
   export interface RootViewProps {
       root: RootData;
   }
@@ -7534,6 +7748,7 @@ declare module 'alinea/dashboard/atoms/root' {
       constructor(root: RootAtoms, locale: string | null, selectedKeys: Atom<Set<Key>>, viewState?: TreeViewState);
       snapshot: Atom<TreeSnapshot>;
       items: Atom<RootTreeItem[]>;
+      children: (id: string) => Atom<Promise<TreeEntryAtoms[]>>;
       item: (id: string) => Atom<RootTreeItem>;
       selectedItem: Atom<RootTreeItem | undefined>;
       ready: Atom<Promise<{
@@ -7551,6 +7766,7 @@ declare module 'alinea/dashboard/atoms/root' {
       explorer: ExplorerAtoms;
       constructor(workspace: string, key: string);
       createTree(locale: string | null, selectedKeys: Atom<Set<Key>>, expandedKeys?: PrimitiveAtom<Set<string>>): TreeAtoms;
+      treeEntries: (locale: string | null) => Atom<Promise<TreeEntryAtoms[]>>;
       children: (parentId: string | null) => ExplorerAtoms;
       label: Atom<string>;
       icon: Atom<typeof LucideFile | ComponentType>;
@@ -8021,7 +8237,7 @@ declare module 'alinea/dashboard/hooks' {
   import type { WorkspaceInternal } from 'alinea/core/Workspace';
   import { Type } from 'alinea';
   import type { ComponentType, Dispatch, PropsWithChildren, SetStateAction } from 'react';
-  import { type EditorModel, type EditorNode, EntryEditor } from 'alinea/dashboard/atoms/editor';
+  import { type EditorModel, type EditorNode, EntryEditor, type ResolvedEditorImage } from 'alinea/dashboard/atoms/editor';
   import type { EntryAtoms, EntryLocaleAtoms } from 'alinea/dashboard/atoms/entry';
   import type { Page } from 'alinea/dashboard/atoms/nav';
   import type { RootAtoms } from 'alinea/dashboard/atoms/root';
@@ -8029,6 +8245,7 @@ declare module 'alinea/dashboard/hooks' {
   interface EntryContextValue {
       entry: EntryAtoms;
       localeData: EntryLocaleAtoms;
+      richTextImages: ReadonlyMap<string, ResolvedEditorImage>;
       selectedEntry: EntryRecord<Record<string, unknown>>;
   }
   export interface DashboardOptions {
@@ -8096,9 +8313,10 @@ declare module 'alinea/dashboard/hooks' {
   export interface EntryScopeProps {
       entry: EntryAtoms;
       localeData: EntryLocaleAtoms;
+      richTextImages: ReadonlyMap<string, ResolvedEditorImage>;
       selectedEntry: EntryRecord<Record<string, unknown>>;
   }
-  export function EntryScope({ children, entry, localeData, selectedEntry }: PropsWithChildren<EntryScopeProps>): import("react").FunctionComponentElement<import("react").ProviderProps<EntryContextValue | null>>;
+  export function EntryScope({ children, entry, localeData, richTextImages, selectedEntry }: PropsWithChildren<EntryScopeProps>): import("react").FunctionComponentElement<import("react").ProviderProps<EntryContextValue | null>>;
   export function useEntryAtoms(): EntryContextValue;
   export function useOptionalEntryAtoms(): EntryContextValue | null;
   /**
@@ -8281,6 +8499,7 @@ declare module 'alinea/dashboard/icons' {
   export function IcRoundMoreVert(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
   export function IcRoundNorthEast(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
   export function IcRoundNumbers(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
+  export function IcRoundOpenInFull(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
   export function IcRoundOpenInNew(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
   export function IcRoundPanorama(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
   export function IcRoundPermMedia(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
@@ -8766,8 +8985,8 @@ declare module 'alinea/field/link/FileLink' {
   }
   export namespace FileLink {
       const title: import("alinea/core/Expr").Expr<string>;
-      const url: import("alinea/field/hidden").HiddenField<string>;
-      const href: import("alinea/field/hidden").HiddenField<string>;
+      const url: import("alinea/core/Expr").Expr<string>;
+      const href: import("alinea/core/Expr").Expr<string>;
       const extension: import("alinea/field/hidden").HiddenField<string>;
       const size: import("alinea/field/hidden").HiddenField<number>;
   }
@@ -8814,7 +9033,7 @@ declare module 'alinea/field/link/ImageLink' {
   export namespace ImageLink {
       const title: import("alinea/core/Expr").Expr<string>;
       const alt: import("alinea/core/media/MediaAltField").MediaAltField;
-      const src: import("alinea/field/hidden").HiddenField<string>;
+      const src: import("alinea/core/Expr").Expr<string>;
       const extension: import("alinea/field/hidden").HiddenField<string>;
       const size: import("alinea/field/hidden").HiddenField<number>;
       const hash: import("alinea/field/hidden").HiddenField<string>;
@@ -9277,6 +9496,8 @@ declare module 'alinea/field/number/NumberField' {
       help?: ReactNode;
       /** Display a minimal version */
       inline?: boolean;
+      /** Text displayed when the field is empty */
+      placeholder?: string;
       /** A minimum value */
       minValue?: number;
       /** A maximum value */
@@ -9509,7 +9730,9 @@ declare module 'alinea/field/richtext/PickTextLink' {
   import { Reference } from 'alinea/core/Reference';
   export interface PickerValue {
       link?: Reference;
+      alt?: string;
       description?: string;
+      src?: string;
       title?: string;
       blank?: boolean;
   }
@@ -9520,9 +9743,14 @@ declare module 'alinea/field/richtext/PickTextLink' {
   export interface PickTextLinkFunc {
       (options: Partial<PickerOptions>): Promise<PickerValue | undefined>;
   }
+  export interface PickRichTextImageFunc {
+      (options: Partial<PickerOptions>): Promise<PickerValue | undefined>;
+  }
   export interface PickTextLinkState {
       isOpen: boolean;
+      kind: 'image' | 'link';
       options: Partial<PickerOptions>;
+      pickImage: PickRichTextImageFunc;
       pickLink: PickTextLinkFunc;
       cancel: () => void;
       confirm: (value: PickerValue | undefined) => void;
@@ -9540,10 +9768,13 @@ declare module 'alinea/field/richtext/ReferenceLink' {
   import { Reference } from 'alinea/core/Reference';
   import type { HTMLProps } from 'react';
   interface Anchor extends HTMLProps<HTMLAnchorElement> {
+      _id?: string;
+      _entry?: string;
+      _link?: 'entry' | 'file' | 'image' | 'url';
       'data-id'?: string;
       'data-entry'?: string;
       'data-anchor'?: string;
-      'data-link'?: 'entry' | 'file' | 'url';
+      'data-link'?: 'entry' | 'file' | 'image' | 'url';
       'data-suffix'?: string;
   }
   export function referenceToAttributes(reference: Reference): Anchor;
@@ -9620,8 +9851,13 @@ declare module 'alinea/field/richtext/RichTextBlockValue' {
 declare module 'alinea/field/richtext/RichTextDocument' {
 
   import { BlockNode, type TextDoc } from 'alinea/core/TextDoc';
-  import type { JSONContent } from '@tiptap/core';
-  export function editorContent(nodes: TextDoc): JSONContent;
+  import { type Editor, type JSONContent } from '@tiptap/core';
+  /** Include data attributes produced by custom extensions in the stored document. */
+  export function editorDocument(editor: Editor): JSONContent;
+  export function editorContent(nodes: TextDoc, images?: ReadonlyMap<string, {
+      src: string;
+      alt: string;
+  }>): JSONContent;
   export function editorNodes(content: JSONContent, resolveBlock?: (id: string, typeName: string, snapshot: BlockNode | undefined) => BlockNode | undefined): TextDoc;
   
 }
@@ -9643,6 +9879,7 @@ declare module 'alinea/field/richtext/RichTextExtensions' {
       Italic: import("@tiptap/core").Mark<import("@tiptap/extension-italic").ItalicOptions, any>;
       Strike: import("@tiptap/core").Mark<import("@tiptap/extension-strike").StrikeOptions, any>;
       HorizontalRule: TipTapNode<import("@tiptap/extension-horizontal-rule").HorizontalRuleOptions, any>;
+      Image: TipTapNode<import("@tiptap/extension-image").ImageOptions, any>;
       BulletList: TipTapNode<import("@tiptap/extension-list").BulletListOptions, any>;
       OrderedList: TipTapNode<import("@tiptap/extension-list").OrderedListOptions, any>;
       ListItem: TipTapNode<import("@tiptap/extension-list").ListItemOptions, any>;
@@ -9663,7 +9900,7 @@ declare module 'alinea/field/richtext/RichTextExtensions' {
       Highlight: import("@tiptap/core").Mark<import("@tiptap/extension-highlight").HighlightOptions, any>;
       UndoRedo: Extension<import("@tiptap/extensions").UndoRedoOptions, any>;
   };
-  export function defaultExtensionConfig(getEntryAnchors?: () => Iterable<string>): {
+  export function defaultExtensionConfig(getEntryAnchors?: () => Iterable<string>, enableImageResize?: boolean): {
       Document: TipTapNode<any, any>;
       Text: TipTapNode<any, any>;
       Paragraph: TipTapNode<import("@tiptap/extension-paragraph").ParagraphOptions, any>;
@@ -9673,6 +9910,7 @@ declare module 'alinea/field/richtext/RichTextExtensions' {
       Italic: import("@tiptap/core").Mark<import("@tiptap/extension-italic").ItalicOptions, any>;
       Strike: import("@tiptap/core").Mark<import("@tiptap/extension-strike").StrikeOptions, any>;
       HorizontalRule: TipTapNode<import("@tiptap/extension-horizontal-rule").HorizontalRuleOptions, any>;
+      Image: TipTapNode<import("@tiptap/extension-image").ImageOptions, any>;
       BulletList: TipTapNode<import("@tiptap/extension-list").BulletListOptions, any>;
       OrderedList: TipTapNode<import("@tiptap/extension-list").OrderedListOptions, any>;
       ListItem: TipTapNode<import("@tiptap/extension-list").ListItemOptions, any>;
@@ -9724,10 +9962,14 @@ declare module 'alinea/field/richtext/RichTextField' {
       help?: ReactNode;
       /** Display a minimal version */
       inline?: boolean;
+      /** Text shown when the editor is empty */
+      placeholder?: string;
       /** Index the text value of this field */
       searchable?: boolean;
       /** Enable inserting and editing tables */
       enableTables?: boolean;
+      /** Enable inserting and editing images */
+      enableImages?: boolean;
       /** Configure the toolbar layout and items */
       toolbar?: ToolbarConfig;
       /** Configure tiptap extensions */
@@ -9748,12 +9990,16 @@ declare module 'alinea/field/richtext/RichTextField.story' {
 
   export function RichTextStory(): import("react").JSX.Element;
   export function RichTextPlainStory(): import("react").JSX.Element;
+  export function RichTextImageStory(): import("react").JSX.Element;
+  export function RichTextImageDisabledStory(): import("react").JSX.Element;
+  export function RichTextReadOnlyImageStory(): import("react").JSX.Element;
   export function RichTextLargeStory(): import("react").JSX.Element;
   export function RichTextImportedListStory(): import("react").JSX.Element;
   export function RichTextCustomToolbarStory(): import("react").JSX.Element;
   export function RichTextEmptyStory(): import("react").JSX.Element;
   export function RichTextLegacyEmptyStory(): import("react").JSX.Element;
   export function RichTextReadOnlyStory(): import("react").JSX.Element;
+  export function RichTextInlineStory(): import("react").JSX.Element;
   
 }
 
@@ -9803,20 +10049,23 @@ declare module 'alinea/field/richtext/RichTextState' {
 declare module 'alinea/field/richtext/RichTextToolbar' {
 
   import type { Editor } from '@tiptap/core';
-  import type { PickTextLinkFunc } from 'alinea/field/richtext/PickTextLink';
+  import type { PickRichTextImageFunc, PickTextLinkFunc } from 'alinea/field/richtext/PickTextLink';
   import { type ToolbarConfig } from 'alinea/field/richtext/Toolbar';
   import type { PickTextAnchorFunc } from 'alinea/field/richtext/PickTextAnchor';
   export interface RichTextToolbarProps {
       editor: Editor;
+      enableImages?: boolean;
       enableTables?: boolean;
       ownerId: string;
+      pickImage?: PickRichTextImageFunc;
       pickLink?: PickTextLinkFunc;
       pickAnchor?: PickTextAnchorFunc;
       getEntryAnchors: () => Array<string>;
       toolbar?: ToolbarConfig;
       onFocusChange: (focused: boolean, nextTarget?: EventTarget | null) => void;
   }
-  export function RichTextToolbar({ editor, enableTables, ownerId, pickLink, pickAnchor, getEntryAnchors, toolbar, onFocusChange }: RichTextToolbarProps): import("react").JSX.Element;
+  export function RichTextToolbar({ editor, enableImages, enableTables, ownerId, pickImage, pickLink, pickAnchor, getEntryAnchors, toolbar, onFocusChange }: RichTextToolbarProps): import("react").JSX.Element;
+  export function createImageHandler(editor: Editor, pickImage: PickRichTextImageFunc | undefined, exec: () => ReturnType<Editor['chain']>): () => void;
   
 }
 
@@ -9825,6 +10074,7 @@ declare module 'alinea/field/richtext/Toolbar' {
   import type { Editor } from '@tiptap/react';
   import type { ComponentType, ReactElement, ReactNode } from 'react';
   import type { PickTextLinkFunc } from 'alinea/field/richtext/PickTextLink';
+  import type { PickRichTextImageFunc } from 'alinea/field/richtext/PickTextLink';
   export interface RichTextCommand {
       (): ReturnType<Editor['chain']>;
   }
@@ -9851,9 +10101,12 @@ declare module 'alinea/field/richtext/Toolbar' {
   export interface RichTextToolbarContext {
       editor: Editor;
       focusToggle: (target: EventTarget | null) => void;
+      pickImage: PickRichTextImageFunc;
       pickLink: PickTextLinkFunc;
+      enableImages?: boolean;
       enableTables?: boolean;
       exec: RichTextCommand;
+      handleImage: () => void;
       handleLink: () => void;
       handleAnchor: () => void;
       toolbar: ToolbarConfig;
@@ -10003,6 +10256,16 @@ declare module 'alinea/field/richtext/Toolbar' {
           };
       };
   };
+  export const images: {
+      group: {
+          image: {
+              icon: () => import("react").JSX.Element;
+              title: string;
+              active: ({ editor }: RichTextToolbarContext) => boolean;
+              onSelect: ({ handleImage }: RichTextToolbarContext) => void;
+          };
+      };
+  };
   export const anchors: {
       group: {
           anchor: {
@@ -10024,7 +10287,11 @@ declare module 'alinea/field/richtext/Toolbar' {
       title: string;
       onSelect: ({ exec }: RichTextToolbarContext) => boolean;
   };
-  export function defaultToolbar(enableTables: boolean): ToolbarConfig;
+  export interface DefaultToolbarOptions {
+      enableImages?: boolean;
+      enableTables?: boolean;
+  }
+  export function defaultToolbar({ enableImages, enableTables }?: DefaultToolbarOptions): ToolbarConfig;
   export {};
   
 }
@@ -10277,7 +10544,8 @@ declare module 'alinea' {
 declare module 'alinea/next' {
 
   export { createCMS } from 'alinea/adapter/next/cms';
-  export { createHandler } from 'alinea/adapter/next/handler';
+  export { createHandler, type NextHandlerOptions } from 'alinea/adapter/next/handler';
+  export type { AfterCommitContext, BeforeCommitContext } from 'alinea/backend/Handler';
   export { withAlinea } from 'alinea/adapter/next/with-alinea';
   
 }
@@ -10285,7 +10553,8 @@ declare module 'alinea/next' {
 declare module 'alinea/next.edge' {
 
   export { createCMS } from 'alinea/adapter/next/cms';
-  export { createHandler } from 'alinea/adapter/next/handler';
+  export { createHandler, type NextHandlerOptions } from 'alinea/adapter/next/handler';
+  export type { AfterCommitContext, BeforeCommitContext } from 'alinea/backend/Handler';
   
 }
 
@@ -11008,6 +11277,7 @@ declare module 'alinea/ui/RichText' {
       li?: ComponentType<JSX.IntrinsicElements['li']> | ReactElement;
       blockquote?: ComponentType<JSX.IntrinsicElements['blockquote']> | ReactElement;
       hr?: ComponentType<JSX.IntrinsicElements['hr']> | ReactElement;
+      img?: ComponentType<JSX.IntrinsicElements['img']> | ReactElement;
       br?: ComponentType<JSX.IntrinsicElements['br']> | ReactElement;
       small?: ComponentType<JSX.IntrinsicElements['small']> | ReactElement;
       sub?: ComponentType<JSX.IntrinsicElements['sub']> | ReactElement;