diff --git a/.github/workflows/flutter-linux.yml b/.github/workflows/flutter-linux.yml
index ca1272d7..3f18bbaf 100644
--- a/.github/workflows/flutter-linux.yml
+++ b/.github/workflows/flutter-linux.yml
@@ -172,7 +172,9 @@ jobs:
           sudo apt-get install -y weston xvfb
 
       - name: Install strict Snap
-        run: sudo snap install --dangerous "${{ steps.snapcraft.outputs.snap }}"
+        run: >-
+          sudo snap install --dangerous
+          "${{ steps.snapcraft.outputs.snap }}"
 
       - name: Exercise strict Snap visualization and PDF paths under X11
         run: |
diff --git a/README.md b/README.md
index 8bb51fdd..1059a51b 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,15 @@ projects.
 - Edit and save local files.
 - Read rendered Markdown without editing it.
 - Render Mermaid, PlantUML, D2, and fenced OpenAPI content locally and offline.
+- Typeset inline and display mathematics locally and offline with bundled
+  MathJax, including Writerside math forms and vector PDF output.
 - Edit Markdown with free-form AI instructions, an explicit change target, and
   explicitly selected context through Ollama, OpenAI, or Gemini, with
   diff-before-apply review.
 - Export Markdown documents as accessible, tagged PDF files.
 - Navigate project files, table of contents, and document outline.
+- Review, stage, commit, branch, synchronize, and inspect history in Git-backed
+  documentation workspaces using the user's normal Git configuration and tools.
 - Run basic diagnostics.
 - Reopen recent workspaces.
 - Use native Linux desktop chrome with a GTK headerbar.
@@ -84,6 +88,16 @@ build settings, Markdown import, status, ID refactoring, instance groups,
 conditional and reusable TOC sections, and cross-instance topic references.
 See [Writerside instances](docs/writerside-instances.md) for behavior, safety
 rules, an openable example, and the authoritative JetBrains references.
+Writerside `<video>` elements are recognized in Markdown and XML topics, with
+local preview images plus HTTPS YouTube and Vimeo sources. See
+[Writerside videos](docs/videos.md) for syntax and preview/export behavior.
+Writerside tip, note, warning, and quote blocks render as native document
+callouts and can be inserted from the WYSIWYG toolbar. See
+[Writerside admonitions](docs/admonitions.md) for supported syntax.
+Writerside chapters, procedures, code blocks, and definition lists support
+documented collapsed and expanded states in Preview and WYSIWYG views. See
+[Writerside collapsible elements](docs/collapsible-elements.md) for syntax and
+the ordinary-Markdown boundary.
 
 Folder workspaces show all files and directories, including hidden project
 files such as `.gitignore`. Unsupported and binary files remain visible but are
@@ -103,6 +117,12 @@ compiler; users do not install or configure a separate program. Local PNG,
 JPEG, GIF, and safe SVG images are included. Remote images are deliberately not
 downloaded during export and are represented by their alternative text.
 
+Inline and display equations use the same bundled MathJax semantics in preview
+and PDF export. Safe generated equations remain self-contained vector SVG, with
+inline baseline metrics carried into Typst. See [mathematical expressions](docs/math.md)
+for supported Markdown and Writerside forms, the scientific TeX package profile,
+editing behavior, and offline security boundaries.
+
 Mermaid and PlantUML fences are exported as vector diagrams. D2 uses normalized
 SVG where possible and a local high-resolution raster fallback for browser-only
 labels. OpenAPI fences become static, selectable API reference content. Failed
@@ -114,16 +134,13 @@ examples are in [demo/visualizations.md](demo/visualizations.md),
 [demo/openapi-local-reference.md](demo/openapi-local-reference.md), and
 [demo/plantuml-conformance.md](demo/plantuml-conformance.md).
 
-Writerside PDF export builds one selected output instance with JetBrains'
-official, versioned Writerside builder image. It supports generated settings or
-an existing project `PDF.xml`, including orientation, keymap, cover page,
-header, footer, and table-of-contents title. Docker is required, the large image
-is downloaded only after confirmation, project sources stay read-only, and
-builder network access is disabled unless explicitly enabled. See
-[Writerside PDF export](docs/writerside-pdf-export.md) for setup, customization,
-security boundaries, Snap limitations, and the authoritative JetBrains
-references. An exportable configuration is included in
-[demo/writerside-instances](demo/writerside-instances).
+Writerside PDF export builds one selected output instance with BusyMark's
+bundled native Typst, MathJax, and diagram pipeline. It follows the resolved
+instance TOC and supports Writerside Markdown and `.topic` XML without Docker,
+a Writerside installation, a daemon, or a network connection. See
+[Writerside PDF export](docs/writerside-pdf-export.md) for supported layout
+options, security boundaries, and native-export scope. An exportable example is
+included in [demo/writerside-instances](demo/writerside-instances).
 
 ## AI editing
 
@@ -255,6 +272,18 @@ flutter test
 Linux `.desktop` and AppStream metadata are localized in the repository. Snap
 Store listing translations are managed outside `snap/snapcraft.yaml`.
 
+The Snap uses strict confinement and bundles Git and OpenSSH. If Git cannot
+find an author identity while committing, BusyMark opens a native form, saves
+the chosen repository or BusyMark-wide identity, and retries the commit. Install
+it with:
+
+```bash
+sudo snap install busymark
+```
+
+The [Snap confinement notes](docs/snap-confinement.md) document supported
+interfaces and the limits of host Git integration.
+
 ## Build Linux Locally
 
 Source builds require the libhandy and WebKitGTK 4.1 development headers,
diff --git a/assets/export/markdown.typ b/assets/export/markdown.typ
index b9effeb1..cc86d880 100644
--- a/assets/export/markdown.typ
+++ b/assets/export/markdown.typ
@@ -31,10 +31,59 @@
 #show heading.where(level: 2): set text(size: 17pt, weight: "bold")
 #show heading.where(level: 3): set text(size: 13.5pt, weight: "bold")
 #show heading.where(level: 4): set text(size: 11.5pt, weight: "bold")
+#show heading.where(level: 5): set text(size: 10.5pt, weight: "bold")
+#show heading.where(level: 6): set text(size: 10.5pt, weight: "bold")
 #show link: set text(fill: rgb("2563a5"))
 
 #let value-or(item, key, default) = item.at(key, default: default)
 
+#let render-math(item, inline: false) = {
+  let asset = value-or(item, "asset", "")
+  let source = value-or(item, "text", "")
+  if asset == "" {
+    if inline { raw(source) } else {
+      block(
+        width: 100%,
+        fill: rgb("fff4e5"),
+        inset: 7pt,
+        radius: 3pt,
+        raw(source, block: true),
+      )
+    }
+  } else {
+    let natural-width = float(value-or(item, "width", "1")) * 1pt
+    let natural-height = float(value-or(item, "height", "1")) * 1pt
+    let depth = float(value-or(item, "depth", "0")) * 1pt
+    if inline {
+      box(
+        width: natural-width,
+        height: natural-height,
+        baseline: depth,
+        image(
+          asset,
+          width: natural-width,
+          height: natural-height,
+          fit: "contain",
+          alt: source,
+        ),
+      )
+    } else {
+      block(
+        width: 100%,
+        above: 0.8em,
+        below: 0.8em,
+        breakable: false,
+        align(center, layout(size => image(
+          asset,
+          width: calc.min(natural-width, size.width),
+          fit: "contain",
+          alt: source,
+        ))),
+      )
+    }
+  }
+}
+
 #let render-inlines(items) = {
   for item in items {
     let kind = item.kind
@@ -74,6 +123,8 @@
       } else {
         image(asset, width: 1.25em, height: 1.25em, fit: "contain", alt: alt)
       }
+    } else if kind == "math" {
+      render-math(item, inline: true)
     } else if kind == "softBreak" {
       text(" ")
     } else if kind == "hardBreak" {
@@ -190,8 +241,30 @@
         raw(value-or(block-data, "text", ""), block: true, lang: language)
       },
     )
+  } else if kind == "math" {
+    render-math(block-data)
   } else if kind == "list" {
     render-list(block-data, render-block)
+  } else if kind == "admonition" {
+    let style = value-or(block-data, "style", "note")
+    let fill = if style == "warning" {
+      rgb("fff4d6")
+    } else if style == "tip" {
+      rgb("e8f7ed")
+    } else {
+      rgb("eaf2fb")
+    }
+    block(
+      width: 100%,
+      fill: fill,
+      inset: 9pt,
+      radius: 4pt,
+      if children.len() > 0 {
+        for child in children { render-block(child) }
+      } else {
+        render-inlines(inlines)
+      },
+    )
   } else if kind == "blockquote" {
     quote(
       block: true,
@@ -221,6 +294,28 @@
     } else {
       link(destination, image-body)
     })
+  } else if kind == "video" {
+    let asset = value-or(block-data, "asset", "")
+    let source = value-or(block-data, "source", "")
+    let body = if asset == "" {
+      block(
+        width: 100%,
+        fill: rgb("f7f7f8"),
+        inset: 10pt,
+        radius: 3pt,
+        align(center, emph("Video: " + source)),
+      )
+    } else {
+      block(
+        breakable: false,
+        align(center, image(asset, width: 100%, fit: "contain", alt: "Video")),
+      )
+    }
+    block(
+      above: 0.8em,
+      below: 0.8em,
+      if source.starts-with("https://") { link(source, body) } else { body },
+    )
   } else if kind == "table" {
     render-table(block-data)
   } else if kind == "visualization" {
diff --git a/docs/admonitions.md b/docs/admonitions.md
new file mode 100644
index 00000000..4c7384a9
--- /dev/null
+++ b/docs/admonitions.md
@@ -0,0 +1,44 @@
+# Writerside admonitions
+
+BusyMark recognizes Writerside tips, notes, warnings, and neutral quote blocks
+in Writerside Markdown and XML `.topic` files.
+
+In Writerside Markdown, a blockquote is a tip by default:
+
+```markdown
+> Try the safer command first.
+```
+
+Use a trailing `style` attribute for the other supported presentations:
+
+```markdown
+> This limitation applies to all releases.
+{style="note"}
+
+> This operation deletes existing data.
+{style="warning"}
+
+> Documentation is a product feature.
+{style="quote"}
+```
+
+BusyMark also recognizes Writerside semantic elements in Markdown and XML
+topics:
+
+```xml
+<tip>Try the safer command first.</tip>
+<note>This limitation applies to all releases.</note>
+<warning>This operation deletes existing data.</warning>
+<quote>Documentation is a product feature.</quote>
+```
+
+The WYSIWYG editing toolbar shows an **Admonition** menu for Writerside
+Markdown topics. Select **Tip**, **Note**, **Warning**, or **Quote** to convert
+the active block or selected blocks. BusyMark emits Writerside-compatible
+blockquote syntax and preserves existing semantic-element syntax when changing
+the type of an element-based admonition.
+
+Ordinary Markdown blockquotes remain ordinary quotes. BusyMark does not apply
+Writerside's default-tip behavior outside a Writerside Markdown topic.
+
+The supported forms follow JetBrains' [Writerside admonition documentation](https://www.jetbrains.com/help/writerside/admonitions.html).
diff --git a/docs/collapsible-elements.md b/docs/collapsible-elements.md
new file mode 100644
index 00000000..29a4859c
--- /dev/null
+++ b/docs/collapsible-elements.md
@@ -0,0 +1,68 @@
+# Writerside collapsible elements
+
+BusyMark renders Writerside collapsible chapters, procedures, code blocks, and
+definition lists in Writerside Markdown topics and XML `.topic` files. These
+extensions are not interpreted in ordinary Markdown workspaces.
+
+## Chapters
+
+In Writerside Markdown, add the attribute to a heading:
+
+```markdown
+## Advanced details {collapsible="true"}
+
+This section is hidden until it is expanded.
+```
+
+In semantic markup, use a chapter element:
+
+```xml
+<chapter title="Advanced details" collapsible="true">
+  <p>This section is hidden until it is expanded.</p>
+</chapter>
+```
+
+The collapsible chapter owns the content up to the next heading at the same or
+a higher level.
+
+## Procedures and code
+
+Procedures use the semantic attribute:
+
+```xml
+<procedure title="Build the project" collapsible="true">
+  <step>Compile the sources.</step>
+  <step>Package the result.</step>
+</procedure>
+```
+
+For a Markdown code fence, put its attribute block directly after the fence:
+
+````markdown
+```kotlin
+data class Person(val name: String)
+```
+{collapsible="true" collapsed-title="Person.kt"}
+````
+
+Semantic `code-block` elements support the same `collapsible` and
+`collapsed-title` attributes. Without `collapsed-title`, BusyMark uses the
+first non-empty code line as the collapsed label.
+
+## Definition lists
+
+Set `collapsible="true"` on the definition list. Each definition becomes an
+independent disclosure item:
+
+```xml
+<deflist collapsible="true">
+  <def title="Open initially" default-state="expanded"><p>Text.</p></def>
+  <def title="Closed initially" default-state="collapsed"><p>Text.</p></def>
+</deflist>
+```
+
+Collapsible content is closed initially unless its element has
+`default-state="expanded"`. BusyMark preserves the original source and passes
+the same documented syntax to Writerside's official build pipeline.
+
+The syntax follows JetBrains' [Writerside collapsible-elements documentation](https://www.jetbrains.com/help/writerside/collapsible-elements.html).
diff --git a/docs/local-ai.md b/docs/local-ai.md
index 4e5543f9..7985438c 100644
--- a/docs/local-ai.md
+++ b/docs/local-ai.md
@@ -21,10 +21,10 @@ application bundle. A desktop process must still read the key to make a direct
 BYOK request, so OS credential storage protects the key at rest; it does not
 make a compromised desktop process trustworthy.
 
-Under strict Snap confinement, BusyMark uses libsecret's password API through
-the desktop interface. Libsecret selects the per-Snap Secret Portal backend;
-BusyMark does not request the broad `password-manager-service` interface or
-access other applications' keyring entries.
+BusyMark uses libsecret's password API through the desktop secret service.
+Access depends on the credential service made available to the packaged
+application. BusyMark does not write API keys into settings, workspaces, logs,
+or its application bundle.
 
 Choose **Automatic model selection** to let BusyMark route the task among the
 approved models of the selected provider, or **Fixed model** to use only the
diff --git a/docs/math.md b/docs/math.md
new file mode 100644
index 00000000..a481bd78
--- /dev/null
+++ b/docs/math.md
@@ -0,0 +1,101 @@
+# Mathematical expressions
+
+BusyMark renders mathematical expressions with its bundled MathJax 4 engine.
+Rendering is local and works without an Internet connection in the preview,
+Editor view, and Markdown PDF export. BusyMark supports TeX expressions inside
+Markdown; it is not a complete TeX or LaTeX document compiler.
+
+## Supported source forms
+
+Normal Markdown and Writerside Markdown support inline dollar math:
+
+```markdown
+Euler's identity is $e^{i\pi}+1=0$.
+```
+
+GitHub's dollar/backtick form is supported when the expression needs to contain
+Markdown-sensitive characters:
+
+```markdown
+The value is $`\sqrt{x^2+y^2}`$.
+```
+
+Display math can use double dollars or a `math` fence:
+
+````markdown
+$$
+\int_0^1 x^2\,dx = \frac{1}{3}
+$$
+
+```math
+\begin{aligned}
+a &= b + c \\
+d &= e + f
+\end{aligned}
+```
+````
+
+Writerside Markdown additionally treats a `tex` fence and a semantic
+`code-block` with `lang="tex"` as display math, and supports inline semantic
+markup:
+
+````markdown
+```tex
+\ce{2H2 + O2 -> 2H2O}
+```
+
+<code-block lang="tex">
+<![CDATA[\sum_{i=1}^n i < n^2]]>
+</code-block>
+
+The domain is <math>\mathbb{R}</math>.
+````
+
+The same `<math>` and `<code-block lang="tex">` elements are recognized in
+Writerside XML `.topic` files. XML entities and CDATA are decoded for MathJax,
+while BusyMark retains the original source for lossless round trips.
+Outside Writerside mode, a `tex` fence remains an ordinary code block.
+BusyMark does not add `\(...\)` or `\[...\]` as Markdown delimiters.
+
+## Scientific TeX profile
+
+The pinned profile contains MathJax's base TeX support plus AMS mathematics,
+`newcommand`, `mathtools`, `mhchem`, `boldsymbol`, `braket`, `cancel`, `cases`,
+`empheq`, `gensymb`, `units`, and `upgreek`. A command declared with
+`newcommand` applies only inside that expression; formulas do not share mutable
+TeX state.
+
+BusyMark deliberately does not enable `physics`, because that extension
+redefines standard commands. Dynamic package loading and HTML-oriented
+extensions—including `autoload`, `require`, `setoptions`, and `texhtml`—are
+disabled. A document cannot request another MathJax package or remote font.
+
+## Editing and export
+
+An unfocused Editor-view block shows rendered math. Activating a block that
+contains inline math switches that block to its exact Markdown source, including
+the delimiters. Leaving the block reparses it and restores rendered math. This
+keeps equation source available for selection, copy, undo, and normal text
+editing without representing equations as hidden replacement characters.
+
+Inline equations use MathJax's returned depth to align with the surrounding
+text baseline. Display equations are centered; equations wider than the
+preview remain available through horizontal scrolling. Invalid expressions
+stay visible as source instead of removing the surrounding content.
+
+Markdown PDF export uses the same MathJax package and font profile. BusyMark
+stages sanitized, self-contained SVG equations for Typst, including inline
+baseline metadata, so safe equations remain vector content in the PDF.
+
+## Offline and security behavior
+
+BusyMark ships MathJax 4.1.3 and New Computer Modern 4.1.3 as a deterministic
+browser bundle. NewCM's dynamic glyph tables are bundled as well; uncommon,
+calligraphic, and double-struck glyphs do not trigger downloads. The reusable
+WebKit renderer has no network connectivity, uses a restrictive content security
+policy, accepts only fixed packaged resources and operations, limits expression
+and batch sizes and render time, applies MathJax safe processing, and passes
+every SVG through BusyMark's generated-SVG normalizer before display or export.
+
+The supported Writerside forms follow the official
+[Writerside math syntax](https://www.jetbrains.com/help/writerside/math-support.html).
diff --git a/docs/snap-confinement.md b/docs/snap-confinement.md
new file mode 100644
index 00000000..fb70b43d
--- /dev/null
+++ b/docs/snap-confinement.md
@@ -0,0 +1,37 @@
+# Snap confinement
+
+The Snap Store build uses strict confinement. BusyMark bundles Git, OpenSSH,
+Typst, D2, WebKitGTK, and its other runtime dependencies rather than executing
+arbitrary host programs.
+
+The application plugs the standard desktop, display, audio, network, `home`,
+`removable-media`, and `ssh-keys` interfaces. This supports documentation
+projects in ordinary home-directory locations and connected removable media.
+Interfaces that expose sensitive SSH material are controlled by snapd and may
+require an explicit connection on the installed system.
+
+## Git author identity
+
+Git inside a strict Snap has a private home directory and cannot assume that a
+host-level `~/.gitconfig` is visible. When a commit has no author name or email,
+BusyMark opens a native identity form, saves the identity through bundled Git,
+and retries the original commit. The user never needs to run `git config` from
+a terminal.
+
+The form can save the identity for only the current repository or globally.
+Inside the Snap, global scope means every repository opened by BusyMark because
+the configuration is stored in BusyMark's Snap data directory. Repository scope
+writes the standard local Git configuration for that repository.
+
+Strict confinement cannot promise compatibility with arbitrary host-side Git
+hooks, signing programs, credential helpers, custom transports, or external
+diff tools. BusyMark must report those failures rather than weakening the Snap
+sandbox.
+
+## Local installation
+
+Install an unasserted strict build with:
+
+```bash
+sudo snap install --dangerous ./busymark_*.snap
+```
diff --git a/docs/videos.md b/docs/videos.md
new file mode 100644
index 00000000..1ab3a46a
--- /dev/null
+++ b/docs/videos.md
@@ -0,0 +1,70 @@
+# Writerside videos
+
+BusyMark recognizes Writerside's semantic `<video>` element in Writerside
+Markdown and XML `.topic` files. The element is document content rather than
+trusted raw HTML, and its original source is preserved exactly when the topic
+is saved.
+
+## Sources
+
+YouTube and Vimeo videos use an HTTPS URL:
+
+```xml
+<video src="https://youtu.be/BeJu9bMPLGU"/>
+<video src="https://vimeo.com/76979871"/>
+```
+
+Local video files belong in the effective Writerside images directory. A local
+video needs a preview image with the same basename, or an explicit
+`preview-src`:
+
+```xml
+<video src="sample.mp4"/>
+<video src="sample.mp4" preview-src="posters/sample-preview.png"/>
+```
+
+For the first example, BusyMark looks for `sample.png` beside `sample.mp4`.
+Imported Writerside topics copy both the local video and an explicit preview
+image. Missing sources and preview images appear in document diagnostics.
+
+BusyMark accepts the documented `width`, `height`, `mini-player`, and
+`border-effect` presentation attributes in its embedded player:
+
+```xml
+<video src="sample.mp4"
+       preview-src="sample.png"
+       width="640"
+       height="360"
+       mini-player="true"
+       border-effect="rounded"/>
+```
+
+Other Writerside attributes remain intact for the official Writerside build
+pipeline. BusyMark does not reinterpret ordinary Markdown `<video>` HTML as a
+Writerside element.
+
+## Desktop preview and PDF
+
+The BusyMark preview and Editor view show a poster until Play is pressed, then
+replace it in place with an interactive player. YouTube thumbnails are loaded
+from YouTube's image host, while Vimeo thumbnails are resolved through Vimeo's
+official oEmbed endpoint. An explicit `preview-src` overrides the provider
+thumbnail. Local files play through the packaged WebKit/GStreamer media stack.
+YouTube and Vimeo posters and players require a network connection.
+`mini-player="true"` hides controls other than play/pause.
+
+Only validated HTTPS YouTube and Vimeo video identifiers reach the hosted
+player. Arbitrary schemes, unrelated hosts, absolute authored paths, and paths
+escaping the project media roots are rejected. The interactive player uses an
+ephemeral WebKit context with cookies, permissions, popups, context menus,
+local storage, WebRTC, and unrelated network hosts blocked. It does not relax
+the separate offline WebKit renderer used for MathJax and visualizations.
+
+Markdown PDF export carries video as a first-class export node. Since PDF is
+not an interactive video container, it stages a local poster image and links
+HTTPS sources when available; a readable source fallback is emitted when no
+poster can be staged. Writerside module export uses the same native offline PDF
+pipeline and does not require a container runtime.
+
+The syntax follows JetBrains' [Writerside video documentation](https://www.jetbrains.com/help/writerside/videos.html)
+and [semantic markup reference](https://www.jetbrains.com/help/writerside/semantic-markup-reference.html).
diff --git a/docs/visualizations.md b/docs/visualizations.md
index 3e1ad75f..a062e9e1 100644
--- a/docs/visualizations.md
+++ b/docs/visualizations.md
@@ -19,6 +19,45 @@ Identifiers are classified case-insensitively. Saving preserves the exact
 source fence. History and diff views show source rather than generated output.
 Whole-file YAML/JSON OpenAPI editing is not part of this feature.
 
+## Writerside diagram forms
+
+Writerside Markdown and XML topics can also use semantic code blocks for
+Mermaid, PlantUML, and D2:
+
+```xml
+<code-block lang="mermaid">flowchart LR
+  A --&gt; B</code-block>
+
+<code-block lang="plantuml"><![CDATA[
+@startuml
+A -> B
+@enduml
+]]></code-block>
+
+<code-block lang="d2">a -> b</code-block>
+```
+
+Writerside's referenced-source form is supported for all three renderers. The
+path is relative to the current topic and must remain inside the open
+Writerside project:
+
+````markdown
+<code-block lang="D2" src="../codeSnippets/graph.d2"/>
+
+```mermaid
+```
+{ src="../codeSnippets/flow.mmd" }
+````
+
+Referenced files are read as strict UTF-8, size-limited, and resolved through
+BusyMark's anchored-path checks. Absolute paths, URI schemes, traversal outside
+the project, and symlink escapes are rejected. Semantic tags and the `src`
+attribute form are enabled only for Writerside projects; ordinary Markdown
+keeps them as ordinary HTML/text. These forms track the official Writerside
+documentation for [D2](https://www.jetbrains.com/help/writerside/d2-diagrams.html),
+[PlantUML](https://www.jetbrains.com/help/writerside/plantuml-diagrams.html),
+and [Mermaid](https://www.jetbrains.com/help/writerside/mermaid-diagrams.html).
+
 Demonstrations are available in:
 
 - [`demo/visualizations.md`](../demo/visualizations.md)
@@ -32,8 +71,8 @@ revision cancellation, priority scheduling, memory/disk LRU caches, generated
 SVG normalization, D2 execution, and OpenAPI dependency resolution. Cache keys
 include the renderer and sanitizer versions, source, theme, preview/PDF profile,
 options, and hashes of local dependencies. The disk cache is stored below
-`$XDG_CACHE_HOME/busymark/visualizations`; the strict Snap maps that location to
-`$SNAP_USER_DATA/.cache`.
+`$XDG_CACHE_HOME/busymark/visualizations` for both conventional packages and
+the strict Snap.
 
 The Linux runner provides a first-party Flutter platform-channel host backed by
 WebKitGTK 4.1. It uses one reusable hidden render view in an ephemeral WebKit
@@ -55,10 +94,9 @@ The CSP permits WebAssembly evaluation for the official PlantUML/Viz.js build
 and JavaScript evaluation for Scalar's bundled schema validator. Those
 permissions are confined to the private, allow-listed, no-network harness.
 
-WebKit's subprocess sandbox remains enabled for ordinary Linux packages. The
-strict Snap uses the auto-connected `browser-support` interface with
-`allow-sandbox: false`, so WebKit's internal sandbox is disabled there and the
-processes remain inside snapd's AppArmor/seccomp confinement.
+WebKit's subprocess sandbox remains enabled for ordinary Linux packages and
+the strict Snap. The private rendering scheme, ephemeral context, disabled
+storage, and no-network content policy apply in both package forms.
 
 ## Renderer policy
 
@@ -111,7 +149,7 @@ warning; it does not abort the document export.
 
 | Component | Version | Verified artifact SHA-256 |
 | --- | --- | --- |
-| Mermaid | 11.16.1 | `ebd9885111092c78cefc79a76f6c1dc34ed5b834b02ae8f338227ce79c003de4` |
+| Mermaid source | 11.16.1 | `0ee99b3bb82766e5d6c34b8cc768b8530ce8f1aaa13790ae368aebeef3de9d11` |
 | `@plantuml/core` | 1.2026.6 | `798f99592eb03a6446519d2becf78e6f1008d0d25c75d60b37a0f46e39e3c413` |
 | `@scalar/openapi-parser` | 0.28.14 | `993bb7ebb3480cc574665b0eac52d9cd4a817fdf5b4444894bb70e174880513d` |
 | `@scalar/api-reference` | 1.65.1 | `68b6f22ca530ac50e3cd034c5189d89cc5457c3c2d325b44e90db05c9f08c573` |
@@ -129,6 +167,11 @@ recipe uses the official `node/24/stable` build snap. Node.js and npm are build
 tools only. Runtime rendering does not require Node.js, Chromium, Java, a
 public rendering service, or a first-run download.
 
+BusyMark builds the complete Mermaid source profile with Mermaid's internal
+math rendering disabled. This keeps the existing diagram families while
+removing KaTeX from both the locked dependency graph and the shipped web
+bundle; mathematical document content is rendered only by MathJax.
+
 D2 is packaged only for Linux amd64. BusyMark must not advertise another
 architecture until the Snap platform, upstream artifact, and full corpus are
 all added and tested for it.
@@ -172,7 +215,7 @@ raster paths, OpenAPI model, live WebKit process termination/recovery, and Typst
 PDF export through the release executable.
 
 The same workflow builds the final strict Snap in a clean core24 build
-environment, installs it without changing its strict confinement, and runs that
+environment, installs it as an unasserted confined package, and runs that
 release verification under both X11 and Wayland. Automated suites also cover
 cancellation, stale-result rejection, timeout wiring, sanitization and external
 resources, traversal and symlink escapes, circular OpenAPI references, input
@@ -194,8 +237,8 @@ is not a substitute for these automated product-path checks.
 - [D2 icons and images](https://d2lang.com/tour/icons/)
 - [Scalar OpenAPI parser](https://github.com/scalar/scalar/blob/main/packages/openapi-parser/README.md)
 - [Scalar API Reference configuration](https://scalar.com/products/api-references/configuration)
-- [Snap browser-support interface](https://snapcraft.io/docs/reference/interfaces/browser-support-interface/)
-- [Snapcraft GNOME extension](https://forum.snapcraft.io/t/the-gnome-extension/31449)
+- [Snap confinement](https://snapcraft.io/docs/explanation/security/snap-confinement/)
+- [Snapcraft GNOME extension](https://documentation.ubuntu.com/snapcraft/latest/reference/extensions/gnome-extension/)
 - [Snapcraft project-file `grade` semantics](https://documentation.ubuntu.com/snapcraft/latest/reference/project-file/snapcraft-yaml/)
 - [GitHub Ubuntu 24.04 runner image](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md)
 - [Ubuntu 24.04 WebKitGTK 4.1 development package](https://packages.ubuntu.com/noble-updates/libwebkit2gtk-4.1-dev)
diff --git a/docs/writerside-pdf-export.md b/docs/writerside-pdf-export.md
index 9a300f0d..8804c37f 100644
--- a/docs/writerside-pdf-export.md
+++ b/docs/writerside-pdf-export.md
@@ -1,111 +1,69 @@
 # Writerside PDF export
 
-BusyMark exports a complete Writerside output instance, not a concatenation of
-its Markdown files. Includes, variables, conditional content, semantic XML,
-API documentation, diagrams, reused TOC sections, and cross-module references
-must be interpreted by Writerside itself to preserve their documented meaning.
-
-JetBrains documents automated PDF generation through the versioned
-`writerside-builder` container running `helpbuilderinspect -pdf`. BusyMark
-therefore keeps its bundled Typst pipeline for regular Markdown and uses that
-official JetBrains builder for Writerside modules.
+BusyMark exports a selected Writerside instance directly with its bundled PDF
+toolchain. Docker, Podman, a Writerside installation, and a network connection
+are not required.
 
 ## Export
 
 Open a Writerside module and select **Main menu → Export as PDF** or press
-<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>E</kbd>. BusyMark requires unsaved editor
-content to be saved or discarded before a project build, then lets you select:
+<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>E</kbd>. BusyMark first asks you to save or
+discard unsaved project changes, then lets you select:
 
 - one non-library Writerside instance;
-- settings configured for this export or an existing `<pdf>` XML file from the
-  module's configured build directory;
+- A4 or US Letter page size;
 - portrait or landscape orientation;
-- a keymap layout declared for that instance in `buildprofiles.xml`;
-- table-of-contents title;
-- optional cover title, logo, description, and copyright; and
-- page header and footer.
-
-The advanced section exposes the source root, module name, builder
-version, and network policy for multi-module repositories and version-sensitive
-projects. The source root defaults to the module's parent. The builder module
-name defaults to `<module name="…">` from `writerside.cfg`, or to the module
-directory name when that element is absent, for JetBrains'
-`MODULE_INSTANCE=module/instance` contract. If `writerside.cfg` declares
-`<wrs-supernova use-version="…"/>`, BusyMark uses that builder version by
-default; otherwise it uses the currently tested version
-`2026.07.8925`.
-
-Generated settings exist only in a private temporary source copy. BusyMark
-does not add or modify a file in the Writerside project. Selecting a project
-configuration passes that file through unchanged, so teams can commit and
-review a release-specific `PDF.xml`. The example module contains
-[`cfg/PDF.xml`](../demo/writerside-instances/cfg/PDF.xml) and a cover-logo
-asset for exercising generated settings.
-
-## Builder installation and isolation
-
-Docker must be installed and its daemon available to the current user. BusyMark
-checks for `jetbrains/writerside-builder:<version>` locally and never performs a
-silent pull. If the image is absent, BusyMark identifies the exact image and
-asks before downloading it. JetBrains' builder image is large and remains in
-Docker's local image store.
-
-Every build uses direct process arguments rather than a host shell and applies:
-
-- a bounded private source copy, leaving the project untouched while preserving
-  the coherent directory tree expected by the builder;
-- exclusion of version-control metadata, IDE state, and stale builder output;
-- rejection of circular links and links that escape the selected source root;
-- a private writable `.idea` directory for transient builder metadata;
-- a private temporary output directory;
-- a private generated PDF configuration when custom settings are selected;
-- a bounded Docker shared-memory allocation for the PDF renderer;
-- `--pull=never`, so an export cannot replace the selected builder image;
-- `--network none` by default; and
-- bounded process time, diagnostic output, and PDF size.
-
-Enable network access only when a reviewed project intentionally needs remote
-resources during its build. The builder is still project code processing: use
-it only for documentation sources you trust. A cancelled or timed-out build is
-terminated and its named container is removed. The validated PDF is published
-atomically to the selected destination.
-
-Strictly confined Snap applications cannot normally access the host Docker
-socket. Writerside PDF export therefore requires a native/development BusyMark
-installation until the distributed Snap has an explicitly reviewed and tested
-Docker access mechanism. Regular Markdown-to-PDF export remains available in
-the Snap because Typst is bundled.
+- narrow, normal, or wide margins; and
+- whether to include page numbers.
+
+The instance's resolved TOC determines topic order. Hidden and work-in-progress
+TOC entries are omitted unless a work-in-progress topic is the configured start
+page. Reused TOC sections already resolved by BusyMark participate in the same
+ordering. Project variables are substituted in recognized variable tokens.
+
+Writerside Markdown is parsed in Writerside mode, so supported semantic markup,
+admonitions, collapsible content, videos, math, Mermaid, PlantUML, and D2 use the
+same export semantics as BusyMark's editor and preview. `.topic` XML content is
+converted into the corresponding native PDF blocks for headings, paragraphs,
+procedures, steps, admonitions, code, lists, images, videos, links, and math.
+Malformed XML remains visible as source instead of disappearing.
+
+## Offline and security behavior
+
+Export uses BusyMark's bundled Typst compiler. Math uses the packaged MathJax
+renderer, and diagrams use the packaged visualization engines. No container
+image is downloaded and no daemon or system socket is accessed.
+
+Only topics reachable from the selected instance are composed. Local image and
+video-poster paths are canonicalized and must resolve inside the Writerside
+module. PDF publication is atomic, output size and compilation time are bounded,
+and cancellation terminates the active native compiler process.
+
+Remote video URLs remain links in PDF output. Remote images are not downloaded.
+When a local asset cannot be staged, the PDF contains a readable fallback and
+the export reports a warning.
 
 ## Scope
 
 PDF output is per Writerside instance. Library instances are reusable TOC
-sources and are not export choices. BusyMark does not offer PDF export for
-Writerside build groups because JetBrains' current GitHub publishing workflow
-does not support PDF artifacts for groups. Builder errors remain visible with
-their diagnostic log; BusyMark does not replace failed Writerside semantics
-with an approximate native conversion.
+sources and are not standalone export choices. BusyMark does not execute
+arbitrary Writerside build scripts or fetch remote project dependencies during
+native export.
+
+BusyMark is not the JetBrains Writerside publication builder. The native export
+targets a reliable offline PDF of the syntax BusyMark understands; teams that
+need byte-for-byte parity with JetBrains website artifacts can still run
+JetBrains' separate CI tooling outside BusyMark.
 
 ## Verification
 
-Focused tests cover documented XML generation, configuration and keymap
-discovery, missing builder handling, cancellation, existing configuration
-pass-through, PDF validation, private builder metadata, bounded source copying,
-process-crash retry, and a module without an existing `cfg` directory. Release
-validation with the real image should export the demo using both generated
-settings and `cfg/PDF.xml`.
+Focused tests cover instance selection, TOC ordering, variables, Markdown and
+`.topic` XML composition, local asset rebasing, cancellation, failure mapping,
+and an end-to-end native PDF build of the repository's Writerside demo.
 
-After the pinned image is installed, run the real project-to-PDF smoke test:
+Run:
 
 ```bash
-BUSYMARK_WRITERSIDE_PDF_INTEGRATION=1 \
-  flutter test test/src/writerside_pdf_export_test.dart
+flutter test test/src/writerside_pdf_export_test.dart
+flutter test test/src/markdown_pdf_export_test.dart
 ```
-
-## Authoritative references
-
-- [Export to PDF](https://www.jetbrains.com/help/writerside/export-to-pdf.html)
-- [Build with Docker](https://www.jetbrains.com/help/writerside/build-with-docker.html)
-- [Modules](https://www.jetbrains.com/help/writerside/help-modules.html)
-- [writerside.cfg](https://www.jetbrains.com/help/writerside/writerside-cfg.html)
-- [buildprofiles.xml](https://www.jetbrains.com/help/writerside/buildprofiles-xml.html)
-- [Writerside GitHub Action](https://github.com/JetBrains/writerside-github-action)
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 57647d80..bac2e617 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "إعادة فتح مساحة العمل السابقة عند بدء التشغيل",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "افتح مساحة العمل وعلامات التبويب من الجلسة السابقة عند بدء BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "التأكيد قبل الإغلاق عند وجود تغييرات غير محفوظة",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "صورة",
+  "video": "فيديو",
+  "openVideo": "تشغيل الفيديو",
+  "pauseVideo": "إيقاف الفيديو مؤقتًا",
+  "videoUnavailable": "الفيديو غير متاح",
+  "videoPreview": "معاينة الفيديو",
+  "diagnosticWritersideVideoMissingSource": "يفتقد الفيديو سمة src.",
+  "diagnosticWritersideVideoUnsupportedSource": "مصدر فيديو غير مدعوم: {source}",
+  "diagnosticWritersideVideoMissingFile": "ملف الفيديو غير موجود: {source}",
+  "diagnosticWritersideVideoMissingPreview": "صورة معاينة الفيديو غير موجودة: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1322,6 +1335,8 @@
   "sourceLargeFileFeaturesPaused": "ملف كبير: تم إيقاف التمييز والطي مؤقتًا",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "لا يوجد محتوى للقراءة",
+  "admonition": "تنبيه",
+  "quote": "اقتباس",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1363,7 +1378,7 @@
   },
   "couldNotOpenTarget": "تعذر فتح \u2068{target}\u2069",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1372,7 +1387,7 @@
   },
   "linkTargetNotFound": "لم يتم العثور على هدف الرابط: \u2068{targetPath}\u2069",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1381,11 +1396,11 @@
   },
   "cannotOpenFileTypeInEditor": "لا يمكن فتح هذا النوع من الملفات في المحرر",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "لم يتم العثور على المُرسى: \u2068{anchor}\u2069",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2216,6 +2231,7 @@
   "gitFileHistory": "الملف الحالي",
   "gitAdditionsDeletions": "\u2068+{additions} -{deletions}\u2069",
   "fileActions": "إجراءات الملف",
+  "actions": "إجراءات",
   "gitStatusAdded": "مضاف",
   "gitStatusDeleted": "محذوف",
   "gitStatusRenamed": "أُعيدت تسميته",
@@ -2235,7 +2251,15 @@
   "gitErrorMultipleRemotes": "تم إعداد عدة مستودعات بعيدة. اختر فرع منبع خارج هذا الإصدار من BusyMark.",
   "gitErrorDirtyWorkspace": "احفظ تغييرات محرر BusyMark أو تجاهلها قبل تبديل الفروع.",
   "gitErrorDiverged": "تباعد الفرع. عالج الدمج أو إعادة التأسيس خارج هذا الإصدار من BusyMark.",
-  "gitErrorAuthentication": "فشلت مصادقة Git. في حزمة snap، قد تتطلب مستودعات SSH البعيدة توصيل واجهة ssh-keys.",
+  "gitErrorAuthorIdentity": "يحتاج Git إلى اسم المؤلف وعنوان بريده الإلكتروني قبل إنشاء الالتزام.",
+  "gitAuthorIdentityTitle": "هوية مؤلف Git",
+  "gitAuthorIdentityMessage": "أدخل الهوية التي يجب أن يسجلها Git في الالتزامات. سيحفظها BusyMark ويعيد محاولة هذا الالتزام.",
+  "gitAuthorName": "الاسم",
+  "gitAuthorEmail": "البريد الإلكتروني",
+  "gitAuthorIdentityGlobal": "استخدامها لجميع المستودعات",
+  "gitAuthorIdentityGlobalDescription": "عند التثبيت كحزمة Snap، ينطبق هذا على المستودعات المفتوحة في BusyMark.",
+  "gitSaveIdentityAndCommit": "حفظ وإنشاء الالتزام",
+  "gitErrorAuthentication": "فشلت مصادقة Git.",
   "gitErrorNetwork": "فشلت عملية Git عبر الشبكة.",
   "gitErrorConflict": "أبلغ Git عن تعارضات لم تُحل.",
   "gitErrorCommandFailed": "فشل أمر Git.",
@@ -2549,56 +2573,23 @@
   "diagnosticWritersideReferenceTopicMissing": "الموضوع «⁨{topic}⁩» غير موجود في المثيل المشار إليه «⁨{instance}⁩».",
   "download": "تنزيل",
   "exportWritersideAsPdf": "تصدير Writerside بصيغة PDF",
-  "writersidePdfExportDescription": "اختر مثيلاً وإعدادات PDF. يستخدم BusyMark أداة البناء الرسمية لـ Writerside من JetBrains.",
   "writersidePdfContent": "محتوى التصدير",
-  "writersidePdfSettings": "إعدادات PDF",
-  "writersidePdfConfigureHere": "تهيئة لهذا التصدير",
-  "writersidePdfProjectConfiguration": "استخدام تهيئة المشروع",
-  "writersidePdfConfigurationFile": "ملف تهيئة PDF",
   "writersidePdfPage": "الصفحة",
-  "writersidePdfKeymap": "تخطيط المفاتيح",
-  "writersidePdfNoKeymap": "بلا تخطيط مفاتيح",
-  "writersidePdfTocTitle": "عنوان جدول المحتويات",
-  "writersidePdfCover": "صفحة الغلاف",
-  "writersidePdfIncludeCover": "تضمين صفحة غلاف",
-  "writersidePdfCoverTitle": "عنوان الغلاف",
-  "writersidePdfCoverDescription": "وصف الغلاف",
-  "writersidePdfCopyright": "حقوق النشر",
-  "writersidePdfCoverLogo": "شعار الغلاف",
-  "writersidePdfChooseCoverLogo": "اختيار شعار الغلاف",
-  "writersidePdfHeaderAndFooter": "رأس الصفحة وتذييلها",
-  "writersidePdfHeader": "رأس الصفحة",
-  "writersidePdfFooter": "تذييل الصفحة",
-  "writersidePdfAdvancedDescription": "تربط هذه القيم الوحدة المفتوحة بتخطيط المصادر في أداة البناء.",
-  "writersidePdfModuleName": "اسم الوحدة",
-  "writersidePdfSourceRoot": "جذر المصادر",
-  "writersidePdfChooseSourceRoot": "اختيار جذر المصادر",
-  "writersidePdfBuilderVersion": "إصدار أداة البناء",
-  "writersidePdfAllowNetwork": "السماح بالشبكة أثناء البناء",
-  "writersidePdfAllowNetworkDescription": "معطل افتراضيًا. مكّنه فقط إذا كان المشروع يحتاج عمدًا إلى موارد بناء بعيدة.",
-  "writersidePdfModuleNameRequired": "أدخل اسم الوحدة.",
-  "writersidePdfSourceRootRequired": "اختر جذر المصادر.",
-  "writersidePdfBuilderVersionInvalid": "أدخل إصدارًا صالحًا لأداة البناء.",
-  "writersidePdfBuilderRequired": "أداة بناء Writerside مطلوبة",
-  "writersidePdfBuilderDownloadDescription": "يستخدم BusyMark صورة الحاوية الرسمية ⁨{image}⁩. هل تريد تنزيلها الآن؟ الصورة كبيرة وسيخزنها Docker.",
-  "writersidePdfDownloadingBuilder": "جارٍ تنزيل أداة بناء Writerside…",
   "exportingWritersidePdf": "جارٍ تصدير ملف Writerside PDF…",
-  "writersidePdfDockerUnavailable": "يلزم Docker لتصدير Writerside إلى PDF. ثبّت Docker وشغّله ثم حاول مجددًا.",
-  "writersidePdfBuilderUnavailable": "صورة أداة بناء Writerside المطلوبة غير متاحة.",
-  "writersidePdfConfigurationInvalid": "تهيئة Writerside PDF غير صالحة.",
-  "writersidePdfBuildFailed": "تعذر على أداة بناء Writerside إنشاء ملف PDF.",
-  "writersidePdfInvalidOutput": "لم تُنتج أداة بناء Writerside ملف PDF صالحًا.",
   "ai": "الذكاء الاصطناعي",
   "aiLocalOllama": "Ollama المحلي",
   "aiDisabled": "معطّل",
   "aiLocalOnlyDescription": "لا يبدأ التحرير بالذكاء الاصطناعي إلا بإجراء صريح. لا يرسل BusyMark إلا السياق المعروض إلى المزوّد المحدد، ولا يطبّق أي اقتراح من دون مراجعته.",
   "aiProvider": "موفّر الذكاء الاصطناعي",
+  "aiDefaultProvider": "موفّر الذكاء الاصطناعي الافتراضي",
+  "aiConfigureProvider": "تهيئة موفّر الذكاء الاصطناعي",
+  "aiChooseProvider": "اختر موفّر الذكاء الاصطناعي",
   "aiOllamaEndpoint": "نقطة نهاية Ollama",
   "aiOllamaModel": "نموذج Ollama",
   "aiTestConnection": "اختبار الاتصال",
   "aiTestingConnection": "جارٍ الاختبار…",
   "aiConnectionReady": "تم الاتصال. عُثر على \u2068{count}\u2069 من النماذج المثبّتة.",
-  "aiNoModels": "يعمل Ollama، لكن لم يُعثر على نماذج مثبّتة.",
+  "aiNoModels": "لم يتم تحديد نموذج.",
   "aiConnectionFailed": "تعذّر على BusyMark التحقق من إنشاء النص بالذكاء الاصطناعي.",
   "aiConfigureFirst": "فعّل مزوّد ذكاء اصطناعي وتحقق من نموذج في الإعدادات ← الذكاء الاصطناعي.",
   "aiEditWithAi": "تحرير باستخدام الذكاء الاصطناعي",
@@ -2630,9 +2621,6 @@
   "aiReviewExactContent": "مراجعة المحتوى الدقيق",
   "aiContentToChange": "المحتوى المراد تغييره",
   "aiContentSentToAi": "المحتوى المُرسل إلى الذكاء الاصطناعي",
-  "aiPrivacyDisabled": "الذكاء الاصطناعي معطّل. لا يرسل BusyMark محتوى المستند مطلقًا من دون إجراء صريح للذكاء الاصطناعي.",
-  "aiPrivacyLocal": "لا يرسل BusyMark إلا السياق المعروض في مربع حوار المراجعة إلى خدمة Ollama المحلية المضبوطة. لا تُطبّق الاقتراحات مطلقًا من دون مراجعة.",
-  "aiPrivacyCloud": "لا يرسل BusyMark إلا السياق المعروض في مربع حوار المراجعة إلى ⁨{provider}⁩. الطلبات عديمة الحالة، ولا تُطبّق الاقتراحات مطلقًا من دون مراجعة.",
   "aiApiKey": "مفتاح API",
   "aiApiKeyStoredHint": "يوجد مفتاح محفوظ في مخزن بيانات الاعتماد في النظام",
   "aiApiKeyEnterHint": "أدخل مفتاح API للمزوّد",
@@ -2645,6 +2633,7 @@
   "aiAutomaticRouting": "تلقائي حسب المهمة",
   "aiFixedModelRouting": "استخدام النموذج المحدد",
   "aiPreferredModel": "النموذج المفضّل",
+  "aiModel": "النموذج",
   "aiUsageThisMonth": "⁨{requests}⁩ طلبات · ⁨{input}⁩ رموز إدخال · ⁨{output}⁩ رموز إخراج",
   "aiCloudConsentTitle": "هل تريد إرسال المحتوى إلى ⁨{provider}⁩؟",
   "aiCloudConsentEnable": "تفعيل ⁨{provider}⁩",
@@ -2665,5 +2654,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "يلي عنوان المستوى ⁨{previousLevel}⁩ عنوان من المستوى ⁨{level}⁩؛ راجع تداخل الأقسام.",
   "diagnosticMarkdownLinkEmptyText": "نص الرابط فارغ؛ أدخل اسمًا ميسّرًا يصف الغرض منه.",
   "diagnosticMarkdownLinkReviewText": "راجع ما إذا كان نص الرابط «⁨{text}⁩» يصف غرضه ضمن السياق.",
-  "diagnosticMarkdownTableEmptyHeader": "يجب أن تعرّف رؤوس الجدول أعمدتها؛ أكمل كل رأس فارغ."
+  "diagnosticMarkdownTableEmptyHeader": "يجب أن تعرّف رؤوس الجدول أعمدتها؛ أكمل كل رأس فارغ.",
+  "commandPalette": "لوحة الأوامر",
+  "commandPaletteHint": "اكتب أمرًا",
+  "commandPaletteEmpty": "لا توجد أوامر مطابقة",
+  "tableAlignmentUnspecified": "المحاذاة: غير محددة",
+  "tableAlignmentLeft": "المحاذاة: إلى اليسار",
+  "tableAlignmentCenter": "المحاذاة: إلى الوسط",
+  "tableAlignmentRight": "المحاذاة: إلى اليمين",
+  "sourceSearchReplacement": "استبدال بـ",
+  "sourceSearchReplaceCurrent": "استبدال المطابقة الحالية",
+  "sourceSearchReplaceAndFindNext": "استبدال والبحث عن التالي",
+  "sourceSearchReplaceAll": "استبدال الكل",
+  "workspaceReplace": "استبدال في مساحة العمل",
+  "reviewReplacements": "مراجعة الاستبدالات",
+  "applyReplacements": "تطبيق الاستبدالات",
+  "skippedFiles": "الملفات المتخطاة",
+  "workspaceReplaceDirtyBuffer": "محتوى المحرر غير المحفوظ",
+  "workspaceReplaceDiskContent": "المحتوى المحفوظ على القرص",
+  "selectFileMatches": "تحديد كل المطابقات وعددها {count}",
+  "workspaceReplaceApplied": "تم استبدال {matches} مطابقة في {files} ملفًا؛ وتم تخطي {skipped}.",
+  "documentFormatWithFinalNewline": "⁨{encoding}⁩ · ⁨{lineEnding}⁩ · سطر جديد نهائي",
+  "documentFormatWithoutFinalNewline": "⁨{encoding}⁩ · ⁨{lineEnding}⁩ · بلا سطر جديد نهائي",
+  "normalizeLineEndings": "توحيد نهايات الأسطر",
+  "workspaceReplaceMixedLineEndings": "يستخدم الملف ⁨{fileName}⁩ نهايات أسطر مختلطة. اختر التنسيق قبل الاستبدال.",
+  "mixedLineEndingsSavePrompt": "يحتوي هذا المستند على نهايات أسطر مختلطة. اختر تنسيقًا.",
+  "workspaceReplaceIssueOversized": "تم تخطي ملف يتجاوز الحجم المسموح.",
+  "workspaceReplaceIssueUnreadable": "تم تخطي ملف تعذرت قراءته.",
+  "workspaceReplaceIssueInvalidUtf8": "تم تخطي ملف بترميز UTF-8 غير صالح.",
+  "workspaceReplaceIssueTruncated": "تم اقتطاع معاينة الاستبدال.",
+  "workspaceReplaceIssueFileChanged": "تم تخطي ملف تغيّر بعد المعاينة.",
+  "workspaceReplaceIssueBufferChanged": "تم تخطي مخزن محرر مؤقت تغيّر بعد المعاينة.",
+  "workspaceReplaceIssueNormalizationRequired": "اختر توحيد LF أو CRLF قبل الاستبدال.",
+  "externalChangesTitle": "تغييرات خارجية — ⁨{fileName}⁩",
+  "externalFileDeleted": "تم حذف هذا الملف من القرص.",
+  "externalFileChanged": "تغيّر هذا الملف على القرص بينما لديك تعديلات غير محفوظة.",
+  "compare": "مقارنة",
+  "reloadFromDisk": "إعادة التحميل من القرص",
+  "keepMine": "الاحتفاظ بنسختي",
+  "saveAs": "حفظ باسم",
+  "unsavedChangesMultipleMessage": "يحتوي {count} من المستندات على تغييرات غير محفوظة. هل تريد حفظها قبل المتابعة؟",
+  "workspaceReplaceIssuePartialConflict": "توقف التراجع لأن الملف تغير بالتزامن. قد تبقى بعض الاستبدالات؛ حُفظ المحتوى المُزاح في المسار أدناه.",
+  "workspaceReplaceIssueApplyFailed": "لم تُطبّق أي استبدالات لأن المجموعة التي تمت مراجعتها تعذر حفظها بأمان.",
+  "workspaceRecoveryRestored": "تمت استعادة {count} من المستندات غير المحفوظة. راجع كل مستند تمت استعادته قبل المتابعة.",
+  "workspaceRecoveryDamaged": "تعذرت استعادة {count} من سجلات الاستعادة التالفة. تظل المستندات الصالحة التي تمت استعادتها متاحة.",
+  "recoveredDocumentReview": "تمت استعادة المحتوى غير المحفوظ للملف {fileName}. راجعه، ثم احفظه أو احفظه باسم جديد أو تجاهله.",
+  "commandUnavailableInContext": "هذا الأمر غير متاح في السياق الحالي.",
+  "mathRenderFailed": "تعذر عرض التعبير الرياضي.",
+  "inlineMath": "رياضيات مضمنة",
+  "displayMath": "رياضيات معروضة"
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index eb444146..c1553c3e 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Vorherigen Arbeitsbereich beim Start erneut öffnen",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Arbeitsbereich und Tabs der vorherigen Sitzung beim Start von BusyMark öffnen.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Vor dem Schließen bei ungespeicherten Änderungen bestätigen",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Bild",
+  "video": "Video",
+  "openVideo": "Video abspielen",
+  "pauseVideo": "Video pausieren",
+  "videoUnavailable": "Video nicht verfügbar",
+  "videoPreview": "Videovorschau",
+  "diagnosticWritersideVideoMissingSource": "Dem Video fehlt das src-Attribut.",
+  "diagnosticWritersideVideoUnsupportedSource": "Nicht unterstützte Videoquelle: {source}",
+  "diagnosticWritersideVideoMissingFile": "Videodatei ist nicht vorhanden: {source}",
+  "diagnosticWritersideVideoMissingPreview": "Videovorschaubild ist nicht vorhanden: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1320,6 +1333,8 @@
   "sourceLargeFileFeaturesPaused": "Große Datei: Hervorhebung und Faltung sind pausiert",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Nichts zu lesen",
+  "admonition": "Hinweisblock",
+  "quote": "Zitat",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1361,7 +1376,7 @@
   },
   "couldNotOpenTarget": "{target} konnte nicht geöffnet werden",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1370,7 +1385,7 @@
   },
   "linkTargetNotFound": "Linkziel nicht gefunden: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1379,11 +1394,11 @@
   },
   "cannotOpenFileTypeInEditor": "Dieser Dateityp kann nicht im Editor geöffnet werden",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Anker nicht gefunden: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2214,6 +2229,7 @@
   "gitFileHistory": "Aktuelle Datei",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Dateiaktionen",
+  "actions": "Aktionen",
   "gitStatusAdded": "Hinzugefügt",
   "gitStatusDeleted": "Gelöscht",
   "gitStatusRenamed": "Umbenannt",
@@ -2233,7 +2249,15 @@
   "gitErrorMultipleRemotes": "Mehrere Remotes sind konfiguriert. Wählen Sie außerhalb dieser BusyMark-Version einen Upstream aus.",
   "gitErrorDirtyWorkspace": "Speichern oder verwerfen Sie die Editoränderungen in BusyMark, bevor Sie den Branch wechseln.",
   "gitErrorDiverged": "Der Branch ist auseinandergelaufen. Führen Sie Merge oder Rebase außerhalb dieser BusyMark-Version aus.",
-  "gitErrorAuthentication": "Git-Authentifizierung fehlgeschlagen. Im Snap muss für SSH-Remotes möglicherweise die Schnittstelle ssh-keys verbunden werden.",
+  "gitErrorAuthorIdentity": "Git benötigt vor dem Commit einen Autorennamen und eine E-Mail-Adresse.",
+  "gitAuthorIdentityTitle": "Git-Autorenidentität",
+  "gitAuthorIdentityMessage": "Geben Sie die Identität ein, die Git in Commits eintragen soll. BusyMark speichert sie und wiederholt diesen Commit.",
+  "gitAuthorName": "Autorenname",
+  "gitAuthorEmail": "E-Mail",
+  "gitAuthorIdentityGlobal": "Für alle Repositorys verwenden",
+  "gitAuthorIdentityGlobalDescription": "Bei einer Snap-Installation gilt dies für Repositorys, die in BusyMark geöffnet werden.",
+  "gitSaveIdentityAndCommit": "Speichern und committen",
+  "gitErrorAuthentication": "Git-Authentifizierung fehlgeschlagen.",
   "gitErrorNetwork": "Git-Netzwerkvorgang fehlgeschlagen.",
   "gitErrorConflict": "Git hat ungelöste Konflikte gemeldet.",
   "gitErrorCommandFailed": "Git-Befehl fehlgeschlagen.",
@@ -2570,56 +2594,23 @@
   "diagnosticWritersideReferenceTopicMissing": "Das Thema „{topic}“ gehört nicht zur referenzierten Instanz „{instance}“.",
   "download": "Herunterladen",
   "exportWritersideAsPdf": "Writerside als PDF exportieren",
-  "writersidePdfExportDescription": "Wählen Sie eine Instanz und die PDF-Einstellungen aus. BusyMark verwendet den offiziellen Writerside-Builder von JetBrains.",
   "writersidePdfContent": "Exportinhalt",
-  "writersidePdfSettings": "PDF-Einstellungen",
-  "writersidePdfConfigureHere": "Für diesen Export konfigurieren",
-  "writersidePdfProjectConfiguration": "Projektkonfiguration verwenden",
-  "writersidePdfConfigurationFile": "PDF-Konfigurationsdatei",
   "writersidePdfPage": "Seite",
-  "writersidePdfKeymap": "Tastaturbelegung",
-  "writersidePdfNoKeymap": "Keine Tastaturbelegung",
-  "writersidePdfTocTitle": "Titel des Inhaltsverzeichnisses",
-  "writersidePdfCover": "Deckblatt",
-  "writersidePdfIncludeCover": "Deckblatt einfügen",
-  "writersidePdfCoverTitle": "Deckblatttitel",
-  "writersidePdfCoverDescription": "Deckblattbeschreibung",
-  "writersidePdfCopyright": "Urheberrecht",
-  "writersidePdfCoverLogo": "Deckblattlogo",
-  "writersidePdfChooseCoverLogo": "Deckblattlogo auswählen",
-  "writersidePdfHeaderAndFooter": "Kopf- und Fußzeile",
-  "writersidePdfHeader": "Kopfzeile",
-  "writersidePdfFooter": "Fußzeile",
-  "writersidePdfAdvancedDescription": "Diese Werte ordnen das geöffnete Modul dem Quelllayout des Builders zu.",
-  "writersidePdfModuleName": "Modulname",
-  "writersidePdfSourceRoot": "Quellstammverzeichnis",
-  "writersidePdfChooseSourceRoot": "Quellstammverzeichnis auswählen",
-  "writersidePdfBuilderVersion": "Builder-Version",
-  "writersidePdfAllowNetwork": "Netzwerk während des Builds zulassen",
-  "writersidePdfAllowNetworkDescription": "Standardmäßig deaktiviert. Nur aktivieren, wenn das Projekt bewusst entfernte Build-Ressourcen benötigt.",
-  "writersidePdfModuleNameRequired": "Geben Sie den Modulnamen ein.",
-  "writersidePdfSourceRootRequired": "Wählen Sie das Quellstammverzeichnis aus.",
-  "writersidePdfBuilderVersionInvalid": "Geben Sie eine gültige Builder-Version ein.",
-  "writersidePdfBuilderRequired": "Writerside-Builder erforderlich",
-  "writersidePdfBuilderDownloadDescription": "BusyMark verwendet das offizielle Container-Image {image}. Jetzt herunterladen? Das Image ist groß und wird von Docker gespeichert.",
-  "writersidePdfDownloadingBuilder": "Writerside-Builder wird heruntergeladen…",
   "exportingWritersidePdf": "Writerside-PDF wird exportiert…",
-  "writersidePdfDockerUnavailable": "Docker ist für den Writerside-PDF-Export erforderlich. Installieren und starten Sie Docker und versuchen Sie es erneut.",
-  "writersidePdfBuilderUnavailable": "Das angeforderte Writerside-Builder-Image ist nicht verfügbar.",
-  "writersidePdfConfigurationInvalid": "Die Writerside-PDF-Konfiguration ist ungültig.",
-  "writersidePdfBuildFailed": "Der Writerside-Builder konnte die PDF-Datei nicht erstellen.",
-  "writersidePdfInvalidOutput": "Der Writerside-Builder hat keine gültige PDF-Datei erzeugt.",
   "ai": "KI",
   "aiLocalOllama": "Lokales Ollama",
   "aiDisabled": "Deaktiviert",
   "aiLocalOnlyDescription": "KI-Bearbeitung erfolgt nur auf ausdrücklichen Befehl. BusyMark sendet ausschließlich den angezeigten Kontext an den ausgewählten Anbieter und übernimmt keinen Vorschlag ohne Prüfung.",
   "aiProvider": "KI-Anbieter",
+  "aiDefaultProvider": "Standardanbieter",
+  "aiConfigureProvider": "Anbieter konfigurieren",
+  "aiChooseProvider": "KI-Anbieter auswählen",
   "aiOllamaEndpoint": "Ollama-Endpunkt",
   "aiOllamaModel": "Ollama-Modell",
   "aiTestConnection": "Verbindung testen",
   "aiTestingConnection": "Wird getestet…",
   "aiConnectionReady": "Verbunden. {count} installierte(s) Modell(e) gefunden.",
-  "aiNoModels": "Ollama wird ausgeführt, aber es wurden keine installierten Modelle gefunden.",
+  "aiNoModels": "Kein Modell ausgewählt.",
   "aiConnectionFailed": "BusyMark konnte die KI-Textgenerierung nicht überprüfen.",
   "aiConfigureFirst": "Aktivieren Sie unter Einstellungen → KI einen KI-Anbieter und überprüfen Sie ein Modell.",
   "aiEditWithAi": "Mit KI bearbeiten",
@@ -2651,9 +2642,6 @@
   "aiReviewExactContent": "Genaue Inhalte prüfen",
   "aiContentToChange": "Zu ändernder Inhalt",
   "aiContentSentToAi": "An KI gesendeter Inhalt",
-  "aiPrivacyDisabled": "KI ist deaktiviert. BusyMark sendet Dokumentinhalte niemals ohne eine ausdrückliche KI-Aktion.",
-  "aiPrivacyLocal": "BusyMark sendet nur den im Prüfdialog angezeigten Kontext an den konfigurierten lokalen Ollama-Dienst. Vorschläge werden nie ohne Prüfung übernommen.",
-  "aiPrivacyCloud": "BusyMark sendet nur den im Prüfdialog angezeigten Kontext an {provider}. Anfragen sind zustandslos, und Vorschläge werden nie ohne Prüfung übernommen.",
   "aiApiKey": "API-Schlüssel",
   "aiApiKeyStoredHint": "Ein Schlüssel ist in der systemweiten Anmeldeinformationsverwaltung gespeichert",
   "aiApiKeyEnterHint": "API-Schlüssel des Anbieters eingeben",
@@ -2666,6 +2654,7 @@
   "aiAutomaticRouting": "Automatisch nach Aufgabe",
   "aiFixedModelRouting": "Ausgewähltes Modell verwenden",
   "aiPreferredModel": "Bevorzugtes Modell",
+  "aiModel": "Modell",
   "aiUsageThisMonth": "{requests} Anfragen · {input} Eingabetoken · {output} Ausgabetoken",
   "aiCloudConsentTitle": "Inhalte an {provider} senden?",
   "aiCloudConsentEnable": "{provider} aktivieren",
@@ -2686,5 +2675,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Auf Überschriftenebene {previousLevel} folgt Ebene {level}; prüfen Sie die Abschnittsverschachtelung.",
   "diagnosticMarkdownLinkEmptyText": "Der Linktext ist leer; geben Sie einen zugänglichen Namen an, der den Zweck beschreibt.",
   "diagnosticMarkdownLinkReviewText": "Prüfen Sie, ob der Linktext „{text}“ seinen Zweck im Kontext beschreibt.",
-  "diagnosticMarkdownTableEmptyHeader": "Tabellenüberschriften müssen ihre Spalten bezeichnen; füllen Sie jede leere Überschrift aus."
+  "diagnosticMarkdownTableEmptyHeader": "Tabellenüberschriften müssen ihre Spalten bezeichnen; füllen Sie jede leere Überschrift aus.",
+  "commandPalette": "Befehlspalette",
+  "commandPaletteHint": "Befehl eingeben",
+  "commandPaletteEmpty": "Keine passenden Befehle",
+  "tableAlignmentUnspecified": "Ausrichtung: Nicht festgelegt",
+  "tableAlignmentLeft": "Ausrichtung: Links",
+  "tableAlignmentCenter": "Ausrichtung: Mitte",
+  "tableAlignmentRight": "Ausrichtung: Rechts",
+  "sourceSearchReplacement": "Ersetzen durch",
+  "sourceSearchReplaceCurrent": "Aktuellen Treffer ersetzen",
+  "sourceSearchReplaceAndFindNext": "Ersetzen und weitersuchen",
+  "sourceSearchReplaceAll": "Alle ersetzen",
+  "workspaceReplace": "Im Arbeitsbereich ersetzen",
+  "reviewReplacements": "Ersetzungen prüfen",
+  "applyReplacements": "Ersetzungen anwenden",
+  "skippedFiles": "Übersprungene Dateien",
+  "workspaceReplaceDirtyBuffer": "Ungespeicherter Editorinhalt",
+  "workspaceReplaceDiskContent": "Gespeicherter Festplatteninhalt",
+  "selectFileMatches": "Alle {count} Treffer auswählen",
+  "workspaceReplaceApplied": "{matches} Treffer in {files} Dateien ersetzt; {skipped} übersprungen.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Abschließender Zeilenumbruch",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Kein abschließender Zeilenumbruch",
+  "normalizeLineEndings": "Zeilenenden normalisieren",
+  "workspaceReplaceMixedLineEndings": "{fileName} verwendet gemischte Zeilenenden. Wählen Sie vor dem Ersetzen das gewünschte Format.",
+  "mixedLineEndingsSavePrompt": "Dieses Dokument enthält gemischte Zeilenenden. Wählen Sie ein Format.",
+  "workspaceReplaceIssueOversized": "Eine zu große Datei wurde übersprungen.",
+  "workspaceReplaceIssueUnreadable": "Eine nicht lesbare Datei wurde übersprungen.",
+  "workspaceReplaceIssueInvalidUtf8": "Eine Datei ohne gültige UTF-8-Codierung wurde übersprungen.",
+  "workspaceReplaceIssueTruncated": "Die Ersetzungsvorschau wurde gekürzt.",
+  "workspaceReplaceIssueFileChanged": "Eine Datei, die sich nach der Vorschau geändert hat, wurde übersprungen.",
+  "workspaceReplaceIssueBufferChanged": "Ein Editorpuffer, der sich nach der Vorschau geändert hat, wurde übersprungen.",
+  "workspaceReplaceIssueNormalizationRequired": "Wählen Sie vor dem Ersetzen die Normalisierung auf LF oder CRLF.",
+  "externalChangesTitle": "Externe Änderungen — {fileName}",
+  "externalFileDeleted": "Diese Datei wurde auf dem Datenträger gelöscht.",
+  "externalFileChanged": "Diese Datei wurde auf dem Datenträger geändert, während ungespeicherte Änderungen vorliegen.",
+  "compare": "Vergleichen",
+  "reloadFromDisk": "Vom Datenträger neu laden",
+  "keepMine": "Meine Version behalten",
+  "saveAs": "Speichern unter",
+  "unsavedChangesMultipleMessage": "{count} Dokumente enthalten ungespeicherte Änderungen. Vor dem Fortfahren speichern?",
+  "workspaceReplaceIssuePartialConflict": "Das Zurücksetzen wurde abgebrochen, da die Datei gleichzeitig geändert wurde. Einige Ersetzungen können bestehen bleiben; verdrängte Inhalte wurden unter dem folgenden Pfad gesichert.",
+  "workspaceReplaceIssueApplyFailed": "Es wurden keine Ersetzungen vorgenommen, da die geprüfte Auswahl nicht sicher gespeichert werden konnte.",
+  "workspaceRecoveryRestored": "{count} ungespeicherte Dokumente wurden wiederhergestellt. Prüfen Sie jedes wiederhergestellte Dokument, bevor Sie fortfahren.",
+  "workspaceRecoveryDamaged": "{count} beschädigte Wiederherstellungsdatensätze konnten nicht wiederhergestellt werden. Gültige wiederhergestellte Dokumente bleiben verfügbar.",
+  "recoveredDocumentReview": "Ungespeicherter Inhalt für {fileName} wurde wiederhergestellt. Prüfen Sie ihn und speichern Sie ihn, speichern Sie ihn unter einem neuen Namen oder verwerfen Sie ihn.",
+  "commandUnavailableInContext": "Dieser Befehl ist im aktuellen Kontext nicht verfügbar.",
+  "mathRenderFailed": "Der mathematische Ausdruck konnte nicht dargestellt werden.",
+  "inlineMath": "Mathematik im Text",
+  "displayMath": "Mathematische Formel als Block"
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 649a31b2..063b4b10 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -135,6 +135,14 @@
   "insert": "Insert",
   "@insert": {"description": "Insert button label."},
   "keyboardShortcuts": "Keyboard Shortcuts",
+  "commandPalette": "Command Palette",
+  "@commandPalette": {"description": "Title and command label for the searchable command palette."},
+  "commandPaletteHint": "Type a command",
+  "@commandPaletteHint": {"description": "Search hint in the command palette."},
+  "commandPaletteEmpty": "No matching commands",
+  "@commandPaletteEmpty": {"description": "Empty state in the command palette."},
+  "commandUnavailableInContext": "Unavailable in the current editor context",
+  "@commandUnavailableInContext": {"description":"Reason shown for a disabled contextual command."},
   "@keyboardShortcuts": {"description": "Keyboard shortcuts dialog title and menu item."},
   "lightTheme": "Light",
   "@lightTheme": {"description": "Light theme option."},
@@ -448,6 +456,10 @@
 
   "settingsWindowSectionTitle": "Window",
   "@settingsWindowSectionTitle": {"description":"Settings section title for native window behavior."},
+  "settingsReopenWorkspaceOnStartupTitle": "Reopen previous workspace on startup",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Open the workspace and tabs from the previous session when BusyMark starts.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Confirm before closing with unsaved changes",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {"description":"Settings switch title for close confirmation when documents have unsaved changes."},
   "settingsConfirmCloseWithUnsavedChangesDescription": "Ask before closing BusyMark when documents have unsaved changes.",
@@ -473,6 +485,8 @@
     "description": "Unsaved changes confirmation message.",
     "placeholders": {"fileName": {"type": "String"}}
   },
+  "unsavedChangesMultipleMessage": "{count, plural, =1{1 document has unsaved changes. Save it before continuing?} other{{count} documents have unsaved changes. Save them before continuing?}}",
+  "@unsavedChangesMultipleMessage": {"description":"Confirmation message before replacing workspace state when several documents are dirty.","placeholders":{"count":{"type":"int"}}},
   "fileChangedOnDisk": "File changed on disk",
   "@fileChangedOnDisk": {"description": "File changed confirmation dialog title."},
   "fileChangedOnDiskMessage": "This file changed on disk since you opened it. Overwrite it?",
@@ -499,6 +513,18 @@
   "codeBlockLanguage": "Code block language",
   "@codeBlockLanguage": {"description": "Dialog title and toolbar tooltip for code block language."},
   "image": "Image",
+  "video": "Video",
+  "openVideo": "Play video",
+  "pauseVideo": "Pause video",
+  "videoUnavailable": "Video unavailable",
+  "videoPreview": "Video preview",
+  "diagnosticWritersideVideoMissingSource": "Video is missing its src attribute.",
+  "diagnosticWritersideVideoUnsupportedSource": "Unsupported video source: {source}",
+  "@diagnosticWritersideVideoUnsupportedSource": {"placeholders": {"source": {"type": "String"}}},
+  "diagnosticWritersideVideoMissingFile": "Video file does not exist: {source}",
+  "@diagnosticWritersideVideoMissingFile": {"placeholders": {"source": {"type": "String"}}},
+  "diagnosticWritersideVideoMissingPreview": "Video preview image does not exist: {preview}",
+  "@diagnosticWritersideVideoMissingPreview": {"placeholders": {"preview": {"type": "String"}}},
   "@image": {"description": "Image command and document kind label."},
   "inlineImage": "Inline image",
   "@inlineImage": {"description": "Inline image command label."},
@@ -566,6 +592,14 @@
   "@insertColumnRight": {"description": "Menu item for inserting a table column to the right."},
   "deleteColumn": "Delete column",
   "@deleteColumn": {"description": "Menu item for deleting a table column."},
+  "tableAlignmentUnspecified": "Alignment: Unspecified",
+  "@tableAlignmentUnspecified": {"description": "Menu item for using unspecified Markdown table-column alignment."},
+  "tableAlignmentLeft": "Alignment: Left",
+  "@tableAlignmentLeft": {"description": "Menu item for left-aligning a Markdown table column."},
+  "tableAlignmentCenter": "Alignment: Center",
+  "@tableAlignmentCenter": {"description": "Menu item for centering a Markdown table column."},
+  "tableAlignmentRight": "Alignment: Right",
+  "@tableAlignmentRight": {"description": "Menu item for right-aligning a Markdown table column."},
   "tableRowNumber": "Row {rowNumber}",
   "@tableRowNumber": {
     "description": "Tooltip for a table row control.",
@@ -857,12 +891,97 @@
   "@sourceSearchWholeWord": {"description": "Tooltip for toggling whole-word source search."},
   "sourceSearchRegex": "Regex",
   "@sourceSearchRegex": {"description": "Tooltip for toggling regular-expression source search."},
+  "sourceSearchReplacement": "Replace with",
+  "@sourceSearchReplacement": {"description": "Placeholder for the active-document replacement field."},
+  "sourceSearchReplaceCurrent": "Replace current",
+  "@sourceSearchReplaceCurrent": {"description": "Tooltip for replacing the current search match."},
+  "sourceSearchReplaceAndFindNext": "Replace and find next",
+  "@sourceSearchReplaceAndFindNext": {"description": "Tooltip for replacing the current match and moving to the next."},
+  "sourceSearchReplaceAll": "Replace all",
+  "@sourceSearchReplaceAll": {"description": "Tooltip for replacing every active-document search match."},
+  "workspaceReplace": "Replace in Workspace",
+  "@workspaceReplace": {"description": "Action that previews replacements across the workspace."},
+  "reviewReplacements": "Review replacements",
+  "@reviewReplacements": {"description": "Action and dialog title for reviewing workspace replacements."},
+  "applyReplacements": "Apply replacements",
+  "@applyReplacements": {"description": "Action that applies selected workspace replacements."},
+  "skippedFiles": "Skipped files",
+  "@skippedFiles": {"description": "Heading for files excluded from a workspace replacement."},
+  "workspaceReplaceDirtyBuffer": "Unsaved editor content",
+  "@workspaceReplaceDirtyBuffer": {"description": "Source label for a workspace replacement preview using a dirty document buffer."},
+  "workspaceReplaceDiskContent": "Saved disk content",
+  "@workspaceReplaceDiskContent": {"description": "Source label for a workspace replacement preview using disk content."},
+  "selectFileMatches": "Select all {count} matches",
+  "@selectFileMatches": {
+    "description": "Checkbox label for selecting every replacement match in a file.",
+    "placeholders": {"count": {"type": "int"}}
+  },
+  "workspaceReplaceApplied": "Replaced {matches} matches in {files} files; skipped {skipped}.",
+  "@workspaceReplaceApplied": {
+    "description": "Summary shown after applying workspace replacements.",
+    "placeholders": {
+      "matches": {"type": "int"},
+      "files": {"type": "int"},
+      "skipped": {"type": "int"}
+    }
+  },
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Final newline",
+  "@documentFormatWithFinalNewline": {"description": "Document format tooltip when the file ends with a newline.", "placeholders": {"encoding": {"type": "String"}, "lineEnding": {"type": "String"}}},
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · No final newline",
+  "@documentFormatWithoutFinalNewline": {"description": "Document format tooltip when the file does not end with a newline.", "placeholders": {"encoding": {"type": "String"}, "lineEnding": {"type": "String"}}},
+  "normalizeLineEndings": "Normalize line endings",
+  "@normalizeLineEndings": {"description": "Dialog title for selecting a line-ending style."},
+  "mixedLineEndingsSavePrompt": "This document contains mixed line endings. Choose a format.",
+  "@mixedLineEndingsSavePrompt": {"description": "Prompt shown before saving a document with mixed line endings."},
+  "workspaceReplaceMixedLineEndings": "{fileName} uses mixed line endings. Choose the format to use before replacing.",
+  "@workspaceReplaceMixedLineEndings": {
+    "description": "Prompt shown before replacing content in a mixed-line-ending file.",
+    "placeholders": {"fileName": {"type": "String"}}
+  },
+  "workspaceReplaceIssueOversized": "Skipped an oversized file.",
+  "@workspaceReplaceIssueOversized": {"description": "Workspace replacement issue for a file above the size limit."},
+  "workspaceReplaceIssueUnreadable": "Skipped a file that could not be read.",
+  "@workspaceReplaceIssueUnreadable": {"description": "Workspace replacement issue for an unreadable file."},
+  "workspaceReplaceIssueInvalidUtf8": "Skipped a file that is not valid UTF-8.",
+  "@workspaceReplaceIssueInvalidUtf8": {"description": "Workspace replacement issue for invalid UTF-8 content."},
+  "workspaceReplaceIssueTruncated": "The replacement preview was truncated.",
+  "@workspaceReplaceIssueTruncated": {"description": "Workspace replacement issue when the match limit is reached."},
+  "workspaceReplaceIssueFileChanged": "Skipped a file that changed after the preview.",
+  "@workspaceReplaceIssueFileChanged": {"description": "Workspace replacement issue for stale disk content."},
+  "workspaceReplaceIssueBufferChanged": "Skipped an editor buffer that changed after the preview.",
+  "@workspaceReplaceIssueBufferChanged": {"description": "Workspace replacement issue for stale in-memory content."},
+  "workspaceReplaceIssueNormalizationRequired": "Choose LF or CRLF normalization before replacing.",
+  "@workspaceReplaceIssueNormalizationRequired": {"description": "Workspace replacement issue for mixed line endings without a selected format."},
+  "workspaceReplaceIssuePartialConflict": "Rollback stopped because the file changed concurrently. Some replacements may remain; displaced content was preserved at the path below.",
+  "@workspaceReplaceIssuePartialConflict": {"description": "Workspace replacement issue when a concurrent edit prevents safe transactional rollback."},
+  "workspaceReplaceIssueApplyFailed": "The reviewed replacement could not be committed; no files were changed.",
+  "@workspaceReplaceIssueApplyFailed": {"description": "Workspace replacement issue when the transactional file commit fails."},
+  "externalChangesTitle": "External changes — {fileName}",
+  "@externalChangesTitle": {"description": "Title of the external-file comparison dialog.", "placeholders": {"fileName": {"type": "String"}}},
+  "externalFileDeleted": "This file was deleted on disk.",
+  "@externalFileDeleted": {"description": "Persistent banner shown when an open file is deleted externally."},
+  "externalFileChanged": "This file changed on disk while you have unsaved edits.",
+  "@externalFileChanged": {"description": "Persistent banner shown when a dirty file changes externally."},
+  "recoveredDocumentReview": "Recovered unsaved content for {fileName}. Inspect it, then save, save as, or discard it.",
+  "@recoveredDocumentReview": {"description":"Persistent recovery review banner.","placeholders":{"fileName":{"type":"String"}}},
+  "compare": "Compare",
+  "@compare": {"description": "Action that compares the editor buffer with the disk version."},
+  "reloadFromDisk": "Reload from Disk",
+  "@reloadFromDisk": {"description": "Action that replaces the editor buffer with the disk version."},
+  "keepMine": "Keep Mine",
+  "@keepMine": {"description": "Action that keeps the editor buffer after an external change."},
+  "saveAs": "Save As",
+  "@saveAs": {"description": "Action that saves the current document to another path."},
   "sourceSearchInvalidRegex": "Invalid regular expression",
   "@sourceSearchInvalidRegex": {"description": "Source search status shown when the regular expression is invalid."},
   "sourceLargeFileFeaturesPaused": "Large file: highlighting and folding are paused",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Nothing to read",
   "@nothingToRead": {"description": "Empty state shown when there is no content to read."},
+  "admonition": "Admonition",
+  "@admonition": {"description": "Tooltip for the Writerside admonition editing menu."},
+  "quote": "Quote",
+  "@quote": {"description": "Label for a neutral Writerside quote block."},
   "note": "Note",
   "@note": {"description": "Preview label for a note admonition."},
   "tip": "Tip",
@@ -883,19 +1002,19 @@
   "@chapter": {"description": "Preview label for a chapter element."},
   "couldNotOpenTarget": "Could not open {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {"target": {"type": "String"}}
   },
   "linkTargetNotFound": "Link target not found: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {"targetPath": {"type": "String"}}
   },
   "cannotOpenFileTypeInEditor": "Cannot open this file type in editor",
-  "@cannotOpenFileTypeInEditor": {"description": "Snackbar shown when a file type cannot be opened in the editor."},
+  "@cannotOpenFileTypeInEditor": {"description": "Toast shown when a file type cannot be opened in the editor."},
   "anchorNotFound": "Anchor not found: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {"anchor": {"type": "String"}}
   },
   "noProblemsFound": "No problems found",
@@ -965,6 +1084,10 @@
     "description": "Workspace error message shown when validation fails.",
     "placeholders": {"error": {"type": "String"}}
   },
+  "workspaceRecoveryRestored": "{count, plural, =1{Recovered 1 unsaved document. Review it before saving or discarding it.} other{Recovered {count} unsaved documents. Review each one before saving or discarding it.}}",
+  "@workspaceRecoveryRestored": {"description":"Notice shown after crash recovery restores documents.","placeholders":{"count":{"type":"int"}}},
+  "workspaceRecoveryDamaged": "{count, plural, =1{One damaged recovery record could not be restored. The original recovery file was preserved for inspection.} other{{count} damaged recovery records could not be restored. Valid recovery records remain available.}}",
+  "@workspaceRecoveryDamaged": {"description":"Notice shown when recovery data is partly or wholly malformed.","placeholders":{"count":{"type":"int"}}},
 
   "errorPathDoesNotExist": "Path does not exist: {path}",
   "@errorPathDoesNotExist": {
@@ -1565,6 +1688,8 @@
   },
   "fileActions": "File actions",
   "@fileActions": {"description": "Tooltip for a file action menu."},
+  "actions": "Actions",
+  "@actions": {"description": "Tooltip for a general action menu."},
   "gitStatusAdded": "Added",
   "@gitStatusAdded": {"description": "Git file status label."},
   "gitStatusDeleted": "Deleted",
@@ -1609,7 +1734,23 @@
   "@gitErrorResetDetachedHead": {"description": "Git reset error shown while HEAD is detached."},
   "gitErrorDiverged": "Branch has diverged. Resolve merge or rebase outside this BusyMark version.",
   "@gitErrorDiverged": {"description": "Git error message."},
-  "gitErrorAuthentication": "Git authentication failed. In the snap, SSH remotes may require connecting the ssh-keys interface.",
+  "gitErrorAuthorIdentity": "Git needs an author name and email address before it can commit.",
+  "@gitErrorAuthorIdentity": {"description": "Git error shown when no commit author identity is configured."},
+  "gitAuthorIdentityTitle": "Git Author Identity",
+  "@gitAuthorIdentityTitle": {"description": "Title of the Git author identity recovery dialog."},
+  "gitAuthorIdentityMessage": "Enter the identity Git should record on commits. BusyMark will save it and retry this commit.",
+  "@gitAuthorIdentityMessage": {"description": "Explanation in the Git author identity recovery dialog."},
+  "gitAuthorName": "Name",
+  "@gitAuthorName": {"description": "Git commit author name field label."},
+  "gitAuthorEmail": "Email",
+  "@gitAuthorEmail": {"description": "Git commit author email field label."},
+  "gitAuthorIdentityGlobal": "Use for all repositories",
+  "@gitAuthorIdentityGlobal": {"description": "Switch label for saving Git identity globally."},
+  "gitAuthorIdentityGlobalDescription": "When installed as a Snap, this applies to repositories opened in BusyMark.",
+  "@gitAuthorIdentityGlobalDescription": {"description": "Description of global Git identity scope in the Snap."},
+  "gitSaveIdentityAndCommit": "Save and Commit",
+  "@gitSaveIdentityAndCommit": {"description": "Action that saves Git author identity and retries a commit."},
+  "gitErrorAuthentication": "Git authentication failed.",
   "@gitErrorAuthentication": {"description": "Git error message."},
   "gitErrorNetwork": "Git network operation failed.",
   "@gitErrorNetwork": {"description": "Git error message."},
@@ -1932,84 +2073,12 @@
   "@download": {"description": "Button label that downloads a required component."},
   "exportWritersideAsPdf": "Export Writerside as PDF",
   "@exportWritersideAsPdf": {"description": "Menu action and dialog title for exporting a Writerside instance as PDF."},
-  "writersidePdfExportDescription": "Choose an instance and PDF settings. BusyMark uses JetBrains’ official Writerside builder.",
-  "@writersidePdfExportDescription": {"description": "Introduction to Writerside PDF export."},
   "writersidePdfContent": "Export content",
   "@writersidePdfContent": {"description": "Group title for selecting Writerside PDF content."},
-  "writersidePdfSettings": "PDF settings",
-  "@writersidePdfSettings": {"description": "Label for the source of Writerside PDF settings."},
-  "writersidePdfConfigureHere": "Configure for this export",
-  "@writersidePdfConfigureHere": {"description": "Option to configure Writerside PDF settings in the export dialog."},
-  "writersidePdfProjectConfiguration": "Use project configuration",
-  "@writersidePdfProjectConfiguration": {"description": "Option to use an existing Writerside PDF configuration file."},
-  "writersidePdfConfigurationFile": "PDF configuration file",
-  "@writersidePdfConfigurationFile": {"description": "Writerside PDF configuration file selector label."},
   "writersidePdfPage": "Page",
   "@writersidePdfPage": {"description": "Writerside PDF page settings group title."},
-  "writersidePdfKeymap": "Keymap",
-  "@writersidePdfKeymap": {"description": "Writerside PDF keymap selector label."},
-  "writersidePdfNoKeymap": "No keymap",
-  "@writersidePdfNoKeymap": {"description": "Writerside PDF option that omits a keymap layout."},
-  "writersidePdfTocTitle": "Table of contents title",
-  "@writersidePdfTocTitle": {"description": "Writerside PDF table-of-contents title field."},
-  "writersidePdfCover": "Cover page",
-  "@writersidePdfCover": {"description": "Writerside PDF cover-page settings group title."},
-  "writersidePdfIncludeCover": "Include cover page",
-  "@writersidePdfIncludeCover": {"description": "Toggle that includes a cover page in a Writerside PDF."},
-  "writersidePdfCoverTitle": "Cover title",
-  "@writersidePdfCoverTitle": {"description": "Writerside PDF cover title field."},
-  "writersidePdfCoverDescription": "Cover description",
-  "@writersidePdfCoverDescription": {"description": "Writerside PDF cover description field."},
-  "writersidePdfCopyright": "Copyright",
-  "@writersidePdfCopyright": {"description": "Writerside PDF cover copyright field."},
-  "writersidePdfCoverLogo": "Cover logo",
-  "@writersidePdfCoverLogo": {"description": "Writerside PDF cover logo path field."},
-  "writersidePdfChooseCoverLogo": "Choose cover logo",
-  "@writersidePdfChooseCoverLogo": {"description": "Action that selects a Writerside PDF cover logo."},
-  "writersidePdfHeaderAndFooter": "Header and footer",
-  "@writersidePdfHeaderAndFooter": {"description": "Writerside PDF header and footer settings group title."},
-  "writersidePdfHeader": "Header",
-  "@writersidePdfHeader": {"description": "Writerside PDF page header field."},
-  "writersidePdfFooter": "Footer",
-  "@writersidePdfFooter": {"description": "Writerside PDF page footer field."},
-  "writersidePdfAdvancedDescription": "These values map the opened module to the builder’s source layout.",
-  "@writersidePdfAdvancedDescription": {"description": "Description of advanced Writerside PDF settings."},
-  "writersidePdfModuleName": "Module name",
-  "@writersidePdfModuleName": {"description": "Writerside builder module-name field."},
-  "writersidePdfSourceRoot": "Source root",
-  "@writersidePdfSourceRoot": {"description": "Writerside builder source-root field."},
-  "writersidePdfChooseSourceRoot": "Choose source root",
-  "@writersidePdfChooseSourceRoot": {"description": "Action that selects the Writerside builder source root."},
-  "writersidePdfBuilderVersion": "Builder version",
-  "@writersidePdfBuilderVersion": {"description": "JetBrains Writerside builder image version field."},
-  "writersidePdfAllowNetwork": "Allow network during build",
-  "@writersidePdfAllowNetwork": {"description": "Toggle that allows network access in the Writerside builder container."},
-  "writersidePdfAllowNetworkDescription": "Disabled by default. Enable only when the project intentionally needs remote build resources.",
-  "@writersidePdfAllowNetworkDescription": {"description": "Security guidance for Writerside builder network access."},
-  "writersidePdfModuleNameRequired": "Enter the module name.",
-  "@writersidePdfModuleNameRequired": {"description": "Validation error for a missing Writerside module name."},
-  "writersidePdfSourceRootRequired": "Choose the source root.",
-  "@writersidePdfSourceRootRequired": {"description": "Validation error for a missing Writerside source root."},
-  "writersidePdfBuilderVersionInvalid": "Enter a valid builder version.",
-  "@writersidePdfBuilderVersionInvalid": {"description": "Validation error for an invalid Writerside builder version."},
-  "writersidePdfBuilderRequired": "Writerside builder required",
-  "@writersidePdfBuilderRequired": {"description": "Dialog title when the Writerside builder image is not installed."},
-  "writersidePdfBuilderDownloadDescription": "BusyMark uses the official {image} container image. Download it now? The image is large and is stored by Docker.",
-  "@writersidePdfBuilderDownloadDescription": {"description": "Consent prompt before downloading the Writerside builder image.", "placeholders": {"image": {"type": "String"}}},
-  "writersidePdfDownloadingBuilder": "Downloading Writerside builder…",
-  "@writersidePdfDownloadingBuilder": {"description": "Progress title while downloading the Writerside builder image."},
   "exportingWritersidePdf": "Exporting Writerside PDF…",
   "@exportingWritersidePdf": {"description": "Progress title while building a Writerside PDF."},
-  "writersidePdfDockerUnavailable": "Docker is required for Writerside PDF export. Install and start Docker, then try again.",
-  "@writersidePdfDockerUnavailable": {"description": "Error shown when Docker is unavailable for Writerside PDF export."},
-  "writersidePdfBuilderUnavailable": "The requested Writerside builder image is not available.",
-  "@writersidePdfBuilderUnavailable": {"description": "Error shown when the Writerside builder image cannot be used."},
-  "writersidePdfConfigurationInvalid": "The Writerside PDF configuration is invalid.",
-  "@writersidePdfConfigurationInvalid": {"description": "Error shown for an invalid Writerside PDF configuration."},
-  "writersidePdfBuildFailed": "The Writerside builder could not create the PDF.",
-  "@writersidePdfBuildFailed": {"description": "Error shown when the Writerside PDF build fails."},
-  "writersidePdfInvalidOutput": "The Writerside builder did not produce a valid PDF.",
-  "@writersidePdfInvalidOutput": {"description": "Error shown when the Writerside builder output is missing or invalid."},
   "ai": "AI",
   "@ai": {"description": "Settings section and editing menu label for artificial-intelligence features."},
   "aiLocalOllama": "Local Ollama",
@@ -2019,7 +2088,13 @@
   "aiLocalOnlyDescription": "AI editing is explicit. BusyMark sends only the context shown for the selected provider and never applies a proposal without review.",
   "@aiLocalOnlyDescription": {"description": "Privacy description for BusyMark local AI."},
   "aiProvider": "AI provider",
-  "@aiProvider": {"description": "Settings label for the active AI provider."},
+  "@aiProvider": {"description": "Label for an AI provider selection."},
+  "aiDefaultProvider": "Default provider",
+  "@aiDefaultProvider": {"description": "Settings label for the provider selected by default for AI actions."},
+  "aiConfigureProvider": "Configure provider",
+  "@aiConfigureProvider": {"description": "Settings label for choosing which AI provider configuration to edit."},
+  "aiChooseProvider": "Choose AI provider",
+  "@aiChooseProvider": {"description": "Dialog title shown before selecting the AI provider for an action."},
   "aiOllamaEndpoint": "Ollama endpoint",
   "@aiOllamaEndpoint": {"description": "Settings label for the local Ollama origin."},
   "aiOllamaModel": "Ollama model",
@@ -2030,8 +2105,8 @@
   "@aiTestingConnection": {"description": "Status while BusyMark verifies the configured AI provider and model."},
   "aiConnectionReady": "Connected. {count} installed model(s) found.",
   "@aiConnectionReady": {"description": "Successful Ollama connection status.", "placeholders": {"count": {"type": "int"}}},
-  "aiNoModels": "Ollama is running, but no installed models were found.",
-  "@aiNoModels": {"description": "Ollama connection status when no model is installed."},
+  "aiNoModels": "No model selected.",
+  "@aiNoModels": {"description": "AI model setting shown before a model has been selected or discovered."},
   "aiConnectionFailed": "BusyMark could not verify AI text generation.",
   "@aiConnectionFailed": {"description": "Generic failure shown while testing AI generation."},
   "aiConfigureFirst": "Enable an AI provider and verify a model in Settings → AI.",
@@ -2080,12 +2155,6 @@
   "@aiContentToChange": {"description": "Label for the exact Markdown that an AI proposal may change."},
   "aiContentSentToAi": "Content sent to AI",
   "@aiContentSentToAi": {"description": "Label for the exact document context that will be sent to the configured AI provider."},
-  "aiPrivacyDisabled": "AI is disabled. BusyMark never sends document content without an explicit AI action.",
-  "@aiPrivacyDisabled": {"description": "Privacy notice when AI is disabled."},
-  "aiPrivacyLocal": "BusyMark sends only the context shown in the review dialog to the configured loopback Ollama service. Proposals are never applied without review.",
-  "@aiPrivacyLocal": {"description": "Privacy notice for local Ollama."},
-  "aiPrivacyCloud": "BusyMark sends only the context shown in the review dialog to {provider}. Requests are stateless and proposals are never applied without review.",
-  "@aiPrivacyCloud": {"description": "Privacy notice for a selected cloud provider.", "placeholders": {"provider": {"type": "String"}}},
   "aiApiKey": "API key",
   "@aiApiKey": {"description": "Label for a cloud AI provider API key."},
   "aiApiKeyStoredHint": "A key is stored in the system credential store",
@@ -2110,6 +2179,8 @@
   "@aiFixedModelRouting": {"description": "AI model routing option that always uses the preferred model."},
   "aiPreferredModel": "Preferred model",
   "@aiPreferredModel": {"description": "Settings label for a preferred cloud AI model."},
+  "aiModel": "Model",
+  "@aiModel": {"description": "Label for selecting a model for one AI request."},
   "aiUsageThisMonth": "{requests} requests · {input} input tokens · {output} output tokens",
   "@aiUsageThisMonth": {"description": "Local monthly AI usage summary.", "placeholders": {"requests": {"type": "int"}, "input": {"type": "int"}, "output": {"type": "int"}}},
   "aiCloudConsentTitle": "Send content to {provider}?",
@@ -2151,6 +2222,12 @@
   "diagnosticMarkdownLinkReviewText": "Review whether the link text “{text}” describes its purpose in context.",
   "@diagnosticMarkdownLinkReviewText": {"description": "Accessibility hint for potentially non-descriptive Markdown link text.", "placeholders": {"text": {"type": "String"}}},
   "diagnosticMarkdownTableEmptyHeader": "Table header cells must identify their columns; complete each empty header.",
-  "@diagnosticMarkdownTableEmptyHeader": {"description": "Accessibility diagnostic for an empty Markdown table header cell."}
+  "@diagnosticMarkdownTableEmptyHeader": {"description": "Accessibility diagnostic for an empty Markdown table header cell."},
+  "mathRenderFailed": "The mathematical expression could not be rendered.",
+  "@mathRenderFailed": {"description": "Tooltip and diagnostic text shown when a mathematical expression cannot be rendered."},
+  "inlineMath": "Inline math",
+  "@inlineMath": {"description": "Editor action that inserts an inline mathematical expression."},
+  "displayMath": "Display math",
+  "@displayMath": {"description": "Editor action that inserts a display mathematical expression."}
 
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 82e0f1c4..e8b35a67 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Volver a abrir el espacio de trabajo anterior al iniciar",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Abre el espacio de trabajo y las pestañas de la sesión anterior cuando se inicia BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Confirmar antes de cerrar con cambios sin guardar",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Imagen",
+  "video": "Vídeo",
+  "openVideo": "Reproducir vídeo",
+  "pauseVideo": "Pausar vídeo",
+  "videoUnavailable": "Vídeo no disponible",
+  "videoPreview": "Vista previa del vídeo",
+  "diagnosticWritersideVideoMissingSource": "Al vídeo le falta el atributo src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Fuente de vídeo no compatible: {source}",
+  "diagnosticWritersideVideoMissingFile": "El archivo de vídeo no existe: {source}",
+  "diagnosticWritersideVideoMissingPreview": "La imagen de vista previa del vídeo no existe: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1320,6 +1333,8 @@
   "sourceLargeFileFeaturesPaused": "Archivo grande: el resaltado y el plegado están en pausa",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "No hay contenido para leer",
+  "admonition": "Aviso",
+  "quote": "Cita",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1361,7 +1376,7 @@
   },
   "couldNotOpenTarget": "No se pudo abrir {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1370,7 +1385,7 @@
   },
   "linkTargetNotFound": "No se encontró el destino del enlace: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1379,11 +1394,11 @@
   },
   "cannotOpenFileTypeInEditor": "No se puede abrir este tipo de archivo en el editor",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "No se encontró el ancla: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2214,6 +2229,7 @@
   "gitFileHistory": "Archivo actual",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Acciones de archivo",
+  "actions": "Acciones",
   "gitStatusAdded": "Añadido",
   "gitStatusDeleted": "Eliminado",
   "gitStatusRenamed": "Renombrado",
@@ -2233,7 +2249,15 @@
   "gitErrorMultipleRemotes": "Hay varios remotos configurados. Elija un upstream fuera de esta versión de BusyMark.",
   "gitErrorDirtyWorkspace": "Guarde o descarte los cambios del editor de BusyMark antes de cambiar de rama.",
   "gitErrorDiverged": "La rama ha divergido. Resuelva el merge o el rebase fuera de esta versión de BusyMark.",
-  "gitErrorAuthentication": "La autenticación de Git ha fallado. En el snap, los remotos SSH pueden requerir que se conecte la interfaz ssh-keys.",
+  "gitErrorAuthorIdentity": "Git necesita un nombre y un correo electrónico de autor antes de confirmar cambios.",
+  "gitAuthorIdentityTitle": "Identidad del autor de Git",
+  "gitAuthorIdentityMessage": "Introduce la identidad que Git debe registrar en las confirmaciones. BusyMark la guardará y volverá a intentar esta confirmación.",
+  "gitAuthorName": "Nombre",
+  "gitAuthorEmail": "Correo electrónico",
+  "gitAuthorIdentityGlobal": "Usar en todos los repositorios",
+  "gitAuthorIdentityGlobalDescription": "Cuando se instala como Snap, se aplica a los repositorios abiertos en BusyMark.",
+  "gitSaveIdentityAndCommit": "Guardar y confirmar",
+  "gitErrorAuthentication": "La autenticación de Git ha fallado.",
   "gitErrorNetwork": "La operación de red de Git ha fallado.",
   "gitErrorConflict": "Git ha informado de conflictos sin resolver.",
   "gitErrorCommandFailed": "El comando de Git ha fallado.",
@@ -2570,56 +2594,23 @@
   "diagnosticWritersideReferenceTopicMissing": "El tema «{topic}» no está en la instancia referenciada «{instance}».",
   "download": "Descargar",
   "exportWritersideAsPdf": "Exportar Writerside como PDF",
-  "writersidePdfExportDescription": "Elija una instancia y la configuración de PDF. BusyMark usa el compilador oficial de Writerside de JetBrains.",
   "writersidePdfContent": "Contenido de la exportación",
-  "writersidePdfSettings": "Configuración de PDF",
-  "writersidePdfConfigureHere": "Configurar para esta exportación",
-  "writersidePdfProjectConfiguration": "Usar la configuración del proyecto",
-  "writersidePdfConfigurationFile": "Archivo de configuración de PDF",
   "writersidePdfPage": "Página",
-  "writersidePdfKeymap": "Mapa de teclas",
-  "writersidePdfNoKeymap": "Sin mapa de teclas",
-  "writersidePdfTocTitle": "Título de la tabla de contenido",
-  "writersidePdfCover": "Portada",
-  "writersidePdfIncludeCover": "Incluir portada",
-  "writersidePdfCoverTitle": "Título de portada",
-  "writersidePdfCoverDescription": "Descripción de portada",
-  "writersidePdfCopyright": "Derechos de autor",
-  "writersidePdfCoverLogo": "Logotipo de portada",
-  "writersidePdfChooseCoverLogo": "Elegir logotipo de portada",
-  "writersidePdfHeaderAndFooter": "Encabezado y pie de página",
-  "writersidePdfHeader": "Encabezado",
-  "writersidePdfFooter": "Pie de página",
-  "writersidePdfAdvancedDescription": "Estos valores asignan el módulo abierto al diseño de fuentes del compilador.",
-  "writersidePdfModuleName": "Nombre del módulo",
-  "writersidePdfSourceRoot": "Raíz de fuentes",
-  "writersidePdfChooseSourceRoot": "Elegir raíz de fuentes",
-  "writersidePdfBuilderVersion": "Versión del compilador",
-  "writersidePdfAllowNetwork": "Permitir red durante la compilación",
-  "writersidePdfAllowNetworkDescription": "Desactivado de forma predeterminada. Actívelo solo si el proyecto necesita deliberadamente recursos de compilación remotos.",
-  "writersidePdfModuleNameRequired": "Introduzca el nombre del módulo.",
-  "writersidePdfSourceRootRequired": "Elija la raíz de fuentes.",
-  "writersidePdfBuilderVersionInvalid": "Introduzca una versión válida del compilador.",
-  "writersidePdfBuilderRequired": "Se requiere el compilador de Writerside",
-  "writersidePdfBuilderDownloadDescription": "BusyMark usa la imagen de contenedor oficial {image}. ¿Descargarla ahora? La imagen es grande y Docker la almacena.",
-  "writersidePdfDownloadingBuilder": "Descargando el compilador de Writerside…",
   "exportingWritersidePdf": "Exportando PDF de Writerside…",
-  "writersidePdfDockerUnavailable": "Docker es necesario para exportar Writerside a PDF. Instale e inicie Docker y vuelva a intentarlo.",
-  "writersidePdfBuilderUnavailable": "La imagen solicitada del compilador de Writerside no está disponible.",
-  "writersidePdfConfigurationInvalid": "La configuración PDF de Writerside no es válida.",
-  "writersidePdfBuildFailed": "El compilador de Writerside no pudo crear el PDF.",
-  "writersidePdfInvalidOutput": "El compilador de Writerside no produjo un PDF válido.",
   "ai": "IA",
   "aiLocalOllama": "Ollama local",
   "aiDisabled": "Desactivado",
   "aiLocalOnlyDescription": "La edición con IA solo se ejecuta de forma explícita. BusyMark envía únicamente el contexto mostrado al proveedor seleccionado y nunca aplica una propuesta sin revisarla.",
   "aiProvider": "Proveedor de IA",
+  "aiDefaultProvider": "Proveedor predeterminado",
+  "aiConfigureProvider": "Configurar proveedor",
+  "aiChooseProvider": "Elegir proveedor de IA",
   "aiOllamaEndpoint": "Punto de conexión de Ollama",
   "aiOllamaModel": "Modelo de Ollama",
   "aiTestConnection": "Probar conexión",
   "aiTestingConnection": "Probando…",
   "aiConnectionReady": "Conectado. Se encontraron {count} modelo(s) instalado(s).",
-  "aiNoModels": "Ollama está en ejecución, pero no se encontraron modelos instalados.",
+  "aiNoModels": "Ningún modelo seleccionado.",
   "aiConnectionFailed": "BusyMark no pudo verificar la generación de texto con IA.",
   "aiConfigureFirst": "Active un proveedor de IA y verifique un modelo en Configuración → IA.",
   "aiEditWithAi": "Editar con IA",
@@ -2651,9 +2642,6 @@
   "aiReviewExactContent": "Revisar contenido exacto",
   "aiContentToChange": "Contenido que se modificará",
   "aiContentSentToAi": "Contenido enviado a la IA",
-  "aiPrivacyDisabled": "La IA está desactivada. BusyMark nunca envía contenido del documento sin una acción de IA explícita.",
-  "aiPrivacyLocal": "BusyMark solo envía el contexto mostrado en el diálogo de revisión al servicio Ollama local configurado. Las propuestas nunca se aplican sin revisión.",
-  "aiPrivacyCloud": "BusyMark solo envía el contexto mostrado en el diálogo de revisión a {provider}. Las solicitudes no conservan estado y las propuestas nunca se aplican sin revisión.",
   "aiApiKey": "Clave de API",
   "aiApiKeyStoredHint": "Hay una clave guardada en el almacén de credenciales del sistema",
   "aiApiKeyEnterHint": "Introduzca una clave de API del proveedor",
@@ -2666,6 +2654,7 @@
   "aiAutomaticRouting": "Automática según la tarea",
   "aiFixedModelRouting": "Usar el modelo seleccionado",
   "aiPreferredModel": "Modelo preferido",
+  "aiModel": "Modelo",
   "aiUsageThisMonth": "{requests} solicitudes · {input} tokens de entrada · {output} tokens de salida",
   "aiCloudConsentTitle": "¿Enviar contenido a {provider}?",
   "aiCloudConsentEnable": "Activar {provider}",
@@ -2686,5 +2675,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "El encabezado de nivel {level} sigue al nivel {previousLevel}; revise la jerarquía de las secciones.",
   "diagnosticMarkdownLinkEmptyText": "El texto del enlace está vacío; proporcione un nombre accesible que describa su propósito.",
   "diagnosticMarkdownLinkReviewText": "Revise si el texto del enlace «{text}» describe su propósito en contexto.",
-  "diagnosticMarkdownTableEmptyHeader": "Los encabezados de tabla deben identificar sus columnas; complete cada encabezado vacío."
+  "diagnosticMarkdownTableEmptyHeader": "Los encabezados de tabla deben identificar sus columnas; complete cada encabezado vacío.",
+  "commandPalette": "Paleta de comandos",
+  "commandPaletteHint": "Escribe un comando",
+  "commandPaletteEmpty": "No hay comandos coincidentes",
+  "tableAlignmentUnspecified": "Alineación: Sin especificar",
+  "tableAlignmentLeft": "Alineación: Izquierda",
+  "tableAlignmentCenter": "Alineación: Centro",
+  "tableAlignmentRight": "Alineación: Derecha",
+  "sourceSearchReplacement": "Reemplazar por",
+  "sourceSearchReplaceCurrent": "Reemplazar actual",
+  "sourceSearchReplaceAndFindNext": "Reemplazar y buscar siguiente",
+  "sourceSearchReplaceAll": "Reemplazar todo",
+  "workspaceReplace": "Reemplazar en el espacio de trabajo",
+  "reviewReplacements": "Revisar reemplazos",
+  "applyReplacements": "Aplicar reemplazos",
+  "skippedFiles": "Archivos omitidos",
+  "workspaceReplaceDirtyBuffer": "Contenido no guardado del editor",
+  "workspaceReplaceDiskContent": "Contenido guardado en disco",
+  "selectFileMatches": "Seleccionar las {count} coincidencias",
+  "workspaceReplaceApplied": "Se reemplazaron {matches} coincidencias en {files} archivos; se omitieron {skipped}.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Salto de línea final",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Sin salto de línea final",
+  "normalizeLineEndings": "Normalizar finales de línea",
+  "workspaceReplaceMixedLineEndings": "{fileName} usa finales de línea mezclados. Elige el formato antes de reemplazar.",
+  "mixedLineEndingsSavePrompt": "Este documento contiene finales de línea mezclados. Elige un formato.",
+  "workspaceReplaceIssueOversized": "Se omitió un archivo demasiado grande.",
+  "workspaceReplaceIssueUnreadable": "Se omitió un archivo que no se pudo leer.",
+  "workspaceReplaceIssueInvalidUtf8": "Se omitió un archivo que no contiene UTF-8 válido.",
+  "workspaceReplaceIssueTruncated": "La vista previa de reemplazos se truncó.",
+  "workspaceReplaceIssueFileChanged": "Se omitió un archivo que cambió después de la vista previa.",
+  "workspaceReplaceIssueBufferChanged": "Se omitió un búfer del editor que cambió después de la vista previa.",
+  "workspaceReplaceIssueNormalizationRequired": "Elige la normalización LF o CRLF antes de reemplazar.",
+  "externalChangesTitle": "Cambios externos — {fileName}",
+  "externalFileDeleted": "Este archivo se eliminó del disco.",
+  "externalFileChanged": "Este archivo cambió en el disco mientras tienes cambios sin guardar.",
+  "compare": "Comparar",
+  "reloadFromDisk": "Recargar desde el disco",
+  "keepMine": "Conservar mi versión",
+  "saveAs": "Guardar como",
+  "unsavedChangesMultipleMessage": "Hay {count} documentos con cambios sin guardar. ¿Desea guardarlos antes de continuar?",
+  "workspaceReplaceIssuePartialConflict": "La reversión se detuvo porque el archivo cambió al mismo tiempo. Es posible que queden algunos reemplazos; el contenido desplazado se conservó en la ruta indicada abajo.",
+  "workspaceReplaceIssueApplyFailed": "No se aplicó ningún reemplazo porque el conjunto revisado no pudo guardarse de forma segura.",
+  "workspaceRecoveryRestored": "Se recuperaron {count} documentos sin guardar. Revise cada documento recuperado antes de continuar.",
+  "workspaceRecoveryDamaged": "No se pudieron restaurar {count} registros de recuperación dañados. Los documentos recuperados válidos siguen disponibles.",
+  "recoveredDocumentReview": "Se recuperó contenido sin guardar de {fileName}. Revíselo y después guárdelo, use Guardar como o descártelo.",
+  "commandUnavailableInContext": "Este comando no está disponible en el contexto actual.",
+  "mathRenderFailed": "No se pudo representar la expresión matemática.",
+  "inlineMath": "Matemáticas en línea",
+  "displayMath": "Matemáticas en bloque"
 }
diff --git a/lib/l10n/app_et.arb b/lib/l10n/app_et.arb
index ffaadeac..71a1f69f 100644
--- a/lib/l10n/app_et.arb
+++ b/lib/l10n/app_et.arb
@@ -439,6 +439,10 @@
 
   "settingsWindowSectionTitle": "Aken",
   "@settingsWindowSectionTitle": {"description":"Settings section title for native window behavior."},
+  "settingsReopenWorkspaceOnStartupTitle": "Eelmise tööruumi taasavamine käivitamisel",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Ava BusyMarki käivitamisel eelmise seansi tööruum ja vahekaardid.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Küsi salvestamata muudatuste korral enne sulgemist kinnitust",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {"description":"Settings switch title for close confirmation when documents have unsaved changes."},
   "settingsConfirmCloseWithUnsavedChangesDescription": "Küsi enne BusyMarki sulgemist kinnitust, kui dokumentides on salvestamata muudatusi.",
@@ -490,6 +494,15 @@
   "codeBlockLanguage": "Koodiploki keel",
   "@codeBlockLanguage": {"description": "Dialog title and toolbar tooltip for code block language."},
   "image": "Pilt",
+  "video": "Video",
+  "openVideo": "Esita videot",
+  "pauseVideo": "Peata video",
+  "videoUnavailable": "Video pole saadaval",
+  "videoPreview": "Video eelvaade",
+  "diagnosticWritersideVideoMissingSource": "Videol puudub atribuut src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Toetamata videoallikas: {source}",
+  "diagnosticWritersideVideoMissingFile": "Videofaili pole olemas: {source}",
+  "diagnosticWritersideVideoMissingPreview": "Video eelvaatepilti pole olemas: {preview}",
   "@image": {"description": "Image command and document kind label."},
   "inlineImage": "Reasisene pilt",
   "@inlineImage": {"description": "Inline image command label."},
@@ -853,6 +866,8 @@
   "sourceLargeFileFeaturesPaused": "Suur fail: esiletõstmine ja voltimine on peatatud",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Pole midagi lugeda",
+  "admonition": "Märkusplokk",
+  "quote": "Tsitaat",
   "@nothingToRead": {"description": "Empty state shown when there is no content to read."},
   "note": "Märkus",
   "@note": {"description": "Preview label for a note admonition."},
@@ -874,19 +889,19 @@
   "@chapter": {"description": "Preview label for a chapter element."},
   "couldNotOpenTarget": "Sihtkoha „{target}” avamine nurjus",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {"target": {"type": "String"}}
   },
   "linkTargetNotFound": "Lingi sihtkohta ei leitud: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {"targetPath": {"type": "String"}}
   },
   "cannotOpenFileTypeInEditor": "Seda failitüüpi ei saa redaktoris avada",
-  "@cannotOpenFileTypeInEditor": {"description": "Snackbar shown when a file type cannot be opened in the editor."},
+  "@cannotOpenFileTypeInEditor": {"description": "Toast shown when a file type cannot be opened in the editor."},
   "anchorNotFound": "Ankrut ei leitud: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {"anchor": {"type": "String"}}
   },
   "noProblemsFound": "Probleeme ei leitud",
@@ -1492,6 +1507,7 @@
   },
   "fileActions": "Failitoimingud",
   "@fileActions": {"description": "Tooltip for a file action menu."},
+  "actions": "Toimingud",
   "gitStatusAdded": "Lisatud",
   "@gitStatusAdded": {"description": "Git file status label."},
   "gitStatusDeleted": "Kustutatud",
@@ -1529,8 +1545,16 @@
   "gitErrorDirtyWorkspace": "Enne haru vahetamist salvesta või hülga BusyMarki redaktori muudatused.",
   "@gitErrorDirtyWorkspace": {"description": "Git error message."},
   "gitErrorDiverged": "Haru ajalugu on lahknenud. Lahenda ühendamine või ümberbaasimine mõne muu tööriistaga; see BusyMarki versioon seda ei võimalda.",
+  "gitErrorAuthorIdentity": "Git vajab enne sissekande loomist autori nime ja e-posti aadressi.",
+  "gitAuthorIdentityTitle": "Giti autori identiteet",
+  "gitAuthorIdentityMessage": "Sisesta identiteet, mille Git peaks sissekannetele lisama. BusyMark salvestab selle ja proovib sissekannet uuesti.",
+  "gitAuthorName": "Nimi",
+  "gitAuthorEmail": "E-post",
+  "gitAuthorIdentityGlobal": "Kasuta kõigis hoidlates",
+  "gitAuthorIdentityGlobalDescription": "Snapi paigalduses kehtib see BusyMarkis avatud hoidlatele.",
+  "gitSaveIdentityAndCommit": "Salvesta ja loo sissekanne",
   "@gitErrorDiverged": {"description": "Git error message."},
-  "gitErrorAuthentication": "Giti autentimine nurjus. Snap-paketis võib SSH-kaughoidlate kasutamiseks olla vaja ühendada liides ssh-keys.",
+  "gitErrorAuthentication": "Giti autentimine nurjus.",
   "@gitErrorAuthentication": {"description": "Git error message."},
   "gitErrorNetwork": "Giti võrgutoiming nurjus.",
   "@gitErrorNetwork": {"description": "Git error message."},
@@ -1758,56 +1782,23 @@
   "diagnosticWritersideReferenceTopicMissing": "Teemat „{topic}” pole viidatud eksemplaris „{instance}”.",
   "download": "Laadi alla",
   "exportWritersideAsPdf": "Ekspordi Writerside PDF-ina",
-  "writersidePdfExportDescription": "Valige eksemplar ja PDF-i sätted. BusyMark kasutab JetBrainsi ametlikku Writerside’i koosturit.",
   "writersidePdfContent": "Ekspordi sisu",
-  "writersidePdfSettings": "PDF-i sätted",
-  "writersidePdfConfigureHere": "Seadista selle ekspordi jaoks",
-  "writersidePdfProjectConfiguration": "Kasuta projekti konfiguratsiooni",
-  "writersidePdfConfigurationFile": "PDF-i konfiguratsioonifail",
   "writersidePdfPage": "Lehekülg",
-  "writersidePdfKeymap": "Klahvipaigutus",
-  "writersidePdfNoKeymap": "Klahvipaigutuseta",
-  "writersidePdfTocTitle": "Sisukorra pealkiri",
-  "writersidePdfCover": "Tiitelleht",
-  "writersidePdfIncludeCover": "Lisa tiitelleht",
-  "writersidePdfCoverTitle": "Tiitellehe pealkiri",
-  "writersidePdfCoverDescription": "Tiitellehe kirjeldus",
-  "writersidePdfCopyright": "Autoriõigus",
-  "writersidePdfCoverLogo": "Tiitellehe logo",
-  "writersidePdfChooseCoverLogo": "Vali tiitellehe logo",
-  "writersidePdfHeaderAndFooter": "Päis ja jalus",
-  "writersidePdfHeader": "Päis",
-  "writersidePdfFooter": "Jalus",
-  "writersidePdfAdvancedDescription": "Need väärtused seovad avatud mooduli koosturi lähtepaigutusega.",
-  "writersidePdfModuleName": "Mooduli nimi",
-  "writersidePdfSourceRoot": "Lähtejuur",
-  "writersidePdfChooseSourceRoot": "Vali lähtejuur",
-  "writersidePdfBuilderVersion": "Koosturi versioon",
-  "writersidePdfAllowNetwork": "Luba koostamise ajal võrk",
-  "writersidePdfAllowNetworkDescription": "Vaikimisi keelatud. Luba ainult siis, kui projekt vajab teadlikult kaugkoostusressursse.",
-  "writersidePdfModuleNameRequired": "Sisesta mooduli nimi.",
-  "writersidePdfSourceRootRequired": "Vali lähtejuur.",
-  "writersidePdfBuilderVersionInvalid": "Sisesta kehtiv koosturi versioon.",
-  "writersidePdfBuilderRequired": "Writerside’i koostur on nõutav",
-  "writersidePdfBuilderDownloadDescription": "BusyMark kasutab ametlikku konteineripilti {image}. Kas laadida see kohe alla? Pilt on suur ja Docker talletab selle.",
-  "writersidePdfDownloadingBuilder": "Writerside’i koosturi allalaadimine…",
   "exportingWritersidePdf": "Writerside’i PDF-i eksportimine…",
-  "writersidePdfDockerUnavailable": "Writerside’i PDF-i eksportimiseks on vaja Dockerit. Paigalda ja käivita Docker ning proovi uuesti.",
-  "writersidePdfBuilderUnavailable": "Soovitud Writerside’i koosturi pilt pole saadaval.",
-  "writersidePdfConfigurationInvalid": "Writerside’i PDF-i konfiguratsioon on vigane.",
-  "writersidePdfBuildFailed": "Writerside’i koostur ei suutnud PDF-i luua.",
-  "writersidePdfInvalidOutput": "Writerside’i koostur ei loonud kehtivat PDF-i.",
   "ai": "TI",
   "aiLocalOllama": "Kohalik Ollama",
   "aiDisabled": "Keelatud",
   "aiLocalOnlyDescription": "Tehisintellektiga redigeerimine käivitatakse ainult selgesõnaliselt. BusyMark saadab valitud teenusepakkujale üksnes kuvatud konteksti ega rakenda ettepanekut ilma ülevaatuseta.",
   "aiProvider": "TI-teenuse pakkuja",
+  "aiDefaultProvider": "Vaikimisi teenusepakkuja",
+  "aiConfigureProvider": "Seadista teenusepakkujat",
+  "aiChooseProvider": "Vali TI-teenuse pakkuja",
   "aiOllamaEndpoint": "Ollama lõpp-punkt",
   "aiOllamaModel": "Ollama mudel",
   "aiTestConnection": "Testi ühendust",
   "aiTestingConnection": "Testimine…",
   "aiConnectionReady": "Ühendatud. Leiti {count} installitud mudelit.",
-  "aiNoModels": "Ollama töötab, kuid installitud mudeleid ei leitud.",
+  "aiNoModels": "Mudelit pole valitud.",
   "aiConnectionFailed": "BusyMark ei saanud tehisintellekti tekstiloomet kontrollida.",
   "aiConfigureFirst": "Luba jaotises Sätted → TI teenusepakkuja ning kontrolli mudelit.",
   "aiEditWithAi": "Redigeeri TI abil",
@@ -1839,9 +1830,6 @@
   "aiReviewExactContent": "Vaata täpne sisu üle",
   "aiContentToChange": "Muudetav sisu",
   "aiContentSentToAi": "TI-le saadetav sisu",
-  "aiPrivacyDisabled": "Tehisintellekt on keelatud. BusyMark ei saada dokumendi sisu kunagi ilma selgesõnalise TI-toiminguta.",
-  "aiPrivacyLocal": "BusyMark saadab ülevaatusdialoogis kuvatud konteksti ainult seadistatud kohalikule Ollama teenusele. Ettepanekuid ei rakendata kunagi ilma ülevaatuseta.",
-  "aiPrivacyCloud": "BusyMark saadab ülevaatusdialoogis kuvatud konteksti ainult teenusele {provider}. Päringud on olekuta ja ettepanekuid ei rakendata kunagi ilma ülevaatuseta.",
   "aiApiKey": "API-võti",
   "aiApiKeyStoredHint": "Võti on salvestatud süsteemi mandaadihoidlasse",
   "aiApiKeyEnterHint": "Sisesta teenusepakkuja API-võti",
@@ -1854,6 +1842,7 @@
   "aiAutomaticRouting": "Automaatselt ülesande järgi",
   "aiFixedModelRouting": "Kasuta valitud mudelit",
   "aiPreferredModel": "Eelistatud mudel",
+  "aiModel": "Mudel",
   "aiUsageThisMonth": "{requests} päringut · {input} sisendmärgendit · {output} väljundmärgendit",
   "aiCloudConsentTitle": "Kas saata sisu teenusele {provider}?",
   "aiCloudConsentEnable": "Luba {provider}",
@@ -1874,5 +1863,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Taseme {level} pealkiri järgneb tasemele {previousLevel}; kontrolli jaotiste pesastust.",
   "diagnosticMarkdownLinkEmptyText": "Lingi tekst on tühi; lisa ligipääsetav nimi, mis kirjeldab selle otstarvet.",
   "diagnosticMarkdownLinkReviewText": "Kontrolli, kas lingi tekst „{text}” kirjeldab kontekstis selle otstarvet.",
-  "diagnosticMarkdownTableEmptyHeader": "Tabelipäised peavad veerge kirjeldama; täida kõik tühjad päised."
+  "diagnosticMarkdownTableEmptyHeader": "Tabelipäised peavad veerge kirjeldama; täida kõik tühjad päised.",
+  "commandPalette": "Käskude palett",
+  "commandPaletteHint": "Sisesta käsk",
+  "commandPaletteEmpty": "Sobivaid käske pole",
+  "tableAlignmentUnspecified": "Joondus: määramata",
+  "tableAlignmentLeft": "Joondus: vasakule",
+  "tableAlignmentCenter": "Joondus: keskele",
+  "tableAlignmentRight": "Joondus: paremale",
+  "sourceSearchReplacement": "Asenda väärtusega",
+  "sourceSearchReplaceCurrent": "Asenda praegune vaste",
+  "sourceSearchReplaceAndFindNext": "Asenda ja leia järgmine",
+  "sourceSearchReplaceAll": "Asenda kõik",
+  "workspaceReplace": "Asenda tööruumis",
+  "reviewReplacements": "Vaata asendused üle",
+  "applyReplacements": "Rakenda asendused",
+  "skippedFiles": "Vahele jäetud failid",
+  "workspaceReplaceDirtyBuffer": "Salvestamata redaktori sisu",
+  "workspaceReplaceDiskContent": "Kettale salvestatud sisu",
+  "selectFileMatches": "Vali kõik {count} vastet",
+  "workspaceReplaceApplied": "Asendati {matches} vastet {files} failis; vahele jäeti {skipped}.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Lõpus on reavahetus",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Lõpus pole reavahetust",
+  "normalizeLineEndings": "Normaliseeri reavahetused",
+  "workspaceReplaceMixedLineEndings": "Fail {fileName} kasutab eri tüüpi reavahetusi. Vali enne asendamist vorming.",
+  "mixedLineEndingsSavePrompt": "See dokument sisaldab eri tüüpi reavahetusi. Vali vorming.",
+  "workspaceReplaceIssueOversized": "Liiga suur fail jäeti vahele.",
+  "workspaceReplaceIssueUnreadable": "Fail, mida ei saanud lugeda, jäeti vahele.",
+  "workspaceReplaceIssueInvalidUtf8": "Fail, mis pole korrektne UTF-8, jäeti vahele.",
+  "workspaceReplaceIssueTruncated": "Asenduste eelvaade kärbiti.",
+  "workspaceReplaceIssueFileChanged": "Pärast eelvaadet muutunud fail jäeti vahele.",
+  "workspaceReplaceIssueBufferChanged": "Pärast eelvaadet muutunud redaktoripuhver jäeti vahele.",
+  "workspaceReplaceIssueNormalizationRequired": "Vali enne asendamist LF- või CRLF-normaliseerimine.",
+  "externalChangesTitle": "Välised muudatused — {fileName}",
+  "externalFileDeleted": "See fail kustutati kettalt.",
+  "externalFileChanged": "See fail muutus kettal ajal, kui sul on salvestamata muudatusi.",
+  "compare": "Võrdle",
+  "reloadFromDisk": "Laadi kettalt uuesti",
+  "keepMine": "Säilita minu versioon",
+  "saveAs": "Salvesta nimega",
+  "unsavedChangesMultipleMessage": "{count} dokumendis on salvestamata muudatusi. Kas salvestada need enne jätkamist?",
+  "workspaceReplaceIssuePartialConflict": "Tagasivõtmine peatati, sest faili muudeti samal ajal. Mõned asendused võivad alles jääda; väljatõrjutud sisu säilitati alloleval teel.",
+  "workspaceReplaceIssueApplyFailed": "Asendusi ei rakendatud, sest läbivaadatud kogumit ei saanud turvaliselt salvestada.",
+  "workspaceRecoveryRestored": "Taastati {count} salvestamata dokumenti. Vaadake iga taastatud dokument enne jätkamist üle.",
+  "workspaceRecoveryDamaged": "{count} rikutud taastekirjet ei saanud taastada. Kehtivad taastatud dokumendid on endiselt saadaval.",
+  "recoveredDocumentReview": "Faili {fileName} salvestamata sisu taastati. Vaadake see üle ning salvestage, salvestage nimega või hüljake.",
+  "commandUnavailableInContext": "See käsk pole praeguses kontekstis saadaval.",
+  "mathRenderFailed": "Matemaatilist avaldist ei saanud kuvada.",
+  "inlineMath": "Reasisene matemaatika",
+  "displayMath": "Plokina matemaatika"
 }
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index a1c2080b..0bb61df1 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "باز کردن دوبارهٔ فضای کاری قبلی هنگام راه‌اندازی",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "هنگام راه‌اندازی BusyMark، فضای کاری و زبانه‌های نشست قبلی باز شوند.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "تأیید پیش از بستن با تغییرات ذخیره‌نشده",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "تصویر",
+  "video": "ویدیو",
+  "openVideo": "پخش ویدیو",
+  "pauseVideo": "مکث ویدیو",
+  "videoUnavailable": "ویدیو در دسترس نیست",
+  "videoPreview": "پیش‌نمایش ویدیو",
+  "diagnosticWritersideVideoMissingSource": "ویژگی src برای ویدیو وجود ندارد.",
+  "diagnosticWritersideVideoUnsupportedSource": "منبع ویدیو پشتیبانی نمی‌شود: {source}",
+  "diagnosticWritersideVideoMissingFile": "فایل ویدیو وجود ندارد: {source}",
+  "diagnosticWritersideVideoMissingPreview": "تصویر پیش‌نمایش ویدیو وجود ندارد: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1322,6 +1335,8 @@
   "sourceLargeFileFeaturesPaused": "فایل بزرگ: برجسته‌سازی و جمع‌کردن موقتاً متوقف شده‌اند",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "محتوایی برای مطالعه وجود ندارد",
+  "admonition": "کادر هشدار",
+  "quote": "نقل‌قول",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1363,7 +1378,7 @@
   },
   "couldNotOpenTarget": "باز کردن \u2068{target}\u2069 ممکن نشد",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1372,7 +1387,7 @@
   },
   "linkTargetNotFound": "مقصد پیوند یافت نشد: \u2068{targetPath}\u2069",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1381,11 +1396,11 @@
   },
   "cannotOpenFileTypeInEditor": "این نوع فایل را نمی‌توان در ویرایشگر باز کرد",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "لنگر یافت نشد: \u2068{anchor}\u2069",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2235,6 +2250,7 @@
     }
   },
   "fileActions": "عملیات فایل",
+  "actions": "عملیات",
   "gitStatusAdded": "افزوده‌شده",
   "gitStatusDeleted": "حذف‌شده",
   "gitStatusRenamed": "تغییرنام‌یافته",
@@ -2254,7 +2270,15 @@
   "gitErrorMultipleRemotes": "چند مخزن راه دور پیکربندی شده است. یک بالادست را خارج از این نسخهٔ BusyMark انتخاب کنید.",
   "gitErrorDirtyWorkspace": "پیش از تغییر شاخه، تغییرات ویرایشگر BusyMark را ذخیره کنید یا دور بیندازید.",
   "gitErrorDiverged": "شاخه واگرا شده است. مشکل را با ادغام یا بازپایه‌گذاری در خارج از این نسخهٔ BusyMark حل کنید.",
-  "gitErrorAuthentication": "احراز هویت Git ناموفق بود. در بستهٔ snap، مخزن‌های راه دور SSH ممکن است به اتصال رابط ssh-keys نیاز داشته باشند.",
+  "gitErrorAuthorIdentity": "Git پیش از ثبت تغییر به نام و نشانی ایمیل نویسنده نیاز دارد.",
+  "gitAuthorIdentityTitle": "هویت نویسندهٔ Git",
+  "gitAuthorIdentityMessage": "هویتی را وارد کنید که Git باید در ثبت‌ها ذخیره کند. BusyMark آن را ذخیره می‌کند و این ثبت را دوباره انجام می‌دهد.",
+  "gitAuthorName": "نام",
+  "gitAuthorEmail": "ایمیل",
+  "gitAuthorIdentityGlobal": "استفاده برای همهٔ مخزن‌ها",
+  "gitAuthorIdentityGlobalDescription": "در نصب Snap، این تنظیم برای مخزن‌های بازشده در BusyMark اعمال می‌شود.",
+  "gitSaveIdentityAndCommit": "ذخیره و ثبت تغییر",
+  "gitErrorAuthentication": "احراز هویت Git ناموفق بود.",
   "gitErrorNetwork": "عملیات شبکهٔ Git ناموفق بود.",
   "gitErrorConflict": "Git تداخل‌های حل‌نشده گزارش کرد.",
   "gitErrorCommandFailed": "فرمان Git ناموفق بود.",
@@ -2568,56 +2592,23 @@
   "diagnosticWritersideReferenceTopicMissing": "موضوع «⁨{topic}⁩» در نمونهٔ ارجاع‌شدهٔ «⁨{instance}⁩» نیست.",
   "download": "بارگیری",
   "exportWritersideAsPdf": "صدور Writerside به‌صورت PDF",
-  "writersidePdfExportDescription": "یک نمونه و تنظیمات PDF را انتخاب کنید. BusyMark از سازندهٔ رسمی Writerside شرکت JetBrains استفاده می‌کند.",
   "writersidePdfContent": "محتوای صدور",
-  "writersidePdfSettings": "تنظیمات PDF",
-  "writersidePdfConfigureHere": "پیکربندی برای این صدور",
-  "writersidePdfProjectConfiguration": "استفاده از پیکربندی پروژه",
-  "writersidePdfConfigurationFile": "فایل پیکربندی PDF",
   "writersidePdfPage": "صفحه",
-  "writersidePdfKeymap": "نگاشت کلیدها",
-  "writersidePdfNoKeymap": "بدون نگاشت کلید",
-  "writersidePdfTocTitle": "عنوان فهرست مطالب",
-  "writersidePdfCover": "صفحهٔ جلد",
-  "writersidePdfIncludeCover": "افزودن صفحهٔ جلد",
-  "writersidePdfCoverTitle": "عنوان جلد",
-  "writersidePdfCoverDescription": "توضیح جلد",
-  "writersidePdfCopyright": "حق نشر",
-  "writersidePdfCoverLogo": "نشان جلد",
-  "writersidePdfChooseCoverLogo": "انتخاب نشان جلد",
-  "writersidePdfHeaderAndFooter": "سرصفحه و پاصفحه",
-  "writersidePdfHeader": "سرصفحه",
-  "writersidePdfFooter": "پاصفحه",
-  "writersidePdfAdvancedDescription": "این مقادیر ماژول باز را به چیدمان منبع سازنده نگاشت می‌کنند.",
-  "writersidePdfModuleName": "نام ماژول",
-  "writersidePdfSourceRoot": "ریشهٔ منبع",
-  "writersidePdfChooseSourceRoot": "انتخاب ریشهٔ منبع",
-  "writersidePdfBuilderVersion": "نسخهٔ سازنده",
-  "writersidePdfAllowNetwork": "اجازهٔ شبکه هنگام ساخت",
-  "writersidePdfAllowNetworkDescription": "به‌طور پیش‌فرض غیرفعال است. فقط وقتی فعال کنید که پروژه عمداً به منابع ساخت راه دور نیاز دارد.",
-  "writersidePdfModuleNameRequired": "نام ماژول را وارد کنید.",
-  "writersidePdfSourceRootRequired": "ریشهٔ منبع را انتخاب کنید.",
-  "writersidePdfBuilderVersionInvalid": "نسخهٔ معتبر سازنده را وارد کنید.",
-  "writersidePdfBuilderRequired": "سازندهٔ Writerside لازم است",
-  "writersidePdfBuilderDownloadDescription": "BusyMark از تصویر کانتینر رسمی ⁨{image}⁩ استفاده می‌کند. اکنون بارگیری شود؟ تصویر بزرگ است و Docker آن را ذخیره می‌کند.",
-  "writersidePdfDownloadingBuilder": "در حال بارگیری سازندهٔ Writerside…",
   "exportingWritersidePdf": "در حال صدور PDF از Writerside…",
-  "writersidePdfDockerUnavailable": "برای صدور Writerside به PDF به Docker نیاز است. Docker را نصب و اجرا کنید و دوباره تلاش کنید.",
-  "writersidePdfBuilderUnavailable": "تصویر درخواستی سازندهٔ Writerside در دسترس نیست.",
-  "writersidePdfConfigurationInvalid": "پیکربندی PDF در Writerside معتبر نیست.",
-  "writersidePdfBuildFailed": "سازندهٔ Writerside نتوانست PDF را ایجاد کند.",
-  "writersidePdfInvalidOutput": "سازندهٔ Writerside یک PDF معتبر تولید نکرد.",
   "ai": "هوش مصنوعی",
   "aiLocalOllama": "Ollama محلی",
   "aiDisabled": "غیرفعال",
   "aiLocalOnlyDescription": "ویرایش با هوش مصنوعی فقط با اقدام صریح آغاز می‌شود. BusyMark تنها زمینهٔ نمایش‌داده‌شده را برای ارائه‌دهندهٔ انتخابی می‌فرستد و هیچ پیشنهادی را بدون بازبینی اعمال نمی‌کند.",
   "aiProvider": "ارائه‌دهندهٔ هوش مصنوعی",
+  "aiDefaultProvider": "ارائه‌دهندهٔ پیش‌فرض",
+  "aiConfigureProvider": "پیکربندی ارائه‌دهنده",
+  "aiChooseProvider": "انتخاب ارائه‌دهندهٔ هوش مصنوعی",
   "aiOllamaEndpoint": "نقطهٔ پایانی Ollama",
   "aiOllamaModel": "مدل Ollama",
   "aiTestConnection": "آزمایش اتصال",
   "aiTestingConnection": "در حال آزمایش…",
   "aiConnectionReady": "متصل شد. \u2068{count}\u2069 مدل نصب‌شده پیدا شد.",
-  "aiNoModels": "Ollama در حال اجرا است، اما هیچ مدل نصب‌شده‌ای پیدا نشد.",
+  "aiNoModels": "هیچ مدلی انتخاب نشده است.",
   "aiConnectionFailed": "BusyMark نتوانست تولید متن با هوش مصنوعی را تأیید کند.",
   "aiConfigureFirst": "ابتدا یک ارائه‌دهندهٔ هوش مصنوعی را فعال و مدلی را در تنظیمات ← هوش مصنوعی تأیید کنید.",
   "aiEditWithAi": "ویرایش با هوش مصنوعی",
@@ -2649,9 +2640,6 @@
   "aiReviewExactContent": "بازبینی محتوای دقیق",
   "aiContentToChange": "محتوایی که تغییر می‌کند",
   "aiContentSentToAi": "محتوای ارسال‌شده به هوش مصنوعی",
-  "aiPrivacyDisabled": "هوش مصنوعی غیرفعال است. BusyMark هرگز بدون یک اقدام صریح هوش مصنوعی محتوای سند را ارسال نمی‌کند.",
-  "aiPrivacyLocal": "BusyMark فقط زمینهٔ نمایش‌داده‌شده در کادر بازبینی را به سرویس محلی Ollama پیکربندی‌شده می‌فرستد. پیشنهادها هرگز بدون بازبینی اعمال نمی‌شوند.",
-  "aiPrivacyCloud": "BusyMark فقط زمینهٔ نمایش‌داده‌شده در کادر بازبینی را به ⁨{provider}⁩ می‌فرستد. درخواست‌ها بدون حالت هستند و پیشنهادها هرگز بدون بازبینی اعمال نمی‌شوند.",
   "aiApiKey": "کلید API",
   "aiApiKeyStoredHint": "یک کلید در مخزن اعتبارنامهٔ سیستم ذخیره شده است",
   "aiApiKeyEnterHint": "کلید API ارائه‌دهنده را وارد کنید",
@@ -2664,6 +2652,7 @@
   "aiAutomaticRouting": "خودکار بر اساس کار",
   "aiFixedModelRouting": "استفاده از مدل انتخابی",
   "aiPreferredModel": "مدل ترجیحی",
+  "aiModel": "مدل",
   "aiUsageThisMonth": "⁨{requests}⁩ درخواست · ⁨{input}⁩ توکن ورودی · ⁨{output}⁩ توکن خروجی",
   "aiCloudConsentTitle": "محتوا برای ⁨{provider}⁩ ارسال شود؟",
   "aiCloudConsentEnable": "فعال‌کردن ⁨{provider}⁩",
@@ -2684,5 +2673,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "عنوان سطح ⁨{level}⁩ پس از سطح ⁨{previousLevel}⁩ آمده است؛ تودرتویی بخش‌ها را بازبینی کنید.",
   "diagnosticMarkdownLinkEmptyText": "متن پیوند خالی است؛ نام دسترس‌پذیری وارد کنید که هدف آن را توضیح دهد.",
   "diagnosticMarkdownLinkReviewText": "بررسی کنید که آیا متن پیوند «⁨{text}⁩» هدف آن را در زمینه توضیح می‌دهد.",
-  "diagnosticMarkdownTableEmptyHeader": "سرستون‌های جدول باید ستون‌های خود را مشخص کنند؛ هر سرستون خالی را تکمیل کنید."
+  "diagnosticMarkdownTableEmptyHeader": "سرستون‌های جدول باید ستون‌های خود را مشخص کنند؛ هر سرستون خالی را تکمیل کنید.",
+  "commandPalette": "پالت فرمان",
+  "commandPaletteHint": "یک فرمان وارد کنید",
+  "commandPaletteEmpty": "هیچ فرمان منطبقی وجود ندارد",
+  "tableAlignmentUnspecified": "تراز: مشخص‌نشده",
+  "tableAlignmentLeft": "تراز: چپ",
+  "tableAlignmentCenter": "تراز: وسط",
+  "tableAlignmentRight": "تراز: راست",
+  "sourceSearchReplacement": "جایگزینی با",
+  "sourceSearchReplaceCurrent": "جایگزینی مورد فعلی",
+  "sourceSearchReplaceAndFindNext": "جایگزینی و یافتن بعدی",
+  "sourceSearchReplaceAll": "جایگزینی همه",
+  "workspaceReplace": "جایگزینی در فضای کاری",
+  "reviewReplacements": "بازبینی جایگزینی‌ها",
+  "applyReplacements": "اعمال جایگزینی‌ها",
+  "skippedFiles": "فایل‌های نادیده‌گرفته‌شده",
+  "workspaceReplaceDirtyBuffer": "محتوای ذخیره‌نشدهٔ ویرایشگر",
+  "workspaceReplaceDiskContent": "محتوای ذخیره‌شده روی دیسک",
+  "selectFileMatches": "انتخاب هر {count} مورد",
+  "workspaceReplaceApplied": "{matches} مورد در {files} فایل جایگزین شد؛ {skipped} مورد نادیده گرفته شد.",
+  "documentFormatWithFinalNewline": "⁨{encoding}⁩ · ⁨{lineEnding}⁩ · خط جدید پایانی",
+  "documentFormatWithoutFinalNewline": "⁨{encoding}⁩ · ⁨{lineEnding}⁩ · بدون خط جدید پایانی",
+  "normalizeLineEndings": "یکسان‌سازی پایان خط‌ها",
+  "workspaceReplaceMixedLineEndings": "فایل ⁨{fileName}⁩ پایان خط‌های ترکیبی دارد. پیش از جایگزینی قالب را انتخاب کنید.",
+  "mixedLineEndingsSavePrompt": "این سند پایان خط‌های ترکیبی دارد. یک قالب انتخاب کنید.",
+  "workspaceReplaceIssueOversized": "یک فایل بیش‌ازحد بزرگ نادیده گرفته شد.",
+  "workspaceReplaceIssueUnreadable": "فایلی که خوانده نمی‌شد نادیده گرفته شد.",
+  "workspaceReplaceIssueInvalidUtf8": "فایلی با UTF-8 نامعتبر نادیده گرفته شد.",
+  "workspaceReplaceIssueTruncated": "پیش‌نمایش جایگزینی کوتاه شد.",
+  "workspaceReplaceIssueFileChanged": "فایلی که پس از پیش‌نمایش تغییر کرده بود نادیده گرفته شد.",
+  "workspaceReplaceIssueBufferChanged": "بافر ویرایشگری که پس از پیش‌نمایش تغییر کرده بود نادیده گرفته شد.",
+  "workspaceReplaceIssueNormalizationRequired": "پیش از جایگزینی، یکسان‌سازی LF یا CRLF را انتخاب کنید.",
+  "externalChangesTitle": "تغییرات بیرونی — ⁨{fileName}⁩",
+  "externalFileDeleted": "این فایل از روی دیسک حذف شد.",
+  "externalFileChanged": "هنگامی که تغییرات ذخیره‌نشده داشتید، این فایل روی دیسک تغییر کرد.",
+  "compare": "مقایسه",
+  "reloadFromDisk": "بارگیری دوباره از دیسک",
+  "keepMine": "نگه‌داشتن نسخهٔ من",
+  "saveAs": "ذخیره با نام",
+  "unsavedChangesMultipleMessage": "تعداد {count} سند تغییرات ذخیره‌نشده دارند. پیش از ادامه ذخیره شوند؟",
+  "workspaceReplaceIssuePartialConflict": "بازگردانی متوقف شد، زیرا فایل هم‌زمان تغییر کرد. ممکن است برخی جایگزینی‌ها باقی مانده باشند؛ محتوای جابه‌جا‌شده در مسیر زیر حفظ شد.",
+  "workspaceReplaceIssueApplyFailed": "هیچ جایگزینی اعمال نشد، زیرا مجموعهٔ بازبینی‌شده را نمی‌شد با ایمنی ذخیره کرد.",
+  "workspaceRecoveryRestored": "تعداد {count} سند ذخیره‌نشده بازیابی شد. پیش از ادامه هر سند بازیابی‌شده را بررسی کنید.",
+  "workspaceRecoveryDamaged": "تعداد {count} رکورد بازیابی آسیب‌دیده قابل بازیابی نبود. سندهای معتبر بازیابی‌شده همچنان در دسترس‌اند.",
+  "recoveredDocumentReview": "محتوای ذخیره‌نشدهٔ {fileName} بازیابی شده است. آن را بررسی کنید و سپس ذخیره، ذخیره با نام یا رد کنید.",
+  "commandUnavailableInContext": "این فرمان در زمینهٔ فعلی در دسترس نیست.",
+  "mathRenderFailed": "عبارت ریاضی قابل نمایش نبود.",
+  "inlineMath": "ریاضی درون‌خطی",
+  "displayMath": "ریاضی نمایشی"
 }
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 628153e6..23cb7211 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Rouvrir l’espace de travail précédent au démarrage",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Ouvrir l’espace de travail et les onglets de la session précédente au démarrage de BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Confirmer avant de fermer avec des modifications non enregistrées",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Image",
+  "video": "Vidéo",
+  "openVideo": "Lire la vidéo",
+  "pauseVideo": "Mettre la vidéo en pause",
+  "videoUnavailable": "Vidéo indisponible",
+  "videoPreview": "Aperçu de la vidéo",
+  "diagnosticWritersideVideoMissingSource": "L’attribut src de la vidéo est manquant.",
+  "diagnosticWritersideVideoUnsupportedSource": "Source vidéo non prise en charge : {source}",
+  "diagnosticWritersideVideoMissingFile": "Le fichier vidéo n’existe pas : {source}",
+  "diagnosticWritersideVideoMissingPreview": "L’image d’aperçu de la vidéo n’existe pas : {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1320,6 +1333,8 @@
   "sourceLargeFileFeaturesPaused": "Fichier volumineux : la coloration et le repliage sont suspendus",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Aucun contenu à lire",
+  "admonition": "Encadré",
+  "quote": "Citation",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1361,7 +1376,7 @@
   },
   "couldNotOpenTarget": "Impossible d’ouvrir {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1370,7 +1385,7 @@
   },
   "linkTargetNotFound": "Cible du lien introuvable : {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1379,11 +1394,11 @@
   },
   "cannotOpenFileTypeInEditor": "Impossible d’ouvrir ce type de fichier dans l’éditeur",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Ancre introuvable : {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2214,6 +2229,7 @@
   "gitFileHistory": "Fichier actuel",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Actions sur le fichier",
+  "actions": "Actions",
   "gitStatusAdded": "Ajouté",
   "gitStatusDeleted": "Supprimé",
   "gitStatusRenamed": "Renommé",
@@ -2233,7 +2249,15 @@
   "gitErrorMultipleRemotes": "Plusieurs dépôts distants sont configurés. Choisissez une branche en amont en dehors de cette version de BusyMark.",
   "gitErrorDirtyWorkspace": "Enregistrez ou abandonnez les modifications de l’éditeur BusyMark avant de changer de branche.",
   "gitErrorDiverged": "La branche a divergé. Résolvez la fusion ou le rebasage en dehors de cette version de BusyMark.",
-  "gitErrorAuthentication": "L’authentification Git a échoué. Dans le snap, les dépôts SSH distants peuvent nécessiter la connexion de l’interface ssh-keys.",
+  "gitErrorAuthorIdentity": "Git a besoin d’un nom et d’une adresse e-mail d’auteur avant de pouvoir valider.",
+  "gitAuthorIdentityTitle": "Identité de l’auteur Git",
+  "gitAuthorIdentityMessage": "Saisissez l’identité que Git doit enregistrer dans les validations. BusyMark l’enregistrera et réessaiera cette validation.",
+  "gitAuthorName": "Nom",
+  "gitAuthorEmail": "E-mail",
+  "gitAuthorIdentityGlobal": "Utiliser pour tous les dépôts",
+  "gitAuthorIdentityGlobalDescription": "Avec l’installation Snap, ce réglage s’applique aux dépôts ouverts dans BusyMark.",
+  "gitSaveIdentityAndCommit": "Enregistrer et valider",
+  "gitErrorAuthentication": "L’authentification Git a échoué.",
   "gitErrorNetwork": "L’opération réseau Git a échoué.",
   "gitErrorConflict": "Git a signalé des conflits non résolus.",
   "gitErrorCommandFailed": "La commande Git a échoué.",
@@ -2570,56 +2594,23 @@
   "diagnosticWritersideReferenceTopicMissing": "La rubrique « {topic} » ne fait pas partie de l’instance référencée « {instance} ».",
   "download": "Télécharger",
   "exportWritersideAsPdf": "Exporter Writerside au format PDF",
-  "writersidePdfExportDescription": "Choisissez une instance et les paramètres PDF. BusyMark utilise le générateur Writerside officiel de JetBrains.",
   "writersidePdfContent": "Contenu de l’exportation",
-  "writersidePdfSettings": "Paramètres PDF",
-  "writersidePdfConfigureHere": "Configurer pour cette exportation",
-  "writersidePdfProjectConfiguration": "Utiliser la configuration du projet",
-  "writersidePdfConfigurationFile": "Fichier de configuration PDF",
   "writersidePdfPage": "Page",
-  "writersidePdfKeymap": "Disposition des raccourcis",
-  "writersidePdfNoKeymap": "Aucune disposition",
-  "writersidePdfTocTitle": "Titre de la table des matières",
-  "writersidePdfCover": "Page de couverture",
-  "writersidePdfIncludeCover": "Inclure une page de couverture",
-  "writersidePdfCoverTitle": "Titre de couverture",
-  "writersidePdfCoverDescription": "Description de couverture",
-  "writersidePdfCopyright": "Droits d’auteur",
-  "writersidePdfCoverLogo": "Logo de couverture",
-  "writersidePdfChooseCoverLogo": "Choisir le logo de couverture",
-  "writersidePdfHeaderAndFooter": "En-tête et pied de page",
-  "writersidePdfHeader": "En-tête",
-  "writersidePdfFooter": "Pied de page",
-  "writersidePdfAdvancedDescription": "Ces valeurs associent le module ouvert à l’organisation des sources du générateur.",
-  "writersidePdfModuleName": "Nom du module",
-  "writersidePdfSourceRoot": "Racine des sources",
-  "writersidePdfChooseSourceRoot": "Choisir la racine des sources",
-  "writersidePdfBuilderVersion": "Version du générateur",
-  "writersidePdfAllowNetwork": "Autoriser le réseau pendant la génération",
-  "writersidePdfAllowNetworkDescription": "Désactivé par défaut. Activez cette option uniquement si le projet nécessite volontairement des ressources distantes.",
-  "writersidePdfModuleNameRequired": "Saisissez le nom du module.",
-  "writersidePdfSourceRootRequired": "Choisissez la racine des sources.",
-  "writersidePdfBuilderVersionInvalid": "Saisissez une version valide du générateur.",
-  "writersidePdfBuilderRequired": "Générateur Writerside requis",
-  "writersidePdfBuilderDownloadDescription": "BusyMark utilise l’image de conteneur officielle {image}. La télécharger maintenant ? Cette image est volumineuse et stockée par Docker.",
-  "writersidePdfDownloadingBuilder": "Téléchargement du générateur Writerside…",
   "exportingWritersidePdf": "Exportation du PDF Writerside…",
-  "writersidePdfDockerUnavailable": "Docker est requis pour exporter Writerside au format PDF. Installez et démarrez Docker, puis réessayez.",
-  "writersidePdfBuilderUnavailable": "L’image demandée du générateur Writerside n’est pas disponible.",
-  "writersidePdfConfigurationInvalid": "La configuration PDF Writerside n’est pas valide.",
-  "writersidePdfBuildFailed": "Le générateur Writerside n’a pas pu créer le PDF.",
-  "writersidePdfInvalidOutput": "Le générateur Writerside n’a pas produit de PDF valide.",
   "ai": "IA",
   "aiLocalOllama": "Ollama local",
   "aiDisabled": "Désactivé",
   "aiLocalOnlyDescription": "L’édition par IA est déclenchée explicitement. BusyMark envoie uniquement le contexte affiché au fournisseur sélectionné et n’applique jamais une proposition sans validation.",
   "aiProvider": "Fournisseur d’IA",
+  "aiDefaultProvider": "Fournisseur par défaut",
+  "aiConfigureProvider": "Configurer le fournisseur",
+  "aiChooseProvider": "Choisir un fournisseur d’IA",
   "aiOllamaEndpoint": "Point de terminaison Ollama",
   "aiOllamaModel": "Modèle Ollama",
   "aiTestConnection": "Tester la connexion",
   "aiTestingConnection": "Test en cours…",
   "aiConnectionReady": "Connecté. {count} modèle(s) installé(s) trouvé(s).",
-  "aiNoModels": "Ollama est en cours d’exécution, mais aucun modèle installé n’a été trouvé.",
+  "aiNoModels": "Aucun modèle sélectionné.",
   "aiConnectionFailed": "BusyMark n’a pas pu vérifier la génération de texte par IA.",
   "aiConfigureFirst": "Activez un fournisseur d’IA et vérifiez un modèle dans Paramètres → IA.",
   "aiEditWithAi": "Modifier avec l’IA",
@@ -2651,9 +2642,6 @@
   "aiReviewExactContent": "Vérifier le contenu exact",
   "aiContentToChange": "Contenu à modifier",
   "aiContentSentToAi": "Contenu envoyé à l’IA",
-  "aiPrivacyDisabled": "L’IA est désactivée. BusyMark n’envoie jamais le contenu du document sans action d’IA explicite.",
-  "aiPrivacyLocal": "BusyMark envoie uniquement le contexte affiché dans la boîte de dialogue de validation au service Ollama local configuré. Les propositions ne sont jamais appliquées sans validation.",
-  "aiPrivacyCloud": "BusyMark envoie uniquement le contexte affiché dans la boîte de dialogue de validation à {provider}. Les requêtes sont sans état et les propositions ne sont jamais appliquées sans validation.",
   "aiApiKey": "Clé API",
   "aiApiKeyStoredHint": "Une clé est enregistrée dans le trousseau d’identifiants du système",
   "aiApiKeyEnterHint": "Saisissez une clé API du fournisseur",
@@ -2666,6 +2654,7 @@
   "aiAutomaticRouting": "Automatique selon la tâche",
   "aiFixedModelRouting": "Utiliser le modèle sélectionné",
   "aiPreferredModel": "Modèle préféré",
+  "aiModel": "Modèle",
   "aiUsageThisMonth": "{requests} requêtes · {input} jetons d’entrée · {output} jetons de sortie",
   "aiCloudConsentTitle": "Envoyer du contenu à {provider} ?",
   "aiCloudConsentEnable": "Activer {provider}",
@@ -2686,5 +2675,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Le titre de niveau {level} suit le niveau {previousLevel} ; vérifiez l’imbrication des sections.",
   "diagnosticMarkdownLinkEmptyText": "Le texte du lien est vide ; fournissez un nom accessible qui décrit son objectif.",
   "diagnosticMarkdownLinkReviewText": "Vérifiez si le texte du lien « {text} » décrit son objectif dans le contexte.",
-  "diagnosticMarkdownTableEmptyHeader": "Les en-têtes de tableau doivent identifier leurs colonnes ; complétez chaque en-tête vide."
+  "diagnosticMarkdownTableEmptyHeader": "Les en-têtes de tableau doivent identifier leurs colonnes ; complétez chaque en-tête vide.",
+  "commandPalette": "Palette de commandes",
+  "commandPaletteHint": "Saisissez une commande",
+  "commandPaletteEmpty": "Aucune commande correspondante",
+  "tableAlignmentUnspecified": "Alignement : non spécifié",
+  "tableAlignmentLeft": "Alignement : gauche",
+  "tableAlignmentCenter": "Alignement : centre",
+  "tableAlignmentRight": "Alignement : droite",
+  "sourceSearchReplacement": "Remplacer par",
+  "sourceSearchReplaceCurrent": "Remplacer la sélection actuelle",
+  "sourceSearchReplaceAndFindNext": "Remplacer et rechercher le suivant",
+  "sourceSearchReplaceAll": "Tout remplacer",
+  "workspaceReplace": "Remplacer dans l’espace de travail",
+  "reviewReplacements": "Vérifier les remplacements",
+  "applyReplacements": "Appliquer les remplacements",
+  "skippedFiles": "Fichiers ignorés",
+  "workspaceReplaceDirtyBuffer": "Contenu non enregistré de l’éditeur",
+  "workspaceReplaceDiskContent": "Contenu enregistré sur le disque",
+  "selectFileMatches": "Sélectionner les {count} occurrences",
+  "workspaceReplaceApplied": "{matches} occurrences remplacées dans {files} fichiers ; {skipped} ignorées.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Saut de ligne final",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Aucun saut de ligne final",
+  "normalizeLineEndings": "Normaliser les fins de ligne",
+  "workspaceReplaceMixedLineEndings": "{fileName} utilise plusieurs types de fins de ligne. Choisissez le format avant le remplacement.",
+  "mixedLineEndingsSavePrompt": "Ce document contient plusieurs types de fins de ligne. Choisissez un format.",
+  "workspaceReplaceIssueOversized": "Un fichier trop volumineux a été ignoré.",
+  "workspaceReplaceIssueUnreadable": "Un fichier illisible a été ignoré.",
+  "workspaceReplaceIssueInvalidUtf8": "Un fichier dont l’encodage UTF-8 est incorrect a été ignoré.",
+  "workspaceReplaceIssueTruncated": "L’aperçu des remplacements a été tronqué.",
+  "workspaceReplaceIssueFileChanged": "Un fichier modifié après l’aperçu a été ignoré.",
+  "workspaceReplaceIssueBufferChanged": "Un tampon d’éditeur modifié après l’aperçu a été ignoré.",
+  "workspaceReplaceIssueNormalizationRequired": "Choisissez la normalisation LF ou CRLF avant le remplacement.",
+  "externalChangesTitle": "Modifications externes — {fileName}",
+  "externalFileDeleted": "Ce fichier a été supprimé du disque.",
+  "externalFileChanged": "Ce fichier a été modifié sur le disque alors que vous avez des modifications non enregistrées.",
+  "compare": "Comparer",
+  "reloadFromDisk": "Recharger depuis le disque",
+  "keepMine": "Conserver ma version",
+  "saveAs": "Enregistrer sous",
+  "unsavedChangesMultipleMessage": "{count} documents contiennent des modifications non enregistrées. Les enregistrer avant de continuer ?",
+  "workspaceReplaceIssuePartialConflict": "L’annulation a été interrompue car le fichier a été modifié simultanément. Certains remplacements peuvent subsister ; le contenu déplacé a été conservé à l’emplacement ci-dessous.",
+  "workspaceReplaceIssueApplyFailed": "Aucun remplacement n’a été appliqué, car l’ensemble vérifié n’a pas pu être enregistré en toute sécurité.",
+  "workspaceRecoveryRestored": "{count} documents non enregistrés ont été récupérés. Vérifiez chaque document récupéré avant de continuer.",
+  "workspaceRecoveryDamaged": "{count} enregistrements de récupération endommagés n’ont pas pu être restaurés. Les documents valides récupérés restent disponibles.",
+  "recoveredDocumentReview": "Le contenu non enregistré de {fileName} a été récupéré. Vérifiez-le, puis enregistrez-le, enregistrez-le sous un autre nom ou ignorez-le.",
+  "commandUnavailableInContext": "Cette commande n’est pas disponible dans le contexte actuel.",
+  "mathRenderFailed": "Impossible d’afficher l’expression mathématique.",
+  "inlineMath": "Formule en ligne",
+  "displayMath": "Formule en bloc"
 }
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
index ef3e88ca..6c613256 100644
--- a/lib/l10n/app_hi.arb
+++ b/lib/l10n/app_hi.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "स्टार्टअप पर पिछला कार्यक्षेत्र फिर से खोलें",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "BusyMark शुरू होने पर पिछले सत्र का कार्यक्षेत्र और टैब खोलें।",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "न सहेजे गए बदलाव हों तो बंद करने से पहले पुष्टि करें",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "छवि",
+  "video": "वीडियो",
+  "openVideo": "वीडियो चलाएँ",
+  "pauseVideo": "वीडियो रोकें",
+  "videoUnavailable": "वीडियो उपलब्ध नहीं है",
+  "videoPreview": "वीडियो पूर्वावलोकन",
+  "diagnosticWritersideVideoMissingSource": "वीडियो में src विशेषता मौजूद नहीं है।",
+  "diagnosticWritersideVideoUnsupportedSource": "असमर्थित वीडियो स्रोत: {source}",
+  "diagnosticWritersideVideoMissingFile": "वीडियो फ़ाइल मौजूद नहीं है: {source}",
+  "diagnosticWritersideVideoMissingPreview": "वीडियो पूर्वावलोकन छवि मौजूद नहीं है: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1322,6 +1335,8 @@
   "sourceLargeFileFeaturesPaused": "बड़ी फ़ाइल: हाइलाइटिंग और फ़ोल्डिंग अस्थायी रूप से रुकी हुई हैं",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "पढ़ने के लिए कोई सामग्री नहीं",
+  "admonition": "सूचना ब्लॉक",
+  "quote": "उद्धरण",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1363,7 +1378,7 @@
   },
   "couldNotOpenTarget": "{target} नहीं खोला जा सका",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1372,7 +1387,7 @@
   },
   "linkTargetNotFound": "लिंक लक्ष्य नहीं मिला: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1381,11 +1396,11 @@
   },
   "cannotOpenFileTypeInEditor": "इस फ़ाइल प्रकार को संपादक में नहीं खोला जा सकता",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "एंकर नहीं मिला: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2216,6 +2231,7 @@
   "gitFileHistory": "मौजूदा फ़ाइल",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "फ़ाइल कार्रवाइयाँ",
+  "actions": "कार्रवाइयाँ",
   "gitStatusAdded": "जोड़ा गया",
   "gitStatusDeleted": "हटाया गया",
   "gitStatusRenamed": "नाम बदला गया",
@@ -2235,7 +2251,15 @@
   "gitErrorMultipleRemotes": "कई रिमोट कॉन्फ़िगर हैं। इस BusyMark संस्करण के बाहर कोई अपस्ट्रीम चुनें।",
   "gitErrorDirtyWorkspace": "शाखा बदलने से पहले BusyMark संपादक के बदलाव सहेजें या त्यागें।",
   "gitErrorDiverged": "शाखा अलग हो गई है। इस BusyMark संस्करण के बाहर मर्ज या रीबेस करके इसे सुलझाएँ।",
-  "gitErrorAuthentication": "Git प्रमाणीकरण विफल रहा। snap में SSH रिमोट के लिए ssh-keys इंटरफ़ेस कनेक्ट करना पड़ सकता है।",
+  "gitErrorAuthorIdentity": "कमिट करने से पहले Git को लेखक का नाम और ईमेल पता चाहिए।",
+  "gitAuthorIdentityTitle": "Git लेखक पहचान",
+  "gitAuthorIdentityMessage": "वह पहचान दर्ज करें जिसे Git कमिट में रिकॉर्ड करे। BusyMark इसे सहेजकर इस कमिट को फिर से आज़माएगा।",
+  "gitAuthorName": "नाम",
+  "gitAuthorEmail": "ईमेल",
+  "gitAuthorIdentityGlobal": "सभी रिपॉज़िटरी के लिए उपयोग करें",
+  "gitAuthorIdentityGlobalDescription": "Snap के रूप में इंस्टॉल होने पर यह BusyMark में खोली गई रिपॉज़िटरी पर लागू होता है।",
+  "gitSaveIdentityAndCommit": "सहेजें और कमिट करें",
+  "gitErrorAuthentication": "Git प्रमाणीकरण विफल रहा।",
   "gitErrorNetwork": "Git नेटवर्क कार्रवाई विफल रही।",
   "gitErrorConflict": "Git ने अनसुलझे टकराव रिपोर्ट किए।",
   "gitErrorCommandFailed": "Git कमांड विफल रहा।",
@@ -2549,56 +2573,23 @@
   "diagnosticWritersideReferenceTopicMissing": "विषय “{topic}” संदर्भित इंस्टेंस “{instance}” में नहीं है।",
   "download": "डाउनलोड करें",
   "exportWritersideAsPdf": "Writerside को PDF के रूप में निर्यात करें",
-  "writersidePdfExportDescription": "एक इंस्टेंस और PDF सेटिंग चुनें। BusyMark, JetBrains के आधिकारिक Writerside बिल्डर का उपयोग करता है।",
   "writersidePdfContent": "निर्यात सामग्री",
-  "writersidePdfSettings": "PDF सेटिंग",
-  "writersidePdfConfigureHere": "इस निर्यात के लिए कॉन्फ़िगर करें",
-  "writersidePdfProjectConfiguration": "प्रोजेक्ट कॉन्फ़िगरेशन का उपयोग करें",
-  "writersidePdfConfigurationFile": "PDF कॉन्फ़िगरेशन फ़ाइल",
   "writersidePdfPage": "पृष्ठ",
-  "writersidePdfKeymap": "कीमैप",
-  "writersidePdfNoKeymap": "कोई कीमैप नहीं",
-  "writersidePdfTocTitle": "विषय-सूची का शीर्षक",
-  "writersidePdfCover": "आवरण पृष्ठ",
-  "writersidePdfIncludeCover": "आवरण पृष्ठ शामिल करें",
-  "writersidePdfCoverTitle": "आवरण शीर्षक",
-  "writersidePdfCoverDescription": "आवरण विवरण",
-  "writersidePdfCopyright": "कॉपीराइट",
-  "writersidePdfCoverLogo": "आवरण लोगो",
-  "writersidePdfChooseCoverLogo": "आवरण लोगो चुनें",
-  "writersidePdfHeaderAndFooter": "शीर्षलेख और पादलेख",
-  "writersidePdfHeader": "शीर्षलेख",
-  "writersidePdfFooter": "पादलेख",
-  "writersidePdfAdvancedDescription": "ये मान खुले मॉड्यूल को बिल्डर की स्रोत संरचना से जोड़ते हैं।",
-  "writersidePdfModuleName": "मॉड्यूल का नाम",
-  "writersidePdfSourceRoot": "स्रोत रूट",
-  "writersidePdfChooseSourceRoot": "स्रोत रूट चुनें",
-  "writersidePdfBuilderVersion": "बिल्डर संस्करण",
-  "writersidePdfAllowNetwork": "बिल्ड के दौरान नेटवर्क की अनुमति दें",
-  "writersidePdfAllowNetworkDescription": "डिफ़ॉल्ट रूप से बंद। केवल तभी चालू करें जब प्रोजेक्ट को जानबूझकर दूरस्थ बिल्ड संसाधनों की आवश्यकता हो।",
-  "writersidePdfModuleNameRequired": "मॉड्यूल का नाम दर्ज करें।",
-  "writersidePdfSourceRootRequired": "स्रोत रूट चुनें।",
-  "writersidePdfBuilderVersionInvalid": "मान्य बिल्डर संस्करण दर्ज करें।",
-  "writersidePdfBuilderRequired": "Writerside बिल्डर आवश्यक है",
-  "writersidePdfBuilderDownloadDescription": "BusyMark आधिकारिक {image} कंटेनर इमेज का उपयोग करता है। इसे अभी डाउनलोड करें? इमेज बड़ी है और Docker इसे संग्रहित करेगा।",
-  "writersidePdfDownloadingBuilder": "Writerside बिल्डर डाउनलोड हो रहा है…",
   "exportingWritersidePdf": "Writerside PDF निर्यात हो रहा है…",
-  "writersidePdfDockerUnavailable": "Writerside PDF निर्यात के लिए Docker आवश्यक है। Docker इंस्टॉल करके चालू करें, फिर दोबारा प्रयास करें।",
-  "writersidePdfBuilderUnavailable": "अनुरोधित Writerside बिल्डर इमेज उपलब्ध नहीं है।",
-  "writersidePdfConfigurationInvalid": "Writerside PDF कॉन्फ़िगरेशन अमान्य है।",
-  "writersidePdfBuildFailed": "Writerside बिल्डर PDF नहीं बना सका।",
-  "writersidePdfInvalidOutput": "Writerside बिल्डर ने मान्य PDF नहीं बनाया।",
   "ai": "एआई",
   "aiLocalOllama": "स्थानीय Ollama",
   "aiDisabled": "अक्षम",
   "aiLocalOnlyDescription": "AI संपादन केवल स्पष्ट कार्रवाई से शुरू होता है। BusyMark चयनित प्रदाता को केवल दिखाया गया संदर्भ भेजता है और समीक्षा के बिना किसी प्रस्ताव को लागू नहीं करता।",
   "aiProvider": "एआई प्रदाता",
+  "aiDefaultProvider": "डिफ़ॉल्ट प्रदाता",
+  "aiConfigureProvider": "प्रदाता कॉन्फ़िगर करें",
+  "aiChooseProvider": "एआई प्रदाता चुनें",
   "aiOllamaEndpoint": "Ollama एंडपॉइंट",
   "aiOllamaModel": "Ollama मॉडल",
   "aiTestConnection": "कनेक्शन जाँचें",
   "aiTestingConnection": "जाँच जारी…",
   "aiConnectionReady": "कनेक्ट हो गया। {count} इंस्टॉल किए गए मॉडल मिले।",
-  "aiNoModels": "Ollama चल रहा है, लेकिन कोई इंस्टॉल किया गया मॉडल नहीं मिला।",
+  "aiNoModels": "कोई मॉडल नहीं चुना गया।",
   "aiConnectionFailed": "BusyMark AI टेक्स्ट जनरेशन को सत्यापित नहीं कर सका।",
   "aiConfigureFirst": "पहले सेटिंग्स → AI में किसी AI प्रदाता को सक्षम करें और मॉडल सत्यापित करें।",
   "aiEditWithAi": "AI से संपादित करें",
@@ -2630,9 +2621,6 @@
   "aiReviewExactContent": "सटीक सामग्री की समीक्षा करें",
   "aiContentToChange": "बदली जाने वाली सामग्री",
   "aiContentSentToAi": "AI को भेजी गई सामग्री",
-  "aiPrivacyDisabled": "AI अक्षम है। BusyMark किसी स्पष्ट AI कार्रवाई के बिना दस्तावेज़ की सामग्री कभी नहीं भेजता।",
-  "aiPrivacyLocal": "BusyMark समीक्षा संवाद में दिखाया गया संदर्भ केवल कॉन्फ़िगर की गई स्थानीय Ollama सेवा को भेजता है। प्रस्ताव समीक्षा के बिना कभी लागू नहीं होते।",
-  "aiPrivacyCloud": "BusyMark समीक्षा संवाद में दिखाया गया संदर्भ केवल {provider} को भेजता है। अनुरोध स्टेटलेस होते हैं और प्रस्ताव समीक्षा के बिना कभी लागू नहीं होते।",
   "aiApiKey": "API कुंजी",
   "aiApiKeyStoredHint": "एक कुंजी सिस्टम क्रेडेंशियल स्टोर में सुरक्षित है",
   "aiApiKeyEnterHint": "प्रदाता की API कुंजी दर्ज करें",
@@ -2645,6 +2633,7 @@
   "aiAutomaticRouting": "कार्य के अनुसार स्वचालित",
   "aiFixedModelRouting": "चयनित मॉडल का उपयोग करें",
   "aiPreferredModel": "पसंदीदा मॉडल",
+  "aiModel": "मॉडल",
   "aiUsageThisMonth": "{requests} अनुरोध · {input} इनपुट टोकन · {output} आउटपुट टोकन",
   "aiCloudConsentTitle": "सामग्री {provider} को भेजें?",
   "aiCloudConsentEnable": "{provider} सक्षम करें",
@@ -2665,5 +2654,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "स्तर {level} का शीर्षक स्तर {previousLevel} के बाद है; अनुभागों का नेस्टिंग जाँचें।",
   "diagnosticMarkdownLinkEmptyText": "लिंक टेक्स्ट खाली है; उसके उद्देश्य का वर्णन करने वाला सुलभ नाम दें।",
   "diagnosticMarkdownLinkReviewText": "जाँचें कि लिंक टेक्स्ट “{text}” संदर्भ में उसके उद्देश्य का वर्णन करता है या नहीं।",
-  "diagnosticMarkdownTableEmptyHeader": "तालिका शीर्षकों को अपने कॉलम पहचानने चाहिए; हर खाली शीर्षक पूरा करें।"
+  "diagnosticMarkdownTableEmptyHeader": "तालिका शीर्षकों को अपने कॉलम पहचानने चाहिए; हर खाली शीर्षक पूरा करें।",
+  "commandPalette": "कमांड पैलेट",
+  "commandPaletteHint": "कमांड लिखें",
+  "commandPaletteEmpty": "कोई मेल खाता कमांड नहीं",
+  "tableAlignmentUnspecified": "संरेखण: अनिर्दिष्ट",
+  "tableAlignmentLeft": "संरेखण: बायाँ",
+  "tableAlignmentCenter": "संरेखण: मध्य",
+  "tableAlignmentRight": "संरेखण: दायाँ",
+  "sourceSearchReplacement": "इससे बदलें",
+  "sourceSearchReplaceCurrent": "वर्तमान मिलान बदलें",
+  "sourceSearchReplaceAndFindNext": "बदलें और अगला खोजें",
+  "sourceSearchReplaceAll": "सभी बदलें",
+  "workspaceReplace": "वर्कस्पेस में बदलें",
+  "reviewReplacements": "बदलावों की समीक्षा करें",
+  "applyReplacements": "बदलाव लागू करें",
+  "skippedFiles": "छोड़ी गई फ़ाइलें",
+  "workspaceReplaceDirtyBuffer": "सहेजी न गई संपादक सामग्री",
+  "workspaceReplaceDiskContent": "डिस्क पर सहेजी सामग्री",
+  "selectFileMatches": "सभी {count} मिलान चुनें",
+  "workspaceReplaceApplied": "{files} फ़ाइलों में {matches} मिलान बदले गए; {skipped} छोड़े गए।",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · अंतिम नई पंक्ति",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · अंतिम नई पंक्ति नहीं",
+  "normalizeLineEndings": "पंक्ति अंत सामान्य करें",
+  "workspaceReplaceMixedLineEndings": "{fileName} में मिले-जुले पंक्ति अंत हैं। बदलने से पहले प्रारूप चुनें।",
+  "mixedLineEndingsSavePrompt": "इस दस्तावेज़ में मिले-जुले पंक्ति अंत हैं। कोई प्रारूप चुनें।",
+  "workspaceReplaceIssueOversized": "बहुत बड़ी फ़ाइल छोड़ दी गई।",
+  "workspaceReplaceIssueUnreadable": "पढ़ी न जा सकने वाली फ़ाइल छोड़ दी गई।",
+  "workspaceReplaceIssueInvalidUtf8": "अमान्य UTF-8 वाली फ़ाइल छोड़ दी गई।",
+  "workspaceReplaceIssueTruncated": "बदलाव पूर्वावलोकन छोटा कर दिया गया।",
+  "workspaceReplaceIssueFileChanged": "पूर्वावलोकन के बाद बदली फ़ाइल छोड़ दी गई।",
+  "workspaceReplaceIssueBufferChanged": "पूर्वावलोकन के बाद बदला संपादक बफ़र छोड़ दिया गया।",
+  "workspaceReplaceIssueNormalizationRequired": "बदलने से पहले LF या CRLF सामान्यीकरण चुनें।",
+  "externalChangesTitle": "बाहरी बदलाव — {fileName}",
+  "externalFileDeleted": "यह फ़ाइल डिस्क से हटा दी गई।",
+  "externalFileChanged": "आपके सहेजे न गए बदलावों के दौरान यह फ़ाइल डिस्क पर बदल गई।",
+  "compare": "तुलना करें",
+  "reloadFromDisk": "डिस्क से फिर लोड करें",
+  "keepMine": "मेरा संस्करण रखें",
+  "saveAs": "इस रूप में सहेजें",
+  "unsavedChangesMultipleMessage": "{count} दस्तावेज़ों में सहेजे नहीं गए बदलाव हैं। जारी रखने से पहले इन्हें सहेजें?",
+  "workspaceReplaceIssuePartialConflict": "रोलबैक रोक दिया गया क्योंकि फ़ाइल उसी समय बदल गई थी। कुछ प्रतिस्थापन बने रह सकते हैं; हटाई गई सामग्री नीचे दिए गए पथ पर सुरक्षित रखी गई है।",
+  "workspaceReplaceIssueApplyFailed": "कोई प्रतिस्थापन लागू नहीं किया गया क्योंकि समीक्षा किए गए समूह को सुरक्षित रूप से सहेजा नहीं जा सका।",
+  "workspaceRecoveryRestored": "{count} सहेजे नहीं गए दस्तावेज़ पुनर्प्राप्त किए गए। जारी रखने से पहले प्रत्येक पुनर्प्राप्त दस्तावेज़ की समीक्षा करें।",
+  "workspaceRecoveryDamaged": "{count} क्षतिग्रस्त पुनर्प्राप्ति रिकॉर्ड बहाल नहीं किए जा सके। मान्य पुनर्प्राप्त दस्तावेज़ उपलब्ध हैं।",
+  "recoveredDocumentReview": "{fileName} की सहेजी नहीं गई सामग्री पुनर्प्राप्त हुई। इसकी समीक्षा करें, फिर सहेजें, इस रूप में सहेजें या छोड़ दें।",
+  "commandUnavailableInContext": "यह आदेश वर्तमान संदर्भ में उपलब्ध नहीं है।",
+  "mathRenderFailed": "गणितीय व्यंजक रेंडर नहीं किया जा सका।",
+  "inlineMath": "इनलाइन गणित",
+  "displayMath": "डिस्प्ले गणित"
 }
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 43ef29b3..6968218b 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Riapri l’area di lavoro precedente all’avvio",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Apri l’area di lavoro e le schede della sessione precedente all’avvio di BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Conferma prima di chiudere con modifiche non salvate",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Immagine",
+  "video": "Video",
+  "openVideo": "Riproduci video",
+  "pauseVideo": "Metti in pausa il video",
+  "videoUnavailable": "Video non disponibile",
+  "videoPreview": "Anteprima video",
+  "diagnosticWritersideVideoMissingSource": "Al video manca l’attributo src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Sorgente video non supportata: {source}",
+  "diagnosticWritersideVideoMissingFile": "Il file video non esiste: {source}",
+  "diagnosticWritersideVideoMissingPreview": "L’immagine di anteprima del video non esiste: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1320,6 +1333,8 @@
   "sourceLargeFileFeaturesPaused": "File di grandi dimensioni: evidenziazione e ripiegamento sono sospesi",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Nessun contenuto da leggere",
+  "admonition": "Avviso",
+  "quote": "Citazione",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1361,7 +1376,7 @@
   },
   "couldNotOpenTarget": "Impossibile aprire {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1370,7 +1385,7 @@
   },
   "linkTargetNotFound": "Destinazione del collegamento non trovata: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1379,11 +1394,11 @@
   },
   "cannotOpenFileTypeInEditor": "Impossibile aprire questo tipo di file nell'editor",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Ancora non trovata: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2214,6 +2229,7 @@
   "gitFileHistory": "File corrente",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Azioni sul file",
+  "actions": "Azioni",
   "gitStatusAdded": "Aggiunto",
   "gitStatusDeleted": "Eliminato",
   "gitStatusRenamed": "Rinominato",
@@ -2233,7 +2249,15 @@
   "gitErrorMultipleRemotes": "Sono configurati più repository remoti. Scegli un upstream al di fuori di questa versione di BusyMark.",
   "gitErrorDirtyWorkspace": "Salva o scarta le modifiche dell’editor di BusyMark prima di cambiare ramo.",
   "gitErrorDiverged": "Il ramo è divergente. Risolvi il merge o il rebase al di fuori di questa versione di BusyMark.",
-  "gitErrorAuthentication": "Autenticazione Git non riuscita. Nello snap, i repository SSH remoti potrebbero richiedere il collegamento dell’interfaccia ssh-keys.",
+  "gitErrorAuthorIdentity": "Git richiede il nome e l’indirizzo e-mail dell’autore prima di eseguire il commit.",
+  "gitAuthorIdentityTitle": "Identità autore Git",
+  "gitAuthorIdentityMessage": "Inserisci l’identità che Git deve registrare nei commit. BusyMark la salverà e riproverà questo commit.",
+  "gitAuthorName": "Nome",
+  "gitAuthorEmail": "E-mail",
+  "gitAuthorIdentityGlobal": "Usa per tutti i repository",
+  "gitAuthorIdentityGlobalDescription": "Con l’installazione Snap, si applica ai repository aperti in BusyMark.",
+  "gitSaveIdentityAndCommit": "Salva ed esegui commit",
+  "gitErrorAuthentication": "Autenticazione Git non riuscita.",
   "gitErrorNetwork": "Operazione di rete Git non riuscita.",
   "gitErrorConflict": "Git ha segnalato conflitti non risolti.",
   "gitErrorCommandFailed": "Comando Git non riuscito.",
@@ -2547,56 +2571,23 @@
   "diagnosticWritersideReferenceTopicMissing": "L’argomento «{topic}» non appartiene all’istanza referenziata «{instance}».",
   "download": "Scarica",
   "exportWritersideAsPdf": "Esporta Writerside come PDF",
-  "writersidePdfExportDescription": "Scegli un’istanza e le impostazioni PDF. BusyMark usa il generatore Writerside ufficiale di JetBrains.",
   "writersidePdfContent": "Contenuto dell’esportazione",
-  "writersidePdfSettings": "Impostazioni PDF",
-  "writersidePdfConfigureHere": "Configura per questa esportazione",
-  "writersidePdfProjectConfiguration": "Usa la configurazione del progetto",
-  "writersidePdfConfigurationFile": "File di configurazione PDF",
   "writersidePdfPage": "Pagina",
-  "writersidePdfKeymap": "Mappa dei tasti",
-  "writersidePdfNoKeymap": "Nessuna mappa dei tasti",
-  "writersidePdfTocTitle": "Titolo dell’indice",
-  "writersidePdfCover": "Pagina di copertina",
-  "writersidePdfIncludeCover": "Includi pagina di copertina",
-  "writersidePdfCoverTitle": "Titolo di copertina",
-  "writersidePdfCoverDescription": "Descrizione di copertina",
-  "writersidePdfCopyright": "Diritto d’autore",
-  "writersidePdfCoverLogo": "Logo di copertina",
-  "writersidePdfChooseCoverLogo": "Scegli logo di copertina",
-  "writersidePdfHeaderAndFooter": "Intestazione e piè di pagina",
-  "writersidePdfHeader": "Intestazione",
-  "writersidePdfFooter": "Piè di pagina",
-  "writersidePdfAdvancedDescription": "Questi valori associano il modulo aperto alla struttura delle sorgenti del generatore.",
-  "writersidePdfModuleName": "Nome del modulo",
-  "writersidePdfSourceRoot": "Radice delle sorgenti",
-  "writersidePdfChooseSourceRoot": "Scegli radice delle sorgenti",
-  "writersidePdfBuilderVersion": "Versione del generatore",
-  "writersidePdfAllowNetwork": "Consenti rete durante la generazione",
-  "writersidePdfAllowNetworkDescription": "Disattivato per impostazione predefinita. Attivalo solo se il progetto richiede intenzionalmente risorse remote.",
-  "writersidePdfModuleNameRequired": "Inserisci il nome del modulo.",
-  "writersidePdfSourceRootRequired": "Scegli la radice delle sorgenti.",
-  "writersidePdfBuilderVersionInvalid": "Inserisci una versione valida del generatore.",
-  "writersidePdfBuilderRequired": "Generatore Writerside necessario",
-  "writersidePdfBuilderDownloadDescription": "BusyMark usa l’immagine contenitore ufficiale {image}. Scaricarla ora? L’immagine è grande e viene archiviata da Docker.",
-  "writersidePdfDownloadingBuilder": "Download del generatore Writerside…",
   "exportingWritersidePdf": "Esportazione del PDF Writerside…",
-  "writersidePdfDockerUnavailable": "Docker è necessario per esportare Writerside in PDF. Installa e avvia Docker, quindi riprova.",
-  "writersidePdfBuilderUnavailable": "L’immagine richiesta del generatore Writerside non è disponibile.",
-  "writersidePdfConfigurationInvalid": "La configurazione PDF di Writerside non è valida.",
-  "writersidePdfBuildFailed": "Il generatore Writerside non ha potuto creare il PDF.",
-  "writersidePdfInvalidOutput": "Il generatore Writerside non ha prodotto un PDF valido.",
   "ai": "IA",
   "aiLocalOllama": "Ollama locale",
   "aiDisabled": "Disabilitato",
   "aiLocalOnlyDescription": "La modifica con IA viene avviata solo esplicitamente. BusyMark invia esclusivamente il contesto mostrato al fornitore selezionato e non applica mai una proposta senza revisione.",
   "aiProvider": "Provider IA",
+  "aiDefaultProvider": "Provider predefinito",
+  "aiConfigureProvider": "Configura provider",
+  "aiChooseProvider": "Scegli provider IA",
   "aiOllamaEndpoint": "Endpoint Ollama",
   "aiOllamaModel": "Modello Ollama",
   "aiTestConnection": "Verifica connessione",
   "aiTestingConnection": "Verifica in corso…",
   "aiConnectionReady": "Connesso. Trovati {count} modelli installati.",
-  "aiNoModels": "Ollama è in esecuzione, ma non sono stati trovati modelli installati.",
+  "aiNoModels": "Nessun modello selezionato.",
   "aiConnectionFailed": "BusyMark non è riuscito a verificare la generazione di testo con IA.",
   "aiConfigureFirst": "Abilita un fornitore di IA e verifica un modello in Impostazioni → IA.",
   "aiEditWithAi": "Modifica con l’IA",
@@ -2628,9 +2619,6 @@
   "aiReviewExactContent": "Esamina contenuto esatto",
   "aiContentToChange": "Contenuto da modificare",
   "aiContentSentToAi": "Contenuto inviato all’IA",
-  "aiPrivacyDisabled": "L’IA è disabilitata. BusyMark non invia mai il contenuto del documento senza un’azione IA esplicita.",
-  "aiPrivacyLocal": "BusyMark invia solo il contesto mostrato nella finestra di revisione al servizio Ollama locale configurato. Le proposte non vengono mai applicate senza revisione.",
-  "aiPrivacyCloud": "BusyMark invia solo il contesto mostrato nella finestra di revisione a {provider}. Le richieste sono senza stato e le proposte non vengono mai applicate senza revisione.",
   "aiApiKey": "Chiave API",
   "aiApiKeyStoredHint": "Una chiave è salvata nell’archivio credenziali di sistema",
   "aiApiKeyEnterHint": "Inserisci una chiave API del fornitore",
@@ -2643,6 +2631,7 @@
   "aiAutomaticRouting": "Automatica in base all’attività",
   "aiFixedModelRouting": "Usa il modello selezionato",
   "aiPreferredModel": "Modello preferito",
+  "aiModel": "Modello",
   "aiUsageThisMonth": "{requests} richieste · {input} token di input · {output} token di output",
   "aiCloudConsentTitle": "Inviare contenuti a {provider}?",
   "aiCloudConsentEnable": "Abilita {provider}",
@@ -2663,5 +2652,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Il titolo di livello {level} segue il livello {previousLevel}; verifica la struttura delle sezioni.",
   "diagnosticMarkdownLinkEmptyText": "Il testo del collegamento è vuoto; fornisci un nome accessibile che ne descriva lo scopo.",
   "diagnosticMarkdownLinkReviewText": "Verifica se il testo del collegamento “{text}” ne descrive lo scopo nel contesto.",
-  "diagnosticMarkdownTableEmptyHeader": "Le intestazioni della tabella devono identificare le colonne; completa ogni intestazione vuota."
+  "diagnosticMarkdownTableEmptyHeader": "Le intestazioni della tabella devono identificare le colonne; completa ogni intestazione vuota.",
+  "commandPalette": "Tavolozza dei comandi",
+  "commandPaletteHint": "Digita un comando",
+  "commandPaletteEmpty": "Nessun comando corrispondente",
+  "tableAlignmentUnspecified": "Allineamento: non specificato",
+  "tableAlignmentLeft": "Allineamento: sinistra",
+  "tableAlignmentCenter": "Allineamento: centro",
+  "tableAlignmentRight": "Allineamento: destra",
+  "sourceSearchReplacement": "Sostituisci con",
+  "sourceSearchReplaceCurrent": "Sostituisci corrente",
+  "sourceSearchReplaceAndFindNext": "Sostituisci e trova successivo",
+  "sourceSearchReplaceAll": "Sostituisci tutto",
+  "workspaceReplace": "Sostituisci nell’area di lavoro",
+  "reviewReplacements": "Rivedi sostituzioni",
+  "applyReplacements": "Applica sostituzioni",
+  "skippedFiles": "File ignorati",
+  "workspaceReplaceDirtyBuffer": "Contenuto dell’editor non salvato",
+  "workspaceReplaceDiskContent": "Contenuto salvato su disco",
+  "selectFileMatches": "Seleziona tutte le {count} corrispondenze",
+  "workspaceReplaceApplied": "Sostituite {matches} corrispondenze in {files} file; {skipped} ignorate.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · A capo finale",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Nessun a capo finale",
+  "normalizeLineEndings": "Normalizza terminatori di riga",
+  "workspaceReplaceMixedLineEndings": "{fileName} usa terminatori di riga misti. Scegli il formato prima di sostituire.",
+  "mixedLineEndingsSavePrompt": "Questo documento contiene terminatori di riga misti. Scegli un formato.",
+  "workspaceReplaceIssueOversized": "È stato ignorato un file troppo grande.",
+  "workspaceReplaceIssueUnreadable": "È stato ignorato un file illeggibile.",
+  "workspaceReplaceIssueInvalidUtf8": "È stato ignorato un file che non è UTF-8 valido.",
+  "workspaceReplaceIssueTruncated": "L’anteprima delle sostituzioni è stata troncata.",
+  "workspaceReplaceIssueFileChanged": "È stato ignorato un file modificato dopo l’anteprima.",
+  "workspaceReplaceIssueBufferChanged": "È stato ignorato un buffer modificato dopo l’anteprima.",
+  "workspaceReplaceIssueNormalizationRequired": "Scegli la normalizzazione LF o CRLF prima di sostituire.",
+  "externalChangesTitle": "Modifiche esterne — {fileName}",
+  "externalFileDeleted": "Questo file è stato eliminato dal disco.",
+  "externalFileChanged": "Questo file è cambiato sul disco mentre sono presenti modifiche non salvate.",
+  "compare": "Confronta",
+  "reloadFromDisk": "Ricarica dal disco",
+  "keepMine": "Mantieni la mia versione",
+  "saveAs": "Salva con nome",
+  "unsavedChangesMultipleMessage": "{count} documenti contengono modifiche non salvate. Salvarli prima di continuare?",
+  "workspaceReplaceIssuePartialConflict": "Il rollback è stato interrotto perché il file è stato modificato contemporaneamente. Alcune sostituzioni potrebbero rimanere; il contenuto spostato è stato conservato nel percorso seguente.",
+  "workspaceReplaceIssueApplyFailed": "Non è stata applicata alcuna sostituzione perché non è stato possibile salvare in sicurezza l’insieme verificato.",
+  "workspaceRecoveryRestored": "Sono stati recuperati {count} documenti non salvati. Controllare ogni documento recuperato prima di continuare.",
+  "workspaceRecoveryDamaged": "Non è stato possibile ripristinare {count} record di recupero danneggiati. I documenti recuperati validi restano disponibili.",
+  "recoveredDocumentReview": "È stato recuperato il contenuto non salvato di {fileName}. Controllarlo, quindi salvarlo, salvarlo con nome o eliminarlo.",
+  "commandUnavailableInContext": "Questo comando non è disponibile nel contesto corrente.",
+  "mathRenderFailed": "Impossibile visualizzare l’espressione matematica.",
+  "inlineMath": "Formula in linea",
+  "displayMath": "Formula in blocco"
 }
diff --git a/lib/l10n/app_nb.arb b/lib/l10n/app_nb.arb
index 3cd9cc49..a8d23e92 100644
--- a/lib/l10n/app_nb.arb
+++ b/lib/l10n/app_nb.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Åpne forrige arbeidsområde ved oppstart",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Åpne arbeidsområdet og fanene fra forrige økt når BusyMark starter.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Bekreft lukking ved ulagrede endringer",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Bilde",
+  "video": "Video",
+  "openVideo": "Spill av video",
+  "pauseVideo": "Sett video på pause",
+  "videoUnavailable": "Videoen er utilgjengelig",
+  "videoPreview": "Videoforhåndsvisning",
+  "diagnosticWritersideVideoMissingSource": "Videoen mangler src-attributtet.",
+  "diagnosticWritersideVideoUnsupportedSource": "Videokilden støttes ikke: {source}",
+  "diagnosticWritersideVideoMissingFile": "Videofilen finnes ikke: {source}",
+  "diagnosticWritersideVideoMissingPreview": "Forhåndsvisningsbildet finnes ikke: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1320,6 +1333,8 @@
   "sourceLargeFileFeaturesPaused": "Stor fil: utheving og folding er satt på pause",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Ingenting å lese",
+  "admonition": "Merknadsblokk",
+  "quote": "Sitat",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1361,7 +1376,7 @@
   },
   "couldNotOpenTarget": "Kunne ikke åpne {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1370,7 +1385,7 @@
   },
   "linkTargetNotFound": "Fant ikke lenkemål: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1379,11 +1394,11 @@
   },
   "cannotOpenFileTypeInEditor": "Kan ikke åpne denne filtypen i redigereren",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Fant ikke anker: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2214,6 +2229,7 @@
   "gitFileHistory": "Gjeldende fil",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Filhandlinger",
+  "actions": "Handlinger",
   "gitStatusAdded": "Lagt til",
   "gitStatusDeleted": "Slettet",
   "gitStatusRenamed": "Gitt nytt navn",
@@ -2233,7 +2249,15 @@
   "gitErrorMultipleRemotes": "Flere remoter er konfigurert. Velg en upstream utenfor denne versjonen av BusyMark.",
   "gitErrorDirtyWorkspace": "Lagre eller forkast endringene i BusyMark-redigereren før du bytter gren.",
   "gitErrorDiverged": "Grenen har divergert. Løs merge eller rebase utenfor denne versjonen av BusyMark.",
-  "gitErrorAuthentication": "Git-autentisering mislyktes. I snap-pakken kan SSH-remoter kreve at grensesnittet ssh-keys kobles til.",
+  "gitErrorAuthorIdentity": "Git trenger forfatternavn og e-postadresse før endringer kan lagres.",
+  "gitAuthorIdentityTitle": "Git-forfatteridentitet",
+  "gitAuthorIdentityMessage": "Skriv inn identiteten Git skal registrere på endringer. BusyMark lagrer den og prøver denne endringen på nytt.",
+  "gitAuthorName": "Navn",
+  "gitAuthorEmail": "E-post",
+  "gitAuthorIdentityGlobal": "Bruk for alle kodelagre",
+  "gitAuthorIdentityGlobalDescription": "Når appen er installert som en Snap, gjelder dette kodelagre som åpnes i BusyMark.",
+  "gitSaveIdentityAndCommit": "Lagre og utfør commit",
+  "gitErrorAuthentication": "Git-autentisering mislyktes.",
   "gitErrorNetwork": "Git-nettverksoperasjonen mislyktes.",
   "gitErrorConflict": "Git rapporterte uløste konflikter.",
   "gitErrorCommandFailed": "Git-kommandoen mislyktes.",
@@ -2547,56 +2571,23 @@
   "diagnosticWritersideReferenceTopicMissing": "Emnet «{topic}» finnes ikke i den refererte instansen «{instance}».",
   "download": "Last ned",
   "exportWritersideAsPdf": "Eksporter Writerside som PDF",
-  "writersidePdfExportDescription": "Velg en instans og PDF-innstillinger. BusyMark bruker JetBrains’ offisielle Writerside-byggeverktøy.",
   "writersidePdfContent": "Eksportinnhold",
-  "writersidePdfSettings": "PDF-innstillinger",
-  "writersidePdfConfigureHere": "Konfigurer for denne eksporten",
-  "writersidePdfProjectConfiguration": "Bruk prosjektkonfigurasjon",
-  "writersidePdfConfigurationFile": "PDF-konfigurasjonsfil",
   "writersidePdfPage": "Side",
-  "writersidePdfKeymap": "Tastaturoppsett",
-  "writersidePdfNoKeymap": "Uten tastaturoppsett",
-  "writersidePdfTocTitle": "Tittel på innholdsfortegnelsen",
-  "writersidePdfCover": "Forside",
-  "writersidePdfIncludeCover": "Ta med forside",
-  "writersidePdfCoverTitle": "Forsidetittel",
-  "writersidePdfCoverDescription": "Forsidebeskrivelse",
-  "writersidePdfCopyright": "Opphavsrett",
-  "writersidePdfCoverLogo": "Forsidelogo",
-  "writersidePdfChooseCoverLogo": "Velg forsidelogo",
-  "writersidePdfHeaderAndFooter": "Topptekst og bunntekst",
-  "writersidePdfHeader": "Topptekst",
-  "writersidePdfFooter": "Bunntekst",
-  "writersidePdfAdvancedDescription": "Disse verdiene kobler den åpne modulen til byggeverktøyets kildestruktur.",
-  "writersidePdfModuleName": "Modulnavn",
-  "writersidePdfSourceRoot": "Kilderot",
-  "writersidePdfChooseSourceRoot": "Velg kilderot",
-  "writersidePdfBuilderVersion": "Byggeverktøyversjon",
-  "writersidePdfAllowNetwork": "Tillat nettverk under bygging",
-  "writersidePdfAllowNetworkDescription": "Deaktivert som standard. Aktiver bare når prosjektet bevisst trenger eksterne byggeressurser.",
-  "writersidePdfModuleNameRequired": "Skriv inn modulnavnet.",
-  "writersidePdfSourceRootRequired": "Velg kilderoten.",
-  "writersidePdfBuilderVersionInvalid": "Skriv inn en gyldig byggeverktøyversjon.",
-  "writersidePdfBuilderRequired": "Writerside-byggeverktøy kreves",
-  "writersidePdfBuilderDownloadDescription": "BusyMark bruker det offisielle containerbildet {image}. Vil du laste det ned nå? Bildet er stort og lagres av Docker.",
-  "writersidePdfDownloadingBuilder": "Laster ned Writerside-byggeverktøy…",
   "exportingWritersidePdf": "Eksporterer Writerside-PDF…",
-  "writersidePdfDockerUnavailable": "Docker kreves for Writerside PDF-eksport. Installer og start Docker, og prøv igjen.",
-  "writersidePdfBuilderUnavailable": "Det forespurte Writerside-byggebildet er ikke tilgjengelig.",
-  "writersidePdfConfigurationInvalid": "Writerside PDF-konfigurasjonen er ugyldig.",
-  "writersidePdfBuildFailed": "Writerside-byggeverktøyet kunne ikke opprette PDF-filen.",
-  "writersidePdfInvalidOutput": "Writerside-byggeverktøyet produserte ikke en gyldig PDF-fil.",
   "ai": "KI",
   "aiLocalOllama": "Lokal Ollama",
   "aiDisabled": "Deaktivert",
   "aiLocalOnlyDescription": "KI-redigering startes bare eksplisitt. BusyMark sender kun den viste konteksten til den valgte leverandøren og bruker aldri et forslag uten gjennomgang.",
   "aiProvider": "KI-leverandør",
+  "aiDefaultProvider": "Standardleverandør",
+  "aiConfigureProvider": "Konfigurer leverandør",
+  "aiChooseProvider": "Velg KI-leverandør",
   "aiOllamaEndpoint": "Ollama-endepunkt",
   "aiOllamaModel": "Ollama-modell",
   "aiTestConnection": "Test tilkobling",
   "aiTestingConnection": "Tester…",
   "aiConnectionReady": "Tilkoblet. Fant {count} installert(e) modell(er).",
-  "aiNoModels": "Ollama kjører, men ingen installerte modeller ble funnet.",
+  "aiNoModels": "Ingen modell er valgt.",
   "aiConnectionFailed": "BusyMark kunne ikke bekrefte KI-tekstgenerering.",
   "aiConfigureFirst": "Aktiver en KI-leverandør og bekreft en modell under Innstillinger → KI.",
   "aiEditWithAi": "Rediger med KI",
@@ -2628,9 +2619,6 @@
   "aiReviewExactContent": "Se gjennom nøyaktig innhold",
   "aiContentToChange": "Innhold som skal endres",
   "aiContentSentToAi": "Innhold sendt til KI",
-  "aiPrivacyDisabled": "KI er deaktivert. BusyMark sender aldri dokumentinnhold uten en eksplisitt KI-handling.",
-  "aiPrivacyLocal": "BusyMark sender bare konteksten som vises i gjennomgangsdialogen, til den konfigurerte lokale Ollama-tjenesten. Forslag brukes aldri uten gjennomgang.",
-  "aiPrivacyCloud": "BusyMark sender bare konteksten som vises i gjennomgangsdialogen, til {provider}. Forespørsler er tilstandsløse, og forslag brukes aldri uten gjennomgang.",
   "aiApiKey": "API-nøkkel",
   "aiApiKeyStoredHint": "En nøkkel er lagret i systemets legitimasjonslager",
   "aiApiKeyEnterHint": "Skriv inn en API-nøkkel for leverandøren",
@@ -2643,6 +2631,7 @@
   "aiAutomaticRouting": "Automatisk etter oppgave",
   "aiFixedModelRouting": "Bruk valgt modell",
   "aiPreferredModel": "Foretrukket modell",
+  "aiModel": "Modell",
   "aiUsageThisMonth": "{requests} forespørsler · {input} inndata-tokener · {output} utdata-tokener",
   "aiCloudConsentTitle": "Sende innhold til {provider}?",
   "aiCloudConsentEnable": "Aktiver {provider}",
@@ -2663,5 +2652,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Overskrift på nivå {level} følger nivå {previousLevel}; kontroller seksjonsnestingen.",
   "diagnosticMarkdownLinkEmptyText": "Lenketeksten er tom. Oppgi et tilgjengelig navn som beskriver formålet.",
   "diagnosticMarkdownLinkReviewText": "Kontroller om lenketeksten «{text}» beskriver formålet i konteksten.",
-  "diagnosticMarkdownTableEmptyHeader": "Tabelloverskrifter må identifisere kolonnene. Fyll ut alle tomme overskrifter."
+  "diagnosticMarkdownTableEmptyHeader": "Tabelloverskrifter må identifisere kolonnene. Fyll ut alle tomme overskrifter.",
+  "commandPalette": "Kommandopalett",
+  "commandPaletteHint": "Skriv inn en kommando",
+  "commandPaletteEmpty": "Ingen samsvarende kommandoer",
+  "tableAlignmentUnspecified": "Justering: ikke angitt",
+  "tableAlignmentLeft": "Justering: venstre",
+  "tableAlignmentCenter": "Justering: midtstilt",
+  "tableAlignmentRight": "Justering: høyre",
+  "sourceSearchReplacement": "Erstatt med",
+  "sourceSearchReplaceCurrent": "Erstatt gjeldende treff",
+  "sourceSearchReplaceAndFindNext": "Erstatt og finn neste",
+  "sourceSearchReplaceAll": "Erstatt alle",
+  "workspaceReplace": "Erstatt i arbeidsområdet",
+  "reviewReplacements": "Se gjennom erstatninger",
+  "applyReplacements": "Bruk erstatninger",
+  "skippedFiles": "Filer som ble hoppet over",
+  "workspaceReplaceDirtyBuffer": "Ulagret redigeringsinnhold",
+  "workspaceReplaceDiskContent": "Innhold lagret på disk",
+  "selectFileMatches": "Velg alle {count} treff",
+  "workspaceReplaceApplied": "Erstattet {matches} treff i {files} filer; hoppet over {skipped}.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Avsluttende linjeskift",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Ingen avsluttende linjeskift",
+  "normalizeLineEndings": "Normaliser linjeslutt",
+  "workspaceReplaceMixedLineEndings": "{fileName} bruker blandede linjeslutt. Velg format før du erstatter.",
+  "mixedLineEndingsSavePrompt": "Dette dokumentet inneholder blandede linjeslutt. Velg et format.",
+  "workspaceReplaceIssueOversized": "En for stor fil ble hoppet over.",
+  "workspaceReplaceIssueUnreadable": "En fil som ikke kunne leses, ble hoppet over.",
+  "workspaceReplaceIssueInvalidUtf8": "En fil som ikke er gyldig UTF-8, ble hoppet over.",
+  "workspaceReplaceIssueTruncated": "Erstatningsforhåndsvisningen ble avkortet.",
+  "workspaceReplaceIssueFileChanged": "En fil som ble endret etter forhåndsvisningen, ble hoppet over.",
+  "workspaceReplaceIssueBufferChanged": "En redigeringsbuffer som ble endret etter forhåndsvisningen, ble hoppet over.",
+  "workspaceReplaceIssueNormalizationRequired": "Velg LF- eller CRLF-normalisering før du erstatter.",
+  "externalChangesTitle": "Eksterne endringer — {fileName}",
+  "externalFileDeleted": "Denne filen ble slettet fra disken.",
+  "externalFileChanged": "Denne filen ble endret på disken mens du har ulagrede endringer.",
+  "compare": "Sammenlign",
+  "reloadFromDisk": "Last inn fra disk på nytt",
+  "keepMine": "Behold min versjon",
+  "saveAs": "Lagre som",
+  "unsavedChangesMultipleMessage": "{count} dokumenter har ulagrede endringer. Lagre dem før du fortsetter?",
+  "workspaceReplaceIssuePartialConflict": "Tilbakerullingen ble stoppet fordi filen ble endret samtidig. Noen erstatninger kan fortsatt være utført; forskjøvet innhold ble bevart på banen nedenfor.",
+  "workspaceReplaceIssueApplyFailed": "Ingen erstatninger ble utført fordi det gjennomgåtte settet ikke kunne lagres på en trygg måte.",
+  "workspaceRecoveryRestored": "{count} ulagrede dokumenter ble gjenopprettet. Se gjennom hvert gjenopprettet dokument før du fortsetter.",
+  "workspaceRecoveryDamaged": "{count} skadede gjenopprettingsoppføringer kunne ikke gjenopprettes. Gyldige gjenopprettede dokumenter er fortsatt tilgjengelige.",
+  "recoveredDocumentReview": "Ulagret innhold for {fileName} ble gjenopprettet. Se gjennom det, og lagre, lagre som eller forkast det.",
+  "commandUnavailableInContext": "Denne kommandoen er ikke tilgjengelig i gjeldende kontekst.",
+  "mathRenderFailed": "Det matematiske uttrykket kunne ikke gjengis.",
+  "inlineMath": "Integrert matematikk",
+  "displayMath": "Matematikkblokk"
 }
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 353876d2..6749ff1a 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Otwieraj poprzedni obszar roboczy przy uruchamianiu",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Otwórz obszar roboczy i karty z poprzedniej sesji podczas uruchamiania BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Potwierdzaj zamknięcie przy niezapisanych zmianach",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Obraz",
+  "video": "Wideo",
+  "openVideo": "Odtwórz wideo",
+  "pauseVideo": "Wstrzymaj wideo",
+  "videoUnavailable": "Wideo jest niedostępne",
+  "videoPreview": "Podgląd wideo",
+  "diagnosticWritersideVideoMissingSource": "Wideo nie ma atrybutu src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Nieobsługiwane źródło wideo: {source}",
+  "diagnosticWritersideVideoMissingFile": "Plik wideo nie istnieje: {source}",
+  "diagnosticWritersideVideoMissingPreview": "Obraz podglądu wideo nie istnieje: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1326,6 +1339,8 @@
   "sourceLargeFileFeaturesPaused": "Duży plik: podświetlanie i zwijanie są wstrzymane",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Brak treści do przeczytania",
+  "admonition": "Adnotacja",
+  "quote": "Cytat",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1367,7 +1382,7 @@
   },
   "couldNotOpenTarget": "Nie można otworzyć: {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1376,7 +1391,7 @@
   },
   "linkTargetNotFound": "Nie znaleziono celu łącza: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1385,11 +1400,11 @@
   },
   "cannotOpenFileTypeInEditor": "Nie można otworzyć tego typu pliku w edytorze",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Nie znaleziono kotwicy: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2232,6 +2247,7 @@
   "gitFileHistory": "Bieżący plik",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Działania na pliku",
+  "actions": "Działania",
   "gitStatusAdded": "Dodany",
   "gitStatusDeleted": "Usunięty",
   "gitStatusRenamed": "Nazwa zmieniona",
@@ -2251,7 +2267,15 @@
   "gitErrorMultipleRemotes": "Skonfigurowano wiele repozytoriów zdalnych. Wybierz gałąź upstream poza tą wersją BusyMark.",
   "gitErrorDirtyWorkspace": "Przed przełączeniem gałęzi zapisz lub odrzuć zmiany w edytorze BusyMark.",
   "gitErrorDiverged": "Gałęzie się rozeszły. Rozwiąż scalanie lub wykonaj rebase poza tą wersją BusyMark.",
-  "gitErrorAuthentication": "Uwierzytelnianie Git nie powiodło się. W pakiecie snap repozytoria SSH mogą wymagać podłączenia interfejsu ssh-keys.",
+  "gitErrorAuthorIdentity": "Git wymaga nazwy autora i adresu e-mail przed utworzeniem commita.",
+  "gitAuthorIdentityTitle": "Tożsamość autora Git",
+  "gitAuthorIdentityMessage": "Wprowadź tożsamość, którą Git ma zapisywać w commitach. BusyMark ją zapisze i ponowi ten commit.",
+  "gitAuthorName": "Nazwa",
+  "gitAuthorEmail": "E-mail",
+  "gitAuthorIdentityGlobal": "Używaj we wszystkich repozytoriach",
+  "gitAuthorIdentityGlobalDescription": "W instalacji Snap dotyczy to repozytoriów otwieranych w BusyMark.",
+  "gitSaveIdentityAndCommit": "Zapisz i utwórz commit",
+  "gitErrorAuthentication": "Uwierzytelnianie Git nie powiodło się.",
   "gitErrorNetwork": "Operacja sieciowa Git nie powiodła się.",
   "gitErrorConflict": "Git zgłosił nierozwiązane konflikty.",
   "gitErrorCommandFailed": "Polecenie Git nie powiodło się.",
@@ -2565,56 +2589,23 @@
   "diagnosticWritersideReferenceTopicMissing": "Temat „{topic}” nie znajduje się we wskazanej instancji „{instance}”.",
   "download": "Pobierz",
   "exportWritersideAsPdf": "Eksportuj Writerside jako PDF",
-  "writersidePdfExportDescription": "Wybierz instancję i ustawienia PDF. BusyMark używa oficjalnego programu budującego Writerside firmy JetBrains.",
   "writersidePdfContent": "Zawartość eksportu",
-  "writersidePdfSettings": "Ustawienia PDF",
-  "writersidePdfConfigureHere": "Skonfiguruj dla tego eksportu",
-  "writersidePdfProjectConfiguration": "Użyj konfiguracji projektu",
-  "writersidePdfConfigurationFile": "Plik konfiguracji PDF",
   "writersidePdfPage": "Strona",
-  "writersidePdfKeymap": "Mapa klawiszy",
-  "writersidePdfNoKeymap": "Bez mapy klawiszy",
-  "writersidePdfTocTitle": "Tytuł spisu treści",
-  "writersidePdfCover": "Strona tytułowa",
-  "writersidePdfIncludeCover": "Dołącz stronę tytułową",
-  "writersidePdfCoverTitle": "Tytuł na okładce",
-  "writersidePdfCoverDescription": "Opis na okładce",
-  "writersidePdfCopyright": "Prawa autorskie",
-  "writersidePdfCoverLogo": "Logo na okładce",
-  "writersidePdfChooseCoverLogo": "Wybierz logo na okładkę",
-  "writersidePdfHeaderAndFooter": "Nagłówek i stopka",
-  "writersidePdfHeader": "Nagłówek",
-  "writersidePdfFooter": "Stopka",
-  "writersidePdfAdvancedDescription": "Te wartości odwzorowują otwarty moduł na układ źródeł programu budującego.",
-  "writersidePdfModuleName": "Nazwa modułu",
-  "writersidePdfSourceRoot": "Katalog główny źródeł",
-  "writersidePdfChooseSourceRoot": "Wybierz katalog główny źródeł",
-  "writersidePdfBuilderVersion": "Wersja programu budującego",
-  "writersidePdfAllowNetwork": "Zezwól na sieć podczas budowania",
-  "writersidePdfAllowNetworkDescription": "Domyślnie wyłączone. Włącz tylko wtedy, gdy projekt świadomie wymaga zdalnych zasobów do budowania.",
-  "writersidePdfModuleNameRequired": "Wprowadź nazwę modułu.",
-  "writersidePdfSourceRootRequired": "Wybierz katalog główny źródeł.",
-  "writersidePdfBuilderVersionInvalid": "Wprowadź prawidłową wersję programu budującego.",
-  "writersidePdfBuilderRequired": "Wymagany program budujący Writerside",
-  "writersidePdfBuilderDownloadDescription": "BusyMark używa oficjalnego obrazu kontenera {image}. Pobrać go teraz? Obraz jest duży i zostanie zapisany przez Docker.",
-  "writersidePdfDownloadingBuilder": "Pobieranie programu budującego Writerside…",
   "exportingWritersidePdf": "Eksportowanie PDF Writerside…",
-  "writersidePdfDockerUnavailable": "Docker jest wymagany do eksportu Writerside do PDF. Zainstaluj i uruchom Docker, a następnie spróbuj ponownie.",
-  "writersidePdfBuilderUnavailable": "Żądany obraz programu budującego Writerside jest niedostępny.",
-  "writersidePdfConfigurationInvalid": "Konfiguracja PDF Writerside jest nieprawidłowa.",
-  "writersidePdfBuildFailed": "Program budujący Writerside nie mógł utworzyć pliku PDF.",
-  "writersidePdfInvalidOutput": "Program budujący Writerside nie utworzył prawidłowego pliku PDF.",
   "ai": "SI",
   "aiLocalOllama": "Lokalny Ollama",
   "aiDisabled": "Wyłączone",
   "aiLocalOnlyDescription": "Edycja z użyciem SI jest uruchamiana wyłącznie jawnie. BusyMark wysyła do wybranego dostawcy tylko pokazany kontekst i nigdy nie stosuje propozycji bez jej sprawdzenia.",
   "aiProvider": "Dostawca SI",
+  "aiDefaultProvider": "Domyślny dostawca",
+  "aiConfigureProvider": "Skonfiguruj dostawcę",
+  "aiChooseProvider": "Wybierz dostawcę SI",
   "aiOllamaEndpoint": "Punkt końcowy Ollama",
   "aiOllamaModel": "Model Ollama",
   "aiTestConnection": "Testuj połączenie",
   "aiTestingConnection": "Testowanie…",
   "aiConnectionReady": "Połączono. Znaleziono zainstalowane modele: {count}.",
-  "aiNoModels": "Ollama działa, ale nie znaleziono zainstalowanych modeli.",
+  "aiNoModels": "Nie wybrano modelu.",
   "aiConnectionFailed": "BusyMark nie mógł zweryfikować generowania tekstu przez SI.",
   "aiConfigureFirst": "Najpierw włącz dostawcę SI i zweryfikuj model w Ustawienia → SI.",
   "aiEditWithAi": "Edytuj za pomocą SI",
@@ -2646,9 +2637,6 @@
   "aiReviewExactContent": "Przejrzyj dokładną treść",
   "aiContentToChange": "Treść do zmiany",
   "aiContentSentToAi": "Treść wysyłana do SI",
-  "aiPrivacyDisabled": "SI jest wyłączona. BusyMark nigdy nie wysyła treści dokumentu bez jawnego działania SI.",
-  "aiPrivacyLocal": "BusyMark wysyła tylko kontekst pokazany w oknie przeglądu do skonfigurowanej lokalnej usługi Ollama. Propozycje nigdy nie są stosowane bez sprawdzenia.",
-  "aiPrivacyCloud": "BusyMark wysyła tylko kontekst pokazany w oknie przeglądu do {provider}. Żądania są bezstanowe, a propozycje nigdy nie są stosowane bez sprawdzenia.",
   "aiApiKey": "Klucz API",
   "aiApiKeyStoredHint": "Klucz jest zapisany w systemowym magazynie poświadczeń",
   "aiApiKeyEnterHint": "Wprowadź klucz API dostawcy",
@@ -2661,6 +2649,7 @@
   "aiAutomaticRouting": "Automatycznie według zadania",
   "aiFixedModelRouting": "Użyj wybranego modelu",
   "aiPreferredModel": "Preferowany model",
+  "aiModel": "Model",
   "aiUsageThisMonth": "{requests} żądań · {input} tokenów wejściowych · {output} tokenów wyjściowych",
   "aiCloudConsentTitle": "Wysłać treść do {provider}?",
   "aiCloudConsentEnable": "Włącz {provider}",
@@ -2681,5 +2670,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Nagłówek poziomu {level} występuje po poziomie {previousLevel}; sprawdź zagnieżdżenie sekcji.",
   "diagnosticMarkdownLinkEmptyText": "Tekst odnośnika jest pusty; podaj dostępną nazwę opisującą jego cel.",
   "diagnosticMarkdownLinkReviewText": "Sprawdź, czy tekst odnośnika „{text}” opisuje jego cel w kontekście.",
-  "diagnosticMarkdownTableEmptyHeader": "Nagłówki tabeli muszą identyfikować kolumny; uzupełnij każdy pusty nagłówek."
+  "diagnosticMarkdownTableEmptyHeader": "Nagłówki tabeli muszą identyfikować kolumny; uzupełnij każdy pusty nagłówek.",
+  "commandPalette": "Paleta poleceń",
+  "commandPaletteHint": "Wpisz polecenie",
+  "commandPaletteEmpty": "Brak pasujących poleceń",
+  "tableAlignmentUnspecified": "Wyrównanie: nieokreślone",
+  "tableAlignmentLeft": "Wyrównanie: do lewej",
+  "tableAlignmentCenter": "Wyrównanie: do środka",
+  "tableAlignmentRight": "Wyrównanie: do prawej",
+  "sourceSearchReplacement": "Zamień na",
+  "sourceSearchReplaceCurrent": "Zamień bieżące",
+  "sourceSearchReplaceAndFindNext": "Zamień i znajdź następne",
+  "sourceSearchReplaceAll": "Zamień wszystko",
+  "workspaceReplace": "Zamień w obszarze roboczym",
+  "reviewReplacements": "Przejrzyj zamiany",
+  "applyReplacements": "Zastosuj zamiany",
+  "skippedFiles": "Pominięte pliki",
+  "workspaceReplaceDirtyBuffer": "Niezapisana zawartość edytora",
+  "workspaceReplaceDiskContent": "Zawartość zapisana na dysku",
+  "selectFileMatches": "Wybierz wszystkie dopasowania ({count})",
+  "workspaceReplaceApplied": "Zamieniono {matches} dopasowań w {files} plikach; pominięto {skipped}.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Końcowy znak nowego wiersza",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Brak końcowego znaku nowego wiersza",
+  "normalizeLineEndings": "Normalizuj zakończenia wierszy",
+  "workspaceReplaceMixedLineEndings": "{fileName} używa mieszanych zakończeń wierszy. Wybierz format przed zamianą.",
+  "mixedLineEndingsSavePrompt": "Ten dokument zawiera mieszane zakończenia wierszy. Wybierz format.",
+  "workspaceReplaceIssueOversized": "Pominięto zbyt duży plik.",
+  "workspaceReplaceIssueUnreadable": "Pominięto plik, którego nie można odczytać.",
+  "workspaceReplaceIssueInvalidUtf8": "Pominięto plik z nieprawidłowym kodowaniem UTF-8.",
+  "workspaceReplaceIssueTruncated": "Podgląd zamian został skrócony.",
+  "workspaceReplaceIssueFileChanged": "Pominięto plik zmieniony po utworzeniu podglądu.",
+  "workspaceReplaceIssueBufferChanged": "Pominięto bufor edytora zmieniony po utworzeniu podglądu.",
+  "workspaceReplaceIssueNormalizationRequired": "Przed zamianą wybierz normalizację LF lub CRLF.",
+  "externalChangesTitle": "Zmiany zewnętrzne — {fileName}",
+  "externalFileDeleted": "Ten plik został usunięty z dysku.",
+  "externalFileChanged": "Ten plik zmienił się na dysku, gdy masz niezapisane zmiany.",
+  "compare": "Porównaj",
+  "reloadFromDisk": "Wczytaj ponownie z dysku",
+  "keepMine": "Zachowaj moją wersję",
+  "saveAs": "Zapisz jako",
+  "unsavedChangesMultipleMessage": "{count} dokumenty zawierają niezapisane zmiany. Zapisać je przed kontynuowaniem?",
+  "workspaceReplaceIssuePartialConflict": "Wycofywanie zatrzymano, ponieważ plik został jednocześnie zmieniony. Niektóre zamiany mogą pozostać; zastąpioną zawartość zachowano w poniższej ścieżce.",
+  "workspaceReplaceIssueApplyFailed": "Nie zastosowano żadnych zamian, ponieważ sprawdzonego zestawu nie można było bezpiecznie zapisać.",
+  "workspaceRecoveryRestored": "Odzyskano {count} niezapisanych dokumentów. Przejrzyj każdy odzyskany dokument przed kontynuowaniem.",
+  "workspaceRecoveryDamaged": "Nie udało się przywrócić {count} uszkodzonych rekordów odzyskiwania. Prawidłowe odzyskane dokumenty są nadal dostępne.",
+  "recoveredDocumentReview": "Odzyskano niezapisaną treść pliku {fileName}. Przejrzyj ją, a następnie zapisz, zapisz jako lub odrzuć.",
+  "commandUnavailableInContext": "To polecenie nie jest dostępne w bieżącym kontekście.",
+  "mathRenderFailed": "Nie udało się wyrenderować wyrażenia matematycznego.",
+  "inlineMath": "Matematyka w tekście",
+  "displayMath": "Matematyka blokowa"
 }
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 9180362c..b11a5b44 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Reabrir o espaço de trabalho anterior ao iniciar",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Abra o espaço de trabalho e as abas da sessão anterior quando o BusyMark iniciar.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Confirmar antes de fechar com alterações não salvas",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Imagem",
+  "video": "Vídeo",
+  "openVideo": "Reproduzir vídeo",
+  "pauseVideo": "Pausar vídeo",
+  "videoUnavailable": "Vídeo indisponível",
+  "videoPreview": "Pré-visualização do vídeo",
+  "diagnosticWritersideVideoMissingSource": "O vídeo não tem o atributo src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Fonte de vídeo não suportada: {source}",
+  "diagnosticWritersideVideoMissingFile": "O ficheiro de vídeo não existe: {source}",
+  "diagnosticWritersideVideoMissingPreview": "A imagem de pré-visualização do vídeo não existe: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1320,6 +1333,8 @@
   "sourceLargeFileFeaturesPaused": "Arquivo grande: o realce e o recolhimento estão pausados",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Nenhum conteúdo para ler",
+  "admonition": "Aviso",
+  "quote": "Citação",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1361,7 +1376,7 @@
   },
   "couldNotOpenTarget": "Não foi possível abrir {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1370,7 +1385,7 @@
   },
   "linkTargetNotFound": "Destino do link não encontrado: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1379,11 +1394,11 @@
   },
   "cannotOpenFileTypeInEditor": "Não é possível abrir este tipo de arquivo no editor",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Âncora não encontrada: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2214,6 +2229,7 @@
   "gitFileHistory": "Arquivo atual",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Ações do arquivo",
+  "actions": "Ações",
   "gitStatusAdded": "Adicionado",
   "gitStatusDeleted": "Excluído",
   "gitStatusRenamed": "Renomeado",
@@ -2233,7 +2249,15 @@
   "gitErrorMultipleRemotes": "Há vários remotos configurados. Escolha um upstream fora desta versão do BusyMark.",
   "gitErrorDirtyWorkspace": "Salve ou descarte as alterações do editor do BusyMark antes de trocar de branch.",
   "gitErrorDiverged": "A branch divergiu. Resolva o merge ou o rebase fora desta versão do BusyMark.",
-  "gitErrorAuthentication": "A autenticação do Git falhou. No snap, os remotos SSH podem exigir a conexão da interface ssh-keys.",
+  "gitErrorAuthorIdentity": "O Git precisa do nome e do e-mail do autor antes de criar um commit.",
+  "gitAuthorIdentityTitle": "Identidade do autor do Git",
+  "gitAuthorIdentityMessage": "Informe a identidade que o Git deve registrar nos commits. O BusyMark irá salvá-la e tentar este commit novamente.",
+  "gitAuthorName": "Nome",
+  "gitAuthorEmail": "E-mail",
+  "gitAuthorIdentityGlobal": "Usar em todos os repositórios",
+  "gitAuthorIdentityGlobalDescription": "Quando instalado como Snap, isto se aplica aos repositórios abertos no BusyMark.",
+  "gitSaveIdentityAndCommit": "Salvar e criar commit",
+  "gitErrorAuthentication": "A autenticação do Git falhou.",
   "gitErrorNetwork": "A operação de rede do Git falhou.",
   "gitErrorConflict": "O Git relatou conflitos não resolvidos.",
   "gitErrorCommandFailed": "O comando Git falhou.",
@@ -2547,56 +2571,23 @@
   "diagnosticWritersideReferenceTopicMissing": "O tópico “{topic}” não está na instância referenciada “{instance}”.",
   "download": "Baixar",
   "exportWritersideAsPdf": "Exportar Writerside como PDF",
-  "writersidePdfExportDescription": "Escolha uma instância e as configurações de PDF. O BusyMark usa o compilador oficial do Writerside da JetBrains.",
   "writersidePdfContent": "Conteúdo da exportação",
-  "writersidePdfSettings": "Configurações do PDF",
-  "writersidePdfConfigureHere": "Configurar para esta exportação",
-  "writersidePdfProjectConfiguration": "Usar configuração do projeto",
-  "writersidePdfConfigurationFile": "Arquivo de configuração do PDF",
   "writersidePdfPage": "Página",
-  "writersidePdfKeymap": "Mapa de teclas",
-  "writersidePdfNoKeymap": "Sem mapa de teclas",
-  "writersidePdfTocTitle": "Título do sumário",
-  "writersidePdfCover": "Página de capa",
-  "writersidePdfIncludeCover": "Incluir página de capa",
-  "writersidePdfCoverTitle": "Título da capa",
-  "writersidePdfCoverDescription": "Descrição da capa",
-  "writersidePdfCopyright": "Direitos autorais",
-  "writersidePdfCoverLogo": "Logotipo da capa",
-  "writersidePdfChooseCoverLogo": "Escolher logotipo da capa",
-  "writersidePdfHeaderAndFooter": "Cabeçalho e rodapé",
-  "writersidePdfHeader": "Cabeçalho",
-  "writersidePdfFooter": "Rodapé",
-  "writersidePdfAdvancedDescription": "Esses valores mapeiam o módulo aberto para a estrutura de fontes do compilador.",
-  "writersidePdfModuleName": "Nome do módulo",
-  "writersidePdfSourceRoot": "Raiz das fontes",
-  "writersidePdfChooseSourceRoot": "Escolher raiz das fontes",
-  "writersidePdfBuilderVersion": "Versão do compilador",
-  "writersidePdfAllowNetwork": "Permitir rede durante a compilação",
-  "writersidePdfAllowNetworkDescription": "Desativado por padrão. Ative somente se o projeto precisar intencionalmente de recursos remotos de compilação.",
-  "writersidePdfModuleNameRequired": "Digite o nome do módulo.",
-  "writersidePdfSourceRootRequired": "Escolha a raiz das fontes.",
-  "writersidePdfBuilderVersionInvalid": "Digite uma versão válida do compilador.",
-  "writersidePdfBuilderRequired": "Compilador do Writerside necessário",
-  "writersidePdfBuilderDownloadDescription": "O BusyMark usa a imagem de contêiner oficial {image}. Baixá-la agora? A imagem é grande e será armazenada pelo Docker.",
-  "writersidePdfDownloadingBuilder": "Baixando o compilador do Writerside…",
   "exportingWritersidePdf": "Exportando PDF do Writerside…",
-  "writersidePdfDockerUnavailable": "O Docker é necessário para exportar Writerside como PDF. Instale e inicie o Docker e tente novamente.",
-  "writersidePdfBuilderUnavailable": "A imagem solicitada do compilador do Writerside não está disponível.",
-  "writersidePdfConfigurationInvalid": "A configuração de PDF do Writerside é inválida.",
-  "writersidePdfBuildFailed": "O compilador do Writerside não conseguiu criar o PDF.",
-  "writersidePdfInvalidOutput": "O compilador do Writerside não produziu um PDF válido.",
   "ai": "IA",
   "aiLocalOllama": "Ollama local",
   "aiDisabled": "Desativado",
   "aiLocalOnlyDescription": "A edição com IA é iniciada apenas de forma explícita. O BusyMark envia somente o contexto exibido ao provedor selecionado e nunca aplica uma proposta sem revisão.",
   "aiProvider": "Provedor de IA",
+  "aiDefaultProvider": "Provedor predefinido",
+  "aiConfigureProvider": "Configurar provedor",
+  "aiChooseProvider": "Escolher provedor de IA",
   "aiOllamaEndpoint": "Endpoint do Ollama",
   "aiOllamaModel": "Modelo do Ollama",
   "aiTestConnection": "Testar conexão",
   "aiTestingConnection": "Testando…",
   "aiConnectionReady": "Conectado. {count} modelo(s) instalado(s) encontrado(s).",
-  "aiNoModels": "O Ollama está em execução, mas nenhum modelo instalado foi encontrado.",
+  "aiNoModels": "Nenhum modelo selecionado.",
   "aiConnectionFailed": "O BusyMark não conseguiu verificar a geração de texto por IA.",
   "aiConfigureFirst": "Ative um provedor de IA e verifique um modelo em Configurações → IA.",
   "aiEditWithAi": "Editar com IA",
@@ -2628,9 +2619,6 @@
   "aiReviewExactContent": "Revisar conteúdo exato",
   "aiContentToChange": "Conteúdo a alterar",
   "aiContentSentToAi": "Conteúdo enviado à IA",
-  "aiPrivacyDisabled": "A IA está desativada. O BusyMark nunca envia o conteúdo do documento sem uma ação explícita de IA.",
-  "aiPrivacyLocal": "O BusyMark envia apenas o contexto exibido na caixa de diálogo de revisão ao serviço Ollama local configurado. As propostas nunca são aplicadas sem revisão.",
-  "aiPrivacyCloud": "O BusyMark envia apenas o contexto exibido na caixa de diálogo de revisão para {provider}. As solicitações não mantêm estado e as propostas nunca são aplicadas sem revisão.",
   "aiApiKey": "Chave de API",
   "aiApiKeyStoredHint": "Uma chave está armazenada no cofre de credenciais do sistema",
   "aiApiKeyEnterHint": "Insira uma chave de API do provedor",
@@ -2643,6 +2631,7 @@
   "aiAutomaticRouting": "Automática conforme a tarefa",
   "aiFixedModelRouting": "Usar o modelo selecionado",
   "aiPreferredModel": "Modelo preferido",
+  "aiModel": "Modelo",
   "aiUsageThisMonth": "{requests} solicitações · {input} tokens de entrada · {output} tokens de saída",
   "aiCloudConsentTitle": "Enviar conteúdo para {provider}?",
   "aiCloudConsentEnable": "Ativar {provider}",
@@ -2663,5 +2652,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "O título de nível {level} vem após o nível {previousLevel}; revise o aninhamento das seções.",
   "diagnosticMarkdownLinkEmptyText": "O texto do link está vazio; forneça um nome acessível que descreva sua finalidade.",
   "diagnosticMarkdownLinkReviewText": "Verifique se o texto do link “{text}” descreve sua finalidade no contexto.",
-  "diagnosticMarkdownTableEmptyHeader": "Os cabeçalhos da tabela devem identificar suas colunas; preencha cada cabeçalho vazio."
+  "diagnosticMarkdownTableEmptyHeader": "Os cabeçalhos da tabela devem identificar suas colunas; preencha cada cabeçalho vazio.",
+  "commandPalette": "Paleta de comandos",
+  "commandPaletteHint": "Digite um comando",
+  "commandPaletteEmpty": "Nenhum comando correspondente",
+  "tableAlignmentUnspecified": "Alinhamento: não especificado",
+  "tableAlignmentLeft": "Alinhamento: esquerda",
+  "tableAlignmentCenter": "Alinhamento: centro",
+  "tableAlignmentRight": "Alinhamento: direita",
+  "sourceSearchReplacement": "Substituir por",
+  "sourceSearchReplaceCurrent": "Substituir atual",
+  "sourceSearchReplaceAndFindNext": "Substituir e localizar próximo",
+  "sourceSearchReplaceAll": "Substituir tudo",
+  "workspaceReplace": "Substituir no espaço de trabalho",
+  "reviewReplacements": "Revisar substituições",
+  "applyReplacements": "Aplicar substituições",
+  "skippedFiles": "Arquivos ignorados",
+  "workspaceReplaceDirtyBuffer": "Conteúdo não salvo do editor",
+  "workspaceReplaceDiskContent": "Conteúdo salvo no disco",
+  "selectFileMatches": "Selecionar todas as {count} correspondências",
+  "workspaceReplaceApplied": "Foram substituídas {matches} correspondências em {files} arquivos; {skipped} ignoradas.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Quebra de linha final",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Sem quebra de linha final",
+  "normalizeLineEndings": "Normalizar finais de linha",
+  "workspaceReplaceMixedLineEndings": "{fileName} usa finais de linha mistos. Escolha o formato antes de substituir.",
+  "mixedLineEndingsSavePrompt": "Este documento contém finais de linha mistos. Escolha um formato.",
+  "workspaceReplaceIssueOversized": "Um arquivo grande demais foi ignorado.",
+  "workspaceReplaceIssueUnreadable": "Um arquivo que não pôde ser lido foi ignorado.",
+  "workspaceReplaceIssueInvalidUtf8": "Um arquivo que não é UTF-8 válido foi ignorado.",
+  "workspaceReplaceIssueTruncated": "A prévia de substituições foi truncada.",
+  "workspaceReplaceIssueFileChanged": "Um arquivo alterado após a prévia foi ignorado.",
+  "workspaceReplaceIssueBufferChanged": "Um buffer do editor alterado após a prévia foi ignorado.",
+  "workspaceReplaceIssueNormalizationRequired": "Escolha a normalização LF ou CRLF antes de substituir.",
+  "externalChangesTitle": "Alterações externas — {fileName}",
+  "externalFileDeleted": "Este arquivo foi excluído do disco.",
+  "externalFileChanged": "Este arquivo mudou no disco enquanto você tem alterações não salvas.",
+  "compare": "Comparar",
+  "reloadFromDisk": "Recarregar do disco",
+  "keepMine": "Manter minha versão",
+  "saveAs": "Salvar como",
+  "unsavedChangesMultipleMessage": "Há {count} documentos com alterações não salvas. Deseja salvá-los antes de continuar?",
+  "workspaceReplaceIssuePartialConflict": "A reversão foi interrompida porque o ficheiro foi alterado em simultâneo. Algumas substituições podem permanecer; o conteúdo deslocado foi preservado no caminho abaixo.",
+  "workspaceReplaceIssueApplyFailed": "Nenhuma substituição foi aplicada porque o conjunto revisado não pôde ser salvo com segurança.",
+  "workspaceRecoveryRestored": "Foram recuperados {count} documentos não salvos. Revise cada documento recuperado antes de continuar.",
+  "workspaceRecoveryDamaged": "Não foi possível restaurar {count} registros de recuperação danificados. Os documentos recuperados válidos continuam disponíveis.",
+  "recoveredDocumentReview": "O conteúdo não salvo de {fileName} foi recuperado. Revise-o e depois salve, salve como ou descarte-o.",
+  "commandUnavailableInContext": "Este comando não está disponível no contexto atual.",
+  "mathRenderFailed": "Não foi possível renderizar a expressão matemática.",
+  "inlineMath": "Matemática em linha",
+  "displayMath": "Matemática em bloco"
 }
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index eb5f132e..0720d6c6 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Открывать предыдущее рабочее пространство при запуске",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Открывать рабочее пространство и вкладки предыдущего сеанса при запуске BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Подтверждать закрытие при несохранённых изменениях",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Изображение",
+  "video": "Видео",
+  "openVideo": "Воспроизвести видео",
+  "pauseVideo": "Приостановить видео",
+  "videoUnavailable": "Видео недоступно",
+  "videoPreview": "Предпросмотр видео",
+  "diagnosticWritersideVideoMissingSource": "У видео отсутствует атрибут src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Неподдерживаемый источник видео: {source}",
+  "diagnosticWritersideVideoMissingFile": "Видеофайл не существует: {source}",
+  "diagnosticWritersideVideoMissingPreview": "Изображение предпросмотра видео не существует: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1326,6 +1339,8 @@
   "sourceLargeFileFeaturesPaused": "Большой файл: подсветка и сворачивание приостановлены",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Нет содержимого для чтения",
+  "admonition": "Блок-уведомление",
+  "quote": "Цитата",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1367,7 +1382,7 @@
   },
   "couldNotOpenTarget": "Не удалось открыть {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1376,7 +1391,7 @@
   },
   "linkTargetNotFound": "Цель ссылки не найдена: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1385,11 +1400,11 @@
   },
   "cannotOpenFileTypeInEditor": "Этот тип файла нельзя открыть в редакторе",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Якорь не найден: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2232,6 +2247,7 @@
   "gitFileHistory": "Текущий файл",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Действия с файлом",
+  "actions": "Действия",
   "gitStatusAdded": "Добавлен",
   "gitStatusDeleted": "Удалён",
   "gitStatusRenamed": "Переименован",
@@ -2251,7 +2267,15 @@
   "gitErrorMultipleRemotes": "Настроено несколько удалённых репозиториев. Эта версия BusyMark не позволяет выбрать upstream-ветку; настройте её вне приложения.",
   "gitErrorDirtyWorkspace": "Перед переключением ветки сохраните или отмените изменения в редакторе BusyMark.",
   "gitErrorDiverged": "Ветка разошлась с upstream-веткой. Выполните слияние или rebase вне этой версии BusyMark.",
-  "gitErrorAuthentication": "Не удалось пройти аутентификацию Git. Для удалённых SSH-репозиториев в snap может потребоваться подключить интерфейс ssh-keys.",
+  "gitErrorAuthorIdentity": "Перед созданием коммита Git требуется имя и адрес электронной почты автора.",
+  "gitAuthorIdentityTitle": "Данные автора Git",
+  "gitAuthorIdentityMessage": "Введите данные, которые Git должен записывать в коммитах. BusyMark сохранит их и повторит этот коммит.",
+  "gitAuthorName": "Имя",
+  "gitAuthorEmail": "Электронная почта",
+  "gitAuthorIdentityGlobal": "Использовать для всех репозиториев",
+  "gitAuthorIdentityGlobalDescription": "При установке через Snap это относится к репозиториям, открытым в BusyMark.",
+  "gitSaveIdentityAndCommit": "Сохранить и создать коммит",
+  "gitErrorAuthentication": "Не удалось пройти аутентификацию Git.",
   "gitErrorNetwork": "Сетевая операция Git не удалась.",
   "gitErrorConflict": "Git сообщил о неразрешённых конфликтах.",
   "gitErrorCommandFailed": "Не удалось выполнить команду Git.",
@@ -2565,56 +2589,23 @@
   "diagnosticWritersideReferenceTopicMissing": "Тема «{topic}» отсутствует в указанном экземпляре «{instance}».",
   "download": "Скачать",
   "exportWritersideAsPdf": "Экспорт Writerside в PDF",
-  "writersidePdfExportDescription": "Выберите экземпляр и параметры PDF. BusyMark использует официальный сборщик Writerside от JetBrains.",
   "writersidePdfContent": "Содержимое экспорта",
-  "writersidePdfSettings": "Настройки PDF",
-  "writersidePdfConfigureHere": "Настроить для этого экспорта",
-  "writersidePdfProjectConfiguration": "Использовать конфигурацию проекта",
-  "writersidePdfConfigurationFile": "Файл конфигурации PDF",
   "writersidePdfPage": "Страница",
-  "writersidePdfKeymap": "Раскладка клавиш",
-  "writersidePdfNoKeymap": "Без раскладки клавиш",
-  "writersidePdfTocTitle": "Заголовок оглавления",
-  "writersidePdfCover": "Титульная страница",
-  "writersidePdfIncludeCover": "Добавить титульную страницу",
-  "writersidePdfCoverTitle": "Заголовок обложки",
-  "writersidePdfCoverDescription": "Описание на обложке",
-  "writersidePdfCopyright": "Авторские права",
-  "writersidePdfCoverLogo": "Логотип на обложке",
-  "writersidePdfChooseCoverLogo": "Выбрать логотип для обложки",
-  "writersidePdfHeaderAndFooter": "Верхний и нижний колонтитулы",
-  "writersidePdfHeader": "Верхний колонтитул",
-  "writersidePdfFooter": "Нижний колонтитул",
-  "writersidePdfAdvancedDescription": "Эти значения сопоставляют открытый модуль со структурой исходных файлов сборщика.",
-  "writersidePdfModuleName": "Имя модуля",
-  "writersidePdfSourceRoot": "Корневая папка исходных файлов",
-  "writersidePdfChooseSourceRoot": "Выбрать корневую папку исходных файлов",
-  "writersidePdfBuilderVersion": "Версия сборщика",
-  "writersidePdfAllowNetwork": "Разрешить сеть во время сборки",
-  "writersidePdfAllowNetworkDescription": "По умолчанию отключено. Включайте, только если проекту намеренно нужны удалённые ресурсы сборки.",
-  "writersidePdfModuleNameRequired": "Введите имя модуля.",
-  "writersidePdfSourceRootRequired": "Выберите корневую папку исходных файлов.",
-  "writersidePdfBuilderVersionInvalid": "Введите допустимую версию сборщика.",
-  "writersidePdfBuilderRequired": "Требуется сборщик Writerside",
-  "writersidePdfBuilderDownloadDescription": "BusyMark использует официальный образ контейнера {image}. Скачать его сейчас? Образ имеет большой размер и будет храниться в Docker.",
-  "writersidePdfDownloadingBuilder": "Загрузка сборщика Writerside…",
   "exportingWritersidePdf": "Экспорт PDF Writerside…",
-  "writersidePdfDockerUnavailable": "Для экспорта Writerside в PDF требуется Docker. Установите и запустите Docker, затем повторите попытку.",
-  "writersidePdfBuilderUnavailable": "Запрошенный образ сборщика Writerside недоступен.",
-  "writersidePdfConfigurationInvalid": "Недопустимая конфигурация PDF Writerside.",
-  "writersidePdfBuildFailed": "Сборщику Writerside не удалось создать PDF.",
-  "writersidePdfInvalidOutput": "Сборщик Writerside не создал допустимый PDF.",
   "ai": "ИИ",
   "aiLocalOllama": "Локальный Ollama",
   "aiDisabled": "Отключено",
   "aiLocalOnlyDescription": "Редактирование с помощью ИИ запускается только явно. BusyMark отправляет выбранному поставщику только показанный контекст и никогда не применяет предложение без проверки.",
   "aiProvider": "Поставщик ИИ",
+  "aiDefaultProvider": "Поставщик по умолчанию",
+  "aiConfigureProvider": "Настроить поставщика",
+  "aiChooseProvider": "Выберите поставщика ИИ",
   "aiOllamaEndpoint": "Конечная точка Ollama",
   "aiOllamaModel": "Модель Ollama",
   "aiTestConnection": "Проверить подключение",
   "aiTestingConnection": "Проверка…",
   "aiConnectionReady": "Подключено. Найдено установленных моделей: {count}.",
-  "aiNoModels": "Ollama запущен, но установленные модели не найдены.",
+  "aiNoModels": "Модель не выбрана.",
   "aiConnectionFailed": "BusyMark не удалось проверить генерацию текста с помощью ИИ.",
   "aiConfigureFirst": "Включите поставщика ИИ и проверьте модель в разделе «Настройки → ИИ».",
   "aiEditWithAi": "Редактировать с помощью ИИ",
@@ -2646,9 +2637,6 @@
   "aiReviewExactContent": "Просмотреть точное содержимое",
   "aiContentToChange": "Содержимое для изменения",
   "aiContentSentToAi": "Содержимое, отправляемое ИИ",
-  "aiPrivacyDisabled": "ИИ отключён. BusyMark никогда не отправляет содержимое документа без явного действия с ИИ.",
-  "aiPrivacyLocal": "BusyMark отправляет только контекст, показанный в диалоге проверки, настроенной локальной службе Ollama. Предложения никогда не применяются без проверки.",
-  "aiPrivacyCloud": "BusyMark отправляет только контекст, показанный в диалоге проверки, поставщику {provider}. Запросы не сохраняют состояние, а предложения никогда не применяются без проверки.",
   "aiApiKey": "Ключ API",
   "aiApiKeyStoredHint": "Ключ сохранён в системном хранилище учётных данных",
   "aiApiKeyEnterHint": "Введите ключ API поставщика",
@@ -2661,6 +2649,7 @@
   "aiAutomaticRouting": "Автоматически по задаче",
   "aiFixedModelRouting": "Использовать выбранную модель",
   "aiPreferredModel": "Предпочитаемая модель",
+  "aiModel": "Модель",
   "aiUsageThisMonth": "{requests} запросов · {input} входных токенов · {output} выходных токенов",
   "aiCloudConsentTitle": "Отправить содержимое поставщику {provider}?",
   "aiCloudConsentEnable": "Включить {provider}",
@@ -2681,5 +2670,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "За заголовком уровня {previousLevel} следует уровень {level}; проверьте вложенность разделов.",
   "diagnosticMarkdownLinkEmptyText": "Текст ссылки пуст; укажите доступное имя, описывающее её назначение.",
   "diagnosticMarkdownLinkReviewText": "Проверьте, описывает ли текст ссылки «{text}» её назначение в контексте.",
-  "diagnosticMarkdownTableEmptyHeader": "Заголовки таблицы должны обозначать столбцы; заполните каждый пустой заголовок."
+  "diagnosticMarkdownTableEmptyHeader": "Заголовки таблицы должны обозначать столбцы; заполните каждый пустой заголовок.",
+  "commandPalette": "Палитра команд",
+  "commandPaletteHint": "Введите команду",
+  "commandPaletteEmpty": "Нет подходящих команд",
+  "tableAlignmentUnspecified": "Выравнивание: не задано",
+  "tableAlignmentLeft": "Выравнивание: по левому краю",
+  "tableAlignmentCenter": "Выравнивание: по центру",
+  "tableAlignmentRight": "Выравнивание: по правому краю",
+  "sourceSearchReplacement": "Заменить на",
+  "sourceSearchReplaceCurrent": "Заменить текущее",
+  "sourceSearchReplaceAndFindNext": "Заменить и найти следующее",
+  "sourceSearchReplaceAll": "Заменить всё",
+  "workspaceReplace": "Заменить в рабочей области",
+  "reviewReplacements": "Проверить замены",
+  "applyReplacements": "Применить замены",
+  "skippedFiles": "Пропущенные файлы",
+  "workspaceReplaceDirtyBuffer": "Несохранённое содержимое редактора",
+  "workspaceReplaceDiskContent": "Содержимое, сохранённое на диске",
+  "selectFileMatches": "Выбрать все совпадения: {count}",
+  "workspaceReplaceApplied": "Заменено совпадений: {matches} в файлах: {files}; пропущено: {skipped}.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Конечный перевод строки",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Нет конечного перевода строки",
+  "normalizeLineEndings": "Нормализовать окончания строк",
+  "workspaceReplaceMixedLineEndings": "В {fileName} используются смешанные окончания строк. Выберите формат перед заменой.",
+  "mixedLineEndingsSavePrompt": "В документе используются смешанные окончания строк. Выберите формат.",
+  "workspaceReplaceIssueOversized": "Слишком большой файл пропущен.",
+  "workspaceReplaceIssueUnreadable": "Нечитаемый файл пропущен.",
+  "workspaceReplaceIssueInvalidUtf8": "Файл с недопустимой кодировкой UTF-8 пропущен.",
+  "workspaceReplaceIssueTruncated": "Предпросмотр замен был сокращён.",
+  "workspaceReplaceIssueFileChanged": "Файл, изменённый после предпросмотра, пропущен.",
+  "workspaceReplaceIssueBufferChanged": "Буфер редактора, изменённый после предпросмотра, пропущен.",
+  "workspaceReplaceIssueNormalizationRequired": "Перед заменой выберите нормализацию LF или CRLF.",
+  "externalChangesTitle": "Внешние изменения — {fileName}",
+  "externalFileDeleted": "Этот файл был удалён с диска.",
+  "externalFileChanged": "Этот файл изменился на диске, пока у вас были несохранённые изменения.",
+  "compare": "Сравнить",
+  "reloadFromDisk": "Перезагрузить с диска",
+  "keepMine": "Оставить мою версию",
+  "saveAs": "Сохранить как",
+  "unsavedChangesMultipleMessage": "В документах ({count}) есть несохранённые изменения. Сохранить их перед продолжением?",
+  "workspaceReplaceIssuePartialConflict": "Откат остановлен, поскольку файл был одновременно изменён. Некоторые замены могли сохраниться; вытесненное содержимое сохранено по указанному ниже пути.",
+  "workspaceReplaceIssueApplyFailed": "Замены не применены, поскольку проверенный набор не удалось безопасно сохранить.",
+  "workspaceRecoveryRestored": "Восстановлено несохранённых документов: {count}. Проверьте каждый восстановленный документ перед продолжением.",
+  "workspaceRecoveryDamaged": "Не удалось восстановить повреждённые записи ({count}). Корректные восстановленные документы остаются доступными.",
+  "recoveredDocumentReview": "Восстановлено несохранённое содержимое файла {fileName}. Проверьте его, затем сохраните, сохраните как новый файл или отбросьте.",
+  "commandUnavailableInContext": "Эта команда недоступна в текущем контексте.",
+  "mathRenderFailed": "Не удалось отобразить математическое выражение.",
+  "inlineMath": "Формула в строке",
+  "displayMath": "Формула отдельным блоком"
 }
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 302e2742..4c20212d 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -740,6 +740,10 @@
   "@settingsWindowSectionTitle": {
     "description": "Settings section title for native window behavior."
   },
+  "settingsReopenWorkspaceOnStartupTitle": "Відкривати попередній робочий простір під час запуску",
+  "@settingsReopenWorkspaceOnStartupTitle": {"description":"Settings switch title for reopening the previous workspace on a normal startup."},
+  "settingsReopenWorkspaceOnStartupDescription": "Відкривати робочий простір і вкладки попереднього сеансу під час запуску BusyMark.",
+  "@settingsReopenWorkspaceOnStartupDescription": {"description":"Settings switch description for reopening the previous workspace on a normal startup."},
   "settingsConfirmCloseWithUnsavedChangesTitle": "Підтверджувати закриття за наявності незбережених змін",
   "@settingsConfirmCloseWithUnsavedChangesTitle": {
     "description": "Settings switch title for close confirmation when documents have unsaved changes."
@@ -843,6 +847,15 @@
     "description": "Dialog title and toolbar tooltip for code block language."
   },
   "image": "Зображення",
+  "video": "Відео",
+  "openVideo": "Відтворити відео",
+  "pauseVideo": "Призупинити відео",
+  "videoUnavailable": "Відео недоступне",
+  "videoPreview": "Попередній перегляд відео",
+  "diagnosticWritersideVideoMissingSource": "У відео відсутній атрибут src.",
+  "diagnosticWritersideVideoUnsupportedSource": "Непідтримуване джерело відео: {source}",
+  "diagnosticWritersideVideoMissingFile": "Відеофайл не існує: {source}",
+  "diagnosticWritersideVideoMissingPreview": "Зображення попереднього перегляду відео не існує: {preview}",
   "@image": {
     "description": "Image command and document kind label."
   },
@@ -1326,6 +1339,8 @@
   "sourceLargeFileFeaturesPaused": "Великий файл: підсвічування та згортання призупинено",
   "@sourceLargeFileFeaturesPaused": {"description": "Status banner shown when source highlighting and folding are disabled for a large file."},
   "nothingToRead": "Немає вмісту для читання",
+  "admonition": "Блок-примітка",
+  "quote": "Цитата",
   "@nothingToRead": {
     "description": "Empty state shown when there is no content to read."
   },
@@ -1367,7 +1382,7 @@
   },
   "couldNotOpenTarget": "Не вдалося відкрити {target}",
   "@couldNotOpenTarget": {
-    "description": "Snackbar shown when a link target cannot be opened.",
+    "description": "Toast shown when a link target cannot be opened.",
     "placeholders": {
       "target": {
         "type": "String"
@@ -1376,7 +1391,7 @@
   },
   "linkTargetNotFound": "Ціль посилання не знайдено: {targetPath}",
   "@linkTargetNotFound": {
-    "description": "Snackbar shown when a link target path is missing.",
+    "description": "Toast shown when a link target path is missing.",
     "placeholders": {
       "targetPath": {
         "type": "String"
@@ -1385,11 +1400,11 @@
   },
   "cannotOpenFileTypeInEditor": "Файл цього типу неможливо відкрити в редакторі",
   "@cannotOpenFileTypeInEditor": {
-    "description": "Snackbar shown when a file type cannot be opened in the editor."
+    "description": "Toast shown when a file type cannot be opened in the editor."
   },
   "anchorNotFound": "Якір не знайдено: {anchor}",
   "@anchorNotFound": {
-    "description": "Snackbar shown when a link anchor is missing.",
+    "description": "Toast shown when a link anchor is missing.",
     "placeholders": {
       "anchor": {
         "type": "String"
@@ -2232,6 +2247,7 @@
   "gitFileHistory": "Поточний файл",
   "gitAdditionsDeletions": "+{additions} -{deletions}",
   "fileActions": "Дії з файлом",
+  "actions": "Дії",
   "gitStatusAdded": "Додано",
   "gitStatusDeleted": "Видалено",
   "gitStatusRenamed": "Перейменовано",
@@ -2251,7 +2267,15 @@
   "gitErrorMultipleRemotes": "Налаштовано кілька віддалених репозиторіїв. Ця версія BusyMark не дає змоги вибрати upstream-гілку; налаштуйте її поза програмою.",
   "gitErrorDirtyWorkspace": "Перед перемиканням гілки збережіть або відкиньте зміни в редакторі BusyMark.",
   "gitErrorDiverged": "Гілка розійшлася з upstream-гілкою. Виконайте злиття або rebase поза цією версією BusyMark.",
-  "gitErrorAuthentication": "Не вдалося автентифікуватися в Git. Для віддалених SSH-репозиторіїв у snap може знадобитися підключити інтерфейс ssh-keys.",
+  "gitErrorAuthorIdentity": "Перед створенням коміту Git потребує ім’я та адресу електронної пошти автора.",
+  "gitAuthorIdentityTitle": "Дані автора Git",
+  "gitAuthorIdentityMessage": "Введіть дані, які Git має записувати в комітах. BusyMark збереже їх і повторить цей коміт.",
+  "gitAuthorName": "Ім’я",
+  "gitAuthorEmail": "Електронна пошта",
+  "gitAuthorIdentityGlobal": "Використовувати для всіх репозиторіїв",
+  "gitAuthorIdentityGlobalDescription": "Під час установлення через Snap це стосується репозиторіїв, відкритих у BusyMark.",
+  "gitSaveIdentityAndCommit": "Зберегти й створити коміт",
+  "gitErrorAuthentication": "Не вдалося автентифікуватися в Git.",
   "gitErrorNetwork": "Не вдалося виконати мережеву операцію Git.",
   "gitErrorConflict": "Git повідомив про нерозв’язані конфлікти.",
   "gitErrorCommandFailed": "Не вдалося виконати команду Git.",
@@ -2565,56 +2589,23 @@
   "diagnosticWritersideReferenceTopicMissing": "Теми «{topic}» немає у вказаному екземплярі «{instance}».",
   "download": "Завантажити",
   "exportWritersideAsPdf": "Експорт Writerside у PDF",
-  "writersidePdfExportDescription": "Виберіть екземпляр і параметри PDF. BusyMark використовує офіційний збирач Writerside від JetBrains.",
   "writersidePdfContent": "Вміст експорту",
-  "writersidePdfSettings": "Налаштування PDF",
-  "writersidePdfConfigureHere": "Налаштувати для цього експорту",
-  "writersidePdfProjectConfiguration": "Використати конфігурацію проєкту",
-  "writersidePdfConfigurationFile": "Файл конфігурації PDF",
   "writersidePdfPage": "Сторінка",
-  "writersidePdfKeymap": "Розкладка клавіш",
-  "writersidePdfNoKeymap": "Без розкладки клавіш",
-  "writersidePdfTocTitle": "Заголовок змісту",
-  "writersidePdfCover": "Титульна сторінка",
-  "writersidePdfIncludeCover": "Додати титульну сторінку",
-  "writersidePdfCoverTitle": "Заголовок обкладинки",
-  "writersidePdfCoverDescription": "Опис на обкладинці",
-  "writersidePdfCopyright": "Авторські права",
-  "writersidePdfCoverLogo": "Логотип на обкладинці",
-  "writersidePdfChooseCoverLogo": "Вибрати логотип для обкладинки",
-  "writersidePdfHeaderAndFooter": "Верхній і нижній колонтитули",
-  "writersidePdfHeader": "Верхній колонтитул",
-  "writersidePdfFooter": "Нижній колонтитул",
-  "writersidePdfAdvancedDescription": "Ці значення зіставляють відкритий модуль зі структурою вихідних файлів збирача.",
-  "writersidePdfModuleName": "Назва модуля",
-  "writersidePdfSourceRoot": "Коренева папка вихідних файлів",
-  "writersidePdfChooseSourceRoot": "Вибрати кореневу папку вихідних файлів",
-  "writersidePdfBuilderVersion": "Версія збирача",
-  "writersidePdfAllowNetwork": "Дозволити мережу під час збирання",
-  "writersidePdfAllowNetworkDescription": "Початково вимкнено. Увімкніть лише тоді, коли проєкт навмисно потребує віддалених ресурсів збирання.",
-  "writersidePdfModuleNameRequired": "Введіть назву модуля.",
-  "writersidePdfSourceRootRequired": "Виберіть кореневу папку вихідних файлів.",
-  "writersidePdfBuilderVersionInvalid": "Введіть припустиму версію збирача.",
-  "writersidePdfBuilderRequired": "Потрібен збирач Writerside",
-  "writersidePdfBuilderDownloadDescription": "BusyMark використовує офіційний образ контейнера {image}. Завантажити його зараз? Образ має великий розмір і зберігатиметься в Docker.",
-  "writersidePdfDownloadingBuilder": "Завантаження збирача Writerside…",
   "exportingWritersidePdf": "Експорт PDF Writerside…",
-  "writersidePdfDockerUnavailable": "Для експорту Writerside у PDF потрібен Docker. Установіть і запустіть Docker, а потім повторіть спробу.",
-  "writersidePdfBuilderUnavailable": "Запитаний образ збирача Writerside недоступний.",
-  "writersidePdfConfigurationInvalid": "Конфігурація PDF Writerside є неприпустимою.",
-  "writersidePdfBuildFailed": "Збирачу Writerside не вдалося створити PDF.",
-  "writersidePdfInvalidOutput": "Збирач Writerside не створив припустимий PDF.",
   "ai": "ШІ",
   "aiLocalOllama": "Локальний Ollama",
   "aiDisabled": "Вимкнено",
   "aiLocalOnlyDescription": "Редагування за допомогою ШІ запускається лише явно. BusyMark надсилає вибраному постачальнику тільки показаний контекст і ніколи не застосовує пропозицію без перевірки.",
   "aiProvider": "Постачальник ШІ",
+  "aiDefaultProvider": "Постачальник за замовчуванням",
+  "aiConfigureProvider": "Налаштувати постачальника",
+  "aiChooseProvider": "Виберіть постачальника ШІ",
   "aiOllamaEndpoint": "Кінцева точка Ollama",
   "aiOllamaModel": "Модель Ollama",
   "aiTestConnection": "Перевірити підключення",
   "aiTestingConnection": "Перевірка…",
   "aiConnectionReady": "Підключено. Знайдено встановлених моделей: {count}.",
-  "aiNoModels": "Ollama запущено, але встановлених моделей не знайдено.",
+  "aiNoModels": "Модель не вибрана.",
   "aiConnectionFailed": "BusyMark не вдалося перевірити генерування тексту за допомогою ШІ.",
   "aiConfigureFirst": "Увімкніть постачальника ШІ та перевірте модель у розділі «Налаштування → ШІ».",
   "aiEditWithAi": "Редагувати за допомогою ШІ",
@@ -2646,9 +2637,6 @@
   "aiReviewExactContent": "Переглянути точний вміст",
   "aiContentToChange": "Вміст для зміни",
   "aiContentSentToAi": "Вміст, що надсилається ШІ",
-  "aiPrivacyDisabled": "ШІ вимкнено. BusyMark ніколи не надсилає вміст документа без явної дії з ШІ.",
-  "aiPrivacyLocal": "BusyMark надсилає лише контекст, показаний у діалозі перевірки, налаштованій локальній службі Ollama. Пропозиції ніколи не застосовуються без перевірки.",
-  "aiPrivacyCloud": "BusyMark надсилає лише контекст, показаний у діалозі перевірки, постачальнику {provider}. Запити не зберігають стан, а пропозиції ніколи не застосовуються без перевірки.",
   "aiApiKey": "Ключ API",
   "aiApiKeyStoredHint": "Ключ збережено в системному сховищі облікових даних",
   "aiApiKeyEnterHint": "Введіть ключ API постачальника",
@@ -2661,6 +2649,7 @@
   "aiAutomaticRouting": "Автоматично за завданням",
   "aiFixedModelRouting": "Використовувати вибрану модель",
   "aiPreferredModel": "Бажана модель",
+  "aiModel": "Модель",
   "aiUsageThisMonth": "{requests} запитів · {input} вхідних токенів · {output} вихідних токенів",
   "aiCloudConsentTitle": "Надіслати вміст постачальнику {provider}?",
   "aiCloudConsentEnable": "Увімкнути {provider}",
@@ -2681,5 +2670,53 @@
   "diagnosticMarkdownHeadingSkippedLevel": "Після заголовка рівня {previousLevel} іде рівень {level}; перевірте вкладеність розділів.",
   "diagnosticMarkdownLinkEmptyText": "Текст посилання порожній; укажіть доступну назву, що описує його призначення.",
   "diagnosticMarkdownLinkReviewText": "Перевірте, чи описує текст посилання «{text}» його призначення в контексті.",
-  "diagnosticMarkdownTableEmptyHeader": "Заголовки таблиці мають позначати стовпці; заповніть кожен порожній заголовок."
+  "diagnosticMarkdownTableEmptyHeader": "Заголовки таблиці мають позначати стовпці; заповніть кожен порожній заголовок.",
+  "commandPalette": "Палітра команд",
+  "commandPaletteHint": "Введіть команду",
+  "commandPaletteEmpty": "Немає відповідних команд",
+  "tableAlignmentUnspecified": "Вирівнювання: не вказано",
+  "tableAlignmentLeft": "Вирівнювання: ліворуч",
+  "tableAlignmentCenter": "Вирівнювання: по центру",
+  "tableAlignmentRight": "Вирівнювання: праворуч",
+  "sourceSearchReplacement": "Замінити на",
+  "sourceSearchReplaceCurrent": "Замінити поточне",
+  "sourceSearchReplaceAndFindNext": "Замінити й знайти наступне",
+  "sourceSearchReplaceAll": "Замінити все",
+  "workspaceReplace": "Замінити в робочій області",
+  "reviewReplacements": "Переглянути заміни",
+  "applyReplacements": "Застосувати заміни",
+  "skippedFiles": "Пропущені файли",
+  "workspaceReplaceDirtyBuffer": "Незбережений вміст редактора",
+  "workspaceReplaceDiskContent": "Вміст, збережений на диску",
+  "selectFileMatches": "Вибрати всі збіги: {count}",
+  "workspaceReplaceApplied": "Замінено збігів: {matches} у файлах: {files}; пропущено: {skipped}.",
+  "documentFormatWithFinalNewline": "{encoding} · {lineEnding} · Кінцеве перенесення рядка",
+  "documentFormatWithoutFinalNewline": "{encoding} · {lineEnding} · Немає кінцевого перенесення рядка",
+  "normalizeLineEndings": "Нормалізувати закінчення рядків",
+  "workspaceReplaceMixedLineEndings": "У {fileName} використовуються змішані закінчення рядків. Виберіть формат перед заміною.",
+  "mixedLineEndingsSavePrompt": "У документі використовуються змішані закінчення рядків. Виберіть формат.",
+  "workspaceReplaceIssueOversized": "Завеликий файл пропущено.",
+  "workspaceReplaceIssueUnreadable": "Файл, який не вдалося прочитати, пропущено.",
+  "workspaceReplaceIssueInvalidUtf8": "Файл із неприпустимим UTF-8 пропущено.",
+  "workspaceReplaceIssueTruncated": "Попередній перегляд замін було скорочено.",
+  "workspaceReplaceIssueFileChanged": "Файл, змінений після попереднього перегляду, пропущено.",
+  "workspaceReplaceIssueBufferChanged": "Буфер редактора, змінений після попереднього перегляду, пропущено.",
+  "workspaceReplaceIssueNormalizationRequired": "Перед заміною виберіть нормалізацію LF або CRLF.",
+  "externalChangesTitle": "Зовнішні зміни — {fileName}",
+  "externalFileDeleted": "Цей файл було видалено з диска.",
+  "externalFileChanged": "Цей файл змінився на диску, поки у вас були незбережені зміни.",
+  "compare": "Порівняти",
+  "reloadFromDisk": "Перезавантажити з диска",
+  "keepMine": "Залишити мою версію",
+  "saveAs": "Зберегти як",
+  "unsavedChangesMultipleMessage": "У документах ({count}) є незбережені зміни. Зберегти їх перед продовженням?",
+  "workspaceReplaceIssuePartialConflict": "Відкат зупинено, оскільки файл було одночасно змінено. Деякі заміни могли залишитися; витіснений вміст збережено за шляхом нижче.",
+  "workspaceReplaceIssueApplyFailed": "Заміни не застосовано, оскільки перевірений набір не вдалося безпечно зберегти.",
+  "workspaceRecoveryRestored": "Відновлено незбережених документів: {count}. Перегляньте кожен відновлений документ перед продовженням.",
+  "workspaceRecoveryDamaged": "Не вдалося відновити пошкоджені записи ({count}). Коректні відновлені документи залишаються доступними.",
+  "recoveredDocumentReview": "Відновлено незбережений вміст файлу {fileName}. Перегляньте його, потім збережіть, збережіть як новий файл або відкиньте.",
+  "commandUnavailableInContext": "Ця команда недоступна в поточному контексті.",
+  "mathRenderFailed": "Не вдалося відобразити математичний вираз.",
+  "inlineMath": "Формула в рядку",
+  "displayMath": "Формула окремим блоком"
 }
diff --git a/lib/l10n/generated/app_localizations.dart b/lib/l10n/generated/app_localizations.dart
index 61153dd9..9b40adf6 100644
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -513,6 +513,30 @@ abstract class AppLocalizations {
   /// **'Keyboard Shortcuts'**
   String get keyboardShortcuts;
 
+  /// Title and command label for the searchable command palette.
+  ///
+  /// In en, this message translates to:
+  /// **'Command Palette'**
+  String get commandPalette;
+
+  /// Search hint in the command palette.
+  ///
+  /// In en, this message translates to:
+  /// **'Type a command'**
+  String get commandPaletteHint;
+
+  /// Empty state in the command palette.
+  ///
+  /// In en, this message translates to:
+  /// **'No matching commands'**
+  String get commandPaletteEmpty;
+
+  /// Reason shown for a disabled contextual command.
+  ///
+  /// In en, this message translates to:
+  /// **'Unavailable in the current editor context'**
+  String get commandUnavailableInContext;
+
   /// Light theme option.
   ///
   /// In en, this message translates to:
@@ -1419,6 +1443,18 @@ abstract class AppLocalizations {
   /// **'Window'**
   String get settingsWindowSectionTitle;
 
+  /// Settings switch title for reopening the previous workspace on a normal startup.
+  ///
+  /// In en, this message translates to:
+  /// **'Reopen previous workspace on startup'**
+  String get settingsReopenWorkspaceOnStartupTitle;
+
+  /// Settings switch description for reopening the previous workspace on a normal startup.
+  ///
+  /// In en, this message translates to:
+  /// **'Open the workspace and tabs from the previous session when BusyMark starts.'**
+  String get settingsReopenWorkspaceOnStartupDescription;
+
   /// Settings switch title for close confirmation when documents have unsaved changes.
   ///
   /// In en, this message translates to:
@@ -1485,6 +1521,12 @@ abstract class AppLocalizations {
   /// **'You have unsaved changes in {fileName}. Save them before continuing?'**
   String unsavedChangesMessage(String fileName);
 
+  /// Confirmation message before replacing workspace state when several documents are dirty.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{1 document has unsaved changes. Save it before continuing?} other{{count} documents have unsaved changes. Save them before continuing?}}'**
+  String unsavedChangesMultipleMessage(int count);
+
   /// File changed confirmation dialog title.
   ///
   /// In en, this message translates to:
@@ -1563,6 +1605,60 @@ abstract class AppLocalizations {
   /// **'Image'**
   String get image;
 
+  /// No description provided for @video.
+  ///
+  /// In en, this message translates to:
+  /// **'Video'**
+  String get video;
+
+  /// No description provided for @openVideo.
+  ///
+  /// In en, this message translates to:
+  /// **'Play video'**
+  String get openVideo;
+
+  /// No description provided for @pauseVideo.
+  ///
+  /// In en, this message translates to:
+  /// **'Pause video'**
+  String get pauseVideo;
+
+  /// No description provided for @videoUnavailable.
+  ///
+  /// In en, this message translates to:
+  /// **'Video unavailable'**
+  String get videoUnavailable;
+
+  /// No description provided for @videoPreview.
+  ///
+  /// In en, this message translates to:
+  /// **'Video preview'**
+  String get videoPreview;
+
+  /// No description provided for @diagnosticWritersideVideoMissingSource.
+  ///
+  /// In en, this message translates to:
+  /// **'Video is missing its src attribute.'**
+  String get diagnosticWritersideVideoMissingSource;
+
+  /// No description provided for @diagnosticWritersideVideoUnsupportedSource.
+  ///
+  /// In en, this message translates to:
+  /// **'Unsupported video source: {source}'**
+  String diagnosticWritersideVideoUnsupportedSource(String source);
+
+  /// No description provided for @diagnosticWritersideVideoMissingFile.
+  ///
+  /// In en, this message translates to:
+  /// **'Video file does not exist: {source}'**
+  String diagnosticWritersideVideoMissingFile(String source);
+
+  /// No description provided for @diagnosticWritersideVideoMissingPreview.
+  ///
+  /// In en, this message translates to:
+  /// **'Video preview image does not exist: {preview}'**
+  String diagnosticWritersideVideoMissingPreview(String preview);
+
   /// Inline image command label.
   ///
   /// In en, this message translates to:
@@ -1743,6 +1839,30 @@ abstract class AppLocalizations {
   /// **'Delete column'**
   String get deleteColumn;
 
+  /// Menu item for using unspecified Markdown table-column alignment.
+  ///
+  /// In en, this message translates to:
+  /// **'Alignment: Unspecified'**
+  String get tableAlignmentUnspecified;
+
+  /// Menu item for left-aligning a Markdown table column.
+  ///
+  /// In en, this message translates to:
+  /// **'Alignment: Left'**
+  String get tableAlignmentLeft;
+
+  /// Menu item for centering a Markdown table column.
+  ///
+  /// In en, this message translates to:
+  /// **'Alignment: Center'**
+  String get tableAlignmentCenter;
+
+  /// Menu item for right-aligning a Markdown table column.
+  ///
+  /// In en, this message translates to:
+  /// **'Alignment: Right'**
+  String get tableAlignmentRight;
+
   /// Tooltip for a table row control.
   ///
   /// In en, this message translates to:
@@ -2451,6 +2571,210 @@ abstract class AppLocalizations {
   /// **'Regex'**
   String get sourceSearchRegex;
 
+  /// Placeholder for the active-document replacement field.
+  ///
+  /// In en, this message translates to:
+  /// **'Replace with'**
+  String get sourceSearchReplacement;
+
+  /// Tooltip for replacing the current search match.
+  ///
+  /// In en, this message translates to:
+  /// **'Replace current'**
+  String get sourceSearchReplaceCurrent;
+
+  /// Tooltip for replacing the current match and moving to the next.
+  ///
+  /// In en, this message translates to:
+  /// **'Replace and find next'**
+  String get sourceSearchReplaceAndFindNext;
+
+  /// Tooltip for replacing every active-document search match.
+  ///
+  /// In en, this message translates to:
+  /// **'Replace all'**
+  String get sourceSearchReplaceAll;
+
+  /// Action that previews replacements across the workspace.
+  ///
+  /// In en, this message translates to:
+  /// **'Replace in Workspace'**
+  String get workspaceReplace;
+
+  /// Action and dialog title for reviewing workspace replacements.
+  ///
+  /// In en, this message translates to:
+  /// **'Review replacements'**
+  String get reviewReplacements;
+
+  /// Action that applies selected workspace replacements.
+  ///
+  /// In en, this message translates to:
+  /// **'Apply replacements'**
+  String get applyReplacements;
+
+  /// Heading for files excluded from a workspace replacement.
+  ///
+  /// In en, this message translates to:
+  /// **'Skipped files'**
+  String get skippedFiles;
+
+  /// Source label for a workspace replacement preview using a dirty document buffer.
+  ///
+  /// In en, this message translates to:
+  /// **'Unsaved editor content'**
+  String get workspaceReplaceDirtyBuffer;
+
+  /// Source label for a workspace replacement preview using disk content.
+  ///
+  /// In en, this message translates to:
+  /// **'Saved disk content'**
+  String get workspaceReplaceDiskContent;
+
+  /// Checkbox label for selecting every replacement match in a file.
+  ///
+  /// In en, this message translates to:
+  /// **'Select all {count} matches'**
+  String selectFileMatches(int count);
+
+  /// Summary shown after applying workspace replacements.
+  ///
+  /// In en, this message translates to:
+  /// **'Replaced {matches} matches in {files} files; skipped {skipped}.'**
+  String workspaceReplaceApplied(int matches, int files, int skipped);
+
+  /// Document format tooltip when the file ends with a newline.
+  ///
+  /// In en, this message translates to:
+  /// **'{encoding} · {lineEnding} · Final newline'**
+  String documentFormatWithFinalNewline(String encoding, String lineEnding);
+
+  /// Document format tooltip when the file does not end with a newline.
+  ///
+  /// In en, this message translates to:
+  /// **'{encoding} · {lineEnding} · No final newline'**
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding);
+
+  /// Dialog title for selecting a line-ending style.
+  ///
+  /// In en, this message translates to:
+  /// **'Normalize line endings'**
+  String get normalizeLineEndings;
+
+  /// Prompt shown before saving a document with mixed line endings.
+  ///
+  /// In en, this message translates to:
+  /// **'This document contains mixed line endings. Choose a format.'**
+  String get mixedLineEndingsSavePrompt;
+
+  /// Prompt shown before replacing content in a mixed-line-ending file.
+  ///
+  /// In en, this message translates to:
+  /// **'{fileName} uses mixed line endings. Choose the format to use before replacing.'**
+  String workspaceReplaceMixedLineEndings(String fileName);
+
+  /// Workspace replacement issue for a file above the size limit.
+  ///
+  /// In en, this message translates to:
+  /// **'Skipped an oversized file.'**
+  String get workspaceReplaceIssueOversized;
+
+  /// Workspace replacement issue for an unreadable file.
+  ///
+  /// In en, this message translates to:
+  /// **'Skipped a file that could not be read.'**
+  String get workspaceReplaceIssueUnreadable;
+
+  /// Workspace replacement issue for invalid UTF-8 content.
+  ///
+  /// In en, this message translates to:
+  /// **'Skipped a file that is not valid UTF-8.'**
+  String get workspaceReplaceIssueInvalidUtf8;
+
+  /// Workspace replacement issue when the match limit is reached.
+  ///
+  /// In en, this message translates to:
+  /// **'The replacement preview was truncated.'**
+  String get workspaceReplaceIssueTruncated;
+
+  /// Workspace replacement issue for stale disk content.
+  ///
+  /// In en, this message translates to:
+  /// **'Skipped a file that changed after the preview.'**
+  String get workspaceReplaceIssueFileChanged;
+
+  /// Workspace replacement issue for stale in-memory content.
+  ///
+  /// In en, this message translates to:
+  /// **'Skipped an editor buffer that changed after the preview.'**
+  String get workspaceReplaceIssueBufferChanged;
+
+  /// Workspace replacement issue for mixed line endings without a selected format.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose LF or CRLF normalization before replacing.'**
+  String get workspaceReplaceIssueNormalizationRequired;
+
+  /// Workspace replacement issue when a concurrent edit prevents safe transactional rollback.
+  ///
+  /// In en, this message translates to:
+  /// **'Rollback stopped because the file changed concurrently. Some replacements may remain; displaced content was preserved at the path below.'**
+  String get workspaceReplaceIssuePartialConflict;
+
+  /// Workspace replacement issue when the transactional file commit fails.
+  ///
+  /// In en, this message translates to:
+  /// **'The reviewed replacement could not be committed; no files were changed.'**
+  String get workspaceReplaceIssueApplyFailed;
+
+  /// Title of the external-file comparison dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'External changes — {fileName}'**
+  String externalChangesTitle(String fileName);
+
+  /// Persistent banner shown when an open file is deleted externally.
+  ///
+  /// In en, this message translates to:
+  /// **'This file was deleted on disk.'**
+  String get externalFileDeleted;
+
+  /// Persistent banner shown when a dirty file changes externally.
+  ///
+  /// In en, this message translates to:
+  /// **'This file changed on disk while you have unsaved edits.'**
+  String get externalFileChanged;
+
+  /// Persistent recovery review banner.
+  ///
+  /// In en, this message translates to:
+  /// **'Recovered unsaved content for {fileName}. Inspect it, then save, save as, or discard it.'**
+  String recoveredDocumentReview(String fileName);
+
+  /// Action that compares the editor buffer with the disk version.
+  ///
+  /// In en, this message translates to:
+  /// **'Compare'**
+  String get compare;
+
+  /// Action that replaces the editor buffer with the disk version.
+  ///
+  /// In en, this message translates to:
+  /// **'Reload from Disk'**
+  String get reloadFromDisk;
+
+  /// Action that keeps the editor buffer after an external change.
+  ///
+  /// In en, this message translates to:
+  /// **'Keep Mine'**
+  String get keepMine;
+
+  /// Action that saves the current document to another path.
+  ///
+  /// In en, this message translates to:
+  /// **'Save As'**
+  String get saveAs;
+
   /// Source search status shown when the regular expression is invalid.
   ///
   /// In en, this message translates to:
@@ -2469,6 +2793,18 @@ abstract class AppLocalizations {
   /// **'Nothing to read'**
   String get nothingToRead;
 
+  /// Tooltip for the Writerside admonition editing menu.
+  ///
+  /// In en, this message translates to:
+  /// **'Admonition'**
+  String get admonition;
+
+  /// Label for a neutral Writerside quote block.
+  ///
+  /// In en, this message translates to:
+  /// **'Quote'**
+  String get quote;
+
   /// Preview label for a note admonition.
   ///
   /// In en, this message translates to:
@@ -2523,25 +2859,25 @@ abstract class AppLocalizations {
   /// **'Chapter'**
   String get chapter;
 
-  /// Snackbar shown when a link target cannot be opened.
+  /// Toast shown when a link target cannot be opened.
   ///
   /// In en, this message translates to:
   /// **'Could not open {target}'**
   String couldNotOpenTarget(String target);
 
-  /// Snackbar shown when a link target path is missing.
+  /// Toast shown when a link target path is missing.
   ///
   /// In en, this message translates to:
   /// **'Link target not found: {targetPath}'**
   String linkTargetNotFound(String targetPath);
 
-  /// Snackbar shown when a file type cannot be opened in the editor.
+  /// Toast shown when a file type cannot be opened in the editor.
   ///
   /// In en, this message translates to:
   /// **'Cannot open this file type in editor'**
   String get cannotOpenFileTypeInEditor;
 
-  /// Snackbar shown when a link anchor is missing.
+  /// Toast shown when a link anchor is missing.
   ///
   /// In en, this message translates to:
   /// **'Anchor not found: {anchor}'**
@@ -2673,6 +3009,18 @@ abstract class AppLocalizations {
   /// **'Validation failed: {error}'**
   String workspaceErrorValidationFailed(String error);
 
+  /// Notice shown after crash recovery restores documents.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{Recovered 1 unsaved document. Review it before saving or discarding it.} other{Recovered {count} unsaved documents. Review each one before saving or discarding it.}}'**
+  String workspaceRecoveryRestored(int count);
+
+  /// Notice shown when recovery data is partly or wholly malformed.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{One damaged recovery record could not be restored. The original recovery file was preserved for inspection.} other{{count} damaged recovery records could not be restored. Valid recovery records remain available.}}'**
+  String workspaceRecoveryDamaged(int count);
+
   /// Detail for a missing path error.
   ///
   /// In en, this message translates to:
@@ -3818,6 +4166,12 @@ abstract class AppLocalizations {
   /// **'File actions'**
   String get fileActions;
 
+  /// Tooltip for a general action menu.
+  ///
+  /// In en, this message translates to:
+  /// **'Actions'**
+  String get actions;
+
   /// Git file status label.
   ///
   /// In en, this message translates to:
@@ -3950,10 +4304,58 @@ abstract class AppLocalizations {
   /// **'Branch has diverged. Resolve merge or rebase outside this BusyMark version.'**
   String get gitErrorDiverged;
 
+  /// Git error shown when no commit author identity is configured.
+  ///
+  /// In en, this message translates to:
+  /// **'Git needs an author name and email address before it can commit.'**
+  String get gitErrorAuthorIdentity;
+
+  /// Title of the Git author identity recovery dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Git Author Identity'**
+  String get gitAuthorIdentityTitle;
+
+  /// Explanation in the Git author identity recovery dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter the identity Git should record on commits. BusyMark will save it and retry this commit.'**
+  String get gitAuthorIdentityMessage;
+
+  /// Git commit author name field label.
+  ///
+  /// In en, this message translates to:
+  /// **'Name'**
+  String get gitAuthorName;
+
+  /// Git commit author email field label.
+  ///
+  /// In en, this message translates to:
+  /// **'Email'**
+  String get gitAuthorEmail;
+
+  /// Switch label for saving Git identity globally.
+  ///
+  /// In en, this message translates to:
+  /// **'Use for all repositories'**
+  String get gitAuthorIdentityGlobal;
+
+  /// Description of global Git identity scope in the Snap.
+  ///
+  /// In en, this message translates to:
+  /// **'When installed as a Snap, this applies to repositories opened in BusyMark.'**
+  String get gitAuthorIdentityGlobalDescription;
+
+  /// Action that saves Git author identity and retries a commit.
+  ///
+  /// In en, this message translates to:
+  /// **'Save and Commit'**
+  String get gitSaveIdentityAndCommit;
+
   /// Git error message.
   ///
   /// In en, this message translates to:
-  /// **'Git authentication failed. In the snap, SSH remotes may require connecting the ssh-keys interface.'**
+  /// **'Git authentication failed.'**
   String get gitErrorAuthentication;
 
   /// Git error message.
@@ -4929,240 +5331,24 @@ abstract class AppLocalizations {
   /// **'Export Writerside as PDF'**
   String get exportWritersideAsPdf;
 
-  /// Introduction to Writerside PDF export.
-  ///
-  /// In en, this message translates to:
-  /// **'Choose an instance and PDF settings. BusyMark uses JetBrains’ official Writerside builder.'**
-  String get writersidePdfExportDescription;
-
   /// Group title for selecting Writerside PDF content.
   ///
   /// In en, this message translates to:
   /// **'Export content'**
   String get writersidePdfContent;
 
-  /// Label for the source of Writerside PDF settings.
-  ///
-  /// In en, this message translates to:
-  /// **'PDF settings'**
-  String get writersidePdfSettings;
-
-  /// Option to configure Writerside PDF settings in the export dialog.
-  ///
-  /// In en, this message translates to:
-  /// **'Configure for this export'**
-  String get writersidePdfConfigureHere;
-
-  /// Option to use an existing Writerside PDF configuration file.
-  ///
-  /// In en, this message translates to:
-  /// **'Use project configuration'**
-  String get writersidePdfProjectConfiguration;
-
-  /// Writerside PDF configuration file selector label.
-  ///
-  /// In en, this message translates to:
-  /// **'PDF configuration file'**
-  String get writersidePdfConfigurationFile;
-
   /// Writerside PDF page settings group title.
   ///
   /// In en, this message translates to:
   /// **'Page'**
   String get writersidePdfPage;
 
-  /// Writerside PDF keymap selector label.
-  ///
-  /// In en, this message translates to:
-  /// **'Keymap'**
-  String get writersidePdfKeymap;
-
-  /// Writerside PDF option that omits a keymap layout.
-  ///
-  /// In en, this message translates to:
-  /// **'No keymap'**
-  String get writersidePdfNoKeymap;
-
-  /// Writerside PDF table-of-contents title field.
-  ///
-  /// In en, this message translates to:
-  /// **'Table of contents title'**
-  String get writersidePdfTocTitle;
-
-  /// Writerside PDF cover-page settings group title.
-  ///
-  /// In en, this message translates to:
-  /// **'Cover page'**
-  String get writersidePdfCover;
-
-  /// Toggle that includes a cover page in a Writerside PDF.
-  ///
-  /// In en, this message translates to:
-  /// **'Include cover page'**
-  String get writersidePdfIncludeCover;
-
-  /// Writerside PDF cover title field.
-  ///
-  /// In en, this message translates to:
-  /// **'Cover title'**
-  String get writersidePdfCoverTitle;
-
-  /// Writerside PDF cover description field.
-  ///
-  /// In en, this message translates to:
-  /// **'Cover description'**
-  String get writersidePdfCoverDescription;
-
-  /// Writerside PDF cover copyright field.
-  ///
-  /// In en, this message translates to:
-  /// **'Copyright'**
-  String get writersidePdfCopyright;
-
-  /// Writerside PDF cover logo path field.
-  ///
-  /// In en, this message translates to:
-  /// **'Cover logo'**
-  String get writersidePdfCoverLogo;
-
-  /// Action that selects a Writerside PDF cover logo.
-  ///
-  /// In en, this message translates to:
-  /// **'Choose cover logo'**
-  String get writersidePdfChooseCoverLogo;
-
-  /// Writerside PDF header and footer settings group title.
-  ///
-  /// In en, this message translates to:
-  /// **'Header and footer'**
-  String get writersidePdfHeaderAndFooter;
-
-  /// Writerside PDF page header field.
-  ///
-  /// In en, this message translates to:
-  /// **'Header'**
-  String get writersidePdfHeader;
-
-  /// Writerside PDF page footer field.
-  ///
-  /// In en, this message translates to:
-  /// **'Footer'**
-  String get writersidePdfFooter;
-
-  /// Description of advanced Writerside PDF settings.
-  ///
-  /// In en, this message translates to:
-  /// **'These values map the opened module to the builder’s source layout.'**
-  String get writersidePdfAdvancedDescription;
-
-  /// Writerside builder module-name field.
-  ///
-  /// In en, this message translates to:
-  /// **'Module name'**
-  String get writersidePdfModuleName;
-
-  /// Writerside builder source-root field.
-  ///
-  /// In en, this message translates to:
-  /// **'Source root'**
-  String get writersidePdfSourceRoot;
-
-  /// Action that selects the Writerside builder source root.
-  ///
-  /// In en, this message translates to:
-  /// **'Choose source root'**
-  String get writersidePdfChooseSourceRoot;
-
-  /// JetBrains Writerside builder image version field.
-  ///
-  /// In en, this message translates to:
-  /// **'Builder version'**
-  String get writersidePdfBuilderVersion;
-
-  /// Toggle that allows network access in the Writerside builder container.
-  ///
-  /// In en, this message translates to:
-  /// **'Allow network during build'**
-  String get writersidePdfAllowNetwork;
-
-  /// Security guidance for Writerside builder network access.
-  ///
-  /// In en, this message translates to:
-  /// **'Disabled by default. Enable only when the project intentionally needs remote build resources.'**
-  String get writersidePdfAllowNetworkDescription;
-
-  /// Validation error for a missing Writerside module name.
-  ///
-  /// In en, this message translates to:
-  /// **'Enter the module name.'**
-  String get writersidePdfModuleNameRequired;
-
-  /// Validation error for a missing Writerside source root.
-  ///
-  /// In en, this message translates to:
-  /// **'Choose the source root.'**
-  String get writersidePdfSourceRootRequired;
-
-  /// Validation error for an invalid Writerside builder version.
-  ///
-  /// In en, this message translates to:
-  /// **'Enter a valid builder version.'**
-  String get writersidePdfBuilderVersionInvalid;
-
-  /// Dialog title when the Writerside builder image is not installed.
-  ///
-  /// In en, this message translates to:
-  /// **'Writerside builder required'**
-  String get writersidePdfBuilderRequired;
-
-  /// Consent prompt before downloading the Writerside builder image.
-  ///
-  /// In en, this message translates to:
-  /// **'BusyMark uses the official {image} container image. Download it now? The image is large and is stored by Docker.'**
-  String writersidePdfBuilderDownloadDescription(String image);
-
-  /// Progress title while downloading the Writerside builder image.
-  ///
-  /// In en, this message translates to:
-  /// **'Downloading Writerside builder…'**
-  String get writersidePdfDownloadingBuilder;
-
   /// Progress title while building a Writerside PDF.
   ///
   /// In en, this message translates to:
   /// **'Exporting Writerside PDF…'**
   String get exportingWritersidePdf;
 
-  /// Error shown when Docker is unavailable for Writerside PDF export.
-  ///
-  /// In en, this message translates to:
-  /// **'Docker is required for Writerside PDF export. Install and start Docker, then try again.'**
-  String get writersidePdfDockerUnavailable;
-
-  /// Error shown when the Writerside builder image cannot be used.
-  ///
-  /// In en, this message translates to:
-  /// **'The requested Writerside builder image is not available.'**
-  String get writersidePdfBuilderUnavailable;
-
-  /// Error shown for an invalid Writerside PDF configuration.
-  ///
-  /// In en, this message translates to:
-  /// **'The Writerside PDF configuration is invalid.'**
-  String get writersidePdfConfigurationInvalid;
-
-  /// Error shown when the Writerside PDF build fails.
-  ///
-  /// In en, this message translates to:
-  /// **'The Writerside builder could not create the PDF.'**
-  String get writersidePdfBuildFailed;
-
-  /// Error shown when the Writerside builder output is missing or invalid.
-  ///
-  /// In en, this message translates to:
-  /// **'The Writerside builder did not produce a valid PDF.'**
-  String get writersidePdfInvalidOutput;
-
   /// Settings section and editing menu label for artificial-intelligence features.
   ///
   /// In en, this message translates to:
@@ -5187,12 +5373,30 @@ abstract class AppLocalizations {
   /// **'AI editing is explicit. BusyMark sends only the context shown for the selected provider and never applies a proposal without review.'**
   String get aiLocalOnlyDescription;
 
-  /// Settings label for the active AI provider.
+  /// Label for an AI provider selection.
   ///
   /// In en, this message translates to:
   /// **'AI provider'**
   String get aiProvider;
 
+  /// Settings label for the provider selected by default for AI actions.
+  ///
+  /// In en, this message translates to:
+  /// **'Default provider'**
+  String get aiDefaultProvider;
+
+  /// Settings label for choosing which AI provider configuration to edit.
+  ///
+  /// In en, this message translates to:
+  /// **'Configure provider'**
+  String get aiConfigureProvider;
+
+  /// Dialog title shown before selecting the AI provider for an action.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose AI provider'**
+  String get aiChooseProvider;
+
   /// Settings label for the local Ollama origin.
   ///
   /// In en, this message translates to:
@@ -5223,10 +5427,10 @@ abstract class AppLocalizations {
   /// **'Connected. {count} installed model(s) found.'**
   String aiConnectionReady(int count);
 
-  /// Ollama connection status when no model is installed.
+  /// AI model setting shown before a model has been selected or discovered.
   ///
   /// In en, this message translates to:
-  /// **'Ollama is running, but no installed models were found.'**
+  /// **'No model selected.'**
   String get aiNoModels;
 
   /// Generic failure shown while testing AI generation.
@@ -5415,24 +5619,6 @@ abstract class AppLocalizations {
   /// **'Content sent to AI'**
   String get aiContentSentToAi;
 
-  /// Privacy notice when AI is disabled.
-  ///
-  /// In en, this message translates to:
-  /// **'AI is disabled. BusyMark never sends document content without an explicit AI action.'**
-  String get aiPrivacyDisabled;
-
-  /// Privacy notice for local Ollama.
-  ///
-  /// In en, this message translates to:
-  /// **'BusyMark sends only the context shown in the review dialog to the configured loopback Ollama service. Proposals are never applied without review.'**
-  String get aiPrivacyLocal;
-
-  /// Privacy notice for a selected cloud provider.
-  ///
-  /// In en, this message translates to:
-  /// **'BusyMark sends only the context shown in the review dialog to {provider}. Requests are stateless and proposals are never applied without review.'**
-  String aiPrivacyCloud(String provider);
-
   /// Label for a cloud AI provider API key.
   ///
   /// In en, this message translates to:
@@ -5505,6 +5691,12 @@ abstract class AppLocalizations {
   /// **'Preferred model'**
   String get aiPreferredModel;
 
+  /// Label for selecting a model for one AI request.
+  ///
+  /// In en, this message translates to:
+  /// **'Model'**
+  String get aiModel;
+
   /// Local monthly AI usage summary.
   ///
   /// In en, this message translates to:
@@ -5630,6 +5822,24 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Table header cells must identify their columns; complete each empty header.'**
   String get diagnosticMarkdownTableEmptyHeader;
+
+  /// Tooltip and diagnostic text shown when a mathematical expression cannot be rendered.
+  ///
+  /// In en, this message translates to:
+  /// **'The mathematical expression could not be rendered.'**
+  String get mathRenderFailed;
+
+  /// Editor action that inserts an inline mathematical expression.
+  ///
+  /// In en, this message translates to:
+  /// **'Inline math'**
+  String get inlineMath;
+
+  /// Editor action that inserts a display mathematical expression.
+  ///
+  /// In en, this message translates to:
+  /// **'Display math'**
+  String get displayMath;
 }
 
 class _AppLocalizationsDelegate
diff --git a/lib/l10n/generated/app_localizations_ar.dart b/lib/l10n/generated/app_localizations_ar.dart
index dbe25f7f..ad67f471 100644
--- a/lib/l10n/generated/app_localizations_ar.dart
+++ b/lib/l10n/generated/app_localizations_ar.dart
@@ -217,6 +217,19 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'اختصارات لوحة المفاتيح';
 
+  @override
+  String get commandPalette => 'لوحة الأوامر';
+
+  @override
+  String get commandPaletteHint => 'اكتب أمرًا';
+
+  @override
+  String get commandPaletteEmpty => 'لا توجد أوامر مطابقة';
+
+  @override
+  String get commandUnavailableInContext =>
+      'هذا الأمر غير متاح في السياق الحالي.';
+
   @override
   String get lightTheme => 'فاتح';
 
@@ -696,6 +709,14 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'النافذة';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'إعادة فتح مساحة العمل السابقة عند بدء التشغيل';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'افتح مساحة العمل وعلامات التبويب من الجلسة السابقة عند بدء BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'التأكيد قبل الإغلاق عند وجود تغييرات غير محفوظة';
@@ -751,6 +772,11 @@ class AppLocalizationsAr extends AppLocalizations {
     return 'لديك تغييرات غير محفوظة في ⁨$fileName⁩. هل تريد حفظها قبل المتابعة؟';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return 'يحتوي $count من المستندات على تغييرات غير محفوظة. هل تريد حفظها قبل المتابعة؟';
+  }
+
   @override
   String get fileChangedOnDisk => 'تغيّر الملف على القرص';
 
@@ -791,6 +817,39 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get image => 'صورة';
 
+  @override
+  String get video => 'فيديو';
+
+  @override
+  String get openVideo => 'تشغيل الفيديو';
+
+  @override
+  String get pauseVideo => 'إيقاف الفيديو مؤقتًا';
+
+  @override
+  String get videoUnavailable => 'الفيديو غير متاح';
+
+  @override
+  String get videoPreview => 'معاينة الفيديو';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource => 'يفتقد الفيديو سمة src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'مصدر فيديو غير مدعوم: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'ملف الفيديو غير موجود: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'صورة معاينة الفيديو غير موجودة: $preview';
+  }
+
   @override
   String get inlineImage => 'صورة مضمنة';
 
@@ -885,6 +944,18 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get deleteColumn => 'حذف العمود';
 
+  @override
+  String get tableAlignmentUnspecified => 'المحاذاة: غير محددة';
+
+  @override
+  String get tableAlignmentLeft => 'المحاذاة: إلى اليسار';
+
+  @override
+  String get tableAlignmentCenter => 'المحاذاة: إلى الوسط';
+
+  @override
+  String get tableAlignmentRight => 'المحاذاة: إلى اليمين';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'الصف $rowNumber';
@@ -1324,6 +1395,131 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'تعبير نمطي';
 
+  @override
+  String get sourceSearchReplacement => 'استبدال بـ';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'استبدال المطابقة الحالية';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'استبدال والبحث عن التالي';
+
+  @override
+  String get sourceSearchReplaceAll => 'استبدال الكل';
+
+  @override
+  String get workspaceReplace => 'استبدال في مساحة العمل';
+
+  @override
+  String get reviewReplacements => 'مراجعة الاستبدالات';
+
+  @override
+  String get applyReplacements => 'تطبيق الاستبدالات';
+
+  @override
+  String get skippedFiles => 'الملفات المتخطاة';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'محتوى المحرر غير المحفوظ';
+
+  @override
+  String get workspaceReplaceDiskContent => 'المحتوى المحفوظ على القرص';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'تحديد كل المطابقات وعددها $count';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'تم استبدال $matches مطابقة في $files ملفًا؛ وتم تخطي $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '⁨$encoding⁩ · ⁨$lineEnding⁩ · سطر جديد نهائي';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '⁨$encoding⁩ · ⁨$lineEnding⁩ · بلا سطر جديد نهائي';
+  }
+
+  @override
+  String get normalizeLineEndings => 'توحيد نهايات الأسطر';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'يحتوي هذا المستند على نهايات أسطر مختلطة. اختر تنسيقًا.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return 'يستخدم الملف ⁨$fileName⁩ نهايات أسطر مختلطة. اختر التنسيق قبل الاستبدال.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'تم تخطي ملف يتجاوز الحجم المسموح.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable => 'تم تخطي ملف تعذرت قراءته.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'تم تخطي ملف بترميز UTF-8 غير صالح.';
+
+  @override
+  String get workspaceReplaceIssueTruncated => 'تم اقتطاع معاينة الاستبدال.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'تم تخطي ملف تغيّر بعد المعاينة.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'تم تخطي مخزن محرر مؤقت تغيّر بعد المعاينة.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'اختر توحيد LF أو CRLF قبل الاستبدال.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'توقف التراجع لأن الملف تغير بالتزامن. قد تبقى بعض الاستبدالات؛ حُفظ المحتوى المُزاح في المسار أدناه.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'لم تُطبّق أي استبدالات لأن المجموعة التي تمت مراجعتها تعذر حفظها بأمان.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'تغييرات خارجية — ⁨$fileName⁩';
+  }
+
+  @override
+  String get externalFileDeleted => 'تم حذف هذا الملف من القرص.';
+
+  @override
+  String get externalFileChanged =>
+      'تغيّر هذا الملف على القرص بينما لديك تعديلات غير محفوظة.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'تمت استعادة المحتوى غير المحفوظ للملف $fileName. راجعه، ثم احفظه أو احفظه باسم جديد أو تجاهله.';
+  }
+
+  @override
+  String get compare => 'مقارنة';
+
+  @override
+  String get reloadFromDisk => 'إعادة التحميل من القرص';
+
+  @override
+  String get keepMine => 'الاحتفاظ بنسختي';
+
+  @override
+  String get saveAs => 'حفظ باسم';
+
   @override
   String get sourceSearchInvalidRegex => 'تعبير نمطي غير صالح';
 
@@ -1334,6 +1530,12 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get nothingToRead => 'لا يوجد محتوى للقراءة';
 
+  @override
+  String get admonition => 'تنبيه';
+
+  @override
+  String get quote => 'اقتباس';
+
   @override
   String get note => 'ملاحظة';
 
@@ -1461,6 +1663,16 @@ class AppLocalizationsAr extends AppLocalizations {
     return 'فشل التحقق: ⁨$error⁩';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'تمت استعادة $count من المستندات غير المحفوظة. راجع كل مستند تمت استعادته قبل المتابعة.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'تعذرت استعادة $count من سجلات الاستعادة التالفة. تظل المستندات الصالحة التي تمت استعادتها متاحة.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'المسار غير موجود: ⁨$path⁩';
@@ -2298,6 +2510,9 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get fileActions => 'إجراءات الملف';
 
+  @override
+  String get actions => 'إجراءات';
+
   @override
   String get gitStatusAdded => 'مضاف';
 
@@ -2370,8 +2585,34 @@ class AppLocalizationsAr extends AppLocalizations {
       'تباعد الفرع. عالج الدمج أو إعادة التأسيس خارج هذا الإصدار من BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'فشلت مصادقة Git. في حزمة snap، قد تتطلب مستودعات SSH البعيدة توصيل واجهة ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'يحتاج Git إلى اسم المؤلف وعنوان بريده الإلكتروني قبل إنشاء الالتزام.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'هوية مؤلف Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'أدخل الهوية التي يجب أن يسجلها Git في الالتزامات. سيحفظها BusyMark ويعيد محاولة هذا الالتزام.';
+
+  @override
+  String get gitAuthorName => 'الاسم';
+
+  @override
+  String get gitAuthorEmail => 'البريد الإلكتروني';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'استخدامها لجميع المستودعات';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'عند التثبيت كحزمة Snap، ينطبق هذا على المستودعات المفتوحة في BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'حفظ وإنشاء الالتزام';
+
+  @override
+  String get gitErrorAuthentication => 'فشلت مصادقة Git.';
 
   @override
   String get gitErrorNetwork => 'فشلت عملية Git عبر الشبكة.';
@@ -2949,135 +3190,15 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'تصدير Writerside بصيغة PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'اختر مثيلاً وإعدادات PDF. يستخدم BusyMark أداة البناء الرسمية لـ Writerside من JetBrains.';
-
   @override
   String get writersidePdfContent => 'محتوى التصدير';
 
-  @override
-  String get writersidePdfSettings => 'إعدادات PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'تهيئة لهذا التصدير';
-
-  @override
-  String get writersidePdfProjectConfiguration => 'استخدام تهيئة المشروع';
-
-  @override
-  String get writersidePdfConfigurationFile => 'ملف تهيئة PDF';
-
   @override
   String get writersidePdfPage => 'الصفحة';
 
-  @override
-  String get writersidePdfKeymap => 'تخطيط المفاتيح';
-
-  @override
-  String get writersidePdfNoKeymap => 'بلا تخطيط مفاتيح';
-
-  @override
-  String get writersidePdfTocTitle => 'عنوان جدول المحتويات';
-
-  @override
-  String get writersidePdfCover => 'صفحة الغلاف';
-
-  @override
-  String get writersidePdfIncludeCover => 'تضمين صفحة غلاف';
-
-  @override
-  String get writersidePdfCoverTitle => 'عنوان الغلاف';
-
-  @override
-  String get writersidePdfCoverDescription => 'وصف الغلاف';
-
-  @override
-  String get writersidePdfCopyright => 'حقوق النشر';
-
-  @override
-  String get writersidePdfCoverLogo => 'شعار الغلاف';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'اختيار شعار الغلاف';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'رأس الصفحة وتذييلها';
-
-  @override
-  String get writersidePdfHeader => 'رأس الصفحة';
-
-  @override
-  String get writersidePdfFooter => 'تذييل الصفحة';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'تربط هذه القيم الوحدة المفتوحة بتخطيط المصادر في أداة البناء.';
-
-  @override
-  String get writersidePdfModuleName => 'اسم الوحدة';
-
-  @override
-  String get writersidePdfSourceRoot => 'جذر المصادر';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'اختيار جذر المصادر';
-
-  @override
-  String get writersidePdfBuilderVersion => 'إصدار أداة البناء';
-
-  @override
-  String get writersidePdfAllowNetwork => 'السماح بالشبكة أثناء البناء';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'معطل افتراضيًا. مكّنه فقط إذا كان المشروع يحتاج عمدًا إلى موارد بناء بعيدة.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'أدخل اسم الوحدة.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'اختر جذر المصادر.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'أدخل إصدارًا صالحًا لأداة البناء.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'أداة بناء Writerside مطلوبة';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'يستخدم BusyMark صورة الحاوية الرسمية ⁨$image⁩. هل تريد تنزيلها الآن؟ الصورة كبيرة وسيخزنها Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'جارٍ تنزيل أداة بناء Writerside…';
-
   @override
   String get exportingWritersidePdf => 'جارٍ تصدير ملف Writerside PDF…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'يلزم Docker لتصدير Writerside إلى PDF. ثبّت Docker وشغّله ثم حاول مجددًا.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'صورة أداة بناء Writerside المطلوبة غير متاحة.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'تهيئة Writerside PDF غير صالحة.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'تعذر على أداة بناء Writerside إنشاء ملف PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'لم تُنتج أداة بناء Writerside ملف PDF صالحًا.';
-
   @override
   String get ai => 'الذكاء الاصطناعي';
 
@@ -3094,6 +3215,15 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get aiProvider => 'موفّر الذكاء الاصطناعي';
 
+  @override
+  String get aiDefaultProvider => 'موفّر الذكاء الاصطناعي الافتراضي';
+
+  @override
+  String get aiConfigureProvider => 'تهيئة موفّر الذكاء الاصطناعي';
+
+  @override
+  String get aiChooseProvider => 'اختر موفّر الذكاء الاصطناعي';
+
   @override
   String get aiOllamaEndpoint => 'نقطة نهاية Ollama';
 
@@ -3112,7 +3242,7 @@ class AppLocalizationsAr extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels => 'يعمل Ollama، لكن لم يُعثر على نماذج مثبّتة.';
+  String get aiNoModels => 'لم يتم تحديد نموذج.';
 
   @override
   String get aiConnectionFailed =>
@@ -3215,19 +3345,6 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'المحتوى المُرسل إلى الذكاء الاصطناعي';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'الذكاء الاصطناعي معطّل. لا يرسل BusyMark محتوى المستند مطلقًا من دون إجراء صريح للذكاء الاصطناعي.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'لا يرسل BusyMark إلا السياق المعروض في مربع حوار المراجعة إلى خدمة Ollama المحلية المضبوطة. لا تُطبّق الاقتراحات مطلقًا من دون مراجعة.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'لا يرسل BusyMark إلا السياق المعروض في مربع حوار المراجعة إلى ⁨$provider⁩. الطلبات عديمة الحالة، ولا تُطبّق الاقتراحات مطلقًا من دون مراجعة.';
-  }
-
   @override
   String get aiApiKey => 'مفتاح API';
 
@@ -3266,6 +3383,9 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get aiPreferredModel => 'النموذج المفضّل';
 
+  @override
+  String get aiModel => 'النموذج';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '⁨$requests⁩ طلبات · ⁨$input⁩ رموز إدخال · ⁨$output⁩ رموز إخراج';
@@ -3349,4 +3469,13 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'يجب أن تعرّف رؤوس الجدول أعمدتها؛ أكمل كل رأس فارغ.';
+
+  @override
+  String get mathRenderFailed => 'تعذر عرض التعبير الرياضي.';
+
+  @override
+  String get inlineMath => 'رياضيات مضمنة';
+
+  @override
+  String get displayMath => 'رياضيات معروضة';
 }
diff --git a/lib/l10n/generated/app_localizations_de.dart b/lib/l10n/generated/app_localizations_de.dart
index b03f3fdb..49567b13 100644
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -221,6 +221,19 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Tastaturkürzel';
 
+  @override
+  String get commandPalette => 'Befehlspalette';
+
+  @override
+  String get commandPaletteHint => 'Befehl eingeben';
+
+  @override
+  String get commandPaletteEmpty => 'Keine passenden Befehle';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Dieser Befehl ist im aktuellen Kontext nicht verfügbar.';
+
   @override
   String get lightTheme => 'Hell';
 
@@ -722,6 +735,14 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Fenster';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Vorherigen Arbeitsbereich beim Start erneut öffnen';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Arbeitsbereich und Tabs der vorherigen Sitzung beim Start von BusyMark öffnen.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Vor dem Schließen bei ungespeicherten Änderungen bestätigen';
@@ -771,6 +792,11 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Für $fileName liegen ungespeicherte Änderungen vor. Vor dem Fortfahren speichern?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count Dokumente enthalten ungespeicherte Änderungen. Vor dem Fortfahren speichern?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Datei auf dem Datenträger geändert';
 
@@ -811,6 +837,40 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get image => 'Bild';
 
+  @override
+  String get video => 'Video';
+
+  @override
+  String get openVideo => 'Video abspielen';
+
+  @override
+  String get pauseVideo => 'Video pausieren';
+
+  @override
+  String get videoUnavailable => 'Video nicht verfügbar';
+
+  @override
+  String get videoPreview => 'Videovorschau';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Dem Video fehlt das src-Attribut.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Nicht unterstützte Videoquelle: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Videodatei ist nicht vorhanden: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Videovorschaubild ist nicht vorhanden: $preview';
+  }
+
   @override
   String get inlineImage => 'Inline-Bild';
 
@@ -906,6 +966,18 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get deleteColumn => 'Spalte löschen';
 
+  @override
+  String get tableAlignmentUnspecified => 'Ausrichtung: Nicht festgelegt';
+
+  @override
+  String get tableAlignmentLeft => 'Ausrichtung: Links';
+
+  @override
+  String get tableAlignmentCenter => 'Ausrichtung: Mitte';
+
+  @override
+  String get tableAlignmentRight => 'Ausrichtung: Rechts';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Zeile $rowNumber';
@@ -1336,6 +1408,134 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Regulärer Ausdruck';
 
+  @override
+  String get sourceSearchReplacement => 'Ersetzen durch';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Aktuellen Treffer ersetzen';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Ersetzen und weitersuchen';
+
+  @override
+  String get sourceSearchReplaceAll => 'Alle ersetzen';
+
+  @override
+  String get workspaceReplace => 'Im Arbeitsbereich ersetzen';
+
+  @override
+  String get reviewReplacements => 'Ersetzungen prüfen';
+
+  @override
+  String get applyReplacements => 'Ersetzungen anwenden';
+
+  @override
+  String get skippedFiles => 'Übersprungene Dateien';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Ungespeicherter Editorinhalt';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Gespeicherter Festplatteninhalt';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Alle $count Treffer auswählen';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return '$matches Treffer in $files Dateien ersetzt; $skipped übersprungen.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Abschließender Zeilenumbruch';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Kein abschließender Zeilenumbruch';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Zeilenenden normalisieren';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Dieses Dokument enthält gemischte Zeilenenden. Wählen Sie ein Format.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName verwendet gemischte Zeilenenden. Wählen Sie vor dem Ersetzen das gewünschte Format.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'Eine zu große Datei wurde übersprungen.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Eine nicht lesbare Datei wurde übersprungen.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Eine Datei ohne gültige UTF-8-Codierung wurde übersprungen.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'Die Ersetzungsvorschau wurde gekürzt.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Eine Datei, die sich nach der Vorschau geändert hat, wurde übersprungen.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Ein Editorpuffer, der sich nach der Vorschau geändert hat, wurde übersprungen.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Wählen Sie vor dem Ersetzen die Normalisierung auf LF oder CRLF.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Das Zurücksetzen wurde abgebrochen, da die Datei gleichzeitig geändert wurde. Einige Ersetzungen können bestehen bleiben; verdrängte Inhalte wurden unter dem folgenden Pfad gesichert.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Es wurden keine Ersetzungen vorgenommen, da die geprüfte Auswahl nicht sicher gespeichert werden konnte.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Externe Änderungen — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted =>
+      'Diese Datei wurde auf dem Datenträger gelöscht.';
+
+  @override
+  String get externalFileChanged =>
+      'Diese Datei wurde auf dem Datenträger geändert, während ungespeicherte Änderungen vorliegen.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Ungespeicherter Inhalt für $fileName wurde wiederhergestellt. Prüfen Sie ihn und speichern Sie ihn, speichern Sie ihn unter einem neuen Namen oder verwerfen Sie ihn.';
+  }
+
+  @override
+  String get compare => 'Vergleichen';
+
+  @override
+  String get reloadFromDisk => 'Vom Datenträger neu laden';
+
+  @override
+  String get keepMine => 'Meine Version behalten';
+
+  @override
+  String get saveAs => 'Speichern unter';
+
   @override
   String get sourceSearchInvalidRegex => 'Ungültiger regulärer Ausdruck';
 
@@ -1346,6 +1546,12 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get nothingToRead => 'Nichts zu lesen';
 
+  @override
+  String get admonition => 'Hinweisblock';
+
+  @override
+  String get quote => 'Zitat';
+
   @override
   String get note => 'Hinweis';
 
@@ -1473,6 +1679,16 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Validierung fehlgeschlagen: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return '$count ungespeicherte Dokumente wurden wiederhergestellt. Prüfen Sie jedes wiederhergestellte Dokument, bevor Sie fortfahren.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return '$count beschädigte Wiederherstellungsdatensätze konnten nicht wiederhergestellt werden. Gültige wiederhergestellte Dokumente bleiben verfügbar.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Pfad existiert nicht: $path';
@@ -2299,6 +2515,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get fileActions => 'Dateiaktionen';
 
+  @override
+  String get actions => 'Aktionen';
+
   @override
   String get gitStatusAdded => 'Hinzugefügt';
 
@@ -2375,8 +2594,34 @@ class AppLocalizationsDe extends AppLocalizations {
       'Der Branch ist auseinandergelaufen. Führen Sie Merge oder Rebase außerhalb dieser BusyMark-Version aus.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Git-Authentifizierung fehlgeschlagen. Im Snap muss für SSH-Remotes möglicherweise die Schnittstelle ssh-keys verbunden werden.';
+  String get gitErrorAuthorIdentity =>
+      'Git benötigt vor dem Commit einen Autorennamen und eine E-Mail-Adresse.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Git-Autorenidentität';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Geben Sie die Identität ein, die Git in Commits eintragen soll. BusyMark speichert sie und wiederholt diesen Commit.';
+
+  @override
+  String get gitAuthorName => 'Autorenname';
+
+  @override
+  String get gitAuthorEmail => 'E-Mail';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Für alle Repositorys verwenden';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Bei einer Snap-Installation gilt dies für Repositorys, die in BusyMark geöffnet werden.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Speichern und committen';
+
+  @override
+  String get gitErrorAuthentication => 'Git-Authentifizierung fehlgeschlagen.';
 
   @override
   String get gitErrorNetwork => 'Git-Netzwerkvorgang fehlgeschlagen.';
@@ -2957,138 +3202,15 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Writerside als PDF exportieren';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Wählen Sie eine Instanz und die PDF-Einstellungen aus. BusyMark verwendet den offiziellen Writerside-Builder von JetBrains.';
-
   @override
   String get writersidePdfContent => 'Exportinhalt';
 
-  @override
-  String get writersidePdfSettings => 'PDF-Einstellungen';
-
-  @override
-  String get writersidePdfConfigureHere => 'Für diesen Export konfigurieren';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Projektkonfiguration verwenden';
-
-  @override
-  String get writersidePdfConfigurationFile => 'PDF-Konfigurationsdatei';
-
   @override
   String get writersidePdfPage => 'Seite';
 
-  @override
-  String get writersidePdfKeymap => 'Tastaturbelegung';
-
-  @override
-  String get writersidePdfNoKeymap => 'Keine Tastaturbelegung';
-
-  @override
-  String get writersidePdfTocTitle => 'Titel des Inhaltsverzeichnisses';
-
-  @override
-  String get writersidePdfCover => 'Deckblatt';
-
-  @override
-  String get writersidePdfIncludeCover => 'Deckblatt einfügen';
-
-  @override
-  String get writersidePdfCoverTitle => 'Deckblatttitel';
-
-  @override
-  String get writersidePdfCoverDescription => 'Deckblattbeschreibung';
-
-  @override
-  String get writersidePdfCopyright => 'Urheberrecht';
-
-  @override
-  String get writersidePdfCoverLogo => 'Deckblattlogo';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Deckblattlogo auswählen';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Kopf- und Fußzeile';
-
-  @override
-  String get writersidePdfHeader => 'Kopfzeile';
-
-  @override
-  String get writersidePdfFooter => 'Fußzeile';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Diese Werte ordnen das geöffnete Modul dem Quelllayout des Builders zu.';
-
-  @override
-  String get writersidePdfModuleName => 'Modulname';
-
-  @override
-  String get writersidePdfSourceRoot => 'Quellstammverzeichnis';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Quellstammverzeichnis auswählen';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Builder-Version';
-
-  @override
-  String get writersidePdfAllowNetwork =>
-      'Netzwerk während des Builds zulassen';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Standardmäßig deaktiviert. Nur aktivieren, wenn das Projekt bewusst entfernte Build-Ressourcen benötigt.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Geben Sie den Modulnamen ein.';
-
-  @override
-  String get writersidePdfSourceRootRequired =>
-      'Wählen Sie das Quellstammverzeichnis aus.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Geben Sie eine gültige Builder-Version ein.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Writerside-Builder erforderlich';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark verwendet das offizielle Container-Image $image. Jetzt herunterladen? Das Image ist groß und wird von Docker gespeichert.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Writerside-Builder wird heruntergeladen…';
-
   @override
   String get exportingWritersidePdf => 'Writerside-PDF wird exportiert…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker ist für den Writerside-PDF-Export erforderlich. Installieren und starten Sie Docker und versuchen Sie es erneut.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'Das angeforderte Writerside-Builder-Image ist nicht verfügbar.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Die Writerside-PDF-Konfiguration ist ungültig.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Der Writerside-Builder konnte die PDF-Datei nicht erstellen.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Der Writerside-Builder hat keine gültige PDF-Datei erzeugt.';
-
   @override
   String get ai => 'KI';
 
@@ -3105,6 +3227,15 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get aiProvider => 'KI-Anbieter';
 
+  @override
+  String get aiDefaultProvider => 'Standardanbieter';
+
+  @override
+  String get aiConfigureProvider => 'Anbieter konfigurieren';
+
+  @override
+  String get aiChooseProvider => 'KI-Anbieter auswählen';
+
   @override
   String get aiOllamaEndpoint => 'Ollama-Endpunkt';
 
@@ -3123,8 +3254,7 @@ class AppLocalizationsDe extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama wird ausgeführt, aber es wurden keine installierten Modelle gefunden.';
+  String get aiNoModels => 'Kein Modell ausgewählt.';
 
   @override
   String get aiConnectionFailed =>
@@ -3227,19 +3357,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'An KI gesendeter Inhalt';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'KI ist deaktiviert. BusyMark sendet Dokumentinhalte niemals ohne eine ausdrückliche KI-Aktion.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark sendet nur den im Prüfdialog angezeigten Kontext an den konfigurierten lokalen Ollama-Dienst. Vorschläge werden nie ohne Prüfung übernommen.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark sendet nur den im Prüfdialog angezeigten Kontext an $provider. Anfragen sind zustandslos, und Vorschläge werden nie ohne Prüfung übernommen.';
-  }
-
   @override
   String get aiApiKey => 'API-Schlüssel';
 
@@ -3279,6 +3396,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Bevorzugtes Modell';
 
+  @override
+  String get aiModel => 'Modell';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests Anfragen · $input Eingabetoken · $output Ausgabetoken';
@@ -3365,4 +3485,14 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Tabellenüberschriften müssen ihre Spalten bezeichnen; füllen Sie jede leere Überschrift aus.';
+
+  @override
+  String get mathRenderFailed =>
+      'Der mathematische Ausdruck konnte nicht dargestellt werden.';
+
+  @override
+  String get inlineMath => 'Mathematik im Text';
+
+  @override
+  String get displayMath => 'Mathematische Formel als Block';
 }
diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart
index a7b87870..21cbb696 100644
--- a/lib/l10n/generated/app_localizations_en.dart
+++ b/lib/l10n/generated/app_localizations_en.dart
@@ -218,6 +218,19 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Keyboard Shortcuts';
 
+  @override
+  String get commandPalette => 'Command Palette';
+
+  @override
+  String get commandPaletteHint => 'Type a command';
+
+  @override
+  String get commandPaletteEmpty => 'No matching commands';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Unavailable in the current editor context';
+
   @override
   String get lightTheme => 'Light';
 
@@ -705,6 +718,14 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Window';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Reopen previous workspace on startup';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Open the workspace and tabs from the previous session when BusyMark starts.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Confirm before closing with unsaved changes';
@@ -754,6 +775,18 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'You have unsaved changes in $fileName. Save them before continuing?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other:
+          '$count documents have unsaved changes. Save them before continuing?',
+      one: '1 document has unsaved changes. Save it before continuing?',
+    );
+    return '$_temp0';
+  }
+
   @override
   String get fileChangedOnDisk => 'File changed on disk';
 
@@ -794,6 +827,40 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get image => 'Image';
 
+  @override
+  String get video => 'Video';
+
+  @override
+  String get openVideo => 'Play video';
+
+  @override
+  String get pauseVideo => 'Pause video';
+
+  @override
+  String get videoUnavailable => 'Video unavailable';
+
+  @override
+  String get videoPreview => 'Video preview';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Video is missing its src attribute.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Unsupported video source: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Video file does not exist: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Video preview image does not exist: $preview';
+  }
+
   @override
   String get inlineImage => 'Inline image';
 
@@ -888,6 +955,18 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get deleteColumn => 'Delete column';
 
+  @override
+  String get tableAlignmentUnspecified => 'Alignment: Unspecified';
+
+  @override
+  String get tableAlignmentLeft => 'Alignment: Left';
+
+  @override
+  String get tableAlignmentCenter => 'Alignment: Center';
+
+  @override
+  String get tableAlignmentRight => 'Alignment: Right';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Row $rowNumber';
@@ -1313,6 +1392,132 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Regex';
 
+  @override
+  String get sourceSearchReplacement => 'Replace with';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Replace current';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Replace and find next';
+
+  @override
+  String get sourceSearchReplaceAll => 'Replace all';
+
+  @override
+  String get workspaceReplace => 'Replace in Workspace';
+
+  @override
+  String get reviewReplacements => 'Review replacements';
+
+  @override
+  String get applyReplacements => 'Apply replacements';
+
+  @override
+  String get skippedFiles => 'Skipped files';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Unsaved editor content';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Saved disk content';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Select all $count matches';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Replaced $matches matches in $files files; skipped $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Final newline';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · No final newline';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normalize line endings';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'This document contains mixed line endings. Choose a format.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName uses mixed line endings. Choose the format to use before replacing.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized => 'Skipped an oversized file.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Skipped a file that could not be read.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Skipped a file that is not valid UTF-8.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'The replacement preview was truncated.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Skipped a file that changed after the preview.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Skipped an editor buffer that changed after the preview.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Choose LF or CRLF normalization before replacing.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Rollback stopped because the file changed concurrently. Some replacements may remain; displaced content was preserved at the path below.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'The reviewed replacement could not be committed; no files were changed.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'External changes — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'This file was deleted on disk.';
+
+  @override
+  String get externalFileChanged =>
+      'This file changed on disk while you have unsaved edits.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Recovered unsaved content for $fileName. Inspect it, then save, save as, or discard it.';
+  }
+
+  @override
+  String get compare => 'Compare';
+
+  @override
+  String get reloadFromDisk => 'Reload from Disk';
+
+  @override
+  String get keepMine => 'Keep Mine';
+
+  @override
+  String get saveAs => 'Save As';
+
   @override
   String get sourceSearchInvalidRegex => 'Invalid regular expression';
 
@@ -1323,6 +1528,12 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get nothingToRead => 'Nothing to read';
 
+  @override
+  String get admonition => 'Admonition';
+
+  @override
+  String get quote => 'Quote';
+
   @override
   String get note => 'Note';
 
@@ -1450,6 +1661,32 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Validation failed: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other:
+          'Recovered $count unsaved documents. Review each one before saving or discarding it.',
+      one:
+          'Recovered 1 unsaved document. Review it before saving or discarding it.',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other:
+          '$count damaged recovery records could not be restored. Valid recovery records remain available.',
+      one:
+          'One damaged recovery record could not be restored. The original recovery file was preserved for inspection.',
+    );
+    return '$_temp0';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Path does not exist: $path';
@@ -2272,6 +2509,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get fileActions => 'File actions';
 
+  @override
+  String get actions => 'Actions';
+
   @override
   String get gitStatusAdded => 'Added';
 
@@ -2345,8 +2585,34 @@ class AppLocalizationsEn extends AppLocalizations {
       'Branch has diverged. Resolve merge or rebase outside this BusyMark version.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Git authentication failed. In the snap, SSH remotes may require connecting the ssh-keys interface.';
+  String get gitErrorAuthorIdentity =>
+      'Git needs an author name and email address before it can commit.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Git Author Identity';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Enter the identity Git should record on commits. BusyMark will save it and retry this commit.';
+
+  @override
+  String get gitAuthorName => 'Name';
+
+  @override
+  String get gitAuthorEmail => 'Email';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Use for all repositories';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'When installed as a Snap, this applies to repositories opened in BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Save and Commit';
+
+  @override
+  String get gitErrorAuthentication => 'Git authentication failed.';
 
   @override
   String get gitErrorNetwork => 'Git network operation failed.';
@@ -2923,135 +3189,15 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Export Writerside as PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Choose an instance and PDF settings. BusyMark uses JetBrains’ official Writerside builder.';
-
   @override
   String get writersidePdfContent => 'Export content';
 
-  @override
-  String get writersidePdfSettings => 'PDF settings';
-
-  @override
-  String get writersidePdfConfigureHere => 'Configure for this export';
-
-  @override
-  String get writersidePdfProjectConfiguration => 'Use project configuration';
-
-  @override
-  String get writersidePdfConfigurationFile => 'PDF configuration file';
-
   @override
   String get writersidePdfPage => 'Page';
 
-  @override
-  String get writersidePdfKeymap => 'Keymap';
-
-  @override
-  String get writersidePdfNoKeymap => 'No keymap';
-
-  @override
-  String get writersidePdfTocTitle => 'Table of contents title';
-
-  @override
-  String get writersidePdfCover => 'Cover page';
-
-  @override
-  String get writersidePdfIncludeCover => 'Include cover page';
-
-  @override
-  String get writersidePdfCoverTitle => 'Cover title';
-
-  @override
-  String get writersidePdfCoverDescription => 'Cover description';
-
-  @override
-  String get writersidePdfCopyright => 'Copyright';
-
-  @override
-  String get writersidePdfCoverLogo => 'Cover logo';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Choose cover logo';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Header and footer';
-
-  @override
-  String get writersidePdfHeader => 'Header';
-
-  @override
-  String get writersidePdfFooter => 'Footer';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'These values map the opened module to the builder’s source layout.';
-
-  @override
-  String get writersidePdfModuleName => 'Module name';
-
-  @override
-  String get writersidePdfSourceRoot => 'Source root';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Choose source root';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Builder version';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Allow network during build';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Disabled by default. Enable only when the project intentionally needs remote build resources.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Enter the module name.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'Choose the source root.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Enter a valid builder version.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Writerside builder required';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark uses the official $image container image. Download it now? The image is large and is stored by Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Downloading Writerside builder…';
-
   @override
   String get exportingWritersidePdf => 'Exporting Writerside PDF…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker is required for Writerside PDF export. Install and start Docker, then try again.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'The requested Writerside builder image is not available.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'The Writerside PDF configuration is invalid.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'The Writerside builder could not create the PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'The Writerside builder did not produce a valid PDF.';
-
   @override
   String get ai => 'AI';
 
@@ -3068,6 +3214,15 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get aiProvider => 'AI provider';
 
+  @override
+  String get aiDefaultProvider => 'Default provider';
+
+  @override
+  String get aiConfigureProvider => 'Configure provider';
+
+  @override
+  String get aiChooseProvider => 'Choose AI provider';
+
   @override
   String get aiOllamaEndpoint => 'Ollama endpoint';
 
@@ -3086,8 +3241,7 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama is running, but no installed models were found.';
+  String get aiNoModels => 'No model selected.';
 
   @override
   String get aiConnectionFailed =>
@@ -3190,19 +3344,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Content sent to AI';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'AI is disabled. BusyMark never sends document content without an explicit AI action.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark sends only the context shown in the review dialog to the configured loopback Ollama service. Proposals are never applied without review.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark sends only the context shown in the review dialog to $provider. Requests are stateless and proposals are never applied without review.';
-  }
-
   @override
   String get aiApiKey => 'API key';
 
@@ -3241,6 +3382,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Preferred model';
 
+  @override
+  String get aiModel => 'Model';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests requests · $input input tokens · $output output tokens';
@@ -3325,4 +3469,14 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Table header cells must identify their columns; complete each empty header.';
+
+  @override
+  String get mathRenderFailed =>
+      'The mathematical expression could not be rendered.';
+
+  @override
+  String get inlineMath => 'Inline math';
+
+  @override
+  String get displayMath => 'Display math';
 }
diff --git a/lib/l10n/generated/app_localizations_es.dart b/lib/l10n/generated/app_localizations_es.dart
index f4d5a9eb..bbb9b369 100644
--- a/lib/l10n/generated/app_localizations_es.dart
+++ b/lib/l10n/generated/app_localizations_es.dart
@@ -220,6 +220,19 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Atajos de teclado';
 
+  @override
+  String get commandPalette => 'Paleta de comandos';
+
+  @override
+  String get commandPaletteHint => 'Escribe un comando';
+
+  @override
+  String get commandPaletteEmpty => 'No hay comandos coincidentes';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Este comando no está disponible en el contexto actual.';
+
   @override
   String get lightTheme => 'Claro';
 
@@ -720,6 +733,14 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Ventana';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Volver a abrir el espacio de trabajo anterior al iniciar';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Abre el espacio de trabajo y las pestañas de la sesión anterior cuando se inicia BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Confirmar antes de cerrar con cambios sin guardar';
@@ -769,6 +790,11 @@ class AppLocalizationsEs extends AppLocalizations {
     return 'Hay cambios sin guardar en $fileName. ¿Guardarlos antes de continuar?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return 'Hay $count documentos con cambios sin guardar. ¿Desea guardarlos antes de continuar?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Archivo modificado en disco';
 
@@ -809,6 +835,40 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get image => 'Imagen';
 
+  @override
+  String get video => 'Vídeo';
+
+  @override
+  String get openVideo => 'Reproducir vídeo';
+
+  @override
+  String get pauseVideo => 'Pausar vídeo';
+
+  @override
+  String get videoUnavailable => 'Vídeo no disponible';
+
+  @override
+  String get videoPreview => 'Vista previa del vídeo';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Al vídeo le falta el atributo src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Fuente de vídeo no compatible: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'El archivo de vídeo no existe: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'La imagen de vista previa del vídeo no existe: $preview';
+  }
+
   @override
   String get inlineImage => 'Imagen en línea';
 
@@ -903,6 +963,18 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get deleteColumn => 'Eliminar columna';
 
+  @override
+  String get tableAlignmentUnspecified => 'Alineación: Sin especificar';
+
+  @override
+  String get tableAlignmentLeft => 'Alineación: Izquierda';
+
+  @override
+  String get tableAlignmentCenter => 'Alineación: Centro';
+
+  @override
+  String get tableAlignmentRight => 'Alineación: Derecha';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Fila $rowNumber';
@@ -1333,6 +1405,133 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Expresión regular';
 
+  @override
+  String get sourceSearchReplacement => 'Reemplazar por';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Reemplazar actual';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Reemplazar y buscar siguiente';
+
+  @override
+  String get sourceSearchReplaceAll => 'Reemplazar todo';
+
+  @override
+  String get workspaceReplace => 'Reemplazar en el espacio de trabajo';
+
+  @override
+  String get reviewReplacements => 'Revisar reemplazos';
+
+  @override
+  String get applyReplacements => 'Aplicar reemplazos';
+
+  @override
+  String get skippedFiles => 'Archivos omitidos';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Contenido no guardado del editor';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Contenido guardado en disco';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Seleccionar las $count coincidencias';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Se reemplazaron $matches coincidencias en $files archivos; se omitieron $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Salto de línea final';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Sin salto de línea final';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normalizar finales de línea';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Este documento contiene finales de línea mezclados. Elige un formato.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName usa finales de línea mezclados. Elige el formato antes de reemplazar.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'Se omitió un archivo demasiado grande.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Se omitió un archivo que no se pudo leer.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Se omitió un archivo que no contiene UTF-8 válido.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'La vista previa de reemplazos se truncó.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Se omitió un archivo que cambió después de la vista previa.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Se omitió un búfer del editor que cambió después de la vista previa.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Elige la normalización LF o CRLF antes de reemplazar.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'La reversión se detuvo porque el archivo cambió al mismo tiempo. Es posible que queden algunos reemplazos; el contenido desplazado se conservó en la ruta indicada abajo.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'No se aplicó ningún reemplazo porque el conjunto revisado no pudo guardarse de forma segura.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Cambios externos — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Este archivo se eliminó del disco.';
+
+  @override
+  String get externalFileChanged =>
+      'Este archivo cambió en el disco mientras tienes cambios sin guardar.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Se recuperó contenido sin guardar de $fileName. Revíselo y después guárdelo, use Guardar como o descártelo.';
+  }
+
+  @override
+  String get compare => 'Comparar';
+
+  @override
+  String get reloadFromDisk => 'Recargar desde el disco';
+
+  @override
+  String get keepMine => 'Conservar mi versión';
+
+  @override
+  String get saveAs => 'Guardar como';
+
   @override
   String get sourceSearchInvalidRegex => 'Expresión regular no válida';
 
@@ -1343,6 +1542,12 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get nothingToRead => 'No hay contenido para leer';
 
+  @override
+  String get admonition => 'Aviso';
+
+  @override
+  String get quote => 'Cita';
+
   @override
   String get note => 'Nota';
 
@@ -1471,6 +1676,16 @@ class AppLocalizationsEs extends AppLocalizations {
     return 'Error de validación: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Se recuperaron $count documentos sin guardar. Revise cada documento recuperado antes de continuar.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'No se pudieron restaurar $count registros de recuperación dañados. Los documentos recuperados válidos siguen disponibles.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'La ruta no existe: $path';
@@ -2299,6 +2514,9 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get fileActions => 'Acciones de archivo';
 
+  @override
+  String get actions => 'Acciones';
+
   @override
   String get gitStatusAdded => 'Añadido';
 
@@ -2375,8 +2593,34 @@ class AppLocalizationsEs extends AppLocalizations {
       'La rama ha divergido. Resuelva el merge o el rebase fuera de esta versión de BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'La autenticación de Git ha fallado. En el snap, los remotos SSH pueden requerir que se conecte la interfaz ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Git necesita un nombre y un correo electrónico de autor antes de confirmar cambios.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Identidad del autor de Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Introduce la identidad que Git debe registrar en las confirmaciones. BusyMark la guardará y volverá a intentar esta confirmación.';
+
+  @override
+  String get gitAuthorName => 'Nombre';
+
+  @override
+  String get gitAuthorEmail => 'Correo electrónico';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Usar en todos los repositorios';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Cuando se instala como Snap, se aplica a los repositorios abiertos en BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Guardar y confirmar';
+
+  @override
+  String get gitErrorAuthentication => 'La autenticación de Git ha fallado.';
 
   @override
   String get gitErrorNetwork => 'La operación de red de Git ha fallado.';
@@ -2959,139 +3203,15 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Exportar Writerside como PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Elija una instancia y la configuración de PDF. BusyMark usa el compilador oficial de Writerside de JetBrains.';
-
   @override
   String get writersidePdfContent => 'Contenido de la exportación';
 
-  @override
-  String get writersidePdfSettings => 'Configuración de PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Configurar para esta exportación';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Usar la configuración del proyecto';
-
-  @override
-  String get writersidePdfConfigurationFile =>
-      'Archivo de configuración de PDF';
-
   @override
   String get writersidePdfPage => 'Página';
 
-  @override
-  String get writersidePdfKeymap => 'Mapa de teclas';
-
-  @override
-  String get writersidePdfNoKeymap => 'Sin mapa de teclas';
-
-  @override
-  String get writersidePdfTocTitle => 'Título de la tabla de contenido';
-
-  @override
-  String get writersidePdfCover => 'Portada';
-
-  @override
-  String get writersidePdfIncludeCover => 'Incluir portada';
-
-  @override
-  String get writersidePdfCoverTitle => 'Título de portada';
-
-  @override
-  String get writersidePdfCoverDescription => 'Descripción de portada';
-
-  @override
-  String get writersidePdfCopyright => 'Derechos de autor';
-
-  @override
-  String get writersidePdfCoverLogo => 'Logotipo de portada';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Elegir logotipo de portada';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Encabezado y pie de página';
-
-  @override
-  String get writersidePdfHeader => 'Encabezado';
-
-  @override
-  String get writersidePdfFooter => 'Pie de página';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Estos valores asignan el módulo abierto al diseño de fuentes del compilador.';
-
-  @override
-  String get writersidePdfModuleName => 'Nombre del módulo';
-
-  @override
-  String get writersidePdfSourceRoot => 'Raíz de fuentes';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Elegir raíz de fuentes';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Versión del compilador';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Permitir red durante la compilación';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Desactivado de forma predeterminada. Actívelo solo si el proyecto necesita deliberadamente recursos de compilación remotos.';
-
-  @override
-  String get writersidePdfModuleNameRequired =>
-      'Introduzca el nombre del módulo.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'Elija la raíz de fuentes.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Introduzca una versión válida del compilador.';
-
-  @override
-  String get writersidePdfBuilderRequired =>
-      'Se requiere el compilador de Writerside';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark usa la imagen de contenedor oficial $image. ¿Descargarla ahora? La imagen es grande y Docker la almacena.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Descargando el compilador de Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Exportando PDF de Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker es necesario para exportar Writerside a PDF. Instale e inicie Docker y vuelva a intentarlo.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'La imagen solicitada del compilador de Writerside no está disponible.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'La configuración PDF de Writerside no es válida.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'El compilador de Writerside no pudo crear el PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'El compilador de Writerside no produjo un PDF válido.';
-
   @override
   String get ai => 'IA';
 
@@ -3108,6 +3228,15 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get aiProvider => 'Proveedor de IA';
 
+  @override
+  String get aiDefaultProvider => 'Proveedor predeterminado';
+
+  @override
+  String get aiConfigureProvider => 'Configurar proveedor';
+
+  @override
+  String get aiChooseProvider => 'Elegir proveedor de IA';
+
   @override
   String get aiOllamaEndpoint => 'Punto de conexión de Ollama';
 
@@ -3126,8 +3255,7 @@ class AppLocalizationsEs extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama está en ejecución, pero no se encontraron modelos instalados.';
+  String get aiNoModels => 'Ningún modelo seleccionado.';
 
   @override
   String get aiConnectionFailed =>
@@ -3230,19 +3358,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Contenido enviado a la IA';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'La IA está desactivada. BusyMark nunca envía contenido del documento sin una acción de IA explícita.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark solo envía el contexto mostrado en el diálogo de revisión al servicio Ollama local configurado. Las propuestas nunca se aplican sin revisión.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark solo envía el contexto mostrado en el diálogo de revisión a $provider. Las solicitudes no conservan estado y las propuestas nunca se aplican sin revisión.';
-  }
-
   @override
   String get aiApiKey => 'Clave de API';
 
@@ -3281,6 +3396,9 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Modelo preferido';
 
+  @override
+  String get aiModel => 'Modelo';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests solicitudes · $input tokens de entrada · $output tokens de salida';
@@ -3367,4 +3485,14 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Los encabezados de tabla deben identificar sus columnas; complete cada encabezado vacío.';
+
+  @override
+  String get mathRenderFailed =>
+      'No se pudo representar la expresión matemática.';
+
+  @override
+  String get inlineMath => 'Matemáticas en línea';
+
+  @override
+  String get displayMath => 'Matemáticas en bloque';
 }
diff --git a/lib/l10n/generated/app_localizations_et.dart b/lib/l10n/generated/app_localizations_et.dart
index f254d8f0..22ec622e 100644
--- a/lib/l10n/generated/app_localizations_et.dart
+++ b/lib/l10n/generated/app_localizations_et.dart
@@ -217,6 +217,19 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Kiirklahvid';
 
+  @override
+  String get commandPalette => 'Käskude palett';
+
+  @override
+  String get commandPaletteHint => 'Sisesta käsk';
+
+  @override
+  String get commandPaletteEmpty => 'Sobivaid käske pole';
+
+  @override
+  String get commandUnavailableInContext =>
+      'See käsk pole praeguses kontekstis saadaval.';
+
   @override
   String get lightTheme => 'Hele';
 
@@ -709,6 +722,14 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Aken';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Eelmise tööruumi taasavamine käivitamisel';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Ava BusyMarki käivitamisel eelmise seansi tööruum ja vahekaardid.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Küsi salvestamata muudatuste korral enne sulgemist kinnitust';
@@ -758,6 +779,11 @@ class AppLocalizationsEt extends AppLocalizations {
     return 'Failis $fileName on salvestamata muudatusi. Kas salvestada need enne jätkamist?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count dokumendis on salvestamata muudatusi. Kas salvestada need enne jätkamist?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Faili on kettal muudetud';
 
@@ -798,6 +824,40 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get image => 'Pilt';
 
+  @override
+  String get video => 'Video';
+
+  @override
+  String get openVideo => 'Esita videot';
+
+  @override
+  String get pauseVideo => 'Peata video';
+
+  @override
+  String get videoUnavailable => 'Video pole saadaval';
+
+  @override
+  String get videoPreview => 'Video eelvaade';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Videol puudub atribuut src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Toetamata videoallikas: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Videofaili pole olemas: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Video eelvaatepilti pole olemas: $preview';
+  }
+
   @override
   String get inlineImage => 'Reasisene pilt';
 
@@ -892,6 +952,18 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get deleteColumn => 'Kustuta veerg';
 
+  @override
+  String get tableAlignmentUnspecified => 'Joondus: määramata';
+
+  @override
+  String get tableAlignmentLeft => 'Joondus: vasakule';
+
+  @override
+  String get tableAlignmentCenter => 'Joondus: keskele';
+
+  @override
+  String get tableAlignmentRight => 'Joondus: paremale';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Rida $rowNumber';
@@ -1317,6 +1389,131 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Regulaaravaldis';
 
+  @override
+  String get sourceSearchReplacement => 'Asenda väärtusega';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Asenda praegune vaste';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Asenda ja leia järgmine';
+
+  @override
+  String get sourceSearchReplaceAll => 'Asenda kõik';
+
+  @override
+  String get workspaceReplace => 'Asenda tööruumis';
+
+  @override
+  String get reviewReplacements => 'Vaata asendused üle';
+
+  @override
+  String get applyReplacements => 'Rakenda asendused';
+
+  @override
+  String get skippedFiles => 'Vahele jäetud failid';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Salvestamata redaktori sisu';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Kettale salvestatud sisu';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Vali kõik $count vastet';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Asendati $matches vastet $files failis; vahele jäeti $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Lõpus on reavahetus';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Lõpus pole reavahetust';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normaliseeri reavahetused';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'See dokument sisaldab eri tüüpi reavahetusi. Vali vorming.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return 'Fail $fileName kasutab eri tüüpi reavahetusi. Vali enne asendamist vorming.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized => 'Liiga suur fail jäeti vahele.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Fail, mida ei saanud lugeda, jäeti vahele.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Fail, mis pole korrektne UTF-8, jäeti vahele.';
+
+  @override
+  String get workspaceReplaceIssueTruncated => 'Asenduste eelvaade kärbiti.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Pärast eelvaadet muutunud fail jäeti vahele.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Pärast eelvaadet muutunud redaktoripuhver jäeti vahele.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Vali enne asendamist LF- või CRLF-normaliseerimine.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Tagasivõtmine peatati, sest faili muudeti samal ajal. Mõned asendused võivad alles jääda; väljatõrjutud sisu säilitati alloleval teel.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Asendusi ei rakendatud, sest läbivaadatud kogumit ei saanud turvaliselt salvestada.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Välised muudatused — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'See fail kustutati kettalt.';
+
+  @override
+  String get externalFileChanged =>
+      'See fail muutus kettal ajal, kui sul on salvestamata muudatusi.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Faili $fileName salvestamata sisu taastati. Vaadake see üle ning salvestage, salvestage nimega või hüljake.';
+  }
+
+  @override
+  String get compare => 'Võrdle';
+
+  @override
+  String get reloadFromDisk => 'Laadi kettalt uuesti';
+
+  @override
+  String get keepMine => 'Säilita minu versioon';
+
+  @override
+  String get saveAs => 'Salvesta nimega';
+
   @override
   String get sourceSearchInvalidRegex => 'Vigane regulaaravaldis';
 
@@ -1327,6 +1524,12 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get nothingToRead => 'Pole midagi lugeda';
 
+  @override
+  String get admonition => 'Märkusplokk';
+
+  @override
+  String get quote => 'Tsitaat';
+
   @override
   String get note => 'Märkus';
 
@@ -1455,6 +1658,16 @@ class AppLocalizationsEt extends AppLocalizations {
     return 'Valideerimine nurjus: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Taastati $count salvestamata dokumenti. Vaadake iga taastatud dokument enne jätkamist üle.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return '$count rikutud taastekirjet ei saanud taastada. Kehtivad taastatud dokumendid on endiselt saadaval.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Teed pole olemas: $path';
@@ -2273,6 +2486,9 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get fileActions => 'Failitoimingud';
 
+  @override
+  String get actions => 'Toimingud';
+
   @override
   String get gitStatusAdded => 'Lisatud';
 
@@ -2346,8 +2562,34 @@ class AppLocalizationsEt extends AppLocalizations {
       'Haru ajalugu on lahknenud. Lahenda ühendamine või ümberbaasimine mõne muu tööriistaga; see BusyMarki versioon seda ei võimalda.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Giti autentimine nurjus. Snap-paketis võib SSH-kaughoidlate kasutamiseks olla vaja ühendada liides ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Git vajab enne sissekande loomist autori nime ja e-posti aadressi.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Giti autori identiteet';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Sisesta identiteet, mille Git peaks sissekannetele lisama. BusyMark salvestab selle ja proovib sissekannet uuesti.';
+
+  @override
+  String get gitAuthorName => 'Nimi';
+
+  @override
+  String get gitAuthorEmail => 'E-post';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Kasuta kõigis hoidlates';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Snapi paigalduses kehtib see BusyMarkis avatud hoidlatele.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Salvesta ja loo sissekanne';
+
+  @override
+  String get gitErrorAuthentication => 'Giti autentimine nurjus.';
 
   @override
   String get gitErrorNetwork => 'Giti võrgutoiming nurjus.';
@@ -2928,136 +3170,15 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Ekspordi Writerside PDF-ina';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Valige eksemplar ja PDF-i sätted. BusyMark kasutab JetBrainsi ametlikku Writerside’i koosturit.';
-
   @override
   String get writersidePdfContent => 'Ekspordi sisu';
 
-  @override
-  String get writersidePdfSettings => 'PDF-i sätted';
-
-  @override
-  String get writersidePdfConfigureHere => 'Seadista selle ekspordi jaoks';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Kasuta projekti konfiguratsiooni';
-
-  @override
-  String get writersidePdfConfigurationFile => 'PDF-i konfiguratsioonifail';
-
   @override
   String get writersidePdfPage => 'Lehekülg';
 
-  @override
-  String get writersidePdfKeymap => 'Klahvipaigutus';
-
-  @override
-  String get writersidePdfNoKeymap => 'Klahvipaigutuseta';
-
-  @override
-  String get writersidePdfTocTitle => 'Sisukorra pealkiri';
-
-  @override
-  String get writersidePdfCover => 'Tiitelleht';
-
-  @override
-  String get writersidePdfIncludeCover => 'Lisa tiitelleht';
-
-  @override
-  String get writersidePdfCoverTitle => 'Tiitellehe pealkiri';
-
-  @override
-  String get writersidePdfCoverDescription => 'Tiitellehe kirjeldus';
-
-  @override
-  String get writersidePdfCopyright => 'Autoriõigus';
-
-  @override
-  String get writersidePdfCoverLogo => 'Tiitellehe logo';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Vali tiitellehe logo';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Päis ja jalus';
-
-  @override
-  String get writersidePdfHeader => 'Päis';
-
-  @override
-  String get writersidePdfFooter => 'Jalus';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Need väärtused seovad avatud mooduli koosturi lähtepaigutusega.';
-
-  @override
-  String get writersidePdfModuleName => 'Mooduli nimi';
-
-  @override
-  String get writersidePdfSourceRoot => 'Lähtejuur';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Vali lähtejuur';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Koosturi versioon';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Luba koostamise ajal võrk';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Vaikimisi keelatud. Luba ainult siis, kui projekt vajab teadlikult kaugkoostusressursse.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Sisesta mooduli nimi.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'Vali lähtejuur.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Sisesta kehtiv koosturi versioon.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Writerside’i koostur on nõutav';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark kasutab ametlikku konteineripilti $image. Kas laadida see kohe alla? Pilt on suur ja Docker talletab selle.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Writerside’i koosturi allalaadimine…';
-
   @override
   String get exportingWritersidePdf => 'Writerside’i PDF-i eksportimine…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Writerside’i PDF-i eksportimiseks on vaja Dockerit. Paigalda ja käivita Docker ning proovi uuesti.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'Soovitud Writerside’i koosturi pilt pole saadaval.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Writerside’i PDF-i konfiguratsioon on vigane.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Writerside’i koostur ei suutnud PDF-i luua.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Writerside’i koostur ei loonud kehtivat PDF-i.';
-
   @override
   String get ai => 'TI';
 
@@ -3074,6 +3195,15 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get aiProvider => 'TI-teenuse pakkuja';
 
+  @override
+  String get aiDefaultProvider => 'Vaikimisi teenusepakkuja';
+
+  @override
+  String get aiConfigureProvider => 'Seadista teenusepakkujat';
+
+  @override
+  String get aiChooseProvider => 'Vali TI-teenuse pakkuja';
+
   @override
   String get aiOllamaEndpoint => 'Ollama lõpp-punkt';
 
@@ -3092,8 +3222,7 @@ class AppLocalizationsEt extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama töötab, kuid installitud mudeleid ei leitud.';
+  String get aiNoModels => 'Mudelit pole valitud.';
 
   @override
   String get aiConnectionFailed =>
@@ -3196,19 +3325,6 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'TI-le saadetav sisu';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'Tehisintellekt on keelatud. BusyMark ei saada dokumendi sisu kunagi ilma selgesõnalise TI-toiminguta.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark saadab ülevaatusdialoogis kuvatud konteksti ainult seadistatud kohalikule Ollama teenusele. Ettepanekuid ei rakendata kunagi ilma ülevaatuseta.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark saadab ülevaatusdialoogis kuvatud konteksti ainult teenusele $provider. Päringud on olekuta ja ettepanekuid ei rakendata kunagi ilma ülevaatuseta.';
-  }
-
   @override
   String get aiApiKey => 'API-võti';
 
@@ -3247,6 +3363,9 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Eelistatud mudel';
 
+  @override
+  String get aiModel => 'Mudel';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests päringut · $input sisendmärgendit · $output väljundmärgendit';
@@ -3331,4 +3450,13 @@ class AppLocalizationsEt extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Tabelipäised peavad veerge kirjeldama; täida kõik tühjad päised.';
+
+  @override
+  String get mathRenderFailed => 'Matemaatilist avaldist ei saanud kuvada.';
+
+  @override
+  String get inlineMath => 'Reasisene matemaatika';
+
+  @override
+  String get displayMath => 'Plokina matemaatika';
 }
diff --git a/lib/l10n/generated/app_localizations_fa.dart b/lib/l10n/generated/app_localizations_fa.dart
index e877aaca..5261f405 100644
--- a/lib/l10n/generated/app_localizations_fa.dart
+++ b/lib/l10n/generated/app_localizations_fa.dart
@@ -217,6 +217,19 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'میانبرهای صفحه‌کلید';
 
+  @override
+  String get commandPalette => 'پالت فرمان';
+
+  @override
+  String get commandPaletteHint => 'یک فرمان وارد کنید';
+
+  @override
+  String get commandPaletteEmpty => 'هیچ فرمان منطبقی وجود ندارد';
+
+  @override
+  String get commandUnavailableInContext =>
+      'این فرمان در زمینهٔ فعلی در دسترس نیست.';
+
   @override
   String get lightTheme => 'روشن';
 
@@ -701,6 +714,14 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'پنجره';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'باز کردن دوبارهٔ فضای کاری قبلی هنگام راه‌اندازی';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'هنگام راه‌اندازی BusyMark، فضای کاری و زبانه‌های نشست قبلی باز شوند.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'تأیید پیش از بستن با تغییرات ذخیره‌نشده';
@@ -754,6 +775,11 @@ class AppLocalizationsFa extends AppLocalizations {
     return 'در ⁨$fileName⁩ تغییرات ذخیره‌نشده دارید. قبل از ادامه ذخیره شوند؟';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return 'تعداد $count سند تغییرات ذخیره‌نشده دارند. پیش از ادامه ذخیره شوند؟';
+  }
+
   @override
   String get fileChangedOnDisk => 'فایل روی دیسک تغییر کرده است';
 
@@ -794,6 +820,40 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get image => 'تصویر';
 
+  @override
+  String get video => 'ویدیو';
+
+  @override
+  String get openVideo => 'پخش ویدیو';
+
+  @override
+  String get pauseVideo => 'مکث ویدیو';
+
+  @override
+  String get videoUnavailable => 'ویدیو در دسترس نیست';
+
+  @override
+  String get videoPreview => 'پیش‌نمایش ویدیو';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'ویژگی src برای ویدیو وجود ندارد.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'منبع ویدیو پشتیبانی نمی‌شود: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'فایل ویدیو وجود ندارد: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'تصویر پیش‌نمایش ویدیو وجود ندارد: $preview';
+  }
+
   @override
   String get inlineImage => 'تصویر درون‌خطی';
 
@@ -898,6 +958,18 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get deleteColumn => 'حذف ستون';
 
+  @override
+  String get tableAlignmentUnspecified => 'تراز: مشخص‌نشده';
+
+  @override
+  String get tableAlignmentLeft => 'تراز: چپ';
+
+  @override
+  String get tableAlignmentCenter => 'تراز: وسط';
+
+  @override
+  String get tableAlignmentRight => 'تراز: راست';
+
   @override
   String tableRowNumber(int rowNumber) {
     final intl.NumberFormat rowNumberNumberFormat =
@@ -1354,6 +1426,132 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'عبارت منظم';
 
+  @override
+  String get sourceSearchReplacement => 'جایگزینی با';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'جایگزینی مورد فعلی';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'جایگزینی و یافتن بعدی';
+
+  @override
+  String get sourceSearchReplaceAll => 'جایگزینی همه';
+
+  @override
+  String get workspaceReplace => 'جایگزینی در فضای کاری';
+
+  @override
+  String get reviewReplacements => 'بازبینی جایگزینی‌ها';
+
+  @override
+  String get applyReplacements => 'اعمال جایگزینی‌ها';
+
+  @override
+  String get skippedFiles => 'فایل‌های نادیده‌گرفته‌شده';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'محتوای ذخیره‌نشدهٔ ویرایشگر';
+
+  @override
+  String get workspaceReplaceDiskContent => 'محتوای ذخیره‌شده روی دیسک';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'انتخاب هر $count مورد';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return '$matches مورد در $files فایل جایگزین شد؛ $skipped مورد نادیده گرفته شد.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '⁨$encoding⁩ · ⁨$lineEnding⁩ · خط جدید پایانی';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '⁨$encoding⁩ · ⁨$lineEnding⁩ · بدون خط جدید پایانی';
+  }
+
+  @override
+  String get normalizeLineEndings => 'یکسان‌سازی پایان خط‌ها';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'این سند پایان خط‌های ترکیبی دارد. یک قالب انتخاب کنید.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return 'فایل ⁨$fileName⁩ پایان خط‌های ترکیبی دارد. پیش از جایگزینی قالب را انتخاب کنید.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'یک فایل بیش‌ازحد بزرگ نادیده گرفته شد.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'فایلی که خوانده نمی‌شد نادیده گرفته شد.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'فایلی با UTF-8 نامعتبر نادیده گرفته شد.';
+
+  @override
+  String get workspaceReplaceIssueTruncated => 'پیش‌نمایش جایگزینی کوتاه شد.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'فایلی که پس از پیش‌نمایش تغییر کرده بود نادیده گرفته شد.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'بافر ویرایشگری که پس از پیش‌نمایش تغییر کرده بود نادیده گرفته شد.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'پیش از جایگزینی، یکسان‌سازی LF یا CRLF را انتخاب کنید.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'بازگردانی متوقف شد، زیرا فایل هم‌زمان تغییر کرد. ممکن است برخی جایگزینی‌ها باقی مانده باشند؛ محتوای جابه‌جا‌شده در مسیر زیر حفظ شد.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'هیچ جایگزینی اعمال نشد، زیرا مجموعهٔ بازبینی‌شده را نمی‌شد با ایمنی ذخیره کرد.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'تغییرات بیرونی — ⁨$fileName⁩';
+  }
+
+  @override
+  String get externalFileDeleted => 'این فایل از روی دیسک حذف شد.';
+
+  @override
+  String get externalFileChanged =>
+      'هنگامی که تغییرات ذخیره‌نشده داشتید، این فایل روی دیسک تغییر کرد.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'محتوای ذخیره‌نشدهٔ $fileName بازیابی شده است. آن را بررسی کنید و سپس ذخیره، ذخیره با نام یا رد کنید.';
+  }
+
+  @override
+  String get compare => 'مقایسه';
+
+  @override
+  String get reloadFromDisk => 'بارگیری دوباره از دیسک';
+
+  @override
+  String get keepMine => 'نگه‌داشتن نسخهٔ من';
+
+  @override
+  String get saveAs => 'ذخیره با نام';
+
   @override
   String get sourceSearchInvalidRegex => 'عبارت منظم نامعتبر است';
 
@@ -1364,6 +1562,12 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get nothingToRead => 'محتوایی برای مطالعه وجود ندارد';
 
+  @override
+  String get admonition => 'کادر هشدار';
+
+  @override
+  String get quote => 'نقل‌قول';
+
   @override
   String get note => 'یادداشت';
 
@@ -1496,6 +1700,16 @@ class AppLocalizationsFa extends AppLocalizations {
     return 'اعتبارسنجی ناموفق بود: ⁨$error⁩';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'تعداد $count سند ذخیره‌نشده بازیابی شد. پیش از ادامه هر سند بازیابی‌شده را بررسی کنید.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'تعداد $count رکورد بازیابی آسیب‌دیده قابل بازیابی نبود. سندهای معتبر بازیابی‌شده همچنان در دسترس‌اند.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'مسیر وجود ندارد: ⁨$path⁩';
@@ -2330,6 +2544,9 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get fileActions => 'عملیات فایل';
 
+  @override
+  String get actions => 'عملیات';
+
   @override
   String get gitStatusAdded => 'افزوده‌شده';
 
@@ -2402,8 +2619,34 @@ class AppLocalizationsFa extends AppLocalizations {
       'شاخه واگرا شده است. مشکل را با ادغام یا بازپایه‌گذاری در خارج از این نسخهٔ BusyMark حل کنید.';
 
   @override
-  String get gitErrorAuthentication =>
-      'احراز هویت Git ناموفق بود. در بستهٔ snap، مخزن‌های راه دور SSH ممکن است به اتصال رابط ssh-keys نیاز داشته باشند.';
+  String get gitErrorAuthorIdentity =>
+      'Git پیش از ثبت تغییر به نام و نشانی ایمیل نویسنده نیاز دارد.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'هویت نویسندهٔ Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'هویتی را وارد کنید که Git باید در ثبت‌ها ذخیره کند. BusyMark آن را ذخیره می‌کند و این ثبت را دوباره انجام می‌دهد.';
+
+  @override
+  String get gitAuthorName => 'نام';
+
+  @override
+  String get gitAuthorEmail => 'ایمیل';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'استفاده برای همهٔ مخزن‌ها';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'در نصب Snap، این تنظیم برای مخزن‌های بازشده در BusyMark اعمال می‌شود.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'ذخیره و ثبت تغییر';
+
+  @override
+  String get gitErrorAuthentication => 'احراز هویت Git ناموفق بود.';
 
   @override
   String get gitErrorNetwork => 'عملیات شبکهٔ Git ناموفق بود.';
@@ -2978,135 +3221,15 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'صدور Writerside به‌صورت PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'یک نمونه و تنظیمات PDF را انتخاب کنید. BusyMark از سازندهٔ رسمی Writerside شرکت JetBrains استفاده می‌کند.';
-
   @override
   String get writersidePdfContent => 'محتوای صدور';
 
-  @override
-  String get writersidePdfSettings => 'تنظیمات PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'پیکربندی برای این صدور';
-
-  @override
-  String get writersidePdfProjectConfiguration => 'استفاده از پیکربندی پروژه';
-
-  @override
-  String get writersidePdfConfigurationFile => 'فایل پیکربندی PDF';
-
   @override
   String get writersidePdfPage => 'صفحه';
 
-  @override
-  String get writersidePdfKeymap => 'نگاشت کلیدها';
-
-  @override
-  String get writersidePdfNoKeymap => 'بدون نگاشت کلید';
-
-  @override
-  String get writersidePdfTocTitle => 'عنوان فهرست مطالب';
-
-  @override
-  String get writersidePdfCover => 'صفحهٔ جلد';
-
-  @override
-  String get writersidePdfIncludeCover => 'افزودن صفحهٔ جلد';
-
-  @override
-  String get writersidePdfCoverTitle => 'عنوان جلد';
-
-  @override
-  String get writersidePdfCoverDescription => 'توضیح جلد';
-
-  @override
-  String get writersidePdfCopyright => 'حق نشر';
-
-  @override
-  String get writersidePdfCoverLogo => 'نشان جلد';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'انتخاب نشان جلد';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'سرصفحه و پاصفحه';
-
-  @override
-  String get writersidePdfHeader => 'سرصفحه';
-
-  @override
-  String get writersidePdfFooter => 'پاصفحه';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'این مقادیر ماژول باز را به چیدمان منبع سازنده نگاشت می‌کنند.';
-
-  @override
-  String get writersidePdfModuleName => 'نام ماژول';
-
-  @override
-  String get writersidePdfSourceRoot => 'ریشهٔ منبع';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'انتخاب ریشهٔ منبع';
-
-  @override
-  String get writersidePdfBuilderVersion => 'نسخهٔ سازنده';
-
-  @override
-  String get writersidePdfAllowNetwork => 'اجازهٔ شبکه هنگام ساخت';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'به‌طور پیش‌فرض غیرفعال است. فقط وقتی فعال کنید که پروژه عمداً به منابع ساخت راه دور نیاز دارد.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'نام ماژول را وارد کنید.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'ریشهٔ منبع را انتخاب کنید.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'نسخهٔ معتبر سازنده را وارد کنید.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'سازندهٔ Writerside لازم است';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark از تصویر کانتینر رسمی ⁨$image⁩ استفاده می‌کند. اکنون بارگیری شود؟ تصویر بزرگ است و Docker آن را ذخیره می‌کند.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'در حال بارگیری سازندهٔ Writerside…';
-
   @override
   String get exportingWritersidePdf => 'در حال صدور PDF از Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'برای صدور Writerside به PDF به Docker نیاز است. Docker را نصب و اجرا کنید و دوباره تلاش کنید.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'تصویر درخواستی سازندهٔ Writerside در دسترس نیست.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'پیکربندی PDF در Writerside معتبر نیست.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'سازندهٔ Writerside نتوانست PDF را ایجاد کند.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'سازندهٔ Writerside یک PDF معتبر تولید نکرد.';
-
   @override
   String get ai => 'هوش مصنوعی';
 
@@ -3123,6 +3246,15 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get aiProvider => 'ارائه‌دهندهٔ هوش مصنوعی';
 
+  @override
+  String get aiDefaultProvider => 'ارائه‌دهندهٔ پیش‌فرض';
+
+  @override
+  String get aiConfigureProvider => 'پیکربندی ارائه‌دهنده';
+
+  @override
+  String get aiChooseProvider => 'انتخاب ارائه‌دهندهٔ هوش مصنوعی';
+
   @override
   String get aiOllamaEndpoint => 'نقطهٔ پایانی Ollama';
 
@@ -3141,8 +3273,7 @@ class AppLocalizationsFa extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama در حال اجرا است، اما هیچ مدل نصب‌شده‌ای پیدا نشد.';
+  String get aiNoModels => 'هیچ مدلی انتخاب نشده است.';
 
   @override
   String get aiConnectionFailed =>
@@ -3245,19 +3376,6 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'محتوای ارسال‌شده به هوش مصنوعی';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'هوش مصنوعی غیرفعال است. BusyMark هرگز بدون یک اقدام صریح هوش مصنوعی محتوای سند را ارسال نمی‌کند.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark فقط زمینهٔ نمایش‌داده‌شده در کادر بازبینی را به سرویس محلی Ollama پیکربندی‌شده می‌فرستد. پیشنهادها هرگز بدون بازبینی اعمال نمی‌شوند.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark فقط زمینهٔ نمایش‌داده‌شده در کادر بازبینی را به ⁨$provider⁩ می‌فرستد. درخواست‌ها بدون حالت هستند و پیشنهادها هرگز بدون بازبینی اعمال نمی‌شوند.';
-  }
-
   @override
   String get aiApiKey => 'کلید API';
 
@@ -3296,6 +3414,9 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get aiPreferredModel => 'مدل ترجیحی';
 
+  @override
+  String get aiModel => 'مدل';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '⁨$requests⁩ درخواست · ⁨$input⁩ توکن ورودی · ⁨$output⁩ توکن خروجی';
@@ -3380,4 +3501,13 @@ class AppLocalizationsFa extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'سرستون‌های جدول باید ستون‌های خود را مشخص کنند؛ هر سرستون خالی را تکمیل کنید.';
+
+  @override
+  String get mathRenderFailed => 'عبارت ریاضی قابل نمایش نبود.';
+
+  @override
+  String get inlineMath => 'ریاضی درون‌خطی';
+
+  @override
+  String get displayMath => 'ریاضی نمایشی';
 }
diff --git a/lib/l10n/generated/app_localizations_fr.dart b/lib/l10n/generated/app_localizations_fr.dart
index 3847a519..ba2bf28a 100644
--- a/lib/l10n/generated/app_localizations_fr.dart
+++ b/lib/l10n/generated/app_localizations_fr.dart
@@ -220,6 +220,19 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Raccourcis clavier';
 
+  @override
+  String get commandPalette => 'Palette de commandes';
+
+  @override
+  String get commandPaletteHint => 'Saisissez une commande';
+
+  @override
+  String get commandPaletteEmpty => 'Aucune commande correspondante';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Cette commande n’est pas disponible dans le contexte actuel.';
+
   @override
   String get lightTheme => 'Clair';
 
@@ -719,6 +732,14 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Fenêtre';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Rouvrir l’espace de travail précédent au démarrage';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Ouvrir l’espace de travail et les onglets de la session précédente au démarrage de BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Confirmer avant de fermer avec des modifications non enregistrées';
@@ -768,6 +789,11 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Des modifications non enregistrées sont présentes dans $fileName. Les enregistrer avant de continuer ?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count documents contiennent des modifications non enregistrées. Les enregistrer avant de continuer ?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Fichier modifié sur le disque';
 
@@ -808,6 +834,40 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get image => 'Image';
 
+  @override
+  String get video => 'Vidéo';
+
+  @override
+  String get openVideo => 'Lire la vidéo';
+
+  @override
+  String get pauseVideo => 'Mettre la vidéo en pause';
+
+  @override
+  String get videoUnavailable => 'Vidéo indisponible';
+
+  @override
+  String get videoPreview => 'Aperçu de la vidéo';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'L’attribut src de la vidéo est manquant.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Source vidéo non prise en charge : $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Le fichier vidéo n’existe pas : $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'L’image d’aperçu de la vidéo n’existe pas : $preview';
+  }
+
   @override
   String get inlineImage => 'Image en ligne';
 
@@ -902,6 +962,18 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get deleteColumn => 'Supprimer la colonne';
 
+  @override
+  String get tableAlignmentUnspecified => 'Alignement : non spécifié';
+
+  @override
+  String get tableAlignmentLeft => 'Alignement : gauche';
+
+  @override
+  String get tableAlignmentCenter => 'Alignement : centre';
+
+  @override
+  String get tableAlignmentRight => 'Alignement : droite';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Ligne $rowNumber';
@@ -1332,6 +1404,135 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Expression régulière';
 
+  @override
+  String get sourceSearchReplacement => 'Remplacer par';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Remplacer la sélection actuelle';
+
+  @override
+  String get sourceSearchReplaceAndFindNext =>
+      'Remplacer et rechercher le suivant';
+
+  @override
+  String get sourceSearchReplaceAll => 'Tout remplacer';
+
+  @override
+  String get workspaceReplace => 'Remplacer dans l’espace de travail';
+
+  @override
+  String get reviewReplacements => 'Vérifier les remplacements';
+
+  @override
+  String get applyReplacements => 'Appliquer les remplacements';
+
+  @override
+  String get skippedFiles => 'Fichiers ignorés';
+
+  @override
+  String get workspaceReplaceDirtyBuffer =>
+      'Contenu non enregistré de l’éditeur';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Contenu enregistré sur le disque';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Sélectionner les $count occurrences';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return '$matches occurrences remplacées dans $files fichiers ; $skipped ignorées.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Saut de ligne final';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Aucun saut de ligne final';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normaliser les fins de ligne';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Ce document contient plusieurs types de fins de ligne. Choisissez un format.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName utilise plusieurs types de fins de ligne. Choisissez le format avant le remplacement.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'Un fichier trop volumineux a été ignoré.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Un fichier illisible a été ignoré.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Un fichier dont l’encodage UTF-8 est incorrect a été ignoré.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'L’aperçu des remplacements a été tronqué.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Un fichier modifié après l’aperçu a été ignoré.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Un tampon d’éditeur modifié après l’aperçu a été ignoré.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Choisissez la normalisation LF ou CRLF avant le remplacement.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'L’annulation a été interrompue car le fichier a été modifié simultanément. Certains remplacements peuvent subsister ; le contenu déplacé a été conservé à l’emplacement ci-dessous.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Aucun remplacement n’a été appliqué, car l’ensemble vérifié n’a pas pu être enregistré en toute sécurité.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Modifications externes — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Ce fichier a été supprimé du disque.';
+
+  @override
+  String get externalFileChanged =>
+      'Ce fichier a été modifié sur le disque alors que vous avez des modifications non enregistrées.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Le contenu non enregistré de $fileName a été récupéré. Vérifiez-le, puis enregistrez-le, enregistrez-le sous un autre nom ou ignorez-le.';
+  }
+
+  @override
+  String get compare => 'Comparer';
+
+  @override
+  String get reloadFromDisk => 'Recharger depuis le disque';
+
+  @override
+  String get keepMine => 'Conserver ma version';
+
+  @override
+  String get saveAs => 'Enregistrer sous';
+
   @override
   String get sourceSearchInvalidRegex => 'Expression régulière non valide';
 
@@ -1342,6 +1543,12 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get nothingToRead => 'Aucun contenu à lire';
 
+  @override
+  String get admonition => 'Encadré';
+
+  @override
+  String get quote => 'Citation';
+
   @override
   String get note => 'Note';
 
@@ -1469,6 +1676,16 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Échec de la validation : $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return '$count documents non enregistrés ont été récupérés. Vérifiez chaque document récupéré avant de continuer.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return '$count enregistrements de récupération endommagés n’ont pas pu être restaurés. Les documents valides récupérés restent disponibles.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Le chemin n’existe pas : $path';
@@ -2294,6 +2511,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get fileActions => 'Actions sur le fichier';
 
+  @override
+  String get actions => 'Actions';
+
   @override
   String get gitStatusAdded => 'Ajouté';
 
@@ -2368,8 +2588,34 @@ class AppLocalizationsFr extends AppLocalizations {
       'La branche a divergé. Résolvez la fusion ou le rebasage en dehors de cette version de BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'L’authentification Git a échoué. Dans le snap, les dépôts SSH distants peuvent nécessiter la connexion de l’interface ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Git a besoin d’un nom et d’une adresse e-mail d’auteur avant de pouvoir valider.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Identité de l’auteur Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Saisissez l’identité que Git doit enregistrer dans les validations. BusyMark l’enregistrera et réessaiera cette validation.';
+
+  @override
+  String get gitAuthorName => 'Nom';
+
+  @override
+  String get gitAuthorEmail => 'E-mail';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Utiliser pour tous les dépôts';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Avec l’installation Snap, ce réglage s’applique aux dépôts ouverts dans BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Enregistrer et valider';
+
+  @override
+  String get gitErrorAuthentication => 'L’authentification Git a échoué.';
 
   @override
   String get gitErrorNetwork => 'L’opération réseau Git a échoué.';
@@ -2951,138 +3197,15 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Exporter Writerside au format PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Choisissez une instance et les paramètres PDF. BusyMark utilise le générateur Writerside officiel de JetBrains.';
-
   @override
   String get writersidePdfContent => 'Contenu de l’exportation';
 
-  @override
-  String get writersidePdfSettings => 'Paramètres PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Configurer pour cette exportation';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Utiliser la configuration du projet';
-
-  @override
-  String get writersidePdfConfigurationFile => 'Fichier de configuration PDF';
-
   @override
   String get writersidePdfPage => 'Page';
 
-  @override
-  String get writersidePdfKeymap => 'Disposition des raccourcis';
-
-  @override
-  String get writersidePdfNoKeymap => 'Aucune disposition';
-
-  @override
-  String get writersidePdfTocTitle => 'Titre de la table des matières';
-
-  @override
-  String get writersidePdfCover => 'Page de couverture';
-
-  @override
-  String get writersidePdfIncludeCover => 'Inclure une page de couverture';
-
-  @override
-  String get writersidePdfCoverTitle => 'Titre de couverture';
-
-  @override
-  String get writersidePdfCoverDescription => 'Description de couverture';
-
-  @override
-  String get writersidePdfCopyright => 'Droits d’auteur';
-
-  @override
-  String get writersidePdfCoverLogo => 'Logo de couverture';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Choisir le logo de couverture';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'En-tête et pied de page';
-
-  @override
-  String get writersidePdfHeader => 'En-tête';
-
-  @override
-  String get writersidePdfFooter => 'Pied de page';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Ces valeurs associent le module ouvert à l’organisation des sources du générateur.';
-
-  @override
-  String get writersidePdfModuleName => 'Nom du module';
-
-  @override
-  String get writersidePdfSourceRoot => 'Racine des sources';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Choisir la racine des sources';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Version du générateur';
-
-  @override
-  String get writersidePdfAllowNetwork =>
-      'Autoriser le réseau pendant la génération';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Désactivé par défaut. Activez cette option uniquement si le projet nécessite volontairement des ressources distantes.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Saisissez le nom du module.';
-
-  @override
-  String get writersidePdfSourceRootRequired =>
-      'Choisissez la racine des sources.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Saisissez une version valide du générateur.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Générateur Writerside requis';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark utilise l’image de conteneur officielle $image. La télécharger maintenant ? Cette image est volumineuse et stockée par Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Téléchargement du générateur Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Exportation du PDF Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker est requis pour exporter Writerside au format PDF. Installez et démarrez Docker, puis réessayez.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'L’image demandée du générateur Writerside n’est pas disponible.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'La configuration PDF Writerside n’est pas valide.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Le générateur Writerside n’a pas pu créer le PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Le générateur Writerside n’a pas produit de PDF valide.';
-
   @override
   String get ai => 'IA';
 
@@ -3099,6 +3222,15 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get aiProvider => 'Fournisseur d’IA';
 
+  @override
+  String get aiDefaultProvider => 'Fournisseur par défaut';
+
+  @override
+  String get aiConfigureProvider => 'Configurer le fournisseur';
+
+  @override
+  String get aiChooseProvider => 'Choisir un fournisseur d’IA';
+
   @override
   String get aiOllamaEndpoint => 'Point de terminaison Ollama';
 
@@ -3117,8 +3249,7 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama est en cours d’exécution, mais aucun modèle installé n’a été trouvé.';
+  String get aiNoModels => 'Aucun modèle sélectionné.';
 
   @override
   String get aiConnectionFailed =>
@@ -3221,19 +3352,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Contenu envoyé à l’IA';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'L’IA est désactivée. BusyMark n’envoie jamais le contenu du document sans action d’IA explicite.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark envoie uniquement le contexte affiché dans la boîte de dialogue de validation au service Ollama local configuré. Les propositions ne sont jamais appliquées sans validation.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark envoie uniquement le contexte affiché dans la boîte de dialogue de validation à $provider. Les requêtes sont sans état et les propositions ne sont jamais appliquées sans validation.';
-  }
-
   @override
   String get aiApiKey => 'Clé API';
 
@@ -3272,6 +3390,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Modèle préféré';
 
+  @override
+  String get aiModel => 'Modèle';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests requêtes · $input jetons d’entrée · $output jetons de sortie';
@@ -3358,4 +3479,14 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Les en-têtes de tableau doivent identifier leurs colonnes ; complétez chaque en-tête vide.';
+
+  @override
+  String get mathRenderFailed =>
+      'Impossible d’afficher l’expression mathématique.';
+
+  @override
+  String get inlineMath => 'Formule en ligne';
+
+  @override
+  String get displayMath => 'Formule en bloc';
 }
diff --git a/lib/l10n/generated/app_localizations_hi.dart b/lib/l10n/generated/app_localizations_hi.dart
index 650b781f..c66d96bf 100644
--- a/lib/l10n/generated/app_localizations_hi.dart
+++ b/lib/l10n/generated/app_localizations_hi.dart
@@ -219,6 +219,19 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'कीबोर्ड शॉर्टकट';
 
+  @override
+  String get commandPalette => 'कमांड पैलेट';
+
+  @override
+  String get commandPaletteHint => 'कमांड लिखें';
+
+  @override
+  String get commandPaletteEmpty => 'कोई मेल खाता कमांड नहीं';
+
+  @override
+  String get commandUnavailableInContext =>
+      'यह आदेश वर्तमान संदर्भ में उपलब्ध नहीं है।';
+
   @override
   String get lightTheme => 'लाइट';
 
@@ -701,6 +714,14 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'विंडो';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'स्टार्टअप पर पिछला कार्यक्षेत्र फिर से खोलें';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'BusyMark शुरू होने पर पिछले सत्र का कार्यक्षेत्र और टैब खोलें।';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'न सहेजे गए बदलाव हों तो बंद करने से पहले पुष्टि करें';
@@ -750,6 +771,11 @@ class AppLocalizationsHi extends AppLocalizations {
     return '$fileName में न सहेजे गए बदलाव हैं। जारी रखने से पहले उन्हें सहेजें?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count दस्तावेज़ों में सहेजे नहीं गए बदलाव हैं। जारी रखने से पहले इन्हें सहेजें?';
+  }
+
   @override
   String get fileChangedOnDisk => 'डिस्क पर फ़ाइल बदल गई';
 
@@ -790,6 +816,40 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get image => 'छवि';
 
+  @override
+  String get video => 'वीडियो';
+
+  @override
+  String get openVideo => 'वीडियो चलाएँ';
+
+  @override
+  String get pauseVideo => 'वीडियो रोकें';
+
+  @override
+  String get videoUnavailable => 'वीडियो उपलब्ध नहीं है';
+
+  @override
+  String get videoPreview => 'वीडियो पूर्वावलोकन';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'वीडियो में src विशेषता मौजूद नहीं है।';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'असमर्थित वीडियो स्रोत: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'वीडियो फ़ाइल मौजूद नहीं है: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'वीडियो पूर्वावलोकन छवि मौजूद नहीं है: $preview';
+  }
+
   @override
   String get inlineImage => 'इनलाइन छवि';
 
@@ -884,6 +944,18 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get deleteColumn => 'कॉलम हटाएँ';
 
+  @override
+  String get tableAlignmentUnspecified => 'संरेखण: अनिर्दिष्ट';
+
+  @override
+  String get tableAlignmentLeft => 'संरेखण: बायाँ';
+
+  @override
+  String get tableAlignmentCenter => 'संरेखण: मध्य';
+
+  @override
+  String get tableAlignmentRight => 'संरेखण: दायाँ';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'पंक्ति $rowNumber';
@@ -1310,6 +1382,132 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'रेगुलर एक्सप्रेशन';
 
+  @override
+  String get sourceSearchReplacement => 'इससे बदलें';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'वर्तमान मिलान बदलें';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'बदलें और अगला खोजें';
+
+  @override
+  String get sourceSearchReplaceAll => 'सभी बदलें';
+
+  @override
+  String get workspaceReplace => 'वर्कस्पेस में बदलें';
+
+  @override
+  String get reviewReplacements => 'बदलावों की समीक्षा करें';
+
+  @override
+  String get applyReplacements => 'बदलाव लागू करें';
+
+  @override
+  String get skippedFiles => 'छोड़ी गई फ़ाइलें';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'सहेजी न गई संपादक सामग्री';
+
+  @override
+  String get workspaceReplaceDiskContent => 'डिस्क पर सहेजी सामग्री';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'सभी $count मिलान चुनें';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return '$files फ़ाइलों में $matches मिलान बदले गए; $skipped छोड़े गए।';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · अंतिम नई पंक्ति';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · अंतिम नई पंक्ति नहीं';
+  }
+
+  @override
+  String get normalizeLineEndings => 'पंक्ति अंत सामान्य करें';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'इस दस्तावेज़ में मिले-जुले पंक्ति अंत हैं। कोई प्रारूप चुनें।';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName में मिले-जुले पंक्ति अंत हैं। बदलने से पहले प्रारूप चुनें।';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized => 'बहुत बड़ी फ़ाइल छोड़ दी गई।';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'पढ़ी न जा सकने वाली फ़ाइल छोड़ दी गई।';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'अमान्य UTF-8 वाली फ़ाइल छोड़ दी गई।';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'बदलाव पूर्वावलोकन छोटा कर दिया गया।';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'पूर्वावलोकन के बाद बदली फ़ाइल छोड़ दी गई।';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'पूर्वावलोकन के बाद बदला संपादक बफ़र छोड़ दिया गया।';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'बदलने से पहले LF या CRLF सामान्यीकरण चुनें।';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'रोलबैक रोक दिया गया क्योंकि फ़ाइल उसी समय बदल गई थी। कुछ प्रतिस्थापन बने रह सकते हैं; हटाई गई सामग्री नीचे दिए गए पथ पर सुरक्षित रखी गई है।';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'कोई प्रतिस्थापन लागू नहीं किया गया क्योंकि समीक्षा किए गए समूह को सुरक्षित रूप से सहेजा नहीं जा सका।';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'बाहरी बदलाव — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'यह फ़ाइल डिस्क से हटा दी गई।';
+
+  @override
+  String get externalFileChanged =>
+      'आपके सहेजे न गए बदलावों के दौरान यह फ़ाइल डिस्क पर बदल गई।';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return '$fileName की सहेजी नहीं गई सामग्री पुनर्प्राप्त हुई। इसकी समीक्षा करें, फिर सहेजें, इस रूप में सहेजें या छोड़ दें।';
+  }
+
+  @override
+  String get compare => 'तुलना करें';
+
+  @override
+  String get reloadFromDisk => 'डिस्क से फिर लोड करें';
+
+  @override
+  String get keepMine => 'मेरा संस्करण रखें';
+
+  @override
+  String get saveAs => 'इस रूप में सहेजें';
+
   @override
   String get sourceSearchInvalidRegex => 'अमान्य रेगुलर एक्सप्रेशन';
 
@@ -1320,6 +1518,12 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get nothingToRead => 'पढ़ने के लिए कोई सामग्री नहीं';
 
+  @override
+  String get admonition => 'सूचना ब्लॉक';
+
+  @override
+  String get quote => 'उद्धरण';
+
   @override
   String get note => 'नोट';
 
@@ -1447,6 +1651,16 @@ class AppLocalizationsHi extends AppLocalizations {
     return 'सत्यापन विफल रहा: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return '$count सहेजे नहीं गए दस्तावेज़ पुनर्प्राप्त किए गए। जारी रखने से पहले प्रत्येक पुनर्प्राप्त दस्तावेज़ की समीक्षा करें।';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return '$count क्षतिग्रस्त पुनर्प्राप्ति रिकॉर्ड बहाल नहीं किए जा सके। मान्य पुनर्प्राप्त दस्तावेज़ उपलब्ध हैं।';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'पाथ मौजूद नहीं है: $path';
@@ -2267,6 +2481,9 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get fileActions => 'फ़ाइल कार्रवाइयाँ';
 
+  @override
+  String get actions => 'कार्रवाइयाँ';
+
   @override
   String get gitStatusAdded => 'जोड़ा गया';
 
@@ -2341,8 +2558,34 @@ class AppLocalizationsHi extends AppLocalizations {
       'शाखा अलग हो गई है। इस BusyMark संस्करण के बाहर मर्ज या रीबेस करके इसे सुलझाएँ।';
 
   @override
-  String get gitErrorAuthentication =>
-      'Git प्रमाणीकरण विफल रहा। snap में SSH रिमोट के लिए ssh-keys इंटरफ़ेस कनेक्ट करना पड़ सकता है।';
+  String get gitErrorAuthorIdentity =>
+      'कमिट करने से पहले Git को लेखक का नाम और ईमेल पता चाहिए।';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Git लेखक पहचान';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'वह पहचान दर्ज करें जिसे Git कमिट में रिकॉर्ड करे। BusyMark इसे सहेजकर इस कमिट को फिर से आज़माएगा।';
+
+  @override
+  String get gitAuthorName => 'नाम';
+
+  @override
+  String get gitAuthorEmail => 'ईमेल';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'सभी रिपॉज़िटरी के लिए उपयोग करें';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Snap के रूप में इंस्टॉल होने पर यह BusyMark में खोली गई रिपॉज़िटरी पर लागू होता है।';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'सहेजें और कमिट करें';
+
+  @override
+  String get gitErrorAuthentication => 'Git प्रमाणीकरण विफल रहा।';
 
   @override
   String get gitErrorNetwork => 'Git नेटवर्क कार्रवाई विफल रही।';
@@ -2922,136 +3165,15 @@ class AppLocalizationsHi extends AppLocalizations {
   String get exportWritersideAsPdf =>
       'Writerside को PDF के रूप में निर्यात करें';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'एक इंस्टेंस और PDF सेटिंग चुनें। BusyMark, JetBrains के आधिकारिक Writerside बिल्डर का उपयोग करता है।';
-
   @override
   String get writersidePdfContent => 'निर्यात सामग्री';
 
-  @override
-  String get writersidePdfSettings => 'PDF सेटिंग';
-
-  @override
-  String get writersidePdfConfigureHere => 'इस निर्यात के लिए कॉन्फ़िगर करें';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'प्रोजेक्ट कॉन्फ़िगरेशन का उपयोग करें';
-
-  @override
-  String get writersidePdfConfigurationFile => 'PDF कॉन्फ़िगरेशन फ़ाइल';
-
   @override
   String get writersidePdfPage => 'पृष्ठ';
 
-  @override
-  String get writersidePdfKeymap => 'कीमैप';
-
-  @override
-  String get writersidePdfNoKeymap => 'कोई कीमैप नहीं';
-
-  @override
-  String get writersidePdfTocTitle => 'विषय-सूची का शीर्षक';
-
-  @override
-  String get writersidePdfCover => 'आवरण पृष्ठ';
-
-  @override
-  String get writersidePdfIncludeCover => 'आवरण पृष्ठ शामिल करें';
-
-  @override
-  String get writersidePdfCoverTitle => 'आवरण शीर्षक';
-
-  @override
-  String get writersidePdfCoverDescription => 'आवरण विवरण';
-
-  @override
-  String get writersidePdfCopyright => 'कॉपीराइट';
-
-  @override
-  String get writersidePdfCoverLogo => 'आवरण लोगो';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'आवरण लोगो चुनें';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'शीर्षलेख और पादलेख';
-
-  @override
-  String get writersidePdfHeader => 'शीर्षलेख';
-
-  @override
-  String get writersidePdfFooter => 'पादलेख';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'ये मान खुले मॉड्यूल को बिल्डर की स्रोत संरचना से जोड़ते हैं।';
-
-  @override
-  String get writersidePdfModuleName => 'मॉड्यूल का नाम';
-
-  @override
-  String get writersidePdfSourceRoot => 'स्रोत रूट';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'स्रोत रूट चुनें';
-
-  @override
-  String get writersidePdfBuilderVersion => 'बिल्डर संस्करण';
-
-  @override
-  String get writersidePdfAllowNetwork =>
-      'बिल्ड के दौरान नेटवर्क की अनुमति दें';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'डिफ़ॉल्ट रूप से बंद। केवल तभी चालू करें जब प्रोजेक्ट को जानबूझकर दूरस्थ बिल्ड संसाधनों की आवश्यकता हो।';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'मॉड्यूल का नाम दर्ज करें।';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'स्रोत रूट चुनें।';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'मान्य बिल्डर संस्करण दर्ज करें।';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Writerside बिल्डर आवश्यक है';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark आधिकारिक $image कंटेनर इमेज का उपयोग करता है। इसे अभी डाउनलोड करें? इमेज बड़ी है और Docker इसे संग्रहित करेगा।';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Writerside बिल्डर डाउनलोड हो रहा है…';
-
   @override
   String get exportingWritersidePdf => 'Writerside PDF निर्यात हो रहा है…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Writerside PDF निर्यात के लिए Docker आवश्यक है। Docker इंस्टॉल करके चालू करें, फिर दोबारा प्रयास करें।';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'अनुरोधित Writerside बिल्डर इमेज उपलब्ध नहीं है।';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Writerside PDF कॉन्फ़िगरेशन अमान्य है।';
-
-  @override
-  String get writersidePdfBuildFailed => 'Writerside बिल्डर PDF नहीं बना सका।';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Writerside बिल्डर ने मान्य PDF नहीं बनाया।';
-
   @override
   String get ai => 'एआई';
 
@@ -3068,6 +3190,15 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get aiProvider => 'एआई प्रदाता';
 
+  @override
+  String get aiDefaultProvider => 'डिफ़ॉल्ट प्रदाता';
+
+  @override
+  String get aiConfigureProvider => 'प्रदाता कॉन्फ़िगर करें';
+
+  @override
+  String get aiChooseProvider => 'एआई प्रदाता चुनें';
+
   @override
   String get aiOllamaEndpoint => 'Ollama एंडपॉइंट';
 
@@ -3086,8 +3217,7 @@ class AppLocalizationsHi extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama चल रहा है, लेकिन कोई इंस्टॉल किया गया मॉडल नहीं मिला।';
+  String get aiNoModels => 'कोई मॉडल नहीं चुना गया।';
 
   @override
   String get aiConnectionFailed =>
@@ -3190,19 +3320,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'AI को भेजी गई सामग्री';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'AI अक्षम है। BusyMark किसी स्पष्ट AI कार्रवाई के बिना दस्तावेज़ की सामग्री कभी नहीं भेजता।';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark समीक्षा संवाद में दिखाया गया संदर्भ केवल कॉन्फ़िगर की गई स्थानीय Ollama सेवा को भेजता है। प्रस्ताव समीक्षा के बिना कभी लागू नहीं होते।';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark समीक्षा संवाद में दिखाया गया संदर्भ केवल $provider को भेजता है। अनुरोध स्टेटलेस होते हैं और प्रस्ताव समीक्षा के बिना कभी लागू नहीं होते।';
-  }
-
   @override
   String get aiApiKey => 'API कुंजी';
 
@@ -3241,6 +3358,9 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get aiPreferredModel => 'पसंदीदा मॉडल';
 
+  @override
+  String get aiModel => 'मॉडल';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests अनुरोध · $input इनपुट टोकन · $output आउटपुट टोकन';
@@ -3325,4 +3445,13 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'तालिका शीर्षकों को अपने कॉलम पहचानने चाहिए; हर खाली शीर्षक पूरा करें।';
+
+  @override
+  String get mathRenderFailed => 'गणितीय व्यंजक रेंडर नहीं किया जा सका।';
+
+  @override
+  String get inlineMath => 'इनलाइन गणित';
+
+  @override
+  String get displayMath => 'डिस्प्ले गणित';
 }
diff --git a/lib/l10n/generated/app_localizations_it.dart b/lib/l10n/generated/app_localizations_it.dart
index b7eeb560..048442f8 100644
--- a/lib/l10n/generated/app_localizations_it.dart
+++ b/lib/l10n/generated/app_localizations_it.dart
@@ -219,6 +219,19 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Scorciatoie da tastiera';
 
+  @override
+  String get commandPalette => 'Tavolozza dei comandi';
+
+  @override
+  String get commandPaletteHint => 'Digita un comando';
+
+  @override
+  String get commandPaletteEmpty => 'Nessun comando corrispondente';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Questo comando non è disponibile nel contesto corrente.';
+
   @override
   String get lightTheme => 'Chiaro';
 
@@ -716,6 +729,14 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Finestra';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Riapri l’area di lavoro precedente all’avvio';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Apri l’area di lavoro e le schede della sessione precedente all’avvio di BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Conferma prima di chiudere con modifiche non salvate';
@@ -765,6 +786,11 @@ class AppLocalizationsIt extends AppLocalizations {
     return 'Sono presenti modifiche non salvate in $fileName. Salvarle prima di continuare?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count documenti contengono modifiche non salvate. Salvarli prima di continuare?';
+  }
+
   @override
   String get fileChangedOnDisk => 'File modificato su disco';
 
@@ -805,6 +831,40 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get image => 'Immagine';
 
+  @override
+  String get video => 'Video';
+
+  @override
+  String get openVideo => 'Riproduci video';
+
+  @override
+  String get pauseVideo => 'Metti in pausa il video';
+
+  @override
+  String get videoUnavailable => 'Video non disponibile';
+
+  @override
+  String get videoPreview => 'Anteprima video';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Al video manca l’attributo src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Sorgente video non supportata: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Il file video non esiste: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'L’immagine di anteprima del video non esiste: $preview';
+  }
+
   @override
   String get inlineImage => 'Immagine in linea';
 
@@ -900,6 +960,18 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get deleteColumn => 'Elimina colonna';
 
+  @override
+  String get tableAlignmentUnspecified => 'Allineamento: non specificato';
+
+  @override
+  String get tableAlignmentLeft => 'Allineamento: sinistra';
+
+  @override
+  String get tableAlignmentCenter => 'Allineamento: centro';
+
+  @override
+  String get tableAlignmentRight => 'Allineamento: destra';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Riga $rowNumber';
@@ -1329,6 +1401,133 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Espressione regolare';
 
+  @override
+  String get sourceSearchReplacement => 'Sostituisci con';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Sostituisci corrente';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Sostituisci e trova successivo';
+
+  @override
+  String get sourceSearchReplaceAll => 'Sostituisci tutto';
+
+  @override
+  String get workspaceReplace => 'Sostituisci nell’area di lavoro';
+
+  @override
+  String get reviewReplacements => 'Rivedi sostituzioni';
+
+  @override
+  String get applyReplacements => 'Applica sostituzioni';
+
+  @override
+  String get skippedFiles => 'File ignorati';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Contenuto dell’editor non salvato';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Contenuto salvato su disco';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Seleziona tutte le $count corrispondenze';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Sostituite $matches corrispondenze in $files file; $skipped ignorate.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · A capo finale';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Nessun a capo finale';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normalizza terminatori di riga';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Questo documento contiene terminatori di riga misti. Scegli un formato.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName usa terminatori di riga misti. Scegli il formato prima di sostituire.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'È stato ignorato un file troppo grande.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'È stato ignorato un file illeggibile.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'È stato ignorato un file che non è UTF-8 valido.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'L’anteprima delle sostituzioni è stata troncata.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'È stato ignorato un file modificato dopo l’anteprima.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'È stato ignorato un buffer modificato dopo l’anteprima.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Scegli la normalizzazione LF o CRLF prima di sostituire.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Il rollback è stato interrotto perché il file è stato modificato contemporaneamente. Alcune sostituzioni potrebbero rimanere; il contenuto spostato è stato conservato nel percorso seguente.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Non è stata applicata alcuna sostituzione perché non è stato possibile salvare in sicurezza l’insieme verificato.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Modifiche esterne — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Questo file è stato eliminato dal disco.';
+
+  @override
+  String get externalFileChanged =>
+      'Questo file è cambiato sul disco mentre sono presenti modifiche non salvate.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'È stato recuperato il contenuto non salvato di $fileName. Controllarlo, quindi salvarlo, salvarlo con nome o eliminarlo.';
+  }
+
+  @override
+  String get compare => 'Confronta';
+
+  @override
+  String get reloadFromDisk => 'Ricarica dal disco';
+
+  @override
+  String get keepMine => 'Mantieni la mia versione';
+
+  @override
+  String get saveAs => 'Salva con nome';
+
   @override
   String get sourceSearchInvalidRegex => 'Espressione regolare non valida';
 
@@ -1339,6 +1538,12 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get nothingToRead => 'Nessun contenuto da leggere';
 
+  @override
+  String get admonition => 'Avviso';
+
+  @override
+  String get quote => 'Citazione';
+
   @override
   String get note => 'Nota';
 
@@ -1467,6 +1672,16 @@ class AppLocalizationsIt extends AppLocalizations {
     return 'Convalida non riuscita: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Sono stati recuperati $count documenti non salvati. Controllare ogni documento recuperato prima di continuare.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'Non è stato possibile ripristinare $count record di recupero danneggiati. I documenti recuperati validi restano disponibili.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Il percorso non esiste: $path';
@@ -2292,6 +2507,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get fileActions => 'Azioni sul file';
 
+  @override
+  String get actions => 'Azioni';
+
   @override
   String get gitStatusAdded => 'Aggiunto';
 
@@ -2368,8 +2586,34 @@ class AppLocalizationsIt extends AppLocalizations {
       'Il ramo è divergente. Risolvi il merge o il rebase al di fuori di questa versione di BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Autenticazione Git non riuscita. Nello snap, i repository SSH remoti potrebbero richiedere il collegamento dell’interfaccia ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Git richiede il nome e l’indirizzo e-mail dell’autore prima di eseguire il commit.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Identità autore Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Inserisci l’identità che Git deve registrare nei commit. BusyMark la salverà e riproverà questo commit.';
+
+  @override
+  String get gitAuthorName => 'Nome';
+
+  @override
+  String get gitAuthorEmail => 'E-mail';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Usa per tutti i repository';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Con l’installazione Snap, si applica ai repository aperti in BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Salva ed esegui commit';
+
+  @override
+  String get gitErrorAuthentication => 'Autenticazione Git non riuscita.';
 
   @override
   String get gitErrorNetwork => 'Operazione di rete Git non riuscita.';
@@ -2950,138 +3194,15 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Esporta Writerside come PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Scegli un’istanza e le impostazioni PDF. BusyMark usa il generatore Writerside ufficiale di JetBrains.';
-
   @override
   String get writersidePdfContent => 'Contenuto dell’esportazione';
 
-  @override
-  String get writersidePdfSettings => 'Impostazioni PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Configura per questa esportazione';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Usa la configurazione del progetto';
-
-  @override
-  String get writersidePdfConfigurationFile => 'File di configurazione PDF';
-
   @override
   String get writersidePdfPage => 'Pagina';
 
-  @override
-  String get writersidePdfKeymap => 'Mappa dei tasti';
-
-  @override
-  String get writersidePdfNoKeymap => 'Nessuna mappa dei tasti';
-
-  @override
-  String get writersidePdfTocTitle => 'Titolo dell’indice';
-
-  @override
-  String get writersidePdfCover => 'Pagina di copertina';
-
-  @override
-  String get writersidePdfIncludeCover => 'Includi pagina di copertina';
-
-  @override
-  String get writersidePdfCoverTitle => 'Titolo di copertina';
-
-  @override
-  String get writersidePdfCoverDescription => 'Descrizione di copertina';
-
-  @override
-  String get writersidePdfCopyright => 'Diritto d’autore';
-
-  @override
-  String get writersidePdfCoverLogo => 'Logo di copertina';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Scegli logo di copertina';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Intestazione e piè di pagina';
-
-  @override
-  String get writersidePdfHeader => 'Intestazione';
-
-  @override
-  String get writersidePdfFooter => 'Piè di pagina';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Questi valori associano il modulo aperto alla struttura delle sorgenti del generatore.';
-
-  @override
-  String get writersidePdfModuleName => 'Nome del modulo';
-
-  @override
-  String get writersidePdfSourceRoot => 'Radice delle sorgenti';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Scegli radice delle sorgenti';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Versione del generatore';
-
-  @override
-  String get writersidePdfAllowNetwork =>
-      'Consenti rete durante la generazione';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Disattivato per impostazione predefinita. Attivalo solo se il progetto richiede intenzionalmente risorse remote.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Inserisci il nome del modulo.';
-
-  @override
-  String get writersidePdfSourceRootRequired =>
-      'Scegli la radice delle sorgenti.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Inserisci una versione valida del generatore.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Generatore Writerside necessario';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark usa l’immagine contenitore ufficiale $image. Scaricarla ora? L’immagine è grande e viene archiviata da Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Download del generatore Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Esportazione del PDF Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker è necessario per esportare Writerside in PDF. Installa e avvia Docker, quindi riprova.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'L’immagine richiesta del generatore Writerside non è disponibile.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'La configurazione PDF di Writerside non è valida.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Il generatore Writerside non ha potuto creare il PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Il generatore Writerside non ha prodotto un PDF valido.';
-
   @override
   String get ai => 'IA';
 
@@ -3098,6 +3219,15 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get aiProvider => 'Provider IA';
 
+  @override
+  String get aiDefaultProvider => 'Provider predefinito';
+
+  @override
+  String get aiConfigureProvider => 'Configura provider';
+
+  @override
+  String get aiChooseProvider => 'Scegli provider IA';
+
   @override
   String get aiOllamaEndpoint => 'Endpoint Ollama';
 
@@ -3116,8 +3246,7 @@ class AppLocalizationsIt extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama è in esecuzione, ma non sono stati trovati modelli installati.';
+  String get aiNoModels => 'Nessun modello selezionato.';
 
   @override
   String get aiConnectionFailed =>
@@ -3220,19 +3349,6 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Contenuto inviato all’IA';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'L’IA è disabilitata. BusyMark non invia mai il contenuto del documento senza un’azione IA esplicita.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark invia solo il contesto mostrato nella finestra di revisione al servizio Ollama locale configurato. Le proposte non vengono mai applicate senza revisione.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark invia solo il contesto mostrato nella finestra di revisione a $provider. Le richieste sono senza stato e le proposte non vengono mai applicate senza revisione.';
-  }
-
   @override
   String get aiApiKey => 'Chiave API';
 
@@ -3271,6 +3387,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Modello preferito';
 
+  @override
+  String get aiModel => 'Modello';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests richieste · $input token di input · $output token di output';
@@ -3356,4 +3475,14 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Le intestazioni della tabella devono identificare le colonne; completa ogni intestazione vuota.';
+
+  @override
+  String get mathRenderFailed =>
+      'Impossibile visualizzare l’espressione matematica.';
+
+  @override
+  String get inlineMath => 'Formula in linea';
+
+  @override
+  String get displayMath => 'Formula in blocco';
 }
diff --git a/lib/l10n/generated/app_localizations_nb.dart b/lib/l10n/generated/app_localizations_nb.dart
index d4800a21..19239c33 100644
--- a/lib/l10n/generated/app_localizations_nb.dart
+++ b/lib/l10n/generated/app_localizations_nb.dart
@@ -220,6 +220,19 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Tastatursnarveier';
 
+  @override
+  String get commandPalette => 'Kommandopalett';
+
+  @override
+  String get commandPaletteHint => 'Skriv inn en kommando';
+
+  @override
+  String get commandPaletteEmpty => 'Ingen samsvarende kommandoer';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Denne kommandoen er ikke tilgjengelig i gjeldende kontekst.';
+
   @override
   String get lightTheme => 'Lys';
 
@@ -708,6 +721,14 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Vindu';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Åpne forrige arbeidsområde ved oppstart';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Åpne arbeidsområdet og fanene fra forrige økt når BusyMark starter.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Bekreft lukking ved ulagrede endringer';
@@ -757,6 +778,11 @@ class AppLocalizationsNb extends AppLocalizations {
     return 'Du har ulagrede endringer i $fileName. Vil du lagre dem før du fortsetter?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count dokumenter har ulagrede endringer. Lagre dem før du fortsetter?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Fil endret på disken';
 
@@ -797,6 +823,40 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get image => 'Bilde';
 
+  @override
+  String get video => 'Video';
+
+  @override
+  String get openVideo => 'Spill av video';
+
+  @override
+  String get pauseVideo => 'Sett video på pause';
+
+  @override
+  String get videoUnavailable => 'Videoen er utilgjengelig';
+
+  @override
+  String get videoPreview => 'Videoforhåndsvisning';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Videoen mangler src-attributtet.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Videokilden støttes ikke: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Videofilen finnes ikke: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Forhåndsvisningsbildet finnes ikke: $preview';
+  }
+
   @override
   String get inlineImage => 'Innebygd bilde';
 
@@ -892,6 +952,18 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get deleteColumn => 'Slett kolonne';
 
+  @override
+  String get tableAlignmentUnspecified => 'Justering: ikke angitt';
+
+  @override
+  String get tableAlignmentLeft => 'Justering: venstre';
+
+  @override
+  String get tableAlignmentCenter => 'Justering: midtstilt';
+
+  @override
+  String get tableAlignmentRight => 'Justering: høyre';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Rad $rowNumber';
@@ -1319,6 +1391,133 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Regulært uttrykk';
 
+  @override
+  String get sourceSearchReplacement => 'Erstatt med';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Erstatt gjeldende treff';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Erstatt og finn neste';
+
+  @override
+  String get sourceSearchReplaceAll => 'Erstatt alle';
+
+  @override
+  String get workspaceReplace => 'Erstatt i arbeidsområdet';
+
+  @override
+  String get reviewReplacements => 'Se gjennom erstatninger';
+
+  @override
+  String get applyReplacements => 'Bruk erstatninger';
+
+  @override
+  String get skippedFiles => 'Filer som ble hoppet over';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Ulagret redigeringsinnhold';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Innhold lagret på disk';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Velg alle $count treff';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Erstattet $matches treff i $files filer; hoppet over $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Avsluttende linjeskift';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Ingen avsluttende linjeskift';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normaliser linjeslutt';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Dette dokumentet inneholder blandede linjeslutt. Velg et format.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName bruker blandede linjeslutt. Velg format før du erstatter.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'En for stor fil ble hoppet over.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'En fil som ikke kunne leses, ble hoppet over.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'En fil som ikke er gyldig UTF-8, ble hoppet over.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'Erstatningsforhåndsvisningen ble avkortet.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'En fil som ble endret etter forhåndsvisningen, ble hoppet over.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'En redigeringsbuffer som ble endret etter forhåndsvisningen, ble hoppet over.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Velg LF- eller CRLF-normalisering før du erstatter.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Tilbakerullingen ble stoppet fordi filen ble endret samtidig. Noen erstatninger kan fortsatt være utført; forskjøvet innhold ble bevart på banen nedenfor.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Ingen erstatninger ble utført fordi det gjennomgåtte settet ikke kunne lagres på en trygg måte.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Eksterne endringer — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Denne filen ble slettet fra disken.';
+
+  @override
+  String get externalFileChanged =>
+      'Denne filen ble endret på disken mens du har ulagrede endringer.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Ulagret innhold for $fileName ble gjenopprettet. Se gjennom det, og lagre, lagre som eller forkast det.';
+  }
+
+  @override
+  String get compare => 'Sammenlign';
+
+  @override
+  String get reloadFromDisk => 'Last inn fra disk på nytt';
+
+  @override
+  String get keepMine => 'Behold min versjon';
+
+  @override
+  String get saveAs => 'Lagre som';
+
   @override
   String get sourceSearchInvalidRegex => 'Ugyldig regulært uttrykk';
 
@@ -1329,6 +1528,12 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get nothingToRead => 'Ingenting å lese';
 
+  @override
+  String get admonition => 'Merknadsblokk';
+
+  @override
+  String get quote => 'Sitat';
+
   @override
   String get note => 'Merknad';
 
@@ -1456,6 +1661,16 @@ class AppLocalizationsNb extends AppLocalizations {
     return 'Validering mislyktes: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return '$count ulagrede dokumenter ble gjenopprettet. Se gjennom hvert gjenopprettet dokument før du fortsetter.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return '$count skadede gjenopprettingsoppføringer kunne ikke gjenopprettes. Gyldige gjenopprettede dokumenter er fortsatt tilgjengelige.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Stien finnes ikke: $path';
@@ -2273,6 +2488,9 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get fileActions => 'Filhandlinger';
 
+  @override
+  String get actions => 'Handlinger';
+
   @override
   String get gitStatusAdded => 'Lagt til';
 
@@ -2347,8 +2565,34 @@ class AppLocalizationsNb extends AppLocalizations {
       'Grenen har divergert. Løs merge eller rebase utenfor denne versjonen av BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Git-autentisering mislyktes. I snap-pakken kan SSH-remoter kreve at grensesnittet ssh-keys kobles til.';
+  String get gitErrorAuthorIdentity =>
+      'Git trenger forfatternavn og e-postadresse før endringer kan lagres.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Git-forfatteridentitet';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Skriv inn identiteten Git skal registrere på endringer. BusyMark lagrer den og prøver denne endringen på nytt.';
+
+  @override
+  String get gitAuthorName => 'Navn';
+
+  @override
+  String get gitAuthorEmail => 'E-post';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Bruk for alle kodelagre';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Når appen er installert som en Snap, gjelder dette kodelagre som åpnes i BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Lagre og utfør commit';
+
+  @override
+  String get gitErrorAuthentication => 'Git-autentisering mislyktes.';
 
   @override
   String get gitErrorNetwork => 'Git-nettverksoperasjonen mislyktes.';
@@ -2926,135 +3170,15 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Eksporter Writerside som PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Velg en instans og PDF-innstillinger. BusyMark bruker JetBrains’ offisielle Writerside-byggeverktøy.';
-
   @override
   String get writersidePdfContent => 'Eksportinnhold';
 
-  @override
-  String get writersidePdfSettings => 'PDF-innstillinger';
-
-  @override
-  String get writersidePdfConfigureHere => 'Konfigurer for denne eksporten';
-
-  @override
-  String get writersidePdfProjectConfiguration => 'Bruk prosjektkonfigurasjon';
-
-  @override
-  String get writersidePdfConfigurationFile => 'PDF-konfigurasjonsfil';
-
   @override
   String get writersidePdfPage => 'Side';
 
-  @override
-  String get writersidePdfKeymap => 'Tastaturoppsett';
-
-  @override
-  String get writersidePdfNoKeymap => 'Uten tastaturoppsett';
-
-  @override
-  String get writersidePdfTocTitle => 'Tittel på innholdsfortegnelsen';
-
-  @override
-  String get writersidePdfCover => 'Forside';
-
-  @override
-  String get writersidePdfIncludeCover => 'Ta med forside';
-
-  @override
-  String get writersidePdfCoverTitle => 'Forsidetittel';
-
-  @override
-  String get writersidePdfCoverDescription => 'Forsidebeskrivelse';
-
-  @override
-  String get writersidePdfCopyright => 'Opphavsrett';
-
-  @override
-  String get writersidePdfCoverLogo => 'Forsidelogo';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Velg forsidelogo';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Topptekst og bunntekst';
-
-  @override
-  String get writersidePdfHeader => 'Topptekst';
-
-  @override
-  String get writersidePdfFooter => 'Bunntekst';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Disse verdiene kobler den åpne modulen til byggeverktøyets kildestruktur.';
-
-  @override
-  String get writersidePdfModuleName => 'Modulnavn';
-
-  @override
-  String get writersidePdfSourceRoot => 'Kilderot';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Velg kilderot';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Byggeverktøyversjon';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Tillat nettverk under bygging';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Deaktivert som standard. Aktiver bare når prosjektet bevisst trenger eksterne byggeressurser.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Skriv inn modulnavnet.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'Velg kilderoten.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Skriv inn en gyldig byggeverktøyversjon.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Writerside-byggeverktøy kreves';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark bruker det offisielle containerbildet $image. Vil du laste det ned nå? Bildet er stort og lagres av Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Laster ned Writerside-byggeverktøy…';
-
   @override
   String get exportingWritersidePdf => 'Eksporterer Writerside-PDF…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker kreves for Writerside PDF-eksport. Installer og start Docker, og prøv igjen.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'Det forespurte Writerside-byggebildet er ikke tilgjengelig.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Writerside PDF-konfigurasjonen er ugyldig.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Writerside-byggeverktøyet kunne ikke opprette PDF-filen.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Writerside-byggeverktøyet produserte ikke en gyldig PDF-fil.';
-
   @override
   String get ai => 'KI';
 
@@ -3071,6 +3195,15 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get aiProvider => 'KI-leverandør';
 
+  @override
+  String get aiDefaultProvider => 'Standardleverandør';
+
+  @override
+  String get aiConfigureProvider => 'Konfigurer leverandør';
+
+  @override
+  String get aiChooseProvider => 'Velg KI-leverandør';
+
   @override
   String get aiOllamaEndpoint => 'Ollama-endepunkt';
 
@@ -3089,8 +3222,7 @@ class AppLocalizationsNb extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama kjører, men ingen installerte modeller ble funnet.';
+  String get aiNoModels => 'Ingen modell er valgt.';
 
   @override
   String get aiConnectionFailed =>
@@ -3193,19 +3325,6 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Innhold sendt til KI';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'KI er deaktivert. BusyMark sender aldri dokumentinnhold uten en eksplisitt KI-handling.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark sender bare konteksten som vises i gjennomgangsdialogen, til den konfigurerte lokale Ollama-tjenesten. Forslag brukes aldri uten gjennomgang.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark sender bare konteksten som vises i gjennomgangsdialogen, til $provider. Forespørsler er tilstandsløse, og forslag brukes aldri uten gjennomgang.';
-  }
-
   @override
   String get aiApiKey => 'API-nøkkel';
 
@@ -3244,6 +3363,9 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Foretrukket modell';
 
+  @override
+  String get aiModel => 'Modell';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests forespørsler · $input inndata-tokener · $output utdata-tokener';
@@ -3330,4 +3452,14 @@ class AppLocalizationsNb extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Tabelloverskrifter må identifisere kolonnene. Fyll ut alle tomme overskrifter.';
+
+  @override
+  String get mathRenderFailed =>
+      'Det matematiske uttrykket kunne ikke gjengis.';
+
+  @override
+  String get inlineMath => 'Integrert matematikk';
+
+  @override
+  String get displayMath => 'Matematikkblokk';
 }
diff --git a/lib/l10n/generated/app_localizations_pl.dart b/lib/l10n/generated/app_localizations_pl.dart
index be543a91..0723dc20 100644
--- a/lib/l10n/generated/app_localizations_pl.dart
+++ b/lib/l10n/generated/app_localizations_pl.dart
@@ -219,6 +219,19 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Skróty klawiaturowe';
 
+  @override
+  String get commandPalette => 'Paleta poleceń';
+
+  @override
+  String get commandPaletteHint => 'Wpisz polecenie';
+
+  @override
+  String get commandPaletteEmpty => 'Brak pasujących poleceń';
+
+  @override
+  String get commandUnavailableInContext =>
+      'To polecenie nie jest dostępne w bieżącym kontekście.';
+
   @override
   String get lightTheme => 'Jasny';
 
@@ -716,6 +729,14 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Okno';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Otwieraj poprzedni obszar roboczy przy uruchamianiu';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Otwórz obszar roboczy i karty z poprzedniej sesji podczas uruchamiania BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Potwierdzaj zamknięcie przy niezapisanych zmianach';
@@ -769,6 +790,11 @@ class AppLocalizationsPl extends AppLocalizations {
     return 'Masz niezapisane zmiany w $fileName. Zapisać je przed kontynuowaniem?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return '$count dokumenty zawierają niezapisane zmiany. Zapisać je przed kontynuowaniem?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Plik zmieniony na dysku';
 
@@ -809,6 +835,40 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get image => 'Obraz';
 
+  @override
+  String get video => 'Wideo';
+
+  @override
+  String get openVideo => 'Odtwórz wideo';
+
+  @override
+  String get pauseVideo => 'Wstrzymaj wideo';
+
+  @override
+  String get videoUnavailable => 'Wideo jest niedostępne';
+
+  @override
+  String get videoPreview => 'Podgląd wideo';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'Wideo nie ma atrybutu src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Nieobsługiwane źródło wideo: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Plik wideo nie istnieje: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Obraz podglądu wideo nie istnieje: $preview';
+  }
+
   @override
   String get inlineImage => 'Obraz w tekście';
 
@@ -903,6 +963,18 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get deleteColumn => 'Usuń kolumnę';
 
+  @override
+  String get tableAlignmentUnspecified => 'Wyrównanie: nieokreślone';
+
+  @override
+  String get tableAlignmentLeft => 'Wyrównanie: do lewej';
+
+  @override
+  String get tableAlignmentCenter => 'Wyrównanie: do środka';
+
+  @override
+  String get tableAlignmentRight => 'Wyrównanie: do prawej';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Wiersz $rowNumber';
@@ -1339,6 +1411,132 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Wyrażenie regularne';
 
+  @override
+  String get sourceSearchReplacement => 'Zamień na';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Zamień bieżące';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Zamień i znajdź następne';
+
+  @override
+  String get sourceSearchReplaceAll => 'Zamień wszystko';
+
+  @override
+  String get workspaceReplace => 'Zamień w obszarze roboczym';
+
+  @override
+  String get reviewReplacements => 'Przejrzyj zamiany';
+
+  @override
+  String get applyReplacements => 'Zastosuj zamiany';
+
+  @override
+  String get skippedFiles => 'Pominięte pliki';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Niezapisana zawartość edytora';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Zawartość zapisana na dysku';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Wybierz wszystkie dopasowania ($count)';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Zamieniono $matches dopasowań w $files plikach; pominięto $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Końcowy znak nowego wiersza';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Brak końcowego znaku nowego wiersza';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normalizuj zakończenia wierszy';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Ten dokument zawiera mieszane zakończenia wierszy. Wybierz format.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName używa mieszanych zakończeń wierszy. Wybierz format przed zamianą.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized => 'Pominięto zbyt duży plik.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Pominięto plik, którego nie można odczytać.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Pominięto plik z nieprawidłowym kodowaniem UTF-8.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'Podgląd zamian został skrócony.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Pominięto plik zmieniony po utworzeniu podglądu.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Pominięto bufor edytora zmieniony po utworzeniu podglądu.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Przed zamianą wybierz normalizację LF lub CRLF.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Wycofywanie zatrzymano, ponieważ plik został jednocześnie zmieniony. Niektóre zamiany mogą pozostać; zastąpioną zawartość zachowano w poniższej ścieżce.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Nie zastosowano żadnych zamian, ponieważ sprawdzonego zestawu nie można było bezpiecznie zapisać.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Zmiany zewnętrzne — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Ten plik został usunięty z dysku.';
+
+  @override
+  String get externalFileChanged =>
+      'Ten plik zmienił się na dysku, gdy masz niezapisane zmiany.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Odzyskano niezapisaną treść pliku $fileName. Przejrzyj ją, a następnie zapisz, zapisz jako lub odrzuć.';
+  }
+
+  @override
+  String get compare => 'Porównaj';
+
+  @override
+  String get reloadFromDisk => 'Wczytaj ponownie z dysku';
+
+  @override
+  String get keepMine => 'Zachowaj moją wersję';
+
+  @override
+  String get saveAs => 'Zapisz jako';
+
   @override
   String get sourceSearchInvalidRegex => 'Nieprawidłowe wyrażenie regularne';
 
@@ -1349,6 +1547,12 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get nothingToRead => 'Brak treści do przeczytania';
 
+  @override
+  String get admonition => 'Adnotacja';
+
+  @override
+  String get quote => 'Cytat';
+
   @override
   String get note => 'Uwaga';
 
@@ -1477,6 +1681,16 @@ class AppLocalizationsPl extends AppLocalizations {
     return 'Sprawdzanie poprawności nie powiodło się: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Odzyskano $count niezapisanych dokumentów. Przejrzyj każdy odzyskany dokument przed kontynuowaniem.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'Nie udało się przywrócić $count uszkodzonych rekordów odzyskiwania. Prawidłowe odzyskane dokumenty są nadal dostępne.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Ścieżka nie istnieje: $path';
@@ -2311,6 +2525,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get fileActions => 'Działania na pliku';
 
+  @override
+  String get actions => 'Działania';
+
   @override
   String get gitStatusAdded => 'Dodany';
 
@@ -2387,8 +2604,34 @@ class AppLocalizationsPl extends AppLocalizations {
       'Gałęzie się rozeszły. Rozwiąż scalanie lub wykonaj rebase poza tą wersją BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Uwierzytelnianie Git nie powiodło się. W pakiecie snap repozytoria SSH mogą wymagać podłączenia interfejsu ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Git wymaga nazwy autora i adresu e-mail przed utworzeniem commita.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Tożsamość autora Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Wprowadź tożsamość, którą Git ma zapisywać w commitach. BusyMark ją zapisze i ponowi ten commit.';
+
+  @override
+  String get gitAuthorName => 'Nazwa';
+
+  @override
+  String get gitAuthorEmail => 'E-mail';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Używaj we wszystkich repozytoriach';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'W instalacji Snap dotyczy to repozytoriów otwieranych w BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Zapisz i utwórz commit';
+
+  @override
+  String get gitErrorAuthentication => 'Uwierzytelnianie Git nie powiodło się.';
 
   @override
   String get gitErrorNetwork => 'Operacja sieciowa Git nie powiodła się.';
@@ -2968,137 +3211,15 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Eksportuj Writerside jako PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Wybierz instancję i ustawienia PDF. BusyMark używa oficjalnego programu budującego Writerside firmy JetBrains.';
-
   @override
   String get writersidePdfContent => 'Zawartość eksportu';
 
-  @override
-  String get writersidePdfSettings => 'Ustawienia PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Skonfiguruj dla tego eksportu';
-
-  @override
-  String get writersidePdfProjectConfiguration => 'Użyj konfiguracji projektu';
-
-  @override
-  String get writersidePdfConfigurationFile => 'Plik konfiguracji PDF';
-
   @override
   String get writersidePdfPage => 'Strona';
 
-  @override
-  String get writersidePdfKeymap => 'Mapa klawiszy';
-
-  @override
-  String get writersidePdfNoKeymap => 'Bez mapy klawiszy';
-
-  @override
-  String get writersidePdfTocTitle => 'Tytuł spisu treści';
-
-  @override
-  String get writersidePdfCover => 'Strona tytułowa';
-
-  @override
-  String get writersidePdfIncludeCover => 'Dołącz stronę tytułową';
-
-  @override
-  String get writersidePdfCoverTitle => 'Tytuł na okładce';
-
-  @override
-  String get writersidePdfCoverDescription => 'Opis na okładce';
-
-  @override
-  String get writersidePdfCopyright => 'Prawa autorskie';
-
-  @override
-  String get writersidePdfCoverLogo => 'Logo na okładce';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Wybierz logo na okładkę';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Nagłówek i stopka';
-
-  @override
-  String get writersidePdfHeader => 'Nagłówek';
-
-  @override
-  String get writersidePdfFooter => 'Stopka';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Te wartości odwzorowują otwarty moduł na układ źródeł programu budującego.';
-
-  @override
-  String get writersidePdfModuleName => 'Nazwa modułu';
-
-  @override
-  String get writersidePdfSourceRoot => 'Katalog główny źródeł';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Wybierz katalog główny źródeł';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Wersja programu budującego';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Zezwól na sieć podczas budowania';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Domyślnie wyłączone. Włącz tylko wtedy, gdy projekt świadomie wymaga zdalnych zasobów do budowania.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Wprowadź nazwę modułu.';
-
-  @override
-  String get writersidePdfSourceRootRequired =>
-      'Wybierz katalog główny źródeł.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Wprowadź prawidłową wersję programu budującego.';
-
-  @override
-  String get writersidePdfBuilderRequired =>
-      'Wymagany program budujący Writerside';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark używa oficjalnego obrazu kontenera $image. Pobrać go teraz? Obraz jest duży i zostanie zapisany przez Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Pobieranie programu budującego Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Eksportowanie PDF Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Docker jest wymagany do eksportu Writerside do PDF. Zainstaluj i uruchom Docker, a następnie spróbuj ponownie.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'Żądany obraz programu budującego Writerside jest niedostępny.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Konfiguracja PDF Writerside jest nieprawidłowa.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Program budujący Writerside nie mógł utworzyć pliku PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Program budujący Writerside nie utworzył prawidłowego pliku PDF.';
-
   @override
   String get ai => 'SI';
 
@@ -3115,6 +3236,15 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get aiProvider => 'Dostawca SI';
 
+  @override
+  String get aiDefaultProvider => 'Domyślny dostawca';
+
+  @override
+  String get aiConfigureProvider => 'Skonfiguruj dostawcę';
+
+  @override
+  String get aiChooseProvider => 'Wybierz dostawcę SI';
+
   @override
   String get aiOllamaEndpoint => 'Punkt końcowy Ollama';
 
@@ -3133,8 +3263,7 @@ class AppLocalizationsPl extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama działa, ale nie znaleziono zainstalowanych modeli.';
+  String get aiNoModels => 'Nie wybrano modelu.';
 
   @override
   String get aiConnectionFailed =>
@@ -3237,19 +3366,6 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Treść wysyłana do SI';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'SI jest wyłączona. BusyMark nigdy nie wysyła treści dokumentu bez jawnego działania SI.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark wysyła tylko kontekst pokazany w oknie przeglądu do skonfigurowanej lokalnej usługi Ollama. Propozycje nigdy nie są stosowane bez sprawdzenia.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark wysyła tylko kontekst pokazany w oknie przeglądu do $provider. Żądania są bezstanowe, a propozycje nigdy nie są stosowane bez sprawdzenia.';
-  }
-
   @override
   String get aiApiKey => 'Klucz API';
 
@@ -3288,6 +3404,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Preferowany model';
 
+  @override
+  String get aiModel => 'Model';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests żądań · $input tokenów wejściowych · $output tokenów wyjściowych';
@@ -3371,4 +3490,14 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Nagłówki tabeli muszą identyfikować kolumny; uzupełnij każdy pusty nagłówek.';
+
+  @override
+  String get mathRenderFailed =>
+      'Nie udało się wyrenderować wyrażenia matematycznego.';
+
+  @override
+  String get inlineMath => 'Matematyka w tekście';
+
+  @override
+  String get displayMath => 'Matematyka blokowa';
 }
diff --git a/lib/l10n/generated/app_localizations_pt.dart b/lib/l10n/generated/app_localizations_pt.dart
index 46680aae..b5381601 100644
--- a/lib/l10n/generated/app_localizations_pt.dart
+++ b/lib/l10n/generated/app_localizations_pt.dart
@@ -220,6 +220,19 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Atalhos de teclado';
 
+  @override
+  String get commandPalette => 'Paleta de comandos';
+
+  @override
+  String get commandPaletteHint => 'Digite um comando';
+
+  @override
+  String get commandPaletteEmpty => 'Nenhum comando correspondente';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Este comando não está disponível no contexto atual.';
+
   @override
   String get lightTheme => 'Claro';
 
@@ -716,6 +729,14 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Janela';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Reabrir o espaço de trabalho anterior ao iniciar';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Abra o espaço de trabalho e as abas da sessão anterior quando o BusyMark iniciar.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Confirmar antes de fechar com alterações não salvas';
@@ -765,6 +786,11 @@ class AppLocalizationsPt extends AppLocalizations {
     return 'Você tem alterações não salvas em $fileName. Salvá-las antes de continuar?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return 'Há $count documentos com alterações não salvas. Deseja salvá-los antes de continuar?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Arquivo alterado no disco';
 
@@ -805,6 +831,40 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get image => 'Imagem';
 
+  @override
+  String get video => 'Vídeo';
+
+  @override
+  String get openVideo => 'Reproduzir vídeo';
+
+  @override
+  String get pauseVideo => 'Pausar vídeo';
+
+  @override
+  String get videoUnavailable => 'Vídeo indisponível';
+
+  @override
+  String get videoPreview => 'Pré-visualização do vídeo';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'O vídeo não tem o atributo src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Fonte de vídeo não suportada: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'O ficheiro de vídeo não existe: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'A imagem de pré-visualização do vídeo não existe: $preview';
+  }
+
   @override
   String get inlineImage => 'Imagem embutida';
 
@@ -899,6 +959,18 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get deleteColumn => 'Excluir coluna';
 
+  @override
+  String get tableAlignmentUnspecified => 'Alinhamento: não especificado';
+
+  @override
+  String get tableAlignmentLeft => 'Alinhamento: esquerda';
+
+  @override
+  String get tableAlignmentCenter => 'Alinhamento: centro';
+
+  @override
+  String get tableAlignmentRight => 'Alinhamento: direita';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Linha $rowNumber';
@@ -1328,6 +1400,133 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Expressão regular';
 
+  @override
+  String get sourceSearchReplacement => 'Substituir por';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Substituir atual';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Substituir e localizar próximo';
+
+  @override
+  String get sourceSearchReplaceAll => 'Substituir tudo';
+
+  @override
+  String get workspaceReplace => 'Substituir no espaço de trabalho';
+
+  @override
+  String get reviewReplacements => 'Revisar substituições';
+
+  @override
+  String get applyReplacements => 'Aplicar substituições';
+
+  @override
+  String get skippedFiles => 'Arquivos ignorados';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Conteúdo não salvo do editor';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Conteúdo salvo no disco';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Selecionar todas as $count correspondências';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Foram substituídas $matches correspondências em $files arquivos; $skipped ignoradas.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Quebra de linha final';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Sem quebra de linha final';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Normalizar finais de linha';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'Este documento contém finais de linha mistos. Escolha um formato.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return '$fileName usa finais de linha mistos. Escolha o formato antes de substituir.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized =>
+      'Um arquivo grande demais foi ignorado.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Um arquivo que não pôde ser lido foi ignorado.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Um arquivo que não é UTF-8 válido foi ignorado.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'A prévia de substituições foi truncada.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Um arquivo alterado após a prévia foi ignorado.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Um buffer do editor alterado após a prévia foi ignorado.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Escolha a normalização LF ou CRLF antes de substituir.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'A reversão foi interrompida porque o ficheiro foi alterado em simultâneo. Algumas substituições podem permanecer; o conteúdo deslocado foi preservado no caminho abaixo.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Nenhuma substituição foi aplicada porque o conjunto revisado não pôde ser salvo com segurança.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Alterações externas — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Este arquivo foi excluído do disco.';
+
+  @override
+  String get externalFileChanged =>
+      'Este arquivo mudou no disco enquanto você tem alterações não salvas.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'O conteúdo não salvo de $fileName foi recuperado. Revise-o e depois salve, salve como ou descarte-o.';
+  }
+
+  @override
+  String get compare => 'Comparar';
+
+  @override
+  String get reloadFromDisk => 'Recarregar do disco';
+
+  @override
+  String get keepMine => 'Manter minha versão';
+
+  @override
+  String get saveAs => 'Salvar como';
+
   @override
   String get sourceSearchInvalidRegex => 'Expressão regular inválida';
 
@@ -1338,6 +1537,12 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get nothingToRead => 'Nenhum conteúdo para ler';
 
+  @override
+  String get admonition => 'Aviso';
+
+  @override
+  String get quote => 'Citação';
+
   @override
   String get note => 'Observação';
 
@@ -1466,6 +1671,16 @@ class AppLocalizationsPt extends AppLocalizations {
     return 'Falha na validação: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Foram recuperados $count documentos não salvos. Revise cada documento recuperado antes de continuar.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'Não foi possível restaurar $count registros de recuperação danificados. Os documentos recuperados válidos continuam disponíveis.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'O caminho não existe: $path';
@@ -2288,6 +2503,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get fileActions => 'Ações do arquivo';
 
+  @override
+  String get actions => 'Ações';
+
   @override
   String get gitStatusAdded => 'Adicionado';
 
@@ -2363,8 +2581,34 @@ class AppLocalizationsPt extends AppLocalizations {
       'A branch divergiu. Resolva o merge ou o rebase fora desta versão do BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'A autenticação do Git falhou. No snap, os remotos SSH podem exigir a conexão da interface ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'O Git precisa do nome e do e-mail do autor antes de criar um commit.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Identidade do autor do Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Informe a identidade que o Git deve registrar nos commits. O BusyMark irá salvá-la e tentar este commit novamente.';
+
+  @override
+  String get gitAuthorName => 'Nome';
+
+  @override
+  String get gitAuthorEmail => 'E-mail';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Usar em todos os repositórios';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Quando instalado como Snap, isto se aplica aos repositórios abertos no BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Salvar e criar commit';
+
+  @override
+  String get gitErrorAuthentication => 'A autenticação do Git falhou.';
 
   @override
   String get gitErrorNetwork => 'A operação de rede do Git falhou.';
@@ -2945,137 +3189,15 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Exportar Writerside como PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Escolha uma instância e as configurações de PDF. O BusyMark usa o compilador oficial do Writerside da JetBrains.';
-
   @override
   String get writersidePdfContent => 'Conteúdo da exportação';
 
-  @override
-  String get writersidePdfSettings => 'Configurações do PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Configurar para esta exportação';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Usar configuração do projeto';
-
-  @override
-  String get writersidePdfConfigurationFile => 'Arquivo de configuração do PDF';
-
   @override
   String get writersidePdfPage => 'Página';
 
-  @override
-  String get writersidePdfKeymap => 'Mapa de teclas';
-
-  @override
-  String get writersidePdfNoKeymap => 'Sem mapa de teclas';
-
-  @override
-  String get writersidePdfTocTitle => 'Título do sumário';
-
-  @override
-  String get writersidePdfCover => 'Página de capa';
-
-  @override
-  String get writersidePdfIncludeCover => 'Incluir página de capa';
-
-  @override
-  String get writersidePdfCoverTitle => 'Título da capa';
-
-  @override
-  String get writersidePdfCoverDescription => 'Descrição da capa';
-
-  @override
-  String get writersidePdfCopyright => 'Direitos autorais';
-
-  @override
-  String get writersidePdfCoverLogo => 'Logotipo da capa';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Escolher logotipo da capa';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Cabeçalho e rodapé';
-
-  @override
-  String get writersidePdfHeader => 'Cabeçalho';
-
-  @override
-  String get writersidePdfFooter => 'Rodapé';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Esses valores mapeiam o módulo aberto para a estrutura de fontes do compilador.';
-
-  @override
-  String get writersidePdfModuleName => 'Nome do módulo';
-
-  @override
-  String get writersidePdfSourceRoot => 'Raiz das fontes';
-
-  @override
-  String get writersidePdfChooseSourceRoot => 'Escolher raiz das fontes';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Versão do compilador';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Permitir rede durante a compilação';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Desativado por padrão. Ative somente se o projeto precisar intencionalmente de recursos remotos de compilação.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Digite o nome do módulo.';
-
-  @override
-  String get writersidePdfSourceRootRequired => 'Escolha a raiz das fontes.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Digite uma versão válida do compilador.';
-
-  @override
-  String get writersidePdfBuilderRequired =>
-      'Compilador do Writerside necessário';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'O BusyMark usa a imagem de contêiner oficial $image. Baixá-la agora? A imagem é grande e será armazenada pelo Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Baixando o compilador do Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Exportando PDF do Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'O Docker é necessário para exportar Writerside como PDF. Instale e inicie o Docker e tente novamente.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'A imagem solicitada do compilador do Writerside não está disponível.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'A configuração de PDF do Writerside é inválida.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'O compilador do Writerside não conseguiu criar o PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'O compilador do Writerside não produziu um PDF válido.';
-
   @override
   String get ai => 'IA';
 
@@ -3092,6 +3214,15 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get aiProvider => 'Provedor de IA';
 
+  @override
+  String get aiDefaultProvider => 'Provedor predefinido';
+
+  @override
+  String get aiConfigureProvider => 'Configurar provedor';
+
+  @override
+  String get aiChooseProvider => 'Escolher provedor de IA';
+
   @override
   String get aiOllamaEndpoint => 'Endpoint do Ollama';
 
@@ -3110,8 +3241,7 @@ class AppLocalizationsPt extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'O Ollama está em execução, mas nenhum modelo instalado foi encontrado.';
+  String get aiNoModels => 'Nenhum modelo selecionado.';
 
   @override
   String get aiConnectionFailed =>
@@ -3214,19 +3344,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Conteúdo enviado à IA';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'A IA está desativada. O BusyMark nunca envia o conteúdo do documento sem uma ação explícita de IA.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'O BusyMark envia apenas o contexto exibido na caixa de diálogo de revisão ao serviço Ollama local configurado. As propostas nunca são aplicadas sem revisão.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'O BusyMark envia apenas o contexto exibido na caixa de diálogo de revisão para $provider. As solicitações não mantêm estado e as propostas nunca são aplicadas sem revisão.';
-  }
-
   @override
   String get aiApiKey => 'Chave de API';
 
@@ -3265,6 +3382,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Modelo preferido';
 
+  @override
+  String get aiModel => 'Modelo';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests solicitações · $input tokens de entrada · $output tokens de saída';
@@ -3350,4 +3470,14 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Os cabeçalhos da tabela devem identificar suas colunas; preencha cada cabeçalho vazio.';
+
+  @override
+  String get mathRenderFailed =>
+      'Não foi possível renderizar a expressão matemática.';
+
+  @override
+  String get inlineMath => 'Matemática em linha';
+
+  @override
+  String get displayMath => 'Matemática em bloco';
 }
diff --git a/lib/l10n/generated/app_localizations_ru.dart b/lib/l10n/generated/app_localizations_ru.dart
index 139da0da..82dc7a9c 100644
--- a/lib/l10n/generated/app_localizations_ru.dart
+++ b/lib/l10n/generated/app_localizations_ru.dart
@@ -220,6 +220,19 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Сочетания клавиш';
 
+  @override
+  String get commandPalette => 'Палитра команд';
+
+  @override
+  String get commandPaletteHint => 'Введите команду';
+
+  @override
+  String get commandPaletteEmpty => 'Нет подходящих команд';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Эта команда недоступна в текущем контексте.';
+
   @override
   String get lightTheme => 'Светлая';
 
@@ -711,6 +724,14 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Окно';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Открывать предыдущее рабочее пространство при запуске';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Открывать рабочее пространство и вкладки предыдущего сеанса при запуске BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Подтверждать закрытие при несохранённых изменениях';
@@ -764,6 +785,11 @@ class AppLocalizationsRu extends AppLocalizations {
     return 'В файле $fileName есть несохранённые изменения. Сохранить их перед продолжением?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return 'В документах ($count) есть несохранённые изменения. Сохранить их перед продолжением?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Файл изменён на диске';
 
@@ -804,6 +830,40 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get image => 'Изображение';
 
+  @override
+  String get video => 'Видео';
+
+  @override
+  String get openVideo => 'Воспроизвести видео';
+
+  @override
+  String get pauseVideo => 'Приостановить видео';
+
+  @override
+  String get videoUnavailable => 'Видео недоступно';
+
+  @override
+  String get videoPreview => 'Предпросмотр видео';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'У видео отсутствует атрибут src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Неподдерживаемый источник видео: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Видеофайл не существует: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Изображение предпросмотра видео не существует: $preview';
+  }
+
   @override
   String get inlineImage => 'Встроенное изображение';
 
@@ -898,6 +958,18 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get deleteColumn => 'Удалить столбец';
 
+  @override
+  String get tableAlignmentUnspecified => 'Выравнивание: не задано';
+
+  @override
+  String get tableAlignmentLeft => 'Выравнивание: по левому краю';
+
+  @override
+  String get tableAlignmentCenter => 'Выравнивание: по центру';
+
+  @override
+  String get tableAlignmentRight => 'Выравнивание: по правому краю';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Строка $rowNumber';
@@ -1333,6 +1405,132 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Регулярное выражение';
 
+  @override
+  String get sourceSearchReplacement => 'Заменить на';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Заменить текущее';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Заменить и найти следующее';
+
+  @override
+  String get sourceSearchReplaceAll => 'Заменить всё';
+
+  @override
+  String get workspaceReplace => 'Заменить в рабочей области';
+
+  @override
+  String get reviewReplacements => 'Проверить замены';
+
+  @override
+  String get applyReplacements => 'Применить замены';
+
+  @override
+  String get skippedFiles => 'Пропущенные файлы';
+
+  @override
+  String get workspaceReplaceDirtyBuffer =>
+      'Несохранённое содержимое редактора';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Содержимое, сохранённое на диске';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Выбрать все совпадения: $count';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Заменено совпадений: $matches в файлах: $files; пропущено: $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Конечный перевод строки';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Нет конечного перевода строки';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Нормализовать окончания строк';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'В документе используются смешанные окончания строк. Выберите формат.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return 'В $fileName используются смешанные окончания строк. Выберите формат перед заменой.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized => 'Слишком большой файл пропущен.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable => 'Нечитаемый файл пропущен.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Файл с недопустимой кодировкой UTF-8 пропущен.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'Предпросмотр замен был сокращён.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Файл, изменённый после предпросмотра, пропущен.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Буфер редактора, изменённый после предпросмотра, пропущен.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Перед заменой выберите нормализацию LF или CRLF.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Откат остановлен, поскольку файл был одновременно изменён. Некоторые замены могли сохраниться; вытесненное содержимое сохранено по указанному ниже пути.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Замены не применены, поскольку проверенный набор не удалось безопасно сохранить.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Внешние изменения — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Этот файл был удалён с диска.';
+
+  @override
+  String get externalFileChanged =>
+      'Этот файл изменился на диске, пока у вас были несохранённые изменения.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Восстановлено несохранённое содержимое файла $fileName. Проверьте его, затем сохраните, сохраните как новый файл или отбросьте.';
+  }
+
+  @override
+  String get compare => 'Сравнить';
+
+  @override
+  String get reloadFromDisk => 'Перезагрузить с диска';
+
+  @override
+  String get keepMine => 'Оставить мою версию';
+
+  @override
+  String get saveAs => 'Сохранить как';
+
   @override
   String get sourceSearchInvalidRegex => 'Некорректное регулярное выражение';
 
@@ -1343,6 +1541,12 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get nothingToRead => 'Нет содержимого для чтения';
 
+  @override
+  String get admonition => 'Блок-уведомление';
+
+  @override
+  String get quote => 'Цитата';
+
   @override
   String get note => 'Примечание';
 
@@ -1470,6 +1674,16 @@ class AppLocalizationsRu extends AppLocalizations {
     return 'Проверка не удалась: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Восстановлено несохранённых документов: $count. Проверьте каждый восстановленный документ перед продолжением.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'Не удалось восстановить повреждённые записи ($count). Корректные восстановленные документы остаются доступными.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Путь не существует: $path';
@@ -2304,6 +2518,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get fileActions => 'Действия с файлом';
 
+  @override
+  String get actions => 'Действия';
+
   @override
   String get gitStatusAdded => 'Добавлен';
 
@@ -2379,8 +2596,34 @@ class AppLocalizationsRu extends AppLocalizations {
       'Ветка разошлась с upstream-веткой. Выполните слияние или rebase вне этой версии BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Не удалось пройти аутентификацию Git. Для удалённых SSH-репозиториев в snap может потребоваться подключить интерфейс ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Перед созданием коммита Git требуется имя и адрес электронной почты автора.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Данные автора Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Введите данные, которые Git должен записывать в коммитах. BusyMark сохранит их и повторит этот коммит.';
+
+  @override
+  String get gitAuthorName => 'Имя';
+
+  @override
+  String get gitAuthorEmail => 'Электронная почта';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Использовать для всех репозиториев';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'При установке через Snap это относится к репозиториям, открытым в BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Сохранить и создать коммит';
+
+  @override
+  String get gitErrorAuthentication => 'Не удалось пройти аутентификацию Git.';
 
   @override
   String get gitErrorNetwork => 'Сетевая операция Git не удалась.';
@@ -2961,137 +3204,15 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Экспорт Writerside в PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Выберите экземпляр и параметры PDF. BusyMark использует официальный сборщик Writerside от JetBrains.';
-
   @override
   String get writersidePdfContent => 'Содержимое экспорта';
 
-  @override
-  String get writersidePdfSettings => 'Настройки PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Настроить для этого экспорта';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Использовать конфигурацию проекта';
-
-  @override
-  String get writersidePdfConfigurationFile => 'Файл конфигурации PDF';
-
   @override
   String get writersidePdfPage => 'Страница';
 
-  @override
-  String get writersidePdfKeymap => 'Раскладка клавиш';
-
-  @override
-  String get writersidePdfNoKeymap => 'Без раскладки клавиш';
-
-  @override
-  String get writersidePdfTocTitle => 'Заголовок оглавления';
-
-  @override
-  String get writersidePdfCover => 'Титульная страница';
-
-  @override
-  String get writersidePdfIncludeCover => 'Добавить титульную страницу';
-
-  @override
-  String get writersidePdfCoverTitle => 'Заголовок обложки';
-
-  @override
-  String get writersidePdfCoverDescription => 'Описание на обложке';
-
-  @override
-  String get writersidePdfCopyright => 'Авторские права';
-
-  @override
-  String get writersidePdfCoverLogo => 'Логотип на обложке';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Выбрать логотип для обложки';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Верхний и нижний колонтитулы';
-
-  @override
-  String get writersidePdfHeader => 'Верхний колонтитул';
-
-  @override
-  String get writersidePdfFooter => 'Нижний колонтитул';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Эти значения сопоставляют открытый модуль со структурой исходных файлов сборщика.';
-
-  @override
-  String get writersidePdfModuleName => 'Имя модуля';
-
-  @override
-  String get writersidePdfSourceRoot => 'Корневая папка исходных файлов';
-
-  @override
-  String get writersidePdfChooseSourceRoot =>
-      'Выбрать корневую папку исходных файлов';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Версия сборщика';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Разрешить сеть во время сборки';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'По умолчанию отключено. Включайте, только если проекту намеренно нужны удалённые ресурсы сборки.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Введите имя модуля.';
-
-  @override
-  String get writersidePdfSourceRootRequired =>
-      'Выберите корневую папку исходных файлов.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Введите допустимую версию сборщика.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Требуется сборщик Writerside';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark использует официальный образ контейнера $image. Скачать его сейчас? Образ имеет большой размер и будет храниться в Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder => 'Загрузка сборщика Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Экспорт PDF Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Для экспорта Writerside в PDF требуется Docker. Установите и запустите Docker, затем повторите попытку.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'Запрошенный образ сборщика Writerside недоступен.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Недопустимая конфигурация PDF Writerside.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Сборщику Writerside не удалось создать PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Сборщик Writerside не создал допустимый PDF.';
-
   @override
   String get ai => 'ИИ';
 
@@ -3108,6 +3229,15 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get aiProvider => 'Поставщик ИИ';
 
+  @override
+  String get aiDefaultProvider => 'Поставщик по умолчанию';
+
+  @override
+  String get aiConfigureProvider => 'Настроить поставщика';
+
+  @override
+  String get aiChooseProvider => 'Выберите поставщика ИИ';
+
   @override
   String get aiOllamaEndpoint => 'Конечная точка Ollama';
 
@@ -3126,8 +3256,7 @@ class AppLocalizationsRu extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama запущен, но установленные модели не найдены.';
+  String get aiNoModels => 'Модель не выбрана.';
 
   @override
   String get aiConnectionFailed =>
@@ -3230,19 +3359,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Содержимое, отправляемое ИИ';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'ИИ отключён. BusyMark никогда не отправляет содержимое документа без явного действия с ИИ.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark отправляет только контекст, показанный в диалоге проверки, настроенной локальной службе Ollama. Предложения никогда не применяются без проверки.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark отправляет только контекст, показанный в диалоге проверки, поставщику $provider. Запросы не сохраняют состояние, а предложения никогда не применяются без проверки.';
-  }
-
   @override
   String get aiApiKey => 'Ключ API';
 
@@ -3281,6 +3397,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Предпочитаемая модель';
 
+  @override
+  String get aiModel => 'Модель';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests запросов · $input входных токенов · $output выходных токенов';
@@ -3366,4 +3485,14 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Заголовки таблицы должны обозначать столбцы; заполните каждый пустой заголовок.';
+
+  @override
+  String get mathRenderFailed =>
+      'Не удалось отобразить математическое выражение.';
+
+  @override
+  String get inlineMath => 'Формула в строке';
+
+  @override
+  String get displayMath => 'Формула отдельным блоком';
 }
diff --git a/lib/l10n/generated/app_localizations_uk.dart b/lib/l10n/generated/app_localizations_uk.dart
index 3fe9349a..2616056b 100644
--- a/lib/l10n/generated/app_localizations_uk.dart
+++ b/lib/l10n/generated/app_localizations_uk.dart
@@ -219,6 +219,19 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get keyboardShortcuts => 'Комбінації клавіш';
 
+  @override
+  String get commandPalette => 'Палітра команд';
+
+  @override
+  String get commandPaletteHint => 'Введіть команду';
+
+  @override
+  String get commandPaletteEmpty => 'Немає відповідних команд';
+
+  @override
+  String get commandUnavailableInContext =>
+      'Ця команда недоступна в поточному контексті.';
+
   @override
   String get lightTheme => 'Світла';
 
@@ -716,6 +729,14 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get settingsWindowSectionTitle => 'Вікно';
 
+  @override
+  String get settingsReopenWorkspaceOnStartupTitle =>
+      'Відкривати попередній робочий простір під час запуску';
+
+  @override
+  String get settingsReopenWorkspaceOnStartupDescription =>
+      'Відкривати робочий простір і вкладки попереднього сеансу під час запуску BusyMark.';
+
   @override
   String get settingsConfirmCloseWithUnsavedChangesTitle =>
       'Підтверджувати закриття за наявності незбережених змін';
@@ -769,6 +790,11 @@ class AppLocalizationsUk extends AppLocalizations {
     return '$fileName містить незбережені зміни. Зберегти їх перед продовженням?';
   }
 
+  @override
+  String unsavedChangesMultipleMessage(int count) {
+    return 'У документах ($count) є незбережені зміни. Зберегти їх перед продовженням?';
+  }
+
   @override
   String get fileChangedOnDisk => 'Файл змінено на диску';
 
@@ -809,6 +835,40 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get image => 'Зображення';
 
+  @override
+  String get video => 'Відео';
+
+  @override
+  String get openVideo => 'Відтворити відео';
+
+  @override
+  String get pauseVideo => 'Призупинити відео';
+
+  @override
+  String get videoUnavailable => 'Відео недоступне';
+
+  @override
+  String get videoPreview => 'Попередній перегляд відео';
+
+  @override
+  String get diagnosticWritersideVideoMissingSource =>
+      'У відео відсутній атрибут src.';
+
+  @override
+  String diagnosticWritersideVideoUnsupportedSource(String source) {
+    return 'Непідтримуване джерело відео: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingFile(String source) {
+    return 'Відеофайл не існує: $source';
+  }
+
+  @override
+  String diagnosticWritersideVideoMissingPreview(String preview) {
+    return 'Зображення попереднього перегляду відео не існує: $preview';
+  }
+
   @override
   String get inlineImage => 'Вбудоване зображення';
 
@@ -904,6 +964,18 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get deleteColumn => 'Видалити стовпець';
 
+  @override
+  String get tableAlignmentUnspecified => 'Вирівнювання: не вказано';
+
+  @override
+  String get tableAlignmentLeft => 'Вирівнювання: ліворуч';
+
+  @override
+  String get tableAlignmentCenter => 'Вирівнювання: по центру';
+
+  @override
+  String get tableAlignmentRight => 'Вирівнювання: праворуч';
+
   @override
   String tableRowNumber(int rowNumber) {
     return 'Рядок $rowNumber';
@@ -1341,6 +1413,132 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get sourceSearchRegex => 'Регулярний вираз';
 
+  @override
+  String get sourceSearchReplacement => 'Замінити на';
+
+  @override
+  String get sourceSearchReplaceCurrent => 'Замінити поточне';
+
+  @override
+  String get sourceSearchReplaceAndFindNext => 'Замінити й знайти наступне';
+
+  @override
+  String get sourceSearchReplaceAll => 'Замінити все';
+
+  @override
+  String get workspaceReplace => 'Замінити в робочій області';
+
+  @override
+  String get reviewReplacements => 'Переглянути заміни';
+
+  @override
+  String get applyReplacements => 'Застосувати заміни';
+
+  @override
+  String get skippedFiles => 'Пропущені файли';
+
+  @override
+  String get workspaceReplaceDirtyBuffer => 'Незбережений вміст редактора';
+
+  @override
+  String get workspaceReplaceDiskContent => 'Вміст, збережений на диску';
+
+  @override
+  String selectFileMatches(int count) {
+    return 'Вибрати всі збіги: $count';
+  }
+
+  @override
+  String workspaceReplaceApplied(int matches, int files, int skipped) {
+    return 'Замінено збігів: $matches у файлах: $files; пропущено: $skipped.';
+  }
+
+  @override
+  String documentFormatWithFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Кінцеве перенесення рядка';
+  }
+
+  @override
+  String documentFormatWithoutFinalNewline(String encoding, String lineEnding) {
+    return '$encoding · $lineEnding · Немає кінцевого перенесення рядка';
+  }
+
+  @override
+  String get normalizeLineEndings => 'Нормалізувати закінчення рядків';
+
+  @override
+  String get mixedLineEndingsSavePrompt =>
+      'У документі використовуються змішані закінчення рядків. Виберіть формат.';
+
+  @override
+  String workspaceReplaceMixedLineEndings(String fileName) {
+    return 'У $fileName використовуються змішані закінчення рядків. Виберіть формат перед заміною.';
+  }
+
+  @override
+  String get workspaceReplaceIssueOversized => 'Завеликий файл пропущено.';
+
+  @override
+  String get workspaceReplaceIssueUnreadable =>
+      'Файл, який не вдалося прочитати, пропущено.';
+
+  @override
+  String get workspaceReplaceIssueInvalidUtf8 =>
+      'Файл із неприпустимим UTF-8 пропущено.';
+
+  @override
+  String get workspaceReplaceIssueTruncated =>
+      'Попередній перегляд замін було скорочено.';
+
+  @override
+  String get workspaceReplaceIssueFileChanged =>
+      'Файл, змінений після попереднього перегляду, пропущено.';
+
+  @override
+  String get workspaceReplaceIssueBufferChanged =>
+      'Буфер редактора, змінений після попереднього перегляду, пропущено.';
+
+  @override
+  String get workspaceReplaceIssueNormalizationRequired =>
+      'Перед заміною виберіть нормалізацію LF або CRLF.';
+
+  @override
+  String get workspaceReplaceIssuePartialConflict =>
+      'Відкат зупинено, оскільки файл було одночасно змінено. Деякі заміни могли залишитися; витіснений вміст збережено за шляхом нижче.';
+
+  @override
+  String get workspaceReplaceIssueApplyFailed =>
+      'Заміни не застосовано, оскільки перевірений набір не вдалося безпечно зберегти.';
+
+  @override
+  String externalChangesTitle(String fileName) {
+    return 'Зовнішні зміни — $fileName';
+  }
+
+  @override
+  String get externalFileDeleted => 'Цей файл було видалено з диска.';
+
+  @override
+  String get externalFileChanged =>
+      'Цей файл змінився на диску, поки у вас були незбережені зміни.';
+
+  @override
+  String recoveredDocumentReview(String fileName) {
+    return 'Відновлено незбережений вміст файлу $fileName. Перегляньте його, потім збережіть, збережіть як новий файл або відкиньте.';
+  }
+
+  @override
+  String get compare => 'Порівняти';
+
+  @override
+  String get reloadFromDisk => 'Перезавантажити з диска';
+
+  @override
+  String get keepMine => 'Залишити мою версію';
+
+  @override
+  String get saveAs => 'Зберегти як';
+
   @override
   String get sourceSearchInvalidRegex => 'Некоректний регулярний вираз';
 
@@ -1351,6 +1549,12 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get nothingToRead => 'Немає вмісту для читання';
 
+  @override
+  String get admonition => 'Блок-примітка';
+
+  @override
+  String get quote => 'Цитата';
+
   @override
   String get note => 'Примітка';
 
@@ -1478,6 +1682,16 @@ class AppLocalizationsUk extends AppLocalizations {
     return 'Помилка перевірки: $error';
   }
 
+  @override
+  String workspaceRecoveryRestored(int count) {
+    return 'Відновлено незбережених документів: $count. Перегляньте кожен відновлений документ перед продовженням.';
+  }
+
+  @override
+  String workspaceRecoveryDamaged(int count) {
+    return 'Не вдалося відновити пошкоджені записи ($count). Коректні відновлені документи залишаються доступними.';
+  }
+
   @override
   String errorPathDoesNotExist(String path) {
     return 'Шлях не існує: $path';
@@ -2313,6 +2527,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get fileActions => 'Дії з файлом';
 
+  @override
+  String get actions => 'Дії';
+
   @override
   String get gitStatusAdded => 'Додано';
 
@@ -2387,8 +2604,34 @@ class AppLocalizationsUk extends AppLocalizations {
       'Гілка розійшлася з upstream-гілкою. Виконайте злиття або rebase поза цією версією BusyMark.';
 
   @override
-  String get gitErrorAuthentication =>
-      'Не вдалося автентифікуватися в Git. Для віддалених SSH-репозиторіїв у snap може знадобитися підключити інтерфейс ssh-keys.';
+  String get gitErrorAuthorIdentity =>
+      'Перед створенням коміту Git потребує ім’я та адресу електронної пошти автора.';
+
+  @override
+  String get gitAuthorIdentityTitle => 'Дані автора Git';
+
+  @override
+  String get gitAuthorIdentityMessage =>
+      'Введіть дані, які Git має записувати в комітах. BusyMark збереже їх і повторить цей коміт.';
+
+  @override
+  String get gitAuthorName => 'Ім’я';
+
+  @override
+  String get gitAuthorEmail => 'Електронна пошта';
+
+  @override
+  String get gitAuthorIdentityGlobal => 'Використовувати для всіх репозиторіїв';
+
+  @override
+  String get gitAuthorIdentityGlobalDescription =>
+      'Під час установлення через Snap це стосується репозиторіїв, відкритих у BusyMark.';
+
+  @override
+  String get gitSaveIdentityAndCommit => 'Зберегти й створити коміт';
+
+  @override
+  String get gitErrorAuthentication => 'Не вдалося автентифікуватися в Git.';
 
   @override
   String get gitErrorNetwork => 'Не вдалося виконати мережеву операцію Git.';
@@ -2969,138 +3212,15 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get exportWritersideAsPdf => 'Експорт Writerside у PDF';
 
-  @override
-  String get writersidePdfExportDescription =>
-      'Виберіть екземпляр і параметри PDF. BusyMark використовує офіційний збирач Writerside від JetBrains.';
-
   @override
   String get writersidePdfContent => 'Вміст експорту';
 
-  @override
-  String get writersidePdfSettings => 'Налаштування PDF';
-
-  @override
-  String get writersidePdfConfigureHere => 'Налаштувати для цього експорту';
-
-  @override
-  String get writersidePdfProjectConfiguration =>
-      'Використати конфігурацію проєкту';
-
-  @override
-  String get writersidePdfConfigurationFile => 'Файл конфігурації PDF';
-
   @override
   String get writersidePdfPage => 'Сторінка';
 
-  @override
-  String get writersidePdfKeymap => 'Розкладка клавіш';
-
-  @override
-  String get writersidePdfNoKeymap => 'Без розкладки клавіш';
-
-  @override
-  String get writersidePdfTocTitle => 'Заголовок змісту';
-
-  @override
-  String get writersidePdfCover => 'Титульна сторінка';
-
-  @override
-  String get writersidePdfIncludeCover => 'Додати титульну сторінку';
-
-  @override
-  String get writersidePdfCoverTitle => 'Заголовок обкладинки';
-
-  @override
-  String get writersidePdfCoverDescription => 'Опис на обкладинці';
-
-  @override
-  String get writersidePdfCopyright => 'Авторські права';
-
-  @override
-  String get writersidePdfCoverLogo => 'Логотип на обкладинці';
-
-  @override
-  String get writersidePdfChooseCoverLogo => 'Вибрати логотип для обкладинки';
-
-  @override
-  String get writersidePdfHeaderAndFooter => 'Верхній і нижній колонтитули';
-
-  @override
-  String get writersidePdfHeader => 'Верхній колонтитул';
-
-  @override
-  String get writersidePdfFooter => 'Нижній колонтитул';
-
-  @override
-  String get writersidePdfAdvancedDescription =>
-      'Ці значення зіставляють відкритий модуль зі структурою вихідних файлів збирача.';
-
-  @override
-  String get writersidePdfModuleName => 'Назва модуля';
-
-  @override
-  String get writersidePdfSourceRoot => 'Коренева папка вихідних файлів';
-
-  @override
-  String get writersidePdfChooseSourceRoot =>
-      'Вибрати кореневу папку вихідних файлів';
-
-  @override
-  String get writersidePdfBuilderVersion => 'Версія збирача';
-
-  @override
-  String get writersidePdfAllowNetwork => 'Дозволити мережу під час збирання';
-
-  @override
-  String get writersidePdfAllowNetworkDescription =>
-      'Початково вимкнено. Увімкніть лише тоді, коли проєкт навмисно потребує віддалених ресурсів збирання.';
-
-  @override
-  String get writersidePdfModuleNameRequired => 'Введіть назву модуля.';
-
-  @override
-  String get writersidePdfSourceRootRequired =>
-      'Виберіть кореневу папку вихідних файлів.';
-
-  @override
-  String get writersidePdfBuilderVersionInvalid =>
-      'Введіть припустиму версію збирача.';
-
-  @override
-  String get writersidePdfBuilderRequired => 'Потрібен збирач Writerside';
-
-  @override
-  String writersidePdfBuilderDownloadDescription(String image) {
-    return 'BusyMark використовує офіційний образ контейнера $image. Завантажити його зараз? Образ має великий розмір і зберігатиметься в Docker.';
-  }
-
-  @override
-  String get writersidePdfDownloadingBuilder =>
-      'Завантаження збирача Writerside…';
-
   @override
   String get exportingWritersidePdf => 'Експорт PDF Writerside…';
 
-  @override
-  String get writersidePdfDockerUnavailable =>
-      'Для експорту Writerside у PDF потрібен Docker. Установіть і запустіть Docker, а потім повторіть спробу.';
-
-  @override
-  String get writersidePdfBuilderUnavailable =>
-      'Запитаний образ збирача Writerside недоступний.';
-
-  @override
-  String get writersidePdfConfigurationInvalid =>
-      'Конфігурація PDF Writerside є неприпустимою.';
-
-  @override
-  String get writersidePdfBuildFailed =>
-      'Збирачу Writerside не вдалося створити PDF.';
-
-  @override
-  String get writersidePdfInvalidOutput =>
-      'Збирач Writerside не створив припустимий PDF.';
-
   @override
   String get ai => 'ШІ';
 
@@ -3117,6 +3237,15 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get aiProvider => 'Постачальник ШІ';
 
+  @override
+  String get aiDefaultProvider => 'Постачальник за замовчуванням';
+
+  @override
+  String get aiConfigureProvider => 'Налаштувати постачальника';
+
+  @override
+  String get aiChooseProvider => 'Виберіть постачальника ШІ';
+
   @override
   String get aiOllamaEndpoint => 'Кінцева точка Ollama';
 
@@ -3135,8 +3264,7 @@ class AppLocalizationsUk extends AppLocalizations {
   }
 
   @override
-  String get aiNoModels =>
-      'Ollama запущено, але встановлених моделей не знайдено.';
+  String get aiNoModels => 'Модель не вибрана.';
 
   @override
   String get aiConnectionFailed =>
@@ -3239,19 +3367,6 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get aiContentSentToAi => 'Вміст, що надсилається ШІ';
 
-  @override
-  String get aiPrivacyDisabled =>
-      'ШІ вимкнено. BusyMark ніколи не надсилає вміст документа без явної дії з ШІ.';
-
-  @override
-  String get aiPrivacyLocal =>
-      'BusyMark надсилає лише контекст, показаний у діалозі перевірки, налаштованій локальній службі Ollama. Пропозиції ніколи не застосовуються без перевірки.';
-
-  @override
-  String aiPrivacyCloud(String provider) {
-    return 'BusyMark надсилає лише контекст, показаний у діалозі перевірки, постачальнику $provider. Запити не зберігають стан, а пропозиції ніколи не застосовуються без перевірки.';
-  }
-
   @override
   String get aiApiKey => 'Ключ API';
 
@@ -3290,6 +3405,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get aiPreferredModel => 'Бажана модель';
 
+  @override
+  String get aiModel => 'Модель';
+
   @override
   String aiUsageThisMonth(int requests, int input, int output) {
     return '$requests запитів · $input вхідних токенів · $output вихідних токенів';
@@ -3375,4 +3493,13 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get diagnosticMarkdownTableEmptyHeader =>
       'Заголовки таблиці мають позначати стовпці; заповніть кожен порожній заголовок.';
+
+  @override
+  String get mathRenderFailed => 'Не вдалося відобразити математичний вираз.';
+
+  @override
+  String get inlineMath => 'Формула в рядку';
+
+  @override
+  String get displayMath => 'Формула окремим блоком';
 }
diff --git a/lib/src/ai/ai_configuration.dart b/lib/src/ai/ai_configuration.dart
index b6572cbb..66b66c51 100644
--- a/lib/src/ai/ai_configuration.dart
+++ b/lib/src/ai/ai_configuration.dart
@@ -3,7 +3,7 @@ import 'ai_models.dart';
 import 'ai_provider.dart';
 
 extension AiSettingsConfiguration on AppSettings {
-  AiProviderKind? get aiProviderKind => switch (aiProviderPreference) {
+  AiProviderKind? get defaultAiProviderKind => switch (aiProviderPreference) {
     AiProviderPreference.disabled => null,
     AiProviderPreference.ollamaLocal => AiProviderKind.ollamaLocal,
     AiProviderPreference.openAi => AiProviderKind.openAi,
diff --git a/lib/src/ai/ai_edit_ui.dart b/lib/src/ai/ai_edit_ui.dart
index 9d96422b..2e76da9a 100644
--- a/lib/src/ai/ai_edit_ui.dart
+++ b/lib/src/ai/ai_edit_ui.dart
@@ -22,13 +22,41 @@ import 'ai_providers.dart';
 Future<AiEditApplication?> showBusyMarkAiEdit(
   BuildContext context,
   WidgetRef ref,
-  AiEditorSnapshot snapshot,
-) async {
+  AiEditorSnapshot snapshot, {
+  AiEditTargetKind? fixedTarget,
+}) async {
+  final settings = ref.read(appSettingsControllerProvider);
+  final List<AiProviderKind> availableProviders;
+  try {
+    availableProviders = await _availableAiProviders(ref, settings);
+  } on AiException catch (error) {
+    if (context.mounted) {
+      await _showAiMessage(context, error.message);
+    }
+    return null;
+  }
+  if (availableProviders.isEmpty) {
+    if (context.mounted) {
+      await _showAiMessage(context, context.l10n.aiConfigureFirst);
+    }
+    return null;
+  }
+  if (!context.mounted) {
+    return null;
+  }
+  final defaultProvider = settings.defaultAiProviderKind;
+  final initialProvider = availableProviders.contains(defaultProvider)
+      ? defaultProvider!
+      : availableProviders.first;
   final configuration =
       await showBusyMarkModalEditorDialog<_AiEditConfiguration>(
         context,
-        builder: (dialogContext) =>
-            _AiEditConfigurationDialog(snapshot: snapshot),
+        builder: (dialogContext) => _AiEditConfigurationDialog(
+          snapshot: snapshot,
+          fixedTarget: fixedTarget,
+          availableProviders: availableProviders,
+          initialProvider: initialProvider,
+        ),
       );
   if (configuration == null || !context.mounted) {
     return null;
@@ -53,7 +81,13 @@ Future<AiEditApplication?> showBusyMarkAiEdit(
     replacementSuffix: target.replacementSuffix,
     trimReplacementOutput: target.trimReplacementOutput,
   );
-  final output = await showBusyMarkAiProposal(context, ref, invocation);
+  final output = await showBusyMarkAiProposal(
+    context,
+    ref,
+    invocation,
+    providerKind: configuration.provider,
+    modelCandidates: configuration.modelCandidates,
+  );
   return output == null
       ? null
       : AiEditApplication(invocation: invocation, output: output);
@@ -63,33 +97,37 @@ Future<String?> showBusyMarkAiProposal(
   BuildContext context,
   WidgetRef ref,
   AiEditInvocation invocation, {
+  AiProviderKind? providerKind,
+  List<String>? modelCandidates,
   Future<bool> Function()? validateBeforeApply,
   String? staleMessage,
 }) async {
   final settings = ref.read(appSettingsControllerProvider);
-  final providerKind = settings.aiProviderKind;
-  if (providerKind == null) {
+  final defaultProvider = settings.defaultAiProviderKind;
+  if (defaultProvider == null) {
     await _showAiMessage(context, context.l10n.aiConfigureFirst);
     return null;
   }
-  if (!settings.hasCloudConsent(providerKind)) {
+  final selectedProvider = providerKind ?? defaultProvider;
+  if (!settings.hasCloudConsent(selectedProvider)) {
     await _showAiMessage(
       context,
-      context.l10n.aiCloudConsentRequired(providerKind.displayName),
+      context.l10n.aiCloudConsentRequired(selectedProvider.displayName),
     );
     return null;
   }
-  final provider = ref.read(aiProviderRegistryProvider).require(providerKind);
-  final modelCandidates = settings.modelCandidatesFor(
-    invocation.feature,
-    provider,
-  );
-  if (modelCandidates.isEmpty) {
+  final provider = ref
+      .read(aiProviderRegistryProvider)
+      .require(selectedProvider);
+  final resolvedModelCandidates =
+      modelCandidates ??
+      settings.modelCandidatesFor(invocation.feature, provider);
+  if (resolvedModelCandidates.isEmpty) {
     await _showAiMessage(context, context.l10n.aiConfigureFirst);
     return null;
   }
   try {
-    if (providerKind == AiProviderKind.ollamaLocal) {
+    if (selectedProvider == AiProviderKind.ollamaLocal) {
       AiPolicy.validateLocalOllamaEndpoint(settings.aiOllamaEndpoint);
     }
   } on AiException catch (error) {
@@ -104,11 +142,11 @@ Future<String?> showBusyMarkAiProposal(
     request = AiPromptBuilder.build(
       id: const Uuid().v4(),
       targetId: invocation.targetId,
-      provider: providerKind,
+      provider: selectedProvider,
       feature: invocation.feature,
       scope: invocation.scope,
       input: invocation.input,
-      modelCandidates: modelCandidates,
+      modelCandidates: resolvedModelCandidates,
       sourceRevision: invocation.sourceRevision,
       contentFormat: invocation.contentFormat,
       editTarget: invocation.editTarget,
@@ -121,7 +159,7 @@ Future<String?> showBusyMarkAiProposal(
       replacementPrefix: invocation.replacementPrefix,
       replacementSuffix: invocation.replacementSuffix,
       trimReplacementOutput: invocation.trimReplacementOutput,
-      deadline: providerKind == AiProviderKind.ollamaLocal
+      deadline: selectedProvider == AiProviderKind.ollamaLocal
           ? const Duration(minutes: 5)
           : const Duration(minutes: 2),
     );
@@ -146,6 +184,83 @@ Future<String?> showBusyMarkAiProposal(
   );
 }
 
+Future<AiProviderKind?> chooseBusyMarkAiProvider(
+  BuildContext context,
+  WidgetRef ref,
+) async {
+  final settings = ref.read(appSettingsControllerProvider);
+  final List<AiProviderKind> availableProviders;
+  try {
+    availableProviders = await _availableAiProviders(ref, settings);
+  } on AiException catch (error) {
+    if (context.mounted) {
+      await _showAiMessage(context, error.message);
+    }
+    return null;
+  }
+  if (availableProviders.isEmpty) {
+    if (context.mounted) {
+      await _showAiMessage(context, context.l10n.aiConfigureFirst);
+    }
+    return null;
+  }
+  if (!context.mounted) {
+    return null;
+  }
+  final defaultProvider = settings.defaultAiProviderKind;
+  final initialProvider = availableProviders.contains(defaultProvider)
+      ? defaultProvider!
+      : availableProviders.first;
+  return showBusyMarkModalDialog<AiProviderKind>(
+    context,
+    builder: (dialogContext) => _AiProviderChoiceDialog(
+      availableProviders: availableProviders,
+      initialProvider: initialProvider,
+    ),
+  );
+}
+
+Future<List<AiProviderKind>> _availableAiProviders(
+  WidgetRef ref,
+  AppSettings settings,
+) async {
+  final defaultProvider = settings.defaultAiProviderKind;
+  if (defaultProvider == null) {
+    return const [];
+  }
+
+  final available = <AiProviderKind>{};
+  if (defaultProvider == AiProviderKind.ollamaLocal ||
+      settings.aiOllamaModel.trim().isNotEmpty) {
+    available.add(AiProviderKind.ollamaLocal);
+  }
+
+  final secretStore = ref.read(aiSecretStoreProvider);
+  AiException? defaultCredentialError;
+  for (final provider in AiProviderKind.values.where(
+    (provider) => provider.isCloud,
+  )) {
+    try {
+      if (await secretStore.read(provider) != null) {
+        available.add(provider);
+      }
+    } on AiException catch (error) {
+      if (provider == defaultProvider) {
+        defaultCredentialError = error;
+      }
+    }
+  }
+  if (available.isEmpty && defaultCredentialError != null) {
+    throw defaultCredentialError;
+  }
+
+  return [
+    if (available.contains(defaultProvider)) defaultProvider,
+    for (final provider in AiProviderKind.values)
+      if (provider != defaultProvider && available.contains(provider)) provider,
+  ];
+}
+
 Future<void> _showAiMessage(BuildContext context, String message) {
   return showBusyMarkModalDialog<void>(
     context,
@@ -168,27 +283,46 @@ class _AiEditConfiguration {
   const _AiEditConfiguration({
     required this.instruction,
     required this.resolvedTarget,
+    required this.provider,
+    required this.modelCandidates,
   });
 
   final String instruction;
   final AiMarkdownEditTarget resolvedTarget;
+  final AiProviderKind provider;
+  final List<String> modelCandidates;
 }
 
-class _AiEditConfigurationDialog extends StatefulWidget {
-  const _AiEditConfigurationDialog({required this.snapshot});
+class _AiEditConfigurationDialog extends ConsumerStatefulWidget {
+  const _AiEditConfigurationDialog({
+    required this.snapshot,
+    required this.availableProviders,
+    required this.initialProvider,
+    this.fixedTarget,
+  });
 
   final AiEditorSnapshot snapshot;
+  final List<AiProviderKind> availableProviders;
+  final AiProviderKind initialProvider;
+  final AiEditTargetKind? fixedTarget;
 
   @override
-  State<_AiEditConfigurationDialog> createState() =>
+  ConsumerState<_AiEditConfigurationDialog> createState() =>
       _AiEditConfigurationDialogState();
 }
 
 class _AiEditConfigurationDialogState
-    extends State<_AiEditConfigurationDialog> {
+    extends ConsumerState<_AiEditConfigurationDialog> {
+  static const _automaticModel = '';
+
   final _controller = TextEditingController();
+  final _modelsByProvider = <AiProviderKind, List<String>>{};
+  final _modelSelectionByProvider = <AiProviderKind, String>{};
+  final _modelDiscoveryTokens = <AiProviderKind, AiCancellationToken>{};
+  final _modelDiscoveryCompleted = <AiProviderKind>{};
   late AiEditTargetKind _target;
   late AiEditContextKind _context;
+  late AiProviderKind _provider;
   AiMarkdownEditTarget? _resolvedTarget;
   String? _resolutionError;
 
@@ -199,7 +333,33 @@ class _AiEditConfigurationDialogState
   @override
   void initState() {
     super.initState();
-    if (widget.snapshot.hasSelection) {
+    _provider = widget.initialProvider;
+    final settings = ref.read(appSettingsControllerProvider);
+    final registry = ref.read(aiProviderRegistryProvider);
+    for (final providerKind in widget.availableProviders) {
+      final provider = registry.require(providerKind);
+      final selectedModel = settings.selectedAiModel(providerKind).trim();
+      _modelsByProvider[providerKind] = <String>{
+        if (selectedModel.isNotEmpty) selectedModel,
+        for (final models in provider.capabilities.recommendedModels.values)
+          ...models,
+      }.toList(growable: false);
+      _modelSelectionByProvider[providerKind] =
+          settings.aiModelRoutingPreference ==
+                  AiModelRoutingPreference.automatic ||
+              selectedModel.isEmpty
+          ? _automaticModel
+          : selectedModel;
+    }
+    unawaited(_discoverModels(_provider));
+    if (widget.fixedTarget case final fixedTarget?) {
+      _target = fixedTarget;
+      _context = fixedTarget == AiEditTargetKind.document
+          ? AiEditContextKind.document
+          : widget.snapshot.hasSelection
+          ? AiEditContextKind.selection
+          : AiEditContextKind.document;
+    } else if (widget.snapshot.hasSelection) {
       _target = AiEditTargetKind.selection;
       _context = AiEditContextKind.selection;
     } else if (_blockTargetAvailable) {
@@ -216,6 +376,9 @@ class _AiEditConfigurationDialogState
 
   @override
   void dispose() {
+    for (final token in _modelDiscoveryTokens.values) {
+      token.cancel();
+    }
     _controller.dispose();
     super.dispose();
   }
@@ -223,6 +386,7 @@ class _AiEditConfigurationDialogState
   @override
   Widget build(BuildContext context) {
     final resolvedTarget = _resolvedTarget;
+    final providerKind = _provider;
     return BusyMarkModalEditorScaffold(
       title: context.l10n.aiRefineWithAi,
       cancelLabel: context.l10n.cancel,
@@ -235,12 +399,33 @@ class _AiEditConfigurationDialogState
               _AiEditConfiguration(
                 instruction: _controller.text.trim(),
                 resolvedTarget: _resolvedTarget!,
+                provider: _provider,
+                modelCandidates: _selectedModelCandidates,
               ),
             ),
       children: [
         BusyMarkGroupedList(
           filled: true,
           children: [
+            BusyMarkComboRow<AiProviderKind>(
+              key: const ValueKey('ai-edit-provider'),
+              title: context.l10n.aiProvider,
+              values: widget.availableProviders,
+              selected: _provider,
+              labelFor: (provider) => _providerLabel(context, provider),
+              onSelected: _selectProvider,
+            ),
+            BusyMarkComboRow<String>(
+              key: const ValueKey('ai-edit-model'),
+              title: context.l10n.aiModel,
+              values: [_automaticModel, ..._modelsByProvider[providerKind]!],
+              selected: _modelSelectionByProvider[providerKind]!,
+              labelFor: (model) =>
+                  model.isEmpty ? context.l10n.aiAutomaticRouting : model,
+              onSelected: (model) => setState(
+                () => _modelSelectionByProvider[providerKind] = model,
+              ),
+            ),
             BusyMarkGroupedTextEntry(
               key: const ValueKey('ai-edit-instruction'),
               label: context.l10n.aiInstruction,
@@ -313,19 +498,24 @@ class _AiEditConfigurationDialogState
             kind: BusyMarkStatusKind.information,
           ),
         ],
+        const SizedBox(
+          key: ValueKey('ai-context-disclosure-bottom-spacing'),
+          height: BusyMarkSpacing.lg,
+        ),
       ],
     );
   }
 
   List<AiEditTargetKind> get _availableTargets => [
     for (final value in AiEditTargetKind.values)
-      if (switch (value) {
-        AiEditTargetKind.selection => widget.snapshot.hasSelection,
-        AiEditTargetKind.insertAfterBlock ||
-        AiEditTargetKind.block ||
-        AiEditTargetKind.section => _blockTargetAvailable,
-        AiEditTargetKind.document => true,
-      })
+      if ((widget.fixedTarget == null || widget.fixedTarget == value) &&
+          switch (value) {
+            AiEditTargetKind.selection => widget.snapshot.hasSelection,
+            AiEditTargetKind.insertAfterBlock ||
+            AiEditTargetKind.block ||
+            AiEditTargetKind.section => _blockTargetAvailable,
+            AiEditTargetKind.document => true,
+          })
         value,
   ];
 
@@ -340,6 +530,67 @@ class _AiEditConfigurationDialogState
         value,
   ];
 
+  List<String> get _selectedModelCandidates {
+    final selection = _modelSelectionByProvider[_provider]!;
+    if (selection.isNotEmpty) {
+      return [selection];
+    }
+    final settings = ref.read(appSettingsControllerProvider);
+    final provider = ref.read(aiProviderRegistryProvider).require(_provider);
+    return <String>{
+      ...provider.capabilities.modelsFor(
+        AiFeature.editDocument.spec.modelClass,
+      ),
+      if (settings.selectedAiModel(_provider).trim().isNotEmpty)
+        settings.selectedAiModel(_provider).trim(),
+      if (provider.capabilities.modelDiscovery)
+        ..._modelsByProvider[_provider]!,
+    }.toList(growable: false);
+  }
+
+  void _selectProvider(AiProviderKind provider) {
+    if (provider == _provider) {
+      return;
+    }
+    setState(() => _provider = provider);
+    unawaited(_discoverModels(provider));
+  }
+
+  Future<void> _discoverModels(AiProviderKind providerKind) async {
+    final provider = ref.read(aiProviderRegistryProvider).require(providerKind);
+    if (!provider.capabilities.modelDiscovery ||
+        _modelDiscoveryCompleted.contains(providerKind) ||
+        _modelDiscoveryTokens.containsKey(providerKind)) {
+      return;
+    }
+    final token = AiCancellationToken();
+    _modelDiscoveryTokens[providerKind] = token;
+    try {
+      final models = await provider.listModels(cancellationToken: token);
+      if (!mounted || token.isCancelled) {
+        return;
+      }
+      final discovered = [
+        for (final model in models)
+          if (model.supportsTextGeneration) model.name.trim(),
+      ]..removeWhere((model) => model.isEmpty);
+      setState(() {
+        _modelsByProvider[providerKind] = <String>{
+          ..._modelsByProvider[providerKind]!,
+          ...discovered,
+        }.toList(growable: false);
+        _modelDiscoveryCompleted.add(providerKind);
+      });
+    } on AiException {
+      // The configured model remains usable when optional discovery fails.
+    } finally {
+      if (identical(_modelDiscoveryTokens[providerKind], token)) {
+        _modelDiscoveryTokens.remove(providerKind);
+      }
+      await token.dispose();
+    }
+  }
+
   void _resolveChoices({bool notify = true}) {
     late final VoidCallback update;
     try {
@@ -371,6 +622,70 @@ class _AiEditConfigurationDialogState
   }
 }
 
+class _AiProviderChoiceDialog extends StatefulWidget {
+  const _AiProviderChoiceDialog({
+    required this.availableProviders,
+    required this.initialProvider,
+  });
+
+  final List<AiProviderKind> availableProviders;
+  final AiProviderKind initialProvider;
+
+  @override
+  State<_AiProviderChoiceDialog> createState() =>
+      _AiProviderChoiceDialogState();
+}
+
+class _AiProviderChoiceDialogState extends State<_AiProviderChoiceDialog> {
+  late AiProviderKind _provider;
+
+  @override
+  void initState() {
+    super.initState();
+    _provider = widget.initialProvider;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BusyMarkDialogShell(
+      title: context.l10n.aiChooseProvider,
+      actions: [
+        BusyMarkDialogButton(
+          label: context.l10n.cancel,
+          onPressed: () => Navigator.pop(context),
+        ),
+        BusyMarkDialogButton(
+          label: context.l10n.aiGenerateProposal,
+          suggested: true,
+          onPressed: () => Navigator.pop(context, _provider),
+        ),
+      ],
+      children: [
+        BusyMarkGroupedList(
+          filled: true,
+          children: [
+            BusyMarkComboRow<AiProviderKind>(
+              key: const ValueKey('ai-provider-choice'),
+              title: context.l10n.aiProvider,
+              values: widget.availableProviders,
+              selected: _provider,
+              labelFor: (provider) => _providerLabel(context, provider),
+              onSelected: (provider) => setState(() => _provider = provider),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+}
+
+String _providerLabel(BuildContext context, AiProviderKind provider) =>
+    switch (provider) {
+      AiProviderKind.ollamaLocal => context.l10n.aiLocalOllama,
+      AiProviderKind.openAi => 'OpenAI',
+      AiProviderKind.gemini => 'Google Gemini',
+    };
+
 class _AiContentDisclosure extends StatefulWidget {
   const _AiContentDisclosure({required this.title, required this.content});
 
diff --git a/lib/src/ai/ai_providers.dart b/lib/src/ai/ai_providers.dart
index 626f2bb4..9478de9c 100644
--- a/lib/src/ai/ai_providers.dart
+++ b/lib/src/ai/ai_providers.dart
@@ -42,9 +42,11 @@ final aiProviderRegistryProvider = Provider<AiProviderRegistry>((ref) {
   ]);
 });
 
-final aiProviderProvider = Provider<AiProvider>((ref) {
+final defaultAiProviderProvider = Provider<AiProvider>((ref) {
   final kind = ref.watch(
-    appSettingsControllerProvider.select((value) => value.aiProviderKind),
+    appSettingsControllerProvider.select(
+      (value) => value.defaultAiProviderKind,
+    ),
   );
   if (kind == null) {
     throw const AiException(
diff --git a/lib/src/app/app_metadata.dart b/lib/src/app/app_metadata.dart
index 9eb9372f..abc28a70 100644
--- a/lib/src/app/app_metadata.dart
+++ b/lib/src/app/app_metadata.dart
@@ -1 +1 @@
-const busyMarkAppVersion = '0.3.0';
+const busyMarkAppVersion = '0.3.1';
diff --git a/lib/src/app/app_settings.dart b/lib/src/app/app_settings.dart
index 489a2acb..0a25eb5f 100644
--- a/lib/src/app/app_settings.dart
+++ b/lib/src/app/app_settings.dart
@@ -97,6 +97,7 @@ class AppSettings {
     required this.trustedGitWorkspacePaths,
     required this.selectedWritersideInstanceIds,
     required this.writersideInstanceIconColors,
+    required this.reopenPreviousWorkspaceOnStartup,
     required this.confirmCloseWithUnsavedChanges,
     required this.recentWorkspaces,
     this.lastOpenedPath,
@@ -127,6 +128,7 @@ class AppSettings {
       trustedGitWorkspacePaths: [],
       selectedWritersideInstanceIds: {},
       writersideInstanceIconColors: {},
+      reopenPreviousWorkspaceOnStartup: false,
       confirmCloseWithUnsavedChanges: true,
       recentWorkspaces: [],
     );
@@ -206,6 +208,9 @@ class AppSettings {
       writersideInstanceIconColors: _stringMapFromJson(
         json['writersideInstanceIconColors'],
       ),
+      reopenPreviousWorkspaceOnStartup:
+          json['reopenPreviousWorkspaceOnStartup'] as bool? ??
+          defaults.reopenPreviousWorkspaceOnStartup,
       confirmCloseWithUnsavedChanges:
           json['confirmCloseWithUnsavedChanges'] as bool? ??
           defaults.confirmCloseWithUnsavedChanges,
@@ -244,6 +249,7 @@ class AppSettings {
   final List<String> trustedGitWorkspacePaths;
   final Map<String, String> selectedWritersideInstanceIds;
   final Map<String, String> writersideInstanceIconColors;
+  final bool reopenPreviousWorkspaceOnStartup;
   final bool confirmCloseWithUnsavedChanges;
   final String? lastOpenedPath;
   final List<RecentWorkspace> recentWorkspaces;
@@ -276,6 +282,7 @@ class AppSettings {
     'trustedGitWorkspacePaths': trustedGitWorkspacePaths,
     'selectedWritersideInstanceIds': selectedWritersideInstanceIds,
     'writersideInstanceIconColors': writersideInstanceIconColors,
+    'reopenPreviousWorkspaceOnStartup': reopenPreviousWorkspaceOnStartup,
     'confirmCloseWithUnsavedChanges': confirmCloseWithUnsavedChanges,
     'lastOpenedPath': lastOpenedPath,
     'recentWorkspaces': recentWorkspaces.map((item) => item.toJson()).toList(),
@@ -347,6 +354,7 @@ class AppSettings {
     List<String>? trustedGitWorkspacePaths,
     Map<String, String>? selectedWritersideInstanceIds,
     Map<String, String>? writersideInstanceIconColors,
+    bool? reopenPreviousWorkspaceOnStartup,
     bool? confirmCloseWithUnsavedChanges,
     String? lastOpenedPath,
     List<RecentWorkspace>? recentWorkspaces,
@@ -386,6 +394,9 @@ class AppSettings {
           selectedWritersideInstanceIds ?? this.selectedWritersideInstanceIds,
       writersideInstanceIconColors:
           writersideInstanceIconColors ?? this.writersideInstanceIconColors,
+      reopenPreviousWorkspaceOnStartup:
+          reopenPreviousWorkspaceOnStartup ??
+          this.reopenPreviousWorkspaceOnStartup,
       confirmCloseWithUnsavedChanges:
           confirmCloseWithUnsavedChanges ?? this.confirmCloseWithUnsavedChanges,
       lastOpenedPath: lastOpenedPath ?? this.lastOpenedPath,
@@ -470,14 +481,18 @@ class AppSettingsController extends Notifier<AppSettings> {
   Future<void>? _lastSave;
   final _pendingInitialMutations = <AppSettings Function(AppSettings)>[];
   var _loaded = false;
+  late Future<void> _loadFuture;
 
   @override
   AppSettings build() {
     _store = ref.read(localSettingsStoreProvider);
-    unawaited(_load());
+    _loadFuture = _load();
+    unawaited(_loadFuture);
     return AppSettings.defaults();
   }
 
+  Future<void> waitUntilLoaded() => _loadFuture;
+
   Future<void> setThemeModePreference(BusyMarkThemeModePreference preference) {
     return _mutate(
       (settings) => settings.copyWith(themeModePreference: preference),
@@ -712,6 +727,13 @@ class AppSettingsController extends Notifier<AppSettings> {
     );
   }
 
+  Future<void> setReopenPreviousWorkspaceOnStartup(bool enabled) {
+    return _mutate(
+      (settings) =>
+          settings.copyWith(reopenPreviousWorkspaceOnStartup: enabled),
+    );
+  }
+
   Future<void> recordOpenedWorkspace({
     required String path,
     required String kind,
diff --git a/lib/src/app/busymark_app.dart b/lib/src/app/busymark_app.dart
index dec330b1..0e8eff6b 100644
--- a/lib/src/app/busymark_app.dart
+++ b/lib/src/app/busymark_app.dart
@@ -21,15 +21,71 @@ import '../workspace/workspace_tabs.dart';
 import 'app_router.dart';
 import 'app_locale.dart';
 import 'app_settings.dart';
-import 'busymark_shortcuts.dart';
+import 'command_palette.dart';
+import 'command_registry.dart';
 import 'app_theme.dart';
 import 'busymark_dialogs.dart';
 import 'busymark_design.dart';
 import 'busymark_glyphs.dart';
+import 'busymark_toast.dart';
 import 'localization.dart';
 import 'system_accent.dart';
 import 'window_control_service.dart';
 
+final busyMarkCommandRegistryProvider = Provider<BusyMarkCommandRegistry>((
+  ref,
+) {
+  final commandIntents = <String, Intent>{
+    BusyMarkCommandIds.newDocument: const _NewWorkspaceIntent(),
+    BusyMarkCommandIds.open: const _OpenWorkspaceIntent(),
+    BusyMarkCommandIds.save: const _SaveActiveIntent(),
+    BusyMarkCommandIds.exportPdf: const _ExportPdfIntent(),
+    BusyMarkCommandIds.fullScreen: const _ToggleFullScreenIntent(),
+    BusyMarkCommandIds.back: const _BackIntent(),
+    BusyMarkCommandIds.search: const _OpenSearchIntent(),
+    BusyMarkCommandIds.keyboardShortcuts: const _KeyboardShortcutsIntent(),
+    BusyMarkCommandIds.commandPalette: const _CommandPaletteIntent(),
+    BusyMarkCommandIds.markdownAndHtml: const _MarkdownAndHtmlIntent(),
+    BusyMarkCommandIds.settings: const _SettingsIntent(),
+    BusyMarkCommandIds.nextTab: const _NextTabIntent(),
+    BusyMarkCommandIds.previousTab: const _PreviousTabIntent(),
+    BusyMarkCommandIds.closeTab: const _CloseTabIntent(),
+    BusyMarkCommandIds.closeAllTabs: const _CloseAllTabsIntent(),
+    BusyMarkCommandIds.toggleSidebar: const _ToggleSidebarIntent(),
+    BusyMarkCommandIds.viewEditor: const _DocumentViewModeIntent(
+      DocumentViewModePreference.editor,
+    ),
+    BusyMarkCommandIds.viewSource: const _DocumentViewModeIntent(
+      DocumentViewModePreference.source,
+    ),
+    BusyMarkCommandIds.viewReading: const _DocumentViewModeIntent(
+      DocumentViewModePreference.preview,
+    ),
+    BusyMarkCommandIds.viewSplit: const _DocumentViewModeIntent(
+      DocumentViewModePreference.split,
+    ),
+  };
+  return BusyMarkCommandCatalog.create(
+    executions: {
+      for (final entry in commandIntents.entries)
+        entry.key: () {
+          final target = rootNavigatorKey.currentContext;
+          if (target != null) {
+            Actions.maybeInvoke(target, entry.value);
+          }
+        },
+    },
+    enabled: {
+      BusyMarkCommandIds.save: () =>
+          ref.read(workspaceControllerProvider).workspace != null,
+      BusyMarkCommandIds.exportPdf: () =>
+          canExportWorkspacePdf(ref.read(workspaceControllerProvider)),
+      BusyMarkCommandIds.search: () =>
+          ref.read(workspaceControllerProvider).workspace != null,
+    },
+  );
+});
+
 class BusyMarkApp extends ConsumerWidget {
   const BusyMarkApp({super.key});
 
@@ -82,59 +138,32 @@ class BusyMarkApp extends ConsumerWidget {
       ],
       supportedLocales: AppLocalizations.supportedLocales,
       builder: (context, child) {
+        final commandRegistry = ref.read(busyMarkCommandRegistryProvider);
         final headerBarDefaults = _nativeHeaderBarDefaults(
           context,
           settings,
+          commandRegistry,
           fullScreen: windowControls.isFullScreen,
         );
-        return HeaderBarConfigurationDefaults(
+        final appContent = HeaderBarConfigurationDefaults(
           configuration: headerBarDefaults,
           child: _BusyMarkWindowLifecycle(
             child: Shortcuts(
-              shortcuts: {
-                BusyMarkAppShortcutActivators.newDocument:
-                    const _NewWorkspaceIntent(),
-                BusyMarkAppShortcutActivators.open:
-                    const _OpenWorkspaceIntent(),
-                BusyMarkAppShortcutActivators.save: const _SaveActiveIntent(),
-                BusyMarkAppShortcutActivators.exportPdf:
-                    const _ExportPdfIntent(),
-                BusyMarkAppShortcutActivators.fullScreen:
-                    const _ToggleFullScreenIntent(),
-                BusyMarkAppShortcutActivators.back: const _BackIntent(),
-                BusyMarkAppShortcutActivators.keyboardShortcuts:
-                    const _KeyboardShortcutsIntent(),
-                BusyMarkAppShortcutActivators.settings: const _SettingsIntent(),
-                BusyMarkAppShortcutActivators.markdownAndHtml:
-                    const _MarkdownAndHtmlIntent(),
-                BusyMarkAppShortcutActivators.nextTab: const _NextTabIntent(),
-                BusyMarkAppShortcutActivators.previousTab:
-                    const _PreviousTabIntent(),
-                BusyMarkAppShortcutActivators.closeTab: const _CloseTabIntent(),
-                BusyMarkAppShortcutActivators.closeAllTabs:
-                    const _CloseAllTabsIntent(),
-                BusyMarkAppShortcutActivators.search: const _OpenSearchIntent(),
-                BusyMarkAppShortcutActivators.toggleSidebar:
-                    const _ToggleSidebarIntent(),
-                BusyMarkDocumentViewShortcutActivators.editor:
-                    const _DocumentViewModeIntent(
-                      DocumentViewModePreference.editor,
-                    ),
-                BusyMarkDocumentViewShortcutActivators.source:
-                    const _DocumentViewModeIntent(
-                      DocumentViewModePreference.source,
-                    ),
-                BusyMarkDocumentViewShortcutActivators.reading:
-                    const _DocumentViewModeIntent(
-                      DocumentViewModePreference.preview,
-                    ),
-                BusyMarkDocumentViewShortcutActivators.split:
-                    const _DocumentViewModeIntent(
-                      DocumentViewModePreference.split,
-                    ),
-              },
+              shortcuts: commandRegistry.shortcutIntents(
+                scopes: const {
+                  BusyMarkCommandScope.application,
+                  BusyMarkCommandScope.documentView,
+                },
+                intentFor: BusyMarkCommandIntent.new,
+              ),
               child: Actions(
                 actions: {
+                  BusyMarkCommandIntent: CallbackAction<BusyMarkCommandIntent>(
+                    onInvoke: (intent) {
+                      unawaited(commandRegistry.execute(intent.commandId));
+                      return null;
+                    },
+                  ),
                   _NewWorkspaceIntent: CallbackAction<_NewWorkspaceIntent>(
                     onInvoke: (intent) {
                       final navigatorContext = rootNavigatorKey.currentContext;
@@ -209,6 +238,20 @@ class BusyMarkApp extends ConsumerWidget {
                           return null;
                         },
                       ),
+                  _CommandPaletteIntent: CallbackAction<_CommandPaletteIntent>(
+                    onInvoke: (intent) {
+                      final navigatorContext = rootNavigatorKey.currentContext;
+                      if (navigatorContext != null) {
+                        unawaited(
+                          showBusyMarkCommandPalette(
+                            navigatorContext,
+                            commandRegistry,
+                          ),
+                        );
+                      }
+                      return null;
+                    },
+                  ),
                   _SettingsIntent: CallbackAction<_SettingsIntent>(
                     onInvoke: (intent) {
                       final navigatorContext = rootNavigatorKey.currentContext;
@@ -309,6 +352,9 @@ class BusyMarkApp extends ConsumerWidget {
                   _DocumentViewModeIntent:
                       CallbackAction<_DocumentViewModeIntent>(
                         onInvoke: (intent) {
+                          ref
+                              .read(workspaceControllerProvider.notifier)
+                              .updateActiveEditorMode(intent.mode);
                           unawaited(
                             ref
                                 .read(appSettingsControllerProvider.notifier)
@@ -328,6 +374,10 @@ class BusyMarkApp extends ConsumerWidget {
             ),
           ),
         );
+        return BusyMarkCommandRegistryScope(
+          registry: commandRegistry,
+          child: BusyMarkToastOverlay(child: appContent),
+        );
       },
       routerConfig: router,
     );
@@ -487,9 +537,6 @@ class BusyMarkApp extends ConsumerWidget {
     if (choice == null || !context.mounted) {
       return;
     }
-    if (!await confirmSafeToContinue(context, ref) || !context.mounted) {
-      return;
-    }
     switch (choice) {
       case _CreateMarkdownFile():
         await ref
@@ -499,6 +546,9 @@ class BusyMarkApp extends ConsumerWidget {
           router.go('/workspace');
         }
       case _CreateWritersideProject():
+        if (!await confirmSafeToContinue(context, ref) || !context.mounted) {
+          return;
+        }
         await _createWritersideProject(context, ref, router);
     }
   }
@@ -552,19 +602,21 @@ class BusyMarkApp extends ConsumerWidget {
     WidgetRef ref, {
     required bool next,
   }) async {
-    final workspace = ref.read(workspaceControllerProvider).workspace;
+    final workspaceState = ref.read(workspaceControllerProvider);
+    final workspace = workspaceState.workspace;
     final gitState = ref.read(gitControllerProvider);
     if (workspace == null) {
       return;
     }
-    final tabs = workspaceTabEntries(workspace: workspace, gitState: gitState);
+    final tabs = workspaceTabEntries(
+      workspace: workspace,
+      gitState: gitState,
+      documentBuffers: workspaceState.documentBuffers,
+      activeBufferId: workspaceState.activeBufferId,
+    );
     if (tabs.length < 2) {
       return;
     }
-    if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-        !context.mounted) {
-      return;
-    }
     final activeIndex = activeWorkspaceTabIndex(tabs);
     final nextIndex = activeIndex < 0
         ? 0
@@ -577,20 +629,27 @@ class BusyMarkApp extends ConsumerWidget {
     BuildContext context,
     WidgetRef ref,
   ) async {
-    final workspace = ref.read(workspaceControllerProvider).workspace;
+    final workspaceState = ref.read(workspaceControllerProvider);
+    final workspace = workspaceState.workspace;
     final gitState = ref.read(gitControllerProvider);
     if (workspace == null) {
       return;
     }
-    final tabs = workspaceTabEntries(workspace: workspace, gitState: gitState);
+    final tabs = workspaceTabEntries(
+      workspace: workspace,
+      gitState: gitState,
+      documentBuffers: workspaceState.documentBuffers,
+      activeBufferId: workspaceState.activeBufferId,
+    );
     final activeIndex = activeWorkspaceTabIndex(tabs);
     if (activeIndex < 0) {
       return;
     }
     final activeTab = tabs[activeIndex];
     if (activeTab.kind == WorkspaceTabKind.file) {
-      if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-          !context.mounted) {
+      if (activeTab.dirty &&
+          (!await confirmSafeToCloseActiveDocument(context, ref) ||
+              !context.mounted)) {
         return;
       }
     }
@@ -601,14 +660,19 @@ class BusyMarkApp extends ConsumerWidget {
     BuildContext context,
     WidgetRef ref,
   ) async {
-    final workspace = ref.read(workspaceControllerProvider).workspace;
+    final workspaceState = ref.read(workspaceControllerProvider);
+    final workspace = workspaceState.workspace;
     final gitState = ref.read(gitControllerProvider);
     if (workspace == null ||
-        workspaceTabEntries(workspace: workspace, gitState: gitState).isEmpty) {
+        workspaceTabEntries(
+          workspace: workspace,
+          gitState: gitState,
+          documentBuffers: workspaceState.documentBuffers,
+          activeBufferId: workspaceState.activeBufferId,
+        ).isEmpty) {
       return;
     }
-    if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-        !context.mounted) {
+    if (!await confirmSafeToContinue(context, ref) || !context.mounted) {
       return;
     }
     await ref.read(workspaceControllerProvider.notifier).closeAllOpenFileTabs();
@@ -624,7 +688,7 @@ class BusyMarkApp extends ConsumerWidget {
       case WorkspaceTabKind.file:
         await ref
             .read(workspaceControllerProvider.notifier)
-            .openActiveFile(tab.path);
+            .activateDocumentBuffer(tab.bufferId!);
         gitController.deactivateDiffFile();
       case WorkspaceTabKind.gitDiff:
         if (tab.path.isEmpty) {
@@ -640,7 +704,7 @@ class BusyMarkApp extends ConsumerWidget {
       case WorkspaceTabKind.file:
         await ref
             .read(workspaceControllerProvider.notifier)
-            .closeOpenFileTab(tab.path);
+            .closeDocumentBuffer(tab.bufferId!);
         gitController.deactivateDiffFile();
       case WorkspaceTabKind.gitDiff:
         if (tab.path.isEmpty) {
@@ -718,54 +782,60 @@ class BusyMarkApp extends ConsumerWidget {
 
   HeaderBarConfiguration _nativeHeaderBarDefaults(
     BuildContext context,
-    AppSettings settings, {
+    AppSettings settings,
+    BusyMarkCommandRegistry commandRegistry, {
     required bool fullScreen,
   }) {
     final material = MaterialLocalizations.of(context);
     final l10n = context.l10n;
     final theme = HeaderBarTheme.fromContext(context);
     final textDirection = Directionality.maybeOf(context) ?? TextDirection.ltr;
+    BusyMarkCommand command(String id) => commandRegistry[id]!;
+    String label(String id) => command(id).label(context);
+    String shortcut(String id) => command(id).shortcut!.label;
+    String accelerator(String id) => command(id).shortcut!.gtkAccelerator!;
     final labels = HeaderBarLabels(
-      editor: l10n.editor,
-      source: l10n.source,
-      preview: l10n.reading,
-      split: l10n.split,
+      editor: label(BusyMarkCommandIds.viewEditor),
+      source: label(BusyMarkCommandIds.viewSource),
+      preview: label(BusyMarkCommandIds.viewReading),
+      split: label(BusyMarkCommandIds.viewSplit),
       viewMode: l10n.viewMode,
-      editorShortcut: BusyMarkDocumentViewShortcutLabels.editor,
-      editorGtkAccelerator: BusyMarkDocumentViewShortcutGtkAccelerators.editor,
-      sourceShortcut: BusyMarkDocumentViewShortcutLabels.source,
-      sourceGtkAccelerator: BusyMarkDocumentViewShortcutGtkAccelerators.source,
-      previewShortcut: BusyMarkDocumentViewShortcutLabels.reading,
-      previewGtkAccelerator:
-          BusyMarkDocumentViewShortcutGtkAccelerators.reading,
-      splitShortcut: BusyMarkDocumentViewShortcutLabels.split,
-      splitGtkAccelerator: BusyMarkDocumentViewShortcutGtkAccelerators.split,
+      editorShortcut: shortcut(BusyMarkCommandIds.viewEditor),
+      editorGtkAccelerator: accelerator(BusyMarkCommandIds.viewEditor),
+      sourceShortcut: shortcut(BusyMarkCommandIds.viewSource),
+      sourceGtkAccelerator: accelerator(BusyMarkCommandIds.viewSource),
+      previewShortcut: shortcut(BusyMarkCommandIds.viewReading),
+      previewGtkAccelerator: accelerator(BusyMarkCommandIds.viewReading),
+      splitShortcut: shortcut(BusyMarkCommandIds.viewSplit),
+      splitGtkAccelerator: accelerator(BusyMarkCommandIds.viewSplit),
       search: material.searchFieldLabel,
-      searchShortcut: BusyMarkAppShortcutLabels.search,
+      searchShortcut: shortcut(BusyMarkCommandIds.search),
       refresh: l10n.validate,
       menu: l10n.mainMenu,
       sidebar: settings.sidebarVisible ? l10n.hideSidebar : l10n.showSidebar,
-      sidebarShortcut: BusyMarkSidebarShortcutLabels.toggleSidebar,
+      sidebarShortcut: shortcut(BusyMarkCommandIds.toggleSidebar),
       back: material.backButtonTooltip,
-      backShortcut: BusyMarkAppShortcutLabels.back,
-      save: l10n.save,
-      exportPdf: l10n.exportAsPdf,
-      exportPdfShortcut: BusyMarkAppShortcutLabels.exportPdf,
-      exportPdfGtkAccelerator: BusyMarkAppShortcutGtkAccelerators.exportPdf,
-      fullScreen: l10n.fullScreen,
-      fullScreenShortcut: BusyMarkAppShortcutLabels.fullScreen,
-      fullScreenGtkAccelerator: BusyMarkAppShortcutGtkAccelerators.fullScreen,
-      settings: l10n.settings,
-      settingsShortcut: BusyMarkAppShortcutLabels.settings,
-      settingsGtkAccelerator: BusyMarkAppShortcutGtkAccelerators.settings,
-      keyboardShortcuts: l10n.keyboardShortcuts,
-      keyboardShortcutsShortcut: BusyMarkAppShortcutLabels.keyboardShortcuts,
-      keyboardShortcutsGtkAccelerator:
-          BusyMarkAppShortcutGtkAccelerators.keyboardShortcuts,
-      markdownAndHtml: l10n.markdownAndHtml,
-      markdownAndHtmlShortcut: BusyMarkAppShortcutLabels.markdownAndHtml,
-      markdownAndHtmlGtkAccelerator:
-          BusyMarkAppShortcutGtkAccelerators.markdownAndHtml,
+      backShortcut: shortcut(BusyMarkCommandIds.back),
+      save: label(BusyMarkCommandIds.save),
+      exportPdf: label(BusyMarkCommandIds.exportPdf),
+      exportPdfShortcut: shortcut(BusyMarkCommandIds.exportPdf),
+      exportPdfGtkAccelerator: accelerator(BusyMarkCommandIds.exportPdf),
+      fullScreen: label(BusyMarkCommandIds.fullScreen),
+      fullScreenShortcut: shortcut(BusyMarkCommandIds.fullScreen),
+      fullScreenGtkAccelerator: accelerator(BusyMarkCommandIds.fullScreen),
+      settings: label(BusyMarkCommandIds.settings),
+      settingsShortcut: shortcut(BusyMarkCommandIds.settings),
+      settingsGtkAccelerator: accelerator(BusyMarkCommandIds.settings),
+      keyboardShortcuts: label(BusyMarkCommandIds.keyboardShortcuts),
+      keyboardShortcutsShortcut: shortcut(BusyMarkCommandIds.keyboardShortcuts),
+      keyboardShortcutsGtkAccelerator: accelerator(
+        BusyMarkCommandIds.keyboardShortcuts,
+      ),
+      markdownAndHtml: label(BusyMarkCommandIds.markdownAndHtml),
+      markdownAndHtmlShortcut: shortcut(BusyMarkCommandIds.markdownAndHtml),
+      markdownAndHtmlGtkAccelerator: accelerator(
+        BusyMarkCommandIds.markdownAndHtml,
+      ),
       reportIssue: l10n.reportIssue,
       aboutBusyMark: l10n.aboutBusyMark,
     );
@@ -836,22 +906,41 @@ class _BusyMarkWindowLifecycleState
     final settings = ref.read(appSettingsControllerProvider);
     var workspace = ref.read(workspaceControllerProvider);
     if (settings.autoSave && workspace.hasUnsavedChanges) {
-      await ref
-          .read(workspaceControllerProvider.notifier)
-          .autoSaveActiveIfNeeded();
+      await ref.read(workspaceControllerProvider.notifier).saveAll();
       workspace = ref.read(workspaceControllerProvider);
     }
+    final controller = ref.read(workspaceControllerProvider.notifier);
     await _windowControlService.handleCloseRequest(
       hasUnsavedChanges: workspace.hasUnsavedChanges,
       confirmCloseWithUnsavedChanges: settings.confirmCloseWithUnsavedChanges,
       showCloseDialog: () => _showWindowCloseDialog(context),
-      saveChanges: () => saveActiveWithOverwriteConfirmation(context, ref),
+      saveChanges: () => _saveAllDirtyDocuments(context),
+      beforeClose: controller.markCleanShutdown,
+      discardChanges: controller.discardRecoveryForShutdown,
     );
   }
 
+  Future<bool> _saveAllDirtyDocuments(BuildContext context) async {
+    final controller = ref.read(workspaceControllerProvider.notifier);
+    final dirtyIds = [
+      for (final buffer
+          in ref.read(workspaceControllerProvider).documentBuffers)
+        if (buffer.isDirty) buffer.id,
+    ];
+    for (final bufferId in dirtyIds) {
+      if (!await controller.activateDocumentBuffer(bufferId) ||
+          !context.mounted ||
+          !await saveActiveWithOverwriteConfirmation(context, ref)) {
+        return false;
+      }
+    }
+    return !ref.read(workspaceControllerProvider).hasUnsavedChanges;
+  }
+
   Future<WindowCloseAction?> _showWindowCloseDialog(BuildContext context) {
     final l10n = AppLocalizations.of(context);
     final headerBar = ref.read(linuxHeaderBarServiceProvider);
+    final dirtyBuffers = ref.read(workspaceControllerProvider).dirtyBuffers;
     return showBusyMarkModalDialog<WindowCloseAction>(
       context,
       headerBarService: headerBar.isAvailable ? headerBar : null,
@@ -877,7 +966,21 @@ class _BusyMarkWindowLifecycleState
             onPressed: () => Navigator.pop(context, WindowCloseAction.save),
           ),
         ],
-        children: [Text(_closeUnsavedChangesMessage(context))],
+        children: [
+          Text(_closeUnsavedChangesMessage(context)),
+          const SizedBox(height: BusyMarkSpacing.md),
+          BusyMarkGroupedList(
+            filled: true,
+            children: [
+              for (final buffer in dirtyBuffers)
+                BusyMarkActionRow(
+                  title: buffer.displayName,
+                  subtitle: buffer.filePath,
+                  leading: const Icon(BusyMarkGlyphs.document),
+                ),
+            ],
+          ),
+        ],
       ),
     );
   }
@@ -885,8 +988,9 @@ class _BusyMarkWindowLifecycleState
   String _closeUnsavedChangesMessage(BuildContext context) {
     final l10n = AppLocalizations.of(context);
     final state = ref.read(workspaceControllerProvider);
-    if (!state.hasUnsavedChanges) {
-      return l10n.closeUnsavedChangesMultipleMessage(0);
+    final count = state.dirtyBuffers.length;
+    if (count != 1) {
+      return l10n.closeUnsavedChangesMultipleMessage(count);
     }
     return l10n.closeUnsavedChangesSingleMessage;
   }
@@ -926,14 +1030,21 @@ class _BusyMarkSearchShortcutHandlerState
       return false;
     }
     final keyboard = HardwareKeyboard.instance;
-    if (BusyMarkAppShortcutActivators.search.accepts(event, keyboard)) {
+    final commands =
+        BusyMarkCommandRegistryScope.read(context) ??
+        BusyMarkCommandCatalog.metadata;
+    if (commands.shortcutAccepts(BusyMarkCommandIds.search, event, keyboard)) {
       if (rootNavigatorKey.currentState?.canPop() ?? false) {
         return false;
       }
       ref.read(workspaceSearchOpenRequestProvider.notifier).request();
       return true;
     }
-    if (BusyMarkTextEditingShortcutActivators.escape.accepts(event, keyboard)) {
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textEscape,
+      event,
+      keyboard,
+    )) {
       if (rootNavigatorKey.currentState?.canPop() ?? false) {
         return false;
       }
@@ -1005,6 +1116,10 @@ class _KeyboardShortcutsIntent extends Intent {
   const _KeyboardShortcutsIntent();
 }
 
+class _CommandPaletteIntent extends Intent {
+  const _CommandPaletteIntent();
+}
+
 class _SettingsIntent extends Intent {
   const _SettingsIntent();
 }
diff --git a/lib/src/app/busymark_design.dart b/lib/src/app/busymark_design.dart
index cb996de8..19d6465b 100644
--- a/lib/src/app/busymark_design.dart
+++ b/lib/src/app/busymark_design.dart
@@ -1964,7 +1964,7 @@ InputDecoration busyMarkGroupedTextFieldDecoration(
 ///
 /// The row owns the background, outline, padding, and separators while
 /// [TextFormField] continues to own editing, validation, and focus behavior.
-class BusyMarkGroupedTextEntry extends StatelessWidget {
+class BusyMarkGroupedTextEntry extends StatefulWidget {
   const BusyMarkGroupedTextEntry({
     super.key,
     required this.label,
@@ -1974,6 +1974,7 @@ class BusyMarkGroupedTextEntry extends StatelessWidget {
     this.hintText,
     this.enabled = true,
     this.autofocus = false,
+    this.focusNode,
     this.keyboardType,
     this.minLines = 1,
     this.maxLines = 1,
@@ -1998,6 +1999,7 @@ class BusyMarkGroupedTextEntry extends StatelessWidget {
   final String? hintText;
   final bool enabled;
   final bool autofocus;
+  final FocusNode? focusNode;
   final TextInputType? keyboardType;
   final int minLines;
   final int maxLines;
@@ -2012,36 +2014,72 @@ class BusyMarkGroupedTextEntry extends StatelessWidget {
   final ValueChanged<String>? onChanged;
   final ValueChanged<String>? onSubmitted;
 
+  @override
+  State<BusyMarkGroupedTextEntry> createState() =>
+      _BusyMarkGroupedTextEntryState();
+}
+
+class _BusyMarkGroupedTextEntryState extends State<BusyMarkGroupedTextEntry> {
+  final _fieldKey = GlobalKey<FormFieldState<String>>();
+
   @override
   Widget build(BuildContext context) {
+    final row = _buildRow(context);
+    if (!widget.enabled || widget.onSubmitted == null) {
+      return row;
+    }
+    // Linux physical key events are not always translated into the text-input
+    // action that drives TextFormField.onFieldSubmitted. Keep that callback for
+    // IME actions and bind the desktop Enter keys explicitly as well.
+    return CallbackShortcuts(
+      bindings: {
+        const SingleActivator(LogicalKeyboardKey.enter): _submit,
+        const SingleActivator(LogicalKeyboardKey.numpadEnter): _submit,
+      },
+      child: row,
+    );
+  }
+
+  Widget _buildRow(BuildContext context) {
     return YaruListTile.square(
       title: TextFormField(
-        controller: controller,
-        initialValue: initialValue,
-        enabled: enabled,
-        autofocus: autofocus,
-        keyboardType: keyboardType,
-        minLines: minLines,
-        maxLines: maxLines,
-        textInputAction: textInputAction,
-        textDirection: textDirection,
-        obscureText: obscureText,
-        enableSuggestions: enableSuggestions,
-        autocorrect: autocorrect,
-        style: textStyle,
-        onChanged: enabled ? onChanged : null,
-        onFieldSubmitted: enabled ? onSubmitted : null,
+        key: _fieldKey,
+        controller: widget.controller,
+        initialValue: widget.initialValue,
+        enabled: widget.enabled,
+        autofocus: widget.autofocus,
+        focusNode: widget.focusNode,
+        keyboardType: widget.keyboardType,
+        minLines: widget.minLines,
+        maxLines: widget.maxLines,
+        textInputAction: widget.textInputAction,
+        textDirection: widget.textDirection,
+        obscureText: widget.obscureText,
+        enableSuggestions: widget.enableSuggestions,
+        autocorrect: widget.autocorrect,
+        style: widget.textStyle,
+        onChanged: widget.enabled ? widget.onChanged : null,
+        onFieldSubmitted: widget.enabled ? widget.onSubmitted : null,
         decoration: busyMarkGroupedTextFieldDecoration(
           context,
-          labelText: label,
-          hintText: hintText,
-          errorText: errorText,
-          alignLabelWithHint: alignLabelWithHint,
+          labelText: widget.label,
+          hintText: widget.hintText,
+          errorText: widget.errorText,
+          alignLabelWithHint: widget.alignLabelWithHint,
         ),
       ),
-      trailing: trailing,
+      trailing: widget.trailing,
     );
   }
+
+  void _submit() {
+    final value =
+        widget.controller?.text ??
+        _fieldKey.currentState?.value ??
+        widget.initialValue ??
+        '';
+    widget.onSubmitted?.call(value);
+  }
 }
 
 class BusyMarkClamp extends StatelessWidget {
diff --git a/lib/src/app/busymark_dialogs.dart b/lib/src/app/busymark_dialogs.dart
index c5fbe137..98629078 100644
--- a/lib/src/app/busymark_dialogs.dart
+++ b/lib/src/app/busymark_dialogs.dart
@@ -9,6 +9,7 @@ import '../platform/linux_header_bar_service.dart';
 import 'app_metadata.dart';
 import 'busymark_dialog_identity.dart';
 import 'busymark_shortcuts.dart';
+import 'command_registry.dart';
 import 'busymark_design.dart';
 import 'busymark_glyphs.dart';
 import 'localization.dart';
@@ -35,16 +36,16 @@ class _DismissBusyMarkModalIntent extends Intent {
 }
 
 final _busyMarkModalShortcuts = <ShortcutActivator, Intent>{
-  for (final shortcut in BusyMarkAppShortcuts.definitions.values)
-    shortcut.activator: const DoNothingAndStopPropagationIntent(),
-  for (final shortcut in BusyMarkDocumentViewShortcuts.definitions.values)
-    shortcut.activator: const DoNothingAndStopPropagationIntent(),
-  for (final entry in BusyMarkEditorShortcuts.definitions.entries)
-    if (entry.key != BusyMarkEditorShortcutAction.pastePlainText)
-      entry.value.activator: const DoNothingAndStopPropagationIntent(),
-  for (final shortcut in BusyMarkSidebarShortcuts.definitions.values)
-    shortcut.activator: const DoNothingAndStopPropagationIntent(),
-  BusyMarkTextEditingShortcutActivators.escape:
+  for (final command in BusyMarkCommandCatalog.metadata.commands)
+    if (command.shortcut != null &&
+        command.id != BusyMarkCommandIds.textPastePlainText &&
+        command.scope != BusyMarkCommandScope.tree &&
+        command.scope != BusyMarkCommandScope.textEditing)
+      command.shortcut!.activator: const DoNothingAndStopPropagationIntent(),
+  BusyMarkCommandCatalog
+          .metadata[BusyMarkCommandIds.textEscape]!
+          .shortcut!
+          .activator:
       const _DismissBusyMarkModalIntent(),
 };
 
@@ -367,6 +368,53 @@ Future<void> _openApacheLicense() async {
 }
 
 void showBusyMarkKeyboardShortcutsDialog(BuildContext context) {
+  final registry =
+      BusyMarkCommandRegistryScope.maybeOf(context) ??
+      BusyMarkCommandCatalog.metadata;
+  final headerBar = LinuxHeaderBarService.instance;
+  unawaited(
+    showBusyMarkModalDialog<void>(
+      context,
+      headerBarService: headerBar.isAvailable ? headerBar : null,
+      builder: (context) {
+        final grouped = <String, List<BusyMarkCommand>>{};
+        final shortcutLabels = <String>{};
+        for (final command in registry.commands) {
+          final shortcut = command.shortcut;
+          if (shortcut == null || !shortcutLabels.add(shortcut.label)) {
+            continue;
+          }
+          grouped.putIfAbsent(command.category(context), () => []).add(command);
+        }
+        return _BusyMarkInfoDialog(
+          title: context.l10n.keyboardShortcuts,
+          icon: BusyMarkGlyphs.keyboard,
+          maxWidth: 460,
+          children: [
+            for (final entry in grouped.entries)
+              BusyMarkGroupedList(
+                title: entry.key,
+                filled: true,
+                children: [
+                  for (final command in entry.value)
+                    BusyMarkActionRow(
+                      title: command.label(context),
+                      subtitle: command.description?.call(context),
+                      leading: const Icon(BusyMarkGlyphs.keyboard),
+                      trailing: _KeyboardShortcutBadge(command.shortcut!.label),
+                    ),
+                ],
+              ),
+          ],
+        );
+      },
+    ),
+  );
+}
+
+// Retained temporarily as a layout reference while every shortcut consumer is
+// migrated to the registry-backed presentation above.
+void showLegacyBusyMarkKeyboardShortcutsDialog(BuildContext context) {
   final headerBar = LinuxHeaderBarService.instance;
   unawaited(
     showBusyMarkModalDialog<void>(
diff --git a/lib/src/app/busymark_glyphs.dart b/lib/src/app/busymark_glyphs.dart
index a83c2570..056ad1d1 100644
--- a/lib/src/app/busymark_glyphs.dart
+++ b/lib/src/app/busymark_glyphs.dart
@@ -57,6 +57,8 @@ abstract final class BusyMarkGlyphs {
   static const IconData keyboard = YaruIcons.keyboard_shortcuts;
   static const IconData link = YaruIcons.insert_link;
   static const IconData markdownFile = YaruIcons.text_editor;
+  static const IconData math = Icons.functions;
+  static const IconData play = YaruIcons.media_play;
   static const IconData menuHorizontal = YaruIcons.view_more_horizontal;
   static const IconData menuVertical = YaruIcons.view_more;
   static const IconData newDocument = YaruIcons.document_new;
@@ -95,6 +97,7 @@ abstract final class BusyMarkGlyphs {
   static const IconData undo = YaruIcons.undo;
   static const IconData unorderedList = YaruIcons.unordered_list;
   static const IconData upArrow = YaruIcons.pan_up;
+  static const IconData video = YaruIcons.multimedia_player;
   static const IconData warning = YaruIcons.warning;
   static const IconData windowClose = YaruIcons.window_close;
   static const IconData writersideProject = YaruIcons.book;
@@ -249,6 +252,9 @@ abstract final class BusyMarkGlyphs {
     if (icon == paste) {
       return 'edit-paste-symbolic';
     }
+    if (icon == play) {
+      return 'media-playback-start-symbolic';
+    }
     if (icon == preview || icon == previewView) {
       return 'image-viewer-symbolic';
     }
@@ -315,6 +321,9 @@ abstract final class BusyMarkGlyphs {
     if (icon == warning) {
       return 'dialog-warning-symbolic';
     }
+    if (icon == video) {
+      return 'multimedia-player-symbolic';
+    }
     if (icon == writersideProject) {
       return 'folder-documents-symbolic';
     }
diff --git a/lib/src/app/busymark_main_menu.dart b/lib/src/app/busymark_main_menu.dart
index bf20c766..f0adf673 100644
--- a/lib/src/app/busymark_main_menu.dart
+++ b/lib/src/app/busymark_main_menu.dart
@@ -1,9 +1,11 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'busymark_design.dart';
 import 'busymark_glyphs.dart';
-import 'busymark_shortcuts.dart';
+import 'command_registry.dart';
 import 'localization.dart';
 import 'window_control_service.dart';
 
@@ -13,6 +15,7 @@ enum BusyMarkMainMenuAction {
   fullScreen,
   settings,
   keyboardShortcuts,
+  commandPalette,
   markdownAndHtml,
   reportIssue,
   aboutBusyMark,
@@ -33,6 +36,10 @@ class BusyMarkMainMenuButton extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final l10n = context.l10n;
+    final commands =
+        BusyMarkCommandRegistryScope.maybeOf(context) ??
+        BusyMarkCommandCatalog.metadata;
+    BusyMarkCommand command(String id) => commands[id]!;
     final fullScreen = ref.watch(
       windowControlServiceProvider.select((service) => service.isFullScreen),
     );
@@ -42,9 +49,9 @@ class BusyMarkMainMenuButton extends ConsumerWidget {
       itemBuilder: (context) => [
         BusyMarkPopupMenuItem(
           value: BusyMarkMainMenuAction.exportPdf,
-          label: l10n.exportAsPdf,
+          label: command(BusyMarkCommandIds.exportPdf).label(context),
           icon: BusyMarkGlyphs.exportPdf,
-          shortcut: BusyMarkAppShortcutLabels.exportPdf,
+          shortcut: command(BusyMarkCommandIds.exportPdf).shortcut?.label,
           enabled: canExportPdf,
         ),
         BusyMarkPopupMenuItem(
@@ -55,30 +62,38 @@ class BusyMarkMainMenuButton extends ConsumerWidget {
         ),
         BusyMarkPopupMenuItem(
           value: BusyMarkMainMenuAction.fullScreen,
-          label: l10n.fullScreen,
+          label: command(BusyMarkCommandIds.fullScreen).label(context),
           icon: BusyMarkGlyphs.fullScreen,
-          shortcut: BusyMarkAppShortcutLabels.fullScreen,
+          shortcut: command(BusyMarkCommandIds.fullScreen).shortcut?.label,
           checked: fullScreen,
           trailingCheck: true,
           mutuallyExclusive: false,
         ),
         BusyMarkPopupMenuItem(
           value: BusyMarkMainMenuAction.settings,
-          label: l10n.settings,
+          label: command(BusyMarkCommandIds.settings).label(context),
           icon: BusyMarkGlyphs.settings,
-          shortcut: BusyMarkAppShortcutLabels.settings,
+          shortcut: command(BusyMarkCommandIds.settings).shortcut?.label,
         ),
         BusyMarkPopupMenuItem(
           value: BusyMarkMainMenuAction.keyboardShortcuts,
-          label: l10n.keyboardShortcuts,
+          label: command(BusyMarkCommandIds.keyboardShortcuts).label(context),
           icon: BusyMarkGlyphs.keyboard,
-          shortcut: BusyMarkAppShortcutLabels.keyboardShortcuts,
+          shortcut: command(
+            BusyMarkCommandIds.keyboardShortcuts,
+          ).shortcut?.label,
+        ),
+        BusyMarkPopupMenuItem(
+          value: BusyMarkMainMenuAction.commandPalette,
+          label: command(BusyMarkCommandIds.commandPalette).label(context),
+          icon: BusyMarkGlyphs.search,
+          shortcut: command(BusyMarkCommandIds.commandPalette).shortcut?.label,
         ),
         BusyMarkPopupMenuItem(
           value: BusyMarkMainMenuAction.markdownAndHtml,
-          label: l10n.markdownAndHtml,
+          label: command(BusyMarkCommandIds.markdownAndHtml).label(context),
           icon: BusyMarkGlyphs.markdownFile,
-          shortcut: BusyMarkAppShortcutLabels.markdownAndHtml,
+          shortcut: command(BusyMarkCommandIds.markdownAndHtml).shortcut?.label,
         ),
         BusyMarkPopupMenuItem(
           value: BusyMarkMainMenuAction.reportIssue,
@@ -91,7 +106,27 @@ class BusyMarkMainMenuButton extends ConsumerWidget {
           icon: BusyMarkGlyphs.info,
         ),
       ],
-      onSelected: onSelected,
+      onSelected: (action) {
+        final commandId = switch (action) {
+          BusyMarkMainMenuAction.exportPdf => BusyMarkCommandIds.exportPdf,
+          BusyMarkMainMenuAction.fullScreen => BusyMarkCommandIds.fullScreen,
+          BusyMarkMainMenuAction.settings => BusyMarkCommandIds.settings,
+          BusyMarkMainMenuAction.keyboardShortcuts =>
+            BusyMarkCommandIds.keyboardShortcuts,
+          BusyMarkMainMenuAction.commandPalette =>
+            BusyMarkCommandIds.commandPalette,
+          BusyMarkMainMenuAction.markdownAndHtml =>
+            BusyMarkCommandIds.markdownAndHtml,
+          BusyMarkMainMenuAction.generateMarkdownToc ||
+          BusyMarkMainMenuAction.reportIssue ||
+          BusyMarkMainMenuAction.aboutBusyMark => null,
+        };
+        if (commandId != null && commands[commandId]?.execute != null) {
+          unawaited(commands.execute(commandId));
+        } else {
+          onSelected(action);
+        }
+      },
     );
   }
 }
diff --git a/lib/src/app/busymark_shortcuts.dart b/lib/src/app/busymark_shortcuts.dart
index 28506c77..586021f2 100644
--- a/lib/src/app/busymark_shortcuts.dart
+++ b/lib/src/app/busymark_shortcuts.dart
@@ -27,6 +27,7 @@ enum BusyMarkAppShortcutAction {
   back,
   search,
   keyboardShortcuts,
+  commandPalette,
   markdownAndHtml,
   settings,
   nextTab,
@@ -47,6 +48,7 @@ abstract final class BusyMarkAppShortcuts {
   static const backLabel = 'Alt+Left';
   static const searchLabel = 'Ctrl+F';
   static const keyboardShortcutsLabel = 'Ctrl+Alt+K';
+  static const commandPaletteLabel = 'Ctrl+Shift+P';
   static const markdownAndHtmlLabel = 'Ctrl+Alt+M';
   static const settingsLabel = 'Ctrl+Alt+S';
   static const nextTabLabel = 'Ctrl+Tab';
@@ -63,6 +65,7 @@ abstract final class BusyMarkAppShortcuts {
   static const backGtkAccelerator = '<Alt>Left';
   static const searchGtkAccelerator = '<Primary>f';
   static const keyboardShortcutsGtkAccelerator = '<Primary><Alt>k';
+  static const commandPaletteGtkAccelerator = '<Primary><Shift>p';
   static const markdownAndHtmlGtkAccelerator = '<Primary><Alt>m';
   static const settingsGtkAccelerator = '<Primary><Alt>s';
   static const nextTabGtkAccelerator = '<Primary>Tab';
@@ -123,6 +126,15 @@ abstract final class BusyMarkAppShortcuts {
     ),
     gtkAccelerator: keyboardShortcutsGtkAccelerator,
   );
+  static const commandPalette = BusyMarkShortcutDefinition(
+    label: commandPaletteLabel,
+    activator: SingleActivator(
+      LogicalKeyboardKey.keyP,
+      control: true,
+      shift: true,
+    ),
+    gtkAccelerator: commandPaletteGtkAccelerator,
+  );
   static const markdownAndHtml = BusyMarkShortcutDefinition(
     label: markdownAndHtmlLabel,
     activator: SingleActivator(
@@ -185,6 +197,7 @@ abstract final class BusyMarkAppShortcuts {
         BusyMarkAppShortcutAction.back: back,
         BusyMarkAppShortcutAction.search: search,
         BusyMarkAppShortcutAction.keyboardShortcuts: keyboardShortcuts,
+        BusyMarkAppShortcutAction.commandPalette: commandPalette,
         BusyMarkAppShortcutAction.markdownAndHtml: markdownAndHtml,
         BusyMarkAppShortcutAction.settings: settings,
         BusyMarkAppShortcutAction.nextTab: nextTab,
@@ -206,6 +219,7 @@ abstract final class BusyMarkAppShortcutLabels {
   static const back = BusyMarkAppShortcuts.backLabel;
   static const search = BusyMarkAppShortcuts.searchLabel;
   static const keyboardShortcuts = BusyMarkAppShortcuts.keyboardShortcutsLabel;
+  static const commandPalette = BusyMarkAppShortcuts.commandPaletteLabel;
   static const markdownAndHtml = BusyMarkAppShortcuts.markdownAndHtmlLabel;
   static const settings = BusyMarkAppShortcuts.settingsLabel;
   static const nextTab = BusyMarkAppShortcuts.nextTabLabel;
@@ -229,6 +243,8 @@ abstract final class BusyMarkAppShortcutActivators {
   static ShortcutActivator get search => BusyMarkAppShortcuts.search.activator;
   static ShortcutActivator get keyboardShortcuts =>
       BusyMarkAppShortcuts.keyboardShortcuts.activator;
+  static ShortcutActivator get commandPalette =>
+      BusyMarkAppShortcuts.commandPalette.activator;
   static ShortcutActivator get markdownAndHtml =>
       BusyMarkAppShortcuts.markdownAndHtml.activator;
   static ShortcutActivator get settings =>
diff --git a/lib/src/app/busymark_toast.dart b/lib/src/app/busymark_toast.dart
new file mode 100644
index 00000000..8245b0df
--- /dev/null
+++ b/lib/src/app/busymark_toast.dart
@@ -0,0 +1,315 @@
+import 'dart:async';
+import 'dart:collection';
+
+import 'package:flutter/material.dart';
+
+import 'busymark_design.dart';
+import 'busymark_glyphs.dart';
+
+/// Controls how a toast is ordered when another toast is already visible.
+enum BusyMarkToastPriority { normal, high }
+
+/// Hosts native-looking, window-level feedback for short-lived app events.
+///
+/// The presentation follows the GNOME/Libadwaita toast pattern: one compact,
+/// user-dismissible message is overlaid at the bottom center of the window.
+class BusyMarkToastOverlay extends StatefulWidget {
+  const BusyMarkToastOverlay({super.key, required this.child});
+
+  final Widget child;
+
+  static void show(
+    BuildContext context, {
+    required String message,
+    String? actionLabel,
+    VoidCallback? onAction,
+    Duration duration = const Duration(seconds: 5),
+    BusyMarkToastPriority priority = BusyMarkToastPriority.normal,
+  }) {
+    final host = context
+        .dependOnInheritedWidgetOfExactType<_BusyMarkToastScope>()
+        ?._state;
+    host?._show(
+      message: message,
+      actionLabel: actionLabel,
+      onAction: onAction,
+      duration: duration,
+      priority: priority,
+    );
+  }
+
+  static bool maybeShow(
+    BuildContext context, {
+    required String message,
+    String? actionLabel,
+    VoidCallback? onAction,
+    Duration duration = const Duration(seconds: 5),
+    BusyMarkToastPriority priority = BusyMarkToastPriority.normal,
+  }) {
+    final host = context
+        .dependOnInheritedWidgetOfExactType<_BusyMarkToastScope>()
+        ?._state;
+    if (host == null) {
+      return false;
+    }
+    host._show(
+      message: message,
+      actionLabel: actionLabel,
+      onAction: onAction,
+      duration: duration,
+      priority: priority,
+    );
+    return true;
+  }
+
+  @override
+  State<BusyMarkToastOverlay> createState() => _BusyMarkToastOverlayState();
+}
+
+class _BusyMarkToastOverlayState extends State<BusyMarkToastOverlay> {
+  static const _transitionDuration = Duration(milliseconds: 180);
+
+  final _pending = ListQueue<_BusyMarkToast>();
+  _BusyMarkToast? _active;
+  Timer? _dismissTimer;
+  Timer? _nextToastTimer;
+  var _nextId = 0;
+
+  @override
+  void dispose() {
+    _dismissTimer?.cancel();
+    _nextToastTimer?.cancel();
+    super.dispose();
+  }
+
+  void _show({
+    required String message,
+    required String? actionLabel,
+    required VoidCallback? onAction,
+    required Duration duration,
+    required BusyMarkToastPriority priority,
+  }) {
+    final normalizedMessage = message.trim();
+    if (normalizedMessage.isEmpty || !mounted) {
+      return;
+    }
+    final toast = _BusyMarkToast(
+      id: _nextId++,
+      message: normalizedMessage,
+      actionLabel: actionLabel?.trim(),
+      onAction: onAction,
+      duration: duration,
+      priority: priority,
+    );
+    final active = _active;
+    if (active == null) {
+      _activate(toast);
+      return;
+    }
+    if (active.matches(toast)) {
+      setState(() => _active = toast);
+      _startDismissTimer(toast);
+      return;
+    }
+    if (priority == BusyMarkToastPriority.high) {
+      _pending.addFirst(toast);
+    } else {
+      _pending.addLast(toast);
+    }
+  }
+
+  void _activate(_BusyMarkToast toast) {
+    _nextToastTimer?.cancel();
+    setState(() => _active = toast);
+    _startDismissTimer(toast);
+  }
+
+  void _startDismissTimer(_BusyMarkToast toast) {
+    _dismissTimer?.cancel();
+    if (toast.duration <= Duration.zero) {
+      return;
+    }
+    _dismissTimer = Timer(toast.duration, () => _dismiss(toast.id));
+  }
+
+  void _dismiss(int id) {
+    if (!mounted || _active?.id != id) {
+      return;
+    }
+    _dismissTimer?.cancel();
+    setState(() => _active = null);
+    _nextToastTimer?.cancel();
+    _nextToastTimer = Timer(_transitionDuration, _showNext);
+  }
+
+  void _showNext() {
+    if (!mounted || _active != null || _pending.isEmpty) {
+      return;
+    }
+    _activate(_pending.removeFirst());
+  }
+
+  void _invokeAction(_BusyMarkToast toast) {
+    toast.onAction?.call();
+    _dismiss(toast.id);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final active = _active;
+    return Overlay.wrap(
+      child: _BusyMarkToastScope(
+        state: this,
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            widget.child,
+            Positioned(
+              left: BusyMarkSpacing.lg,
+              right: BusyMarkSpacing.lg,
+              bottom: BusyMarkSpacing.lg,
+              child: SafeArea(
+                top: false,
+                child: Align(
+                  alignment: Alignment.bottomCenter,
+                  heightFactor: 1,
+                  child: AnimatedSwitcher(
+                    duration: _transitionDuration,
+                    reverseDuration: _transitionDuration,
+                    switchInCurve: Curves.easeOutCubic,
+                    switchOutCurve: Curves.easeInCubic,
+                    transitionBuilder: (child, animation) => FadeTransition(
+                      opacity: animation,
+                      child: SlideTransition(
+                        position: Tween<Offset>(
+                          begin: const Offset(0, 0.15),
+                          end: Offset.zero,
+                        ).animate(animation),
+                        child: child,
+                      ),
+                    ),
+                    child: active == null
+                        ? const SizedBox.shrink()
+                        : _BusyMarkToastSurface(
+                            key: ValueKey(active.id),
+                            toast: active,
+                            onAction: () => _invokeAction(active),
+                            onDismiss: () => _dismiss(active.id),
+                          ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _BusyMarkToastScope extends InheritedWidget {
+  const _BusyMarkToastScope({required this.state, required super.child});
+
+  final _BusyMarkToastOverlayState state;
+
+  _BusyMarkToastOverlayState get _state => state;
+
+  @override
+  bool updateShouldNotify(_BusyMarkToastScope oldWidget) => false;
+}
+
+@immutable
+class _BusyMarkToast {
+  const _BusyMarkToast({
+    required this.id,
+    required this.message,
+    required this.actionLabel,
+    required this.onAction,
+    required this.duration,
+    required this.priority,
+  });
+
+  final int id;
+  final String message;
+  final String? actionLabel;
+  final VoidCallback? onAction;
+  final Duration duration;
+  final BusyMarkToastPriority priority;
+
+  bool matches(_BusyMarkToast other) =>
+      message == other.message && actionLabel == other.actionLabel;
+}
+
+class _BusyMarkToastSurface extends StatelessWidget {
+  const _BusyMarkToastSurface({
+    super.key,
+    required this.toast,
+    required this.onAction,
+    required this.onDismiss,
+  });
+
+  final _BusyMarkToast toast;
+  final VoidCallback onAction;
+  final VoidCallback onDismiss;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colors = BusyMarkSurfaceColors.of(context);
+    final actionLabel = toast.actionLabel;
+    return Semantics(
+      container: true,
+      liveRegion: true,
+      child: ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 560),
+        child: Material(
+          color: BusyMarkLinuxPalette.transparent,
+          child: DecoratedBox(
+            decoration: BoxDecoration(
+              color: colors.popover,
+              borderRadius: BorderRadius.circular(BusyMarkRadius.lg),
+              border: Border.all(color: colors.floatingBorder),
+              boxShadow: BusyMarkShadow.nativeCardShadowsFor(context),
+            ),
+            child: Padding(
+              padding: const EdgeInsetsDirectional.fromSTEB(
+                BusyMarkSpacing.lg,
+                BusyMarkSpacing.sm,
+                BusyMarkSpacing.sm,
+                BusyMarkSpacing.sm,
+              ),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Flexible(
+                    child: Text(
+                      toast.message,
+                      maxLines: 3,
+                      overflow: TextOverflow.ellipsis,
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        color: colors.foreground,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ),
+                  if (actionLabel != null && actionLabel.isNotEmpty) ...[
+                    const SizedBox(width: BusyMarkSpacing.sm),
+                    TextButton(onPressed: onAction, child: Text(actionLabel)),
+                  ],
+                  const SizedBox(width: BusyMarkSpacing.xs),
+                  BusyMarkCompactIconButton(
+                    tooltip: MaterialLocalizations.of(
+                      context,
+                    ).closeButtonTooltip,
+                    icon: BusyMarkGlyphs.windowClose,
+                    onPressed: onDismiss,
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/app/command_palette.dart b/lib/src/app/command_palette.dart
new file mode 100644
index 00000000..131985f2
--- /dev/null
+++ b/lib/src/app/command_palette.dart
@@ -0,0 +1,128 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import '../platform/linux_header_bar_service.dart';
+import 'busymark_design.dart';
+import 'busymark_dialogs.dart';
+import 'busymark_glyphs.dart';
+import 'command_registry.dart';
+import 'localization.dart';
+
+Future<void> showBusyMarkCommandPalette(
+  BuildContext context,
+  BusyMarkCommandRegistry registry,
+) async {
+  final headerBar = LinuxHeaderBarService.instance;
+  final commandTarget = FocusManager.instance.primaryFocus?.context;
+  await showBusyMarkModalDialog<void>(
+    context,
+    headerBarService: headerBar.isAvailable ? headerBar : null,
+    builder: (context) => _BusyMarkCommandPalette(
+      registry: registry,
+      commandTarget: commandTarget,
+    ),
+  );
+}
+
+class _BusyMarkCommandPalette extends StatefulWidget {
+  const _BusyMarkCommandPalette({
+    required this.registry,
+    required this.commandTarget,
+  });
+
+  final BusyMarkCommandRegistry registry;
+  final BuildContext? commandTarget;
+
+  @override
+  State<_BusyMarkCommandPalette> createState() =>
+      _BusyMarkCommandPaletteState();
+}
+
+class _BusyMarkCommandPaletteState extends State<_BusyMarkCommandPalette> {
+  var _query = '';
+
+  List<BusyMarkCommand> get _commands {
+    final query = _query.trim().toLowerCase();
+    return widget.registry.visibleCommands().where((command) {
+      if (query.isEmpty) {
+        return true;
+      }
+      return command.label(context).toLowerCase().contains(query) ||
+          command.category(context).toLowerCase().contains(query) ||
+          command.id.toLowerCase().contains(query);
+    }).toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final commands = _commands;
+    return BusyMarkDialogShell(
+      title: context.l10n.commandPalette,
+      maxWidth: BusyMarkSizes.dialogCompact,
+      children: [
+        BusyMarkGroupedList(
+          filled: true,
+          children: [
+            BusyMarkGroupedTextEntry(
+              label: context.l10n.commandPaletteHint,
+              autofocus: true,
+              onChanged: (value) => setState(() => _query = value),
+              onSubmitted: (_) {
+                if (commands.isNotEmpty && _enabled(commands.first)) {
+                  _execute(commands.first);
+                }
+              },
+            ),
+          ],
+        ),
+        const SizedBox(height: BusyMarkSpacing.md),
+        if (commands.isEmpty)
+          Padding(
+            padding: const EdgeInsets.all(BusyMarkSpacing.lg),
+            child: Text(
+              context.l10n.commandPaletteEmpty,
+              textAlign: TextAlign.center,
+            ),
+          )
+        else
+          BusyMarkGroupedList(
+            filled: true,
+            children: [
+              for (final command in commands)
+                BusyMarkActionRow(
+                  title: command.label(context),
+                  subtitle: _enabled(command)
+                      ? command.category(context)
+                      : command.disabledReason?.call(context) ??
+                            command.category(context),
+                  leading: const Icon(BusyMarkGlyphs.search),
+                  trailing: command.shortcut == null
+                      ? null
+                      : Text(command.shortcut!.label),
+                  enabled: _enabled(command),
+                  onTap: _enabled(command) ? () => _execute(command) : null,
+                ),
+            ],
+          ),
+      ],
+    );
+  }
+
+  void _execute(BusyMarkCommand command) {
+    Navigator.pop(context);
+    unawaited(
+      Future<void>.microtask(
+        () =>
+            widget.registry.executeInContext(command.id, widget.commandTarget),
+      ),
+    );
+  }
+
+  bool _enabled(BusyMarkCommand command) {
+    return widget.registry.canExecuteInContext(
+      command.id,
+      widget.commandTarget,
+    );
+  }
+}
diff --git a/lib/src/app/command_registry.dart b/lib/src/app/command_registry.dart
new file mode 100644
index 00000000..ca5f745e
--- /dev/null
+++ b/lib/src/app/command_registry.dart
@@ -0,0 +1,655 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'busymark_shortcuts.dart';
+import 'localization.dart';
+
+typedef BusyMarkCommandCallback = FutureOr<void> Function();
+typedef BusyMarkCommandPredicate = bool Function();
+typedef BusyMarkCommandLabel = String Function(BuildContext context);
+typedef BusyMarkCommandDescription = String? Function(BuildContext context);
+
+class BusyMarkCommandIntent extends Intent {
+  const BusyMarkCommandIntent(this.commandId);
+
+  final String commandId;
+}
+
+class BusyMarkContextCommandIntent extends Intent {
+  const BusyMarkContextCommandIntent(this.commandId);
+
+  final String commandId;
+}
+
+class BusyMarkContextCommandAction
+    extends Action<BusyMarkContextCommandIntent> {
+  BusyMarkContextCommandAction({
+    required this.isCommandEnabled,
+    required this.onCommand,
+  });
+
+  final bool Function(String commandId) isCommandEnabled;
+  final void Function(String commandId) onCommand;
+
+  @override
+  bool isEnabled(BusyMarkContextCommandIntent intent) {
+    return isCommandEnabled(intent.commandId);
+  }
+
+  @override
+  Object? invoke(BusyMarkContextCommandIntent intent) {
+    onCommand(intent.commandId);
+    return null;
+  }
+}
+
+enum BusyMarkCommandScope {
+  application,
+  documentView,
+  textEditing,
+  editor,
+  sidebar,
+  tree,
+}
+
+@immutable
+class BusyMarkCommand {
+  const BusyMarkCommand({
+    required this.id,
+    required this.label,
+    required this.category,
+    required this.scope,
+    this.shortcut,
+    this.description,
+    this.disabledReason,
+    this.execute,
+    this.enabled = _always,
+    this.visible = _always,
+  });
+
+  final String id;
+  final BusyMarkCommandLabel label;
+  final BusyMarkCommandLabel category;
+  final BusyMarkCommandScope scope;
+  final BusyMarkShortcutDefinition? shortcut;
+  final BusyMarkCommandDescription? description;
+  final BusyMarkCommandDescription? disabledReason;
+  final BusyMarkCommandCallback? execute;
+  final BusyMarkCommandPredicate enabled;
+  final BusyMarkCommandPredicate visible;
+
+  bool get canExecute => execute != null && enabled();
+
+  static bool _always() => true;
+}
+
+class BusyMarkCommandRegistryScope extends InheritedWidget {
+  const BusyMarkCommandRegistryScope({
+    super.key,
+    required this.registry,
+    required super.child,
+  });
+
+  final BusyMarkCommandRegistry registry;
+
+  static BusyMarkCommandRegistry? maybeOf(BuildContext context) {
+    return context
+        .dependOnInheritedWidgetOfExactType<BusyMarkCommandRegistryScope>()
+        ?.registry;
+  }
+
+  static BusyMarkCommandRegistry? read(BuildContext context) {
+    final widget = context
+        .getElementForInheritedWidgetOfExactType<BusyMarkCommandRegistryScope>()
+        ?.widget;
+    return widget is BusyMarkCommandRegistryScope ? widget.registry : null;
+  }
+
+  @override
+  bool updateShouldNotify(BusyMarkCommandRegistryScope oldWidget) {
+    return !identical(registry, oldWidget.registry);
+  }
+}
+
+class BusyMarkCommandRegistryValidationException implements Exception {
+  const BusyMarkCommandRegistryValidationException(this.message);
+
+  final String message;
+
+  @override
+  String toString() => message;
+}
+
+class BusyMarkCommandRegistry {
+  BusyMarkCommandRegistry(Iterable<BusyMarkCommand> commands)
+    : commands = List.unmodifiable(commands) {
+    _validate(this.commands);
+    _byId = {for (final command in this.commands) command.id: command};
+  }
+
+  final List<BusyMarkCommand> commands;
+  late final Map<String, BusyMarkCommand> _byId;
+
+  BusyMarkCommand? operator [](String id) => _byId[id];
+
+  List<BusyMarkCommand> visibleCommands() => [
+    for (final command in commands)
+      if (command.visible()) command,
+  ];
+
+  Future<bool> execute(String id) async {
+    final command = _byId[id];
+    if (command == null || !command.canExecute) {
+      return false;
+    }
+    await command.execute!();
+    return true;
+  }
+
+  bool canExecuteInContext(String id, BuildContext? contextTarget) {
+    final command = _byId[id];
+    if (command == null || command.execute == null) {
+      return false;
+    }
+    if (!_isContextual(command) || contextTarget == null) {
+      return command.enabled();
+    }
+    final action = Actions.maybeFind<BusyMarkContextCommandIntent>(
+      contextTarget,
+    );
+    return action?.isEnabled(BusyMarkContextCommandIntent(id)) ?? false;
+  }
+
+  Future<bool> executeInContext(String id, BuildContext? contextTarget) async {
+    final command = _byId[id];
+    if (command == null || !canExecuteInContext(id, contextTarget)) {
+      return false;
+    }
+    if (_isContextual(command) && contextTarget != null) {
+      Actions.maybeInvoke(contextTarget, BusyMarkContextCommandIntent(id));
+      return true;
+    }
+    await command.execute!();
+    return true;
+  }
+
+  bool _isContextual(BusyMarkCommand command) {
+    return command.scope == BusyMarkCommandScope.editor ||
+        command.scope == BusyMarkCommandScope.textEditing;
+  }
+
+  bool shortcutAccepts(String id, KeyEvent event, HardwareKeyboard keyboard) {
+    return _byId[id]?.shortcut?.activator.accepts(event, keyboard) ?? false;
+  }
+
+  String? matchingCommandId(
+    KeyEvent event,
+    HardwareKeyboard keyboard, {
+    required BusyMarkCommandScope scope,
+  }) {
+    for (final command in commands) {
+      if (command.scope == scope &&
+          command.shortcut?.activator.accepts(event, keyboard) == true) {
+        return command.id;
+      }
+    }
+    return null;
+  }
+
+  Map<ShortcutActivator, Intent> shortcutIntents({
+    required Set<BusyMarkCommandScope> scopes,
+    required Intent Function(String commandId) intentFor,
+  }) {
+    return {
+      for (final command in commands)
+        if (scopes.contains(command.scope) && command.shortcut != null)
+          command.shortcut!.activator: intentFor(command.id),
+    };
+  }
+
+  static void _validate(List<BusyMarkCommand> commands) {
+    final ids = <String>{};
+    final shortcuts = <(BusyMarkCommandScope, ShortcutActivator), String>{};
+    for (final command in commands) {
+      if (!RegExp(
+        r'^[a-z][A-Za-z0-9]*(?:\.[a-z][A-Za-z0-9]*)+$',
+      ).hasMatch(command.id)) {
+        throw BusyMarkCommandRegistryValidationException(
+          'Invalid command ID: ${command.id}',
+        );
+      }
+      if (!ids.add(command.id)) {
+        throw BusyMarkCommandRegistryValidationException(
+          'Duplicate command ID: ${command.id}',
+        );
+      }
+      final shortcut = command.shortcut;
+      if (shortcut == null) {
+        continue;
+      }
+      final key = (command.scope, shortcut.activator);
+      if (shortcuts[key] case final existing?) {
+        throw BusyMarkCommandRegistryValidationException(
+          'Shortcut conflict in ${command.scope.name}: $existing and ${command.id}',
+        );
+      }
+      shortcuts[key] = command.id;
+    }
+  }
+}
+
+abstract final class BusyMarkCommandIds {
+  static const newDocument = 'file.newDocument';
+  static const open = 'file.open';
+  static const save = 'file.save';
+  static const exportPdf = 'file.exportPdf';
+  static const fullScreen = 'view.fullScreen';
+  static const back = 'navigation.back';
+  static const search = 'search.find';
+  static const keyboardShortcuts = 'help.keyboardShortcuts';
+  static const commandPalette = 'view.commandPalette';
+  static const markdownAndHtml = 'help.markdownAndHtml';
+  static const settings = 'application.settings';
+  static const nextTab = 'tabs.next';
+  static const previousTab = 'tabs.previous';
+  static const closeTab = 'tabs.close';
+  static const closeAllTabs = 'tabs.closeAll';
+  static const toggleSidebar = 'view.toggleSidebar';
+  static const viewEditor = 'view.editor';
+  static const viewSource = 'view.source';
+  static const viewReading = 'view.reading';
+  static const viewSplit = 'view.split';
+  static const textSelectAll = 'text.selectAll';
+  static const textCut = 'text.cut';
+  static const textCopy = 'text.copy';
+  static const textPaste = 'text.paste';
+  static const textPastePlainText = 'text.pastePlainText';
+  static const textUndo = 'text.undo';
+  static const textRedo = 'text.redo';
+  static const textInsertIndentation = 'text.insertIndentation';
+  static const textOutdentSource = 'text.outdentSource';
+  static const textEscape = 'text.escape';
+  static const editorRefineWithAi = 'editor.refineWithAi';
+  static const sidebarFiles = 'sidebar.files';
+  static const sidebarToc = 'sidebar.toc';
+  static const sidebarOutline = 'sidebar.outline';
+  static const sidebarGit = 'sidebar.git';
+  static const treeDeleteSelection = 'tree.deleteSelection';
+}
+
+abstract final class BusyMarkCommandCatalog {
+  static final BusyMarkCommandRegistry metadata = create();
+
+  static BusyMarkCommandRegistry create({
+    Map<String, BusyMarkCommandCallback> executions = const {},
+    Map<String, BusyMarkCommandPredicate> enabled = const {},
+    Map<String, BusyMarkCommandPredicate> visible = const {},
+  }) {
+    BusyMarkCommand command({
+      required String id,
+      required BusyMarkCommandLabel label,
+      required BusyMarkCommandLabel category,
+      required BusyMarkCommandScope scope,
+      BusyMarkShortcutDefinition? shortcut,
+      BusyMarkCommandDescription? description,
+    }) {
+      final contextual =
+          scope == BusyMarkCommandScope.editor ||
+          scope == BusyMarkCommandScope.textEditing;
+      return BusyMarkCommand(
+        id: id,
+        label: label,
+        category: category,
+        scope: scope,
+        shortcut: shortcut,
+        description: description,
+        disabledReason: (context) => context.l10n.commandUnavailableInContext,
+        execute:
+            executions[id] ??
+            (contextual ? () => _executeContextCommand(id) : null),
+        enabled:
+            enabled[id] ??
+            (contextual
+                ? () => _contextCommandAvailable(id)
+                : BusyMarkCommand._always),
+        visible: visible[id] ?? BusyMarkCommand._always,
+      );
+    }
+
+    final commands = <BusyMarkCommand>[
+      for (final action in BusyMarkAppShortcutAction.values)
+        command(
+          id: _appId(action),
+          label: (context) => _appLabel(context, action),
+          category: (context) => _appCategory(context, action),
+          scope: BusyMarkCommandScope.application,
+          shortcut: BusyMarkAppShortcuts.definitions[action],
+          description: (context) => _appDescription(context, action),
+        ),
+      for (final action in BusyMarkDocumentViewShortcutAction.values)
+        command(
+          id: switch (action) {
+            BusyMarkDocumentViewShortcutAction.editor =>
+              BusyMarkCommandIds.viewEditor,
+            BusyMarkDocumentViewShortcutAction.source =>
+              BusyMarkCommandIds.viewSource,
+            BusyMarkDocumentViewShortcutAction.reading =>
+              BusyMarkCommandIds.viewReading,
+            BusyMarkDocumentViewShortcutAction.split =>
+              BusyMarkCommandIds.viewSplit,
+          },
+          label: (context) => _viewLabel(context, action),
+          category: (context) => context.l10n.viewMode,
+          scope: BusyMarkCommandScope.documentView,
+          shortcut: BusyMarkDocumentViewShortcuts.definitions[action],
+        ),
+      for (final action in BusyMarkTextEditingShortcutAction.values)
+        command(
+          id: 'text.${action.name}',
+          label: (context) => _textLabel(context, action),
+          category: (context) => context.l10n.shortcutGroupTextEditing,
+          scope: BusyMarkCommandScope.textEditing,
+          shortcut: BusyMarkTextEditingShortcuts.definitions[action],
+          description: (context) => _textDescription(context, action),
+        ),
+      for (final action in BusyMarkEditorShortcutAction.values)
+        command(
+          id: 'editor.${action.name}',
+          label: (context) => _editorLabel(context, action),
+          category: (context) => _editorCategory(context, action),
+          scope: BusyMarkCommandScope.editor,
+          shortcut: BusyMarkEditorShortcuts.definitions[action],
+          description: (context) => _editorDescription(context, action),
+        ),
+      for (final action in BusyMarkSidebarShortcutAction.values)
+        command(
+          id: 'sidebar.${action.name}',
+          label: (context) => _sidebarLabel(context, action),
+          category: (context) => context.l10n.shortcutGroupSidebar,
+          scope: BusyMarkCommandScope.sidebar,
+          shortcut: BusyMarkSidebarShortcuts.definitions[action],
+        ),
+      for (final action in BusyMarkTreeShortcutAction.values)
+        command(
+          id: 'tree.${action.name}',
+          label: (context) => context.l10n.delete,
+          category: (context) => context.l10n.shortcutGroupSidebar,
+          scope: BusyMarkCommandScope.tree,
+          shortcut: BusyMarkTreeShortcuts.definitions[action],
+          description: (context) =>
+              context.l10n.shortcutDeleteTreeItemDescription,
+        ),
+    ];
+    return BusyMarkCommandRegistry(commands);
+  }
+
+  static String _appId(BusyMarkAppShortcutAction action) => switch (action) {
+    BusyMarkAppShortcutAction.newDocument => BusyMarkCommandIds.newDocument,
+    BusyMarkAppShortcutAction.open => BusyMarkCommandIds.open,
+    BusyMarkAppShortcutAction.save => BusyMarkCommandIds.save,
+    BusyMarkAppShortcutAction.exportPdf => BusyMarkCommandIds.exportPdf,
+    BusyMarkAppShortcutAction.fullScreen => BusyMarkCommandIds.fullScreen,
+    BusyMarkAppShortcutAction.back => BusyMarkCommandIds.back,
+    BusyMarkAppShortcutAction.search => BusyMarkCommandIds.search,
+    BusyMarkAppShortcutAction.keyboardShortcuts =>
+      BusyMarkCommandIds.keyboardShortcuts,
+    BusyMarkAppShortcutAction.commandPalette =>
+      BusyMarkCommandIds.commandPalette,
+    BusyMarkAppShortcutAction.markdownAndHtml =>
+      BusyMarkCommandIds.markdownAndHtml,
+    BusyMarkAppShortcutAction.settings => BusyMarkCommandIds.settings,
+    BusyMarkAppShortcutAction.nextTab => BusyMarkCommandIds.nextTab,
+    BusyMarkAppShortcutAction.previousTab => BusyMarkCommandIds.previousTab,
+    BusyMarkAppShortcutAction.closeTab => BusyMarkCommandIds.closeTab,
+    BusyMarkAppShortcutAction.closeAllTabs => BusyMarkCommandIds.closeAllTabs,
+    BusyMarkAppShortcutAction.toggleSidebar => BusyMarkCommandIds.toggleSidebar,
+  };
+
+  static String _appLabel(
+    BuildContext context,
+    BusyMarkAppShortcutAction action,
+  ) => switch (action) {
+    BusyMarkAppShortcutAction.newDocument => context.l10n.shortcutNewDocument,
+    BusyMarkAppShortcutAction.open => context.l10n.open,
+    BusyMarkAppShortcutAction.save => context.l10n.save,
+    BusyMarkAppShortcutAction.exportPdf => context.l10n.exportAsPdf,
+    BusyMarkAppShortcutAction.fullScreen => context.l10n.fullScreen,
+    BusyMarkAppShortcutAction.back => context.l10n.back,
+    BusyMarkAppShortcutAction.search => context.l10n.search,
+    BusyMarkAppShortcutAction.keyboardShortcuts =>
+      context.l10n.keyboardShortcuts,
+    BusyMarkAppShortcutAction.commandPalette => context.l10n.commandPalette,
+    BusyMarkAppShortcutAction.markdownAndHtml => context.l10n.markdownAndHtml,
+    BusyMarkAppShortcutAction.settings => context.l10n.settings,
+    BusyMarkAppShortcutAction.nextTab => context.l10n.shortcutNextTab,
+    BusyMarkAppShortcutAction.previousTab => context.l10n.shortcutPreviousTab,
+    BusyMarkAppShortcutAction.closeTab => context.l10n.shortcutCloseTab,
+    BusyMarkAppShortcutAction.closeAllTabs => context.l10n.shortcutCloseAllTabs,
+    BusyMarkAppShortcutAction.toggleSidebar => context.l10n.toggleSidebar,
+  };
+
+  static String _appCategory(
+    BuildContext context,
+    BusyMarkAppShortcutAction action,
+  ) => switch (action) {
+    BusyMarkAppShortcutAction.nextTab ||
+    BusyMarkAppShortcutAction.previousTab ||
+    BusyMarkAppShortcutAction.closeTab ||
+    BusyMarkAppShortcutAction.closeAllTabs => context.l10n.tabs,
+    BusyMarkAppShortcutAction.toggleSidebar =>
+      context.l10n.shortcutGroupSidebar,
+    _ => context.l10n.shortcutGroupGeneral,
+  };
+
+  static String _viewLabel(
+    BuildContext context,
+    BusyMarkDocumentViewShortcutAction action,
+  ) => switch (action) {
+    BusyMarkDocumentViewShortcutAction.editor => context.l10n.editor,
+    BusyMarkDocumentViewShortcutAction.source => context.l10n.source,
+    BusyMarkDocumentViewShortcutAction.reading => context.l10n.reading,
+    BusyMarkDocumentViewShortcutAction.split => context.l10n.split,
+  };
+
+  static String? _appDescription(
+    BuildContext context,
+    BusyMarkAppShortcutAction action,
+  ) => switch (action) {
+    BusyMarkAppShortcutAction.newDocument =>
+      context.l10n.shortcutNewDocumentDescription,
+    BusyMarkAppShortcutAction.open => context.l10n.shortcutOpenDescription,
+    BusyMarkAppShortcutAction.save => context.l10n.shortcutSaveDescription,
+    BusyMarkAppShortcutAction.exportPdf =>
+      context.l10n.shortcutExportPdfDescription,
+    BusyMarkAppShortcutAction.search => context.l10n.shortcutSearchDescription,
+    BusyMarkAppShortcutAction.keyboardShortcuts =>
+      context.l10n.shortcutKeyboardShortcutsDescription,
+    BusyMarkAppShortcutAction.markdownAndHtml =>
+      context.l10n.shortcutMarkdownAndHtmlDescription,
+    BusyMarkAppShortcutAction.settings =>
+      context.l10n.shortcutSettingsDescription,
+    BusyMarkAppShortcutAction.nextTab =>
+      context.l10n.shortcutNextTabDescription,
+    BusyMarkAppShortcutAction.previousTab =>
+      context.l10n.shortcutPreviousTabDescription,
+    BusyMarkAppShortcutAction.closeTab =>
+      context.l10n.shortcutCloseTabDescription,
+    BusyMarkAppShortcutAction.closeAllTabs =>
+      context.l10n.shortcutCloseAllTabsDescription,
+    _ => null,
+  };
+
+  static String _textLabel(
+    BuildContext context,
+    BusyMarkTextEditingShortcutAction action,
+  ) => switch (action) {
+    BusyMarkTextEditingShortcutAction.selectAll => context.l10n.selectAll,
+    BusyMarkTextEditingShortcutAction.cut => context.l10n.cut,
+    BusyMarkTextEditingShortcutAction.copy => context.l10n.copy,
+    BusyMarkTextEditingShortcutAction.paste => context.l10n.paste,
+    BusyMarkTextEditingShortcutAction.pastePlainText =>
+      context.l10n.pasteWithoutFormatting,
+    BusyMarkTextEditingShortcutAction.undo => context.l10n.undo,
+    BusyMarkTextEditingShortcutAction.redo => context.l10n.redo,
+    BusyMarkTextEditingShortcutAction.insertIndentation =>
+      context.l10n.shortcutInsertIndentation,
+    BusyMarkTextEditingShortcutAction.outdentSource =>
+      context.l10n.shortcutOutdentSource,
+    BusyMarkTextEditingShortcutAction.escape => context.l10n.shortcutEscape,
+  };
+
+  static String _editorLabel(
+    BuildContext context,
+    BusyMarkEditorShortcutAction action,
+  ) => switch (action) {
+    BusyMarkEditorShortcutAction.refineWithAi => context.l10n.aiRefineWithAi,
+    BusyMarkEditorShortcutAction.bold => context.l10n.bold,
+    BusyMarkEditorShortcutAction.italic => context.l10n.italic,
+    BusyMarkEditorShortcutAction.underline => context.l10n.underline,
+    BusyMarkEditorShortcutAction.strikethrough => context.l10n.strikethrough,
+    BusyMarkEditorShortcutAction.inlineCode => context.l10n.inlineCode,
+    BusyMarkEditorShortcutAction.link => context.l10n.link,
+    BusyMarkEditorShortcutAction.paragraph => context.l10n.paragraph,
+    BusyMarkEditorShortcutAction.heading1 => context.l10n.heading1,
+    BusyMarkEditorShortcutAction.heading2 => context.l10n.heading2,
+    BusyMarkEditorShortcutAction.heading3 => context.l10n.heading3,
+    BusyMarkEditorShortcutAction.heading4 => context.l10n.heading4,
+    BusyMarkEditorShortcutAction.heading5 => context.l10n.heading5,
+    BusyMarkEditorShortcutAction.heading6 => context.l10n.heading6,
+    BusyMarkEditorShortcutAction.orderedList => context.l10n.numberedList,
+    BusyMarkEditorShortcutAction.unorderedList => context.l10n.bulletedList,
+    BusyMarkEditorShortcutAction.taskList => context.l10n.checklist,
+    BusyMarkEditorShortcutAction.toggleTask => context.l10n.checklist,
+    BusyMarkEditorShortcutAction.indent => context.l10n.indentListItem,
+    BusyMarkEditorShortcutAction.outdent => context.l10n.outdentListItem,
+    BusyMarkEditorShortcutAction.blockquote => context.l10n.blockquote,
+    BusyMarkEditorShortcutAction.codeBlock => context.l10n.codeBlock,
+    BusyMarkEditorShortcutAction.codeBlockLanguage => context.l10n.language,
+    BusyMarkEditorShortcutAction.image => context.l10n.image,
+    BusyMarkEditorShortcutAction.inlineImage => context.l10n.inlineImage,
+    BusyMarkEditorShortcutAction.table => context.l10n.table,
+    BusyMarkEditorShortcutAction.htmlBlock => context.l10n.htmlBlock,
+    BusyMarkEditorShortcutAction.thematicBreak => context.l10n.thematicBreak,
+    BusyMarkEditorShortcutAction.hardLineBreak => context.l10n.hardLineBreak,
+    BusyMarkEditorShortcutAction.pastePlainText =>
+      context.l10n.pasteWithoutFormatting,
+  };
+
+  static String? _textDescription(
+    BuildContext context,
+    BusyMarkTextEditingShortcutAction action,
+  ) => switch (action) {
+    BusyMarkTextEditingShortcutAction.selectAll =>
+      context.l10n.shortcutSelectAllDescription,
+    BusyMarkTextEditingShortcutAction.cut =>
+      context.l10n.shortcutCutDescription,
+    BusyMarkTextEditingShortcutAction.copy =>
+      context.l10n.shortcutCopyDescription,
+    BusyMarkTextEditingShortcutAction.paste =>
+      context.l10n.shortcutPasteDescription,
+    BusyMarkTextEditingShortcutAction.pastePlainText =>
+      context.l10n.shortcutPastePlainTextDescription,
+    BusyMarkTextEditingShortcutAction.undo =>
+      context.l10n.shortcutUndoDescription,
+    BusyMarkTextEditingShortcutAction.redo =>
+      context.l10n.shortcutRedoDescription,
+    BusyMarkTextEditingShortcutAction.insertIndentation =>
+      context.l10n.shortcutInsertIndentationDescription,
+    BusyMarkTextEditingShortcutAction.outdentSource =>
+      context.l10n.shortcutOutdentSourceDescription,
+    BusyMarkTextEditingShortcutAction.escape =>
+      context.l10n.shortcutEscapeDescription,
+  };
+
+  static String? _editorDescription(
+    BuildContext context,
+    BusyMarkEditorShortcutAction action,
+  ) => switch (action) {
+    BusyMarkEditorShortcutAction.bold => context.l10n.shortcutBoldDescription,
+    BusyMarkEditorShortcutAction.italic =>
+      context.l10n.shortcutItalicDescription,
+    BusyMarkEditorShortcutAction.underline =>
+      context.l10n.shortcutUnderlineDescription,
+    BusyMarkEditorShortcutAction.link => context.l10n.shortcutLinkDescription,
+    BusyMarkEditorShortcutAction.inlineCode =>
+      context.l10n.shortcutInlineCodeDescription,
+    BusyMarkEditorShortcutAction.strikethrough =>
+      context.l10n.shortcutStrikethroughDescription,
+    BusyMarkEditorShortcutAction.paragraph =>
+      context.l10n.shortcutParagraphDescription,
+    BusyMarkEditorShortcutAction.heading1 =>
+      context.l10n.shortcutHeading1Description,
+    BusyMarkEditorShortcutAction.heading2 =>
+      context.l10n.shortcutHeading2Description,
+    BusyMarkEditorShortcutAction.heading3 =>
+      context.l10n.shortcutHeading3Description,
+    BusyMarkEditorShortcutAction.heading4 =>
+      context.l10n.shortcutHeading4Description,
+    BusyMarkEditorShortcutAction.heading5 =>
+      context.l10n.shortcutHeading5Description,
+    BusyMarkEditorShortcutAction.heading6 =>
+      context.l10n.shortcutHeading6Description,
+    BusyMarkEditorShortcutAction.orderedList =>
+      context.l10n.shortcutNumberedListDescription,
+    BusyMarkEditorShortcutAction.unorderedList =>
+      context.l10n.shortcutBulletedListDescription,
+    BusyMarkEditorShortcutAction.taskList =>
+      context.l10n.shortcutChecklistDescription,
+    _ => null,
+  };
+
+  static String _editorCategory(
+    BuildContext context,
+    BusyMarkEditorShortcutAction action,
+  ) => switch (action) {
+    BusyMarkEditorShortcutAction.bold ||
+    BusyMarkEditorShortcutAction.italic ||
+    BusyMarkEditorShortcutAction.underline ||
+    BusyMarkEditorShortcutAction.strikethrough ||
+    BusyMarkEditorShortcutAction.inlineCode ||
+    BusyMarkEditorShortcutAction.link => context.l10n.shortcutGroupFormatting,
+    BusyMarkEditorShortcutAction.orderedList ||
+    BusyMarkEditorShortcutAction.unorderedList ||
+    BusyMarkEditorShortcutAction.taskList ||
+    BusyMarkEditorShortcutAction.toggleTask ||
+    BusyMarkEditorShortcutAction.indent ||
+    BusyMarkEditorShortcutAction.outdent => context.l10n.shortcutGroupLists,
+    BusyMarkEditorShortcutAction.image ||
+    BusyMarkEditorShortcutAction.inlineImage ||
+    BusyMarkEditorShortcutAction.table ||
+    BusyMarkEditorShortcutAction.htmlBlock ||
+    BusyMarkEditorShortcutAction.thematicBreak ||
+    BusyMarkEditorShortcutAction.hardLineBreak => context.l10n.insert,
+    _ => context.l10n.shortcutGroupBlocks,
+  };
+
+  static String _sidebarLabel(
+    BuildContext context,
+    BusyMarkSidebarShortcutAction action,
+  ) => switch (action) {
+    BusyMarkSidebarShortcutAction.files => context.l10n.files,
+    BusyMarkSidebarShortcutAction.toc => context.l10n.toc,
+    BusyMarkSidebarShortcutAction.outline => context.l10n.outline,
+    BusyMarkSidebarShortcutAction.git => context.l10n.git,
+  };
+
+  static BuildContext? get _focusedContext =>
+      FocusManager.instance.primaryFocus?.context;
+
+  static bool _contextCommandAvailable(String commandId) {
+    final context = _focusedContext;
+    final action = context == null
+        ? null
+        : Actions.maybeFind<BusyMarkContextCommandIntent>(context);
+    return action?.isEnabled(BusyMarkContextCommandIntent(commandId)) ?? false;
+  }
+
+  static void _executeContextCommand(String commandId) {
+    final context = _focusedContext;
+    if (context != null) {
+      Actions.maybeInvoke(context, BusyMarkContextCommandIntent(commandId));
+    }
+  }
+}
diff --git a/lib/src/app/startup_path.dart b/lib/src/app/startup_path.dart
index 1832a0cd..57b1128f 100644
--- a/lib/src/app/startup_path.dart
+++ b/lib/src/app/startup_path.dart
@@ -1,3 +1,36 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 final startupPathProvider = Provider<String?>((ref) => null);
+
+/// Claims startup-only navigation work once for the lifetime of the app's
+/// provider container.
+///
+/// [WelcomeScreen] can be mounted again when the user deliberately returns to
+/// Welcome. Keeping these flags in widget state would make that navigation
+/// look like a new application startup and reopen the command-line path or
+/// previous session immediately.
+final startupNavigationGuardProvider = Provider<StartupNavigationGuard>(
+  (ref) => StartupNavigationGuard(),
+);
+
+class StartupNavigationGuard {
+  bool _startupPathClaimed = false;
+  bool _sessionRestoreClaimed = false;
+
+  bool claimStartupPath(String? path) {
+    if (_startupPathClaimed || path == null || path.isEmpty) {
+      return false;
+    }
+    _startupPathClaimed = true;
+    return true;
+  }
+
+  bool claimSessionRestore(String? startupPath) {
+    if (_sessionRestoreClaimed ||
+        (startupPath != null && startupPath.isNotEmpty)) {
+      return false;
+    }
+    _sessionRestoreClaimed = true;
+    return true;
+  }
+}
diff --git a/lib/src/app/window_control_service.dart b/lib/src/app/window_control_service.dart
index f1d5a93f..924aa0c5 100644
--- a/lib/src/app/window_control_service.dart
+++ b/lib/src/app/window_control_service.dart
@@ -130,11 +130,14 @@ class WindowControlService extends ChangeNotifier {
     required bool confirmCloseWithUnsavedChanges,
     required Future<WindowCloseAction?> Function() showCloseDialog,
     required Future<bool> Function() saveChanges,
+    Future<void> Function()? beforeClose,
+    Future<void> Function()? discardChanges,
   }) async {
     if (_closeInProgress) {
       return;
     }
     if (!hasUnsavedChanges || !confirmCloseWithUnsavedChanges) {
+      await beforeClose?.call();
       await closeWindow();
       return;
     }
@@ -142,9 +145,11 @@ class WindowControlService extends ChangeNotifier {
     final action = await showCloseDialog();
     switch (action) {
       case WindowCloseAction.discard:
+        await discardChanges?.call();
         await closeWindow();
       case WindowCloseAction.save:
         if (await saveChanges()) {
+          await beforeClose?.call();
           await closeWindow();
         } else {
           await _nativeWindow.setPreventClose(true);
diff --git a/lib/src/assets/asset_ingestion_service.dart b/lib/src/assets/asset_ingestion_service.dart
new file mode 100644
index 00000000..d5d6d7fb
--- /dev/null
+++ b/lib/src/assets/asset_ingestion_service.dart
@@ -0,0 +1,341 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:crypto/crypto.dart';
+import 'package:path/path.dart' as p;
+import 'package:xml/xml.dart' as xml;
+
+enum AssetIngestionOrigin {
+  imagePicker,
+  screenshotPaste,
+  clipboardImageFile,
+  dragAndDrop,
+}
+
+enum AssetWorkspaceKind { writerside, markdownWorkspace, standalone }
+
+class AssetIngestionException implements Exception {
+  const AssetIngestionException(this.code, this.message);
+
+  final String code;
+  final String message;
+
+  @override
+  String toString() => message;
+}
+
+class AssetSaveRequiredException extends AssetIngestionException {
+  const AssetSaveRequiredException()
+    : super(
+        'asset.document-save-required',
+        'Save the document before adding an image.',
+      );
+}
+
+class AssetIngestionRequest {
+  const AssetIngestionRequest({
+    required this.documentFilePath,
+    required this.workspaceKind,
+    this.workspaceRoot,
+    this.writersideRoot,
+    this.imagesDir = 'images',
+  });
+
+  final String documentFilePath;
+  final AssetWorkspaceKind workspaceKind;
+  final String? workspaceRoot;
+  final String? writersideRoot;
+  final String imagesDir;
+}
+
+class IngestedAsset {
+  const IngestedAsset({
+    required this.absolutePath,
+    required this.markdownPath,
+    required this.mimeType,
+    required this.reusedExisting,
+    required this.origin,
+  });
+
+  final String absolutePath;
+  final String markdownPath;
+  final String mimeType;
+  final bool reusedExisting;
+  final AssetIngestionOrigin origin;
+}
+
+class AssetIngestionService {
+  const AssetIngestionService({this.maximumAssetBytes = 100 * 1024 * 1024});
+
+  final int maximumAssetBytes;
+
+  Future<IngestedAsset> ingestFile({
+    required String sourcePath,
+    required AssetIngestionRequest request,
+    required AssetIngestionOrigin origin,
+  }) async {
+    final source = File(p.normalize(p.absolute(sourcePath)));
+    final stat = await source.stat();
+    if (stat.type != FileSystemEntityType.file) {
+      throw const AssetIngestionException(
+        'asset.source-not-file',
+        'The selected image is not a regular file.',
+      );
+    }
+    if (stat.size <= 0 || stat.size > maximumAssetBytes) {
+      throw const AssetIngestionException(
+        'asset.invalid-size',
+        'The image is empty or exceeds the supported size limit.',
+      );
+    }
+    return ingestBytes(
+      bytes: await source.readAsBytes(),
+      suggestedFileName: p.basename(source.path),
+      request: request,
+      origin: origin,
+    );
+  }
+
+  Future<IngestedAsset> ingestBytes({
+    required Uint8List bytes,
+    required String suggestedFileName,
+    required AssetIngestionRequest request,
+    required AssetIngestionOrigin origin,
+  }) async {
+    if (request.documentFilePath.trim().isEmpty) {
+      throw const AssetSaveRequiredException();
+    }
+    if (bytes.isEmpty || bytes.length > maximumAssetBytes) {
+      throw const AssetIngestionException(
+        'asset.invalid-size',
+        'The image is empty or exceeds the supported size limit.',
+      );
+    }
+    final imageType = _detectImageType(bytes);
+    if (imageType == null) {
+      throw const AssetIngestionException(
+        'asset.invalid-image-type',
+        'The selected file is not a supported PNG, JPEG, GIF, WebP, or SVG image.',
+      );
+    }
+    final destination = await _destinationDirectory(request);
+    final contentHash = sha256.convert(bytes).toString();
+    final existing = await _identicalAsset(
+      destination,
+      bytes.length,
+      contentHash,
+    );
+    late final File published;
+    var reused = existing != null;
+    if (existing != null) {
+      published = existing;
+    } else {
+      final stem = _safeStem(p.basenameWithoutExtension(suggestedFileName));
+      published = await _publishUnique(
+        destination,
+        stem: stem,
+        extension: imageType.extension,
+        bytes: bytes,
+      );
+      reused = false;
+    }
+    return IngestedAsset(
+      absolutePath: published.path,
+      markdownPath: p
+          .relative(published.path, from: p.dirname(request.documentFilePath))
+          .replaceAll(p.separator, '/'),
+      mimeType: imageType.mimeType,
+      reusedExisting: reused,
+      origin: origin,
+    );
+  }
+
+  Future<Directory> _destinationDirectory(AssetIngestionRequest request) async {
+    final documentPath = p.normalize(p.absolute(request.documentFilePath));
+    late final String allowedRootPath;
+    late final String destinationPath;
+    switch (request.workspaceKind) {
+      case AssetWorkspaceKind.writerside:
+        final writersideRoot = request.writersideRoot;
+        if (writersideRoot == null || writersideRoot.trim().isEmpty) {
+          throw const AssetIngestionException(
+            'asset.writerside-root-missing',
+            'The Writerside project image directory is unavailable.',
+          );
+        }
+        final relativeImagesDir = _safeRelativeDirectory(request.imagesDir);
+        allowedRootPath = p.normalize(p.absolute(writersideRoot));
+        destinationPath = p.join(allowedRootPath, relativeImagesDir);
+      case AssetWorkspaceKind.markdownWorkspace:
+        final workspaceRoot = request.workspaceRoot;
+        if (workspaceRoot == null || workspaceRoot.trim().isEmpty) {
+          throw const AssetIngestionException(
+            'asset.workspace-root-missing',
+            'The workspace image directory is unavailable.',
+          );
+        }
+        allowedRootPath = p.normalize(p.absolute(workspaceRoot));
+        destinationPath = p.join(allowedRootPath, 'images');
+      case AssetWorkspaceKind.standalone:
+        allowedRootPath = p.dirname(documentPath);
+        destinationPath = p.join(allowedRootPath, 'images');
+    }
+    final allowedRoot = Directory(allowedRootPath);
+    if (!await allowedRoot.exists()) {
+      throw const AssetIngestionException(
+        'asset.destination-root-missing',
+        'The document asset root no longer exists.',
+      );
+    }
+    final canonicalRoot = p.normalize(await allowedRoot.resolveSymbolicLinks());
+    final destination = Directory(destinationPath);
+    await destination.create(recursive: true);
+    final canonicalDestination = p.normalize(
+      await destination.resolveSymbolicLinks(),
+    );
+    if (!p.equals(canonicalRoot, canonicalDestination) &&
+        !p.isWithin(canonicalRoot, canonicalDestination)) {
+      throw const AssetIngestionException(
+        'asset.destination-outside-workspace',
+        'The configured image directory resolves outside the project.',
+      );
+    }
+    return Directory(canonicalDestination);
+  }
+
+  String _safeRelativeDirectory(String value) {
+    final normalized = p.normalize(value.trim());
+    if (normalized.isEmpty ||
+        normalized == '.' ||
+        p.isAbsolute(normalized) ||
+        normalized == '..' ||
+        normalized.startsWith('..${p.separator}')) {
+      throw const AssetIngestionException(
+        'asset.images-dir-invalid',
+        'The configured Writerside images directory is invalid.',
+      );
+    }
+    return normalized;
+  }
+
+  Future<File?> _identicalAsset(
+    Directory directory,
+    int size,
+    String expectedHash,
+  ) async {
+    var inspected = 0;
+    await for (final entity in directory.list(followLinks: false)) {
+      if (++inspected > 10000) {
+        break;
+      }
+      if (entity is! File) {
+        continue;
+      }
+      final stat = await entity.stat();
+      if (stat.size != size) {
+        continue;
+      }
+      final digest = sha256.convert(await entity.readAsBytes()).toString();
+      if (digest == expectedHash) {
+        return entity;
+      }
+    }
+    return null;
+  }
+
+  Future<File> _publishUnique(
+    Directory directory, {
+    required String stem,
+    required String extension,
+    required Uint8List bytes,
+  }) async {
+    var suffix = 1;
+    late File target;
+    while (true) {
+      final name = suffix == 1
+          ? '$stem.$extension'
+          : '$stem-$suffix.$extension';
+      target = File(p.join(directory.path, name));
+      if (!await target.exists()) {
+        break;
+      }
+      suffix++;
+    }
+    final staging = File(
+      p.join(
+        directory.path,
+        '.busymark-asset-$pid-${DateTime.now().microsecondsSinceEpoch}',
+      ),
+    );
+    try {
+      await staging.writeAsBytes(bytes, flush: true);
+      return await staging.rename(target.path);
+    } finally {
+      if (await staging.exists()) {
+        await staging.delete();
+      }
+    }
+  }
+
+  String _safeStem(String value) {
+    final sanitized = value
+        .replaceAll(RegExp(r'[^A-Za-z0-9._-]+'), '-')
+        .replaceAll(RegExp(r'-+'), '-')
+        .replaceAll(RegExp(r'^[.\-_]+|[.\-_]+$'), '');
+    if (sanitized.isEmpty) {
+      return 'image';
+    }
+    return sanitized.length <= 80 ? sanitized : sanitized.substring(0, 80);
+  }
+
+  _DetectedImageType? _detectImageType(Uint8List bytes) {
+    if (bytes.length >= 8 &&
+        bytes[0] == 0x89 &&
+        bytes[1] == 0x50 &&
+        bytes[2] == 0x4e &&
+        bytes[3] == 0x47 &&
+        bytes[4] == 0x0d &&
+        bytes[5] == 0x0a &&
+        bytes[6] == 0x1a &&
+        bytes[7] == 0x0a) {
+      return const _DetectedImageType('png', 'image/png');
+    }
+    if (bytes.length >= 3 &&
+        bytes[0] == 0xff &&
+        bytes[1] == 0xd8 &&
+        bytes[2] == 0xff) {
+      return const _DetectedImageType('jpg', 'image/jpeg');
+    }
+    if (bytes.length >= 6) {
+      final signature = ascii.decode(bytes.sublist(0, 6), allowInvalid: true);
+      if (signature == 'GIF87a' || signature == 'GIF89a') {
+        return const _DetectedImageType('gif', 'image/gif');
+      }
+    }
+    if (bytes.length >= 12 &&
+        ascii.decode(bytes.sublist(0, 4), allowInvalid: true) == 'RIFF' &&
+        ascii.decode(bytes.sublist(8, 12), allowInvalid: true) == 'WEBP') {
+      return const _DetectedImageType('webp', 'image/webp');
+    }
+    try {
+      final source = utf8.decode(bytes);
+      final document = xml.XmlDocument.parse(
+        source.startsWith('\uFEFF') ? source.substring(1) : source,
+      );
+      if (document.rootElement.name.local.toLowerCase() == 'svg') {
+        return const _DetectedImageType('svg', 'image/svg+xml');
+      }
+    } on Object {
+      // Binary or malformed XML is not SVG.
+    }
+    return null;
+  }
+}
+
+class _DetectedImageType {
+  const _DetectedImageType(this.extension, this.mimeType);
+
+  final String extension;
+  final String mimeType;
+}
diff --git a/lib/src/assets/asset_input_service.dart b/lib/src/assets/asset_input_service.dart
new file mode 100644
index 00000000..a657180f
--- /dev/null
+++ b/lib/src/assets/asset_input_service.dart
@@ -0,0 +1,57 @@
+import 'dart:async';
+import 'package:flutter/services.dart';
+
+class AssetInputService {
+  AssetInputService({
+    MethodChannel channel = const MethodChannel('com.busymark.app/asset_input'),
+  }) : _channel = channel {
+    _channel.setMethodCallHandler(_handleNativeCall);
+  }
+
+  final MethodChannel _channel;
+  final _droppedFiles = StreamController<List<String>>.broadcast();
+
+  Stream<List<String>> get droppedFiles => _droppedFiles.stream;
+
+  Future<List<String>> readClipboardImageFiles() async {
+    try {
+      final paths = await _channel.invokeListMethod<String>(
+        'readClipboardImageFiles',
+      );
+      return paths ?? const [];
+    } on MissingPluginException {
+      return const [];
+    } on PlatformException {
+      return const [];
+    }
+  }
+
+  Future<Uint8List?> readClipboardImagePng() async {
+    try {
+      return await _channel.invokeMethod<Uint8List>('readClipboardImagePng');
+    } on MissingPluginException {
+      return null;
+    } on PlatformException {
+      return null;
+    }
+  }
+
+  Future<void> _handleNativeCall(MethodCall call) async {
+    if (call.method != 'assetFilesDropped') {
+      throw MissingPluginException('Unknown asset input method ${call.method}');
+    }
+    final paths = (call.arguments as List?)?.whereType<String>().toList(
+      growable: false,
+    );
+    if (paths != null && paths.isNotEmpty && !_droppedFiles.isClosed) {
+      _droppedFiles.add(paths);
+    }
+  }
+
+  Future<void> dispose() async {
+    _channel.setMethodCallHandler(null);
+    await _droppedFiles.close();
+  }
+}
+
+final busyMarkAssetInputService = AssetInputService();
diff --git a/lib/src/core/diagnostic_localizations.dart b/lib/src/core/diagnostic_localizations.dart
index 5a5f8465..464c837f 100644
--- a/lib/src/core/diagnostic_localizations.dart
+++ b/lib/src/core/diagnostic_localizations.dart
@@ -61,7 +61,21 @@ String localizeDiagnostic(BuildContext context, Diagnostic diagnostic) {
     'markdown.image.missing-file' => l10n.diagnosticMarkdownImageMissingFile(
       value('destination'),
     ),
+    'writerside.video.missing-source' =>
+      l10n.diagnosticWritersideVideoMissingSource,
+    'writerside.video.unsupported-source' =>
+      l10n.diagnosticWritersideVideoUnsupportedSource(value('source')),
+    'writerside.video.missing-file' =>
+      l10n.diagnosticWritersideVideoMissingFile(value('source')),
+    'writerside.video.missing-preview' =>
+      l10n.diagnosticWritersideVideoMissingPreview(value('preview')),
     'markdown.table.empty-header' => l10n.diagnosticMarkdownTableEmptyHeader,
+    'math.invalidTex' ||
+    'math.resourceLimit' ||
+    'math.timeout' ||
+    'math.rendererUnavailable' ||
+    'math.unsafeOutput' ||
+    'math.cancelled' => l10n.mathRenderFailed,
     'writerside.config.invalid-xml' ||
     'writerside.build-profiles.invalid-xml' ||
     'writerside.instance-groups.invalid-xml' ||
diff --git a/lib/src/core/local_image_resolver.dart b/lib/src/core/local_image_resolver.dart
index 5ca43c9e..a6c884b0 100644
--- a/lib/src/core/local_image_resolver.dart
+++ b/lib/src/core/local_image_resolver.dart
@@ -14,6 +14,24 @@ String? resolveLocalImagePath({
   String? writersideRoot,
   String imagesDir = 'images',
   int maxRecursiveEntries = 10000,
+}) => resolveLocalMediaPath(
+  activeFilePath: activeFilePath,
+  destination: destination,
+  workspaceRoot: workspaceRoot,
+  writersideRoot: writersideRoot,
+  imagesDir: imagesDir,
+  maxRecursiveEntries: maxRecursiveEntries,
+);
+
+/// Resolves an authored local media reference inside the same roots used for
+/// Writerside images and videos.
+String? resolveLocalMediaPath({
+  required String activeFilePath,
+  required String destination,
+  String? workspaceRoot,
+  String? writersideRoot,
+  String imagesDir = 'images',
+  int maxRecursiveEntries = 10000,
 }) {
   final decoded = _decodeImageDestination(destination.trim());
   if (decoded.isEmpty) {
diff --git a/lib/src/editor/document_collapsible.dart b/lib/src/editor/document_collapsible.dart
new file mode 100644
index 00000000..8916da65
--- /dev/null
+++ b/lib/src/editor/document_collapsible.dart
@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+
+import '../app/busymark_design.dart';
+import '../app/busymark_glyphs.dart';
+import '../app/localization.dart';
+
+/// Shared Writerside collapsible presentation for Editor and Preview.
+class BusyMarkDocumentCollapsible extends StatefulWidget {
+  const BusyMarkDocumentCollapsible({
+    super.key,
+    required this.header,
+    required this.child,
+    required this.kindLabel,
+    this.initiallyExpanded = false,
+    this.framed = false,
+    this.toggleOnHeaderTap = true,
+    this.margin = const EdgeInsets.symmetric(vertical: BusyMarkSpacing.xs),
+  });
+
+  final Widget header;
+  final Widget child;
+  final String kindLabel;
+  final bool initiallyExpanded;
+  final bool framed;
+  final bool toggleOnHeaderTap;
+  final EdgeInsetsGeometry margin;
+
+  @override
+  State<BusyMarkDocumentCollapsible> createState() =>
+      _BusyMarkDocumentCollapsibleState();
+}
+
+class _BusyMarkDocumentCollapsibleState
+    extends State<BusyMarkDocumentCollapsible> {
+  late bool _expanded = widget.initiallyExpanded;
+
+  @override
+  void didUpdateWidget(BusyMarkDocumentCollapsible oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.initiallyExpanded != widget.initiallyExpanded) {
+      _expanded = widget.initiallyExpanded;
+    }
+  }
+
+  void _toggle() => setState(() => _expanded = !_expanded);
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    final tooltip = _expanded
+        ? context.l10n.collapseKind(widget.kindLabel)
+        : context.l10n.expandKind(widget.kindLabel);
+    final content = Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        _header(context, colors, tooltip),
+        if (_expanded) widget.child,
+      ],
+    );
+    if (!widget.framed) {
+      return Padding(padding: widget.margin, child: content);
+    }
+    return Container(
+      margin: widget.margin,
+      decoration: BoxDecoration(
+        color: colors.panel,
+        borderRadius: BorderRadius.circular(BusyMarkRadius.md),
+        border: Border.all(
+          color: colors.subtleBorder,
+          width: BusyMarkStroke.hairline,
+        ),
+      ),
+      child: content,
+    );
+  }
+
+  Widget _header(
+    BuildContext context,
+    BusyMarkSurfaceColors colors,
+    String tooltip,
+  ) {
+    final icon = _expanded
+        ? BusyMarkGlyphs.downArrow
+        : BusyMarkGlyphs.collapsedTreeArrowFor(Directionality.of(context));
+    final row = Padding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: BusyMarkSpacing.xs,
+        vertical: BusyMarkSpacing.xs,
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          if (widget.toggleOnHeaderTap)
+            Tooltip(
+              message: tooltip,
+              child: Icon(
+                icon,
+                size: BusyMarkSizes.iconSm,
+                color: colors.mutedForeground,
+              ),
+            )
+          else
+            IconButton(
+              tooltip: tooltip,
+              onPressed: _toggle,
+              icon: Icon(icon),
+              iconSize: BusyMarkSizes.iconSm,
+              visualDensity: VisualDensity.compact,
+            ),
+          const SizedBox(width: BusyMarkSpacing.sm),
+          Expanded(child: widget.header),
+        ],
+      ),
+    );
+    if (!widget.toggleOnHeaderTap) {
+      return row;
+    }
+    return Semantics(
+      button: true,
+      expanded: _expanded,
+      label: tooltip,
+      child: InkWell(
+        onTap: _toggle,
+        borderRadius: BorderRadius.circular(BusyMarkRadius.sm),
+        child: row,
+      ),
+    );
+  }
+}
diff --git a/lib/src/editor/document_text_geometry.dart b/lib/src/editor/document_text_geometry.dart
index d420ef73..ccccf67f 100644
--- a/lib/src/editor/document_text_geometry.dart
+++ b/lib/src/editor/document_text_geometry.dart
@@ -11,9 +11,9 @@ abstract final class BusyMarkDocumentTextGeometry {
   static const double editableLayoutInset =
       editableCaretGap + editableCursorWidth;
 
-  /// Matches Flutter's native-platform `EditableText` selection geometry.
-  static const BoxHeightStyle selectionHeightStyle =
-      BoxHeightStyle.includeLineSpacingMiddle;
+  /// Uses the complete text strut so selection has balanced breathing room
+  /// above capitals and below descenders in both Source and Editor views.
+  static const BoxHeightStyle selectionHeightStyle = BoxHeightStyle.strut;
   static const BoxWidthStyle selectionWidthStyle = BoxWidthStyle.tight;
   static const double fallbackSelectionAlpha = 0.40;
 }
diff --git a/lib/src/editor/editor_text_context_menu.dart b/lib/src/editor/editor_text_context_menu.dart
index 8f8afc74..a3e6380b 100644
--- a/lib/src/editor/editor_text_context_menu.dart
+++ b/lib/src/editor/editor_text_context_menu.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 
 import '../app/busymark_design.dart';
 import '../app/busymark_glyphs.dart';
-import '../app/busymark_shortcuts.dart';
+import '../app/command_registry.dart';
 
 Widget buildBusyMarkEditorTextContextMenu(
   BuildContext context,
@@ -86,15 +86,27 @@ class _BusyMarkEditorTextContextMenuState
 
   List<PopupMenuEntry<VoidCallback>> _menuItems(BuildContext context) {
     final editable = widget.editableTextState;
+    final commands =
+        BusyMarkCommandRegistryScope.maybeOf(context) ??
+        BusyMarkCommandCatalog.metadata;
     final items = <PopupMenuEntry<VoidCallback>>[
-      for (final item in editable.contextMenuButtonItems)
-        BusyMarkPopupMenuItem<VoidCallback>(
-          value: item.onPressed ?? () {},
-          label: AdaptiveTextSelectionToolbar.getButtonLabel(context, item),
-          icon: _iconFor(item.type),
-          shortcut: _shortcutFor(item.type),
-          enabled: item.onPressed != null,
-        ),
+      for (final item in editable.contextMenuButtonItems) ...[
+        if (_commandIdFor(item.type) case final commandId?)
+          BusyMarkPopupMenuItem<VoidCallback>(
+            value: item.onPressed ?? () {},
+            label: commands[commandId]!.label(context),
+            icon: _iconFor(item.type),
+            shortcut: commands[commandId]!.shortcut?.label,
+            enabled: item.onPressed != null,
+          )
+        else
+          BusyMarkPopupMenuItem<VoidCallback>(
+            value: item.onPressed ?? () {},
+            label: AdaptiveTextSelectionToolbar.getButtonLabel(context, item),
+            icon: _iconFor(item.type),
+            enabled: item.onPressed != null,
+          ),
+      ],
     ];
     final selection = editable.textEditingValue.selection;
     final refineWithAi = widget.onRefineWithAi;
@@ -102,9 +114,12 @@ class _BusyMarkEditorTextContextMenuState
       items.add(
         BusyMarkPopupMenuItem<VoidCallback>(
           value: refineWithAi,
-          label: widget.refineWithAiLabel,
+          label:
+              commands[BusyMarkCommandIds.editorRefineWithAi]?.label(context) ??
+              widget.refineWithAiLabel,
           icon: BusyMarkGlyphs.ai,
-          shortcut: BusyMarkEditorShortcutLabels.refineWithAi,
+          shortcut:
+              commands[BusyMarkCommandIds.editorRefineWithAi]?.shortcut?.label,
         ),
       );
     }
@@ -127,14 +142,13 @@ IconData? _iconFor(ContextMenuButtonType type) {
   };
 }
 
-String? _shortcutFor(ContextMenuButtonType type) {
+String? _commandIdFor(ContextMenuButtonType type) {
   return switch (type) {
-    ContextMenuButtonType.cut => BusyMarkTextEditingShortcutLabels.cut,
-    ContextMenuButtonType.copy => BusyMarkTextEditingShortcutLabels.copy,
-    ContextMenuButtonType.paste => BusyMarkTextEditingShortcutLabels.paste,
-    ContextMenuButtonType.selectAll =>
-      BusyMarkTextEditingShortcutLabels.selectAll,
-    ContextMenuButtonType.delete => 'Delete',
+    ContextMenuButtonType.cut => BusyMarkCommandIds.textCut,
+    ContextMenuButtonType.copy => BusyMarkCommandIds.textCopy,
+    ContextMenuButtonType.paste => BusyMarkCommandIds.textPaste,
+    ContextMenuButtonType.selectAll => BusyMarkCommandIds.textSelectAll,
+    ContextMenuButtonType.delete => null,
     ContextMenuButtonType.lookUp ||
     ContextMenuButtonType.searchWeb ||
     ContextMenuButtonType.share ||
diff --git a/lib/src/editor/source/source_editor.dart b/lib/src/editor/source/source_editor.dart
index 73146e6e..8bb88eb4 100644
--- a/lib/src/editor/source/source_editor.dart
+++ b/lib/src/editor/source/source_editor.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:math' as math;
-import 'dart:ui' show BoxHeightStyle, BoxWidthStyle, FontFeature;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -8,9 +7,14 @@ import 'package:yaru/yaru.dart';
 
 import '../../ai/ai_models.dart';
 import '../../app/busymark_design.dart';
+import '../../app/busymark_glyphs.dart';
 import '../../app/busymark_shortcuts.dart';
+import '../../app/busymark_toast.dart';
+import '../../app/command_registry.dart';
 import '../../app/localization.dart';
 import '../../core/diagnostic.dart';
+import '../../search/search_replace_service.dart';
+import '../document_text_geometry.dart';
 import '../editor_text_context_menu.dart';
 import '../source_folding.dart';
 import 'source_commands.dart';
@@ -22,41 +26,66 @@ import 'source_search.dart';
 typedef BusyMarkSourceChanged =
     void Function(String fullText, String? sourceFilePath);
 
+typedef BusyMarkSourceSessionChanged =
+    void Function(
+      TextSelection selection,
+      double scrollOffset,
+      Set<String> foldedRegionKeys,
+    );
+
 class BusyMarkSourceEditor extends StatefulWidget {
   const BusyMarkSourceEditor({
     super.key,
     required this.text,
     required this.language,
     required this.filePath,
+    this.documentId,
     required this.diagnostics,
     required this.editorFontSize,
     required this.wordWrap,
     required this.searchActive,
     required this.searchOptions,
     required this.onSearchOptionsChanged,
+    this.searchReplacement = '',
+    this.onSearchReplacementChanged,
     required this.onChanged,
+    this.onUndo,
+    this.onRedo,
     required this.onOpenSearch,
     required this.onCloseSearch,
     this.onVisibleLineChanged,
     this.onAiEdit,
     this.editRevision = 0,
+    this.initialSelection,
+    this.initialScrollOffset = 0,
+    this.initialFoldedRegionKeys = const {},
+    this.onSessionChanged,
   });
 
   final String text;
   final SourceSyntaxLanguage language;
   final String? filePath;
+  final String? documentId;
   final Iterable<Diagnostic> diagnostics;
   final double editorFontSize;
   final bool wordWrap;
   final bool searchActive;
   final SourceSearchOptions searchOptions;
   final ValueChanged<SourceSearchOptions> onSearchOptionsChanged;
+  final String searchReplacement;
+  final ValueChanged<String>? onSearchReplacementChanged;
   final BusyMarkSourceChanged onChanged;
+  final String? Function()? onUndo;
+  final String? Function()? onRedo;
   final VoidCallback onOpenSearch;
   final VoidCallback onCloseSearch;
   final ValueChanged<int?>? onVisibleLineChanged;
   final BusyMarkAiEditCallback? onAiEdit;
   final int editRevision;
+  final TextSelection? initialSelection;
+  final double initialScrollOffset;
+  final Set<String> initialFoldedRegionKeys;
+  final BusyMarkSourceSessionChanged? onSessionChanged;
 
   @override
   State<BusyMarkSourceEditor> createState() => BusyMarkSourceEditorState();
@@ -70,6 +99,7 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
   final _sourceEditorKey = GlobalKey();
   final _foldedRegionKeys = <String>{};
   final _searchController = SourceSearchController();
+  final _replacementService = const SearchReplacementService();
   final _lineLayoutCache = SourceLineLayoutCache();
   List<SourceFoldRegion> _foldRegions = const [];
   String _lastPath = '';
@@ -84,29 +114,37 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
     _focusNode = FocusNode(onKeyEvent: _handleKeyEvent);
     _scrollController = ScrollController();
     _undoController = UndoHistoryController();
-    _lastPath = widget.filePath ?? '';
+    _lastPath = widget.documentId ?? widget.filePath ?? '';
     _recomputeFoldRegions(resetCollapsed: true);
+    _restoreSessionState();
     _syncSearchOptions();
+    _controller.addListener(_publishSessionState);
+    _scrollController.addListener(_publishSessionState);
   }
 
   @override
   void didUpdateWidget(covariant BusyMarkSourceEditor oldWidget) {
     super.didUpdateWidget(oldWidget);
-    final path = widget.filePath ?? '';
+    final path = widget.documentId ?? widget.filePath ?? '';
     final pathChanged = path != _lastPath;
     final languageChanged = widget.language != oldWidget.language;
     if (pathChanged) {
       _lastPath = path;
       _foldedRegionKeys.clear();
-      _replaceController(text: widget.text, language: widget.language);
-      _recomputeFoldRegions(resetCollapsed: true);
+      _withoutSessionPublication(() {
+        _replaceController(text: widget.text, language: widget.language);
+        _recomputeFoldRegions(resetCollapsed: true);
+        _restoreSessionState();
+      });
     } else if ((widget.text != oldWidget.text && !_focusNode.hasFocus) ||
         languageChanged) {
-      _controller.replaceFullTextAndLanguage(
-        text: widget.text,
-        language: widget.language,
-      );
-      _recomputeFoldRegions(resetCollapsed: languageChanged);
+      _withoutSessionPublication(() {
+        _controller.replaceFullTextAndLanguage(
+          text: widget.text,
+          language: widget.language,
+        );
+        _recomputeFoldRegions(resetCollapsed: languageChanged);
+      });
     }
     if (widget.searchActive != oldWidget.searchActive ||
         widget.searchOptions != oldWidget.searchOptions ||
@@ -175,18 +213,45 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
     }
     final keyboard = HardwareKeyboard.instance;
     final key = event.logicalKey;
-    if (BusyMarkAppShortcutActivators.search.accepts(event, keyboard)) {
+    final commands =
+        BusyMarkCommandRegistryScope.read(context) ??
+        BusyMarkCommandCatalog.metadata;
+    if (commands.shortcutAccepts(BusyMarkCommandIds.search, event, keyboard)) {
       widget.onOpenSearch();
       return KeyEventResult.handled;
     }
-    if (BusyMarkTextEditingShortcutActivators.insertIndentation.accepts(
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textUndo,
+      event,
+      keyboard,
+    )) {
+      final text = widget.onUndo?.call();
+      if (text != null) {
+        _applyOwnedUndoText(text);
+        return KeyEventResult.handled;
+      }
+    }
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textRedo,
+      event,
+      keyboard,
+    )) {
+      final text = widget.onRedo?.call();
+      if (text != null) {
+        _applyOwnedUndoText(text);
+        return KeyEventResult.handled;
+      }
+    }
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textInsertIndentation,
       event,
       keyboard,
     )) {
       _insertTab();
       return KeyEventResult.handled;
     }
-    if (BusyMarkTextEditingShortcutActivators.outdentSource.accepts(
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textOutdentSource,
       event,
       keyboard,
     )) {
@@ -197,14 +262,24 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
       _applyFullEditingValue(SourceCommands.smartEnter(_fullEditingValue()));
       return KeyEventResult.handled;
     }
-    if (BusyMarkTextEditingShortcutActivators.escape.accepts(event, keyboard)) {
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textEscape,
+      event,
+      keyboard,
+    )) {
       widget.onCloseSearch();
       return KeyEventResult.handled;
     }
-    final shortcutAction = BusyMarkEditorShortcutActivators.actionForKeyEvent(
+    final commandId = commands.matchingCommandId(
       event,
       keyboard,
+      scope: BusyMarkCommandScope.editor,
     );
+    final shortcutAction = commandId == null
+        ? null
+        : BusyMarkEditorShortcutAction.values
+              .where((action) => commandId == 'editor.${action.name}')
+              .firstOrNull;
     if (shortcutAction != null) {
       if (shortcutAction == BusyMarkEditorShortcutAction.refineWithAi &&
           !_canRefineWithAi) {
@@ -250,13 +325,36 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
               child: SizedBox(
                 key: _sourceEditorKey,
                 child: KeyedSubtree(
-                  key: ValueKey(widget.filePath),
+                  key: ValueKey(widget.documentId ?? widget.filePath),
                   child: Shortcuts(
-                    shortcuts: BusyMarkEditorShortcutActivators.intentMap(
-                      _SourceEditorShortcutIntent.new,
-                    ),
+                    shortcuts:
+                        (BusyMarkCommandRegistryScope.maybeOf(context) ??
+                                BusyMarkCommandCatalog.metadata)
+                            .shortcutIntents(
+                              scopes: const {BusyMarkCommandScope.editor},
+                              intentFor: BusyMarkContextCommandIntent.new,
+                            ),
                     child: Actions(
                       actions: {
+                        BusyMarkContextCommandIntent:
+                            BusyMarkContextCommandAction(
+                              isCommandEnabled: (commandId) =>
+                                  commandId.startsWith('editor.'),
+                              onCommand: (commandId) {
+                                final name = commandId.substring(
+                                  'editor.'.length,
+                                );
+                                final action = BusyMarkEditorShortcutAction
+                                    .values
+                                    .where(
+                                      (candidate) => candidate.name == name,
+                                    )
+                                    .firstOrNull;
+                                if (action != null) {
+                                  _applyShortcutAction(action);
+                                }
+                              },
+                            ),
                         _SourceEditorShortcutIntent:
                             CallbackAction<_SourceEditorShortcutIntent>(
                               onInvoke: (intent) {
@@ -285,8 +383,10 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
                           textAlignVertical: TextAlignVertical.top,
                           style: _sourceTextStyle,
                           strutStyle: sourceStrutStyle,
-                          selectionHeightStyle: BoxHeightStyle.strut,
-                          selectionWidthStyle: BoxWidthStyle.tight,
+                          selectionHeightStyle:
+                              BusyMarkDocumentTextGeometry.selectionHeightStyle,
+                          selectionWidthStyle:
+                              BusyMarkDocumentTextGeometry.selectionWidthStyle,
                           cursorColor: colors.foreground.withValues(
                             alpha: BusyMarkAlpha.sourceCursor,
                           ),
@@ -352,6 +452,13 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
                     regex: !widget.searchOptions.regex,
                   ),
                 ),
+                replacement: widget.searchReplacement,
+                onReplacementChanged:
+                    widget.onSearchReplacementChanged ?? (_) {},
+                onReplaceCurrent: _replaceCurrentSearchMatch,
+                onReplaceAndFindNext: () =>
+                    _replaceCurrentSearchMatch(findNext: true),
+                onReplaceAll: _replaceAllSearchMatches,
                 onClose: widget.onCloseSearch,
               ),
             ),
@@ -408,9 +515,11 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
       return;
     }
     if (_controller.fullText != originalText) {
-      ScaffoldMessenger.of(
+      BusyMarkToastOverlay.show(
         context,
-      ).showSnackBar(SnackBar(content: Text(context.l10n.aiStaleProposal)));
+        message: context.l10n.aiStaleProposal,
+        priority: BusyMarkToastPriority.high,
+      );
       return;
     }
     final replacement = result.replacement;
@@ -470,6 +579,74 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
     _revealSearchMatch(match);
   }
 
+  void _replaceCurrentSearchMatch({bool findNext = false}) {
+    if (_searchController.result.invalidRegex) {
+      return;
+    }
+    var currentIndex = _searchController.result.currentMatchIndex;
+    if (currentIndex == null) {
+      _searchController.next(_controller.document);
+      currentIndex = _searchController.result.currentMatchIndex;
+    }
+    if (currentIndex == null) {
+      return;
+    }
+    final preview = _replacementService.previewText(
+      source: _controller.fullText,
+      options: widget.searchOptions,
+      replacement: widget.searchReplacement,
+    );
+    if (preview.invalidRegex || currentIndex >= preview.matches.length) {
+      return;
+    }
+    final match = preview.matches[currentIndex];
+    final nextText = preview.source.replaceRange(
+      match.start,
+      match.end,
+      match.replacement,
+    );
+    _applyFullEditingValue(
+      TextEditingValue(
+        text: nextText,
+        selection: TextSelection(
+          baseOffset: match.start,
+          extentOffset: match.start + match.replacement.length,
+        ),
+      ),
+    );
+    _refreshSearch(
+      currentIndex: math.min(
+        currentIndex,
+        math.max(0, preview.matches.length - 2),
+      ),
+    );
+    if (findNext) {
+      _nextSearchMatch();
+    }
+  }
+
+  void _replaceAllSearchMatches() {
+    final preview = _replacementService.previewText(
+      source: _controller.fullText,
+      options: widget.searchOptions,
+      replacement: widget.searchReplacement,
+    );
+    if (preview.invalidRegex || preview.matches.isEmpty) {
+      return;
+    }
+    final nextText = preview.apply();
+    final selectionOffset = _controller.fullSelection.extentOffset
+        .clamp(0, nextText.length)
+        .toInt();
+    _applyFullEditingValue(
+      TextEditingValue(
+        text: nextText,
+        selection: TextSelection.collapsed(offset: selectionOffset),
+      ),
+    );
+    _refreshSearch();
+  }
+
   void _revealSearchMatch(SourceSearchMatch? initialMatch) {
     var match = initialMatch;
     if (match == null) {
@@ -547,6 +724,7 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
       _applyFoldedRegions();
       _refreshSearch(currentIndex: _searchController.result.currentMatchIndex);
     });
+    _publishSessionState();
   }
 
   void _unfoldSourceLine(int line) {
@@ -592,6 +770,59 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
       _refreshSearch(currentIndex: _searchController.result.currentMatchIndex);
     });
     widget.onChanged(_controller.fullText, widget.filePath);
+    _publishSessionState();
+  }
+
+  void _restoreSessionState() {
+    final validKeys = {for (final region in _foldRegions) region.key};
+    _foldedRegionKeys
+      ..clear()
+      ..addAll(widget.initialFoldedRegionKeys.where(validKeys.contains));
+    _applyFoldedRegions();
+    final selection = widget.initialSelection;
+    if (selection != null) {
+      _controller.fullSelection = TextSelection(
+        baseOffset: selection.baseOffset
+            .clamp(0, _controller.fullText.length)
+            .toInt(),
+        extentOffset: selection.extentOffset
+            .clamp(0, _controller.fullText.length)
+            .toInt(),
+      );
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted || !_scrollController.hasClients) {
+        return;
+      }
+      _scrollController.jumpTo(
+        widget.initialScrollOffset
+            .clamp(0, _scrollController.position.maxScrollExtent)
+            .toDouble(),
+      );
+    });
+  }
+
+  void _publishSessionState() {
+    if (_suppressSessionPublication) {
+      return;
+    }
+    widget.onSessionChanged?.call(
+      _controller.fullSelection,
+      _scrollController.hasClients ? _scrollController.offset : 0,
+      Set.unmodifiable(_foldedRegionKeys),
+    );
+  }
+
+  bool _suppressSessionPublication = false;
+
+  void _withoutSessionPublication(VoidCallback callback) {
+    final wasSuppressed = _suppressSessionPublication;
+    _suppressSessionPublication = true;
+    try {
+      callback();
+    } finally {
+      _suppressSessionPublication = wasSuppressed;
+    }
   }
 
   TextEditingValue _fullEditingValue() {
@@ -607,6 +838,16 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
     _handleSourceChanged();
   }
 
+  void _applyOwnedUndoText(String text) {
+    _controller.replaceFullTextAndLanguage(
+      text: text,
+      language: widget.language,
+    );
+    _recomputeFoldRegions();
+    _refreshSearch();
+    setState(() {});
+  }
+
   void _applyShortcutAction(BusyMarkEditorShortcutAction action) {
     switch (action) {
       case BusyMarkEditorShortcutAction.refineWithAi:
@@ -803,6 +1044,7 @@ class BusyMarkSourceEditorState extends State<BusyMarkSourceEditor> {
   }) {
     final previous = _controller;
     _controller = BusyMarkSourceController(text: text, language: language);
+    _controller.addListener(_publishSessionState);
     _resetUndoHistory();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       previous.dispose();
@@ -1258,7 +1500,7 @@ class _CollapsedSourceLine extends StatelessWidget {
   }
 }
 
-class _SourceSearchPanel extends StatelessWidget {
+class _SourceSearchPanel extends StatefulWidget {
   const _SourceSearchPanel({
     required this.result,
     required this.onPrevious,
@@ -1266,6 +1508,11 @@ class _SourceSearchPanel extends StatelessWidget {
     required this.onToggleCaseSensitive,
     required this.onToggleWholeWord,
     required this.onToggleRegex,
+    required this.replacement,
+    required this.onReplacementChanged,
+    required this.onReplaceCurrent,
+    required this.onReplaceAndFindNext,
+    required this.onReplaceAll,
     required this.onClose,
   });
 
@@ -1275,11 +1522,45 @@ class _SourceSearchPanel extends StatelessWidget {
   final VoidCallback onToggleCaseSensitive;
   final VoidCallback onToggleWholeWord;
   final VoidCallback onToggleRegex;
+  final String replacement;
+  final ValueChanged<String> onReplacementChanged;
+  final VoidCallback onReplaceCurrent;
+  final VoidCallback onReplaceAndFindNext;
+  final VoidCallback onReplaceAll;
   final VoidCallback onClose;
 
+  @override
+  State<_SourceSearchPanel> createState() => _SourceSearchPanelState();
+}
+
+class _SourceSearchPanelState extends State<_SourceSearchPanel> {
+  late final TextEditingController _replacementController;
+
+  @override
+  void initState() {
+    super.initState();
+    _replacementController = TextEditingController(text: widget.replacement);
+  }
+
+  @override
+  void didUpdateWidget(covariant _SourceSearchPanel oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.replacement != oldWidget.replacement &&
+        widget.replacement != _replacementController.text) {
+      _replacementController.text = widget.replacement;
+    }
+  }
+
+  @override
+  void dispose() {
+    _replacementController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final colors = BusyMarkSurfaceColors.of(context);
+    final result = widget.result;
     final status = result.invalidRegex
         ? context.l10n.sourceSearchInvalidRegex
         : result.totalMatchCount == 0
@@ -1292,54 +1573,106 @@ class _SourceSearchPanel extends StatelessWidget {
           horizontal: BusyMarkSpacing.xs,
           vertical: BusyMarkSpacing.xxs,
         ),
-        child: Row(
+        child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            Text(
-              status,
-              textDirection: result.invalidRegex
-                  ? Directionality.of(context)
-                  : TextDirection.ltr,
-              style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                color: result.invalidRegex
-                    ? Theme.of(context).colorScheme.error
-                    : colors.mutedForeground,
-                fontFeatures: const [FontFeature.tabularFigures()],
-              ),
-            ),
-            const SizedBox(width: BusyMarkSpacing.xs),
-            _SearchPanelIconButton(
-              tooltip: context.l10n.sourceSearchPreviousMatch,
-              icon: YaruIcons.pan_up,
-              onPressed: result.totalMatchCount == 0 ? null : onPrevious,
-            ),
-            _SearchPanelIconButton(
-              tooltip: context.l10n.sourceSearchNextMatch,
-              icon: YaruIcons.pan_down,
-              onPressed: result.totalMatchCount == 0 ? null : onNext,
-            ),
-            _SearchOptionButton(
-              label: 'Aa',
-              tooltip: context.l10n.sourceSearchCaseSensitive,
-              selected: result.options.caseSensitive,
-              onPressed: onToggleCaseSensitive,
-            ),
-            _SearchOptionButton(
-              label: 'W',
-              tooltip: context.l10n.sourceSearchWholeWord,
-              selected: result.options.wholeWord,
-              onPressed: onToggleWholeWord,
-            ),
-            _SearchOptionButton(
-              label: '.*',
-              tooltip: context.l10n.sourceSearchRegex,
-              selected: result.options.regex,
-              onPressed: onToggleRegex,
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  status,
+                  textDirection: result.invalidRegex
+                      ? Directionality.of(context)
+                      : TextDirection.ltr,
+                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                    color: result.invalidRegex
+                        ? Theme.of(context).colorScheme.error
+                        : colors.mutedForeground,
+                    fontFeatures: const [FontFeature.tabularFigures()],
+                  ),
+                ),
+                const SizedBox(width: BusyMarkSpacing.xs),
+                _SearchPanelIconButton(
+                  tooltip: context.l10n.sourceSearchPreviousMatch,
+                  icon: YaruIcons.pan_up,
+                  onPressed: result.totalMatchCount == 0
+                      ? null
+                      : widget.onPrevious,
+                ),
+                _SearchPanelIconButton(
+                  tooltip: context.l10n.sourceSearchNextMatch,
+                  icon: YaruIcons.pan_down,
+                  onPressed: result.totalMatchCount == 0 ? null : widget.onNext,
+                ),
+                _SearchOptionButton(
+                  label: 'Aa',
+                  tooltip: context.l10n.sourceSearchCaseSensitive,
+                  selected: result.options.caseSensitive,
+                  onPressed: widget.onToggleCaseSensitive,
+                ),
+                _SearchOptionButton(
+                  label: 'W',
+                  tooltip: context.l10n.sourceSearchWholeWord,
+                  selected: result.options.wholeWord,
+                  onPressed: widget.onToggleWholeWord,
+                ),
+                _SearchOptionButton(
+                  label: '.*',
+                  tooltip: context.l10n.sourceSearchRegex,
+                  selected: result.options.regex,
+                  onPressed: widget.onToggleRegex,
+                ),
+                _SearchPanelIconButton(
+                  tooltip: context.l10n.close,
+                  icon: YaruIcons.window_close,
+                  onPressed: widget.onClose,
+                ),
+              ],
             ),
-            _SearchPanelIconButton(
-              tooltip: context.l10n.close,
-              icon: YaruIcons.window_close,
-              onPressed: onClose,
+            const SizedBox(height: BusyMarkSpacing.xxs),
+            SizedBox(
+              width: 410,
+              height: 30,
+              child: Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      key: const ValueKey('source-search-replacement'),
+                      controller: _replacementController,
+                      onChanged: widget.onReplacementChanged,
+                      decoration: InputDecoration(
+                        isDense: true,
+                        hintText: context.l10n.sourceSearchReplacement,
+                        contentPadding: const EdgeInsets.symmetric(
+                          horizontal: BusyMarkSpacing.sm,
+                          vertical: BusyMarkSpacing.xs,
+                        ),
+                      ),
+                    ),
+                  ),
+                  _SearchPanelIconButton(
+                    tooltip: context.l10n.sourceSearchReplaceCurrent,
+                    icon: BusyMarkGlyphs.edit,
+                    onPressed: result.totalMatchCount == 0
+                        ? null
+                        : widget.onReplaceCurrent,
+                  ),
+                  _SearchPanelIconButton(
+                    tooltip: context.l10n.sourceSearchReplaceAndFindNext,
+                    icon: BusyMarkGlyphs.forwardFor(Directionality.of(context)),
+                    onPressed: result.totalMatchCount == 0
+                        ? null
+                        : widget.onReplaceAndFindNext,
+                  ),
+                  _SearchPanelIconButton(
+                    tooltip: context.l10n.sourceSearchReplaceAll,
+                    icon: BusyMarkGlyphs.searchUnavailable,
+                    onPressed: result.totalMatchCount == 0
+                        ? null
+                        : widget.onReplaceAll,
+                  ),
+                ],
+              ),
             ),
           ],
         ),
diff --git a/lib/src/editor/source_highlighter.dart b/lib/src/editor/source_highlighter.dart
index b24a1455..4e9d4654 100644
--- a/lib/src/editor/source_highlighter.dart
+++ b/lib/src/editor/source_highlighter.dart
@@ -528,6 +528,7 @@ List<TextSpan> _highlightMarkdown(
   MarkdownFence? openFence;
   var fenceLanguage = '';
   var inFrontMatter = source.startsWith('---\n') || source == '---';
+  var inDisplayMath = false;
 
   for (final line in source.split('\n')) {
     final lineStart = offset;
@@ -548,6 +549,20 @@ List<TextSpan> _highlightMarkdown(
       continue;
     }
 
+    if (inDisplayMath) {
+      _addRange(
+        ranges,
+        lineStart,
+        lineEnd,
+        baseStyle.copyWith(color: palette.literal),
+      );
+      if (line.trimRight().endsWith(r'$$')) {
+        inDisplayMath = false;
+      }
+      offset = lineEnd + 1;
+      continue;
+    }
+
     final activeFence = openFence;
     if (activeFence != null) {
       if (!activeFence.closes(line)) {
@@ -595,6 +610,20 @@ List<TextSpan> _highlightMarkdown(
       continue;
     }
 
+    final displayStart = RegExp(r'^\s{0,3}\$\$').firstMatch(line);
+    if (displayStart != null) {
+      _addRange(
+        ranges,
+        lineStart,
+        lineEnd,
+        baseStyle.copyWith(color: palette.literal),
+      );
+      final remainder = line.substring(displayStart.end);
+      inDisplayMath = !remainder.contains(r'$$');
+      offset = lineEnd + 1;
+      continue;
+    }
+
     final heading = _markdownHeadingPattern.firstMatch(line);
     if (heading != null) {
       final marker = heading.group(1)!;
@@ -667,6 +696,13 @@ List<TextSpan> _highlightMarkdown(
       closingLength: 1,
       markerStyle: inlineMarkerStyle,
     );
+    _addMarkdownInlineMathRanges(
+      ranges,
+      lineStart,
+      line,
+      baseStyle.copyWith(color: palette.literal),
+      inlineMarkerStyle,
+    );
     _addLinkLabelMatches(
       ranges,
       lineStart,
@@ -744,6 +780,84 @@ List<TextSpan> _highlightMarkdown(
   );
 }
 
+void _addMarkdownInlineMathRanges(
+  List<_HighlightRange> ranges,
+  int lineStart,
+  String line,
+  TextStyle expressionStyle,
+  TextStyle markerStyle,
+) {
+  var index = 0;
+  while (index < line.length) {
+    final start = line.indexOf(r'$', index);
+    if (start < 0) return;
+    final globalStart = lineStart + start;
+    if (_isEscapedAt(line, start) ||
+        _positionInsideRange(ranges, globalStart) ||
+        (start + 1 < line.length && line[start + 1] == r'$')) {
+      index = start + 1;
+      continue;
+    }
+    final github = start + 1 < line.length && line[start + 1] == '`';
+    final closeToken = github ? '`\$' : r'$';
+    var close = line.indexOf(closeToken, start + (github ? 2 : 1));
+    while (close >= 0 && !github && _isEscapedAt(line, close)) {
+      close = line.indexOf(closeToken, close + 1);
+    }
+    if (close < 0 || close == start + 1) {
+      index = start + 1;
+      continue;
+    }
+    final end = close + closeToken.length;
+    if ((!github && _positionInsideRange(ranges, lineStart + close)) ||
+        (!github && _looksLikeCurrencyRange(line, start, close))) {
+      index = end;
+      continue;
+    }
+    final openingLength = github ? 2 : 1;
+    _addRange(
+      ranges,
+      globalStart,
+      globalStart + openingLength,
+      markerStyle,
+      priority: 10,
+    );
+    _addRange(
+      ranges,
+      globalStart + openingLength,
+      lineStart + close,
+      expressionStyle,
+      priority: 10,
+    );
+    _addRange(
+      ranges,
+      lineStart + close,
+      lineStart + end,
+      markerStyle,
+      priority: 10,
+    );
+    index = end;
+  }
+}
+
+bool _isEscapedAt(String source, int offset) {
+  var backslashes = 0;
+  for (var index = offset - 1; index >= 0 && source[index] == r'\'; index--) {
+    backslashes++;
+  }
+  return backslashes.isOdd;
+}
+
+bool _looksLikeCurrencyRange(String line, int start, int close) {
+  if (start + 1 >= close ||
+      !RegExp(r'\d').hasMatch(line[start + 1]) ||
+      close + 1 >= line.length ||
+      !RegExp(r'\d').hasMatch(line[close + 1])) {
+    return false;
+  }
+  return true;
+}
+
 bool _addFencedCodeLineRanges(
   List<_HighlightRange> ranges,
   int lineStart,
diff --git a/lib/src/editor/writerside_video_player_host.dart b/lib/src/editor/writerside_video_player_host.dart
new file mode 100644
index 00000000..b1b8b16a
--- /dev/null
+++ b/lib/src/editor/writerside_video_player_host.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/services.dart';
+
+import '../writerside/writerside_video.dart';
+
+const writersideVideoPlayerChannelName = 'com.busymark.app/video_player';
+
+class WritersideVideoPlayerRequest {
+  const WritersideVideoPlayerRequest({
+    required this.playerId,
+    required this.source,
+    required this.rect,
+    required this.miniPlayer,
+    required this.playLabel,
+    required this.pauseLabel,
+    required this.borderEffect,
+  });
+
+  final String playerId;
+  final WritersideVideoPlaybackSource source;
+  final Rect rect;
+  final bool miniPlayer;
+  final String playLabel;
+  final String pauseLabel;
+  final String borderEffect;
+
+  Map<String, Object?> toMap() => {
+    'playerId': playerId,
+    'kind': source.kind.name,
+    'value': source.value,
+    'x': rect.left,
+    'y': rect.top,
+    'width': rect.width,
+    'height': rect.height,
+    'miniPlayer': miniPlayer,
+    'playLabel': playLabel,
+    'pauseLabel': pauseLabel,
+    'borderEffect': borderEffect,
+  };
+}
+
+abstract interface class WritersideVideoPlayerHost {
+  Future<bool> show(WritersideVideoPlayerRequest request);
+
+  Future<bool> update(String playerId, Rect rect);
+
+  Future<void> hide(String playerId);
+}
+
+class PlatformWritersideVideoPlayerHost implements WritersideVideoPlayerHost {
+  const PlatformWritersideVideoPlayerHost({
+    MethodChannel channel = const MethodChannel(
+      writersideVideoPlayerChannelName,
+    ),
+  }) : _channel = channel;
+
+  final MethodChannel _channel;
+
+  @override
+  Future<bool> show(WritersideVideoPlayerRequest request) async {
+    return await _channel.invokeMethod<bool>('show', request.toMap()) ?? false;
+  }
+
+  @override
+  Future<bool> update(String playerId, Rect rect) async {
+    return await _channel.invokeMethod<bool>('update', {
+          'playerId': playerId,
+          'x': rect.left,
+          'y': rect.top,
+          'width': rect.width,
+          'height': rect.height,
+        }) ??
+        false;
+  }
+
+  @override
+  Future<void> hide(String playerId) {
+    return _channel.invokeMethod<void>('hide', {'playerId': playerId});
+  }
+}
diff --git a/lib/src/editor/writerside_video_view.dart b/lib/src/editor/writerside_video_view.dart
new file mode 100644
index 00000000..8491d992
--- /dev/null
+++ b/lib/src/editor/writerside_video_view.dart
@@ -0,0 +1,464 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:path/path.dart' as p;
+
+import '../app/busymark_design.dart';
+import '../app/busymark_glyphs.dart';
+import '../app/localization.dart';
+import '../writerside/writerside_video.dart';
+import 'markdown_image_view.dart';
+import 'writerside_video_player_host.dart';
+
+class BusyMarkWritersideVideoView extends StatefulWidget {
+  const BusyMarkWritersideVideoView({
+    super.key,
+    required this.source,
+    required this.previewSource,
+    required this.activeFilePath,
+    required this.workspaceRoot,
+    required this.writersideRoot,
+    required this.imagesDir,
+    required this.allowRemoteImages,
+    this.onRemoteImageBlocked,
+    this.onOpenFailed,
+    this.playerHost = const PlatformWritersideVideoPlayerHost(),
+    this.width,
+    this.height,
+    this.miniPlayer = false,
+    this.borderEffect = 'none',
+    this.hostedPosterLoader = loadWritersideHostedVideoPoster,
+  });
+
+  final String source;
+  final String? previewSource;
+  final String activeFilePath;
+  final String? workspaceRoot;
+  final String? writersideRoot;
+  final String imagesDir;
+  final bool allowRemoteImages;
+  final VoidCallback? onRemoteImageBlocked;
+  final VoidCallback? onOpenFailed;
+  final WritersideVideoPlayerHost playerHost;
+  final double? width;
+  final double? height;
+  final bool miniPlayer;
+  final String borderEffect;
+  final WritersideVideoPosterLoader hostedPosterLoader;
+
+  @override
+  State<BusyMarkWritersideVideoView> createState() =>
+      _BusyMarkWritersideVideoViewState();
+}
+
+class _BusyMarkWritersideVideoViewState
+    extends State<BusyMarkWritersideVideoView> {
+  static int _nextPlayerId = 0;
+
+  final _playerBodyKey = GlobalKey();
+  late final String _playerId = 'writerside-video-${_nextPlayerId++}';
+  Timer? _layoutTimer;
+  Rect? _lastRect;
+  bool _starting = false;
+  bool _playing = false;
+  bool _syncing = false;
+  int _generation = 0;
+  late Future<String?> _hostedPoster;
+
+  @override
+  void initState() {
+    super.initState();
+    _hostedPoster = _loadHostedPoster();
+  }
+
+  @override
+  void didUpdateWidget(BusyMarkWritersideVideoView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.source != widget.source ||
+        oldWidget.previewSource != widget.previewSource ||
+        oldWidget.activeFilePath != widget.activeFilePath ||
+        oldWidget.workspaceRoot != widget.workspaceRoot ||
+        oldWidget.writersideRoot != widget.writersideRoot ||
+        oldWidget.imagesDir != widget.imagesDir ||
+        oldWidget.miniPlayer != widget.miniPlayer) {
+      _stopPlayer(updateState: false);
+      _starting = false;
+      _playing = false;
+    }
+    if (oldWidget.source != widget.source ||
+        oldWidget.previewSource != widget.previewSource ||
+        oldWidget.hostedPosterLoader != widget.hostedPosterLoader) {
+      _hostedPoster = _loadHostedPoster();
+    }
+  }
+
+  @override
+  void dispose() {
+    _generation += 1;
+    _layoutTimer?.cancel();
+    unawaited(widget.playerHost.hide(_playerId));
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    final authoredPoster = writersideVideoPreviewSource(
+      widget.source,
+      widget.previewSource,
+    );
+    final target = resolveWritersideVideoPlaybackSource(
+      source: widget.source,
+      activeFilePath: widget.activeFilePath,
+      workspaceRoot: widget.workspaceRoot,
+      writersideRoot: widget.writersideRoot,
+      imagesDir: widget.imagesDir,
+    );
+    final radius = widget.borderEffect == 'rounded'
+        ? BusyMarkRadius.md
+        : BusyMarkRadius.sm;
+    final border =
+        widget.borderEffect == 'line' || widget.borderEffect == 'rounded'
+        ? Border.all(color: colors.subtleBorder)
+        : null;
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final size = _videoSize(constraints.maxWidth);
+        final activePlayer = _playing || _starting
+            ? ColoredBox(
+                key: _playerBodyKey,
+                color: BusyMarkLinuxPalette.black,
+                child: _starting
+                    ? const Center(child: CircularProgressIndicator())
+                    : const SizedBox.expand(),
+              )
+            : null;
+        final body =
+            activePlayer ??
+            FutureBuilder<String?>(
+              future: _hostedPoster,
+              builder: (context, snapshot) {
+                final hostedPoster = authoredPoster.isEmpty
+                    ? snapshot.data
+                    : null;
+                return _posterCard(
+                  context,
+                  target,
+                  authoredPoster.isNotEmpty
+                      ? authoredPoster
+                      : hostedPoster ?? '',
+                  trustedHostedPoster: hostedPoster != null,
+                );
+              },
+            );
+        return Align(
+          alignment: AlignmentDirectional.centerStart,
+          child: Semantics(
+            button: !_playing,
+            enabled: target != null,
+            label: target == null
+                ? context.l10n.videoUnavailable
+                : context.l10n.openVideo,
+            child: Tooltip(
+              message: target == null
+                  ? context.l10n.videoUnavailable
+                  : context.l10n.openVideo,
+              child: Container(
+                width: size.width,
+                height: size.height,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(radius),
+                  border: border,
+                ),
+                clipBehavior: Clip.antiAlias,
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(radius),
+                  child: body,
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _posterCard(
+    BuildContext context,
+    WritersideVideoPlaybackSource? target,
+    String poster, {
+    required bool trustedHostedPoster,
+  }) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    return Material(
+      color: colors.panel,
+      child: InkWell(
+        onTap: target == null
+            ? widget.onOpenFailed
+            : () => _startPlayer(target),
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            if (poster.isNotEmpty && trustedHostedPoster)
+              Image.network(
+                poster,
+                fit: BoxFit.cover,
+                filterQuality: FilterQuality.medium,
+                semanticLabel: context.l10n.videoPreview,
+                errorBuilder: (context, error, stackTrace) =>
+                    _posterFallback(colors),
+              )
+            else if (poster.isNotEmpty)
+              MarkdownImageView(
+                source: poster,
+                alt: context.l10n.videoPreview,
+                activeFilePath: widget.activeFilePath,
+                workspaceRoot: widget.workspaceRoot,
+                writersideRoot: widget.writersideRoot,
+                imagesDir: widget.imagesDir,
+                allowRemoteImages: widget.allowRemoteImages,
+                onRemoteImageBlocked: widget.onRemoteImageBlocked,
+              )
+            else
+              _posterFallback(colors),
+            Center(
+              child: DecoratedBox(
+                decoration: BoxDecoration(
+                  color: colors.view.withValues(alpha: 0.9),
+                  shape: BoxShape.circle,
+                  border: Border.all(color: colors.subtleBorder),
+                ),
+                child: Padding(
+                  padding: const EdgeInsets.all(BusyMarkSpacing.smPlus),
+                  child: Icon(
+                    BusyMarkGlyphs.play,
+                    color: target == null
+                        ? colors.mutedForeground
+                        : colors.foreground,
+                  ),
+                ),
+              ),
+            ),
+            if (!widget.miniPlayer)
+              Align(
+                alignment: AlignmentDirectional.bottomStart,
+                child: Container(
+                  color: colors.panel.withValues(alpha: 0.9),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: BusyMarkSpacing.sm,
+                    vertical: BusyMarkSpacing.xs,
+                  ),
+                  child: Text(
+                    _videoLabel(widget.source, target),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                      color: colors.mutedForeground,
+                    ),
+                  ),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<String?> _loadHostedPoster() async {
+    if ((widget.previewSource?.trim().isNotEmpty ?? false)) {
+      return null;
+    }
+    final target = resolveWritersideHostedVideoSource(widget.source);
+    if (target == null) {
+      return null;
+    }
+    try {
+      return await widget.hostedPosterLoader(target);
+    } on Object {
+      return null;
+    }
+  }
+
+  Widget _posterFallback(BusyMarkSurfaceColors colors) {
+    return Center(
+      child: Icon(
+        BusyMarkGlyphs.video,
+        size: 48,
+        color: colors.mutedForeground,
+      ),
+    );
+  }
+
+  Size _videoSize(double availableWidth) {
+    const defaultWidth = 700.0;
+    const defaultAspectRatio = 16 / 9;
+    final naturalWidth =
+        widget.width ??
+        (widget.height == null
+            ? defaultWidth
+            : widget.height! * defaultAspectRatio);
+    final naturalHeight =
+        widget.height ??
+        (widget.width == null
+            ? defaultWidth / defaultAspectRatio
+            : widget.width! / defaultAspectRatio);
+    final scale = availableWidth.isFinite && naturalWidth > availableWidth
+        ? availableWidth / naturalWidth
+        : 1.0;
+    return Size(naturalWidth * scale, naturalHeight * scale);
+  }
+
+  Future<void> _startPlayer(WritersideVideoPlaybackSource source) async {
+    if (_starting || _playing) {
+      return;
+    }
+    final generation = ++_generation;
+    setState(() => _starting = true);
+    await WidgetsBinding.instance.endOfFrame;
+    if (!mounted || generation != _generation) {
+      return;
+    }
+    final rect = _visiblePlayerRect();
+    if (rect == null) {
+      setState(() => _starting = false);
+      widget.onOpenFailed?.call();
+      return;
+    }
+    try {
+      final shown = await widget.playerHost.show(
+        WritersideVideoPlayerRequest(
+          playerId: _playerId,
+          source: source,
+          rect: rect,
+          miniPlayer: widget.miniPlayer,
+          playLabel: context.l10n.openVideo,
+          pauseLabel: context.l10n.pauseVideo,
+          borderEffect: const {'line', 'rounded'}.contains(widget.borderEffect)
+              ? widget.borderEffect
+              : 'none',
+        ),
+      );
+      if (!mounted || generation != _generation) {
+        if (shown) {
+          await widget.playerHost.hide(_playerId);
+        }
+        return;
+      }
+      if (!shown) {
+        setState(() => _starting = false);
+        widget.onOpenFailed?.call();
+        return;
+      }
+      _lastRect = rect;
+      setState(() {
+        _starting = false;
+        _playing = true;
+      });
+      _layoutTimer?.cancel();
+      _layoutTimer = Timer.periodic(
+        const Duration(milliseconds: 80),
+        (_) => _syncPlayerRect(),
+      );
+    } on Object {
+      if (mounted && generation == _generation) {
+        setState(() => _starting = false);
+        widget.onOpenFailed?.call();
+      }
+    }
+  }
+
+  Future<void> _syncPlayerRect() async {
+    if (!_playing || !mounted || _syncing) {
+      return;
+    }
+    final rect = _visiblePlayerRect();
+    if (rect == null) {
+      _stopPlayer();
+      return;
+    }
+    final previous = _lastRect;
+    if (previous != null && _rectNear(previous, rect)) {
+      return;
+    }
+    _lastRect = rect;
+    _syncing = true;
+    try {
+      if (!await widget.playerHost.update(_playerId, rect) && mounted) {
+        _stopPlayer();
+      }
+    } on Object {
+      if (mounted) {
+        _stopPlayer();
+      }
+    } finally {
+      _syncing = false;
+    }
+  }
+
+  Rect? _visiblePlayerRect() {
+    final route = ModalRoute.of(context);
+    if (route != null && !route.isCurrent) {
+      return null;
+    }
+    final bodyContext = _playerBodyKey.currentContext;
+    final box = bodyContext?.findRenderObject();
+    if (box is! RenderBox || !box.attached || !box.hasSize) {
+      return null;
+    }
+    final rect = box.localToGlobal(Offset.zero) & box.size;
+    final windowRect = Offset.zero & MediaQuery.sizeOf(context);
+    if (!_containsRect(windowRect, rect)) {
+      return null;
+    }
+    final scrollable = Scrollable.maybeOf(context);
+    final viewport = scrollable?.context.findRenderObject();
+    if (viewport is RenderBox && viewport.attached && viewport.hasSize) {
+      final viewportRect = viewport.localToGlobal(Offset.zero) & viewport.size;
+      if (!_containsRect(viewportRect, rect)) {
+        return null;
+      }
+    }
+    return rect;
+  }
+
+  void _stopPlayer({bool updateState = true}) {
+    _generation += 1;
+    _layoutTimer?.cancel();
+    _layoutTimer = null;
+    _lastRect = null;
+    _syncing = false;
+    unawaited(widget.playerHost.hide(_playerId));
+    if (updateState && mounted) {
+      setState(() {
+        _starting = false;
+        _playing = false;
+      });
+    }
+  }
+}
+
+bool _containsRect(Rect outer, Rect inner) {
+  const tolerance = 0.5;
+  return inner.left >= outer.left - tolerance &&
+      inner.top >= outer.top - tolerance &&
+      inner.right <= outer.right + tolerance &&
+      inner.bottom <= outer.bottom + tolerance;
+}
+
+bool _rectNear(Rect first, Rect second) {
+  const tolerance = 0.5;
+  return (first.left - second.left).abs() < tolerance &&
+      (first.top - second.top).abs() < tolerance &&
+      (first.width - second.width).abs() < tolerance &&
+      (first.height - second.height).abs() < tolerance;
+}
+
+String _videoLabel(String source, WritersideVideoPlaybackSource? target) {
+  return switch (target?.kind) {
+    WritersideVideoPlaybackKind.youtube => 'YouTube',
+    WritersideVideoPlaybackKind.vimeo => 'Vimeo',
+    WritersideVideoPlaybackKind.localFile => p.basename(target!.value),
+    null => p.basename(source.trim().split('?').first),
+  };
+}
diff --git a/lib/src/editor/wysiwyg/wysiwyg_block_widgets.dart b/lib/src/editor/wysiwyg/wysiwyg_block_widgets.dart
index 755786c9..27a7bfa7 100644
--- a/lib/src/editor/wysiwyg/wysiwyg_block_widgets.dart
+++ b/lib/src/editor/wysiwyg/wysiwyg_block_widgets.dart
@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
 
 import '../../app/busymark_design.dart';
 import '../../app/busymark_glyphs.dart';
+import '../../app/busymark_toast.dart';
 import '../../app/localization.dart';
+import '../../core/source_span.dart';
 import '../document_callout.dart';
 import '../document_code_block.dart';
 import '../document_list_marker.dart';
@@ -11,13 +13,19 @@ import '../document_text_geometry.dart';
 import '../document_text_direction.dart';
 import '../document_thematic_break.dart';
 import '../markdown_image_view.dart';
+import '../writerside_video_view.dart';
 import '../../markdown/busymark_document.dart';
+import '../../math/math_widget.dart';
 import '../../visualization/visualization_card.dart';
 import '../../visualization/visualization_models.dart';
+import '../../writerside/writerside_video.dart';
 import '../editor_text_context_menu.dart';
 import 'wysiwyg_inline_controller.dart';
 import 'wysiwyg_visualization_navigation.dart';
 
+typedef BusyMarkWysiwygMathDiagnosticCallback =
+    void Function(String expressionId, String? code, SourceSpan? sourceSpan);
+
 TextDirection busyMarkWysiwygBlockTextDirection(
   BusyBlock block, {
   required TextDirection fallback,
@@ -61,7 +69,8 @@ EdgeInsets busyMarkWysiwygOuterPadding(
     BusyBlockKind.htmlBlock ||
     BusyBlockKind.unknown => BusyMarkInsets.wysiwygContainerBlock,
     BusyBlockKind.table => BusyMarkInsets.wysiwygTableBlock,
-    BusyBlockKind.image => BusyMarkInsets.documentImageBlock,
+    BusyBlockKind.image ||
+    BusyBlockKind.video => BusyMarkInsets.documentImageBlock,
     BusyBlockKind.thematicBreak => EdgeInsets.zero,
     BusyBlockKind.unorderedListItem ||
     BusyBlockKind.orderedListItem ||
@@ -138,6 +147,7 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
     this.imagesDir = 'images',
     required this.allowRemoteImages,
     this.onRemoteImageBlocked,
+    this.onMathDiagnostic,
     required this.controller,
     required this.undoController,
     required this.focusNode,
@@ -147,6 +157,7 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
     required this.onTableRowDeleted,
     required this.onTableColumnInserted,
     required this.onTableColumnDeleted,
+    required this.onTableColumnAlignmentChanged,
     required this.onTableDeleted,
     required this.onImageEditRequested,
     required this.onHtmlEditRequested,
@@ -170,6 +181,7 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
   final String imagesDir;
   final bool allowRemoteImages;
   final VoidCallback? onRemoteImageBlocked;
+  final BusyMarkWysiwygMathDiagnosticCallback? onMathDiagnostic;
   final BusyMarkWysiwygTextController controller;
   final UndoHistoryController undoController;
   final FocusNode focusNode;
@@ -180,6 +192,8 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
   final void Function(int columnIndex, {required bool after})
   onTableColumnInserted;
   final ValueChanged<int> onTableColumnDeleted;
+  final void Function(int columnIndex, BusyTableAlignment alignment)
+  onTableColumnAlignmentChanged;
   final VoidCallback onTableDeleted;
   final VoidCallback onImageEditRequested;
   final VoidCallback onHtmlEditRequested;
@@ -195,10 +209,19 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: focusNode,
+      builder: (context, _) => _buildBlock(context),
+    );
+  }
+
+  Widget _buildBlock(BuildContext context) {
     final style = _textStyle(context);
     final prefix = _prefix(context);
     final readOnly = _readOnly;
-    final tapHandler = block.kind == BusyBlockKind.table
+    final VoidCallback? tapHandler = block.kind == BusyBlockKind.video
+        ? null
+        : block.kind == BusyBlockKind.table
         ? onFocused
         : block.kind == BusyBlockKind.image
         ? _editImageBlock
@@ -226,6 +249,7 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
               key: ValueKey('wysiwyg-visualization-${block.id}'),
               descriptor: visualization,
               source: block.plainText,
+              sourceReference: block.attributes['src'],
               sourceFence:
                   block.rawSource ??
                   _visualizationFenceSource(block, visualization),
@@ -249,31 +273,14 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
                 child: content,
               ),
             )
-          : block.kind == BusyBlockKind.blockquote
-          ? Directionality(
-              textDirection: busyMarkWysiwygBlockTextDirection(
-                block,
-                fallback: Directionality.of(context),
-              ),
-              child: BusyMarkDocumentCallout(
-                icon: BusyMarkGlyphs.blockquote,
-                margin: _padding,
-                onTap: tapHandler,
-                child: content,
-              ),
-            )
-          : block.kind == BusyBlockKind.writersideAdmonition
+          : block.kind == BusyBlockKind.blockquote ||
+                block.kind == BusyBlockKind.writersideAdmonition
           ? Directionality(
               textDirection: busyMarkWysiwygBlockTextDirection(
                 block,
                 fallback: Directionality.of(context),
               ),
-              child: BusyMarkDocumentAdmonition(
-                style: block.attributes['element'] ?? block.attributes['style'],
-                margin: _padding,
-                onTap: tapHandler,
-                child: content,
-              ),
+              child: _callout(content, tapHandler),
             )
           : Padding(
               padding: _padding,
@@ -303,6 +310,31 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
     );
   }
 
+  Widget _callout(Widget content, VoidCallback? onTap) {
+    final style = busyAdmonitionStyleFromName(
+      block.attributes['style'] ?? block.attributes['element'],
+    );
+    final admonition =
+        (block.kind == BusyBlockKind.writersideAdmonition ||
+            block.attributes[busyMarkWritersideAdmonitionAttribute] ==
+                'true') &&
+        style != BusyAdmonitionStyle.quote;
+    if (admonition) {
+      return BusyMarkDocumentAdmonition(
+        style: style?.name,
+        margin: _padding,
+        onTap: onTap,
+        child: content,
+      );
+    }
+    return BusyMarkDocumentCallout(
+      icon: BusyMarkGlyphs.blockquote,
+      margin: _padding,
+      onTap: onTap,
+      child: content,
+    );
+  }
+
   Widget _blockContent(
     BuildContext context,
     TextStyle style,
@@ -328,10 +360,35 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
           onRowDeleted: onTableRowDeleted,
           onColumnInserted: onTableColumnInserted,
           onColumnDeleted: onTableColumnDeleted,
+          onColumnAlignmentChanged: onTableColumnAlignmentChanged,
           onTableDeleted: onTableDeleted,
+          editRevision: editRevision,
+          onMathDiagnostic: onMathDiagnostic,
         ),
       );
     }
+    if (block.kind == BusyBlockKind.video) {
+      final source = block.attributes['src'] ?? '';
+      return BusyMarkWritersideVideoView(
+        source: source,
+        previewSource: block.attributes['preview-src'],
+        activeFilePath: documentFilePath,
+        workspaceRoot: workspaceRoot,
+        writersideRoot: writersideRoot,
+        imagesDir: imagesDir,
+        allowRemoteImages: allowRemoteImages,
+        onRemoteImageBlocked: onRemoteImageBlocked,
+        onOpenFailed: () => BusyMarkToastOverlay.maybeShow(
+          context,
+          message: context.l10n.couldNotOpenTarget(source),
+          priority: BusyMarkToastPriority.high,
+        ),
+        width: busyMarkVideoDimension(block.attributes['width']),
+        height: busyMarkVideoDimension(block.attributes['height']),
+        miniPlayer: block.attributes['mini-player'] == 'true',
+        borderEffect: block.attributes['border-effect'] ?? 'none',
+      );
+    }
     if (_isRenderedHtmlBlock) {
       return _RenderedHtmlBlockEditor(
         block: block,
@@ -344,6 +401,23 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
         onEdit: _editHtmlBlock,
       );
     }
+    final renderedMath =
+        busyMarkWysiwygBlockContainsMath(block) && !focusNode.hasFocus
+        ? Focus(
+            focusNode: focusNode,
+            child: GestureDetector(
+              key: ValueKey('wysiwyg-rendered-math-${block.id}'),
+              behavior: HitTestBehavior.translucent,
+              onTap: _focusBlock,
+              child: _RenderedMathBlock(
+                block: block,
+                editRevision: editRevision,
+                style: style,
+                onMathDiagnostic: onMathDiagnostic,
+              ),
+            ),
+          )
+        : null;
     return Directionality(
       textDirection: textDirection,
       child: Row(
@@ -354,101 +428,105 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
             const SizedBox(width: BusyMarkSpacing.sm),
           ],
           Expanded(
-            child: block.kind == BusyBlockKind.image
-                ? _ImageBlockEditor(
-                    block: block,
-                    documentFilePath: documentFilePath,
-                    workspaceRoot: workspaceRoot,
-                    writersideRoot: writersideRoot,
-                    imagesDir: imagesDir,
-                    allowRemoteImages: allowRemoteImages,
-                    onRemoteImageBlocked: onRemoteImageBlocked,
-                  )
-                : readOnly
-                ? SelectableText(
-                    _readOnlyText,
-                    textDirection: textDirection,
-                    style: style.copyWith(
-                      color: colors.mutedForeground,
-                      fontFamily: BusyMarkTypography.monoFontFamily,
-                      fontFamilyFallback:
-                          BusyMarkTypography.monoFontFamilyFallback,
-                    ),
-                  )
-                : Stack(
-                    children: [
-                      Positioned.fill(
-                        child: IgnorePointer(
-                          child: CustomPaint(
-                            painter: _WysiwygSelectionPainter(
-                              text: controller.text,
-                              style: style,
-                              selectionRange: selectionRange,
-                              color:
-                                  DefaultSelectionStyle.of(
-                                    context,
-                                  ).selectionColor ??
-                                  Theme.of(
-                                    context,
-                                  ).colorScheme.primary.withValues(
-                                    alpha: BusyMarkDocumentTextGeometry
-                                        .fallbackSelectionAlpha,
-                                  ),
-                              textDirection: textDirection,
-                              textScaler: MediaQuery.textScalerOf(context),
-                              locale: Localizations.maybeLocaleOf(context),
-                              layoutWidthInset: BusyMarkDocumentTextGeometry
-                                  .editableLayoutInset,
-                            ),
-                          ),
+            child:
+                renderedMath ??
+                (block.kind == BusyBlockKind.image
+                    ? _ImageBlockEditor(
+                        block: block,
+                        documentFilePath: documentFilePath,
+                        workspaceRoot: workspaceRoot,
+                        writersideRoot: writersideRoot,
+                        imagesDir: imagesDir,
+                        allowRemoteImages: allowRemoteImages,
+                        onRemoteImageBlocked: onRemoteImageBlocked,
+                      )
+                    : readOnly
+                    ? SelectableText(
+                        _readOnlyText,
+                        textDirection: textDirection,
+                        style: style.copyWith(
+                          color: colors.mutedForeground,
+                          fontFamily: BusyMarkTypography.monoFontFamily,
+                          fontFamilyFallback:
+                              BusyMarkTypography.monoFontFamilyFallback,
                         ),
-                      ),
-                      TextSelectionTheme(
-                        data: selectionRange == null
-                            ? Theme.of(context).textSelectionTheme
-                            : Theme.of(context).textSelectionTheme.copyWith(
-                                selectionColor:
-                                    BusyMarkLinuxPalette.transparent,
+                      )
+                    : Stack(
+                        children: [
+                          Positioned.fill(
+                            child: IgnorePointer(
+                              child: CustomPaint(
+                                painter: _WysiwygSelectionPainter(
+                                  text: controller.text,
+                                  style: style,
+                                  selectionRange: selectionRange,
+                                  color:
+                                      DefaultSelectionStyle.of(
+                                        context,
+                                      ).selectionColor ??
+                                      Theme.of(
+                                        context,
+                                      ).colorScheme.primary.withValues(
+                                        alpha: BusyMarkDocumentTextGeometry
+                                            .fallbackSelectionAlpha,
+                                      ),
+                                  textDirection: textDirection,
+                                  textScaler: MediaQuery.textScalerOf(context),
+                                  locale: Localizations.maybeLocaleOf(context),
+                                  layoutWidthInset: BusyMarkDocumentTextGeometry
+                                      .editableLayoutInset,
+                                ),
                               ),
-                        child: TextField(
-                          key: ValueKey(
-                            'wysiwyg-field-$documentFilePath-${block.id}',
-                          ),
-                          controller: controller,
-                          undoController: undoController,
-                          focusNode: focusNode,
-                          maxLines: null,
-                          minLines: 1,
-                          textDirection: textDirection,
-                          style: style,
-                          cursorWidth:
-                              BusyMarkDocumentTextGeometry.editableCursorWidth,
-                          selectionHeightStyle:
-                              BusyMarkDocumentTextGeometry.selectionHeightStyle,
-                          selectionWidthStyle:
-                              BusyMarkDocumentTextGeometry.selectionWidthStyle,
-                          decoration: const InputDecoration(
-                            isCollapsed: true,
-                            border: InputBorder.none,
-                            enabledBorder: InputBorder.none,
-                            focusedBorder: InputBorder.none,
-                            filled: false,
-                            hoverColor: BusyMarkLinuxPalette.transparent,
-                            contentPadding: EdgeInsets.zero,
+                            ),
                           ),
-                          contextMenuBuilder: (context, editableTextState) =>
-                              buildBusyMarkEditorTextContextMenu(
-                                context,
-                                editableTextState,
-                                refineWithAiLabel: context.l10n.aiRefineWithAi,
-                                onRefineWithAi: onRefineWithAi,
+                          TextSelectionTheme(
+                            data: selectionRange == null
+                                ? Theme.of(context).textSelectionTheme
+                                : Theme.of(context).textSelectionTheme.copyWith(
+                                    selectionColor:
+                                        BusyMarkLinuxPalette.transparent,
+                                  ),
+                            child: TextField(
+                              key: ValueKey(
+                                'wysiwyg-field-$documentFilePath-${block.id}',
                               ),
-                          onTap: onFocused,
-                          onChanged: onChanged,
-                        ),
-                      ),
-                    ],
-                  ),
+                              controller: controller,
+                              undoController: undoController,
+                              focusNode: focusNode,
+                              maxLines: null,
+                              minLines: 1,
+                              textDirection: textDirection,
+                              style: style,
+                              cursorWidth: BusyMarkDocumentTextGeometry
+                                  .editableCursorWidth,
+                              selectionHeightStyle: BusyMarkDocumentTextGeometry
+                                  .selectionHeightStyle,
+                              selectionWidthStyle: BusyMarkDocumentTextGeometry
+                                  .selectionWidthStyle,
+                              decoration: const InputDecoration(
+                                isCollapsed: true,
+                                border: InputBorder.none,
+                                enabledBorder: InputBorder.none,
+                                focusedBorder: InputBorder.none,
+                                filled: false,
+                                hoverColor: BusyMarkLinuxPalette.transparent,
+                                contentPadding: EdgeInsets.zero,
+                              ),
+                              contextMenuBuilder:
+                                  (context, editableTextState) =>
+                                      buildBusyMarkEditorTextContextMenu(
+                                        context,
+                                        editableTextState,
+                                        refineWithAiLabel:
+                                            context.l10n.aiRefineWithAi,
+                                        onRefineWithAi: onRefineWithAi,
+                                      ),
+                              onTap: onFocused,
+                              onChanged: onChanged,
+                            ),
+                          ),
+                        ],
+                      )),
           ),
         ],
       ),
@@ -517,7 +595,8 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
       BusyBlockKind.writersideRawXml ||
       BusyBlockKind.htmlBlock ||
       BusyBlockKind.unknown => fontSize * 2.4,
-      BusyBlockKind.image => BusyMarkSizes.documentImageMinHeight,
+      BusyBlockKind.image ||
+      BusyBlockKind.video => BusyMarkSizes.documentImageMinHeight,
       _ => 0,
     };
   }
@@ -539,6 +618,8 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
     final level = int.tryParse(block.attributes['level'] ?? '') ?? 0;
     return switch (block.kind) {
       BusyBlockKind.heading => busyMarkDocumentHeadingTextStyle(context, level),
+      _ when busyMarkWysiwygBlockContainsMath(block) && focusNode.hasFocus =>
+        busyMarkDocumentCodeTextStyle(context),
       BusyBlockKind.codeBlock => busyMarkDocumentCodeTextStyle(context),
       _ => busyMarkDocumentBodyTextStyle(context),
     };
@@ -596,6 +677,108 @@ class BusyMarkWysiwygBlockField extends StatelessWidget {
   }
 }
 
+class _RenderedMathBlock extends StatelessWidget {
+  const _RenderedMathBlock({
+    required this.block,
+    required this.editRevision,
+    required this.style,
+    this.onMathDiagnostic,
+  });
+
+  final BusyBlock block;
+  final int editRevision;
+  final TextStyle style;
+  final BusyMarkWysiwygMathDiagnosticCallback? onMathDiagnostic;
+
+  @override
+  Widget build(BuildContext context) {
+    if (block.kind == BusyBlockKind.math) {
+      final expressionId = 'block-${block.id}';
+      return BusyMarkDisplayMath(
+        expression: block.attributes['mathExpression'] ?? block.plainText,
+        expressionId: expressionId,
+        editRevision: editRevision,
+        onFailure: (failure) => onMathDiagnostic?.call(
+          expressionId,
+          failure.code,
+          block.sourceSpan,
+        ),
+        onSuccess: () =>
+            onMathDiagnostic?.call(expressionId, null, block.sourceSpan),
+      );
+    }
+    return Text.rich(
+      TextSpan(
+        style: style,
+        children: [
+          for (final (index, inline) in block.inlines.indexed)
+            _span(inline, style, editRevision, 'i$index'),
+        ],
+      ),
+    );
+  }
+
+  InlineSpan _span(
+    BusyInline inline,
+    TextStyle inherited,
+    int revision,
+    String path,
+  ) {
+    final nextStyle = switch (inline.kind) {
+      BusyInlineKind.strong => inherited.copyWith(fontWeight: FontWeight.w700),
+      BusyInlineKind.emphasis => inherited.copyWith(
+        fontStyle: FontStyle.italic,
+      ),
+      BusyInlineKind.underline => inherited.copyWith(
+        decoration: TextDecoration.underline,
+      ),
+      BusyInlineKind.strikethrough => inherited.copyWith(
+        decoration: TextDecoration.lineThrough,
+      ),
+      BusyInlineKind.code => inherited.copyWith(
+        fontFamily: BusyMarkTypography.monoFontFamily,
+      ),
+      _ => inherited,
+    };
+    if (inline.kind == BusyInlineKind.math) {
+      final expressionId = 'inline-block-${block.id}.$path';
+      return WidgetSpan(
+        alignment: PlaceholderAlignment.baseline,
+        baseline: TextBaseline.alphabetic,
+        child: BusyMarkInlineMath(
+          expression: inline.text,
+          expressionId: expressionId,
+          editRevision: revision,
+          textStyle: nextStyle,
+          onFailure: (failure) => onMathDiagnostic?.call(
+            expressionId,
+            failure.code,
+            block.sourceSpan,
+          ),
+          onSuccess: () =>
+              onMathDiagnostic?.call(expressionId, null, block.sourceSpan),
+        ),
+      );
+    }
+    if (inline.kind == BusyInlineKind.hardBreak) {
+      return const TextSpan(text: '\n');
+    }
+    if (inline.kind == BusyInlineKind.softBreak) {
+      return const TextSpan(text: ' ');
+    }
+    if (inline.children.isNotEmpty) {
+      return TextSpan(
+        style: nextStyle,
+        children: [
+          for (final (index, child) in inline.children.indexed)
+            _span(child, nextStyle, revision, '$path.i$index'),
+        ],
+      );
+    }
+    return TextSpan(text: inline.text, style: nextStyle);
+  }
+}
+
 class BusyMarkWysiwygSelectionRange {
   const BusyMarkWysiwygSelectionRange({required this.start, required this.end});
 
@@ -1234,7 +1417,10 @@ class _TableBlockEditor extends StatelessWidget {
     required this.onRowDeleted,
     required this.onColumnInserted,
     required this.onColumnDeleted,
+    required this.onColumnAlignmentChanged,
     required this.onTableDeleted,
+    required this.editRevision,
+    this.onMathDiagnostic,
   });
 
   static const double _controlSize = BusyMarkSizes.tableControl;
@@ -1246,7 +1432,11 @@ class _TableBlockEditor extends StatelessWidget {
   final ValueChanged<int> onRowDeleted;
   final void Function(int columnIndex, {required bool after}) onColumnInserted;
   final ValueChanged<int> onColumnDeleted;
+  final void Function(int columnIndex, BusyTableAlignment alignment)
+  onColumnAlignmentChanged;
   final VoidCallback onTableDeleted;
+  final int editRevision;
+  final BusyMarkWysiwygMathDiagnosticCallback? onMathDiagnostic;
 
   @override
   Widget build(BuildContext context) {
@@ -1284,8 +1474,10 @@ class _TableBlockEditor extends StatelessWidget {
                 for (var column = 0; column < columnCount; column++)
                   _TableColumnControlCell(
                     columnIndex: column,
+                    alignment: _alignmentForColumn(rows, column),
                     onInserted: onColumnInserted,
                     onDeleted: onColumnDeleted,
+                    onAlignmentChanged: onColumnAlignmentChanged,
                   ),
               ],
             ),
@@ -1311,6 +1503,9 @@ class _TableBlockEditor extends StatelessWidget {
                       style: busyMarkDocumentBodyTextStyle(context),
                       onFocused: onFocused,
                       onChanged: onCellChanged,
+                      editRevision: editRevision,
+                      sourceSpan: block.sourceSpan,
+                      onMathDiagnostic: onMathDiagnostic,
                     ),
                 ],
               ),
@@ -1333,9 +1528,31 @@ class _TableBlockEditor extends StatelessWidget {
   bool _isHeaderRow(BusyBlock row, int index) {
     return index == 0 || row.attributes['header'] == 'true';
   }
+
+  BusyTableAlignment _alignmentForColumn(List<BusyBlock> rows, int column) {
+    for (final row in rows) {
+      if (column < row.children.length) {
+        final alignment = busyTableAlignmentFromAttribute(
+          row.children[column].attributes['align'],
+        );
+        if (alignment != BusyTableAlignment.unspecified) {
+          return alignment;
+        }
+      }
+    }
+    return BusyTableAlignment.unspecified;
+  }
 }
 
-enum _TableControlAction { insertBefore, insertAfter, delete }
+enum _TableControlAction {
+  insertBefore,
+  insertAfter,
+  alignUnspecified,
+  alignLeft,
+  alignCenter,
+  alignRight,
+  delete,
+}
 
 class _TableCornerCell extends StatelessWidget {
   const _TableCornerCell({required this.onTableDeleted});
@@ -1361,13 +1578,18 @@ class _TableCornerCell extends StatelessWidget {
 class _TableColumnControlCell extends StatelessWidget {
   const _TableColumnControlCell({
     required this.columnIndex,
+    required this.alignment,
     required this.onInserted,
     required this.onDeleted,
+    required this.onAlignmentChanged,
   });
 
   final int columnIndex;
+  final BusyTableAlignment alignment;
   final void Function(int columnIndex, {required bool after}) onInserted;
   final ValueChanged<int> onDeleted;
+  final void Function(int columnIndex, BusyTableAlignment alignment)
+  onAlignmentChanged;
 
   @override
   Widget build(BuildContext context) {
@@ -1377,12 +1599,27 @@ class _TableColumnControlCell extends StatelessWidget {
       beforeLabel: context.l10n.insertColumnLeft,
       afterLabel: context.l10n.insertColumnRight,
       deleteLabel: context.l10n.deleteColumn,
+      alignment: alignment,
+      alignmentLabels: (
+        unspecified: context.l10n.tableAlignmentUnspecified,
+        left: context.l10n.tableAlignmentLeft,
+        center: context.l10n.tableAlignmentCenter,
+        right: context.l10n.tableAlignmentRight,
+      ),
       onSelected: (action) {
         switch (action) {
           case _TableControlAction.insertBefore:
             onInserted(columnIndex, after: false);
           case _TableControlAction.insertAfter:
             onInserted(columnIndex, after: true);
+          case _TableControlAction.alignUnspecified:
+            onAlignmentChanged(columnIndex, BusyTableAlignment.unspecified);
+          case _TableControlAction.alignLeft:
+            onAlignmentChanged(columnIndex, BusyTableAlignment.left);
+          case _TableControlAction.alignCenter:
+            onAlignmentChanged(columnIndex, BusyTableAlignment.center);
+          case _TableControlAction.alignRight:
+            onAlignmentChanged(columnIndex, BusyTableAlignment.right);
           case _TableControlAction.delete:
             onDeleted(columnIndex);
         }
@@ -1416,6 +1653,11 @@ class _TableRowControlCell extends StatelessWidget {
             onInserted(rowIndex, after: false);
           case _TableControlAction.insertAfter:
             onInserted(rowIndex, after: true);
+          case _TableControlAction.alignUnspecified ||
+              _TableControlAction.alignLeft ||
+              _TableControlAction.alignCenter ||
+              _TableControlAction.alignRight:
+            return;
           case _TableControlAction.delete:
             onDeleted(rowIndex);
         }
@@ -1432,6 +1674,8 @@ class _TableControlMenuButton extends StatelessWidget {
     required this.afterLabel,
     required this.deleteLabel,
     required this.onSelected,
+    this.alignment,
+    this.alignmentLabels,
   });
 
   final String tooltip;
@@ -1440,6 +1684,9 @@ class _TableControlMenuButton extends StatelessWidget {
   final String afterLabel;
   final String deleteLabel;
   final ValueChanged<_TableControlAction> onSelected;
+  final BusyTableAlignment? alignment;
+  final ({String unspecified, String left, String center, String right})?
+  alignmentLabels;
 
   @override
   Widget build(BuildContext context) {
@@ -1455,6 +1702,28 @@ class _TableControlMenuButton extends StatelessWidget {
           value: _TableControlAction.insertAfter,
           label: afterLabel,
         ),
+        if (alignmentLabels case final labels?) ...[
+          BusyMarkPopupMenuItem(
+            value: _TableControlAction.alignUnspecified,
+            label: labels.unspecified,
+            checked: alignment == BusyTableAlignment.unspecified,
+          ),
+          BusyMarkPopupMenuItem(
+            value: _TableControlAction.alignLeft,
+            label: labels.left,
+            checked: alignment == BusyTableAlignment.left,
+          ),
+          BusyMarkPopupMenuItem(
+            value: _TableControlAction.alignCenter,
+            label: labels.center,
+            checked: alignment == BusyTableAlignment.center,
+          ),
+          BusyMarkPopupMenuItem(
+            value: _TableControlAction.alignRight,
+            label: labels.right,
+            checked: alignment == BusyTableAlignment.right,
+          ),
+        ],
         BusyMarkPopupMenuItem(
           value: _TableControlAction.delete,
           label: deleteLabel,
@@ -1472,6 +1741,9 @@ class _TableCellEditor extends StatefulWidget {
     required this.style,
     required this.onFocused,
     required this.onChanged,
+    required this.editRevision,
+    this.sourceSpan,
+    this.onMathDiagnostic,
   });
 
   final BusyBlock? cell;
@@ -1479,6 +1751,9 @@ class _TableCellEditor extends StatefulWidget {
   final TextStyle style;
   final VoidCallback onFocused;
   final void Function(String cellId, String text) onChanged;
+  final int editRevision;
+  final SourceSpan? sourceSpan;
+  final BusyMarkWysiwygMathDiagnosticCallback? onMathDiagnostic;
 
   @override
   State<_TableCellEditor> createState() => _TableCellEditorState();
@@ -1488,13 +1763,15 @@ class _TableCellEditorState extends State<_TableCellEditor> {
   late final TextEditingController _controller;
   late final FocusNode _focusNode;
   String? _cellId;
+  bool _sourceEditing = false;
 
   @override
   void initState() {
     super.initState();
     _cellId = widget.cell?.id;
-    _controller = TextEditingController(text: widget.cell?.plainText ?? '');
+    _controller = TextEditingController(text: _editableText(widget.cell));
     _focusNode = FocusNode(debugLabel: 'BusyMark table cell $_cellId');
+    _focusNode.addListener(_handleFocusChanged);
   }
 
   @override
@@ -1503,23 +1780,42 @@ class _TableCellEditorState extends State<_TableCellEditor> {
     final cell = widget.cell;
     if (cell?.id != _cellId) {
       _cellId = cell?.id;
-      _controller.text = cell?.plainText ?? '';
+      _controller.text = _editableText(cell);
       return;
     }
-    if (!_focusNode.hasFocus &&
-        cell != null &&
-        cell.plainText != _controller.text) {
-      _controller.text = cell.plainText;
+    final nextText = _editableText(cell);
+    if (!_focusNode.hasFocus && nextText != _controller.text) {
+      _controller.text = nextText;
     }
   }
 
+  String _editableText(BusyBlock? cell) {
+    if (cell == null) {
+      return '';
+    }
+    return busyMarkWysiwygBlockContainsMath(cell)
+        ? busyMarkWysiwygEditableText(cell)
+        : cell.plainText;
+  }
+
   @override
   void dispose() {
+    _focusNode.removeListener(_handleFocusChanged);
     _controller.dispose();
     _focusNode.dispose();
     super.dispose();
   }
 
+  void _handleFocusChanged() {
+    if (mounted) {
+      setState(() {
+        if (!_focusNode.hasFocus) {
+          _sourceEditing = false;
+        }
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final colors = BusyMarkSurfaceColors.of(context);
@@ -1530,6 +1826,32 @@ class _TableCellEditorState extends State<_TableCellEditor> {
     if (cell == null) {
       return const SizedBox.shrink();
     }
+    if (busyMarkWysiwygBlockContainsMath(cell) &&
+        !_sourceEditing &&
+        !_focusNode.hasFocus) {
+      return Padding(
+        padding: BusyMarkInsets.documentTableCell,
+        child: GestureDetector(
+          key: ValueKey('wysiwyg-rendered-math-${cell.id}'),
+          behavior: HitTestBehavior.translucent,
+          onTap: () {
+            widget.onFocused();
+            setState(() => _sourceEditing = true);
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (mounted) {
+                _focusNode.requestFocus();
+              }
+            });
+          },
+          child: _RenderedMathBlock(
+            block: cell.copyWith(sourceSpan: widget.sourceSpan),
+            editRevision: widget.editRevision,
+            style: textStyle,
+            onMathDiagnostic: widget.onMathDiagnostic,
+          ),
+        ),
+      );
+    }
     return Padding(
       padding: BusyMarkInsets.documentTableCell,
       child: TextField(
@@ -1539,6 +1861,8 @@ class _TableCellEditorState extends State<_TableCellEditor> {
         minLines: 1,
         maxLines: null,
         style: textStyle,
+        selectionHeightStyle: BusyMarkDocumentTextGeometry.selectionHeightStyle,
+        selectionWidthStyle: BusyMarkDocumentTextGeometry.selectionWidthStyle,
         decoration: InputDecoration(
           isCollapsed: true,
           border: InputBorder.none,
@@ -1597,6 +1921,7 @@ class _WysiwygSelectionPainter extends CustomPainter {
     }
     final textPainter = TextPainter(
       text: TextSpan(text: text, style: style),
+      strutStyle: StrutStyle.fromTextStyle(style),
       textDirection: textDirection,
       textScaler: textScaler,
       locale: locale,
diff --git a/lib/src/editor/wysiwyg/wysiwyg_document_controller.dart b/lib/src/editor/wysiwyg/wysiwyg_document_controller.dart
index 9bde3424..4281021a 100644
--- a/lib/src/editor/wysiwyg/wysiwyg_document_controller.dart
+++ b/lib/src/editor/wysiwyg/wysiwyg_document_controller.dart
@@ -4,6 +4,9 @@ import '../../core/path_utils.dart';
 import '../../core/source_span.dart';
 import '../../markdown/busymark_document.dart';
 import '../../markdown/busymark_markdown_serializer.dart';
+import '../../markdown/markdown_model.dart';
+import '../../markdown/markdown_parser.dart';
+import '../../markdown/math_syntax.dart';
 import '../../markdown/raw_html_adapter.dart';
 import 'wysiwyg_commands.dart';
 import 'wysiwyg_inline_controller.dart';
@@ -30,7 +33,327 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
 
   String blockText(String blockId) {
     final block = blockById(blockId);
-    return block?.plainText ?? '';
+    return block == null ? '' : busyMarkWysiwygEditableText(block);
+  }
+
+  String _sourceWithBlockStructure(BusyBlock block, String source) {
+    final prefix = switch (block.kind) {
+      BusyBlockKind.heading =>
+        '${'#' * (int.tryParse(block.attributes['level'] ?? '') ?? 1)} ',
+      BusyBlockKind.unorderedListItem =>
+        '${block.attributes['marker'] ?? '-'} ',
+      BusyBlockKind.orderedListItem => '${block.attributes['marker'] ?? '1.'} ',
+      BusyBlockKind.taskListItem =>
+        '${block.attributes['ordered'] == 'true' ? block.attributes['marker'] ?? '1.' : '-'} '
+            '[${block.attributes['task'] == 'true' ? 'x' : ' '}] ',
+      BusyBlockKind.blockquote => '> ',
+      _ => '',
+    };
+    return '$prefix$source';
+  }
+
+  void updateMathSource(String blockId, String source) {
+    final current = blockById(blockId);
+    if (current == null) {
+      return;
+    }
+    final parsed = const MarkdownParser().parse(
+      filePath: _document.filePath,
+      source: _sourceWithBlockStructure(current, source),
+      mode: _document.mode,
+      validateLocalReferences: false,
+    );
+    final parsedBlocks = parsed.busyDocument.blocks
+        .where(
+          (block) =>
+              block.kind != BusyBlockKind.frontMatter && !block.isSourceOnly,
+        )
+        .toList(growable: false);
+    final replacements = parsedBlocks.isEmpty
+        ? [
+            BusyBlock(
+              id: current.id,
+              kind: BusyBlockKind.paragraph,
+              inlines: [BusyInline(kind: BusyInlineKind.text, text: source)],
+              sourceSpan: current.sourceSpan,
+              dirty: true,
+            ),
+          ]
+        : [
+            for (final (index, parsedBlock) in parsedBlocks.indexed)
+              BusyBlock(
+                id: index == 0
+                    ? current.id
+                    : _nextGeneratedBlockId('math-edit'),
+                kind: parsedBlock.kind,
+                inlines: parsedBlock.inlines,
+                children: index == 0 ? current.children : parsedBlock.children,
+                attributes: _mathEditedBlockAttributes(
+                  current,
+                  parsedBlock,
+                  firstReplacement: index == 0,
+                ),
+                rawSource: parsedBlock.rawSource,
+                sourceSpan: index == 0 ? current.sourceSpan : null,
+                preserveRaw: false,
+                dirty: true,
+              ),
+          ];
+    _document = _document.copyWith(
+      blocks: _replaceBlockWithMany(_document.blocks, blockId, replacements),
+    );
+    notifyListeners();
+  }
+
+  ({int selectionStart, int selectionEnd})? insertInlineMath(
+    String blockId,
+    int selectionStart,
+    int selectionEnd, {
+    String fallbackExpression = 'x',
+  }) {
+    final current = blockById(blockId);
+    if (current == null || busyMarkWysiwygBlockContainsMath(current)) {
+      return null;
+    }
+    final text = current.plainText;
+    final rawStart = selectionStart < selectionEnd
+        ? selectionStart
+        : selectionEnd;
+    final rawEnd = selectionStart < selectionEnd
+        ? selectionEnd
+        : selectionStart;
+    final start = rawStart.clamp(0, text.length).toInt();
+    final end = rawEnd.clamp(start, text.length).toInt();
+    final rawExpression = start == end
+        ? fallbackExpression
+        : text.substring(start, end);
+    final parts = _inlineMathExpressionParts(rawExpression);
+    if (parts == null) {
+      return null;
+    }
+    final collapsed = start == end;
+    final contentStart = collapsed ? start : start + parts.leading.length;
+    final contentEnd = collapsed ? end : end - parts.trailing.length;
+    final partition = _partitionInlinesForReplacement(
+      current.inlines,
+      contentStart,
+      contentEnd,
+    );
+    final before = [
+      ...partition.before,
+      if (collapsed && parts.leading.isNotEmpty)
+        BusyInline(kind: BusyInlineKind.text, text: parts.leading),
+    ];
+    final after = [
+      if (collapsed && parts.trailing.isNotEmpty)
+        BusyInline(kind: BusyInlineKind.text, text: parts.trailing),
+      ...partition.after,
+    ];
+    BusyInline? math;
+    List<BusyInline>? inlines;
+    for (final form in const [
+      BusyMathSourceForm.dollarInline,
+      BusyMathSourceForm.githubDollarBacktick,
+    ]) {
+      final candidate = _inlineMath(parts.expression, form);
+      final candidateInlines = [...before, candidate, ...after];
+      if (_serializedInlineMathParses(
+        candidateInlines,
+        mode: _document.mode,
+        serializer: _serializer,
+      )) {
+        math = candidate;
+        inlines = candidateInlines;
+        break;
+      }
+    }
+    if (math == null || inlines == null) {
+      return null;
+    }
+    final updated = current.copyWith(
+      inlines: inlines,
+      attributes: _attributesAfterInlineMathEdit(current, inlines),
+      preserveRaw: false,
+      dirty: true,
+    );
+    _document = _document.copyWith(
+      blocks: _replaceInBlocks(_document.blocks, blockId, (_) => updated),
+    );
+    final prefixSource = _serializer.serializeBlock(
+      BusyBlock(
+        id: 'wysiwyg-math-prefix',
+        kind: BusyBlockKind.paragraph,
+        inlines: before,
+        dirty: true,
+      ),
+    );
+    final form = busyMathSourceFormFromName(
+      math.attributes[busyMarkMathSourceFormAttribute],
+    );
+    final openingLength = form == BusyMathSourceForm.githubDollarBacktick
+        ? 2
+        : 1;
+    notifyListeners();
+    return (
+      selectionStart: prefixSource.length + openingLength,
+      selectionEnd:
+          prefixSource.length + openingLength + parts.expression.length,
+    );
+  }
+
+  ({String source, int selectionStart, int selectionEnd})?
+  buildInlineMathSourceInsertion(
+    String blockId,
+    String source,
+    int selectionStart,
+    int selectionEnd, {
+    String fallbackExpression = 'x',
+  }) {
+    final current = blockById(blockId);
+    if (current == null) {
+      return null;
+    }
+    final rawStart = selectionStart < selectionEnd
+        ? selectionStart
+        : selectionEnd;
+    final rawEnd = selectionStart < selectionEnd
+        ? selectionEnd
+        : selectionStart;
+    final start = rawStart.clamp(0, source.length).toInt();
+    final end = rawEnd.clamp(start, source.length).toInt();
+    final collapsed = start == end;
+    final rawExpression = collapsed
+        ? fallbackExpression
+        : source.substring(start, end);
+    final parts = _inlineMathExpressionParts(rawExpression);
+    if (parts == null) {
+      return null;
+    }
+    final replaceStart = collapsed ? start : start + parts.leading.length;
+    final replaceEnd = collapsed ? end : end - parts.trailing.length;
+    final existing = _parseMathEditSource(current, source);
+    final existingMath = _mathInlineCount(existing);
+    for (final form in const [
+      BusyMathSourceForm.dollarInline,
+      BusyMathSourceForm.githubDollarBacktick,
+    ]) {
+      final mathSource = _inlineMathSource(parts.expression, form);
+      final replacement = collapsed
+          ? '${parts.leading}$mathSource${parts.trailing}'
+          : mathSource;
+      final candidate = source.replaceRange(
+        replaceStart,
+        replaceEnd,
+        replacement,
+      );
+      final parsed = _parseMathEditSource(current, candidate);
+      final validationExpression = _uniqueMathValidationExpression(
+        source,
+        parts.expression,
+      );
+      final validationSource = _inlineMathSource(validationExpression, form);
+      final validationReplacement = collapsed
+          ? '${parts.leading}$validationSource${parts.trailing}'
+          : validationSource;
+      final validationCandidate = source.replaceRange(
+        replaceStart,
+        replaceEnd,
+        validationReplacement,
+      );
+      final validationParsed = _parseMathEditSource(
+        current,
+        validationCandidate,
+      );
+      final expectedInlines = _singleEditableBlockInlines(validationParsed);
+      final actualInlines = _singleEditableBlockInlines(parsed);
+      if (_mathInlineCount(validationParsed) != existingMath + 1 ||
+          _matchingMathInlineCount(
+                validationParsed,
+                expression: validationExpression,
+                form: form,
+              ) !=
+              1 ||
+          expectedInlines == null ||
+          actualInlines == null ||
+          !_inlineListsSemanticallyEqual(
+            _replaceValidationMath(
+              expectedInlines,
+              validationExpression: validationExpression,
+              expression: parts.expression,
+              form: form,
+            ),
+            actualInlines,
+          )) {
+        continue;
+      }
+      final expressionStart =
+          replaceStart +
+          (collapsed ? parts.leading.length : 0) +
+          (form == BusyMathSourceForm.githubDollarBacktick ? 2 : 1);
+      return (
+        source: candidate,
+        selectionStart: expressionStart,
+        selectionEnd: expressionStart + parts.expression.length,
+      );
+    }
+    return null;
+  }
+
+  BusyDocument _parseMathEditSource(BusyBlock current, String source) {
+    return const MarkdownParser()
+        .parse(
+          filePath: _document.filePath,
+          source: _sourceWithBlockStructure(current, source),
+          mode: _document.mode,
+          validateLocalReferences: false,
+        )
+        .busyDocument;
+  }
+
+  String? insertDisplayMathAfter(String blockId, {String expression = 'x'}) {
+    if (blockById(blockId) == null) {
+      return null;
+    }
+    final mathId = _nextGeneratedBlockId('math');
+    final paragraphId = _nextGeneratedBlockId('paragraph');
+    _document = _document.copyWith(
+      blocks: _insertBlocksAfter(_document.blocks, blockId, [
+        BusyBlock(
+          id: mathId,
+          kind: BusyBlockKind.math,
+          inlines: [
+            BusyInline(
+              kind: BusyInlineKind.math,
+              text: expression,
+              attributes: {
+                busyMarkMathExpressionAttribute: expression,
+                busyMarkMathDisplayAttribute: 'true',
+                busyMarkMathSourceFormAttribute:
+                    BusyMathSourceForm.doubleDollarDisplay.name,
+              },
+            ),
+          ],
+          attributes: {
+            busyMarkMathExpressionAttribute: expression,
+            busyMarkMathDisplayAttribute: 'true',
+            busyMarkMathSourceFormAttribute:
+                BusyMathSourceForm.doubleDollarDisplay.name,
+          },
+          rawSource: '\$\$\n$expression\n\$\$',
+          preserveRaw: false,
+          dirty: true,
+        ),
+        BusyBlock(
+          id: paragraphId,
+          kind: BusyBlockKind.paragraph,
+          inlines: _textInlines(''),
+          attributes: const {busyMarkPreserveEmptyParagraphAttribute: 'true'},
+          dirty: true,
+        ),
+      ]),
+    );
+    notifyListeners();
+    return mathId;
   }
 
   BusyBlock? blockById(String blockId) {
@@ -42,6 +365,30 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
     return null;
   }
 
+  String admonitionTargetId(String blockId) {
+    String? target;
+
+    void visit(List<BusyBlock> blocks, BusyBlock? enclosingAdmonition) {
+      for (final block in blocks) {
+        final isAdmonition =
+            block.kind == BusyBlockKind.writersideAdmonition ||
+            block.attributes[busyMarkWritersideAdmonitionAttribute] == 'true';
+        final nextEnclosing = isAdmonition ? block : enclosingAdmonition;
+        if (block.id == blockId) {
+          target = nextEnclosing?.id ?? blockId;
+          return;
+        }
+        visit(block.children, nextEnclosing);
+        if (target != null) {
+          return;
+        }
+      }
+    }
+
+    visit(_document.blocks, null);
+    return target ?? blockId;
+  }
+
   void updateBlockText(
     String blockId,
     String text, {
@@ -70,7 +417,7 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
           final cells = <BusyBlock>[];
           for (final cell in row.children) {
             if (cell.id == cellId) {
-              cells.add(_blockWithEditedText(cell, text));
+              cells.add(_tableCellWithEditedSource(cell, text));
               rowChanged = true;
               changed = true;
             } else {
@@ -92,6 +439,29 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
     }
   }
 
+  BusyBlock _tableCellWithEditedSource(BusyBlock cell, String source) {
+    final parsed = const MarkdownParser().parse(
+      filePath: _document.filePath,
+      source: '$source\n',
+      mode: _document.mode,
+      validateLocalReferences: false,
+    );
+    final parsedBlock = parsed.busyDocument.blocks
+        .where(
+          (block) =>
+              block.kind != BusyBlockKind.frontMatter && !block.isSourceOnly,
+        )
+        .firstOrNull;
+    final inlines = parsedBlock?.inlines;
+    return cell.copyWith(
+      inlines: inlines == null || inlines.isEmpty
+          ? _textInlines(source)
+          : inlines,
+      preserveRaw: false,
+      dirty: true,
+    );
+  }
+
   BusyWysiwygTextSplitResult? replaceBlockTextWithParagraphs(
     String blockId,
     String text,
@@ -213,6 +583,35 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
     notifyListeners();
   }
 
+  void applyAdmonitionStyle(String blockId, BusyAdmonitionStyle style) {
+    _document = _document.copyWith(
+      blocks: _replaceInBlocks(
+        _document.blocks,
+        blockId,
+        (block) => _blockWithAdmonitionStyle(block, style),
+      ),
+    );
+    notifyListeners();
+  }
+
+  void applyAdmonitionStyleToBlocks(
+    Iterable<String> blockIds,
+    BusyAdmonitionStyle style,
+  ) {
+    final ids = blockIds.toSet();
+    if (ids.isEmpty) {
+      return;
+    }
+    _document = _document.copyWith(
+      blocks: _replaceBlocksByIds(
+        _document.blocks,
+        ids,
+        (block) => _blockWithAdmonitionStyle(block, style),
+      ),
+    );
+    notifyListeners();
+  }
+
   void applyImageBlock(
     String blockId, {
     required String source,
@@ -418,10 +817,14 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
           ? 0
           : rowIndex.clamp(0, rows.length - 1).toInt();
       final insertIndex = rows.isEmpty ? 0 : safeRow + (after ? 1 : 0);
+      final alignments = [
+        for (var column = 0; column < columnCount; column++)
+          _tableColumnAlignment(block, column),
+      ];
       final nextRows = [...rows]
         ..insert(
           insertIndex.clamp(0, rows.length).toInt(),
-          _newTableRow(columnCount),
+          _newTableRow(columnCount, alignments: alignments),
         );
       return block.copyWith(
         children: _normalizedTableRows(nextRows),
@@ -525,6 +928,59 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
     });
   }
 
+  BusyTableAlignment tableColumnAlignment(
+    String tableBlockId,
+    int columnIndex,
+  ) {
+    final table = blockById(tableBlockId);
+    if (table == null || table.kind != BusyBlockKind.table) {
+      return BusyTableAlignment.unspecified;
+    }
+    return _tableColumnAlignment(table, columnIndex);
+  }
+
+  void setTableColumnAlignment(
+    String tableBlockId,
+    int columnIndex,
+    BusyTableAlignment alignment,
+  ) {
+    _replaceBlock(tableBlockId, (block) {
+      if (block.kind != BusyBlockKind.table) {
+        return block;
+      }
+      final columnCount = _tableColumnCount(block);
+      final safeColumn = columnIndex.clamp(0, columnCount - 1).toInt();
+      final attribute = busyTableAlignmentAttribute(alignment);
+      return block.copyWith(
+        children: [
+          for (final row in block.children)
+            row.copyWith(
+              children: [
+                for (final (index, cell) in _cellsPaddedTo(
+                  row,
+                  columnCount,
+                ).indexed)
+                  if (index == safeColumn)
+                    cell.copyWith(
+                      attributes: {
+                        for (final entry in cell.attributes.entries)
+                          if (entry.key != 'align') entry.key: entry.value,
+                        if (attribute != null) 'align': attribute,
+                      },
+                      dirty: true,
+                    )
+                  else
+                    cell,
+              ],
+              dirty: true,
+            ),
+        ],
+        preserveRaw: false,
+        dirty: true,
+      );
+    });
+  }
+
   void deleteTable(String tableBlockId) {
     final nextDocument = BusyDocument(
       filePath: _document.filePath,
@@ -586,7 +1042,15 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
                 _tableCellText(template, rowIndex, column) ??
                     (header ? headerTextForColumn(column + 1) : cellText),
               ),
-              attributes: {'cell': header ? 'th' : 'td'},
+              attributes: {
+                'cell': header ? 'th' : 'td',
+                if (template != null)
+                  if (busyTableAlignmentAttribute(
+                        _tableColumnAlignment(template, column),
+                      )
+                      case final alignment?)
+                    'align': alignment,
+              },
               dirty: true,
             ),
         ],
@@ -608,26 +1072,55 @@ class BusyMarkWysiwygDocumentController extends ChangeNotifier {
     );
   }
 
-  BusyBlock _newTableRow(int columns) {
+  BusyBlock _newTableRow(
+    int columns, {
+    List<BusyTableAlignment> alignments = const [],
+  }) {
     return BusyBlock(
       id: _nextGeneratedBlockId('table-row'),
       kind: BusyBlockKind.table,
       children: [
-        for (var column = 0; column < columns; column++) _newTableCell(),
+        for (var column = 0; column < columns; column++)
+          _newTableCell(
+            alignment: column < alignments.length
+                ? alignments[column]
+                : BusyTableAlignment.unspecified,
+          ),
       ],
       dirty: true,
     );
   }
 
-  BusyBlock _newTableCell() {
+  BusyBlock _newTableCell({
+    BusyTableAlignment alignment = BusyTableAlignment.unspecified,
+  }) {
     return BusyBlock(
       id: _nextGeneratedBlockId('table-cell'),
       kind: BusyBlockKind.paragraph,
       inlines: _textInlines(''),
+      attributes: {
+        if (busyTableAlignmentAttribute(alignment) case final value?)
+          'align': value,
+      },
       dirty: true,
     );
   }
 
+  BusyTableAlignment _tableColumnAlignment(BusyBlock table, int column) {
+    for (final row in table.children) {
+      if (column >= row.children.length) {
+        continue;
+      }
+      final alignment = busyTableAlignmentFromAttribute(
+        row.children[column].attributes['align'],
+      );
+      if (alignment != BusyTableAlignment.unspecified) {
+        return alignment;
+      }
+    }
+    return BusyTableAlignment.unspecified;
+  }
+
   int _tableColumnCount(BusyBlock table) {
     var count = 1;
     for (final row in table.children) {
@@ -1535,6 +2028,298 @@ Map<String, String> _attributesForText(
   return updated;
 }
 
+Map<String, String> _mathEditedBlockAttributes(
+  BusyBlock current,
+  BusyBlock parsed, {
+  required bool firstReplacement,
+}) {
+  final attributes = {...parsed.attributes};
+  if (firstReplacement &&
+      current.kind == BusyBlockKind.heading &&
+      parsed.kind == BusyBlockKind.heading &&
+      current.attributes['generatedId'] == 'false') {
+    final explicitId = current.attributes['id'];
+    if (explicitId != null && explicitId.isNotEmpty) {
+      attributes['id'] = explicitId;
+      attributes['generatedId'] = 'false';
+    }
+  }
+  return attributes;
+}
+
+Map<String, String> _attributesAfterInlineMathEdit(
+  BusyBlock block,
+  List<BusyInline> inlines,
+) {
+  final attributes = {...block.attributes};
+  if (block.kind == BusyBlockKind.heading &&
+      attributes['generatedId'] != 'false') {
+    attributes['id'] = slugForHeading(
+      inlines.map((inline) => inline.plainText).join().trim(),
+    );
+    attributes['generatedId'] = 'true';
+  }
+  return attributes;
+}
+
+({List<BusyInline> before, List<BusyInline> after})
+_partitionInlinesForReplacement(List<BusyInline> inlines, int start, int end) {
+  final before = <BusyInline>[];
+  final after = <BusyInline>[];
+  var offset = 0;
+  for (final inline in inlines) {
+    final length = inline.plainText.length;
+    final inlineEnd = offset + length;
+    if (length == 0) {
+      // Text selections cannot address zero-width semantic nodes. Keep each
+      // one on a deterministic side of the replacement instead of silently
+      // treating it as selected content.
+      (offset <= start ? before : after).add(inline);
+    } else if (inlineEnd <= start) {
+      before.add(inline);
+    } else if (offset >= end) {
+      after.add(inline);
+    } else {
+      final localStart = (start - offset).clamp(0, length).toInt();
+      final localEnd = (end - offset).clamp(localStart, length).toInt();
+      final partition = _partitionInlineForReplacement(
+        inline,
+        localStart,
+        localEnd,
+      );
+      if (partition.before != null) {
+        before.add(partition.before!);
+      }
+      if (partition.after != null) {
+        after.add(partition.after!);
+      }
+    }
+    offset = inlineEnd;
+  }
+  return (before: before, after: after);
+}
+
+({BusyInline? before, BusyInline? after}) _partitionInlineForReplacement(
+  BusyInline inline,
+  int start,
+  int end,
+) {
+  final length = inline.plainText.length;
+  if (inline.children.isNotEmpty) {
+    final partition = _partitionInlinesForReplacement(
+      inline.children,
+      start,
+      end,
+    );
+    return (
+      before: partition.before.isEmpty
+          ? null
+          : inline.copyWith(
+              text: partition.before.map((child) => child.plainText).join(),
+              children: partition.before,
+            ),
+      after: partition.after.isEmpty
+          ? null
+          : inline.copyWith(
+              text: partition.after.map((child) => child.plainText).join(),
+              children: partition.after,
+            ),
+    );
+  }
+  return (
+    before: start == 0
+        ? null
+        : inline.copyWith(text: inline.text.substring(0, start)),
+    after: end == length
+        ? null
+        : inline.copyWith(text: inline.text.substring(end)),
+  );
+}
+
+({String expression, String leading, String trailing})?
+_inlineMathExpressionParts(String value) {
+  if (value.contains('\n') || value.contains('\r')) {
+    return null;
+  }
+  final withoutLeading = value.trimLeft();
+  final leadingLength = value.length - withoutLeading.length;
+  final expression = withoutLeading.trimRight();
+  if (expression.isEmpty) {
+    return null;
+  }
+  return (
+    expression: expression,
+    leading: value.substring(0, leadingLength),
+    trailing: withoutLeading.substring(expression.length),
+  );
+}
+
+BusyInline _inlineMath(String expression, BusyMathSourceForm form) {
+  return BusyInline(
+    kind: BusyInlineKind.math,
+    text: expression,
+    attributes: {
+      busyMarkMathExpressionAttribute: expression,
+      busyMarkMathDisplayAttribute: 'false',
+      busyMarkMathSourceFormAttribute: form.name,
+    },
+  );
+}
+
+String _inlineMathSource(String expression, BusyMathSourceForm form) {
+  return form == BusyMathSourceForm.githubDollarBacktick
+      ? '\$`$expression`\$'
+      : '\$$expression\$';
+}
+
+bool _serializedInlineMathParses(
+  List<BusyInline> inlines, {
+  required MarkdownMode mode,
+  required BusyMarkMarkdownSerializer serializer,
+}) {
+  final source = serializer.serializeBlock(
+    BusyBlock(
+      id: 'wysiwyg-inline-math-validation',
+      kind: BusyBlockKind.paragraph,
+      inlines: inlines,
+      dirty: true,
+    ),
+  );
+  final parsed = const MarkdownParser()
+      .parse(
+        filePath: 'wysiwyg-inline-math-validation.md',
+        source: source,
+        mode: mode,
+        validateLocalReferences: false,
+      )
+      .busyDocument;
+  final parsedInlines = _singleEditableBlockInlines(parsed);
+  return parsedInlines != null &&
+      _inlineListsSemanticallyEqual(inlines, parsedInlines);
+}
+
+List<BusyInline>? _singleEditableBlockInlines(BusyDocument document) {
+  final blocks = document.blocks
+      .where(
+        (block) =>
+            block.kind != BusyBlockKind.frontMatter && !block.isSourceOnly,
+      )
+      .toList(growable: false);
+  return blocks.length == 1 ? blocks.single.inlines : null;
+}
+
+String _uniqueMathValidationExpression(String source, String expression) {
+  var value = 'BusyMarkMathValidationToken';
+  while (source.contains(value) || expression.contains(value)) {
+    value += 'X';
+  }
+  return value;
+}
+
+List<BusyInline> _replaceValidationMath(
+  List<BusyInline> inlines, {
+  required String validationExpression,
+  required String expression,
+  required BusyMathSourceForm form,
+}) {
+  return [
+    for (final inline in inlines)
+      if (inline.kind == BusyInlineKind.math &&
+          inline.text == validationExpression &&
+          inline.attributes[busyMarkMathSourceFormAttribute] == form.name)
+        _inlineMath(expression, form)
+      else if (inline.children.isNotEmpty)
+        inline.copyWith(
+          children: _replaceValidationMath(
+            inline.children,
+            validationExpression: validationExpression,
+            expression: expression,
+            form: form,
+          ),
+        )
+      else
+        inline,
+  ];
+}
+
+bool _inlineListsSemanticallyEqual(
+  List<BusyInline> expected,
+  List<BusyInline> actual,
+) {
+  final expectedNodes = _coalescedInlineNodes(expected);
+  final actualNodes = _coalescedInlineNodes(actual);
+  if (expectedNodes.length != actualNodes.length) {
+    return false;
+  }
+  for (var index = 0; index < expectedNodes.length; index++) {
+    final left = expectedNodes[index];
+    final right = actualNodes[index];
+    if (left.kind != right.kind ||
+        left.text != right.text ||
+        left.destination != right.destination ||
+        !_inlineListsSemanticallyEqual(left.children, right.children)) {
+      return false;
+    }
+    if (left.kind == BusyInlineKind.math &&
+        left.attributes[busyMarkMathSourceFormAttribute] !=
+            right.attributes[busyMarkMathSourceFormAttribute]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+List<BusyInline> _coalescedInlineNodes(List<BusyInline> inlines) {
+  final result = <BusyInline>[];
+  for (final inline in inlines) {
+    if (inline.kind == BusyInlineKind.text &&
+        inline.children.isEmpty &&
+        result.isNotEmpty &&
+        result.last.kind == BusyInlineKind.text &&
+        result.last.children.isEmpty) {
+      result[result.length - 1] = result.last.copyWith(
+        text: '${result.last.text}${inline.text}',
+      );
+    } else {
+      result.add(inline);
+    }
+  }
+  return result;
+}
+
+int _mathInlineCount(BusyDocument document) {
+  return _walkInlines(
+    document.blocks,
+  ).where((inline) => inline.kind == BusyInlineKind.math).length;
+}
+
+int _matchingMathInlineCount(
+  BusyDocument document, {
+  required String expression,
+  BusyMathSourceForm? form,
+}) {
+  return _walkInlines(document.blocks).where((inline) {
+    return inline.kind == BusyInlineKind.math &&
+        inline.text == expression &&
+        (form == null ||
+            inline.attributes[busyMarkMathSourceFormAttribute] == form.name);
+  }).length;
+}
+
+Iterable<BusyInline> _walkInlines(Iterable<BusyBlock> blocks) sync* {
+  for (final block in blocks) {
+    yield* _walkInlineNodes(block.inlines);
+    yield* _walkInlines(block.children);
+  }
+}
+
+Iterable<BusyInline> _walkInlineNodes(Iterable<BusyInline> inlines) sync* {
+  for (final inline in inlines) {
+    yield inline;
+    yield* _walkInlineNodes(inline.children);
+  }
+}
+
 bool _shouldSplitNewlines(BusyBlockKind kind) {
   return switch (kind) {
     BusyBlockKind.paragraph ||
@@ -1635,7 +2420,13 @@ BusyBlock _blockWithCommand(BusyBlock block, BusyWysiwygBlockCommand command) {
     ..remove('ordered')
     ..remove('marker')
     ..remove('task')
+    ..remove(busyMarkWritersideAdmonitionAttribute)
+    ..remove(busyMarkWritersideAdmonitionSourceFormAttribute)
+    ..remove('style')
     ..remove(busyMarkPreserveEmptyParagraphAttribute);
+  if (block.kind == BusyBlockKind.writersideAdmonition) {
+    attributes.remove('element');
+  }
   if (command == BusyWysiwygBlockCommand.heading1) {
     attributes['level'] = '1';
   } else if (command == BusyWysiwygBlockCommand.heading2) {
@@ -1675,6 +2466,39 @@ BusyBlock _blockWithCommand(BusyBlock block, BusyWysiwygBlockCommand command) {
   return block.copyWith(kind: kind, attributes: attributes, dirty: true);
 }
 
+BusyBlock _blockWithAdmonitionStyle(
+  BusyBlock block,
+  BusyAdmonitionStyle style,
+) {
+  final semanticElement = block.kind == BusyBlockKind.writersideAdmonition;
+  final attributes = {...block.attributes}
+    ..remove('ordered')
+    ..remove('marker')
+    ..remove('task')
+    ..remove('level')
+    ..remove('id')
+    ..remove('generatedId')
+    ..remove(busyMarkPreserveEmptyParagraphAttribute)
+    ..[busyMarkWritersideAdmonitionAttribute] = 'true'
+    ..[busyMarkWritersideAdmonitionSourceFormAttribute] = semanticElement
+        ? 'element'
+        : 'blockquote'
+    ..['style'] = style.name;
+  if (semanticElement) {
+    attributes['element'] = style.name;
+  } else {
+    attributes.remove('element');
+  }
+  return block.copyWith(
+    kind: semanticElement
+        ? BusyBlockKind.writersideAdmonition
+        : BusyBlockKind.blockquote,
+    attributes: attributes,
+    preserveRaw: false,
+    dirty: true,
+  );
+}
+
 BusyBlock _numberIndentedListItem(
   BusyBlock block,
   List<BusyBlock> existingSiblings,
diff --git a/lib/src/editor/wysiwyg/wysiwyg_editor.dart b/lib/src/editor/wysiwyg/wysiwyg_editor.dart
index 4d2e3558..a75169ae 100644
--- a/lib/src/editor/wysiwyg/wysiwyg_editor.dart
+++ b/lib/src/editor/wysiwyg/wysiwyg_editor.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:file_selector/file_selector.dart';
@@ -7,22 +8,29 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:html/parser.dart' as html_parser;
+import 'package:path/path.dart' as p;
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 import '../../ai/ai_models.dart';
+import '../../assets/asset_ingestion_service.dart';
+import '../../assets/asset_input_service.dart';
 import '../../app/app_settings.dart';
 import '../../app/busymark_dialogs.dart';
 import '../../app/busymark_design.dart';
 import '../../app/busymark_glyphs.dart';
 import '../../app/busymark_shortcuts.dart';
+import '../../app/busymark_toast.dart';
+import '../../app/command_registry.dart';
 import '../../app/localization.dart';
 import '../../core/source_span.dart';
 import '../../markdown/busymark_document.dart';
 import '../../markdown/document_outline.dart';
+import '../../markdown/markdown_model.dart';
 import '../../markdown/markdown_parser.dart';
 import '../../platform/linux_header_bar_service.dart';
 import '../document_callout.dart';
 import '../document_code_block.dart';
+import '../document_collapsible.dart';
 import '../document_layout.dart';
 import '../document_surface.dart';
 import '../document_text_geometry.dart';
@@ -30,20 +38,31 @@ import 'wysiwyg_block_widgets.dart';
 import 'wysiwyg_commands.dart';
 import 'wysiwyg_document_controller.dart';
 import 'wysiwyg_inline_controller.dart';
+import 'wysiwyg_session_state.dart';
 import 'wysiwyg_toolbar.dart';
 
 typedef BusyMarkWysiwygSourceChanged =
     void Function(String filePath, String source);
+typedef BusyMarkWysiwygSessionChanged =
+    void Function(String documentId, WysiwygEditorSessionState state);
 
 class BusyMarkWysiwygEditor extends StatefulWidget {
   const BusyMarkWysiwygEditor({
     super.key,
     required this.document,
     required this.onSourceChanged,
+    this.documentId,
+    this.initialSessionState = const WysiwygEditorSessionState(),
+    this.onSessionChanged,
+    this.useExternalUndoHistory = false,
     this.onDocumentChanged,
     this.workspaceRoot,
     this.writersideRoot,
     this.imagesDir = 'images',
+    this.assetWorkspaceKind,
+    this.assetIngestionService = const AssetIngestionService(),
+    this.assetInputService,
+    this.onAssetSaveRequired,
     this.allowRemoteImages = false,
     this.onRemoteImageBlocked,
     this.toolbarPlacement = EditorToolbarPlacement.topLeft,
@@ -57,18 +76,29 @@ class BusyMarkWysiwygEditor extends StatefulWidget {
     this.onVisibleHeadingChanged,
     this.onOpenSearch,
     this.onCloseSearch,
+    this.onUndo,
+    this.onRedo,
     this.headerBarService,
     this.documentLayout,
     this.visualizationRevision = 0,
     this.onAiEdit,
+    this.onMathDiagnostic,
   });
 
   final BusyDocument document;
   final BusyMarkWysiwygSourceChanged onSourceChanged;
+  final String? documentId;
+  final WysiwygEditorSessionState initialSessionState;
+  final BusyMarkWysiwygSessionChanged? onSessionChanged;
+  final bool useExternalUndoHistory;
   final ValueChanged<BusyDocument>? onDocumentChanged;
   final String? workspaceRoot;
   final String? writersideRoot;
   final String imagesDir;
+  final AssetWorkspaceKind? assetWorkspaceKind;
+  final AssetIngestionService assetIngestionService;
+  final AssetInputService? assetInputService;
+  final VoidCallback? onAssetSaveRequired;
   final bool allowRemoteImages;
   final VoidCallback? onRemoteImageBlocked;
   final EditorToolbarPlacement toolbarPlacement;
@@ -82,10 +112,13 @@ class BusyMarkWysiwygEditor extends StatefulWidget {
   final ValueChanged<DocumentOutlineHeading?>? onVisibleHeadingChanged;
   final VoidCallback? onOpenSearch;
   final VoidCallback? onCloseSearch;
+  final VoidCallback? onUndo;
+  final VoidCallback? onRedo;
   final LinuxHeaderBarService? headerBarService;
   final BusyMarkDocumentLayoutSpec? documentLayout;
   final int visualizationRevision;
   final BusyMarkAiEditCallback? onAiEdit;
+  final BusyMarkWysiwygMathDiagnosticCallback? onMathDiagnostic;
 
   @override
   State<BusyMarkWysiwygEditor> createState() => _BusyMarkWysiwygEditorState();
@@ -98,6 +131,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   final _textControllers = <String, BusyMarkWysiwygTextController>{};
   final _textUndoControllers = <String, UndoHistoryController>{};
   final _focusNodes = <String, FocusNode>{};
+  StreamSubscription<List<String>>? _assetDropSubscription;
   final _blockKeys = <String, GlobalKey>{};
   final _undoStack = <BusyDocument>[];
   final _redoStack = <BusyDocument>[];
@@ -105,6 +139,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   final _itemPositionsListener = ItemPositionsListener.create();
   List<({int itemIndex, DocumentOutlineHeading heading})>
   _viewportOutlineStops = const [];
+  List<String> _viewportBlockIds = const [];
   String? _reportedVisibleHeadingKey;
   bool _hasReportedVisibleHeading = false;
   late final FocusNode _selectionFocusNode;
@@ -122,6 +157,9 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   bool _initialFocusScheduled = false;
   var _toolbarVisible = true;
   var _documentGeneration = 0;
+  bool _sessionReportScheduled = false;
+
+  String get _documentId => widget.documentId ?? widget.document.filePath;
 
   @override
   void initState() {
@@ -133,11 +171,12 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     _documentController = BusyMarkWysiwygDocumentController(
       document: widget.document,
     )..addListener(_handleDocumentControllerChanged);
+    _listenForDroppedAssets();
     _itemPositionsListener.itemPositions.addListener(
       _handleVisibleItemsChanged,
     );
     _syncBlockControllers();
-    _scheduleInitialFocus();
+    _scheduleSessionRestore(widget.initialSessionState);
     _scheduleHeadingScroll();
     _scheduleSearchScroll();
     _scheduleVisibleHeadingReport();
@@ -146,19 +185,28 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   @override
   void didUpdateWidget(covariant BusyMarkWysiwygEditor oldWidget) {
     super.didUpdateWidget(oldWidget);
-    final fileChanged = oldWidget.document.filePath != widget.document.filePath;
+    if (oldWidget.assetInputService != widget.assetInputService) {
+      unawaited(_assetDropSubscription?.cancel());
+      _listenForDroppedAssets();
+    }
+    final oldDocumentId = oldWidget.documentId ?? oldWidget.document.filePath;
+    final fileChanged = oldDocumentId != _documentId;
     final sourceChanged = oldWidget.document.source != widget.document.source;
     if (fileChanged || (sourceChanged && !_internalChange)) {
       _hasReportedVisibleHeading = false;
-      _undoStack.clear();
-      _redoStack.clear();
       if (fileChanged) {
+        _reportSessionNow(
+          callback: oldWidget.onSessionChanged,
+          documentId: oldDocumentId,
+        );
+        _undoStack.clear();
+        _redoStack.clear();
         _internalChange = false;
         _resetPerDocumentState();
       }
       _documentController.replaceDocument(widget.document);
       _initialFocusScheduled = false;
-      _scheduleInitialFocus();
+      _scheduleSessionRestore(widget.initialSessionState);
       _scheduleVisibleHeadingReport();
     } else if (oldWidget.onVisibleHeadingChanged !=
         widget.onVisibleHeadingChanged) {
@@ -173,6 +221,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
 
   @override
   void dispose() {
+    unawaited(_assetDropSubscription?.cancel());
     _itemPositionsListener.itemPositions.removeListener(
       _handleVisibleItemsChanged,
     );
@@ -221,7 +270,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   }
 
   void _handleVisibleItemsChanged() {
-    if (!mounted || _viewportOutlineStops.isEmpty) {
+    if (!mounted) {
       return;
     }
     int? firstVisible;
@@ -236,6 +285,10 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     if (firstVisible == null) {
       return;
     }
+    _scheduleSessionReport();
+    if (_viewportOutlineStops.isEmpty) {
+      return;
+    }
     var low = 0;
     var high = _viewportOutlineStops.length - 1;
     DocumentOutlineHeading? heading;
@@ -264,6 +317,9 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   @override
   Widget build(BuildContext context) {
     final colors = BusyMarkSurfaceColors.of(context);
+    final commandRegistry =
+        BusyMarkCommandRegistryScope.maybeOf(context) ??
+        BusyMarkCommandCatalog.metadata;
     final entries = _editableBlockEntries(_documentController.document.blocks);
     final renderEntries = _editorRenderEntries(
       _documentController.document.blocks,
@@ -283,6 +339,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
             case final heading?)
           (itemIndex: index, heading: heading),
     ];
+    _viewportBlockIds = [for (final entry in renderEntries) entry.block.id];
     final blocks = entries.map((entry) => entry.block).toList();
     final blockSelectionActive = _hasBlockSelection;
     final selectionRangesByBlockId = {
@@ -303,19 +360,23 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     final selectedBlockIds = _fullySelectedBlockIds(blocks);
     return Shortcuts(
       shortcuts: {
-        ...BusyMarkEditorShortcutActivators.intentMap(
-          _EditorShortcutIntent.new,
+        ...commandRegistry.shortcutIntents(
+          scopes: const {BusyMarkCommandScope.editor},
+          intentFor: BusyMarkContextCommandIntent.new,
         ),
-        BusyMarkTextEditingShortcutActivators.paste: const _PasteTextIntent(),
-        BusyMarkTextEditingShortcutActivators.selectAll:
+        commandRegistry[BusyMarkCommandIds.textPaste]!.shortcut!.activator:
+            const _PasteTextIntent(),
+        commandRegistry[BusyMarkCommandIds.textSelectAll]!.shortcut!.activator:
             const _SelectAllTextIntent(),
-        BusyMarkTextEditingShortcutActivators.undo: const _UndoEditorIntent(),
-        BusyMarkTextEditingShortcutActivators.redo: const _RedoEditorIntent(),
+        commandRegistry['text.undo']!.shortcut!.activator:
+            const _UndoEditorIntent(),
+        commandRegistry['text.redo']!.shortcut!.activator:
+            const _RedoEditorIntent(),
         if (blockSelectionActive)
-          BusyMarkTextEditingShortcutActivators.copy:
+          commandRegistry[BusyMarkCommandIds.textCopy]!.shortcut!.activator:
               const _CopyBlockSelectionIntent(),
         if (blockSelectionActive)
-          BusyMarkTextEditingShortcutActivators.cut:
+          commandRegistry[BusyMarkCommandIds.textCut]!.shortcut!.activator:
               const _CutBlockSelectionIntent(),
         if (blockSelectionActive)
           const SingleActivator(LogicalKeyboardKey.backspace):
@@ -324,11 +385,15 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
           const SingleActivator(LogicalKeyboardKey.delete):
               const _DeleteBlockSelectionIntent(),
         if (blockSelectionActive)
-          BusyMarkTextEditingShortcutActivators.escape:
+          commandRegistry['text.escape']!.shortcut!.activator:
               const _ClearBlockSelectionIntent(),
       },
       child: Actions(
         actions: {
+          BusyMarkContextCommandIntent: BusyMarkContextCommandAction(
+            isCommandEnabled: _canApplyContextCommand,
+            onCommand: _applyContextCommand,
+          ),
           _EditorShortcutIntent: CallbackAction<_EditorShortcutIntent>(
             onInvoke: (intent) {
               _applyEditorShortcutAction(intent.action);
@@ -375,13 +440,17 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
               ),
           _UndoEditorIntent: CallbackAction<_UndoEditorIntent>(
             onInvoke: (intent) {
-              _undoEditorChange();
+              if (widget.useExternalUndoHistory || !_undoEditorChange()) {
+                widget.onUndo?.call();
+              }
               return null;
             },
           ),
           _RedoEditorIntent: CallbackAction<_RedoEditorIntent>(
             onInvoke: (intent) {
-              _redoEditorChange();
+              if (widget.useExternalUndoHistory || !_redoEditorChange()) {
+                widget.onRedo?.call();
+              }
               return null;
             },
           ),
@@ -443,8 +512,14 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
                         widget.toolbarDirection,
                       ),
                       onBlockCommand: _applyBlockCommand,
+                      onAdmonitionCommand: _applyAdmonitionCommand,
+                      admonitionsEnabled:
+                          _documentController.document.mode ==
+                          MarkdownMode.writersideMarkdown,
                       onInlineCommand: _applyInlineCommand,
                       onLinkCommand: () => unawaited(_applyLinkCommand()),
+                      onInlineMathCommand: _applyInlineMathCommand,
+                      onDisplayMathCommand: _applyDisplayMathCommand,
                       onImageCommand: () => unawaited(_applyImageCommand()),
                       onInlineImageCommand: () =>
                           unawaited(_applyInlineImageCommand()),
@@ -487,7 +562,16 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
       block,
       fallback: Directionality.of(context),
     );
-    final content = entry.children == null
+    final content = entry.collapsible
+        ? _buildCollapsibleEntry(
+            context,
+            entry,
+            documentLayout: documentLayout,
+            first: first,
+            selectedBlockIds: selectedBlockIds,
+            selectionRangesByBlockId: selectionRangesByBlockId,
+          )
+        : entry.children == null
         ? _buildEditableBlockField(
             block,
             first: first,
@@ -519,35 +603,51 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     );
   }
 
-  Widget _buildBlockquoteEntry(
+  Widget _buildCollapsibleEntry(
     BuildContext context,
     _EditorRenderEntry entry, {
     required BusyMarkDocumentLayoutSpec documentLayout,
-    required TextDirection blockTextDirection,
+    required bool first,
     required Set<String> selectedBlockIds,
     required Map<String, BusyMarkWysiwygSelectionRange>
     selectionRangesByBlockId,
   }) {
-    final children = entry.children!;
-    final firstEditableBlock = _firstEditableBlockIn(children);
-    return Directionality(
-      textDirection: blockTextDirection,
-      child: BusyMarkDocumentCallout(
-        key: ValueKey('wysiwyg-blockquote-${entry.block.id}'),
-        icon: BusyMarkGlyphs.blockquote,
-        onTap: firstEditableBlock == null
-            ? null
-            : () {
-                _handleBlockFocused(firstEditableBlock.id);
-                _focusNodeFor(firstEditableBlock).requestFocus();
-              },
-        child: Builder(
-          builder: (quoteContext) => Column(
+    final block = entry.block;
+    final heading = block.kind == BusyBlockKind.heading;
+    final title = heading
+        ? block.plainText
+        : _wysiwygCollapsibleTitle(context, block);
+    final header = heading
+        ? _buildEditableBlockField(
+            block,
+            first: first,
+            listRunEnd: false,
+            selectedBlockIds: selectedBlockIds,
+            selectionRangesByBlockId: selectionRangesByBlockId,
+          )
+        : Text(
+            title,
+            style: block.kind == BusyBlockKind.codeBlock
+                ? busyMarkDocumentCodeTextStyle(context)
+                : busyMarkDocumentBodyTextStyle(
+                    context,
+                  ).copyWith(fontWeight: FontWeight.w600),
+          );
+    final children = entry.children;
+    final expandedChild = children == null
+        ? _buildEditableBlockField(
+            block,
+            first: false,
+            listRunEnd: entry.listRunEnd,
+            selectedBlockIds: selectedBlockIds,
+            selectionRangesByBlockId: selectionRangesByBlockId,
+          )
+        : Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               for (final (index, child) in children.indexed)
                 _buildRenderEntry(
-                  quoteContext,
+                  context,
                   child,
                   documentLayout: documentLayout,
                   applyDocumentFrame: false,
@@ -556,10 +656,97 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
                   selectionRangesByBlockId: selectionRangesByBlockId,
                 ),
             ],
-          ),
-        ),
+          );
+    return BusyMarkDocumentCollapsible(
+      key: ValueKey('wysiwyg-collapsible-${block.id}'),
+      initiallyExpanded: busyMarkWritersideInitiallyExpanded(block.attributes),
+      kindLabel: title,
+      framed: !heading,
+      toggleOnHeaderTap: false,
+      margin: heading
+          ? (first
+                ? BusyMarkInsets.documentHeadingBlock.copyWith(top: 0)
+                : BusyMarkInsets.documentHeadingBlock)
+          : const EdgeInsets.symmetric(vertical: BusyMarkSpacing.xs),
+      header: header,
+      child: expandedChild,
+    );
+  }
+
+  String _wysiwygCollapsibleTitle(BuildContext context, BusyBlock block) {
+    final configured = block
+        .attributes[busyMarkWritersideCollapsedTitleAttribute]
+        ?.trim();
+    if (configured != null && configured.isNotEmpty) {
+      return configured;
+    }
+    if (block.kind == BusyBlockKind.codeBlock) {
+      final firstLine = block.plainText
+          .split('\n')
+          .map((line) => line.trim())
+          .firstWhere((line) => line.isNotEmpty, orElse: () => '');
+      return firstLine.isEmpty ? context.l10n.codeBlock : firstLine;
+    }
+    return block.attributes['title']?.trim().isNotEmpty == true
+        ? block.attributes['title']!.trim()
+        : block.plainText;
+  }
+
+  Widget _buildBlockquoteEntry(
+    BuildContext context,
+    _EditorRenderEntry entry, {
+    required BusyMarkDocumentLayoutSpec documentLayout,
+    required TextDirection blockTextDirection,
+    required Set<String> selectedBlockIds,
+    required Map<String, BusyMarkWysiwygSelectionRange>
+    selectionRangesByBlockId,
+  }) {
+    final children = entry.children!;
+    final firstEditableBlock = _firstEditableBlockIn(children);
+    final onTap = firstEditableBlock == null
+        ? null
+        : () {
+            _handleBlockFocused(firstEditableBlock.id);
+            _focusNodeFor(firstEditableBlock).requestFocus();
+          };
+    final child = Builder(
+      builder: (quoteContext) => Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          for (final (index, child) in children.indexed)
+            _buildRenderEntry(
+              quoteContext,
+              child,
+              documentLayout: documentLayout,
+              applyDocumentFrame: false,
+              first: index == 0,
+              selectedBlockIds: selectedBlockIds,
+              selectionRangesByBlockId: selectionRangesByBlockId,
+            ),
+        ],
       ),
     );
+    final style = busyAdmonitionStyleFromName(entry.block.attributes['style']);
+    final admonition =
+        entry.block.attributes[busyMarkWritersideAdmonitionAttribute] ==
+            'true' &&
+        style != BusyAdmonitionStyle.quote;
+    return Directionality(
+      textDirection: blockTextDirection,
+      child: admonition
+          ? BusyMarkDocumentAdmonition(
+              key: ValueKey('wysiwyg-blockquote-${entry.block.id}'),
+              style: style?.name,
+              onTap: onTap,
+              child: child,
+            )
+          : BusyMarkDocumentCallout(
+              key: ValueKey('wysiwyg-blockquote-${entry.block.id}'),
+              icon: BusyMarkGlyphs.blockquote,
+              onTap: onTap,
+              child: child,
+            ),
+    );
   }
 
   BusyBlock? _firstEditableBlockIn(List<_EditorRenderEntry> entries) {
@@ -596,6 +783,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
       imagesDir: widget.imagesDir,
       allowRemoteImages: widget.allowRemoteImages,
       onRemoteImageBlocked: widget.onRemoteImageBlocked,
+      onMathDiagnostic: widget.onMathDiagnostic,
       controller: _textControllerFor(block),
       undoController: _textUndoControllerFor(block),
       focusNode: _focusNodeFor(block),
@@ -624,6 +812,8 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
           _handleTableColumnInserted(block.id, columnIndex, after: after),
       onTableColumnDeleted: (columnIndex) =>
           _handleTableColumnDeleted(block.id, columnIndex),
+      onTableColumnAlignmentChanged: (columnIndex, alignment) =>
+          _handleTableColumnAlignmentChanged(block.id, columnIndex, alignment),
       onTableDeleted: () => _handleTableDeleted(block.id),
       onImageEditRequested: () =>
           unawaited(_handleImageBlockEditRequested(block.id)),
@@ -706,13 +896,16 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   }
 
   BusyMarkWysiwygTextController _textControllerFor(BusyBlock block) {
-    final controller = _textControllers.putIfAbsent(
-      block.id,
-      () => BusyMarkWysiwygTextController(
-        text: block.plainText,
-        ranges: busyInlineStyleRanges(block.inlines),
-      ),
-    );
+    final controller = _textControllers.putIfAbsent(block.id, () {
+      final created = BusyMarkWysiwygTextController(
+        text: busyMarkWysiwygEditableText(block),
+        ranges: busyMarkWysiwygBlockContainsMath(block)
+            ? const []
+            : busyInlineStyleRanges(block.inlines),
+      );
+      created.addListener(_scheduleSessionReport);
+      return created;
+    });
     controller.updateFromBlock(block);
     return controller;
   }
@@ -773,7 +966,34 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
               block.kind != BusyBlockKind.frontMatter && !block.isSourceOnly,
         )
         .toList();
-    for (final (index, block) in visibleBlocks.indexed) {
+    var index = 0;
+    while (index < visibleBlocks.length) {
+      final block = visibleBlocks[index];
+      if (_isWritersideCollapsibleHeading(block)) {
+        final level = int.tryParse(block.attributes['level'] ?? '') ?? 6;
+        var end = index + 1;
+        while (end < visibleBlocks.length) {
+          final candidate = visibleBlocks[end];
+          if (candidate.kind == BusyBlockKind.heading &&
+              (int.tryParse(candidate.attributes['level'] ?? '') ?? 6) <=
+                  level) {
+            break;
+          }
+          end += 1;
+        }
+        entries.add(
+          _EditorRenderEntry.collapsible(
+            block: block,
+            depth: depth,
+            children: _editorRenderEntries(
+              visibleBlocks.sublist(index + 1, end),
+              depth,
+            ),
+          ),
+        );
+        index = end;
+        continue;
+      }
       if (_isStructuralBlockquote(block)) {
         entries.add(
           _EditorRenderEntry.blockquote(
@@ -782,27 +1002,50 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
             children: _editorRenderEntries(block.children),
           ),
         );
+        index += 1;
         continue;
       }
       final nextBlock = index + 1 < visibleBlocks.length
           ? visibleBlocks[index + 1]
           : null;
-      entries.add(
-        _EditorRenderEntry.block(
-          block: block,
-          depth: depth,
-          listRunEnd:
-              _isListItemBlock(block) &&
-              (nextBlock == null || !_isListItemBlock(nextBlock)),
-        ),
-      );
+      final entry = _isWritersideCollapsibleLeaf(block)
+          ? _EditorRenderEntry.collapsible(
+              block: block,
+              depth: depth,
+              listRunEnd:
+                  _isListItemBlock(block) &&
+                  (nextBlock == null || !_isListItemBlock(nextBlock)),
+            )
+          : _EditorRenderEntry.block(
+              block: block,
+              depth: depth,
+              listRunEnd:
+                  _isListItemBlock(block) &&
+                  (nextBlock == null || !_isListItemBlock(nextBlock)),
+            );
+      entries.add(entry);
       if (_showsNestedEditorBlocks(block)) {
         entries.addAll(_editorRenderEntries(block.children, depth + 1));
       }
+      index += 1;
     }
     return entries;
   }
 
+  bool _isWritersideCollapsibleHeading(BusyBlock block) {
+    return _documentController.document.mode ==
+            MarkdownMode.writersideMarkdown &&
+        block.kind == BusyBlockKind.heading &&
+        busyMarkWritersideIsCollapsible(block.attributes);
+  }
+
+  bool _isWritersideCollapsibleLeaf(BusyBlock block) {
+    return _documentController.document.mode ==
+            MarkdownMode.writersideMarkdown &&
+        block.kind != BusyBlockKind.heading &&
+        busyMarkWritersideIsCollapsible(block.attributes);
+  }
+
   bool _isStructuralBlockquote(BusyBlock block) =>
       block.kind == BusyBlockKind.blockquote &&
       block.children.isNotEmpty &&
@@ -824,6 +1067,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
 
   void _setActiveBlock(String blockId) {
     _activeBlockId = blockId;
+    _scheduleSessionReport();
   }
 
   KeyEventResult _handleDocumentSelectionKeyEvent(
@@ -956,6 +1200,13 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
       return;
     }
     _recordUndoSnapshot();
+    final currentBlock = _documentController.blockById(blockId);
+    if (currentBlock != null &&
+        busyMarkWysiwygBlockContainsMath(currentBlock)) {
+      _documentController.updateMathSource(blockId, value);
+      _emitMarkdown();
+      return;
+    }
     final controller = _textControllers[blockId];
     final offset =
         controller?.selection.extentOffset.clamp(0, value.length).toInt() ??
@@ -1063,6 +1314,22 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     _emitMarkdown();
   }
 
+  void _handleTableColumnAlignmentChanged(
+    String tableBlockId,
+    int columnIndex,
+    BusyTableAlignment alignment,
+  ) {
+    _clearBlockSelection();
+    _setActiveBlock(tableBlockId);
+    _recordUndoSnapshot();
+    _documentController.setTableColumnAlignment(
+      tableBlockId,
+      columnIndex,
+      alignment,
+    );
+    _emitMarkdown();
+  }
+
   void _handleTableDeleted(String tableBlockId) {
     _clearBlockSelection();
     _recordUndoSnapshot();
@@ -1126,12 +1393,155 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     }
     _initialFocusScheduled = true;
     WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      final firstPlainBlock = _focusableBlocks()
+          .where((block) => !busyMarkWysiwygBlockContainsMath(block))
+          .firstOrNull;
+      if (firstPlainBlock == null) {
+        return;
+      }
+      _activeBlockId = firstPlainBlock.id;
+      _focusActiveOrFirstBlock(initialSelectionOffset: 0);
+    });
+  }
+
+  void _scheduleSessionRestore(WysiwygEditorSessionState session) {
+    if (session.activeBlockId == null &&
+        session.anchorBlockId == null &&
+        session.viewportBlockId == null) {
+      _scheduleInitialFocus();
+      return;
+    }
+    _initialFocusScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      final activeBlock = session.activeBlockId == null
+          ? null
+          : _documentController.blockById(session.activeBlockId!);
+      _activeBlockId = activeBlock?.id ?? _focusableBlocks().firstOrNull?.id;
+      final anchorBlockId = session.anchorBlockId;
+      final extentBlockId = session.extentBlockId;
+      if (anchorBlockId != null && extentBlockId != null) {
+        final anchor = _documentController.blockById(anchorBlockId);
+        final extent = _documentController.blockById(extentBlockId);
+        if (anchor != null && extent != null) {
+          if (anchorBlockId == extentBlockId) {
+            final controller = _textControllers[anchorBlockId];
+            if (controller != null) {
+              controller.selection = TextSelection(
+                baseOffset: session.anchorOffset
+                    .clamp(0, controller.text.length)
+                    .toInt(),
+                extentOffset: session.extentOffset
+                    .clamp(0, controller.text.length)
+                    .toInt(),
+              );
+            }
+          } else {
+            _documentSelection = _DocumentTextSelection(
+              anchor: _DocumentTextPosition(
+                blockId: anchorBlockId,
+                offset: session.anchorOffset
+                    .clamp(0, anchor.plainText.length)
+                    .toInt(),
+              ),
+              extent: _DocumentTextPosition(
+                blockId: extentBlockId,
+                offset: session.extentOffset
+                    .clamp(0, extent.plainText.length)
+                    .toInt(),
+              ),
+            );
+          }
+        }
+      }
+      final viewportBlockId = session.viewportBlockId;
+      if (viewportBlockId != null) {
+        _jumpToBlock(
+          viewportBlockId,
+          alignment: session.viewportAlignment.clamp(0.0, 1.0),
+        );
+      }
+      _focusActiveOrFirstBlock();
+      if (mounted) {
+        setState(() {});
+      }
+    });
+  }
+
+  void _scheduleSessionReport() {
+    if (_sessionReportScheduled || widget.onSessionChanged == null) {
+      return;
+    }
+    _sessionReportScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _sessionReportScheduled = false;
       if (mounted) {
-        _focusActiveOrFirstBlock(initialSelectionOffset: 0);
+        _reportSessionNow();
       }
     });
   }
 
+  void _reportSessionNow({
+    BusyMarkWysiwygSessionChanged? callback,
+    String? documentId,
+  }) {
+    final report = callback ?? widget.onSessionChanged;
+    if (report == null) {
+      return;
+    }
+    String? anchorBlockId;
+    String? extentBlockId;
+    var anchorOffset = 0;
+    var extentOffset = 0;
+    final documentSelection = _documentSelection;
+    if (documentSelection != null) {
+      anchorBlockId = documentSelection.anchor.blockId;
+      anchorOffset = documentSelection.anchor.offset;
+      extentBlockId = documentSelection.extent.blockId;
+      extentOffset = documentSelection.extent.offset;
+    } else if (_activeBlockId case final blockId?) {
+      final selection = _textControllers[blockId]?.selection;
+      if (selection != null && selection.isValid) {
+        anchorBlockId = blockId;
+        anchorOffset = selection.baseOffset;
+        extentBlockId = blockId;
+        extentOffset = selection.extentOffset;
+      }
+    }
+    String? viewportBlockId;
+    var viewportAlignment = 0.0;
+    final positions =
+        _itemPositionsListener.itemPositions.value
+            .where(
+              (position) =>
+                  position.itemTrailingEdge > 0 && position.itemLeadingEdge < 1,
+            )
+            .toList()
+          ..sort((left, right) => left.index.compareTo(right.index));
+    if (positions.isNotEmpty &&
+        positions.first.index < _viewportBlockIds.length) {
+      viewportBlockId = _viewportBlockIds[positions.first.index];
+      viewportAlignment = positions.first.itemLeadingEdge.clamp(0.0, 1.0);
+    }
+    report(
+      documentId ?? _documentId,
+      WysiwygEditorSessionState(
+        activeBlockId: _activeBlockId,
+        anchorBlockId: anchorBlockId,
+        anchorOffset: anchorOffset,
+        extentBlockId: extentBlockId,
+        extentOffset: extentOffset,
+        viewportBlockId: viewportBlockId,
+        viewportAlignment: viewportAlignment,
+      ),
+    );
+  }
+
   void _scheduleHeadingScroll() {
     final headingId = widget.scrollToHeadingId;
     final editorBlockId = widget.scrollToBlockId;
@@ -1293,6 +1703,9 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   KeyEventResult _handleBlockKeyEvent(String blockId, KeyEvent event) {
     final keyboard = HardwareKeyboard.instance;
     final key = event.logicalKey;
+    final commands =
+        BusyMarkCommandRegistryScope.read(context) ??
+        BusyMarkCommandCatalog.metadata;
     if ((event is KeyDownEvent || event is KeyRepeatEvent) &&
         key == LogicalKeyboardKey.tab &&
         !_hasCommandModifierPressed()) {
@@ -1308,7 +1721,8 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
       }
     }
     if ((event is KeyDownEvent || event is KeyRepeatEvent) &&
-        BusyMarkTextEditingShortcutActivators.insertIndentation.accepts(
+        commands.shortcutAccepts(
+          BusyMarkCommandIds.textInsertIndentation,
           event,
           keyboard,
         )) {
@@ -1327,48 +1741,76 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
       return KeyEventResult.ignored;
     }
     _activeBlockId = blockId;
-    if (keyboard.isControlPressed && key == LogicalKeyboardKey.keyA) {
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textSelectAll,
+      event,
+      keyboard,
+    )) {
       _selectAllForBlock(blockId);
       return KeyEventResult.handled;
     }
-    if (keyboard.isControlPressed &&
-        key == LogicalKeyboardKey.keyC &&
+    if (commands.shortcutAccepts(
+          BusyMarkCommandIds.textCopy,
+          event,
+          keyboard,
+        ) &&
         _copyCurrentSelection()) {
       return KeyEventResult.handled;
     }
-    if (keyboard.isControlPressed &&
-        key == LogicalKeyboardKey.keyX &&
+    if (commands.shortcutAccepts(BusyMarkCommandIds.textCut, event, keyboard) &&
         _cutCurrentSelection()) {
       return KeyEventResult.handled;
     }
-    if (keyboard.isControlPressed &&
-        !keyboard.isShiftPressed &&
-        key == LogicalKeyboardKey.keyV) {
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textPaste,
+      event,
+      keyboard,
+    )) {
       unawaited(_pasteIntoActiveBlock());
       return KeyEventResult.handled;
     }
-    if (keyboard.isControlPressed &&
-        keyboard.isShiftPressed &&
-        key == LogicalKeyboardKey.keyZ) {
-      _redoEditorChange();
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textRedo,
+      event,
+      keyboard,
+    )) {
+      if (widget.useExternalUndoHistory || !_redoEditorChange()) {
+        widget.onRedo?.call();
+      }
       return KeyEventResult.handled;
     }
-    if (keyboard.isControlPressed && key == LogicalKeyboardKey.keyZ) {
-      _undoEditorChange();
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textUndo,
+      event,
+      keyboard,
+    )) {
+      if (widget.useExternalUndoHistory || !_undoEditorChange()) {
+        widget.onUndo?.call();
+      }
       return KeyEventResult.handled;
     }
-    if (BusyMarkAppShortcutActivators.search.accepts(event, keyboard)) {
+    if (commands.shortcutAccepts(BusyMarkCommandIds.search, event, keyboard)) {
       widget.onOpenSearch?.call();
       return KeyEventResult.handled;
     }
-    if (BusyMarkTextEditingShortcutActivators.escape.accepts(event, keyboard)) {
+    if (commands.shortcutAccepts(
+      BusyMarkCommandIds.textEscape,
+      event,
+      keyboard,
+    )) {
       widget.onCloseSearch?.call();
       return KeyEventResult.handled;
     }
-    final shortcutAction = BusyMarkEditorShortcutActivators.actionForKeyEvent(
+    final commandId = commands.matchingCommandId(
       event,
       keyboard,
+      scope: BusyMarkCommandScope.editor,
     );
+    final shortcutAction = commandId == null
+        ? null
+        : BusyMarkEditorShortcutAction.values
+              .where((action) => commandId == 'editor.${action.name}')
+              .firstOrNull;
     if (shortcutAction != null) {
       if (shortcutAction == BusyMarkEditorShortcutAction.refineWithAi &&
           (widget.onAiEdit == null || _currentSelectionRanges().isEmpty)) {
@@ -2070,6 +2512,35 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     _emitMarkdown();
   }
 
+  void _applyAdmonitionCommand(BusyAdmonitionStyle style) {
+    if (_documentController.document.mode != MarkdownMode.writersideMarkdown) {
+      return;
+    }
+    final selectedBlocks = _selectedBlocks();
+    if (selectedBlocks.isNotEmpty) {
+      _recordUndoSnapshot();
+      _documentController.applyAdmonitionStyleToBlocks(
+        selectedBlocks
+            .map((block) => _documentController.admonitionTargetId(block.id))
+            .toSet(),
+        style,
+      );
+      _clearBlockSelection();
+      _emitMarkdown();
+      return;
+    }
+    final blockId = _activeBlockId;
+    if (blockId == null) {
+      return;
+    }
+    _recordUndoSnapshot();
+    _documentController.applyAdmonitionStyle(
+      _documentController.admonitionTargetId(blockId),
+      style,
+    );
+    _emitMarkdown();
+  }
+
   void _applyInlineCommand(BusyWysiwygInlineCommand command) {
     final selectedRanges = _selectedTextRanges();
     if (selectedRanges.isNotEmpty) {
@@ -2204,6 +2675,58 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     }
   }
 
+  bool _canApplyContextCommand(String commandId) {
+    if (commandId.startsWith('editor.')) {
+      final name = commandId.substring('editor.'.length);
+      return BusyMarkEditorShortcutAction.values.any(
+        (action) => action.name == name,
+      );
+    }
+    return switch (commandId) {
+      BusyMarkCommandIds.textSelectAll ||
+      BusyMarkCommandIds.textCut ||
+      BusyMarkCommandIds.textCopy ||
+      BusyMarkCommandIds.textPaste ||
+      'text.pastePlainText' ||
+      'text.undo' ||
+      'text.redo' => true,
+      _ => false,
+    };
+  }
+
+  void _applyContextCommand(String commandId) {
+    if (commandId.startsWith('editor.')) {
+      final name = commandId.substring('editor.'.length);
+      final action = BusyMarkEditorShortcutAction.values
+          .where((candidate) => candidate.name == name)
+          .firstOrNull;
+      if (action != null) {
+        _applyEditorShortcutAction(action);
+      }
+      return;
+    }
+    switch (commandId) {
+      case BusyMarkCommandIds.textSelectAll:
+        _selectAllForActiveBlock();
+      case BusyMarkCommandIds.textCut:
+        _cutCurrentSelection();
+      case BusyMarkCommandIds.textCopy:
+        _copyCurrentSelection();
+      case BusyMarkCommandIds.textPaste:
+        unawaited(_pasteIntoActiveBlock());
+      case 'text.pastePlainText':
+        unawaited(_pastePlainTextIntoActiveBlock());
+      case 'text.undo':
+        if (widget.useExternalUndoHistory || !_undoEditorChange()) {
+          widget.onUndo?.call();
+        }
+      case 'text.redo':
+        if (widget.useExternalUndoHistory || !_redoEditorChange()) {
+          widget.onRedo?.call();
+        }
+    }
+  }
+
   Set<BusyInlineKind> _activeInlineKindsAt(String blockId, int offset) {
     final block = _documentController.blockById(blockId);
     final active = <BusyInlineKind>{...?_pendingInlineKindsByBlockId[blockId]};
@@ -2266,15 +2789,30 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   Future<void> _applyLinkCommand() async {
     final selectedRanges = _selectedTextRanges();
     if (selectedRanges.isNotEmpty) {
+      final existingLink = selectedRanges.length == 1
+          ? _linkCoveringRange(selectedRanges.single)
+          : null;
+      final rangesToApply = existingLink == null
+          ? selectedRanges
+          : [
+              _SelectedTextRange(
+                block: selectedRanges.single.block,
+                start: existingLink.start,
+                end: existingLink.end,
+              ),
+            ];
       final target = _captureDialogTarget();
-      final destination = await _showLinkDialog(context);
+      final destination = await _showLinkDialog(
+        context,
+        initialDestination: existingLink?.destination ?? '',
+      );
       if (!_isDialogTargetCurrent(target) ||
           destination == null ||
           destination.trim().isEmpty) {
         return;
       }
       _recordUndoSnapshot();
-      for (final range in selectedRanges) {
+      for (final range in rangesToApply) {
         _documentController.applyInlineCommand(
           range.block.id,
           BusyWysiwygInlineCommand.link,
@@ -2293,11 +2831,42 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     }
     final controller = _textControllers[blockId];
     final selection = controller?.selection;
-    if (controller == null || selection == null || selection.isCollapsed) {
+    final block = _documentController.blockById(blockId);
+    if (controller == null ||
+        selection == null ||
+        !selection.isValid ||
+        block == null) {
+      return;
+    }
+    final start = math
+        .min(selection.start, selection.end)
+        .clamp(0, controller.text.length)
+        .toInt();
+    final end = math
+        .max(selection.start, selection.end)
+        .clamp(start, controller.text.length)
+        .toInt();
+    final selectedRange = _SelectedTextRange(
+      block: block,
+      start: start,
+      end: end,
+    );
+    final existingLink = _linkCoveringRange(selectedRange);
+    if (selection.isCollapsed && existingLink == null) {
       return;
     }
+    final rangeToApply = existingLink == null
+        ? selectedRange
+        : _SelectedTextRange(
+            block: block,
+            start: existingLink.start,
+            end: existingLink.end,
+          );
     final target = _captureDialogTarget();
-    final destination = await _showLinkDialog(context);
+    final destination = await _showLinkDialog(
+      context,
+      initialDestination: existingLink?.destination ?? '',
+    );
     if (!_isDialogTargetCurrent(target) ||
         destination == null ||
         destination.trim().isEmpty) {
@@ -2307,13 +2876,123 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     _documentController.applyInlineCommand(
       blockId,
       BusyWysiwygInlineCommand.link,
-      selection.start,
-      selection.end,
+      rangeToApply.start,
+      rangeToApply.end,
       destination: destination.trim(),
     );
     _emitMarkdown();
   }
 
+  BusyInlineStyleRange? _linkCoveringRange(_SelectedTextRange selection) {
+    final textLength = selection.block.plainText.length;
+    final start = selection.start.clamp(0, textLength).toInt();
+    final end = selection.end.clamp(start, textLength).toInt();
+    for (final link in _linkRanges(selection.block.inlines)) {
+      if (link.start <= start && link.end >= end) {
+        return link;
+      }
+    }
+    return null;
+  }
+
+  List<BusyInlineStyleRange> _linkRanges(List<BusyInline> inlines) {
+    final ranges = <BusyInlineStyleRange>[];
+    var offset = 0;
+
+    void visit(BusyInline inline) {
+      final start = offset;
+      if (inline.children.isEmpty) {
+        offset += inline.plainText.length;
+      } else {
+        for (final child in inline.children) {
+          visit(child);
+        }
+      }
+      if (inline.kind == BusyInlineKind.link && offset > start) {
+        ranges.add(
+          BusyInlineStyleRange(
+            start: start,
+            end: offset,
+            kind: BusyInlineKind.link,
+            destination: inline.destination,
+          ),
+        );
+      }
+    }
+
+    for (final inline in inlines) {
+      visit(inline);
+    }
+    return ranges;
+  }
+
+  void _applyInlineMathCommand() {
+    final blockId = _activeBlockId;
+    final controller = blockId == null ? null : _textControllers[blockId];
+    if (blockId == null || controller == null) {
+      return;
+    }
+    final selection = controller.selection.isValid
+        ? controller.selection
+        : TextSelection.collapsed(offset: controller.text.length);
+    final start = math.min(selection.start, selection.end);
+    final end = math.max(selection.start, selection.end);
+    final selected = controller.text.substring(start, end);
+    final expression = selected.isEmpty ? 'x' : selected;
+    final currentBlock = _documentController.blockById(blockId);
+    if (currentBlock != null &&
+        !busyMarkWysiwygBlockContainsMath(currentBlock)) {
+      _recordUndoSnapshot();
+      final insertion = _documentController.insertInlineMath(
+        blockId,
+        start,
+        end,
+        fallbackExpression: expression,
+      );
+      if (insertion == null) {
+        return;
+      }
+      _emitMarkdown();
+      _focusBlockAfterFrame(blockId, offset: insertion.selectionEnd);
+      return;
+    }
+    final insertion = _documentController.buildInlineMathSourceInsertion(
+      blockId,
+      controller.text,
+      start,
+      end,
+      fallbackExpression: expression,
+    );
+    if (insertion == null) {
+      return;
+    }
+    _recordUndoSnapshot();
+    controller.value = TextEditingValue(
+      text: insertion.source,
+      selection: TextSelection(
+        baseOffset: insertion.selectionStart,
+        extentOffset: insertion.selectionEnd,
+      ),
+    );
+    _documentController.updateMathSource(blockId, insertion.source);
+    _emitMarkdown();
+    _focusBlockAfterFrame(blockId, offset: insertion.selectionEnd);
+  }
+
+  void _applyDisplayMathCommand() {
+    final blockId = _activeBlockId;
+    if (blockId == null) {
+      return;
+    }
+    _recordUndoSnapshot();
+    final mathId = _documentController.insertDisplayMathAfter(blockId);
+    if (mathId == null) {
+      return;
+    }
+    _emitMarkdown();
+    _focusBlockAfterFrame(mathId, offset: 4);
+  }
+
   Future<void> _applyImageCommand() async {
     final blockId = _activeBlockId;
     if (blockId == null) {
@@ -2342,16 +3021,43 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
   Future<void> _pasteIntoActiveBlock() async {
     final data = await Clipboard.getData(Clipboard.kTextPlain);
     final text = data?.text;
-    if (text == null || text.isEmpty) {
+    if (text != null && text.isNotEmpty) {
+      final internalClipboard = _internalClipboard;
+      if (internalClipboard != null &&
+          internalClipboard.text == text &&
+          _pasteInternalClipboardIntoActiveBlock(internalClipboard)) {
+        return;
+      }
+      final filePath = _localFilePathFromClipboardText(text);
+      if (filePath != null &&
+          await _ingestExternalImageFile(
+            filePath,
+            AssetIngestionOrigin.clipboardImageFile,
+            reportInvalidImage: false,
+          )) {
+        return;
+      }
+      await _pastePlainTextIntoActiveBlock(textOverride: text);
       return;
     }
-    final internalClipboard = _internalClipboard;
-    if (internalClipboard != null &&
-        internalClipboard.text == text &&
-        _pasteInternalClipboardIntoActiveBlock(internalClipboard)) {
+    final assetInput = widget.assetInputService ?? busyMarkAssetInputService;
+    final clipboardFiles = await assetInput.readClipboardImageFiles();
+    if (clipboardFiles.isNotEmpty &&
+        await _ingestExternalImageFile(
+          clipboardFiles.first,
+          AssetIngestionOrigin.clipboardImageFile,
+        )) {
       return;
     }
-    await _pastePlainTextIntoActiveBlock(textOverride: text);
+    final png = await assetInput.readClipboardImagePng();
+    if (png != null && png.isNotEmpty) {
+      await _ingestExternalImageBytes(
+        png,
+        suggestedFileName:
+            'screenshot-${DateTime.now().millisecondsSinceEpoch}.png',
+        origin: AssetIngestionOrigin.screenshotPaste,
+      );
+    }
   }
 
   bool _pasteInternalClipboardIntoActiveBlock(
@@ -2759,8 +3465,11 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
     );
   }
 
-  Future<String?> _showLinkDialog(BuildContext context) {
-    var destination = '';
+  Future<String?> _showLinkDialog(
+    BuildContext context, {
+    String initialDestination = '',
+  }) {
+    var destination = initialDestination;
     return _showEditorDialog<String>(
       context,
       builder: (context) => BusyMarkModalEditorScaffold(
@@ -2776,6 +3485,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
               BusyMarkGroupedTextEntry(
                 key: const ValueKey('wysiwyg-link-destination-field'),
                 label: context.l10n.source,
+                initialValue: initialDestination,
                 autofocus: true,
                 textDirection: TextDirection.ltr,
                 onChanged: (value) => destination = value,
@@ -2808,10 +3518,169 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
         initialSource: initialSource,
         initialAlt: initialAlt,
         submitLabel: submitLabel,
+        ingestSelectedImage: _ingestSelectedImage,
+        onSaveRequired: widget.onAssetSaveRequired,
       ),
     );
   }
 
+  Future<String> _ingestSelectedImage(String sourcePath) async {
+    final asset = await widget.assetIngestionService.ingestFile(
+      sourcePath: sourcePath,
+      request: _assetIngestionRequest,
+      origin: AssetIngestionOrigin.imagePicker,
+    );
+    return asset.markdownPath;
+  }
+
+  AssetIngestionRequest get _assetIngestionRequest => AssetIngestionRequest(
+    documentFilePath: _documentController.document.filePath,
+    workspaceKind:
+        widget.assetWorkspaceKind ??
+        (widget.writersideRoot != null
+            ? AssetWorkspaceKind.writerside
+            : widget.workspaceRoot != null
+            ? AssetWorkspaceKind.markdownWorkspace
+            : AssetWorkspaceKind.standalone),
+    workspaceRoot: widget.workspaceRoot,
+    writersideRoot: widget.writersideRoot,
+    imagesDir: widget.imagesDir,
+  );
+
+  void _listenForDroppedAssets() {
+    final input = widget.assetInputService ?? busyMarkAssetInputService;
+    _assetDropSubscription = input.droppedFiles.listen((paths) {
+      unawaited(_ingestDroppedAssetFiles(paths));
+    });
+  }
+
+  Future<void> _ingestDroppedAssetFiles(List<String> paths) async {
+    for (final path in paths) {
+      if (!mounted) {
+        return;
+      }
+      await _ingestExternalImageFile(path, AssetIngestionOrigin.dragAndDrop);
+    }
+  }
+
+  String? _localFilePathFromClipboardText(String value) {
+    final trimmed = value.trim();
+    if (trimmed.contains('\n') || trimmed.contains('\r')) {
+      return null;
+    }
+    final uri = Uri.tryParse(trimmed);
+    final candidate = uri?.scheme == 'file' ? File.fromUri(uri!).path : trimmed;
+    return File(candidate).existsSync() ? candidate : null;
+  }
+
+  Future<bool> _ingestExternalImageFile(
+    String sourcePath,
+    AssetIngestionOrigin origin, {
+    bool reportInvalidImage = true,
+  }) async {
+    try {
+      final asset = await widget.assetIngestionService.ingestFile(
+        sourcePath: sourcePath,
+        request: _assetIngestionRequest,
+        origin: origin,
+      );
+      await _requestAltAndInsertAsset(
+        asset,
+        suggestedAlt: p.basenameWithoutExtension(sourcePath),
+      );
+      return true;
+    } on AssetSaveRequiredException {
+      widget.onAssetSaveRequired?.call();
+      return true;
+    } on AssetIngestionException catch (error) {
+      if (reportInvalidImage && mounted) {
+        BusyMarkToastOverlay.show(
+          context,
+          message: error.message,
+          priority: BusyMarkToastPriority.high,
+        );
+      }
+      return false;
+    } on FileSystemException {
+      return false;
+    }
+  }
+
+  Future<bool> _ingestExternalImageBytes(
+    Uint8List bytes, {
+    required String suggestedFileName,
+    required AssetIngestionOrigin origin,
+  }) async {
+    try {
+      final asset = await widget.assetIngestionService.ingestBytes(
+        bytes: bytes,
+        suggestedFileName: suggestedFileName,
+        request: _assetIngestionRequest,
+        origin: origin,
+      );
+      await _requestAltAndInsertAsset(asset, suggestedAlt: 'Screenshot');
+      return true;
+    } on AssetSaveRequiredException {
+      widget.onAssetSaveRequired?.call();
+      return true;
+    } on AssetIngestionException catch (error) {
+      if (mounted) {
+        BusyMarkToastOverlay.show(
+          context,
+          message: error.message,
+          priority: BusyMarkToastPriority.high,
+        );
+      }
+      return false;
+    }
+  }
+
+  Future<void> _requestAltAndInsertAsset(
+    IngestedAsset asset, {
+    required String suggestedAlt,
+  }) async {
+    if (!mounted) {
+      return;
+    }
+    final fallbackAltText = context.l10n.image;
+    final target = _captureDialogTarget();
+    final result = await _showImageDialog(
+      context,
+      title: context.l10n.image,
+      initialSource: asset.markdownPath,
+      initialAlt: suggestedAlt,
+      submitLabel: context.l10n.insert,
+    );
+    if (!_isDialogTargetCurrent(target) || result == null) {
+      if (!asset.reusedExisting) {
+        try {
+          await File(asset.absolutePath).delete();
+        } on FileSystemException {
+          // A cancelled dialog should not make the editor unusable.
+        }
+      }
+      return;
+    }
+    final blockId = _activeBlockId;
+    final controller = blockId == null ? null : _textControllers[blockId];
+    if (blockId == null || controller == null) {
+      return;
+    }
+    final selection = controller.selection.isValid
+        ? controller.selection
+        : TextSelection.collapsed(offset: controller.text.length);
+    _recordUndoSnapshot();
+    _documentController.insertInlineImage(
+      blockId,
+      selectionStart: selection.start,
+      selectionEnd: selection.end,
+      source: result.source,
+      alt: result.alt,
+      fallbackAltText: fallbackAltText,
+    );
+    _emitMarkdown();
+  }
+
   Future<_TableDialogResult?> _showTableDialog(
     BuildContext context, {
     required int initialColumns,
@@ -2940,9 +3809,11 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
       return;
     }
     if (_documentController.markdown != originalSource) {
-      ScaffoldMessenger.of(
+      BusyMarkToastOverlay.show(
         context,
-      ).showSnackBar(SnackBar(content: Text(context.l10n.aiStaleProposal)));
+        message: context.l10n.aiStaleProposal,
+        priority: BusyMarkToastPriority.high,
+      );
       return;
     }
     final invocation = result.invocation;
@@ -2954,9 +3825,11 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
         start < 0 ||
         end < start ||
         end > originalSource.length) {
-      ScaffoldMessenger.of(
+      BusyMarkToastOverlay.show(
         context,
-      ).showSnackBar(SnackBar(content: Text(context.l10n.aiStaleProposal)));
+        message: context.l10n.aiStaleProposal,
+        priority: BusyMarkToastPriority.high,
+      );
       return;
     }
     final candidate = originalSource.replaceRange(
@@ -3995,6 +4868,7 @@ class _BusyMarkWysiwygEditorState extends State<BusyMarkWysiwygEditor> {
         text.isNotEmpty
             ? text
             : (block.attributes['src'] ?? block.rawSource ?? ''),
+      BusyBlockKind.video => block.attributes['src'] ?? block.rawSource ?? '',
       _ => text.isNotEmpty ? text : (block.rawSource ?? ''),
     };
   }
@@ -4200,18 +5074,28 @@ class _EditorRenderEntry {
     required this.block,
     required this.depth,
     required this.listRunEnd,
-  }) : children = null;
+  }) : children = null,
+       collapsible = false;
 
   const _EditorRenderEntry.blockquote({
     required this.block,
     required this.depth,
     required this.children,
-  }) : listRunEnd = false;
+  }) : listRunEnd = false,
+       collapsible = false;
+
+  const _EditorRenderEntry.collapsible({
+    required this.block,
+    required this.depth,
+    this.listRunEnd = false,
+    this.children,
+  }) : collapsible = true;
 
   final BusyBlock block;
   final int depth;
   final bool listRunEnd;
   final List<_EditorRenderEntry>? children;
+  final bool collapsible;
 }
 
 class _FloatingWysiwygToolbar extends StatelessWidget {
@@ -4488,12 +5372,16 @@ class _ImageDialog extends StatefulWidget {
     this.initialSource = '',
     this.initialAlt = '',
     required this.submitLabel,
+    required this.ingestSelectedImage,
+    this.onSaveRequired,
   });
 
   final String title;
   final String initialSource;
   final String initialAlt;
   final String submitLabel;
+  final Future<String> Function(String sourcePath) ingestSelectedImage;
+  final VoidCallback? onSaveRequired;
 
   @override
   State<_ImageDialog> createState() => _ImageDialogState();
@@ -4502,6 +5390,7 @@ class _ImageDialog extends StatefulWidget {
 class _ImageDialogState extends State<_ImageDialog> {
   final _sourceController = TextEditingController();
   final _altController = TextEditingController();
+  String? _errorMessage;
 
   @override
   void initState() {
@@ -4552,6 +5441,21 @@ class _ImageDialogState extends State<_ImageDialog> {
                 onPressed: _chooseImage,
               ),
             ),
+            if (_errorMessage case final message?)
+              Padding(
+                padding: const EdgeInsets.fromLTRB(
+                  BusyMarkSpacing.md,
+                  BusyMarkSpacing.xs,
+                  BusyMarkSpacing.md,
+                  BusyMarkSpacing.sm,
+                ),
+                child: Text(
+                  message,
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: Theme.of(context).colorScheme.error,
+                  ),
+                ),
+              ),
             BusyMarkGroupedTextEntry(
               key: BusyMarkImageDialogKeys.alt,
               label: context.l10n.altText,
@@ -4587,9 +5491,26 @@ class _ImageDialogState extends State<_ImageDialog> {
     if (file == null || !mounted) {
       return;
     }
-    _sourceController.text = file.path;
-    if (_altController.text.trim().isEmpty) {
-      _altController.text = file.name;
+    try {
+      final markdownPath = await widget.ingestSelectedImage(file.path);
+      if (!mounted) {
+        return;
+      }
+      _sourceController.text = markdownPath;
+      if (_altController.text.trim().isEmpty) {
+        _altController.text = p.basenameWithoutExtension(file.name);
+      }
+      setState(() => _errorMessage = null);
+    } on AssetSaveRequiredException {
+      if (!mounted) {
+        return;
+      }
+      Navigator.pop(context);
+      widget.onSaveRequired?.call();
+    } on AssetIngestionException catch (error) {
+      if (mounted) {
+        setState(() => _errorMessage = error.message);
+      }
     }
   }
 
diff --git a/lib/src/editor/wysiwyg/wysiwyg_inline_controller.dart b/lib/src/editor/wysiwyg/wysiwyg_inline_controller.dart
index ee709d2d..1d4526bf 100644
--- a/lib/src/editor/wysiwyg/wysiwyg_inline_controller.dart
+++ b/lib/src/editor/wysiwyg/wysiwyg_inline_controller.dart
@@ -2,6 +2,42 @@ import 'package:flutter/material.dart';
 
 import '../../app/busymark_design.dart';
 import '../../markdown/busymark_document.dart';
+import '../../markdown/busymark_markdown_serializer.dart';
+
+bool busyMarkWysiwygBlockContainsMath(BusyBlock block) {
+  bool contains(List<BusyInline> inlines) => inlines.any(
+    (inline) => inline.kind == BusyInlineKind.math || contains(inline.children),
+  );
+  return block.kind == BusyBlockKind.math || contains(block.inlines);
+}
+
+bool busyMarkWysiwygBlockDescendantsContainMath(BusyBlock block) {
+  return block.children.any(
+    (child) =>
+        busyMarkWysiwygBlockContainsMath(child) ||
+        busyMarkWysiwygBlockDescendantsContainMath(child),
+  );
+}
+
+String busyMarkWysiwygEditableText(BusyBlock block) {
+  if (!busyMarkWysiwygBlockContainsMath(block)) {
+    return block.plainText;
+  }
+  if (block.kind != BusyBlockKind.math && block.inlines.isNotEmpty) {
+    return const BusyMarkMarkdownSerializer().serializeBlock(
+      BusyBlock(
+        id: 'wysiwyg-inline-source',
+        kind: BusyBlockKind.paragraph,
+        inlines: block.inlines,
+        dirty: true,
+      ),
+    );
+  }
+  final source =
+      block.rawSource ??
+      const BusyMarkMarkdownSerializer().serializeBlock(block);
+  return source.replaceFirst(RegExp(r'(?:\r\n|\r|\n)$'), '');
+}
 
 class BusyInlineStyleRange {
   const BusyInlineStyleRange({
@@ -27,8 +63,11 @@ class BusyMarkWysiwygTextController extends TextEditingController {
   List<BusyInlineStyleRange> _ranges;
 
   void updateFromBlock(BusyBlock block) {
-    final nextText = block.plainText;
-    final nextRanges = busyInlineStyleRanges(block.inlines);
+    final sourceEditing = busyMarkWysiwygBlockContainsMath(block);
+    final nextText = busyMarkWysiwygEditableText(block);
+    final nextRanges = sourceEditing
+        ? const <BusyInlineStyleRange>[]
+        : busyInlineStyleRanges(block.inlines);
     final rangesChanged = !_inlineStyleRangesEqual(_ranges, nextRanges);
     if (text != nextText) {
       final previousSelection = selection;
diff --git a/lib/src/editor/wysiwyg/wysiwyg_session_state.dart b/lib/src/editor/wysiwyg/wysiwyg_session_state.dart
new file mode 100644
index 00000000..de3d6482
--- /dev/null
+++ b/lib/src/editor/wysiwyg/wysiwyg_session_state.dart
@@ -0,0 +1,41 @@
+class WysiwygEditorSessionState {
+  const WysiwygEditorSessionState({
+    this.activeBlockId,
+    this.anchorBlockId,
+    this.anchorOffset = 0,
+    this.extentBlockId,
+    this.extentOffset = 0,
+    this.viewportBlockId,
+    this.viewportAlignment = 0,
+  });
+
+  final String? activeBlockId;
+  final String? anchorBlockId;
+  final int anchorOffset;
+  final String? extentBlockId;
+  final int extentOffset;
+  final String? viewportBlockId;
+  final double viewportAlignment;
+
+  Map<String, Object?> toJson() => {
+    'activeBlockId': activeBlockId,
+    'anchorBlockId': anchorBlockId,
+    'anchorOffset': anchorOffset,
+    'extentBlockId': extentBlockId,
+    'extentOffset': extentOffset,
+    'viewportBlockId': viewportBlockId,
+    'viewportAlignment': viewportAlignment,
+  };
+
+  factory WysiwygEditorSessionState.fromJson(Map<String, Object?> json) {
+    return WysiwygEditorSessionState(
+      activeBlockId: json['activeBlockId']?.toString(),
+      anchorBlockId: json['anchorBlockId']?.toString(),
+      anchorOffset: (json['anchorOffset'] as num?)?.toInt() ?? 0,
+      extentBlockId: json['extentBlockId']?.toString(),
+      extentOffset: (json['extentOffset'] as num?)?.toInt() ?? 0,
+      viewportBlockId: json['viewportBlockId']?.toString(),
+      viewportAlignment: (json['viewportAlignment'] as num?)?.toDouble() ?? 0,
+    );
+  }
+}
diff --git a/lib/src/editor/wysiwyg/wysiwyg_toolbar.dart b/lib/src/editor/wysiwyg/wysiwyg_toolbar.dart
index 84d99f2f..972b6cd2 100644
--- a/lib/src/editor/wysiwyg/wysiwyg_toolbar.dart
+++ b/lib/src/editor/wysiwyg/wysiwyg_toolbar.dart
@@ -4,14 +4,18 @@ import '../../app/busymark_design.dart';
 import '../../app/busymark_glyphs.dart';
 import '../../app/busymark_shortcuts.dart';
 import '../../app/localization.dart';
+import '../../markdown/busymark_document.dart';
 import 'wysiwyg_commands.dart';
 
 class BusyMarkWysiwygToolbar extends StatelessWidget {
   const BusyMarkWysiwygToolbar({
     super.key,
     required this.onBlockCommand,
+    this.onAdmonitionCommand,
     required this.onInlineCommand,
     required this.onLinkCommand,
+    required this.onInlineMathCommand,
+    required this.onDisplayMathCommand,
     required this.onImageCommand,
     required this.onInlineImageCommand,
     required this.onTableCommand,
@@ -20,13 +24,17 @@ class BusyMarkWysiwygToolbar extends StatelessWidget {
     required this.onOutdentCommand,
     required this.onToggleTaskCommand,
     required this.onHardBreakCommand,
+    this.admonitionsEnabled = false,
     this.alignEnd = false,
     this.axis = Axis.horizontal,
   });
 
   final ValueChanged<BusyWysiwygBlockCommand> onBlockCommand;
+  final ValueChanged<BusyAdmonitionStyle>? onAdmonitionCommand;
   final ValueChanged<BusyWysiwygInlineCommand> onInlineCommand;
   final VoidCallback onLinkCommand;
+  final VoidCallback onInlineMathCommand;
+  final VoidCallback onDisplayMathCommand;
   final VoidCallback onImageCommand;
   final VoidCallback onInlineImageCommand;
   final VoidCallback onTableCommand;
@@ -35,6 +43,7 @@ class BusyMarkWysiwygToolbar extends StatelessWidget {
   final VoidCallback onOutdentCommand;
   final VoidCallback onToggleTaskCommand;
   final VoidCallback onHardBreakCommand;
+  final bool admonitionsEnabled;
   final bool alignEnd;
   final Axis axis;
 
@@ -106,6 +115,12 @@ class BusyMarkWysiwygToolbar extends StatelessWidget {
               shortcut: BusyMarkEditorShortcutLabels.link,
               onPressed: onLinkCommand,
             ),
+            _button(
+              context,
+              tooltip: context.l10n.inlineMath,
+              icon: BusyMarkGlyphs.math,
+              onPressed: onInlineMathCommand,
+            ),
             _button(
               context,
               tooltip: context.l10n.hardLineBreak,
@@ -115,6 +130,8 @@ class BusyMarkWysiwygToolbar extends StatelessWidget {
             ),
           ],
           [
+            if (admonitionsEnabled && onAdmonitionCommand != null)
+              _admonitionMenu(context),
             _button(
               context,
               tooltip: context.l10n.blockquote,
@@ -131,6 +148,12 @@ class BusyMarkWysiwygToolbar extends StatelessWidget {
               onPressed: () =>
                   onBlockCommand(BusyWysiwygBlockCommand.codeBlock),
             ),
+            _button(
+              context,
+              tooltip: context.l10n.displayMath,
+              icon: BusyMarkGlyphs.math,
+              onPressed: onDisplayMathCommand,
+            ),
             _button(
               context,
               tooltip: context.l10n.htmlBlock,
@@ -291,6 +314,40 @@ class BusyMarkWysiwygToolbar extends StatelessWidget {
     );
   }
 
+  Widget _admonitionMenu(BuildContext context) {
+    return BusyMarkHeaderPopupMenuButton<BusyAdmonitionStyle>(
+      tooltip: context.l10n.admonition,
+      icon: BusyMarkGlyphs.info,
+      transparent: false,
+      elevated: true,
+      foregroundColor: BusyMarkLinuxPalette.white,
+      backgroundColor: _editorToolbarButtonBackground(context),
+      itemBuilder: (context) => [
+        BusyMarkPopupMenuItem(
+          value: BusyAdmonitionStyle.tip,
+          label: context.l10n.tip,
+          icon: BusyMarkGlyphs.tip,
+        ),
+        BusyMarkPopupMenuItem(
+          value: BusyAdmonitionStyle.note,
+          label: context.l10n.note,
+          icon: BusyMarkGlyphs.info,
+        ),
+        BusyMarkPopupMenuItem(
+          value: BusyAdmonitionStyle.warning,
+          label: context.l10n.warning,
+          icon: BusyMarkGlyphs.warning,
+        ),
+        BusyMarkPopupMenuItem(
+          value: BusyAdmonitionStyle.quote,
+          label: context.l10n.quote,
+          icon: BusyMarkGlyphs.blockquote,
+        ),
+      ],
+      onSelected: onAdmonitionCommand!,
+    );
+  }
+
   Widget _button(
     BuildContext context, {
     required String tooltip,
diff --git a/lib/src/export/markdown_export_document.dart b/lib/src/export/markdown_export_document.dart
index 38750b84..6a525231 100644
--- a/lib/src/export/markdown_export_document.dart
+++ b/lib/src/export/markdown_export_document.dart
@@ -6,14 +6,17 @@ enum MarkdownExportBlockKind {
   code,
   list,
   listItem,
+  admonition,
   blockquote,
   thematicBreak,
   image,
+  video,
   table,
   tableRow,
   tableCell,
   rawText,
   group,
+  math,
   visualization,
   openApiReference,
 }
@@ -29,6 +32,7 @@ enum MarkdownExportInlineKind {
   image,
   softBreak,
   hardBreak,
+  math,
 }
 
 @immutable
@@ -63,6 +67,13 @@ class MarkdownExportDocument {
   final MarkdownExportMetadata metadata;
   final List<MarkdownExportBlock> blocks;
 
+  MarkdownExportDocument copyWith({List<MarkdownExportBlock>? blocks}) {
+    return MarkdownExportDocument(
+      metadata: metadata,
+      blocks: blocks ?? this.blocks,
+    );
+  }
+
   Iterable<String> get imageDestinations sync* {
     for (final block in blocks) {
       yield* block.imageDestinations;
@@ -86,7 +97,27 @@ class MarkdownExportBlock {
   final Map<String, Object> attributes;
   final String text;
 
+  MarkdownExportBlock copyWith({
+    List<MarkdownExportInline>? inlines,
+    List<MarkdownExportBlock>? children,
+    Map<String, Object>? attributes,
+  }) {
+    return MarkdownExportBlock(
+      kind: kind,
+      inlines: inlines ?? this.inlines,
+      children: children ?? this.children,
+      attributes: attributes ?? this.attributes,
+      text: text,
+    );
+  }
+
   Iterable<String> get imageDestinations sync* {
+    final preview = attributes['preview'];
+    if (kind == MarkdownExportBlockKind.video &&
+        preview is String &&
+        preview.trim().isNotEmpty) {
+      yield preview;
+    }
     for (final inline in inlines) {
       yield* inline.imageDestinations;
     }
@@ -112,6 +143,19 @@ class MarkdownExportInline {
   final List<MarkdownExportInline> children;
   final Map<String, String> attributes;
 
+  MarkdownExportInline copyWith({
+    List<MarkdownExportInline>? children,
+    Map<String, String>? attributes,
+  }) {
+    return MarkdownExportInline(
+      kind: kind,
+      text: text,
+      destination: destination,
+      children: children ?? this.children,
+      attributes: attributes ?? this.attributes,
+    );
+  }
+
   Iterable<String> get imageDestinations sync* {
     if (kind == MarkdownExportInlineKind.image &&
         destination != null &&
diff --git a/lib/src/export/markdown_export_mapper.dart b/lib/src/export/markdown_export_mapper.dart
index ba7604a5..3e084619 100644
--- a/lib/src/export/markdown_export_mapper.dart
+++ b/lib/src/export/markdown_export_mapper.dart
@@ -2,8 +2,20 @@ import 'package:path/path.dart' as p;
 
 import '../core/uri_utils.dart';
 import '../markdown/busymark_document.dart';
+import '../writerside/writerside_video.dart';
 import 'markdown_export_document.dart';
 
+const double busyMarkPdfBodyTextSize = 10.5;
+
+double busyMarkPdfHeadingTextSize(int level) => switch (level.clamp(1, 6)) {
+  1 => 22,
+  2 => 17,
+  3 => 13.5,
+  4 => 11.5,
+  5 || 6 => busyMarkPdfBodyTextSize,
+  _ => busyMarkPdfBodyTextSize,
+};
+
 class MarkdownExportMapper {
   const MarkdownExportMapper();
 
@@ -126,19 +138,21 @@ class MarkdownExportMapper {
     Map<String, MarkdownExportBlock> blockOverrides,
   ) {
     return switch (block.kind) {
-      BusyBlockKind.heading => MarkdownExportBlock(
-        kind: MarkdownExportBlockKind.heading,
-        inlines: _mapInlines(block.inlines),
-        attributes: {
-          'level':
-              int.tryParse(block.attributes['level'] ?? '')?.clamp(1, 6) ?? 1,
-          if (_safeAnchor(block.attributes['id']) case final id?) 'id': id,
-        },
-      ),
+      BusyBlockKind.heading => _mapHeading(block),
       BusyBlockKind.paragraph => MarkdownExportBlock(
         kind: MarkdownExportBlockKind.paragraph,
         inlines: _mapInlines(block.inlines),
       ),
+      BusyBlockKind.math => MarkdownExportBlock(
+        kind: MarkdownExportBlockKind.math,
+        text: block.plainText,
+        attributes: {
+          'mathId': block.id,
+          'display': true,
+          if (block.attributes['mathSourceForm'] case final sourceForm?)
+            'sourceForm': sourceForm,
+        },
+      ),
       BusyBlockKind.codeBlock => MarkdownExportBlock(
         kind: MarkdownExportBlockKind.code,
         text: block.plainText,
@@ -148,15 +162,12 @@ class MarkdownExportMapper {
             'language': language,
         },
       ),
-      BusyBlockKind.blockquote => MarkdownExportBlock(
-        kind: MarkdownExportBlockKind.blockquote,
-        inlines: _mapInlines(block.inlines),
-        children: _mapBlocks(block.children, blockOverrides),
-      ),
+      BusyBlockKind.blockquote => _mapBlockquote(block, blockOverrides),
       BusyBlockKind.thematicBreak => const MarkdownExportBlock(
         kind: MarkdownExportBlockKind.thematicBreak,
       ),
       BusyBlockKind.image => _mapImageBlock(block),
+      BusyBlockKind.video => _mapVideoBlock(block),
       BusyBlockKind.table => _mapTable(block, blockOverrides),
       BusyBlockKind.htmlBlock when block.children.isNotEmpty =>
         MarkdownExportBlock(
@@ -171,7 +182,10 @@ class MarkdownExportMapper {
       BusyBlockKind.unorderedListItem ||
       BusyBlockKind.orderedListItem ||
       BusyBlockKind.taskListItem => _mapListItem(block, blockOverrides),
-      BusyBlockKind.writersideAdmonition ||
+      BusyBlockKind.writersideAdmonition => _mapWritersideAdmonition(
+        block,
+        blockOverrides,
+      ),
       BusyBlockKind.writersideTabs ||
       BusyBlockKind.writersideProcedure ||
       BusyBlockKind.writersideRawXml ||
@@ -186,6 +200,59 @@ class MarkdownExportMapper {
     };
   }
 
+  MarkdownExportBlock _mapBlockquote(
+    BusyBlock block,
+    Map<String, MarkdownExportBlock> blockOverrides,
+  ) {
+    final style = busyAdmonitionStyleFromName(block.attributes['style']);
+    final admonition =
+        block.attributes[busyMarkWritersideAdmonitionAttribute] == 'true' &&
+        style != BusyAdmonitionStyle.quote;
+    return MarkdownExportBlock(
+      kind: admonition
+          ? MarkdownExportBlockKind.admonition
+          : MarkdownExportBlockKind.blockquote,
+      inlines: _mapInlines(block.inlines),
+      children: _mapBlocks(block.children, blockOverrides),
+      attributes: {if (admonition) 'style': style?.name ?? 'tip'},
+    );
+  }
+
+  MarkdownExportBlock _mapWritersideAdmonition(
+    BusyBlock block,
+    Map<String, MarkdownExportBlock> blockOverrides,
+  ) {
+    final style =
+        busyAdmonitionStyleFromName(
+          block.attributes['style'] ?? block.attributes['element'],
+        ) ??
+        BusyAdmonitionStyle.note;
+    return MarkdownExportBlock(
+      kind: style == BusyAdmonitionStyle.quote
+          ? MarkdownExportBlockKind.blockquote
+          : MarkdownExportBlockKind.admonition,
+      inlines: _mapInlines(block.inlines),
+      children: _mapBlocks(block.children, blockOverrides),
+      attributes: {if (style != BusyAdmonitionStyle.quote) 'style': style.name},
+    );
+  }
+
+  MarkdownExportBlock _mapHeading(BusyBlock block) {
+    final level =
+        int.tryParse(block.attributes['level'] ?? '')?.clamp(1, 6) ?? 1;
+    return MarkdownExportBlock(
+      kind: MarkdownExportBlockKind.heading,
+      inlines: _mapInlines(
+        block.inlines,
+        mathEm: busyMarkPdfHeadingTextSize(level),
+      ),
+      attributes: {
+        'level': level,
+        if (_safeAnchor(block.attributes['id']) case final id?) 'id': id,
+      },
+    );
+  }
+
   MarkdownExportBlock _mapTable(
     BusyBlock table,
     Map<String, MarkdownExportBlock> blockOverrides,
@@ -236,12 +303,37 @@ class MarkdownExportMapper {
     );
   }
 
-  List<MarkdownExportInline> _mapInlines(List<BusyInline> inlines) {
-    return List.unmodifiable(inlines.map(_mapInline));
+  MarkdownExportBlock _mapVideoBlock(BusyBlock block) {
+    final source = block.attributes['src']?.trim() ?? '';
+    final preview = writersideVideoPreviewSource(
+      source,
+      block.attributes['preview-src'],
+    );
+    return MarkdownExportBlock(
+      kind: MarkdownExportBlockKind.video,
+      attributes: {
+        'source': source,
+        if (preview.isNotEmpty) 'preview': preview,
+        if (block.attributes['width'] case final width?) 'width': width,
+        if (block.attributes['height'] case final height?) 'height': height,
+      },
+    );
+  }
+
+  List<MarkdownExportInline> _mapInlines(
+    List<BusyInline> inlines, {
+    double mathEm = busyMarkPdfBodyTextSize,
+  }) {
+    return List.unmodifiable(
+      inlines.map((inline) => _mapInline(inline, mathEm: mathEm)),
+    );
   }
 
-  MarkdownExportInline _mapInline(BusyInline inline) {
-    final children = _mapInlines(inline.children);
+  MarkdownExportInline _mapInline(
+    BusyInline inline, {
+    double mathEm = busyMarkPdfBodyTextSize,
+  }) {
+    final children = _mapInlines(inline.children, mathEm: mathEm);
     return switch (inline.kind) {
       BusyInlineKind.text => MarkdownExportInline(
         kind: MarkdownExportInlineKind.text,
@@ -271,6 +363,18 @@ class MarkdownExportMapper {
         kind: MarkdownExportInlineKind.code,
         text: inline.text,
       ),
+      BusyInlineKind.math => MarkdownExportInline(
+        kind: MarkdownExportInlineKind.math,
+        text: inline.text,
+        attributes: {
+          'mathId': inline.attributes['expressionId'] ?? inline.text,
+          'display': 'false',
+          'renderEm': '$mathEm',
+          'renderEx': '${mathEm / 2}',
+          if (inline.attributes['mathSourceForm'] case final sourceForm?)
+            'sourceForm': sourceForm,
+        },
+      ),
       BusyInlineKind.link => MarkdownExportInline(
         kind: MarkdownExportInlineKind.link,
         text: inline.text,
diff --git a/lib/src/export/markdown_math_export.dart b/lib/src/export/markdown_math_export.dart
new file mode 100644
index 00000000..e02d70a1
--- /dev/null
+++ b/lib/src/export/markdown_math_export.dart
@@ -0,0 +1,347 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:crypto/crypto.dart';
+import 'package:path/path.dart' as p;
+
+import '../math/math_coordinator.dart';
+import '../math/math_models.dart';
+import '../math/math_svg_preprocessor.dart';
+import '../visualization/generated_svg_normalizer.dart';
+import 'markdown_export_document.dart';
+import 'markdown_pdf_models.dart';
+
+class MarkdownMathExportPreparation {
+  const MarkdownMathExportPreparation({
+    required this.document,
+    required this.warnings,
+  });
+
+  final MarkdownExportDocument document;
+  final List<MarkdownPdfWarning> warnings;
+}
+
+class MarkdownMathExportRenderer {
+  const MarkdownMathExportRenderer({
+    required this.coordinator,
+    this.svgNormalizer = const GeneratedSvgNormalizer(
+      maximumBytes: busyMarkMaximumMathSvgBytes,
+    ),
+    this.maximumExpressions = 512,
+    this.maximumGeneratedBytes = 64 * 1024 * 1024,
+  });
+
+  final MathCoordinator coordinator;
+  final GeneratedSvgNormalizer svgNormalizer;
+  final int maximumExpressions;
+  final int maximumGeneratedBytes;
+  static const _svgPreprocessor = MathSvgPreprocessor();
+
+  Future<MarkdownMathExportPreparation> prepare({
+    required MarkdownExportDocument document,
+    required Directory exportRoot,
+    required double containerWidth,
+    required MarkdownPdfCancellationToken cancellationToken,
+  }) async {
+    final annotated = _annotate(document);
+    final candidates = _mathCandidates(annotated).toList(growable: false);
+    if (candidates.isEmpty) {
+      return MarkdownMathExportPreparation(
+        document: document,
+        warnings: const [],
+      );
+    }
+    final selected = candidates
+        .take(maximumExpressions)
+        .toList(growable: false);
+    final blockKeys = [
+      for (final item in selected) 'pdf-math:${item.renderKey}',
+    ];
+    cancellationToken.attach(() {
+      for (final key in blockKeys) {
+        coordinator.cancel(key);
+      }
+    });
+    final results = <String, MathRenderResult>{};
+    try {
+      final rendered = await coordinator.renderAll([
+        for (final (index, item) in selected.indexed)
+          MathRenderRequest(
+            expressionId: item.renderKey,
+            expression: item.expression,
+            display: item.display,
+            blockKey: blockKeys[index],
+            editRevision: 0,
+            em: item.em,
+            ex: item.ex,
+            containerWidth: containerWidth,
+            renderProfile: 'pdf',
+          ),
+      ]);
+      for (final result in rendered) {
+        results[result.expressionId] = result;
+      }
+    } on Object {
+      cancellationToken.throwIfCancelled();
+    } finally {
+      cancellationToken.detach();
+      for (final key in blockKeys) {
+        coordinator.cancel(key);
+      }
+    }
+    cancellationToken.throwIfCancelled();
+
+    final assets = <String, _PreparedMathAsset>{};
+    final warnings = <MarkdownPdfWarning>[
+      if (candidates.length > maximumExpressions)
+        MarkdownPdfWarning(
+          MarkdownPdfWarningCode.mathLimitReached,
+          '${candidates.length - maximumExpressions} math expressions',
+        ),
+    ];
+    final generatedDirectory = Directory(
+      p.join(exportRoot.path, 'generated-assets'),
+    );
+    var generatedBytes = 0;
+    for (final item in selected) {
+      cancellationToken.throwIfCancelled();
+      final result = results[item.renderKey];
+      if (result is! RenderedMathResult) {
+        warnings.add(
+          MarkdownPdfWarning(
+            MarkdownPdfWarningCode.mathRenderFailed,
+            item.expression,
+          ),
+        );
+        continue;
+      }
+      try {
+        final normalized = svgNormalizer.normalize(
+          _svgPreprocessor.resolveCurrentColor(result.vectorSvg, '#000000'),
+        );
+        final svg = normalized.vectorSafeSvg;
+        if (svg == null) {
+          throw const GeneratedSvgException(
+            'math.unsafeOutput',
+            'Math SVG is not vector safe.',
+          );
+        }
+        final bytes = utf8.encode(svg);
+        if (bytes.length > maximumGeneratedBytes - generatedBytes) {
+          warnings.add(
+            MarkdownPdfWarning(
+              MarkdownPdfWarningCode.mathRenderFailed,
+              item.expression,
+            ),
+          );
+          continue;
+        }
+        await generatedDirectory.create(recursive: true);
+        final digest = sha256.convert(bytes).toString();
+        final filename = '$digest.svg';
+        final target = File(p.join(generatedDirectory.path, filename));
+        if (!await target.exists()) {
+          await target.writeAsBytes(bytes, flush: true);
+          generatedBytes += bytes.length;
+        }
+        assets[item.renderKey] = _PreparedMathAsset(
+          path: p.posix.join('generated-assets', filename),
+          width: result.width,
+          height: result.height,
+          depth: result.depth,
+        );
+      } on GeneratedSvgException {
+        warnings.add(
+          MarkdownPdfWarning(
+            MarkdownPdfWarningCode.mathRenderFailed,
+            item.expression,
+          ),
+        );
+      }
+    }
+    return MarkdownMathExportPreparation(
+      document: _applyAssets(annotated, assets),
+      warnings: List.unmodifiable(warnings),
+    );
+  }
+
+  MarkdownExportDocument _annotate(MarkdownExportDocument document) {
+    MarkdownExportInline inline(MarkdownExportInline value, String path) {
+      final children = [
+        for (final (index, child) in value.children.indexed)
+          inline(child, '$path.i$index'),
+      ];
+      if (value.kind != MarkdownExportInlineKind.math) {
+        return value.copyWith(children: children);
+      }
+      return value.copyWith(
+        children: children,
+        attributes: {
+          ...value.attributes,
+          'mathRenderKey': _renderKey(path, value.text, false),
+        },
+      );
+    }
+
+    MarkdownExportBlock block(MarkdownExportBlock value, String path) {
+      final inlines = [
+        for (final (index, child) in value.inlines.indexed)
+          inline(child, '$path.i$index'),
+      ];
+      final children = [
+        for (final (index, child) in value.children.indexed)
+          block(child, '$path.b$index'),
+      ];
+      if (value.kind != MarkdownExportBlockKind.math) {
+        return value.copyWith(inlines: inlines, children: children);
+      }
+      return value.copyWith(
+        inlines: inlines,
+        children: children,
+        attributes: {
+          ...value.attributes,
+          'mathRenderKey': _renderKey(path, value.text, true),
+        },
+      );
+    }
+
+    return document.copyWith(
+      blocks: [
+        for (final (index, value) in document.blocks.indexed)
+          block(value, 'b$index'),
+      ],
+    );
+  }
+
+  Iterable<_MathExportCandidate> _mathCandidates(
+    MarkdownExportDocument document,
+  ) sync* {
+    Iterable<_MathExportCandidate> inlines(
+      List<MarkdownExportInline> values,
+    ) sync* {
+      for (final value in values) {
+        if (value.kind == MarkdownExportInlineKind.math) {
+          yield _MathExportCandidate(
+            renderKey: value.attributes['mathRenderKey']!,
+            expression: value.text,
+            display: false,
+            em: double.tryParse(value.attributes['renderEm'] ?? '') ?? 10.5,
+            ex: double.tryParse(value.attributes['renderEx'] ?? '') ?? 5.25,
+          );
+        }
+        yield* inlines(value.children);
+      }
+    }
+
+    Iterable<_MathExportCandidate> blocks(
+      List<MarkdownExportBlock> values,
+    ) sync* {
+      for (final value in values) {
+        if (value.kind == MarkdownExportBlockKind.math) {
+          yield _MathExportCandidate(
+            renderKey: value.attributes['mathRenderKey']! as String,
+            expression: value.text,
+            display: true,
+            em: 10.5,
+            ex: 5.25,
+          );
+        }
+        yield* inlines(value.inlines);
+        yield* blocks(value.children);
+      }
+    }
+
+    yield* blocks(document.blocks);
+  }
+
+  MarkdownExportDocument _applyAssets(
+    MarkdownExportDocument document,
+    Map<String, _PreparedMathAsset> assets,
+  ) {
+    Map<String, String> inlineAttributes(Map<String, String> source) {
+      final asset = assets[source['mathRenderKey']];
+      return {
+        ...source,
+        if (asset != null) ...{
+          'asset': asset.path,
+          'width': '${asset.width}',
+          'height': '${asset.height}',
+          'depth': '${asset.depth}',
+          'vector': 'true',
+        } else
+          'failed': 'true',
+      };
+    }
+
+    MarkdownExportInline inline(MarkdownExportInline value) {
+      return value.copyWith(
+        children: value.children.map(inline).toList(growable: false),
+        attributes: value.kind == MarkdownExportInlineKind.math
+            ? inlineAttributes(value.attributes)
+            : value.attributes,
+      );
+    }
+
+    MarkdownExportBlock block(MarkdownExportBlock value) {
+      final key = value.attributes['mathRenderKey'] as String?;
+      final asset = assets[key];
+      return value.copyWith(
+        inlines: value.inlines.map(inline).toList(growable: false),
+        children: value.children.map(block).toList(growable: false),
+        attributes: value.kind == MarkdownExportBlockKind.math
+            ? {
+                ...value.attributes,
+                if (asset != null) ...{
+                  'asset': asset.path,
+                  'width': '${asset.width}',
+                  'height': '${asset.height}',
+                  'depth': '${asset.depth}',
+                  'vector': 'true',
+                } else
+                  'failed': 'true',
+              }
+            : value.attributes,
+      );
+    }
+
+    return document.copyWith(
+      blocks: document.blocks.map(block).toList(growable: false),
+    );
+  }
+
+  String _renderKey(String path, String expression, bool display) {
+    return sha256
+        .convert(utf8.encode('$path\u0000$display\u0000$expression'))
+        .toString();
+  }
+}
+
+class _MathExportCandidate {
+  const _MathExportCandidate({
+    required this.renderKey,
+    required this.expression,
+    required this.display,
+    required this.em,
+    required this.ex,
+  });
+
+  final String renderKey;
+  final String expression;
+  final bool display;
+  final double em;
+  final double ex;
+}
+
+class _PreparedMathAsset {
+  const _PreparedMathAsset({
+    required this.path,
+    required this.width,
+    required this.height,
+    required this.depth,
+  });
+
+  final String path;
+  final double width;
+  final double height;
+  final double depth;
+}
diff --git a/lib/src/export/markdown_pdf_export_service.dart b/lib/src/export/markdown_pdf_export_service.dart
index 7b602ba6..903f3b45 100644
--- a/lib/src/export/markdown_pdf_export_service.dart
+++ b/lib/src/export/markdown_pdf_export_service.dart
@@ -8,6 +8,7 @@ import '../core/atomic_file_writer.dart';
 import '../markdown/markdown_parser.dart';
 import 'markdown_export_assets.dart';
 import 'markdown_export_mapper.dart';
+import 'markdown_math_export.dart';
 import 'markdown_pdf_models.dart';
 import 'markdown_visualization_export.dart';
 import 'typst_compiler.dart';
@@ -28,6 +29,7 @@ class MarkdownPdfExportService {
     this.compileTimeout = const Duration(seconds: 45),
     this.maximumPdfBytes = 100 * 1024 * 1024,
     this.visualizationRenderer,
+    this.mathRenderer,
   });
 
   final MarkdownParser parser;
@@ -41,6 +43,7 @@ class MarkdownPdfExportService {
   final Duration compileTimeout;
   final int maximumPdfBytes;
   final MarkdownVisualizationExportRenderer? visualizationRenderer;
+  final MarkdownMathExportRenderer? mathRenderer;
 
   Future<MarkdownPdfExportResult> export(
     MarkdownPdfExportRequest request, {
@@ -71,6 +74,7 @@ class MarkdownPdfExportService {
       final parsed = await parser.parseAsync(
         filePath: effectiveFilePath,
         source: request.source,
+        mode: request.mode,
         workspaceRoot: request.workspaceRoot.isEmpty
             ? null
             : request.workspaceRoot,
@@ -90,10 +94,23 @@ class MarkdownPdfExportService {
               cancellationToken: token,
             );
       token.throwIfCancelled();
-      final document = mapper.map(
+      final mappedDocument = mapper.map(
         parsed.busyDocument,
         blockOverrides: visualizationPreparation.blockOverrides,
       );
+      final mathPreparation = mathRenderer == null
+          ? MarkdownMathExportPreparation(
+              document: mappedDocument,
+              warnings: const [],
+            )
+          : await mathRenderer!.prepare(
+              document: mappedDocument,
+              exportRoot: exportRoot,
+              containerWidth: _pdfContentWidth(request.options),
+              cancellationToken: token,
+            );
+      token.throwIfCancelled();
+      final document = mathPreparation.document;
       final stagedAssets = await assetStager.stage(
         document: document,
         exportRoot: exportRoot,
@@ -175,6 +192,7 @@ class MarkdownPdfExportService {
         pageCount: _pageCount(pdfBytes),
         warnings: [
           ...visualizationPreparation.warnings,
+          ...mathPreparation.warnings,
           ...stagedAssets.warnings,
         ],
       );
@@ -191,6 +209,27 @@ class MarkdownPdfExportService {
     }
   }
 
+  double _pdfContentWidth(MarkdownPdfOptions options) {
+    final pageWidth = switch (options.pageSize) {
+      MarkdownPdfPageSize.a4 => 595.28,
+      MarkdownPdfPageSize.letter => 612.0,
+    };
+    final pageHeight = switch (options.pageSize) {
+      MarkdownPdfPageSize.a4 => 841.89,
+      MarkdownPdfPageSize.letter => 792.0,
+    };
+    final horizontalMargin = switch (options.margin) {
+      MarkdownPdfMargin.narrow => 36.0,
+      MarkdownPdfMargin.normal => 57.0,
+      MarkdownPdfMargin.wide => 78.0,
+    };
+    final orientedWidth =
+        options.orientation == MarkdownPdfOrientation.landscape
+        ? pageHeight
+        : pageWidth;
+    return orientedWidth - 2 * horizontalMargin;
+  }
+
   static Future<String> _loadBundledTemplate() {
     return rootBundle.loadString('assets/export/markdown.typ');
   }
diff --git a/lib/src/export/markdown_pdf_export_ui.dart b/lib/src/export/markdown_pdf_export_ui.dart
index b3a44c8c..ac82bb85 100644
--- a/lib/src/export/markdown_pdf_export_ui.dart
+++ b/lib/src/export/markdown_pdf_export_ui.dart
@@ -10,12 +10,15 @@ import 'package:url_launcher/url_launcher.dart';
 import '../app/busymark_dialogs.dart';
 import '../app/busymark_design.dart';
 import '../app/busymark_glyphs.dart';
+import '../app/busymark_toast.dart';
 import '../app/localization.dart';
 import '../platform/linux_header_bar_service.dart';
+import '../math/math_providers.dart';
 import '../workspace/workspace_model.dart';
 import '../workspace/workspace_controller.dart';
 import '../visualization/visualization_providers.dart';
 import 'markdown_visualization_export.dart';
+import 'markdown_math_export.dart';
 import 'markdown_pdf_export_service.dart';
 import 'markdown_pdf_models.dart';
 import 'writerside_pdf_export_ui.dart';
@@ -25,6 +28,9 @@ final markdownPdfExportServiceProvider = Provider<MarkdownPdfExportService>(
     visualizationRenderer: MarkdownVisualizationExportRenderer(
       coordinator: ref.watch(visualizationCoordinatorProvider),
     ),
+    mathRenderer: MarkdownMathExportRenderer(
+      coordinator: ref.watch(mathCoordinatorProvider),
+    ),
   ),
 );
 
@@ -158,17 +164,14 @@ Future<void> exportActiveMarkdownToPdf(
   final message = result.warnings.isEmpty
       ? context.l10n.pdfExported(fileName)
       : context.l10n.pdfExportedWithWarnings(fileName, result.warnings.length);
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(
-      content: Text(message),
-      action: SnackBarAction(
-        label: context.l10n.open,
-        onPressed: () => unawaited(
-          launchUrl(
-            Uri.file(result.destinationPath),
-            mode: LaunchMode.externalApplication,
-          ),
-        ),
+  BusyMarkToastOverlay.show(
+    context,
+    message: message,
+    actionLabel: context.l10n.open,
+    onAction: () => unawaited(
+      launchUrl(
+        Uri.file(result.destinationPath),
+        mode: LaunchMode.externalApplication,
       ),
     ),
   );
diff --git a/lib/src/export/markdown_pdf_models.dart b/lib/src/export/markdown_pdf_models.dart
index 99bcede5..2fe876bb 100644
--- a/lib/src/export/markdown_pdf_models.dart
+++ b/lib/src/export/markdown_pdf_models.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/foundation.dart';
 
+import '../markdown/markdown_model.dart';
+
 enum MarkdownPdfPageSize { a4, letter }
 
 enum MarkdownPdfOrientation { portrait, landscape }
@@ -59,6 +61,8 @@ enum MarkdownPdfWarningCode {
   imageReadFailed,
   visualizationRenderFailed,
   visualizationLimitReached,
+  mathRenderFailed,
+  mathLimitReached,
 }
 
 @immutable
@@ -78,6 +82,7 @@ class MarkdownPdfExportRequest {
     required this.destinationPath,
     required this.options,
     required this.overwrite,
+    this.mode = MarkdownMode.commonMark,
   });
 
   final String source;
@@ -86,6 +91,7 @@ class MarkdownPdfExportRequest {
   final String destinationPath;
   final MarkdownPdfOptions options;
   final bool overwrite;
+  final MarkdownMode mode;
 }
 
 @immutable
diff --git a/lib/src/export/markdown_visualization_export.dart b/lib/src/export/markdown_visualization_export.dart
index e21ee5fe..9c45d1c0 100644
--- a/lib/src/export/markdown_visualization_export.dart
+++ b/lib/src/export/markdown_visualization_export.dart
@@ -10,6 +10,7 @@ import '../visualization/generated_svg_normalizer.dart';
 import '../visualization/visualization_coordinator.dart';
 import '../visualization/visualization_models.dart';
 import '../visualization/visualization_renderer.dart';
+import '../writerside/writerside_diagram_source_loader.dart';
 import 'markdown_export_document.dart';
 import 'markdown_pdf_models.dart';
 import 'openapi_static_export_mapper.dart';
@@ -32,6 +33,7 @@ class MarkdownVisualizationExportRenderer {
     required this.coordinator,
     this.svgNormalizer = const GeneratedSvgNormalizer(),
     this.openApiMapper = const OpenApiStaticExportMapper(),
+    this.diagramSourceLoader = const WritersideDiagramSourceLoader(),
     this.maximumBlocks = 64,
     this.maximumGeneratedBytes = 64 * 1024 * 1024,
   });
@@ -39,6 +41,7 @@ class MarkdownVisualizationExportRenderer {
   final VisualizationCoordinator coordinator;
   final GeneratedSvgNormalizer svgNormalizer;
   final OpenApiStaticExportMapper openApiMapper;
+  final WritersideDiagramSourceLoader diagramSourceLoader;
   final int maximumBlocks;
   final int maximumGeneratedBytes;
 
@@ -146,11 +149,20 @@ class MarkdownVisualizationExportRenderer {
       block.attributes['language'],
     );
     try {
+      var source = block.plainText;
+      final sourceReference = block.attributes['src']?.trim() ?? '';
+      if (sourceReference.isNotEmpty) {
+        source = await diagramSourceLoader.load(
+          reference: sourceReference,
+          documentPath: documentPath,
+          workspaceRoot: workspaceRoot,
+        );
+      }
       final result = await coordinator.render(
         VisualizationRenderRequest(
           blockKey: blockKey,
           kind: descriptor.kind,
-          source: block.plainText,
+          source: source,
           sourceStartLine: block.sourceSpan?.startLine ?? 1,
           documentPath: documentPath,
           workspaceRoot: workspaceRoot,
diff --git a/lib/src/export/typst_payload_builder.dart b/lib/src/export/typst_payload_builder.dart
index dd25d94a..64ce21bf 100644
--- a/lib/src/export/typst_payload_builder.dart
+++ b/lib/src/export/typst_payload_builder.dart
@@ -30,6 +30,8 @@ class TypstPayloadBuilder {
         ],
       if (block.children.isNotEmpty)
         'children': [for (final child in block.children) _block(child, assets)],
+      if (block.kind == MarkdownExportBlockKind.video)
+        'asset': assets[block.attributes['preview']] ?? '',
       ...block.attributes,
     };
   }
@@ -51,6 +53,7 @@ class TypstPayloadBuilder {
         'children': [
           for (final child in inline.children) _inline(child, assets),
         ],
+      ...inline.attributes,
     };
   }
 }
diff --git a/lib/src/export/writerside_pdf_configuration.dart b/lib/src/export/writerside_pdf_configuration.dart
deleted file mode 100644
index 37e7d8f3..00000000
--- a/lib/src/export/writerside_pdf_configuration.dart
+++ /dev/null
@@ -1,157 +0,0 @@
-import 'dart:io';
-
-import 'package:path/path.dart' as p;
-import 'package:xml/xml.dart';
-
-import 'writerside_pdf_models.dart';
-
-class WritersidePdfConfigurationCodec {
-  const WritersidePdfConfigurationCodec();
-
-  String encode(WritersidePdfOptions options, {String? containerLogoPath}) {
-    final builder = XmlBuilder();
-    builder.processing('xml', 'version="1.0" encoding="UTF-8"');
-    builder.element(
-      'pdf',
-      attributes: {
-        'landscape': options.orientation.name == 'landscape' ? 'true' : 'false',
-      },
-      nest: () {
-        final cover = options.cover;
-        if (cover.enabled) {
-          builder.element(
-            'cover-page',
-            nest: () {
-              _textElement(builder, 'title', cover.title);
-              _textElement(builder, 'logo', containerLogoPath ?? '');
-              _textElement(builder, 'description', cover.description);
-              _textElement(builder, 'copyright', cover.copyright);
-            },
-          );
-        }
-        _textElement(builder, 'header', options.header);
-        _textElement(builder, 'footer', options.footer);
-        _textElement(builder, 'toc-title', options.tocTitle);
-        _textElement(builder, 'layout', options.layout);
-      },
-    );
-    return '${builder.buildDocument().toXmlString(pretty: true)}\n';
-  }
-
-  bool isPdfConfiguration(String source) {
-    try {
-      return XmlDocument.parse(source).rootElement.name.local == 'pdf';
-    } on XmlException {
-      return false;
-    }
-  }
-
-  Future<List<String>> discover({
-    required String moduleRoot,
-    required String buildConfigDirectory,
-    int maximumFileBytes = 1024 * 1024,
-  }) async {
-    final directory = Directory(
-      p.normalize(p.join(moduleRoot, buildConfigDirectory)),
-    );
-    if (!await directory.exists()) {
-      return const [];
-    }
-    final result = <String>[];
-    await for (final entity in directory.list(followLinks: false)) {
-      if (entity is! File || p.extension(entity.path).toLowerCase() != '.xml') {
-        continue;
-      }
-      try {
-        if (await entity.length() > maximumFileBytes) {
-          continue;
-        }
-        if (isPdfConfiguration(await entity.readAsString())) {
-          result.add(p.normalize(p.absolute(entity.path)));
-        }
-      } on FileSystemException {
-        // A concurrently removed or unreadable candidate is not selectable.
-      }
-    }
-    result.sort((left, right) => p.basename(left).compareTo(p.basename(right)));
-    return List.unmodifiable(result);
-  }
-
-  Future<List<WritersidePdfKeymapLayout>> discoverLayouts({
-    required String moduleRoot,
-    required String buildConfigDirectory,
-    required String instanceId,
-    int maximumFileBytes = 4 * 1024 * 1024,
-  }) async {
-    final file = File(
-      p.normalize(
-        p.join(moduleRoot, buildConfigDirectory, 'buildprofiles.xml'),
-      ),
-    );
-    try {
-      if (!await file.exists() || await file.length() > maximumFileBytes) {
-        return const [];
-      }
-      final document = XmlDocument.parse(await file.readAsString());
-      if (document.rootElement.name.local != 'buildprofiles') {
-        return const [];
-      }
-      final layouts = <String, WritersidePdfKeymapLayout>{};
-      for (final shortcuts in document.descendants.whereType<XmlElement>()) {
-        if (shortcuts.name.local != 'shortcuts' ||
-            !_appliesToInstance(
-              shortcuts.getAttribute('instance'),
-              instanceId,
-            )) {
-          continue;
-        }
-        for (final layout in shortcuts.childElements.where(
-          (element) => element.name.local == 'layout',
-        )) {
-          if (!_appliesToInstance(
-            layout.getAttribute('instance'),
-            instanceId,
-          )) {
-            continue;
-          }
-          final name = layout.getAttribute('name')?.trim() ?? '';
-          if (name.isEmpty) {
-            continue;
-          }
-          layouts[name] = WritersidePdfKeymapLayout(
-            name: name,
-            displayName:
-                layout.getAttribute('display-name')?.trim().isNotEmpty == true
-                ? layout.getAttribute('display-name')!.trim()
-                : name,
-          );
-        }
-      }
-      return List.unmodifiable(layouts.values);
-    } on FileSystemException {
-      return const [];
-    } on XmlException {
-      return const [];
-    }
-  }
-
-  void _textElement(XmlBuilder builder, String name, String value) {
-    final normalized = value.trim();
-    if (normalized.isNotEmpty) {
-      builder.element(name, nest: normalized);
-    }
-  }
-
-  bool _appliesToInstance(String? condition, String instanceId) {
-    final normalized = condition?.trim();
-    if (normalized == null || normalized.isEmpty) {
-      return true;
-    }
-    final values = normalized
-        .split(',')
-        .map((value) => value.trim())
-        .where((value) => value.isNotEmpty)
-        .toSet();
-    return values.contains(instanceId);
-  }
-}
diff --git a/lib/src/export/writerside_pdf_export_service.dart b/lib/src/export/writerside_pdf_export_service.dart
index 7621cebc..d268a093 100644
--- a/lib/src/export/writerside_pdf_export_service.dart
+++ b/lib/src/export/writerside_pdf_export_service.dart
@@ -1,1011 +1,564 @@
-import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
-
-import '../core/atomic_file_writer.dart';
-import 'writerside_pdf_configuration.dart';
+import 'package:xml/xml.dart';
+
+import '../core/uri_utils.dart';
+import '../markdown/markdown_model.dart';
+import '../writerside/writerside_model.dart';
+import '../writerside/writerside_module_service.dart';
+import 'markdown_pdf_export_service.dart';
+import 'markdown_pdf_models.dart';
 import 'writerside_pdf_models.dart';
 
-class DockerExecutableLocator {
-  const DockerExecutableLocator({this.environment});
-
-  final Map<String, String>? environment;
-
-  String? locate() {
-    final values = environment ?? Platform.environment;
-    final override = values['BUSYMARK_DOCKER_PATH']?.trim();
-    if (override != null && override.isNotEmpty) {
-      return _executable(override);
-    }
-    for (final directory in (values['PATH'] ?? '').split(':')) {
-      if (directory.isEmpty) {
-        continue;
-      }
-      final candidate = _executable(p.join(directory, 'docker'));
-      if (candidate != null) {
-        return candidate;
-      }
-    }
-    return null;
-  }
-
-  String? _executable(String path) {
-    try {
-      final file = File(p.normalize(p.absolute(path)));
-      final stat = file.statSync();
-      return stat.type == FileSystemEntityType.file && stat.mode & 0x49 != 0
-          ? file.path
-          : null;
-    } on FileSystemException {
-      return null;
-    }
-  }
-}
-
-class WritersideBuilderProcessResult {
-  const WritersideBuilderProcessResult({
-    required this.exitCode,
-    required this.stdout,
-    required this.stderr,
-  });
-
-  final int exitCode;
-  final String stdout;
-  final String stderr;
-}
-
-abstract class WritersideBuilderCommandRunner {
-  Future<WritersideBuilderProcessResult> run({
-    required String executable,
-    required List<String> arguments,
-    required Duration timeout,
-    required WritersidePdfCancellationToken cancellationToken,
-    String? containerName,
-  });
-}
-
-class DartWritersideBuilderCommandRunner
-    implements WritersideBuilderCommandRunner {
-  const DartWritersideBuilderCommandRunner({
-    this.maximumDiagnosticBytes = 1024 * 1024,
+/// Exports one Writerside instance with BusyMark's bundled PDF toolchain.
+///
+/// This service deliberately has no container-runtime dependency. Writerside
+/// topics are selected through the resolved instance TOC, composed in that
+/// order, and handed to the same offline Typst, MathJax, and diagram pipeline
+/// used for ordinary Markdown documents.
+class WritersidePdfExportService {
+  const WritersidePdfExportService({
+    this.moduleService = const WritersideModuleService(),
+    this.markdownExporter = const MarkdownPdfExportService(),
+    this.maximumTopics = 2000,
+    this.maximumCombinedSourceBytes = 64 * 1024 * 1024,
   });
 
-  final int maximumDiagnosticBytes;
+  final WritersideModuleService moduleService;
+  final MarkdownPdfExportService markdownExporter;
+  final int maximumTopics;
+  final int maximumCombinedSourceBytes;
 
-  @override
-  Future<WritersideBuilderProcessResult> run({
-    required String executable,
-    required List<String> arguments,
-    required Duration timeout,
-    required WritersidePdfCancellationToken cancellationToken,
-    String? containerName,
+  Future<WritersidePdfExportResult> export(
+    WritersidePdfExportRequest request, {
+    WritersidePdfCancellationToken? cancellationToken,
   }) async {
-    cancellationToken.throwIfCancelled();
-    final Process process;
-    try {
-      process = await Process.start(
-        executable,
-        arguments,
-        includeParentEnvironment: true,
-        runInShell: false,
-      );
-    } on Object catch (error) {
+    final token = cancellationToken ?? WritersidePdfCancellationToken();
+    token.throwIfCancelled();
+    final moduleRoot = await _validatedModuleRoot(request.moduleRoot);
+    final module = await moduleService.load(moduleRoot);
+    token.throwIfCancelled();
+    final instance = module.instances
+        .where(
+          (candidate) =>
+              candidate.id == request.instanceId && !candidate.isLibrary,
+        )
+        .firstOrNull;
+    if (instance == null) {
       throw WritersidePdfExportException(
-        WritersidePdfFailureCode.dockerUnavailable,
-        detail: error.toString(),
-        cause: error,
+        WritersidePdfFailureCode.invalidRequest,
+        detail: 'Unknown or non-exportable instance: ${request.instanceId}',
       );
     }
-
-    var cancelled = false;
-    var exited = false;
-    final exitCode = process.exitCode.then((value) {
-      exited = true;
-      return value;
-    });
-    cancellationToken.attach(() {
-      cancelled = true;
-      process.kill(ProcessSignal.sigterm);
-      if (containerName != null) {
-        unawaited(_removeContainer(executable, containerName));
-      }
-      unawaited(
-        Future<void>.delayed(const Duration(milliseconds: 500), () {
-          if (!exited) {
-            process.kill(ProcessSignal.sigkill);
-          }
-        }),
-      );
-    });
-    final stdout = _collectBounded(process.stdout);
-    final stderr = _collectBounded(process.stderr);
-    try {
-      final code = await exitCode.timeout(timeout);
-      if (cancelled || cancellationToken.isCancelled) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.cancelled,
-        );
-      }
-      return WritersideBuilderProcessResult(
-        exitCode: code,
-        stdout: await stdout,
-        stderr: await stderr,
-      );
-    } on TimeoutException {
-      process.kill(ProcessSignal.sigterm);
-      if (containerName != null) {
-        unawaited(_removeContainer(executable, containerName));
-      }
-      await Future.any<void>([
-        exitCode.then((_) {}),
-        Future<void>.delayed(const Duration(milliseconds: 500)),
-      ]);
-      if (!exited) {
-        process.kill(ProcessSignal.sigkill);
-      }
+    final source = await _composeInstanceSource(module, instance, token);
+    if (source.trim().isEmpty) {
       throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.timedOut,
+        WritersidePdfFailureCode.invalidRequest,
+        detail: 'The selected instance contains no exportable topics.',
       );
-    } finally {
-      cancellationToken.detach();
     }
-  }
-
-  Future<String> _collectBounded(Stream<List<int>> stream) async {
-    final bytes = <int>[];
-    await for (final chunk in stream) {
-      final remaining = maximumDiagnosticBytes - bytes.length;
-      if (remaining > 0) {
-        bytes.addAll(chunk.take(remaining));
-      }
-    }
-    return utf8.decode(bytes, allowMalformed: true);
-  }
-
-  Future<void> _removeContainer(String executable, String name) async {
-    try {
-      await Process.run(executable, [
-        'rm',
-        '--force',
-        name,
-      ], runInShell: false).timeout(const Duration(seconds: 10));
-    } on Object {
-      // Best-effort cleanup; cancellation/timeout remains the primary result.
-    }
-  }
-}
-
-class WritersidePdfExportService {
-  const WritersidePdfExportService({
-    this.dockerLocator = const DockerExecutableLocator(),
-    this.commandRunner = const DartWritersideBuilderCommandRunner(),
-    this.configurationCodec = const WritersidePdfConfigurationCodec(),
-    this.fileWriter = const AtomicFileWriter(),
-    this.buildTimeout = const Duration(minutes: 15),
-    this.pullTimeout = const Duration(hours: 1),
-    this.maximumPdfBytes = 250 * 1024 * 1024,
-    this.maximumSourceCopyBytes = 2 * 1024 * 1024 * 1024,
-    this.maximumSourceCopyEntries = 100000,
-  });
-
-  final DockerExecutableLocator dockerLocator;
-  final WritersideBuilderCommandRunner commandRunner;
-  final WritersidePdfConfigurationCodec configurationCodec;
-  final AtomicFileWriter fileWriter;
-  final Duration buildTimeout;
-  final Duration pullTimeout;
-  final int maximumPdfBytes;
-  final int maximumSourceCopyBytes;
-  final int maximumSourceCopyEntries;
-
-  Future<List<String>> discoverProjectConfigurations({
-    required String moduleRoot,
-    required String buildConfigDirectory,
-  }) {
-    return configurationCodec.discover(
-      moduleRoot: moduleRoot,
-      buildConfigDirectory: buildConfigDirectory,
-    );
-  }
-
-  Future<List<WritersidePdfKeymapLayout>> discoverLayouts({
-    required String moduleRoot,
-    required String buildConfigDirectory,
-    required String instanceId,
-  }) {
-    return configurationCodec.discoverLayouts(
-      moduleRoot: moduleRoot,
-      buildConfigDirectory: buildConfigDirectory,
-      instanceId: instanceId,
-    );
-  }
-
-  Future<bool> isBuilderAvailable(
-    String version, {
-    WritersidePdfCancellationToken? cancellationToken,
-  }) async {
-    _validateBuilderVersion(version);
-    final token = cancellationToken ?? WritersidePdfCancellationToken();
-    final executable = dockerLocator.locate();
-    if (executable == null) {
+    if (source.length > maximumCombinedSourceBytes) {
       throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.dockerUnavailable,
+        WritersidePdfFailureCode.invalidRequest,
+        detail: 'The selected instance is too large to export safely.',
       );
     }
-    await _verifyDocker(executable, token);
-    return _imageExists(executable, version, token);
-  }
 
-  Future<void> downloadBuilder(
-    String version, {
-    WritersidePdfCancellationToken? cancellationToken,
-  }) async {
-    _validateBuilderVersion(version);
-    final token = cancellationToken ?? WritersidePdfCancellationToken();
-    final executable = _dockerExecutable();
-    await _verifyDocker(executable, token);
-    final image = '$writersideBuilderRepository:$version';
-    final result = await commandRunner.run(
-      executable: executable,
-      arguments: ['pull', image],
-      timeout: pullTimeout,
-      cancellationToken: token,
-    );
-    if (result.exitCode != 0) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.builderImageUnavailable,
-        detail: _safeDetail('${result.stderr}\n${result.stdout}'),
+    final markdownToken = MarkdownPdfCancellationToken();
+    token.attach(markdownToken.cancel);
+    try {
+      final result = await markdownExporter.export(
+        MarkdownPdfExportRequest(
+          source: source,
+          filePath: p.join(moduleRoot, '.busymark-writerside-export.md'),
+          workspaceRoot: moduleRoot,
+          destinationPath: request.destinationPath,
+          options: request.options,
+          overwrite: request.overwrite,
+          mode: MarkdownMode.writersideMarkdown,
+        ),
+        cancellationToken: markdownToken,
       );
-    }
-  }
-
-  Future<WritersidePdfExportResult> export(
-    WritersidePdfExportRequest request, {
-    WritersidePdfCancellationToken? cancellationToken,
-  }) async {
-    final token = cancellationToken ?? WritersidePdfCancellationToken();
-    token.throwIfCancelled();
-    final validated = await _validateRequest(request);
-    final executable = _dockerExecutable();
-    await _verifyDocker(executable, token);
-    if (!await _imageExists(executable, request.builderVersion, token)) {
+      return WritersidePdfExportResult(
+        destinationPath: result.destinationPath,
+        pageCount: result.pageCount,
+        warnings: result.warnings,
+      );
+    } on MarkdownPdfExportException catch (error) {
       throw WritersidePdfExportException(
-        WritersidePdfFailureCode.builderImageUnavailable,
-        detail: request.builderImage,
+        _failureCode(error.code),
+        detail: error.detail,
+        cause: error,
       );
+    } finally {
+      token.detach();
     }
+  }
 
-    final exportRoot = await Directory.systemTemp.createTemp(
-      'busymark-writerside-pdf-',
-    );
-    final outputDirectory = await Directory(
-      p.join(exportRoot.path, 'output'),
-    ).create();
+  Future<String> _validatedModuleRoot(String value) async {
+    final requested = p.normalize(p.absolute(value));
     try {
-      final configurationArgument = switch (request.configurationMode) {
-        WritersidePdfConfigurationMode.projectFile =>
-          validated.projectConfigurationRelativePath!,
-        WritersidePdfConfigurationMode.generated => 'BusyMark-PDF.xml',
-      };
-      final sourceOverlay = switch (request.configurationMode) {
-        WritersidePdfConfigurationMode.projectFile =>
-          await _createProjectSourceOverlay(
-            exportRoot: exportRoot,
-            validated: validated,
-            cancellationToken: token,
-          ),
-        WritersidePdfConfigurationMode.generated =>
-          await _createGeneratedSourceOverlay(
-            exportRoot: exportRoot,
-            validated: validated,
-            configurationXml: configurationCodec.encode(
-              request.options,
-              containerLogoPath: validated.containerLogoPath,
-            ),
-            cancellationToken: token,
-          ),
-      };
-
-      final containerName =
-          'busymark-writerside-$pid-${DateTime.now().microsecondsSinceEpoch}';
-      final arguments = <String>[
-        'run',
-        '--rm',
-        '--pull=never',
-        '--name',
-        containerName,
-        '--shm-size',
-        '1g',
-        if (!request.allowNetwork) ...['--network', 'none'],
-        '--mount',
-        _mount(sourceOverlay.directory.path, '/opt/sources'),
-        '--mount',
-        _mount(outputDirectory.path, '/opt/output'),
-        '-e',
-        'SOURCE_DIR=/opt/sources',
-        '-e',
-        'MODULE_INSTANCE=${request.moduleName}/${request.instanceId}',
-        '-e',
-        'OUTPUT_DIR=/opt/output',
-        '-e',
-        'RUNNER=other',
-        '-e',
-        'PDF=${_posix(configurationArgument)}',
-        request.builderImage,
-      ];
-      var build = await commandRunner.run(
-        executable: executable,
-        arguments: arguments,
-        timeout: buildTimeout,
-        cancellationToken: token,
-        containerName: containerName,
-      );
-      if (build.exitCode != 0) {
-        throw WritersidePdfExportException(
-          WritersidePdfFailureCode.buildFailed,
-          detail: _safeDetail('${build.stderr}\n${build.stdout}'),
-        );
-      }
-      token.throwIfCancelled();
-      File artifact;
-      try {
-        artifact = await _findPdfArtifact(
-          outputDirectory,
-          request.instanceId,
-          build,
-        );
-      } on WritersidePdfExportException {
-        if (!_isRecoverablePdfProcessCrash(build)) {
-          rethrow;
-        }
-        final retry = await commandRunner.run(
-          executable: executable,
-          arguments: arguments,
-          timeout: buildTimeout,
-          cancellationToken: token,
-          containerName: containerName,
-        );
-        if (retry.exitCode != 0) {
-          throw WritersidePdfExportException(
-            WritersidePdfFailureCode.buildFailed,
-            detail: _safeDetail('${retry.stderr}\n${retry.stdout}'),
-          );
-        }
-        build = WritersideBuilderProcessResult(
-          exitCode: retry.exitCode,
-          stdout: '${build.stdout}\nPDF generation retried.\n${retry.stdout}',
-          stderr: '${build.stderr}\n${retry.stderr}',
-        );
-        artifact = await _findPdfArtifact(
-          outputDirectory,
-          request.instanceId,
-          build,
-        );
-      }
-      final artifactLength = await artifact.length();
-      if (artifactLength <= 8 || artifactLength > maximumPdfBytes) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidOutput,
-        );
-      }
-      final bytes = await artifact.readAsBytes();
-      if (bytes.length != artifactLength || !_isPdf(bytes)) {
+      final root = await Directory(requested).resolveSymbolicLinks();
+      if (await FileSystemEntity.type(root, followLinks: false) !=
+          FileSystemEntityType.directory) {
         throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidOutput,
-        );
-      }
-      try {
-        await fileWriter.writeBytes(
-          request.destinationPath,
-          bytes,
-          overwrite: request.overwrite,
-        );
-      } on AtomicFileAlreadyExistsException catch (error) {
-        throw WritersidePdfExportException(
-          WritersidePdfFailureCode.destinationExists,
-          detail: error.path,
-          cause: error,
+          WritersidePdfFailureCode.invalidRequest,
+          detail: 'The Writerside module directory does not exist.',
         );
       }
-      return WritersidePdfExportResult(
-        destinationPath: p.normalize(p.absolute(request.destinationPath)),
-        pageCount: _pageCount(bytes),
-        builderVersion: request.builderVersion,
-        buildLog: _safeDetail('${build.stdout}\n${build.stderr}'),
-      );
+      return p.normalize(root);
     } on WritersidePdfExportException {
       rethrow;
     } on FileSystemException catch (error) {
       throw WritersidePdfExportException(
-        WritersidePdfFailureCode.fileSystem,
+        WritersidePdfFailureCode.invalidRequest,
         detail: error.message,
         cause: error,
       );
-    } finally {
-      await _deleteBestEffort(exportRoot);
-    }
-  }
-
-  String _dockerExecutable() {
-    final executable = dockerLocator.locate();
-    if (executable == null) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.dockerUnavailable,
-      );
     }
-    return executable;
   }
 
-  Future<void> _verifyDocker(
-    String executable,
+  Future<String> _composeInstanceSource(
+    WritersideModule module,
+    WritersideInstance instance,
     WritersidePdfCancellationToken token,
   ) async {
-    final result = await commandRunner.run(
-      executable: executable,
-      arguments: const ['version', '--format', '{{.Server.Version}}'],
-      timeout: const Duration(seconds: 30),
-      cancellationToken: token,
-    );
-    if (result.exitCode != 0) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.dockerUnavailable,
-        detail: _safeDetail('${result.stderr}\n${result.stdout}'),
-      );
-    }
-  }
+    final selected = <({WritersideTopic topic, String? title})>[];
+    final seen = <String>{};
 
-  Future<bool> _imageExists(
-    String executable,
-    String version,
-    WritersidePdfCancellationToken token,
-  ) async {
-    final image = '$writersideBuilderRepository:$version';
-    final result = await commandRunner.run(
-      executable: executable,
-      arguments: ['image', 'inspect', '--format', '{{.Id}}', image],
-      timeout: const Duration(seconds: 30),
-      cancellationToken: token,
-    );
-    return result.exitCode == 0;
-  }
+    void addReference(String? reference, String? title) {
+      if (reference == null) {
+        return;
+      }
+      final topic = module.topicByReference(reference);
+      if (topic != null && seen.add(topic.filePath)) {
+        selected.add((topic: topic, title: title));
+      }
+    }
 
-  Future<_ValidatedWritersidePdfRequest> _validateRequest(
-    WritersidePdfExportRequest request,
-  ) async {
-    _validateBuilderVersion(request.builderVersion);
-    _validateIdentifier(request.moduleName, 'module');
-    _validateIdentifier(request.instanceId, 'instance');
-    final buildConfigDirectory = _normalizeRelativeDirectory(
-      request.buildConfigDirectory,
-    );
-    final sourceRoot = await _canonicalDirectory(request.sourceRoot);
-    final moduleRoot = await _canonicalDirectory(request.moduleRoot);
-    if (!p.equals(sourceRoot, moduleRoot) &&
-        !p.isWithin(sourceRoot, moduleRoot)) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'The help module is outside the selected source root.',
-      );
+    void addNode(TocNode node) {
+      if (!node.hidden && !node.workInProgress) {
+        addReference(node.topicReference, node.tocTitle);
+      }
+      for (final child in node.children) {
+        addNode(child);
+      }
     }
-    _validateMountPath(sourceRoot);
-    final moduleRelative = p.relative(moduleRoot, from: sourceRoot);
-    final buildConfigPath = p.normalize(
-      p.join(moduleRoot, buildConfigDirectory),
-    );
-    if (!p.isWithin(moduleRoot, buildConfigPath)) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'The build configuration directory leaves the help module.',
-      );
+
+    addReference(instance.startPage, null);
+    for (final root in instance.navigationTocRoots) {
+      addNode(root);
     }
-    String? canonicalBuildConfig;
-    final buildConfigType = await FileSystemEntity.type(
-      buildConfigPath,
-      followLinks: false,
-    );
-    if (buildConfigType == FileSystemEntityType.directory ||
-        buildConfigType == FileSystemEntityType.link) {
-      canonicalBuildConfig = await _canonicalDirectory(buildConfigPath);
-      if (!p.equals(moduleRoot, canonicalBuildConfig) &&
-          !p.isWithin(moduleRoot, canonicalBuildConfig)) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidRequest,
-          detail: 'The build configuration directory leaves the help module.',
-        );
+    if (selected.isEmpty) {
+      for (final reference in instance.topicFileSet) {
+        addReference(reference, null);
       }
-    } else if (buildConfigType != FileSystemEntityType.notFound) {
+    }
+    if (selected.length > maximumTopics) {
       throw const WritersidePdfExportException(
         WritersidePdfFailureCode.invalidRequest,
-        detail: 'The build configuration path is not a directory.',
+        detail: 'The selected instance contains too many topics.',
       );
     }
 
-    String? projectConfigurationRelativePath;
-    if (request.configurationMode ==
-        WritersidePdfConfigurationMode.projectFile) {
-      final path = request.projectConfigurationPath;
-      if (path == null || path.trim().isEmpty) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidConfiguration,
-          detail: 'No Writerside PDF configuration was selected.',
-        );
-      }
-      if (canonicalBuildConfig == null) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidConfiguration,
-          detail: 'The build configuration directory does not exist.',
+    final variables = {
+      for (final variable in module.variables) variable.name: variable.value,
+    };
+    final output = StringBuffer();
+    for (var index = 0; index < selected.length; index++) {
+      token.throwIfCancelled();
+      final selection = selected[index];
+      final topic = selection.topic;
+      String source;
+      try {
+        source =
+            topic.markdown?.source ?? await File(topic.filePath).readAsString();
+      } on FileSystemException catch (error) {
+        throw WritersidePdfExportException(
+          WritersidePdfFailureCode.fileSystem,
+          detail: error.message,
+          cause: error,
         );
       }
-      final canonical = await _canonicalFile(path);
-      if (!p.equals(canonicalBuildConfig, p.dirname(canonical)) &&
-          !p.isWithin(canonicalBuildConfig, canonical)) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidConfiguration,
-          detail: 'The PDF configuration must be inside the build directory.',
+      source = await _prepareTopicSource(
+        module: module,
+        topic: topic,
+        source: source,
+        variables: variables,
+      );
+      if (topic.format == WritersideTopicFormat.xml) {
+        source = _xmlTopicToMarkdown(
+          source,
+          fallbackTitle: selection.title ?? _topicTitle(topic, instance.id),
         );
+      } else if (selection.title case final title?
+          when title.trim().isNotEmpty) {
+        source = _replaceFirstHeading(source, title.trim());
       }
-      final configurationFile = File(canonical);
-      if (await configurationFile.length() > 1024 * 1024 ||
-          !configurationCodec.isPdfConfiguration(
-            await configurationFile.readAsString(),
-          )) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidConfiguration,
-          detail: 'The selected XML root must be <pdf>.',
-        );
+      if (index > 0) {
+        output.write('\n\n---\n\n');
       }
-      projectConfigurationRelativePath = p.relative(
-        canonical,
-        from: canonicalBuildConfig,
-      );
+      output.write(source.trim());
     }
-
-    String? containerLogoPath;
-    final logo = request.options.cover.logoPath.trim();
-    if (request.configurationMode == WritersidePdfConfigurationMode.generated &&
-        request.options.cover.enabled &&
-        logo.isNotEmpty) {
-      final canonicalLogo = await _canonicalFile(logo);
-      if (!p.equals(sourceRoot, canonicalLogo) &&
-          !p.isWithin(sourceRoot, canonicalLogo)) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidConfiguration,
-          detail: 'The cover logo must be inside the selected source root.',
-        );
-      }
-      containerLogoPath = _containerPath([
-        '/opt/sources',
-        p.relative(canonicalLogo, from: sourceRoot),
-      ]);
+    if (output.isNotEmpty) {
+      output.write('\n');
     }
-    return _ValidatedWritersidePdfRequest(
-      sourceRoot: sourceRoot,
-      moduleRelativePath: moduleRelative,
-      buildConfigDirectory: buildConfigDirectory,
-      projectConfigurationRelativePath: projectConfigurationRelativePath,
-      containerLogoPath: containerLogoPath,
-    );
+    return output.toString();
   }
 
-  Future<_SourceOverlay> _createGeneratedSourceOverlay({
-    required Directory exportRoot,
-    required _ValidatedWritersidePdfRequest validated,
-    required String configurationXml,
-    required WritersidePdfCancellationToken cancellationToken,
-  }) async {
-    final directory = await Directory(
-      p.join(exportRoot.path, 'source-overlay'),
-    ).create();
-    await _copySourceTree(
-      sourceRoot: validated.sourceRoot,
-      destination: directory,
-      cancellationToken: cancellationToken,
-    );
-    final configurationDirectory = Directory(
-      p.joinAll([
-        directory.path,
-        if (validated.moduleRelativePath != '.') validated.moduleRelativePath,
-        validated.buildConfigDirectory,
-      ]),
-    );
-    await configurationDirectory.create(recursive: true);
-    await File(
-      p.join(configurationDirectory.path, 'BusyMark-PDF.xml'),
-    ).writeAsString(configurationXml, flush: true);
-    return _SourceOverlay(directory: directory);
-  }
-
-  Future<void> _copySourceTree({
-    required String sourceRoot,
-    required Directory destination,
-    required WritersidePdfCancellationToken cancellationToken,
-  }) async {
-    final budget = _SourceCopyBudget(
-      maximumBytes: maximumSourceCopyBytes,
-      maximumEntries: maximumSourceCopyEntries,
-    );
-    await _copyDirectoryContents(
-      sourceDirectory: sourceRoot,
-      destinationDirectory: destination.path,
-      sourceRoot: sourceRoot,
-      excludedPath: p.dirname(destination.path),
-      budget: budget,
-      activeDirectories: <String>{},
-      cancellationToken: cancellationToken,
-    );
-    await Directory(p.join(destination.path, '.idea')).create();
-  }
-
-  Future<_SourceOverlay> _createProjectSourceOverlay({
-    required Directory exportRoot,
-    required _ValidatedWritersidePdfRequest validated,
-    required WritersidePdfCancellationToken cancellationToken,
-  }) async {
-    final directory = await Directory(
-      p.join(exportRoot.path, 'source-overlay'),
-    ).create();
-    await _copySourceTree(
-      sourceRoot: validated.sourceRoot,
-      destination: directory,
-      cancellationToken: cancellationToken,
-    );
-    return _SourceOverlay(directory: directory);
+  String? _topicTitle(WritersideTopic topic, String instanceId) {
+    return topic.titleOverrides
+            .where((override) => override.instance == instanceId)
+            .map((override) => override.title)
+            .firstOrNull ??
+        topic.title;
   }
 
-  Future<void> _copyDirectoryContents({
-    required String sourceDirectory,
-    required String destinationDirectory,
-    required String sourceRoot,
-    required String excludedPath,
-    required _SourceCopyBudget budget,
-    required Set<String> activeDirectories,
-    required WritersidePdfCancellationToken cancellationToken,
+  Future<String> _prepareTopicSource({
+    required WritersideModule module,
+    required WritersideTopic topic,
+    required String source,
+    required Map<String, String> variables,
   }) async {
-    cancellationToken.throwIfCancelled();
-    final canonicalDirectory = p.normalize(
-      await Directory(sourceDirectory).resolveSymbolicLinks(),
-    );
-    if (!activeDirectories.add(canonicalDirectory)) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'The selected source root contains a circular symlink.',
+    final replacements = <_SourceReplacement>[];
+    final occupied = <({int start, int end})>[];
+
+    for (final image in topic.images) {
+      final replacement = await _assetReplacement(
+        module: module,
+        topic: topic,
+        source: source,
+        start: image.span.startOffset,
+        end: image.span.endOffset,
+        destination: image.destination,
       );
+      if (replacement != null) {
+        replacements.add(replacement);
+        occupied.add((start: replacement.start, end: replacement.end));
+      }
     }
-    try {
-      await Directory(destinationDirectory).create(recursive: true);
-      final entities = await Directory(
-        sourceDirectory,
-      ).list(followLinks: false).toList();
-      entities.sort((left, right) => left.path.compareTo(right.path));
-      for (final entity in entities) {
-        cancellationToken.throwIfCancelled();
-        final name = p.basename(entity.path);
-        final resolved = await _canonicalOverlayEntity(entity.path, sourceRoot);
-        if (p.equals(resolved.path, excludedPath) ||
-            p.isWithin(excludedPath, resolved.path)) {
-          continue;
-        }
-        if (resolved.type == FileSystemEntityType.directory &&
-            const {'.git', '.hg', '.svn', '.idea'}.contains(name)) {
-          continue;
-        }
-        if (resolved.type == FileSystemEntityType.file &&
-            RegExp(r'^pdfSource.+\.(?:pdf|html)$').hasMatch(name)) {
+    for (final video in topic.videos) {
+      final initialSegment = _safeSubstring(
+        source,
+        video.span.startOffset,
+        video.span.endOffset,
+      );
+      if (initialSegment == null) {
+        continue;
+      }
+      var segment = initialSegment;
+      var changed = false;
+      for (final destination in [video.previewSource, video.source]) {
+        if (destination == null || destination.trim().isEmpty) {
           continue;
         }
-        budget.addEntry(name);
-        final destinationPath = p.join(destinationDirectory, name);
-        switch (resolved.type) {
-          case FileSystemEntityType.directory:
-            await _copyDirectoryContents(
-              sourceDirectory: resolved.path,
-              destinationDirectory: destinationPath,
-              sourceRoot: sourceRoot,
-              excludedPath: excludedPath,
-              budget: budget,
-              activeDirectories: activeDirectories,
-              cancellationToken: cancellationToken,
-            );
-          case FileSystemEntityType.file:
-            final sourceFile = File(resolved.path);
-            budget.addBytes(await sourceFile.length(), name);
-            await sourceFile.copy(destinationPath);
-          case FileSystemEntityType.link:
-          case FileSystemEntityType.unixDomainSock:
-          case FileSystemEntityType.pipe:
-          case FileSystemEntityType.notFound:
-            throw WritersidePdfExportException(
-              WritersidePdfFailureCode.invalidRequest,
-              detail: 'Unsupported filesystem entry in the source: $name',
-            );
+        final resolved = await _resolvedAssetUri(module, topic, destination);
+        if (resolved != null && segment.contains(destination)) {
+          segment = segment.replaceFirst(destination, resolved);
+          changed = true;
         }
       }
-    } finally {
-      activeDirectories.remove(canonicalDirectory);
-    }
-  }
-
-  Future<_ResolvedOverlayEntity> _canonicalOverlayEntity(
-    String entityPath,
-    String sourceRoot,
-  ) async {
-    try {
-      final resolved = p.normalize(
-        await File(entityPath).resolveSymbolicLinks(),
-      );
-      if (!p.equals(sourceRoot, resolved) &&
-          !p.isWithin(sourceRoot, resolved)) {
-        throw const WritersidePdfExportException(
-          WritersidePdfFailureCode.invalidRequest,
-          detail: 'A help-module symlink leaves the selected source root.',
+      if (changed) {
+        replacements.add(
+          _SourceReplacement(
+            video.span.startOffset,
+            video.span.endOffset,
+            segment,
+          ),
         );
+        occupied.add((
+          start: video.span.startOffset,
+          end: video.span.endOffset,
+        ));
       }
-      final type = await FileSystemEntity.type(resolved, followLinks: false);
-      return _ResolvedOverlayEntity(path: resolved, type: type);
-    } on WritersidePdfExportException {
-      rethrow;
-    } on FileSystemException catch (error) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: error.message,
-        cause: error,
-      );
-    }
-  }
-
-  String _normalizeRelativeDirectory(String value) {
-    final normalized = p.normalize(value.trim());
-    if (normalized.isEmpty ||
-        normalized == '.' ||
-        p.isAbsolute(normalized) ||
-        normalized == '..' ||
-        normalized.startsWith('../') ||
-        normalized.contains('\u0000')) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'The build configuration directory is invalid.',
-      );
-    }
-    return normalized;
-  }
-
-  void _validateBuilderVersion(String value) {
-    if (!RegExp(r'^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$').hasMatch(value)) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'The Writerside builder version is invalid.',
-      );
-    }
-  }
-
-  void _validateIdentifier(String value, String label) {
-    final normalized = value.trim();
-    if (normalized.isEmpty ||
-        normalized.length > 200 ||
-        normalized.contains('/') ||
-        normalized.runes.any((value) => value < 0x20 || value == 0x7f)) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'The Writerside $label name is invalid.',
-      );
     }
-  }
-
-  Future<String> _canonicalDirectory(String value) async {
-    try {
-      final directory = Directory(p.normalize(p.absolute(value)));
-      final resolved = p.normalize(await directory.resolveSymbolicLinks());
-      if (await FileSystemEntity.type(resolved, followLinks: false) !=
-          FileSystemEntityType.directory) {
-        throw FileSystemException('Directory does not exist', resolved);
+    for (final token in topic.variables) {
+      final value = variables[token.name];
+      if (token.escaped || value == null) {
+        continue;
       }
-      return resolved;
-    } on FileSystemException catch (error) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: error.message,
-        cause: error,
-      );
-    }
-  }
-
-  Future<String> _canonicalFile(String value) async {
-    try {
-      final file = File(p.normalize(p.absolute(value)));
-      final resolved = p.normalize(await file.resolveSymbolicLinks());
-      if (await FileSystemEntity.type(resolved, followLinks: false) !=
-          FileSystemEntityType.file) {
-        throw FileSystemException('File does not exist', resolved);
+      final start = token.span.startOffset;
+      final end = token.span.endOffset;
+      if (start < 0 || end > source.length || start > end) {
+        continue;
       }
-      return resolved;
-    } on FileSystemException catch (error) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidConfiguration,
-        detail: error.message,
-        cause: error,
+      if (occupied.any((range) => start < range.end && end > range.start)) {
+        continue;
+      }
+      replacements.add(_SourceReplacement(start, end, value));
+    }
+    replacements.sort((left, right) => right.start.compareTo(left.start));
+    var result = source;
+    var rightBoundary = source.length;
+    for (final replacement in replacements) {
+      if (replacement.end > rightBoundary ||
+          replacement.start < 0 ||
+          replacement.end > result.length) {
+        continue;
+      }
+      result = result.replaceRange(
+        replacement.start,
+        replacement.end,
+        replacement.value,
       );
+      rightBoundary = replacement.start;
     }
+    return result;
   }
 
-  void _validateMountPath(String value) {
-    if (value.contains(',') ||
-        value.contains('\n') ||
-        value.contains('\r') ||
-        value.contains('\u0000')) {
-      throw const WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail: 'A Docker mount path contains unsupported characters.',
-      );
+  Future<_SourceReplacement?> _assetReplacement({
+    required WritersideModule module,
+    required WritersideTopic topic,
+    required String source,
+    required int start,
+    required int end,
+    required String destination,
+  }) async {
+    final segment = _safeSubstring(source, start, end);
+    if (segment == null || destination.trim().isEmpty) {
+      return null;
     }
-  }
-
-  String _mount(String source, String target, {bool readOnly = false}) {
-    _validateMountPath(source);
-    _validateMountPath(target);
-    return [
-      'type=bind',
-      'source=${p.normalize(p.absolute(source))}',
-      'target=$target',
-      if (readOnly) 'readonly',
-    ].join(',');
-  }
-
-  String _containerPath(List<String> parts) {
-    final result = <String>[];
-    for (final part in parts) {
-      final normalized = _posix(part);
-      if (normalized.isEmpty || normalized == '.') {
-        continue;
-      }
-      result.add(normalized.replaceAll(RegExp(r'^/+|/+$'), ''));
+    final resolved = await _resolvedAssetUri(module, topic, destination);
+    if (resolved == null || !segment.contains(destination)) {
+      return null;
     }
-    return '/${result.join('/')}';
+    return _SourceReplacement(
+      start,
+      end,
+      segment.replaceFirst(destination, resolved),
+    );
   }
 
-  String _posix(String value) => value.replaceAll('\\', '/');
-
-  Future<File> _findPdfArtifact(
-    Directory output,
-    String instanceId,
-    WritersideBuilderProcessResult build,
+  Future<String?> _resolvedAssetUri(
+    WritersideModule module,
+    WritersideTopic topic,
+    String value,
   ) async {
-    final expectedName = 'pdfSource${instanceId.toUpperCase()}.pdf';
-    final candidates = <File>[];
-    await for (final entity in output.list(
-      recursive: true,
-      followLinks: false,
-    )) {
-      if (entity is File && p.extension(entity.path).toLowerCase() == '.pdf') {
-        if (p.basename(entity.path) == expectedName) {
-          return entity;
+    final destination = value.trim();
+    final uri = parseSchemedUri(destination);
+    if (uri != null) {
+      return isRemoteResourceUriScheme(uri.scheme) ? null : destination;
+    }
+    final relative = destination.startsWith('/')
+        ? destination.substring(1)
+        : destination;
+    final candidates = <String>[
+      p.join(p.dirname(topic.filePath), relative),
+      p.join(module.rootPath, relative),
+      p.join(module.rootPath, module.effectiveImagesDir, relative),
+    ];
+    for (final candidate in candidates) {
+      try {
+        final canonical = p.normalize(
+          await File(candidate).resolveSymbolicLinks(),
+        );
+        if ((p.equals(module.rootPath, canonical) ||
+                p.isWithin(module.rootPath, canonical)) &&
+            await FileSystemEntity.type(canonical, followLinks: false) ==
+                FileSystemEntityType.file) {
+          return Uri.file(canonical).toString();
         }
-        candidates.add(entity);
+      } on FileSystemException {
+        // Try the next Writerside-compatible asset root.
       }
     }
-    if (candidates.length == 1) {
-      return candidates.single;
-    }
-    final log = _safeDetail('${build.stderr}\n${build.stdout}');
-    final crashed = _isRecoverablePdfProcessCrash(build);
-    throw WritersidePdfExportException(
-      crashed
-          ? WritersidePdfFailureCode.buildFailed
-          : WritersidePdfFailureCode.invalidOutput,
-      detail: [
-        candidates.isEmpty
-            ? 'The Writerside builder did not produce a PDF artifact.'
-            : 'The Writerside builder produced multiple PDF artifacts.',
-        if (log.isNotEmpty) log,
-      ].join('\n\n'),
-    );
-  }
-
-  bool _isRecoverablePdfProcessCrash(WritersideBuilderProcessResult build) {
-    return build.stderr.toLowerCase().contains('stack smashing detected') ||
-        build.stdout.toLowerCase().contains('stack smashing detected');
+    return null;
   }
 
-  bool _isPdf(List<int> bytes) {
-    const header = [0x25, 0x50, 0x44, 0x46, 0x2d];
-    if (bytes.length < header.length) {
-      return false;
-    }
-    for (var index = 0; index < header.length; index++) {
-      if (bytes[index] != header[index]) {
-        return false;
-      }
+  String? _safeSubstring(String source, int start, int end) {
+    if (start < 0 || end < start || end > source.length) {
+      return null;
     }
-    final tailStart = (bytes.length - 2048).clamp(0, bytes.length);
-    return latin1.decode(bytes.sublist(tailStart)).contains('%%EOF');
+    return source.substring(start, end);
   }
 
-  int? _pageCount(List<int> bytes) {
-    final text = latin1.decode(bytes, allowInvalid: true);
-    final count = RegExp(r'/Type\s*/Page(?!s)\b').allMatches(text).length;
-    return count == 0 ? null : count;
-  }
-
-  String _safeDetail(String value) {
-    final normalized = value.replaceAll('\u0000', '').trim();
-    if (normalized.length <= 12000) {
-      return normalized;
+  String _replaceFirstHeading(String source, String title) {
+    final match = RegExp(
+      r'^ {0,3}#{1,6}[ \t]+.*$',
+      multiLine: true,
+    ).firstMatch(source);
+    if (match == null) {
+      return '# $title\n\n$source';
     }
-    const half = 6000;
-    return '${normalized.substring(0, half)}\n'
-        '… builder output truncated …\n'
-        '${normalized.substring(normalized.length - half)}';
+    return source.replaceRange(match.start, match.end, '# $title');
   }
 
-  Future<void> _deleteBestEffort(Directory directory) async {
+  String _xmlTopicToMarkdown(String source, {String? fallbackTitle}) {
     try {
-      if (await directory.exists()) {
-        await directory.delete(recursive: true);
+      final document = XmlDocument.parse(source);
+      final root = document.rootElement;
+      final title = root.getAttribute('title')?.trim();
+      final output = StringBuffer();
+      if ((title ?? fallbackTitle)?.trim() case final effective?
+          when effective.isNotEmpty) {
+        output.writeln('# ${_plain(effective)}');
+        output.writeln();
+      }
+      for (final child in root.children) {
+        _writeXmlBlock(output, child, headingLevel: 2);
       }
-    } on Object {
-      // Export completion and failure must not be hidden by cleanup.
+      return output.toString();
+    } on XmlException {
+      return '```xml\n$source\n```';
     }
   }
-}
-
-class _ValidatedWritersidePdfRequest {
-  const _ValidatedWritersidePdfRequest({
-    required this.sourceRoot,
-    required this.moduleRelativePath,
-    required this.buildConfigDirectory,
-    required this.projectConfigurationRelativePath,
-    required this.containerLogoPath,
-  });
-
-  final String sourceRoot;
-  final String moduleRelativePath;
-  final String buildConfigDirectory;
-  final String? projectConfigurationRelativePath;
-  final String? containerLogoPath;
-}
-
-class _SourceOverlay {
-  const _SourceOverlay({required this.directory});
-
-  final Directory directory;
-}
-
-class _SourceCopyBudget {
-  _SourceCopyBudget({required this.maximumBytes, required this.maximumEntries});
-
-  final int maximumBytes;
-  final int maximumEntries;
-  var _bytes = 0;
-  var _entries = 0;
 
-  void addEntry(String name) {
-    _entries++;
-    if (_entries > maximumEntries) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail:
-            'The selected source contains more than $maximumEntries entries.',
-      );
+  void _writeXmlBlock(
+    StringBuffer output,
+    XmlNode node, {
+    required int headingLevel,
+  }) {
+    if (node is XmlText) {
+      final text = node.value.trim();
+      if (text.isNotEmpty) {
+        output.writeln(text);
+        output.writeln();
+      }
+      return;
+    }
+    if (node is! XmlElement) {
+      return;
+    }
+    final name = node.name.local.toLowerCase();
+    switch (name) {
+      case 'title' || 'web-file-name':
+        return;
+      case 'p':
+        final text = _xmlInlineChildren(node).trim();
+        if (text.isNotEmpty) {
+          output.writeln(text);
+          output.writeln();
+        }
+      case 'chapter' || 'procedure' || 'tab' || 'def':
+        final title =
+            node.getAttribute('title')?.trim() ??
+            (name == 'tab'
+                ? 'Tab'
+                : name == 'def'
+                ? 'Definition'
+                : '');
+        if (title.isNotEmpty) {
+          output.writeln('${'#' * headingLevel} ${_plain(title)}');
+          output.writeln();
+        }
+        for (final child in node.children) {
+          _writeXmlBlock(output, child, headingLevel: headingLevel + 1);
+        }
+      case 'step':
+        final text = _xmlInlineChildren(node).trim();
+        if (text.isNotEmpty) {
+          output.writeln('1. $text');
+          output.writeln();
+        }
+      case 'note' || 'tip' || 'warning' || 'quote':
+        final style = name == 'quote' ? 'NOTE' : name.toUpperCase();
+        final body = _xmlInlineChildren(node).trim();
+        output.writeln('> [!$style]');
+        for (final line in body.split('\n')) {
+          output.writeln('> $line');
+        }
+        output.writeln();
+      case 'code-block':
+        final language = node.getAttribute('lang')?.trim() ?? '';
+        output.writeln('~~~$language');
+        output.writeln(node.innerText.replaceFirst(RegExp(r'^\n'), ''));
+        output.writeln('~~~');
+        output.writeln();
+      case 'math':
+        output.writeln(r'$$');
+        output.writeln(node.innerText);
+        output.writeln(r'$$');
+        output.writeln();
+      case 'img':
+        final src = node.getAttribute('src') ?? '';
+        final alt = node.getAttribute('alt') ?? '';
+        output.writeln('![${_plain(alt)}]($src)');
+        output.writeln();
+      case 'video':
+        output.writeln(node.toXmlString());
+        output.writeln();
+      case 'list':
+        for (final item in node.childElements) {
+          final text = _xmlInlineChildren(item).trim();
+          if (text.isNotEmpty) {
+            output.writeln('- $text');
+          }
+        }
+        output.writeln();
+      case 'include':
+        final from = node.getAttribute('from') ?? '';
+        if (from.isNotEmpty) {
+          output.writeln('> Included content: `$from`');
+          output.writeln();
+        }
+      default:
+        for (final child in node.children) {
+          _writeXmlBlock(output, child, headingLevel: headingLevel);
+        }
     }
   }
 
-  void addBytes(int bytes, String name) {
-    _bytes += bytes;
-    if (_bytes > maximumBytes) {
-      throw WritersidePdfExportException(
-        WritersidePdfFailureCode.invalidRequest,
-        detail:
-            'The selected source exceeds the private-copy limit while '
-            'copying $name.',
-      );
-    }
+  String _xmlInlineChildren(XmlElement element) {
+    return element.children
+        .map(_xmlInline)
+        .join()
+        .replaceAll(RegExp(r'[ \t]+'), ' ');
+  }
+
+  String _xmlInline(XmlNode node) {
+    if (node is XmlText) {
+      return node.value;
+    }
+    if (node is! XmlElement) {
+      return '';
+    }
+    final body = node.children.map(_xmlInline).join();
+    return switch (node.name.local.toLowerCase()) {
+      'b' || 'strong' => '**$body**',
+      'i' || 'em' => '*$body*',
+      'code' => '`${body.replaceAll('`', r'\`')}`',
+      'a' => '[${body.trim()}](${node.getAttribute('href') ?? ''})',
+      'img' =>
+        '![${_plain(node.getAttribute('alt') ?? '')}]'
+            '(${node.getAttribute('src') ?? ''})',
+      'math' => '\$${body.trim()}\$',
+      'br' => '  \n',
+      'include' => '',
+      _ => body,
+    };
+  }
+
+  String _plain(String value) => value
+      .replaceAll('\\', r'\\')
+      .replaceAll('[', r'\[')
+      .replaceAll(']', r'\]');
+
+  WritersidePdfFailureCode _failureCode(MarkdownPdfFailureCode code) {
+    return switch (code) {
+      MarkdownPdfFailureCode.compilerUnavailable =>
+        WritersidePdfFailureCode.exporterUnavailable,
+      MarkdownPdfFailureCode.compilerFailed =>
+        WritersidePdfFailureCode.buildFailed,
+      MarkdownPdfFailureCode.timedOut => WritersidePdfFailureCode.timedOut,
+      MarkdownPdfFailureCode.cancelled => WritersidePdfFailureCode.cancelled,
+      MarkdownPdfFailureCode.invalidOutput =>
+        WritersidePdfFailureCode.invalidOutput,
+      MarkdownPdfFailureCode.destinationExists =>
+        WritersidePdfFailureCode.destinationExists,
+      MarkdownPdfFailureCode.fileSystem => WritersidePdfFailureCode.fileSystem,
+    };
   }
 }
 
-class _ResolvedOverlayEntity {
-  const _ResolvedOverlayEntity({required this.path, required this.type});
+class _SourceReplacement {
+  const _SourceReplacement(this.start, this.end, this.value);
+
+  final int start;
+  final int end;
+  final String value;
+}
 
-  final String path;
-  final FileSystemEntityType type;
+extension _FirstOrNull<T> on Iterable<T> {
+  T? get firstOrNull => isEmpty ? null : first;
 }
diff --git a/lib/src/export/writerside_pdf_export_ui.dart b/lib/src/export/writerside_pdf_export_ui.dart
index 0dde3261..539173d7 100644
--- a/lib/src/export/writerside_pdf_export_ui.dart
+++ b/lib/src/export/writerside_pdf_export_ui.dart
@@ -8,20 +8,35 @@ import 'package:path/path.dart' as p;
 import 'package:url_launcher/url_launcher.dart';
 
 import '../app/app_settings.dart';
-import '../app/busymark_dialogs.dart';
 import '../app/busymark_design.dart';
+import '../app/busymark_dialogs.dart';
+import '../app/busymark_toast.dart';
 import '../app/localization.dart';
+import '../math/math_providers.dart';
 import '../platform/linux_header_bar_service.dart';
+import '../visualization/visualization_providers.dart';
 import '../workspace/workspace_controller.dart';
 import '../workspace/workspace_model.dart';
 import '../workspace/workspace_safety.dart';
 import '../writerside/writerside_model.dart';
+import 'markdown_math_export.dart';
+import 'markdown_pdf_export_service.dart';
 import 'markdown_pdf_models.dart';
+import 'markdown_visualization_export.dart';
 import 'writerside_pdf_export_service.dart';
 import 'writerside_pdf_models.dart';
 
 final writersidePdfExportServiceProvider = Provider<WritersidePdfExportService>(
-  (ref) => const WritersidePdfExportService(),
+  (ref) => WritersidePdfExportService(
+    markdownExporter: MarkdownPdfExportService(
+      visualizationRenderer: MarkdownVisualizationExportRenderer(
+        coordinator: ref.watch(visualizationCoordinatorProvider),
+      ),
+      mathRenderer: MarkdownMathExportRenderer(
+        coordinator: ref.watch(mathCoordinatorProvider),
+      ),
+    ),
+  ),
 );
 
 bool canExportWritersidePdf(WorkspaceState state) {
@@ -32,7 +47,7 @@ bool canExportWritersidePdf(WorkspaceState state) {
       module.instances.any((instance) => !instance.isLibrary);
 }
 
-String defaultWritersideBuilderModuleName(WritersideModule module) {
+String defaultWritersideModuleName(WritersideModule module) {
   final configured = module.config.moduleName?.trim();
   return configured == null || configured.isEmpty
       ? p.basename(p.normalize(module.rootPath))
@@ -55,29 +70,13 @@ Future<void> exportWritersideModuleToPdf(
   if (workspace == null || module == null) {
     return;
   }
-  final service = ref.read(writersidePdfExportServiceProvider);
-  final regularInstances = module.instances
+  final instances = module.instances
       .where((instance) => !instance.isLibrary)
       .toList(growable: false);
-  final projectConfigurations = await service.discoverProjectConfigurations(
-    moduleRoot: module.rootPath,
-    buildConfigDirectory: module.config.buildConfigDir,
-  );
-  final layouts = <String, List<WritersidePdfKeymapLayout>>{};
-  for (final instance in regularInstances) {
-    layouts[instance.id] = await service.discoverLayouts(
-      moduleRoot: module.rootPath,
-      buildConfigDirectory: module.config.buildConfigDir,
-      instanceId: instance.id,
-    );
-  }
-  if (!context.mounted) {
-    return;
-  }
   final storedInstanceId = ref
       .read(appSettingsControllerProvider)
       .selectedWritersideInstanceId(workspace.rootPath);
-  final initialInstance = regularInstances
+  final initialInstance = instances
       .where((instance) => instance.id == storedInstanceId)
       .firstOrNull;
   final headerBar = ref.read(linuxHeaderBarServiceProvider);
@@ -85,14 +84,10 @@ Future<void> exportWritersideModuleToPdf(
       await showBusyMarkModalEditorDialog<_WritersidePdfSelection>(
         context,
         headerBarService: headerBar.isAvailable ? headerBar : null,
-        maxWidth: BusyMarkSizes.dialogWide,
-        maxHeight: 820,
+        maxWidth: BusyMarkSizes.dialog,
         builder: (context) => _WritersidePdfOptionsDialog(
-          module: module,
-          instances: regularInstances,
-          initialInstance: initialInstance ?? regularInstances.first,
-          projectConfigurations: projectConfigurations,
-          layouts: layouts,
+          instances: instances,
+          initialInstance: initialInstance ?? instances.first,
         ),
       );
   if (selection == null || !context.mounted) {
@@ -103,16 +98,6 @@ Future<void> exportWritersideModuleToPdf(
         .read(appSettingsControllerProvider.notifier)
         .selectWritersideInstance(workspace.rootPath, selection.instance.id),
   );
-
-  final builderReady = await _ensureBuilder(
-    context,
-    headerBar,
-    service,
-    selection.builderVersion,
-  );
-  if (!builderReady || !context.mounted) {
-    return;
-  }
   final location = await getSaveLocation(
     acceptedTypeGroups: [
       XTypeGroup(
@@ -141,29 +126,23 @@ Future<void> exportWritersideModuleToPdf(
   if (!context.mounted) {
     return;
   }
+  final token = WritersidePdfCancellationToken();
   final request = WritersidePdfExportRequest(
     moduleRoot: module.rootPath,
-    sourceRoot: selection.sourceRoot,
-    moduleName: selection.moduleName,
-    buildConfigDirectory: module.config.buildConfigDir,
     instanceId: selection.instance.id,
     destinationPath: destination,
     overwrite: overwrite,
-    builderVersion: selection.builderVersion,
-    configurationMode: selection.configurationMode,
     options: selection.options,
-    projectConfigurationPath: selection.projectConfigurationPath,
-    allowNetwork: selection.allowNetwork,
   );
-  final cancellationToken = WritersidePdfCancellationToken();
   final outcome = await showBusyMarkModalDialog<_WritersidePdfOutcome>(
     context,
     headerBarService: headerBar.isAvailable ? headerBar : null,
     barrierDismissible: false,
     builder: (context) => _WritersidePdfProgressDialog(
-      cancellationToken: cancellationToken,
-      operation: () =>
-          service.export(request, cancellationToken: cancellationToken),
+      cancellationToken: token,
+      operation: () => ref
+          .read(writersidePdfExportServiceProvider)
+          .export(request, cancellationToken: token),
     ),
   );
   if (outcome == null || !context.mounted) {
@@ -177,104 +156,27 @@ Future<void> exportWritersideModuleToPdf(
   }
   final result = outcome.result!;
   final fileName = p.basename(result.destinationPath);
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(
-      content: Text(context.l10n.pdfExported(fileName)),
-      action: SnackBarAction(
-        label: context.l10n.open,
-        onPressed: () => unawaited(
-          launchUrl(
-            Uri.file(result.destinationPath),
-            mode: LaunchMode.externalApplication,
-          ),
-        ),
-      ),
-    ),
-  );
-}
-
-Future<bool> _ensureBuilder(
-  BuildContext context,
-  LinuxHeaderBarService headerBar,
-  WritersidePdfExportService service,
-  String version,
-) async {
-  try {
-    if (await service.isBuilderAvailable(version)) {
-      return true;
-    }
-  } on WritersidePdfExportException catch (failure) {
-    if (!context.mounted) {
-      return false;
-    }
-    await _showWritersidePdfError(context, headerBar, failure);
-    return false;
-  }
-  if (!context.mounted) {
-    return false;
-  }
-  final image = '$writersideBuilderRepository:$version';
-  final download =
-      await showBusyMarkModalDialog<bool>(
-        context,
-        headerBarService: headerBar.isAvailable ? headerBar : null,
-        builder: (context) => BusyMarkDialogShell(
-          title: context.l10n.writersidePdfBuilderRequired,
-          maxWidth: BusyMarkSizes.dialog,
-          actions: [
-            BusyMarkDialogButton(
-              label: context.l10n.cancel,
-              onPressed: () => Navigator.pop(context, false),
-            ),
-            BusyMarkDialogButton(
-              label: context.l10n.download,
-              suggested: true,
-              onPressed: () => Navigator.pop(context, true),
-            ),
-          ],
-          children: [
-            Text(context.l10n.writersidePdfBuilderDownloadDescription(image)),
-          ],
-        ),
-      ) ??
-      false;
-  if (!download || !context.mounted) {
-    return false;
-  }
-  final token = WritersidePdfCancellationToken();
-  final outcome = await showBusyMarkModalDialog<_WritersideDownloadOutcome>(
+  BusyMarkToastOverlay.show(
     context,
-    headerBarService: headerBar.isAvailable ? headerBar : null,
-    barrierDismissible: false,
-    builder: (context) => _WritersideDownloadProgressDialog(
-      cancellationToken: token,
-      operation: () =>
-          service.downloadBuilder(version, cancellationToken: token),
+    message: context.l10n.pdfExported(fileName),
+    actionLabel: context.l10n.open,
+    onAction: () => unawaited(
+      launchUrl(
+        Uri.file(result.destinationPath),
+        mode: LaunchMode.externalApplication,
+      ),
     ),
   );
-  if (outcome?.failure case final failure?) {
-    if (context.mounted && failure.code != WritersidePdfFailureCode.cancelled) {
-      await _showWritersidePdfError(context, headerBar, failure);
-    }
-    return false;
-  }
-  return outcome?.succeeded == true;
 }
 
 class _WritersidePdfOptionsDialog extends StatefulWidget {
   const _WritersidePdfOptionsDialog({
-    required this.module,
     required this.instances,
     required this.initialInstance,
-    required this.projectConfigurations,
-    required this.layouts,
   });
 
-  final WritersideModule module;
   final List<WritersideInstance> instances;
   final WritersideInstance initialInstance;
-  final List<String> projectConfigurations;
-  final Map<String, List<WritersidePdfKeymapLayout>> layouts;
 
   @override
   State<_WritersidePdfOptionsDialog> createState() =>
@@ -284,106 +186,26 @@ class _WritersidePdfOptionsDialog extends StatefulWidget {
 class _WritersidePdfOptionsDialogState
     extends State<_WritersidePdfOptionsDialog> {
   late WritersideInstance _instance;
-  var _configurationMode = WritersidePdfConfigurationMode.generated;
-  String? _projectConfiguration;
+  var _pageSize = MarkdownPdfPageSize.a4;
   var _orientation = MarkdownPdfOrientation.portrait;
-  var _coverEnabled = true;
-  var _layout = '';
-  var _allowNetwork = false;
-  late final TextEditingController _moduleNameController;
-  late final TextEditingController _sourceRootController;
-  late final TextEditingController _builderVersionController;
-  late final TextEditingController _coverTitleController;
-  late final TextEditingController _coverLogoController;
-  late final TextEditingController _coverDescriptionController;
-  late final TextEditingController _coverCopyrightController;
-  late final TextEditingController _headerController;
-  late final TextEditingController _footerController;
-  late final TextEditingController _tocTitleController;
+  var _margin = MarkdownPdfMargin.normal;
+  var _pageNumbers = true;
 
   @override
   void initState() {
     super.initState();
     _instance = widget.initialInstance;
-    _projectConfiguration = widget.projectConfigurations.firstOrNull;
-    _moduleNameController = TextEditingController(
-      text: defaultWritersideBuilderModuleName(widget.module),
-    );
-    _sourceRootController = TextEditingController(
-      text: p.dirname(widget.module.rootPath),
-    );
-    _builderVersionController = TextEditingController(
-      text: _configuredBuilderVersion(widget.module),
-    );
-    _coverTitleController = TextEditingController(text: _instance.name);
-    _coverLogoController = TextEditingController();
-    _coverDescriptionController = TextEditingController();
-    _coverCopyrightController = TextEditingController();
-    _headerController = TextEditingController();
-    _footerController = TextEditingController();
-    _tocTitleController = TextEditingController();
-  }
-
-  @override
-  void dispose() {
-    for (final controller in [
-      _moduleNameController,
-      _sourceRootController,
-      _builderVersionController,
-      _coverTitleController,
-      _coverLogoController,
-      _coverDescriptionController,
-      _coverCopyrightController,
-      _headerController,
-      _footerController,
-      _tocTitleController,
-    ]) {
-      controller.dispose();
-    }
-    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    final modes = <WritersidePdfConfigurationMode>[
-      WritersidePdfConfigurationMode.generated,
-      if (widget.projectConfigurations.isNotEmpty)
-        WritersidePdfConfigurationMode.projectFile,
-    ];
-    final availableLayouts = widget.layouts[_instance.id] ?? const [];
-    final layoutValues = <String>[
-      '',
-      ...availableLayouts.map((item) => item.name),
-    ];
-    if (!layoutValues.contains(_layout)) {
-      _layout = '';
-    }
-    final moduleNameError = _moduleNameController.text.trim().isEmpty
-        ? context.l10n.writersidePdfModuleNameRequired
-        : null;
-    final sourceRootError = _sourceRootController.text.trim().isEmpty
-        ? context.l10n.writersidePdfSourceRootRequired
-        : null;
-    final versionError =
-        !RegExp(
-          r'^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$',
-        ).hasMatch(_builderVersionController.text.trim())
-        ? context.l10n.writersidePdfBuilderVersionInvalid
-        : null;
-    final canExport =
-        moduleNameError == null &&
-        sourceRootError == null &&
-        versionError == null &&
-        (_configurationMode == WritersidePdfConfigurationMode.generated ||
-            _projectConfiguration != null);
     return BusyMarkModalEditorScaffold(
       title: context.l10n.exportWritersideAsPdf,
       cancelLabel: context.l10n.cancel,
       saveLabel: context.l10n.export,
       onCancel: () => Navigator.pop(context),
-      onSave: canExport ? _submit : null,
+      onSave: _submit,
       children: [
-        Text(context.l10n.writersidePdfExportDescription),
         BusyMarkGroupedList(
           title: context.l10n.writersidePdfContent,
           filled: true,
@@ -393,154 +215,49 @@ class _WritersidePdfOptionsDialogState
               values: widget.instances,
               selected: _instance,
               labelFor: (instance) => '${instance.name} (${instance.id})',
-              onSelected: (instance) => setState(() {
-                _instance = instance;
-                _layout = '';
-                _coverTitleController.text = instance.name;
-              }),
+              onSelected: (instance) => setState(() => _instance = instance),
             ),
-            BusyMarkComboRow<WritersidePdfConfigurationMode>(
-              title: context.l10n.writersidePdfSettings,
-              values: modes,
-              selected: _configurationMode,
-              labelFor: (mode) => switch (mode) {
-                WritersidePdfConfigurationMode.generated =>
-                  context.l10n.writersidePdfConfigureHere,
-                WritersidePdfConfigurationMode.projectFile =>
-                  context.l10n.writersidePdfProjectConfiguration,
-              },
-              onSelected: (mode) => setState(() => _configurationMode = mode),
-            ),
-            if (_configurationMode ==
-                WritersidePdfConfigurationMode.projectFile)
-              BusyMarkComboRow<String>(
-                title: context.l10n.writersidePdfConfigurationFile,
-                values: widget.projectConfigurations,
-                selected: _projectConfiguration!,
-                labelFor: p.basename,
-                onSelected: (value) =>
-                    setState(() => _projectConfiguration = value),
-              ),
           ],
         ),
-        if (_configurationMode == WritersidePdfConfigurationMode.generated) ...[
-          BusyMarkGroupedList(
-            title: context.l10n.writersidePdfPage,
-            filled: true,
-            children: [
-              BusyMarkComboRow<MarkdownPdfOrientation>(
-                title: context.l10n.pdfOrientation,
-                values: MarkdownPdfOrientation.values,
-                selected: _orientation,
-                labelFor: (value) => switch (value) {
-                  MarkdownPdfOrientation.portrait => context.l10n.pdfPortrait,
-                  MarkdownPdfOrientation.landscape => context.l10n.pdfLandscape,
-                },
-                onSelected: (value) => setState(() => _orientation = value),
-              ),
-              if (layoutValues.length > 1)
-                BusyMarkComboRow<String>(
-                  title: context.l10n.writersidePdfKeymap,
-                  values: layoutValues,
-                  selected: _layout,
-                  labelFor: (value) => value.isEmpty
-                      ? context.l10n.writersidePdfNoKeymap
-                      : availableLayouts
-                            .where((item) => item.name == value)
-                            .first
-                            .displayName,
-                  onSelected: (value) => setState(() => _layout = value),
-                ),
-              BusyMarkGroupedTextEntry(
-                label: context.l10n.writersidePdfTocTitle,
-                controller: _tocTitleController,
-              ),
-            ],
-          ),
-          BusyMarkGroupedList(
-            title: context.l10n.writersidePdfCover,
-            filled: true,
-            children: [
-              BusyMarkSwitchRow(
-                title: context.l10n.writersidePdfIncludeCover,
-                value: _coverEnabled,
-                onChanged: (value) => setState(() => _coverEnabled = value),
-              ),
-              if (_coverEnabled) ...[
-                BusyMarkGroupedTextEntry(
-                  label: context.l10n.writersidePdfCoverTitle,
-                  controller: _coverTitleController,
-                ),
-                BusyMarkGroupedTextEntry(
-                  label: context.l10n.writersidePdfCoverDescription,
-                  controller: _coverDescriptionController,
-                  maxLines: 3,
-                ),
-                BusyMarkGroupedTextEntry(
-                  label: context.l10n.writersidePdfCopyright,
-                  controller: _coverCopyrightController,
-                ),
-                BusyMarkGroupedTextEntry(
-                  label: context.l10n.writersidePdfCoverLogo,
-                  controller: _coverLogoController,
-                  textDirection: TextDirection.ltr,
-                ),
-                BusyMarkActionRow(
-                  title: context.l10n.writersidePdfChooseCoverLogo,
-                  onTap: _chooseLogo,
-                ),
-              ],
-            ],
-          ),
-          BusyMarkGroupedList(
-            title: context.l10n.writersidePdfHeaderAndFooter,
-            filled: true,
-            children: [
-              BusyMarkGroupedTextEntry(
-                label: context.l10n.writersidePdfHeader,
-                controller: _headerController,
-              ),
-              BusyMarkGroupedTextEntry(
-                label: context.l10n.writersidePdfFooter,
-                controller: _footerController,
-              ),
-            ],
-          ),
-        ],
         BusyMarkGroupedList(
-          title: context.l10n.advanced,
-          description: context.l10n.writersidePdfAdvancedDescription,
+          title: context.l10n.writersidePdfPage,
           filled: true,
           children: [
-            BusyMarkGroupedTextEntry(
-              label: context.l10n.writersidePdfModuleName,
-              controller: _moduleNameController,
-              errorText: moduleNameError,
-              onChanged: (_) => setState(() {}),
-            ),
-            BusyMarkGroupedTextEntry(
-              label: context.l10n.writersidePdfSourceRoot,
-              controller: _sourceRootController,
-              textDirection: TextDirection.ltr,
-              errorText: sourceRootError,
-              onChanged: (_) => setState(() {}),
+            BusyMarkComboRow<MarkdownPdfPageSize>(
+              title: context.l10n.pdfPageSize,
+              values: MarkdownPdfPageSize.values,
+              selected: _pageSize,
+              labelFor: (value) => switch (value) {
+                MarkdownPdfPageSize.a4 => context.l10n.pdfPageSizeA4,
+                MarkdownPdfPageSize.letter => context.l10n.pdfPageSizeLetter,
+              },
+              onSelected: (value) => setState(() => _pageSize = value),
             ),
-            BusyMarkActionRow(
-              title: context.l10n.writersidePdfChooseSourceRoot,
-              onTap: _chooseSourceRoot,
+            BusyMarkComboRow<MarkdownPdfOrientation>(
+              title: context.l10n.pdfOrientation,
+              values: MarkdownPdfOrientation.values,
+              selected: _orientation,
+              labelFor: (value) => switch (value) {
+                MarkdownPdfOrientation.portrait => context.l10n.pdfPortrait,
+                MarkdownPdfOrientation.landscape => context.l10n.pdfLandscape,
+              },
+              onSelected: (value) => setState(() => _orientation = value),
             ),
-            BusyMarkGroupedTextEntry(
-              label: context.l10n.writersidePdfBuilderVersion,
-              controller: _builderVersionController,
-              textDirection: TextDirection.ltr,
-              errorText: versionError,
-              onChanged: (_) => setState(() {}),
+            BusyMarkComboRow<MarkdownPdfMargin>(
+              title: context.l10n.pdfMargins,
+              values: MarkdownPdfMargin.values,
+              selected: _margin,
+              labelFor: (value) => switch (value) {
+                MarkdownPdfMargin.narrow => context.l10n.pdfMarginNarrow,
+                MarkdownPdfMargin.normal => context.l10n.pdfMarginNormal,
+                MarkdownPdfMargin.wide => context.l10n.pdfMarginWide,
+              },
+              onSelected: (value) => setState(() => _margin = value),
             ),
             BusyMarkSwitchRow(
-              title: context.l10n.writersidePdfAllowNetwork,
-              subtitle: context.l10n.writersidePdfAllowNetworkDescription,
-              value: _allowNetwork,
-              onChanged: (value) => setState(() => _allowNetwork = value),
+              title: context.l10n.pdfIncludePageNumbers,
+              value: _pageNumbers,
+              onChanged: (value) => setState(() => _pageNumbers = value),
             ),
           ],
         ),
@@ -549,60 +266,16 @@ class _WritersidePdfOptionsDialogState
     );
   }
 
-  Future<void> _chooseLogo() async {
-    final file = await openFile(
-      acceptedTypeGroups: [
-        XTypeGroup(
-          label: context.l10n.fileTypeImages,
-          extensions: const ['png', 'jpg', 'jpeg', 'svg'],
-        ),
-      ],
-      initialDirectory: widget.module.rootPath,
-      confirmButtonText: context.l10n.choose,
-    );
-    if (file != null && mounted) {
-      setState(() => _coverLogoController.text = file.path);
-    }
-  }
-
-  Future<void> _chooseSourceRoot() async {
-    final path = await getDirectoryPath(
-      initialDirectory: _sourceRootController.text,
-      confirmButtonText: context.l10n.chooseLocation,
-      canCreateDirectories: false,
-    );
-    if (path != null && mounted) {
-      setState(() => _sourceRootController.text = path);
-    }
-  }
-
   void _submit() {
     Navigator.pop(
       context,
       _WritersidePdfSelection(
         instance: _instance,
-        moduleName: _moduleNameController.text.trim(),
-        sourceRoot: _sourceRootController.text.trim(),
-        builderVersion: _builderVersionController.text.trim(),
-        configurationMode: _configurationMode,
-        projectConfigurationPath:
-            _configurationMode == WritersidePdfConfigurationMode.projectFile
-            ? _projectConfiguration
-            : null,
-        allowNetwork: _allowNetwork,
-        options: WritersidePdfOptions(
+        options: MarkdownPdfOptions(
+          pageSize: _pageSize,
           orientation: _orientation,
-          layout: _layout,
-          cover: WritersidePdfCoverOptions(
-            enabled: _coverEnabled,
-            title: _coverTitleController.text,
-            logoPath: _coverLogoController.text,
-            description: _coverDescriptionController.text,
-            copyright: _coverCopyrightController.text,
-          ),
-          header: _headerController.text,
-          footer: _footerController.text,
-          tocTitle: _tocTitleController.text,
+          margin: _margin,
+          pageNumbers: _pageNumbers,
         ),
       ),
     );
@@ -612,23 +285,11 @@ class _WritersidePdfOptionsDialogState
 class _WritersidePdfSelection {
   const _WritersidePdfSelection({
     required this.instance,
-    required this.moduleName,
-    required this.sourceRoot,
-    required this.builderVersion,
-    required this.configurationMode,
-    required this.projectConfigurationPath,
     required this.options,
-    required this.allowNetwork,
   });
 
   final WritersideInstance instance;
-  final String moduleName;
-  final String sourceRoot;
-  final String builderVersion;
-  final WritersidePdfConfigurationMode configurationMode;
-  final String? projectConfigurationPath;
-  final WritersidePdfOptions options;
-  final bool allowNetwork;
+  final MarkdownPdfOptions options;
 }
 
 class _WritersidePdfProgressDialog extends StatefulWidget {
@@ -709,84 +370,6 @@ class _WritersidePdfProgressDialogState
   }
 }
 
-class _WritersideDownloadProgressDialog extends StatefulWidget {
-  const _WritersideDownloadProgressDialog({
-    required this.operation,
-    required this.cancellationToken,
-  });
-
-  final Future<void> Function() operation;
-  final WritersidePdfCancellationToken cancellationToken;
-
-  @override
-  State<_WritersideDownloadProgressDialog> createState() =>
-      _WritersideDownloadProgressDialogState();
-}
-
-class _WritersideDownloadProgressDialogState
-    extends State<_WritersideDownloadProgressDialog> {
-  var _cancelling = false;
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) => _run());
-  }
-
-  Future<void> _run() async {
-    try {
-      await widget.operation();
-      if (mounted) {
-        Navigator.pop(context, const _WritersideDownloadOutcome.success());
-      }
-    } on WritersidePdfExportException catch (failure) {
-      if (mounted) {
-        Navigator.pop(context, _WritersideDownloadOutcome.failure(failure));
-      }
-    } on Object catch (error) {
-      if (mounted) {
-        Navigator.pop(
-          context,
-          _WritersideDownloadOutcome.failure(
-            WritersidePdfExportException(
-              WritersidePdfFailureCode.fileSystem,
-              detail: error.toString(),
-              cause: error,
-            ),
-          ),
-        );
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return PopScope(
-      canPop: false,
-      child: BusyMarkDialogShell(
-        title: context.l10n.writersidePdfDownloadingBuilder,
-        closable: false,
-        maxWidth: 440,
-        actions: [
-          BusyMarkDialogButton(
-            label: context.l10n.cancel,
-            onPressed: _cancelling
-                ? null
-                : () {
-                    setState(() => _cancelling = true);
-                    widget.cancellationToken.cancel();
-                  },
-          ),
-        ],
-        children: const [
-          Center(child: CircularProgressIndicator()),
-          SizedBox(height: BusyMarkSpacing.md),
-        ],
-      ),
-    );
-  }
-}
-
 class _WritersidePdfOutcome {
   const _WritersidePdfOutcome._({this.result, this.failure});
 
@@ -800,15 +383,6 @@ class _WritersidePdfOutcome {
   final WritersidePdfExportException? failure;
 }
 
-class _WritersideDownloadOutcome {
-  const _WritersideDownloadOutcome.success() : succeeded = true, failure = null;
-
-  const _WritersideDownloadOutcome.failure(this.failure) : succeeded = false;
-
-  final bool succeeded;
-  final WritersidePdfExportException? failure;
-}
-
 Future<bool> _confirmOverwrite(
   BuildContext context,
   LinuxHeaderBarService headerBar,
@@ -842,21 +416,15 @@ Future<void> _showWritersidePdfError(
   WritersidePdfExportException failure,
 ) {
   final message = switch (failure.code) {
-    WritersidePdfFailureCode.dockerUnavailable =>
-      context.l10n.writersidePdfDockerUnavailable,
-    WritersidePdfFailureCode.builderImageUnavailable =>
-      context.l10n.writersidePdfBuilderUnavailable,
+    WritersidePdfFailureCode.exporterUnavailable =>
+      context.l10n.pdfExportUnavailable,
     WritersidePdfFailureCode.timedOut => context.l10n.pdfExportTimedOut,
     WritersidePdfFailureCode.destinationExists =>
       context.l10n.errorPathAlreadyExists(failure.detail),
     WritersidePdfFailureCode.invalidRequest ||
-    WritersidePdfFailureCode.invalidConfiguration =>
-      context.l10n.writersidePdfConfigurationInvalid,
-    WritersidePdfFailureCode.buildFailed =>
-      context.l10n.writersidePdfBuildFailed,
-    WritersidePdfFailureCode.invalidOutput =>
-      context.l10n.writersidePdfInvalidOutput,
-    WritersidePdfFailureCode.fileSystem => context.l10n.pdfExportFailed,
+    WritersidePdfFailureCode.buildFailed ||
+    WritersidePdfFailureCode.invalidOutput ||
+    WritersidePdfFailureCode.fileSystem ||
     WritersidePdfFailureCode.cancelled => context.l10n.pdfExportFailed,
   };
   return showBusyMarkModalDialog<void>(
@@ -898,11 +466,3 @@ String _withPdfExtension(String path) {
 extension _FirstOrNull<T> on Iterable<T> {
   T? get firstOrNull => isEmpty ? null : first;
 }
-
-String _configuredBuilderVersion(WritersideModule module) {
-  final configured = module.config.settings.wrsSupernovaUseVersion?.trim();
-  return configured != null &&
-          RegExp(r'^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$').hasMatch(configured)
-      ? configured
-      : writersideBuilderDefaultVersion;
-}
diff --git a/lib/src/export/writerside_pdf_models.dart b/lib/src/export/writerside_pdf_models.dart
index dd34478a..cd17950d 100644
--- a/lib/src/export/writerside_pdf_models.dart
+++ b/lib/src/export/writerside_pdf_models.dart
@@ -2,126 +2,21 @@ import 'package:flutter/foundation.dart';
 
 import 'markdown_pdf_models.dart';
 
-/// The current official Writerside builder documented by JetBrains when this
-/// BusyMark release was prepared. The repository is intentionally fixed; users
-/// may select another version tag, but not an arbitrary container image.
-const writersideBuilderRepository = 'jetbrains/writerside-builder';
-const writersideBuilderDefaultVersion = '2026.07.8925';
-
-enum WritersidePdfConfigurationMode { generated, projectFile }
-
-@immutable
-class WritersidePdfKeymapLayout {
-  const WritersidePdfKeymapLayout({
-    required this.name,
-    required this.displayName,
-  });
-
-  final String name;
-  final String displayName;
-}
-
-@immutable
-class WritersidePdfCoverOptions {
-  const WritersidePdfCoverOptions({
-    this.enabled = false,
-    this.title = '',
-    this.logoPath = '',
-    this.description = '',
-    this.copyright = '',
-  });
-
-  final bool enabled;
-  final String title;
-  final String logoPath;
-  final String description;
-  final String copyright;
-
-  WritersidePdfCoverOptions copyWith({
-    bool? enabled,
-    String? title,
-    String? logoPath,
-    String? description,
-    String? copyright,
-  }) {
-    return WritersidePdfCoverOptions(
-      enabled: enabled ?? this.enabled,
-      title: title ?? this.title,
-      logoPath: logoPath ?? this.logoPath,
-      description: description ?? this.description,
-      copyright: copyright ?? this.copyright,
-    );
-  }
-}
-
-@immutable
-class WritersidePdfOptions {
-  const WritersidePdfOptions({
-    this.orientation = MarkdownPdfOrientation.portrait,
-    this.layout = '',
-    this.cover = const WritersidePdfCoverOptions(),
-    this.header = '',
-    this.footer = '',
-    this.tocTitle = '',
-  });
-
-  final MarkdownPdfOrientation orientation;
-  final String layout;
-  final WritersidePdfCoverOptions cover;
-  final String header;
-  final String footer;
-  final String tocTitle;
-
-  WritersidePdfOptions copyWith({
-    MarkdownPdfOrientation? orientation,
-    String? layout,
-    WritersidePdfCoverOptions? cover,
-    String? header,
-    String? footer,
-    String? tocTitle,
-  }) {
-    return WritersidePdfOptions(
-      orientation: orientation ?? this.orientation,
-      layout: layout ?? this.layout,
-      cover: cover ?? this.cover,
-      header: header ?? this.header,
-      footer: footer ?? this.footer,
-      tocTitle: tocTitle ?? this.tocTitle,
-    );
-  }
-}
-
 @immutable
 class WritersidePdfExportRequest {
   const WritersidePdfExportRequest({
     required this.moduleRoot,
-    required this.sourceRoot,
-    required this.moduleName,
-    required this.buildConfigDirectory,
     required this.instanceId,
     required this.destinationPath,
     required this.overwrite,
-    required this.builderVersion,
-    required this.configurationMode,
-    this.options = const WritersidePdfOptions(),
-    this.projectConfigurationPath,
-    this.allowNetwork = false,
+    this.options = const MarkdownPdfOptions(),
   });
 
   final String moduleRoot;
-  final String sourceRoot;
-  final String moduleName;
-  final String buildConfigDirectory;
   final String instanceId;
   final String destinationPath;
   final bool overwrite;
-  final String builderVersion;
-  final WritersidePdfConfigurationMode configurationMode;
-  final WritersidePdfOptions options;
-  final String? projectConfigurationPath;
-  final bool allowNetwork;
-
-  String get builderImage => '$writersideBuilderRepository:$builderVersion';
+  final MarkdownPdfOptions options;
 }
 
 @immutable
@@ -129,21 +24,17 @@ class WritersidePdfExportResult {
   const WritersidePdfExportResult({
     required this.destinationPath,
     required this.pageCount,
-    required this.builderVersion,
-    required this.buildLog,
+    required this.warnings,
   });
 
   final String destinationPath;
   final int? pageCount;
-  final String builderVersion;
-  final String buildLog;
+  final List<MarkdownPdfWarning> warnings;
 }
 
 enum WritersidePdfFailureCode {
-  dockerUnavailable,
-  builderImageUnavailable,
+  exporterUnavailable,
   invalidRequest,
-  invalidConfiguration,
   buildFailed,
   timedOut,
   cancelled,
diff --git a/lib/src/git/application/git_controller.dart b/lib/src/git/application/git_controller.dart
index 31aad1ef..f18894b9 100644
--- a/lib/src/git/application/git_controller.dart
+++ b/lib/src/git/application/git_controller.dart
@@ -846,7 +846,11 @@ class GitController extends Notifier<GitState> {
         currentPath == null) {
       return false;
     }
-    state = state.copyWith(isRunningOperation: true, lastError: null);
+    state = state.copyWith(
+      isRunningOperation: true,
+      lastError: null,
+      lastOperationMessage: null,
+    );
     try {
       final result = await _gateway.restoreFileFromCommit(
         operation.repository,
@@ -1066,6 +1070,21 @@ class GitController extends Notifier<GitState> {
     return completed;
   }
 
+  Future<bool> configureAuthorIdentity({
+    required String name,
+    required String email,
+    required bool globally,
+  }) {
+    return _runOperation(
+      (repository) => _gateway.configureAuthorIdentity(
+        repository,
+        name: name,
+        email: email,
+        globally: globally,
+      ),
+    );
+  }
+
   Future<GitStagedDiffSnapshot?> stagedDiffForAi() async {
     final operation = _captureRepositoryOperation();
     if (operation == null ||
@@ -1558,7 +1577,11 @@ class GitController extends Notifier<GitState> {
         !_isCurrentRepositoryOperation(currentContext)) {
       return false;
     }
-    state = state.copyWith(isRunningOperation: true, lastError: null);
+    state = state.copyWith(
+      isRunningOperation: true,
+      lastError: null,
+      lastOperationMessage: null,
+    );
     try {
       final result = await operation(currentContext.repository);
       if (!_isCurrentRepositoryOperation(currentContext)) {
@@ -1598,7 +1621,11 @@ class GitController extends Notifier<GitState> {
     if (!_isCurrentWorkspaceOperation(context)) {
       return false;
     }
-    state = state.copyWith(isRunningOperation: true, lastError: null);
+    state = state.copyWith(
+      isRunningOperation: true,
+      lastError: null,
+      lastOperationMessage: null,
+    );
     try {
       final result = await operation(rootPath);
       if (!_isCurrentWorkspaceOperation(context)) {
@@ -2054,6 +2081,14 @@ class UnavailableGitRepositoryGateway implements GitRepositoryGateway {
     String message,
   ) => _unavailable();
 
+  @override
+  Future<GitOperationResult> configureAuthorIdentity(
+    GitRepositoryInfo repository, {
+    required String name,
+    required String email,
+    required bool globally,
+  }) => _unavailable();
+
   @override
   Future<GitOperationResult> fetch(GitRepositoryInfo repository) =>
       _unavailable();
diff --git a/lib/src/git/application/git_gateway.dart b/lib/src/git/application/git_gateway.dart
index 04820a3d..a1fb4758 100644
--- a/lib/src/git/application/git_gateway.dart
+++ b/lib/src/git/application/git_gateway.dart
@@ -92,6 +92,12 @@ abstract class GitRepositoryGateway implements GitRepositoryDetector {
     GitRepositoryInfo repository,
     String message,
   );
+  Future<GitOperationResult> configureAuthorIdentity(
+    GitRepositoryInfo repository, {
+    required String name,
+    required String email,
+    required bool globally,
+  });
   Future<GitOperationResult> fetch(GitRepositoryInfo repository);
   Future<GitOperationResult> pullFastForwardOnly(GitRepositoryInfo repository);
   Future<GitOperationResult> push(GitRepositoryInfo repository);
diff --git a/lib/src/git/data/git_cli_gateway.dart b/lib/src/git/data/git_cli_gateway.dart
index 24350cdb..39d5d378 100644
--- a/lib/src/git/data/git_cli_gateway.dart
+++ b/lib/src/git/data/git_cli_gateway.dart
@@ -796,6 +796,47 @@ class GitCliGateway implements GitRepositoryGateway {
     }
   }
 
+  @override
+  Future<GitOperationResult> configureAuthorIdentity(
+    GitRepositoryInfo repository, {
+    required String name,
+    required String email,
+    required bool globally,
+  }) async {
+    final normalizedName = name.trim();
+    final normalizedEmail = email.trim();
+    if (normalizedName.isEmpty ||
+        normalizedEmail.isEmpty ||
+        normalizedName.contains(RegExp(r'[\r\n]')) ||
+        normalizedEmail.contains(RegExp(r'[\r\n]'))) {
+      throw const GitFailure(
+        code: GitFailureCode.authorIdentity,
+        userMessageKey: 'gitErrorAuthorIdentity',
+        rawMessage: 'Enter a valid Git author name and email address.',
+        commandName: 'config',
+      );
+    }
+    final scope = globally ? '--global' : '--local';
+    await _operation(repository, [
+      'config',
+      scope,
+      'user.name',
+      normalizedName,
+    ], 'config');
+    await _operation(repository, [
+      'config',
+      scope,
+      'user.email',
+      normalizedEmail,
+    ], 'config');
+    return const GitOperationResult(
+      success: true,
+      message: '',
+      stdout: '',
+      stderr: '',
+    );
+  }
+
   @override
   Future<GitOperationResult> restoreFileFromCommit(
     GitRepositoryInfo repository,
@@ -1350,6 +1391,11 @@ class GitCliGateway implements GitRepositoryGateway {
     if (lower.contains('not a git repository')) {
       code = GitFailureCode.notRepository;
       key = 'gitErrorNotRepository';
+    } else if (lower.contains('author identity unknown') ||
+        lower.contains('please tell me who you are') ||
+        lower.contains('unable to auto-detect email address')) {
+      code = GitFailureCode.authorIdentity;
+      key = 'gitErrorAuthorIdentity';
     } else if (lower.contains('could not read from remote repository') ||
         lower.contains('permission denied') ||
         lower.contains('authentication failed') ||
diff --git a/lib/src/git/data/git_process_runner.dart b/lib/src/git/data/git_process_runner.dart
index 3246f71c..85d16a1c 100644
--- a/lib/src/git/data/git_process_runner.dart
+++ b/lib/src/git/data/git_process_runner.dart
@@ -69,11 +69,15 @@ class DartGitCommandRunner implements GitCommandRunner {
     }
     final stopwatch = Stopwatch()..start();
     final launch = processGroupLauncher.resolve(executable, arguments);
+    final snapGitEnvironment = gitEnvironmentForSnap(
+      processGroupLauncher.snapRootOverride,
+    );
     final process = await Process.start(
       launch.executable,
       launch.arguments,
       workingDirectory: workingDirectory,
       environment: {
+        ...snapGitEnvironment,
         ...environment,
         'GIT_TERMINAL_PROMPT': '0',
         'GIT_PAGER': 'cat',
@@ -195,6 +199,18 @@ class DartGitCommandRunner implements GitCommandRunner {
   }
 }
 
+Map<String, String> gitEnvironmentForSnap([String? snapRootOverride]) {
+  final snapRoot = snapRootOverride ?? Platform.environment['SNAP'];
+  if (snapRoot == null || snapRoot.isEmpty) {
+    return const {};
+  }
+  return {
+    'GIT_EXEC_PATH': '$snapRoot/usr/lib/git-core',
+    'GIT_TEMPLATE_DIR': '$snapRoot/usr/share/git-core/templates',
+    'GIT_SSH': '$snapRoot/usr/bin/ssh',
+  };
+}
+
 class _BoundedOutputCapture {
   _BoundedOutputCapture(this.maxBytes);
 
@@ -251,8 +267,8 @@ class GitProcessGroupLauncher {
           processGroup: true,
         );
       }
-      // Strict snap confinement cannot execute the host's /usr/bin/setsid.
-      // A malformed or older snap should retain Git support while sacrificing
+      // Prefer the packaged launcher whenever this binary runs from a Snap. A
+      // malformed package should retain Git support while sacrificing
       // process-group cleanup until its packaging is corrected.
       return GitProcessLaunch(
         executable: executable,
diff --git a/lib/src/git/domain/git_models.dart b/lib/src/git/domain/git_models.dart
index f5e618c4..abdd2663 100644
--- a/lib/src/git/domain/git_models.dart
+++ b/lib/src/git/domain/git_models.dart
@@ -52,6 +52,7 @@ enum GitFailureCode {
   stagedChanges,
   detachedHead,
   diverged,
+  authorIdentity,
   authentication,
   network,
   conflict,
diff --git a/lib/src/git/presentation/git_author_identity_dialog.dart b/lib/src/git/presentation/git_author_identity_dialog.dart
new file mode 100644
index 00000000..cdb6d7d5
--- /dev/null
+++ b/lib/src/git/presentation/git_author_identity_dialog.dart
@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+
+import '../../app/busymark_design.dart';
+import '../../app/busymark_dialogs.dart';
+import '../../app/localization.dart';
+
+class GitAuthorIdentityInput {
+  const GitAuthorIdentityInput({
+    required this.name,
+    required this.email,
+    required this.globally,
+  });
+
+  final String name;
+  final String email;
+  final bool globally;
+}
+
+Future<GitAuthorIdentityInput?> showGitAuthorIdentityDialog(
+  BuildContext context,
+) {
+  return showBusyMarkModalEditorDialog<GitAuthorIdentityInput>(
+    context,
+    maxWidth: BusyMarkSizes.dialogCompact,
+    builder: (context) => const _GitAuthorIdentityDialog(),
+  );
+}
+
+class _GitAuthorIdentityDialog extends StatefulWidget {
+  const _GitAuthorIdentityDialog();
+
+  @override
+  State<_GitAuthorIdentityDialog> createState() =>
+      _GitAuthorIdentityDialogState();
+}
+
+class _GitAuthorIdentityDialogState extends State<_GitAuthorIdentityDialog> {
+  late final TextEditingController _nameController;
+  late final TextEditingController _emailController;
+  late final FocusNode _emailFocusNode;
+  var _globally = true;
+
+  bool get _canSubmit =>
+      _nameController.text.trim().isNotEmpty &&
+      _emailController.text.trim().isNotEmpty &&
+      !_nameController.text.contains(RegExp(r'[\r\n]')) &&
+      !_emailController.text.contains(RegExp(r'[\r\n]'));
+
+  @override
+  void initState() {
+    super.initState();
+    _nameController = TextEditingController()..addListener(_handleChanged);
+    _emailController = TextEditingController()..addListener(_handleChanged);
+    _emailFocusNode = FocusNode();
+  }
+
+  @override
+  void dispose() {
+    _nameController
+      ..removeListener(_handleChanged)
+      ..dispose();
+    _emailController
+      ..removeListener(_handleChanged)
+      ..dispose();
+    _emailFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BusyMarkModalEditorScaffold(
+      title: context.l10n.gitAuthorIdentityTitle,
+      cancelLabel: context.l10n.cancel,
+      saveLabel: context.l10n.gitSaveIdentityAndCommit,
+      onCancel: () => Navigator.pop(context),
+      onSave: _canSubmit ? _submit : null,
+      children: [
+        Text(context.l10n.gitAuthorIdentityMessage),
+        const SizedBox(height: BusyMarkSpacing.lg),
+        BusyMarkGroupedList(
+          filled: true,
+          children: [
+            BusyMarkGroupedTextEntry(
+              label: context.l10n.gitAuthorName,
+              controller: _nameController,
+              autofocus: true,
+              textInputAction: TextInputAction.next,
+              onSubmitted: (_) => _emailFocusNode.requestFocus(),
+            ),
+            BusyMarkGroupedTextEntry(
+              label: context.l10n.gitAuthorEmail,
+              controller: _emailController,
+              focusNode: _emailFocusNode,
+              keyboardType: TextInputType.emailAddress,
+              textDirection: TextDirection.ltr,
+              textInputAction: TextInputAction.done,
+              onSubmitted: (_) => _submit(),
+            ),
+            BusyMarkSwitchRow(
+              title: context.l10n.gitAuthorIdentityGlobal,
+              subtitle: context.l10n.gitAuthorIdentityGlobalDescription,
+              value: _globally,
+              onChanged: (value) => setState(() => _globally = value),
+            ),
+          ],
+        ),
+        const SizedBox(height: BusyMarkSpacing.lg),
+      ],
+    );
+  }
+
+  void _submit() {
+    if (!_canSubmit) {
+      return;
+    }
+    Navigator.pop(
+      context,
+      GitAuthorIdentityInput(
+        name: _nameController.text.trim(),
+        email: _emailController.text.trim(),
+        globally: _globally,
+      ),
+    );
+  }
+
+  void _handleChanged() {
+    setState(() {});
+  }
+}
diff --git a/lib/src/git/presentation/git_sidebar_tab.dart b/lib/src/git/presentation/git_sidebar_tab.dart
index eec76a20..8a5a89ce 100644
--- a/lib/src/git/presentation/git_sidebar_tab.dart
+++ b/lib/src/git/presentation/git_sidebar_tab.dart
@@ -1,17 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter/services.dart';
 
 import '../../ai/ai_edit_ui.dart';
 import '../../ai/ai_models.dart';
 import '../../app/busymark_design.dart';
 import '../../app/busymark_dialogs.dart';
 import '../../app/busymark_glyphs.dart';
+import '../../app/busymark_toast.dart';
 import '../../app/localization.dart';
 import '../../workspace/workspace_model.dart';
 import '../../workspace/workspace_controller.dart';
 import '../../workspace/workspace_safety.dart';
 import '../application/git_controller.dart';
 import '../domain/git_models.dart';
+import 'git_author_identity_dialog.dart';
 import 'git_changes_view.dart';
 import 'git_history_view.dart';
 
@@ -36,6 +39,22 @@ class GitSidebarTab extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(gitControllerProvider);
+    ref.listen<GitState>(gitControllerProvider, (previous, next) {
+      final failure = next.lastError;
+      if (failure != null && !identical(failure, previous?.lastError)) {
+        if (failure.code == GitFailureCode.authorIdentity) {
+          return;
+        }
+        _showGitFailureToast(context, failure);
+        return;
+      }
+      final message = next.lastOperationMessage?.trim();
+      if (message != null &&
+          message.isNotEmpty &&
+          message != previous?.lastOperationMessage?.trim()) {
+        BusyMarkToastOverlay.show(context, message: message);
+      }
+    });
     final hasUnsavedEditorChanges = ref.watch(
       workspaceControllerProvider.select((value) => value.isDirty),
     );
@@ -82,7 +101,8 @@ class GitSidebarTab extends ConsumerWidget {
       });
     }
     return GitCommitActions(
-      commit: controller.commit,
+      commit: (message) =>
+          _commitWithIdentityRecovery(context, ref, controller, message),
       child: GitFileActions(
         select: (paths) => controller.stageFiles(paths),
         unselect: (paths) => controller.unstageFiles(paths),
@@ -97,10 +117,6 @@ class GitSidebarTab extends ConsumerWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            if (state.lastError != null)
-              _GitMessage(failure: state.lastError!)
-            else if (state.lastOperationMessage?.isNotEmpty ?? false)
-              _GitOperationMessage(message: state.lastOperationMessage!),
             Expanded(
               child: switch (state.selectedView) {
                 GitView.changes => GitChangesView(
@@ -164,6 +180,10 @@ class GitSidebarTab extends ConsumerWidget {
     if (stagedDiff == null || !context.mounted) {
       return null;
     }
+    final provider = await chooseBusyMarkAiProvider(context, ref);
+    if (provider == null || !context.mounted) {
+      return null;
+    }
     final repository = ref.read(gitControllerProvider).repositoryInfo;
     return showBusyMarkAiProposal(
       context,
@@ -179,6 +199,7 @@ class GitSidebarTab extends ConsumerWidget {
         contentFormat: AiContentFormat.plainText,
         enforceDocumentRevision: false,
       ),
+      providerKind: provider,
       validateBeforeApply: () =>
           controller.stagedDiffMatches(stagedDiff.fingerprint),
       staleMessage: context.l10n.gitAiStagedChangesChanged,
@@ -365,87 +386,79 @@ class _GitResetDialogState extends State<_GitResetDialog> {
   }
 }
 
-class _GitMessage extends StatelessWidget {
-  const _GitMessage({required this.failure});
-
-  final GitFailure failure;
+String _gitFailureMessage(BuildContext context, GitFailure failure) {
+  return switch (failure.code) {
+    GitFailureCode.unavailable ||
+    GitFailureCode.unsupportedVersion => context.l10n.gitErrorUnavailable,
+    GitFailureCode.notRepository => context.l10n.gitErrorNotRepository,
+    GitFailureCode.invalidPath => context.l10n.gitErrorUnsafePath,
+    GitFailureCode.invalidBranchName => context.l10n.gitErrorInvalidBranchName,
+    GitFailureCode.invalidCommitMessage =>
+      context.l10n.gitCommitMessageRequired,
+    GitFailureCode.noStagedFiles => context.l10n.gitCommitNoSelectedFiles,
+    GitFailureCode.noRemote => context.l10n.gitErrorNoRemote,
+    GitFailureCode.noUpstream => context.l10n.gitErrorNoUpstream,
+    GitFailureCode.multipleRemotes => context.l10n.gitErrorMultipleRemotes,
+    GitFailureCode.dirtyWorkspace =>
+      failure.commandName == 'reset'
+          ? context.l10n.gitErrorResetDirtyWorkspace
+          : context.l10n.gitErrorDirtyWorkspace,
+    GitFailureCode.stagedChanges => context.l10n.gitErrorRestoreStagedFile,
+    GitFailureCode.detachedHead => context.l10n.gitErrorResetDetachedHead,
+    GitFailureCode.diverged => context.l10n.gitErrorDiverged,
+    GitFailureCode.authorIdentity => context.l10n.gitErrorAuthorIdentity,
+    GitFailureCode.authentication => context.l10n.gitErrorAuthentication,
+    GitFailureCode.network => context.l10n.gitErrorNetwork,
+    GitFailureCode.conflict => context.l10n.gitErrorConflict,
+    GitFailureCode.commandFailed => context.l10n.gitErrorCommandFailed,
+  };
+}
 
-  @override
-  Widget build(BuildContext context) {
-    final message = _failureMessage(context, failure);
-    final rawMessage = failure.rawMessage.trim();
-    return SelectionArea(
-      child: BusyMarkStatusBox(
-        message: rawMessage.isEmpty ? message : '$message\n$rawMessage',
-        kind: _gitFailureStatusKind(failure.code),
-      ),
-    );
+Future<bool> _commitWithIdentityRecovery(
+  BuildContext context,
+  WidgetRef ref,
+  GitController controller,
+  String message,
+) async {
+  if (await controller.commit(message)) {
+    return true;
   }
-
-  String _failureMessage(BuildContext context, GitFailure failure) {
-    return switch (failure.code) {
-      GitFailureCode.unavailable ||
-      GitFailureCode.unsupportedVersion => context.l10n.gitErrorUnavailable,
-      GitFailureCode.notRepository => context.l10n.gitErrorNotRepository,
-      GitFailureCode.invalidPath => context.l10n.gitErrorUnsafePath,
-      GitFailureCode.invalidBranchName =>
-        context.l10n.gitErrorInvalidBranchName,
-      GitFailureCode.invalidCommitMessage =>
-        context.l10n.gitCommitMessageRequired,
-      GitFailureCode.noStagedFiles => context.l10n.gitCommitNoSelectedFiles,
-      GitFailureCode.noRemote => context.l10n.gitErrorNoRemote,
-      GitFailureCode.noUpstream => context.l10n.gitErrorNoUpstream,
-      GitFailureCode.multipleRemotes => context.l10n.gitErrorMultipleRemotes,
-      GitFailureCode.dirtyWorkspace =>
-        failure.commandName == 'reset'
-            ? context.l10n.gitErrorResetDirtyWorkspace
-            : context.l10n.gitErrorDirtyWorkspace,
-      GitFailureCode.stagedChanges => context.l10n.gitErrorRestoreStagedFile,
-      GitFailureCode.detachedHead => context.l10n.gitErrorResetDetachedHead,
-      GitFailureCode.diverged => context.l10n.gitErrorDiverged,
-      GitFailureCode.authentication => context.l10n.gitErrorAuthentication,
-      GitFailureCode.network => context.l10n.gitErrorNetwork,
-      GitFailureCode.conflict => context.l10n.gitErrorConflict,
-      GitFailureCode.commandFailed => context.l10n.gitErrorCommandFailed,
-    };
+  final failure = ref.read(gitControllerProvider).lastError;
+  if (failure?.code != GitFailureCode.authorIdentity || !context.mounted) {
+    return false;
   }
-}
-
-class _GitOperationMessage extends StatelessWidget {
-  const _GitOperationMessage({required this.message});
-
-  final String message;
-
-  @override
-  Widget build(BuildContext context) {
-    return BusyMarkStatusBox(
-      message: message,
-      kind: BusyMarkStatusKind.success,
-    );
+  final identity = await showGitAuthorIdentityDialog(context);
+  if (identity == null || !context.mounted) {
+    return false;
+  }
+  final configured = await controller.configureAuthorIdentity(
+    name: identity.name,
+    email: identity.email,
+    globally: identity.globally,
+  );
+  if (!configured || !context.mounted) {
+    return false;
   }
+  return controller.commit(message);
 }
 
-BusyMarkStatusKind _gitFailureStatusKind(GitFailureCode code) {
-  return switch (code) {
-    GitFailureCode.noStagedFiles ||
-    GitFailureCode.noRemote ||
-    GitFailureCode.noUpstream ||
-    GitFailureCode.multipleRemotes => BusyMarkStatusKind.information,
-    GitFailureCode.dirtyWorkspace ||
-    GitFailureCode.stagedChanges ||
-    GitFailureCode.detachedHead ||
-    GitFailureCode.diverged ||
-    GitFailureCode.conflict => BusyMarkStatusKind.warning,
-    GitFailureCode.unavailable ||
-    GitFailureCode.unsupportedVersion ||
-    GitFailureCode.notRepository ||
-    GitFailureCode.invalidPath ||
-    GitFailureCode.invalidBranchName ||
-    GitFailureCode.invalidCommitMessage ||
-    GitFailureCode.authentication ||
-    GitFailureCode.network ||
-    GitFailureCode.commandFailed => BusyMarkStatusKind.error,
-  };
+void _showGitFailureToast(BuildContext context, GitFailure failure) {
+  final summary = _gitFailureMessage(context, failure);
+  final rawMessage = failure.rawMessage.trim();
+  final firstDetail = rawMessage
+      .split('\n')
+      .map((line) => line.trim())
+      .firstWhere((line) => line.isNotEmpty, orElse: () => '');
+  BusyMarkToastOverlay.show(
+    context,
+    message: firstDetail.isEmpty ? summary : '$summary\n$firstDetail',
+    actionLabel: rawMessage.isEmpty ? null : context.l10n.copy,
+    onAction: rawMessage.isEmpty
+        ? null
+        : () => Clipboard.setData(ClipboardData(text: rawMessage)),
+    duration: const Duration(seconds: 8),
+    priority: BusyMarkToastPriority.high,
+  );
 }
 
 class _GitEmptyState extends StatelessWidget {
diff --git a/lib/src/markdown/busymark_document.dart b/lib/src/markdown/busymark_document.dart
index 32fe5c41..0e628930 100644
--- a/lib/src/markdown/busymark_document.dart
+++ b/lib/src/markdown/busymark_document.dart
@@ -5,6 +5,60 @@ import 'markdown_model.dart';
 /// Marks an empty WYSIWYG paragraph that must remain a source blank line.
 const busyMarkPreserveEmptyParagraphAttribute = 'preserveEmptyParagraph';
 
+const busyMarkWritersideAdmonitionAttribute = 'writersideAdmonition';
+const busyMarkWritersideAdmonitionSourceFormAttribute =
+    'writersideAdmonitionSourceForm';
+
+const busyMarkWritersideCollapsibleAttribute = 'collapsible';
+const busyMarkWritersideDefaultStateAttribute = 'default-state';
+const busyMarkWritersideCollapsedTitleAttribute = 'collapsed-title';
+const busyMarkWritersideCodeBlockSourceFormAttribute =
+    'writersideCodeBlockSourceForm';
+const busyMarkWritersideCodeBlockElementSourceForm = 'element';
+
+bool busyMarkWritersideIsCollapsible(Map<String, String> attributes) {
+  return attributes[busyMarkWritersideCollapsibleAttribute]
+          ?.trim()
+          .toLowerCase() ==
+      'true';
+}
+
+bool busyMarkWritersideInitiallyExpanded(Map<String, String> attributes) {
+  return attributes[busyMarkWritersideDefaultStateAttribute]
+          ?.trim()
+          .toLowerCase() ==
+      'expanded';
+}
+
+enum BusyAdmonitionStyle { tip, note, warning, quote }
+
+BusyAdmonitionStyle? busyAdmonitionStyleFromName(String? value) {
+  final normalized = value?.trim().toLowerCase();
+  return BusyAdmonitionStyle.values
+      .where((style) => style.name == normalized)
+      .firstOrNull;
+}
+
+enum BusyTableAlignment { unspecified, left, center, right }
+
+BusyTableAlignment busyTableAlignmentFromAttribute(String? value) {
+  return switch (value?.toLowerCase()) {
+    'left' => BusyTableAlignment.left,
+    'center' => BusyTableAlignment.center,
+    'right' => BusyTableAlignment.right,
+    _ => BusyTableAlignment.unspecified,
+  };
+}
+
+String? busyTableAlignmentAttribute(BusyTableAlignment alignment) {
+  return switch (alignment) {
+    BusyTableAlignment.unspecified => null,
+    BusyTableAlignment.left => 'left',
+    BusyTableAlignment.center => 'center',
+    BusyTableAlignment.right => 'right',
+  };
+}
+
 class BusyDocument {
   const BusyDocument({
     required this.filePath,
@@ -50,6 +104,7 @@ class BusyDocument {
 enum BusyBlockKind {
   heading,
   paragraph,
+  math,
   codeBlock,
   unorderedListItem,
   orderedListItem,
@@ -57,6 +112,7 @@ enum BusyBlockKind {
   blockquote,
   thematicBreak,
   image,
+  video,
   table,
   htmlBlock,
   writersideAdmonition,
@@ -131,6 +187,7 @@ class BusyBlock {
 
 enum BusyInlineKind {
   text,
+  math,
   strong,
   emphasis,
   underline,
diff --git a/lib/src/markdown/busymark_markdown_serializer.dart b/lib/src/markdown/busymark_markdown_serializer.dart
index ba2e87b4..9d5df7b5 100644
--- a/lib/src/markdown/busymark_markdown_serializer.dart
+++ b/lib/src/markdown/busymark_markdown_serializer.dart
@@ -1,5 +1,6 @@
 import '../core/source_span.dart';
 import 'busymark_document.dart';
+import 'math_syntax.dart';
 
 class BusyMarkMarkdownSerializer {
   const BusyMarkMarkdownSerializer();
@@ -38,6 +39,7 @@ class BusyMarkMarkdownSerializer {
     return switch (block.kind) {
       BusyBlockKind.heading => _heading(block),
       BusyBlockKind.paragraph => _inlineMarkdown(block.inlines),
+      BusyBlockKind.math => _mathBlock(block),
       BusyBlockKind.codeBlock => _codeBlock(block),
       BusyBlockKind.unorderedListItem => _listItem(block, '-'),
       BusyBlockKind.orderedListItem => _listItem(
@@ -54,6 +56,7 @@ class BusyMarkMarkdownSerializer {
       BusyBlockKind.blockquote => _blockquote(block),
       BusyBlockKind.thematicBreak => '---',
       BusyBlockKind.image => _image(block),
+      BusyBlockKind.video => block.rawSource ?? _inlineMarkdown(block.inlines),
       BusyBlockKind.table => _table(block),
       BusyBlockKind.writersideAdmonition => _writersideAdmonition(block),
       BusyBlockKind.writersideTabs ||
@@ -160,17 +163,91 @@ class BusyMarkMarkdownSerializer {
     final text = _inlineMarkdown(block.inlines);
     final id = block.attributes['id'];
     final generated = block.attributes['generatedId'] != 'false';
-    final suffix = id == null || id.isEmpty || generated ? '' : ' {id="$id"}';
+    final attributes = <String>[
+      if (id != null && id.isNotEmpty && !generated) 'id="${_attribute(id)}"',
+      if (busyMarkWritersideIsCollapsible(block.attributes))
+        'collapsible="true"',
+      if (block.attributes[busyMarkWritersideDefaultStateAttribute]
+          case final state? when state.trim().isNotEmpty)
+        'default-state="${_attribute(state)}"',
+    ];
+    final suffix = attributes.isEmpty ? '' : ' {${attributes.join(' ')}}';
     return '${'#' * level} $text$suffix';
   }
 
   String _codeBlock(BusyBlock block) {
     final language = block.attributes['language'] ?? '';
     final text = block.plainText;
+    if (block.attributes[busyMarkWritersideCodeBlockSourceFormAttribute] ==
+        busyMarkWritersideCodeBlockElementSourceForm) {
+      final attributes = <String>[
+        if (language.trim().isNotEmpty)
+          'lang="${_xmlAttribute(language.trim())}"',
+        for (final entry in block.attributes.entries)
+          if (_writersideCodeBlockXmlAttribute(entry.key) &&
+              entry.value.trim().isNotEmpty)
+            '${entry.key}="${_xmlAttribute(entry.value)}"',
+      ];
+      final opening =
+          '<code-block${attributes.isEmpty ? '' : ' ${attributes.join(' ')}'}';
+      if (text.isEmpty && (block.attributes['src']?.isNotEmpty ?? false)) {
+        return '$opening/>';
+      }
+      return '$opening>\n${busyMarkEncodeXmlMathText(text)}\n</code-block>';
+    }
     final delimiter = language.contains('`') ? '~' : '`';
     final fence = delimiter * _delimiterLength(text, delimiter, minimum: 3);
     final infoSeparator = language.startsWith(delimiter) ? ' ' : '';
-    return '$fence$infoSeparator$language\n$text\n$fence';
+    final source = '$fence$infoSeparator$language\n$text\n$fence';
+    final hasSource = block.attributes['src']?.trim().isNotEmpty ?? false;
+    if (!busyMarkWritersideIsCollapsible(block.attributes) && !hasSource) {
+      return source;
+    }
+    final attributes = <String>[
+      'collapsible="true"',
+      if (block.attributes[busyMarkWritersideCollapsedTitleAttribute]
+          case final title? when title.trim().isNotEmpty)
+        'collapsed-title="${_attribute(title)}"',
+      if (block.attributes[busyMarkWritersideDefaultStateAttribute]
+          case final state? when state.trim().isNotEmpty)
+        'default-state="${_attribute(state)}"',
+      if (block.attributes['src'] case final source?
+          when source.trim().isNotEmpty)
+        'src="${_attribute(source)}"',
+    ];
+    return '$source\n{${attributes.join(' ')}}';
+  }
+
+  bool _writersideCodeBlockXmlAttribute(String key) => !{
+    'element',
+    'lang',
+    'language',
+    'editorBlockId',
+    busyMarkWritersideCodeBlockSourceFormAttribute,
+  }.contains(key);
+
+  String _xmlAttribute(String value) => busyMarkEncodeXmlMathText(
+    value,
+  ).replaceAll('"', '&quot;').replaceAll("'", '&apos;');
+
+  String _attribute(String value) => value.replaceAll('"', '&quot;');
+
+  String _mathBlock(BusyBlock block) {
+    final expression =
+        block.attributes[busyMarkMathExpressionAttribute] ?? block.plainText;
+    final form = busyMathSourceFormFromName(
+      block.attributes[busyMarkMathSourceFormAttribute],
+    );
+    return switch (form) {
+      BusyMathSourceForm.mathFence => '```math\n$expression\n```',
+      BusyMathSourceForm.writersideTexFence => '```tex\n$expression\n```',
+      BusyMathSourceForm.writersideTexElement =>
+        '<code-block lang="tex">\n${busyMarkEncodeXmlMathText(expression)}\n</code-block>',
+      BusyMathSourceForm.writersideElement => '<math>$expression</math>',
+      BusyMathSourceForm.doubleDollarDisplay ||
+      BusyMathSourceForm.dollarInline ||
+      BusyMathSourceForm.githubDollarBacktick => '\$\$\n$expression\n\$\$',
+    };
   }
 
   String _listItem(BusyBlock block, String marker, {String? contentPrefix}) {
@@ -252,10 +329,21 @@ class BusyMarkMarkdownSerializer {
     final text = block.children.isEmpty
         ? _inlineMarkdown(block.inlines)
         : block.children.map(serializeBlock).join('\n\n');
-    return text
+    final quote = text
         .split('\n')
         .map((line) => line.isEmpty ? '>' : '> $line')
         .join('\n');
+    if (block.attributes[busyMarkWritersideAdmonitionAttribute] != 'true') {
+      return quote;
+    }
+    final style =
+        busyAdmonitionStyleFromName(block.attributes['style']) ??
+        BusyAdmonitionStyle.tip;
+    if (style == BusyAdmonitionStyle.tip) {
+      return quote;
+    }
+    final attribute = '{style="${style.name}"}';
+    return quote.isEmpty ? attribute : '$quote\n$attribute';
   }
 
   String _image(BusyBlock block) {
@@ -281,13 +369,35 @@ class BusyMarkMarkdownSerializer {
     final body = rows.skip(1);
     final buffer = StringBuffer()
       ..writeln('| ${header.join(' | ')} |')
-      ..writeln('| ${header.map((_) => '---').join(' | ')} |');
+      ..writeln(
+        '| ${[for (var column = 0; column < header.length; column++) _tableColumnDelimiter(block, column)].join(' | ')} |',
+      );
     for (final row in body) {
       buffer.writeln('| ${row.children.map(_tableCellMarkdown).join(' | ')} |');
     }
     return buffer.toString().trimRight();
   }
 
+  String _tableColumnDelimiter(BusyBlock table, int column) {
+    final alignment = table.children
+        .where((row) => column < row.children.length)
+        .map(
+          (row) => busyTableAlignmentFromAttribute(
+            row.children[column].attributes['align'],
+          ),
+        )
+        .firstWhere(
+          (value) => value != BusyTableAlignment.unspecified,
+          orElse: () => BusyTableAlignment.unspecified,
+        );
+    return switch (alignment) {
+      BusyTableAlignment.unspecified => '---',
+      BusyTableAlignment.left => ':---',
+      BusyTableAlignment.center => ':---:',
+      BusyTableAlignment.right => '---:',
+    };
+  }
+
   String _tableCellMarkdown(BusyBlock cell) {
     return _inlineMarkdown(
       cell.inlines,
@@ -299,8 +409,36 @@ class BusyMarkMarkdownSerializer {
     if (!_hasDirtyContent(block) && block.rawSource != null) {
       return block.rawSource!;
     }
-    final element = block.attributes['element'] ?? 'note';
-    return '<$element>${_inlineMarkdown(block.inlines)}</$element>';
+    final style =
+        busyAdmonitionStyleFromName(
+          block.attributes['style'] ?? block.attributes['element'],
+        ) ??
+        BusyAdmonitionStyle.note;
+    final attributes = block.attributes.entries
+        .where(
+          (entry) =>
+              entry.key != 'element' &&
+              entry.key != 'style' &&
+              entry.key != busyMarkWritersideAdmonitionAttribute &&
+              entry.key != busyMarkWritersideAdmonitionSourceFormAttribute,
+        )
+        .map((entry) => '${entry.key}="${_escapeXmlAttribute(entry.value)}"')
+        .join(' ');
+    final opening = attributes.isEmpty
+        ? '<${style.name}>'
+        : '<${style.name} $attributes>';
+    final content = block.children.isEmpty
+        ? _inlineMarkdown(block.inlines)
+        : block.children.map(serializeBlock).join('\n\n');
+    return '$opening$content</${style.name}>';
+  }
+
+  String _escapeXmlAttribute(String value) {
+    return value
+        .replaceAll('&', '&amp;')
+        .replaceAll('"', '&quot;')
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;');
   }
 
   String _inlineMarkdown(List<BusyInline> inlines, {bool tableCell = false}) {
@@ -315,6 +453,7 @@ class BusyMarkMarkdownSerializer {
         : _inlineMarkdown(inline.children, tableCell: tableCell);
     return switch (inline.kind) {
       BusyInlineKind.text => _escapeInlineText(inline.text),
+      BusyInlineKind.math => _mathInline(inline),
       BusyInlineKind.strong => '**$children**',
       BusyInlineKind.emphasis => '*$children*',
       BusyInlineKind.underline => '<u>$children</u>',
@@ -334,6 +473,30 @@ class BusyMarkMarkdownSerializer {
     };
   }
 
+  String _mathInline(BusyInline inline) {
+    final form = busyMathSourceFormFromName(
+      inline.attributes[busyMarkMathSourceFormAttribute],
+    );
+    return switch (form) {
+      BusyMathSourceForm.githubDollarBacktick => '\$`${inline.text}`\$',
+      BusyMathSourceForm.writersideElement =>
+        '<math>${_writersideMathExpression(inline)}</math>',
+      BusyMathSourceForm.dollarInline ||
+      BusyMathSourceForm.doubleDollarDisplay ||
+      BusyMathSourceForm.mathFence ||
+      BusyMathSourceForm.writersideTexFence ||
+      BusyMathSourceForm.writersideTexElement => '\$${inline.text}\$',
+    };
+  }
+
+  String _writersideMathExpression(BusyInline inline) {
+    final raw = inline.attributes[busyMarkMathRawExpressionAttribute];
+    if (raw != null && busyMarkDecodeXmlMathText(raw) == inline.text) {
+      return raw;
+    }
+    return busyMarkEncodeXmlMathText(inline.text);
+  }
+
   String _codeSpan(String text) {
     final delimiter = '`' * _delimiterLength(text, '`');
     final touchesDelimiter = text.startsWith('`') || text.endsWith('`');
@@ -385,6 +548,7 @@ class BusyMarkMarkdownSerializer {
   String _escapeInlineText(String value) {
     return value
         .replaceAll('\\', r'\\')
+        .replaceAll(r'$', r'\$')
         .replaceAll('[', r'\[')
         .replaceAll(']', r'\]');
   }
diff --git a/lib/src/markdown/markdown_ast_adapter.dart b/lib/src/markdown/markdown_ast_adapter.dart
index 3604dfb4..9c1cc442 100644
--- a/lib/src/markdown/markdown_ast_adapter.dart
+++ b/lib/src/markdown/markdown_ast_adapter.dart
@@ -1,9 +1,11 @@
 import 'package:markdown/markdown.dart' as md;
+import 'package:xml/xml.dart';
 
 import '../core/path_utils.dart';
 import 'busymark_document.dart';
 import 'markdown_fence.dart';
 import 'markdown_model.dart';
+import 'math_syntax.dart';
 import 'raw_html_adapter.dart';
 import 'raw_html_policy.dart';
 
@@ -56,8 +58,34 @@ class MarkdownAstAdapter {
     required MarkdownMode mode,
   }) {
     final blocks = <BusyBlock>[];
-    for (final segment in _rawHtmlAwareSegments(source)) {
+    for (final segment in _rawHtmlAwareSegments(source, mode)) {
       if (segment.rawHtml) {
+        if (mode == MarkdownMode.writersideMarkdown) {
+          final writerside = _writersideBlockFromText(
+            segment.text,
+            nextId: nextId,
+            allowVideo: true,
+          );
+          if (writerside != null) {
+            blocks.add(writerside);
+            continue;
+          }
+        }
+        final customTag = RegExp(
+          r'^\s*<([A-Za-z][A-Za-z0-9_-]*)\b',
+        ).firstMatch(segment.text)?.group(1)?.toLowerCase();
+        if (customTag != null && _writersideBlockTag(customTag)) {
+          blocks.add(
+            BusyBlock(
+              id: nextId(),
+              kind: BusyBlockKind.htmlBlock,
+              rawSource: segment.text.trimRight(),
+              preserveRaw: true,
+              attributes: const {'sourceFormat': 'html'},
+            ),
+          );
+          continue;
+        }
         final html = _rawHtmlAdapter.parseRawHtmlBlock(segment.text, nextId);
         if (html != null) {
           blocks.add(
@@ -89,15 +117,15 @@ class MarkdownAstAdapter {
     final packageSource = _protectProseHyphenLines(
       _protectImageDestinationsWithSpaces(source),
     );
-    final document = md.Document(
-      extensionSet: md.ExtensionSet.gitHubWeb,
-      encodeHtml: false,
-    );
+    final document = busyMarkMarkdownDocument(mode);
     final nodes = document.parse(packageSource);
-    return [
+    final blocks = [
       for (final node in nodes)
         ..._blocksFromNode(node, nextId: nextId, mode: mode),
     ];
+    return mode == MarkdownMode.writersideMarkdown
+        ? _attachWritersideCodeAttributes(blocks)
+        : blocks;
   }
 
   List<BusyBlock> _applyImageAttributes(
@@ -131,6 +159,16 @@ class MarkdownAstAdapter {
       if (text.isEmpty) {
         return const [];
       }
+      if (mode == MarkdownMode.writersideMarkdown) {
+        final writerside = _writersideBlockFromText(
+          rawText,
+          nextId: nextId,
+          allowVideo: true,
+        );
+        if (writerside != null) {
+          return [writerside];
+        }
+      }
       final html = _rawHtmlAdapter.parseRawHtmlBlock(rawText, nextId);
       if (html != null) {
         return [
@@ -165,30 +203,62 @@ class MarkdownAstAdapter {
 
     final tag = node.tag.toLowerCase();
     final children = node.children ?? const <md.Node>[];
+    if (tag == busyMarkMathBlockTag) {
+      return [
+        BusyBlock(
+          id: nextId(),
+          kind: BusyBlockKind.math,
+          inlines: [
+            BusyInline(
+              kind: BusyInlineKind.math,
+              text:
+                  node.attributes[busyMarkMathExpressionAttribute] ??
+                  node.textContent,
+              attributes: node.attributes,
+            ),
+          ],
+          attributes: node.attributes,
+        ),
+      ];
+    }
     if (_headingLevel(tag) case final level?) {
       final rawText = node.textContent.trim();
       final attrId = _attributeValue(rawText, 'id');
-      final text = _stripTrailingAttributeBlock(rawText);
+      final trailingAttributes = mode == MarkdownMode.writersideMarkdown
+          ? _trailingAttributeBlock(rawText)
+          : const <String, String>{};
+      final hasSupportedAttributeBlock =
+          attrId != null || trailingAttributes.isNotEmpty;
+      final text = hasSupportedAttributeBlock
+          ? _stripTrailingAttributeBlock(rawText)
+          : rawText;
       final anchorId = attrId ?? slugForHeading(text);
+      final parsedInlines = _inlinesFromNodes(children);
       return [
         BusyBlock(
           id: nextId(),
           kind: BusyBlockKind.heading,
-          inlines: _stripTrailingAttributeInline(_inlinesFromNodes(children)),
+          inlines: hasSupportedAttributeBlock
+              ? _stripTrailingAttributeInline(parsedInlines)
+              : parsedInlines,
           attributes: {
             'level': '$level',
             'id': anchorId,
             'generatedId': '${attrId == null}',
+            ...trailingAttributes,
           },
         ),
       ];
     }
 
     if (tag == 'p') {
-      final writerside = _writersideBlockFromText(
-        node.textContent,
-        nextId: nextId,
-      );
+      final writerside = mode == MarkdownMode.writersideMarkdown
+          ? _writersideBlockFromText(
+              node.textContent,
+              nextId: nextId,
+              allowVideo: true,
+            )
+          : null;
       if (writerside != null) {
         return [writerside];
       }
@@ -215,6 +285,39 @@ class MarkdownAstAdapter {
       final language = className.startsWith('language-')
           ? className.substring('language-'.length)
           : '';
+      final normalizedLanguage = language.trim().toLowerCase();
+      final mathSourceForm = switch (normalizedLanguage) {
+        'math' => BusyMathSourceForm.mathFence,
+        'tex' when mode == MarkdownMode.writersideMarkdown =>
+          BusyMathSourceForm.writersideTexFence,
+        _ => null,
+      };
+      if (mathSourceForm != null) {
+        final expression = _codeBlockText(code.textContent);
+        return [
+          BusyBlock(
+            id: nextId(),
+            kind: BusyBlockKind.math,
+            inlines: [
+              BusyInline(
+                kind: BusyInlineKind.math,
+                text: expression,
+                attributes: {
+                  busyMarkMathExpressionAttribute: expression,
+                  busyMarkMathDisplayAttribute: 'true',
+                  busyMarkMathSourceFormAttribute: mathSourceForm.name,
+                },
+              ),
+            ],
+            attributes: {
+              busyMarkMathExpressionAttribute: expression,
+              busyMarkMathDisplayAttribute: 'true',
+              busyMarkMathSourceFormAttribute: mathSourceForm.name,
+              'language': normalizedLanguage,
+            },
+          ),
+        ];
+      }
       return [
         BusyBlock(
           id: nextId(),
@@ -235,22 +338,40 @@ class MarkdownAstAdapter {
     }
 
     if (tag == 'ul' || tag == 'ol') {
-      return _listBlocksFromNode(node, ordered: tag == 'ol', nextId: nextId);
+      return _listBlocksFromNode(
+        node,
+        ordered: tag == 'ol',
+        nextId: nextId,
+        mode: mode,
+      );
     }
 
     if (tag == 'blockquote') {
-      final blocks = [
+      var blocks = [
         for (final child in children)
           ..._blocksFromNode(child, nextId: nextId, mode: mode),
       ];
+      final attributes = <String, String>{};
+      if (mode == MarkdownMode.writersideMarkdown) {
+        final admonition = _writersideBlockquoteAdmonition(blocks);
+        blocks = admonition.blocks;
+        attributes.addAll({
+          busyMarkWritersideAdmonitionAttribute: 'true',
+          busyMarkWritersideAdmonitionSourceFormAttribute: 'blockquote',
+          'style': admonition.style.name,
+        });
+      }
       return [
         BusyBlock(
           id: nextId(),
           kind: BusyBlockKind.blockquote,
-          inlines: blocks.isEmpty
+          inlines: mode == MarkdownMode.writersideMarkdown
+              ? const <BusyInline>[]
+              : blocks.isEmpty
               ? _inlinesFromNodes(children)
               : const <BusyInline>[],
           children: blocks,
+          attributes: attributes,
         ),
       ];
     }
@@ -280,19 +401,51 @@ class MarkdownAstAdapter {
       ];
     }
 
-    if (_writersideBlockTag(tag)) {
+    if (mode == MarkdownMode.writersideMarkdown && _writersideBlockTag(tag)) {
+      if (tag == 'code-block') {
+        return [
+          _writersideCodeBlock(
+            text: node.textContent,
+            attributes: node.attributes,
+            rawSource: node.textContent,
+            nextId: nextId,
+          ),
+        ];
+      }
       return [
         BusyBlock(
           id: nextId(),
           kind: _writersideKind(tag),
           inlines: _inlinesFromNodes(children),
-          attributes: {...node.attributes, 'element': tag},
+          attributes: {
+            ...node.attributes,
+            'element': tag,
+            if (_writersideAdmonitionTag(tag)) ...{
+              busyMarkWritersideAdmonitionAttribute: 'true',
+              busyMarkWritersideAdmonitionSourceFormAttribute: 'element',
+              'style': tag,
+            },
+          },
           rawSource: node.textContent,
           preserveRaw: !_editableWritersideTag(tag),
         ),
       ];
     }
 
+    // These names remain protected custom HTML outside Writerside mode. They
+    // deliberately receive neither Writerside kinds nor Writerside attributes.
+    if (_writersideBlockTag(tag)) {
+      return [
+        BusyBlock(
+          id: nextId(),
+          kind: BusyBlockKind.htmlBlock,
+          rawSource: node.textContent,
+          preserveRaw: true,
+          attributes: const {'sourceFormat': 'html'},
+        ),
+      ];
+    }
+
     if (isUnsafeHtmlTag(tag)) {
       return [
         BusyBlock(
@@ -319,6 +472,7 @@ class MarkdownAstAdapter {
     md.Element node, {
     required bool ordered,
     required String Function() nextId,
+    required MarkdownMode mode,
   }) {
     final result = <BusyBlock>[];
     final items =
@@ -341,7 +495,7 @@ class MarkdownAstAdapter {
                 child.tag == 'pre' ||
                 child.tag == 'table')) {
           nestedBlocks.addAll(
-            _blocksFromNode(child, nextId: nextId, mode: MarkdownMode.gfm),
+            _blocksFromNode(child, nextId: nextId, mode: mode),
           );
         } else {
           inlineNodes.add(child);
@@ -392,6 +546,15 @@ class MarkdownAstAdapter {
     final children = _inlinesFromNodes(node.children ?? const <md.Node>[]);
     final text = node.textContent;
     return switch (tag) {
+      busyMarkMathInlineTag => [
+        BusyInline(
+          kind: BusyInlineKind.math,
+          text:
+              node.attributes[busyMarkMathExpressionAttribute] ??
+              node.textContent,
+          attributes: node.attributes,
+        ),
+      ],
       'strong' || 'b' => [
         BusyInline(kind: BusyInlineKind.strong, text: text, children: children),
       ],
@@ -581,7 +744,61 @@ class MarkdownAstAdapter {
   BusyBlock? _writersideBlockFromText(
     String value, {
     required String Function() nextId,
+    required bool allowVideo,
   }) {
+    try {
+      final fragment = XmlDocumentFragment.parse(value.trim());
+      final elements = fragment.children.whereType<XmlElement>().toList();
+      if (elements.length == 1 &&
+          !fragment.children.whereType<XmlText>().any(
+            (node) => node.value.trim().isNotEmpty,
+          )) {
+        final element = elements.single;
+        final tag = element.name.local.toLowerCase();
+        if (_writersideBlockTag(tag) && (tag != 'video' || allowVideo)) {
+          final text = tag == 'code-block'
+              ? element.innerText
+                    .replaceFirst(RegExp(r'^\n'), '')
+                    .replaceFirst(RegExp(r'\n\s*$'), '')
+              : element.innerText.trim();
+          final attributes = <String, String>{
+            'element': tag,
+            for (final attribute in element.attributes)
+              attribute.name.local: attribute.value,
+            if (tag == 'code-block' && element.getAttribute('lang') != null)
+              'language': element.getAttribute('lang')!,
+          };
+          if (tag == 'code-block') {
+            return _writersideCodeBlock(
+              text: text,
+              attributes: attributes,
+              rawSource: value,
+              nextId: nextId,
+            );
+          }
+          return BusyBlock(
+            id: nextId(),
+            kind: _writersideKind(tag),
+            inlines: text.isEmpty
+                ? const []
+                : [BusyInline(kind: BusyInlineKind.text, text: text)],
+            attributes: {
+              ...attributes,
+              if (_writersideAdmonitionTag(tag)) ...{
+                busyMarkWritersideAdmonitionAttribute: 'true',
+                busyMarkWritersideAdmonitionSourceFormAttribute: 'element',
+                'style': tag,
+              },
+            },
+            rawSource: value,
+            preserveRaw: !_editableWritersideTag(tag),
+          );
+        }
+      }
+    } on Object {
+      // The established paired-tag fallback below remains tolerant while the
+      // Markdown topic is being edited.
+    }
     final match = RegExp(
       r'^\s*<([A-Za-z][A-Za-z0-9_-]*)\b([^>]*)>(.*?)</\1>\s*$',
       dotAll: true,
@@ -593,17 +810,92 @@ class MarkdownAstAdapter {
     if (!_writersideBlockTag(tag)) {
       return null;
     }
-    final text = match.group(3)!.trim();
+    final rawText = match.group(3)!.trim();
+    final attributes = <String, String>{
+      'element': tag,
+      ..._parseAttributePairs(match.group(2)!),
+    };
+    if (tag == 'code-block') {
+      final language = attributes['lang'];
+      return _writersideCodeBlock(
+        text: busyMarkDecodeXmlMathText(rawText),
+        attributes: {...attributes, if (language != null) 'language': language},
+        rawSource: value,
+        nextId: nextId,
+      );
+    }
     return BusyBlock(
       id: nextId(),
       kind: _writersideKind(tag),
-      inlines: [BusyInline(kind: BusyInlineKind.text, text: text)],
-      attributes: {'element': tag, ..._parseAttributePairs(match.group(2)!)},
+      inlines: [BusyInline(kind: BusyInlineKind.text, text: rawText)],
+      attributes: {
+        ...attributes,
+        if (_writersideAdmonitionTag(tag)) ...{
+          busyMarkWritersideAdmonitionAttribute: 'true',
+          busyMarkWritersideAdmonitionSourceFormAttribute: 'element',
+          'style': tag,
+        },
+      },
       rawSource: value,
       preserveRaw: !_editableWritersideTag(tag),
     );
   }
 
+  BusyBlock _writersideCodeBlock({
+    required String text,
+    required Map<String, String> attributes,
+    required String rawSource,
+    required String Function() nextId,
+  }) {
+    final language = (attributes['language'] ?? attributes['lang'] ?? '')
+        .trim();
+    final normalizedLanguage = language.toLowerCase();
+    final commonAttributes = <String, String>{
+      ...attributes,
+      'element': 'code-block',
+      if (language.isNotEmpty) ...{'lang': language, 'language': language},
+      busyMarkWritersideCodeBlockSourceFormAttribute:
+          busyMarkWritersideCodeBlockElementSourceForm,
+    };
+    if (normalizedLanguage == 'tex') {
+      return BusyBlock(
+        id: nextId(),
+        kind: BusyBlockKind.math,
+        inlines: [
+          BusyInline(
+            kind: BusyInlineKind.math,
+            text: text,
+            attributes: {
+              busyMarkMathExpressionAttribute: text,
+              busyMarkMathDisplayAttribute: 'true',
+              busyMarkMathSourceFormAttribute:
+                  BusyMathSourceForm.writersideTexElement.name,
+            },
+          ),
+        ],
+        attributes: {
+          ...commonAttributes,
+          busyMarkMathExpressionAttribute: text,
+          busyMarkMathDisplayAttribute: 'true',
+          busyMarkMathSourceFormAttribute:
+              BusyMathSourceForm.writersideTexElement.name,
+        },
+        rawSource: rawSource,
+        preserveRaw: false,
+      );
+    }
+    return BusyBlock(
+      id: nextId(),
+      kind: BusyBlockKind.codeBlock,
+      inlines: text.isEmpty
+          ? const []
+          : [BusyInline(kind: BusyInlineKind.text, text: text)],
+      attributes: commonAttributes,
+      rawSource: rawSource,
+      preserveRaw: false,
+    );
+  }
+
   int? _headingLevel(String tag) {
     if (!RegExp(r'^h[1-6]$').hasMatch(tag)) {
       return null;
@@ -677,6 +969,44 @@ class MarkdownAstAdapter {
     return value.replaceFirst(RegExp(r'\s*\{[^}]+\}\s*$'), '').trim();
   }
 
+  Map<String, String> _trailingAttributeBlock(String value) {
+    final match = RegExp(r'(\{[^{}]+\})\s*$').firstMatch(value);
+    return match == null ? const {} : _parseAttributeBlock(match.group(1)!);
+  }
+
+  List<BusyBlock> _attachWritersideCodeAttributes(List<BusyBlock> blocks) {
+    final result = <BusyBlock>[];
+    var index = 0;
+    while (index < blocks.length) {
+      final block = blocks[index];
+      if (block.kind == BusyBlockKind.codeBlock && index + 1 < blocks.length) {
+        final attributeBlock = blocks[index + 1];
+        final attributes = attributeBlock.kind == BusyBlockKind.paragraph
+            ? _standaloneAttributeBlock(attributeBlock.plainText)
+            : const <String, String>{};
+        if (busyMarkWritersideIsCollapsible(attributes) ||
+            (attributes['src']?.trim().isNotEmpty ?? false)) {
+          result.add(
+            block.copyWith(attributes: {...block.attributes, ...attributes}),
+          );
+          index += 2;
+          continue;
+        }
+      }
+      result.add(block);
+      index += 1;
+    }
+    return result;
+  }
+
+  Map<String, String> _standaloneAttributeBlock(String value) {
+    final trimmed = value.trim();
+    if (!RegExp(r'^\{[^{}]+\}$').hasMatch(trimmed)) {
+      return const {};
+    }
+    return _parseAttributeBlock(trimmed);
+  }
+
   String? _attributeValue(String raw, String key) {
     return RegExp('$key\\s*=\\s*"([^"]+)"').firstMatch(raw)?.group(1);
   }
@@ -836,26 +1166,121 @@ class MarkdownAstAdapter {
       'note',
       'tip',
       'warning',
+      'quote',
       'tabs',
       'tab',
       'procedure',
+      'step',
       'chapter',
+      'code-block',
+      'deflist',
+      'def',
+      'video',
     }.contains(tag);
   }
 
   bool _editableWritersideTag(String tag) {
-    return {'note', 'tip', 'warning'}.contains(tag);
+    return _writersideAdmonitionTag(tag);
+  }
+
+  bool _writersideAdmonitionTag(String tag) {
+    return busyAdmonitionStyleFromName(tag) != null;
   }
 
   BusyBlockKind _writersideKind(String tag) {
     return switch (tag) {
-      'note' || 'tip' || 'warning' => BusyBlockKind.writersideAdmonition,
+      'note' ||
+      'tip' ||
+      'warning' ||
+      'quote' => BusyBlockKind.writersideAdmonition,
       'tabs' || 'tab' => BusyBlockKind.writersideTabs,
       'procedure' => BusyBlockKind.writersideProcedure,
+      'video' => BusyBlockKind.video,
       _ => BusyBlockKind.writersideRawXml,
     };
   }
 
+  ({BusyAdmonitionStyle style, List<BusyBlock> blocks})
+  _writersideBlockquoteAdmonition(List<BusyBlock> blocks) {
+    for (var index = blocks.length - 1; index >= 0; index -= 1) {
+      final block = blocks[index];
+      if (block.kind != BusyBlockKind.paragraph || block.inlines.isEmpty) {
+        continue;
+      }
+      final match = RegExp(r'\s*\{([^{}]*)\}\s*$').firstMatch(block.plainText);
+      if (match == null) {
+        break;
+      }
+      final style = busyAdmonitionStyleFromName(
+        _parseAttributePairs(match.group(1)!)['style'],
+      );
+      if (style == null) {
+        break;
+      }
+      final cleaned = _takeInlinePrefix(block.inlines, match.start);
+      final updated = [...blocks];
+      if (cleaned.isEmpty && block.children.isEmpty) {
+        updated.removeAt(index);
+      } else {
+        updated[index] = block.copyWith(inlines: cleaned);
+      }
+      return (style: style, blocks: updated);
+    }
+    return (style: BusyAdmonitionStyle.tip, blocks: blocks);
+  }
+
+  List<BusyInline> _takeInlinePrefix(List<BusyInline> inlines, int length) {
+    if (length <= 0) {
+      return const [];
+    }
+    final result = <BusyInline>[];
+    var remaining = length;
+    for (final inline in inlines) {
+      final inlineLength = inline.plainText.length;
+      if (inlineLength == 0) {
+        result.add(inline);
+        continue;
+      }
+      if (remaining >= inlineLength) {
+        result.add(inline);
+        remaining -= inlineLength;
+        continue;
+      }
+      if (remaining > 0) {
+        if (inline.children.isEmpty) {
+          result.add(
+            inline.copyWith(text: inline.text.substring(0, remaining)),
+          );
+        } else {
+          result.add(
+            inline.copyWith(
+              children: _takeInlinePrefix(inline.children, remaining),
+            ),
+          );
+        }
+      }
+      break;
+    }
+    while (result.isNotEmpty &&
+        (result.last.kind == BusyInlineKind.softBreak ||
+            result.last.kind == BusyInlineKind.hardBreak)) {
+      result.removeLast();
+    }
+    final last = result.lastOrNull;
+    if (last != null &&
+        last.children.isEmpty &&
+        last.kind == BusyInlineKind.text &&
+        last.text.trimRight() != last.text) {
+      final trimmed = last.text.trimRight();
+      if (trimmed.isEmpty) {
+        result.removeLast();
+      } else {
+        result[result.length - 1] = last.copyWith(text: trimmed);
+      }
+    }
+    return result;
+  }
+
   _FrontMatter? _extractFrontMatter(String source) {
     if (!source.startsWith('---\n') && source != '---') {
       return null;
@@ -898,7 +1323,10 @@ class MarkdownAstAdapter {
     return lines.join('\n');
   }
 
-  List<_MarkdownSourceSegment> _rawHtmlAwareSegments(String source) {
+  List<_MarkdownSourceSegment> _rawHtmlAwareSegments(
+    String source,
+    MarkdownMode mode,
+  ) {
     final lines = _markdownSourceLines(source);
     final segments = <_MarkdownSourceSegment>[];
     var segmentStart = 0;
@@ -921,6 +1349,38 @@ class MarkdownAstAdapter {
         continue;
       }
 
+      if (mode == MarkdownMode.writersideMarkdown &&
+          RegExp(
+            r'^\s{0,3}<math(?:\s|/?>)',
+            caseSensitive: false,
+          ).hasMatch(line)) {
+        index += 1;
+        continue;
+      }
+
+      final writersideEndIndex = _writersideContainerEndIndex(lines, index);
+      if (writersideEndIndex != null) {
+        final startOffset = lines[index].offset;
+        final endOffset = lines[writersideEndIndex - 1].endOffset;
+        if (segmentStart < startOffset) {
+          segments.add(
+            _MarkdownSourceSegment(
+              text: source.substring(segmentStart, startOffset),
+              rawHtml: false,
+            ),
+          );
+        }
+        segments.add(
+          _MarkdownSourceSegment(
+            text: source.substring(startOffset, endOffset),
+            rawHtml: true,
+          ),
+        );
+        segmentStart = endOffset;
+        index = writersideEndIndex;
+        continue;
+      }
+
       final htmlEndIndex = _rawHtmlContainerEndIndex(lines, index);
       if (htmlEndIndex == null) {
         index += 1;
@@ -987,6 +1447,27 @@ class MarkdownAstAdapter {
     return null;
   }
 
+  int? _writersideContainerEndIndex(
+    List<_MarkdownSourceLine> lines,
+    int startIndex,
+  ) {
+    final match = RegExp(
+      r'^\s{0,3}<([A-Za-z][A-Za-z0-9_-]*)\b',
+    ).firstMatch(lines[startIndex].line);
+    final tag = match?.group(1)?.toLowerCase();
+    if (tag == null || !_writersideBlockTag(tag)) {
+      return null;
+    }
+    var balance = 0;
+    for (var index = startIndex; index < lines.length; index += 1) {
+      balance += _rawHtmlTagBalance(lines[index].line, tag);
+      if (balance <= 0) {
+        return index + 1;
+      }
+    }
+    return null;
+  }
+
   String? _rawHtmlContainerOpeningTag(String line) {
     final match = RegExp(
       r'^\s{0,3}<([A-Za-z][A-Za-z0-9_-]*)\b',
diff --git a/lib/src/markdown/markdown_parser.dart b/lib/src/markdown/markdown_parser.dart
index 190f7b6d..73ae9128 100644
--- a/lib/src/markdown/markdown_parser.dart
+++ b/lib/src/markdown/markdown_parser.dart
@@ -13,6 +13,7 @@ import 'busymark_document.dart';
 import 'markdown_ast_adapter.dart';
 import 'markdown_fence.dart';
 import 'markdown_model.dart';
+import 'math_syntax.dart';
 import 'raw_html_policy.dart';
 
 // Cross-file diagnostics are intentionally scoped to Markdown files that
@@ -227,6 +228,7 @@ class MarkdownParser {
         source: source,
         line: line,
         lineOffset: offset,
+        mode: mode,
         diagnostics: diagnostics,
       );
 
@@ -426,7 +428,11 @@ class MarkdownParser {
   ) {
     final sourceChunks = document.source == null
         ? const <_ScannedBlockSource>[]
-        : _scannedBlockSources(document.filePath, document.source!);
+        : _scannedBlockSources(
+            document.filePath,
+            document.source!,
+            mode: document.mode,
+          );
     final contentBlocks = document.blocks
         .where(
           (block) =>
@@ -669,6 +675,7 @@ class MarkdownParser {
             );
             break;
           case BusyInlineKind.text:
+          case BusyInlineKind.math:
           case BusyInlineKind.strong:
           case BusyInlineKind.emphasis:
           case BusyInlineKind.underline:
@@ -744,8 +751,9 @@ class MarkdownParser {
 
   List<_ScannedBlockSource> _scannedBlockSources(
     String filePath,
-    String source,
-  ) {
+    String source, {
+    required MarkdownMode mode,
+  }) {
     var scanOffset = _frontMatterEndOffset(source);
     final sourceLocationMapper = SourceLocationMapper(source);
     final chunks = <_ScannedBlockSource>[];
@@ -818,16 +826,39 @@ class MarkdownParser {
           }
           index += 1;
         }
+        if (mode == MarkdownMode.writersideMarkdown &&
+            index < indexedLines.length &&
+            _isWritersideCodeAttributeLine(indexedLines[index].trimmed)) {
+          index += 1;
+        }
         addChunk(startIndex, index);
         continue;
       }
 
+      final displayMathEnd = _displayMathEndIndex(indexedLines, index);
+      if (displayMathEnd != null) {
+        addChunk(startIndex, displayMathEnd);
+        index = displayMathEnd;
+        continue;
+      }
+
       final htmlEndIndex = _rawHtmlContainerSourceEndIndex(indexedLines, index);
       if (htmlEndIndex != null) {
         addChunk(startIndex, htmlEndIndex);
         index = htmlEndIndex;
         continue;
       }
+      if (mode == MarkdownMode.writersideMarkdown) {
+        final writersideEndIndex = _writersideContainerSourceEndIndex(
+          indexedLines,
+          index,
+        );
+        if (writersideEndIndex != null) {
+          addChunk(startIndex, writersideEndIndex);
+          index = writersideEndIndex;
+          continue;
+        }
+      }
 
       if (_isAtxHeading(indexedLines[index].line) ||
           _isThematicBreak(indexedLines[index].trimmed)) {
@@ -862,6 +893,7 @@ class MarkdownParser {
         final line = indexedLines[index];
         if (line.trimmed.isEmpty ||
             MarkdownFence.parse(line.line) != null ||
+            _startsDisplayMath(line.line) ||
             _isAtxHeading(line.line) ||
             (!startsWithBlockquote && _isBlockquoteStart(line.line)) ||
             _listItemIndent(line.line) != null) {
@@ -882,6 +914,13 @@ class MarkdownParser {
     return chunks;
   }
 
+  bool _isWritersideCodeAttributeLine(String line) {
+    return RegExp(
+      r'^\{[^{}]*(?:\bcollapsible\s*=\s*"true"|\bsrc\s*=\s*"[^"]+")[^{}]*\}\s*$',
+      caseSensitive: false,
+    ).hasMatch(line);
+  }
+
   bool _containsNestedDefinitions(String source) {
     if (!source.contains(']:')) {
       return false;
@@ -1067,10 +1106,59 @@ class MarkdownParser {
   }
 
   md.Document _markdownDocument() {
-    return md.Document(
-      extensionSet: md.ExtensionSet.gitHubWeb,
-      encodeHtml: false,
-    );
+    return busyMarkMarkdownDocument(MarkdownMode.commonMark);
+  }
+
+  int? _displayMathEndIndex(List<_ScannedSourceLine> lines, int startIndex) {
+    if (!_startsDisplayMath(lines[startIndex].line)) {
+      return null;
+    }
+    final first = lines[startIndex].line;
+    final opening = first.indexOf(r'$$');
+    final tail = first.substring(opening + 2);
+    final firstClose = _displayMathCloseIndex(tail);
+    if (firstClose != null) {
+      return tail.substring(0, firstClose).trim().isEmpty
+          ? null
+          : startIndex + 1;
+    }
+    final expression = StringBuffer(tail);
+    for (var index = startIndex + 1; index < lines.length; index++) {
+      final line = lines[index].line;
+      final close = _displayMathCloseIndex(line);
+      if (close != null) {
+        if (expression.isNotEmpty) expression.writeln();
+        expression.write(line.substring(0, close));
+        return expression.toString().trim().isEmpty ? null : index + 1;
+      }
+      if (expression.isNotEmpty) expression.writeln();
+      expression.write(line);
+    }
+    return null;
+  }
+
+  bool _startsDisplayMath(String line) {
+    return RegExp(r'^ {0,3}\$\$(?!\$)').hasMatch(line);
+  }
+
+  int? _displayMathCloseIndex(String line) {
+    for (var index = 0; index + 1 < line.length; index++) {
+      if (!line.startsWith(r'$$', index)) {
+        continue;
+      }
+      var backslashes = 0;
+      for (
+        var cursor = index - 1;
+        cursor >= 0 && line.codeUnitAt(cursor) == 0x5c;
+        cursor--
+      ) {
+        backslashes += 1;
+      }
+      if (backslashes.isEven && line.substring(index + 2).trim().isEmpty) {
+        return index;
+      }
+    }
+    return null;
   }
 
   int _consumedLineCount(md.BlockParser parser, List<md.Line> lines) {
@@ -1119,6 +1207,42 @@ class MarkdownParser {
     return null;
   }
 
+  int? _writersideContainerSourceEndIndex(
+    List<_ScannedSourceLine> lines,
+    int startIndex,
+  ) {
+    final match = RegExp(
+      r'^\s{0,3}<([A-Za-z][A-Za-z0-9_-]*)\b',
+    ).firstMatch(lines[startIndex].line);
+    final tag = match?.group(1)?.toLowerCase();
+    if (tag == null ||
+        !{
+          'note',
+          'tip',
+          'warning',
+          'quote',
+          'tabs',
+          'tab',
+          'procedure',
+          'step',
+          'chapter',
+          'code-block',
+          'deflist',
+          'def',
+          'video',
+        }.contains(tag)) {
+      return null;
+    }
+    var balance = 0;
+    for (var index = startIndex; index < lines.length; index += 1) {
+      balance += _rawHtmlTagBalance(lines[index].line, tag);
+      if (balance <= 0) {
+        return index + 1;
+      }
+    }
+    return null;
+  }
+
   String? _rawHtmlContainerOpeningTag(String line) {
     final match = RegExp(
       r'^\s{0,3}<([A-Za-z][A-Za-z0-9_-]*)\b',
@@ -1301,8 +1425,16 @@ class MarkdownParser {
     required String source,
     required String line,
     required int lineOffset,
+    required MarkdownMode mode,
     required List<Diagnostic> diagnostics,
   }) {
+    if (mode == MarkdownMode.writersideMarkdown &&
+        RegExp(
+          r'^\s{0,3}<video(?:\s|/?>)',
+          caseSensitive: false,
+        ).hasMatch(line)) {
+      return;
+    }
     if (!hasUnsafeHtml(line)) {
       return;
     }
@@ -1338,6 +1470,8 @@ class MarkdownParser {
       'note',
       'tip',
       'warning',
+      'quote',
+      'video',
     }.contains(tag);
   }
 
diff --git a/lib/src/markdown/math_syntax.dart b/lib/src/markdown/math_syntax.dart
new file mode 100644
index 00000000..b43e517c
--- /dev/null
+++ b/lib/src/markdown/math_syntax.dart
@@ -0,0 +1,357 @@
+import 'package:markdown/markdown.dart' as md;
+
+import 'markdown_model.dart';
+
+const busyMarkMathInlineTag = 'busymark-math-inline';
+const busyMarkMathBlockTag = 'busymark-math-block';
+const busyMarkMathExpressionAttribute = 'mathExpression';
+const busyMarkMathDisplayAttribute = 'mathDisplay';
+const busyMarkMathSourceFormAttribute = 'mathSourceForm';
+const busyMarkMathRawExpressionAttribute = 'mathRawExpression';
+
+enum BusyMathSourceForm {
+  dollarInline,
+  githubDollarBacktick,
+  doubleDollarDisplay,
+  mathFence,
+  writersideTexFence,
+  writersideTexElement,
+  writersideElement,
+}
+
+BusyMathSourceForm busyMathSourceFormFromName(String? value) {
+  return BusyMathSourceForm.values.firstWhere(
+    (form) => form.name == value,
+    orElse: () => BusyMathSourceForm.dollarInline,
+  );
+}
+
+md.Document busyMarkMarkdownDocument(MarkdownMode mode) {
+  return md.Document(
+    blockSyntaxes: const [BusyDisplayMathSyntax()],
+    inlineSyntaxes: [
+      BusyDollarMathSyntax(),
+      if (mode == MarkdownMode.writersideMarkdown) BusyWritersideMathSyntax(),
+    ],
+    extensionSet: md.ExtensionSet.gitHubWeb,
+    encodeHtml: false,
+  );
+}
+
+class BusyDollarMathSyntax extends md.InlineSyntax {
+  BusyDollarMathSyntax() : super(r'\$', startCharacter: 0x24);
+
+  @override
+  bool onMatch(md.InlineParser parser, Match match) {
+    final source = parser.source;
+    final start = match.start;
+    if (_isEscaped(source, start)) {
+      parser.addNode(md.Text(r'$'));
+      parser.consume(1);
+      return false;
+    }
+
+    if (source.startsWith(r'$`', start)) {
+      final end = _findGithubClose(source, start + 2);
+      if (end != null) {
+        final expression = source.substring(start + 2, end);
+        if (expression.isNotEmpty) {
+          parser.addNode(
+            _mathElement(
+              busyMarkMathInlineTag,
+              expression,
+              BusyMathSourceForm.githubDollarBacktick,
+              display: false,
+            ),
+          );
+          parser.consume(end + 2 - start);
+          return false;
+        }
+      }
+    }
+
+    // A double-dollar run belongs to the display block syntax. If it occurs
+    // in ordinary paragraph text, leave it literal rather than accidentally
+    // interpreting the second dollar as an inline opener.
+    if (source.startsWith(r'$$', start)) {
+      parser.addNode(md.Text(r'$$'));
+      parser.consume(2);
+      return false;
+    }
+
+    final end = _findDollarClose(source, start + 1);
+    if (end != null) {
+      final expression = source.substring(start + 1, end);
+      parser.addNode(
+        _mathElement(
+          busyMarkMathInlineTag,
+          expression,
+          BusyMathSourceForm.dollarInline,
+          display: false,
+        ),
+      );
+      parser.consume(end + 1 - start);
+      return false;
+    }
+
+    parser.addNode(md.Text(r'$'));
+    parser.consume(1);
+    return false;
+  }
+
+  int? _findGithubClose(String source, int expressionStart) {
+    var index = expressionStart;
+    while (index + 1 < source.length) {
+      if (source.codeUnitAt(index) == 0x0a ||
+          source.codeUnitAt(index) == 0x0d) {
+        return null;
+      }
+      if (source.startsWith(r'`$', index) && !_isEscaped(source, index)) {
+        return index;
+      }
+      index += 1;
+    }
+    return null;
+  }
+
+  int? _findDollarClose(String source, int expressionStart) {
+    if (expressionStart >= source.length ||
+        _isWhitespace(source.codeUnitAt(expressionStart))) {
+      return null;
+    }
+    var index = expressionStart;
+    while (index < source.length) {
+      final unit = source.codeUnitAt(index);
+      if (unit == 0x0a || unit == 0x0d) {
+        return null;
+      }
+      if (unit == 0x60) {
+        return null;
+      }
+      if (unit == 0x24 && !_isEscaped(source, index)) {
+        if (index == expressionStart ||
+            _isWhitespace(source.codeUnitAt(index - 1))) {
+          // This dollar can begin a later expression, so it terminates the
+          // current candidate instead of allowing currency to swallow it.
+          return null;
+        }
+        final next = index + 1 < source.length
+            ? source.codeUnitAt(index + 1)
+            : null;
+        // This avoids consuming currency ranges such as `$5-$10`.
+        if (next != null && next >= 0x30 && next <= 0x39) {
+          return null;
+        }
+        return index;
+      }
+      index += 1;
+    }
+    return null;
+  }
+}
+
+class BusyWritersideMathSyntax extends md.InlineSyntax {
+  BusyWritersideMathSyntax()
+    : super(r'<math(?:\s[^>]*)?>', startCharacter: 0x3c, caseSensitive: false);
+
+  @override
+  bool onMatch(md.InlineParser parser, Match match) {
+    final close = RegExp(
+      r'</math\s*>',
+      caseSensitive: false,
+    ).matchAsPrefix(parser.source, match.end);
+    final end =
+        close ??
+        RegExp(
+          r'</math\s*>',
+          caseSensitive: false,
+        ).firstMatch(parser.source.substring(match.end));
+    if (end == null) {
+      parser.addNode(md.Text(match.group(0)!));
+      return true;
+    }
+    final closeStart = close == null ? match.end + end.start : end.start;
+    final closeEnd = close == null ? match.end + end.end : end.end;
+    final rawExpression = parser.source.substring(match.end, closeStart);
+    if (rawExpression.isEmpty || rawExpression.contains('\n')) {
+      parser.addNode(md.Text(match.group(0)!));
+      return true;
+    }
+    final expression = busyMarkDecodeXmlMathText(rawExpression);
+    parser.addNode(
+      _mathElement(
+        busyMarkMathInlineTag,
+        expression,
+        BusyMathSourceForm.writersideElement,
+        display: false,
+        rawExpression: rawExpression,
+      ),
+    );
+    parser.consume(closeEnd - match.start);
+    return false;
+  }
+}
+
+class BusyDisplayMathSyntax extends md.BlockSyntax {
+  const BusyDisplayMathSyntax();
+
+  @override
+  RegExp get pattern => RegExp(r'^ {0,3}\$\$(?!\$)');
+
+  @override
+  bool canParse(md.BlockParser parser) {
+    if (!pattern.hasMatch(parser.current.content)) {
+      return false;
+    }
+    final first = parser.current.content;
+    final opening = first.indexOf(r'$$');
+    final firstClose = _displayClose(first, opening + 2);
+    if (firstClose != null) {
+      return first.substring(opening + 2, firstClose).trim().isNotEmpty;
+    }
+    final expression = StringBuffer(first.substring(opening + 2));
+    var ahead = 1;
+    while (true) {
+      final line = parser.peek(ahead);
+      if (line == null) {
+        break;
+      }
+      final close = _displayClose(line.content, 0);
+      if (close != null) {
+        if (expression.isNotEmpty) expression.writeln();
+        expression.write(line.content.substring(0, close));
+        return expression.toString().trim().isNotEmpty;
+      }
+      if (expression.isNotEmpty) expression.writeln();
+      expression.write(line.content);
+      ahead += 1;
+    }
+    // An unclosed delimiter remains ordinary Markdown text.
+    return false;
+  }
+
+  @override
+  md.Node parse(md.BlockParser parser) {
+    final first = parser.current.content;
+    final opening = first.indexOf(r'$$');
+    final tail = first.substring(opening + 2);
+    final lines = <String>[];
+    final firstClose = _displayClose(tail, 0);
+    if (firstClose != null) {
+      lines.add(tail.substring(0, firstClose));
+      parser.advance();
+    } else {
+      if (tail.isNotEmpty) {
+        lines.add(tail);
+      }
+      parser.advance();
+      while (!parser.isDone) {
+        final line = parser.current.content;
+        final close = _displayClose(line, 0);
+        if (close != null) {
+          if (close > 0) {
+            lines.add(line.substring(0, close));
+          }
+          parser.advance();
+          break;
+        }
+        lines.add(line);
+        parser.advance();
+      }
+    }
+    return _mathElement(
+      busyMarkMathBlockTag,
+      lines.join('\n'),
+      BusyMathSourceForm.doubleDollarDisplay,
+      display: true,
+    );
+  }
+
+  @override
+  bool canEndBlock(md.BlockParser parser) => true;
+}
+
+md.Element _mathElement(
+  String tag,
+  String expression,
+  BusyMathSourceForm sourceForm, {
+  required bool display,
+  String? rawExpression,
+}) {
+  return md.Element.text(tag, expression)
+    ..attributes[busyMarkMathExpressionAttribute] = expression
+    ..attributes[busyMarkMathDisplayAttribute] = '$display'
+    ..attributes[busyMarkMathSourceFormAttribute] = sourceForm.name
+    ..attributes.addAll({
+      if (rawExpression != null)
+        busyMarkMathRawExpressionAttribute: rawExpression,
+    });
+}
+
+String busyMarkDecodeXmlMathText(String source) {
+  return source.replaceAllMapped(
+    RegExp(r'&(?:lt|gt|amp|quot|apos|#[0-9]+|#[xX][0-9A-Fa-f]+);'),
+    (match) {
+      final entity = match.group(0)!;
+      final named = switch (entity) {
+        '&lt;' => '<',
+        '&gt;' => '>',
+        '&amp;' => '&',
+        '&quot;' => '"',
+        '&apos;' => "'",
+        _ => null,
+      };
+      if (named != null) {
+        return named;
+      }
+      final hexadecimal = entity.startsWith('&#x') || entity.startsWith('&#X');
+      final digits = entity.substring(hexadecimal ? 3 : 2, entity.length - 1);
+      final codePoint = int.tryParse(digits, radix: hexadecimal ? 16 : 10);
+      final validXmlCharacter =
+          codePoint != null &&
+          (codePoint == 0x09 ||
+              codePoint == 0x0a ||
+              codePoint == 0x0d ||
+              (codePoint >= 0x20 && codePoint <= 0xd7ff) ||
+              (codePoint >= 0xe000 && codePoint <= 0xfffd) ||
+              (codePoint >= 0x10000 && codePoint <= 0x10ffff));
+      if (!validXmlCharacter) {
+        return entity;
+      }
+      return String.fromCharCode(codePoint);
+    },
+  );
+}
+
+String busyMarkEncodeXmlMathText(String source) => source
+    .replaceAll('&', '&amp;')
+    .replaceAll('<', '&lt;')
+    .replaceAll('>', '&gt;');
+
+int? _displayClose(String source, int start) {
+  var index = start;
+  while (index + 1 < source.length) {
+    if (source.startsWith(r'$$', index) && !_isEscaped(source, index)) {
+      final trailing = source.substring(index + 2);
+      return trailing.trim().isEmpty ? index : null;
+    }
+    index += 1;
+  }
+  return null;
+}
+
+bool _isEscaped(String source, int index) {
+  var backslashes = 0;
+  for (
+    var cursor = index - 1;
+    cursor >= 0 && source.codeUnitAt(cursor) == 0x5c;
+    cursor -= 1
+  ) {
+    backslashes += 1;
+  }
+  return backslashes.isOdd;
+}
+
+bool _isWhitespace(int unit) {
+  return unit == 0x20 || unit == 0x09 || unit == 0x0a || unit == 0x0d;
+}
diff --git a/lib/src/markdown/preview_model.dart b/lib/src/markdown/preview_model.dart
index c88ace3b..2baa7fbc 100644
--- a/lib/src/markdown/preview_model.dart
+++ b/lib/src/markdown/preview_model.dart
@@ -1,18 +1,22 @@
 import '../core/source_span.dart';
 import '../core/uri_utils.dart';
 import '../visualization/visualization_models.dart';
+import 'package:xml/xml.dart';
 import 'busymark_document.dart';
 import 'document_outline.dart';
 import 'markdown_model.dart';
+import 'math_syntax.dart';
 
 enum PreviewBlockKind {
   heading,
   paragraph,
+  math,
   code,
   list,
   quote,
   thematicBreak,
   image,
+  video,
   table,
   container,
   raw,
@@ -20,6 +24,8 @@ enum PreviewBlockKind {
   admonition,
   tabs,
   procedure,
+  definitionList,
+  definition,
   unknown,
 }
 
@@ -62,6 +68,7 @@ enum PreviewInlineKind {
   code,
   link,
   image,
+  math,
 }
 
 class PreviewInline {
@@ -70,12 +77,14 @@ class PreviewInline {
     required this.text,
     this.destination,
     this.children = const [],
+    this.attributes = const {},
   });
 
   final PreviewInlineKind kind;
   final String text;
   final String? destination;
   final List<PreviewInline> children;
+  final Map<String, String> attributes;
 }
 
 class PreviewDocument {
@@ -155,20 +164,23 @@ class BusyMarkPreviewBuilder {
   }
 
   List<PreviewBlock> buildBlocks(BusyDocument document) {
-    return [
-      for (final block in document.blocks)
+    final blocks = [
+      for (final (index, block) in document.blocks.indexed)
         if (block.kind != BusyBlockKind.frontMatter && !block.isSourceOnly)
-          _block(block),
+          _block(block, 'b$index'),
     ];
+    return document.mode == MarkdownMode.writersideMarkdown
+        ? _groupWritersideCollapsibleChapters(blocks)
+        : blocks;
   }
 
-  PreviewBlock _block(BusyBlock block) {
+  PreviewBlock _block(BusyBlock block, String path) {
     final preview = switch (block.kind) {
       BusyBlockKind.heading => PreviewBlock(
         kind: PreviewBlockKind.heading,
         text: _plainText(block.inlines),
         level: int.tryParse(block.attributes['level'] ?? ''),
-        inlines: _inlines(block.inlines),
+        inlines: _inlines(block.inlines, 'block-${block.id}.i'),
         attributes: {
           ...block.attributes,
           if (block.attributes['id'] case final id?) 'id': id,
@@ -178,9 +190,21 @@ class BusyMarkPreviewBuilder {
       BusyBlockKind.paragraph => PreviewBlock(
         kind: PreviewBlockKind.paragraph,
         text: _plainText(block.inlines),
-        inlines: _inlines(block.inlines),
+        inlines: _inlines(block.inlines, 'block-${block.id}.i'),
         attributes: block.attributes,
       ),
+      BusyBlockKind.math => PreviewBlock(
+        kind: PreviewBlockKind.math,
+        text:
+            block.attributes[busyMarkMathExpressionAttribute] ??
+            block.plainText,
+        inlines: _inlines(block.inlines, 'block-${block.id}.i'),
+        attributes: {
+          ...block.attributes,
+          'expressionId': 'block-${block.id}',
+          'editorBlockId': block.id,
+        },
+      ),
       BusyBlockKind.codeBlock => PreviewBlock(
         kind: PreviewBlockKind.code,
         text: block.plainText,
@@ -195,25 +219,14 @@ class BusyMarkPreviewBuilder {
       BusyBlockKind.taskListItem => PreviewBlock(
         kind: PreviewBlockKind.list,
         text: _plainText(block.inlines),
-        inlines: _inlines(block.inlines),
-        children: block.children.map(_block).toList(),
-        attributes: block.attributes,
-      ),
-      BusyBlockKind.blockquote => PreviewBlock(
-        kind: PreviewBlockKind.quote,
-        text: block.children.isEmpty
-            ? _plainText(block.inlines)
-            : block.children.map((child) => child.plainText).join('\n'),
-        inlines:
-            block.children.length == 1 &&
-                block.children.single.kind == BusyBlockKind.paragraph
-            ? _inlines(block.children.single.inlines)
-            : block.children.isEmpty
-            ? _inlines(block.inlines)
-            : const [],
-        children: block.children.map(_block).toList(),
+        inlines: _inlines(block.inlines, 'block-${block.id}.i'),
+        children: [
+          for (final (index, child) in block.children.indexed)
+            _block(child, '$path.b$index'),
+        ],
         attributes: block.attributes,
       ),
+      BusyBlockKind.blockquote => _blockquote(block, path),
       BusyBlockKind.thematicBreak => const PreviewBlock(
         kind: PreviewBlockKind.thematicBreak,
         text: '---',
@@ -223,45 +236,55 @@ class BusyMarkPreviewBuilder {
         text: block.inlines.isEmpty
             ? block.plainText
             : block.inlines.first.text,
-        inlines: _inlines(block.inlines),
+        inlines: _inlines(block.inlines, 'block-${block.id}.i'),
         attributes: block.attributes,
       ),
+      BusyBlockKind.video => PreviewBlock(
+        kind: PreviewBlockKind.video,
+        text: block.attributes['src'] ?? block.plainText,
+        attributes: {...block.attributes, 'editorBlockId': block.id},
+      ),
       BusyBlockKind.table => PreviewBlock(
         kind: PreviewBlockKind.table,
         text: '',
-        children: block.children.map(_block).toList(),
+        children: [
+          for (final (index, child) in block.children.indexed)
+            _block(child, '$path.b$index'),
+        ],
         attributes: block.attributes,
       ),
-      BusyBlockKind.writersideAdmonition => PreviewBlock(
-        kind: PreviewBlockKind.admonition,
-        text: _plainText(block.inlines),
-        inlines: _inlines(block.inlines),
-        attributes: {
-          ...block.attributes,
-          'style': block.attributes['element'] ?? 'note',
-        },
-      ),
+      BusyBlockKind.writersideAdmonition => _writersideAdmonition(block, path),
       BusyBlockKind.writersideTabs => PreviewBlock(
         kind: PreviewBlockKind.tabs,
         text: _plainText(block.inlines),
         attributes: block.attributes,
       ),
-      BusyBlockKind.writersideProcedure => PreviewBlock(
-        kind: PreviewBlockKind.procedure,
-        text: _plainText(block.inlines).isEmpty
-            ? block.attributes['title'] ?? ''
-            : _plainText(block.inlines),
-        attributes: block.attributes,
-      ),
+      BusyBlockKind.writersideProcedure =>
+        _writersideSemanticBlock(block, path) ??
+            PreviewBlock(
+              kind: PreviewBlockKind.procedure,
+              text: _plainText(block.inlines).isEmpty
+                  ? block.attributes['title'] ?? ''
+                  : _plainText(block.inlines),
+              attributes: block.attributes,
+            ),
       BusyBlockKind.htmlBlock when block.children.isNotEmpty => PreviewBlock(
         kind: PreviewBlockKind.container,
         text: block.children.map((child) => child.plainText).join('\n'),
-        children: block.children.map(_block).toList(),
+        children: [
+          for (final (index, child) in block.children.indexed)
+            _block(child, '$path.b$index'),
+        ],
         attributes: block.attributes,
       ),
-      BusyBlockKind.htmlBlock ||
-      BusyBlockKind.writersideRawXml ||
-      BusyBlockKind.unknown => PreviewBlock(
+      BusyBlockKind.writersideRawXml =>
+        _writersideSemanticBlock(block, path) ??
+            PreviewBlock(
+              kind: PreviewBlockKind.raw,
+              text: block.rawSource ?? block.plainText,
+              attributes: block.attributes,
+            ),
+      BusyBlockKind.htmlBlock || BusyBlockKind.unknown => PreviewBlock(
         kind: PreviewBlockKind.raw,
         text: block.rawSource ?? block.plainText,
         attributes: block.attributes,
@@ -274,6 +297,341 @@ class BusyMarkPreviewBuilder {
     return _withSourceSpan(preview, block.sourceSpan);
   }
 
+  List<PreviewBlock> _groupWritersideCollapsibleChapters(
+    List<PreviewBlock> blocks,
+  ) {
+    final result = <PreviewBlock>[];
+    var index = 0;
+    while (index < blocks.length) {
+      final block = blocks[index];
+      final level = block.level;
+      final markdownChapter =
+          block.kind == PreviewBlockKind.heading &&
+          block.attributes['element'] != 'chapter' &&
+          level != null &&
+          busyMarkWritersideIsCollapsible(block.attributes);
+      if (!markdownChapter) {
+        result.add(block);
+        index += 1;
+        continue;
+      }
+      var end = index + 1;
+      while (end < blocks.length) {
+        final candidate = blocks[end];
+        if (candidate.kind == PreviewBlockKind.heading &&
+            candidate.level != null &&
+            candidate.level! <= level) {
+          break;
+        }
+        end += 1;
+      }
+      final children = blocks.sublist(index + 1, end);
+      result.add(
+        PreviewBlock(
+          kind: block.kind,
+          text: block.text,
+          level: block.level,
+          language: block.language,
+          visualization: block.visualization,
+          inlines: block.inlines,
+          children: children,
+          attributes: block.attributes,
+          sourceStartLine: block.sourceStartLine,
+          sourceEndLine: children.isEmpty
+              ? block.sourceEndLine
+              : children.last.sourceEndLine,
+          sourceStartOffset: block.sourceStartOffset,
+          sourceEndOffset: children.isEmpty
+              ? block.sourceEndOffset
+              : children.last.sourceEndOffset,
+        ),
+      );
+      index = end;
+    }
+    return result;
+  }
+
+  PreviewBlock? _writersideSemanticBlock(BusyBlock block, String path) {
+    final source = block.rawSource;
+    if (source == null || source.trim().isEmpty) {
+      return null;
+    }
+    try {
+      final fragment = XmlDocumentFragment.parse(source.trim());
+      final elements = fragment.children.whereType<XmlElement>().toList();
+      if (elements.length != 1) {
+        return null;
+      }
+      return _writersideSemanticElement(
+        elements.single,
+        '$path.xml',
+        editorBlockId: block.id,
+      );
+    } on Object {
+      return null;
+    }
+  }
+
+  PreviewBlock _writersideSemanticElement(
+    XmlElement element,
+    String path, {
+    String? editorBlockId,
+    Map<String, String> inheritedAttributes = const {},
+  }) {
+    final name = element.name.local.toLowerCase();
+    final attributes = <String, String>{
+      ...inheritedAttributes,
+      'element': name,
+      for (final attribute in element.attributes)
+        attribute.name.local: attribute.value,
+      if (editorBlockId != null) 'editorBlockId': editorBlockId,
+    };
+    final title = element.getAttribute('title')?.trim() ?? '';
+    final children = <PreviewBlock>[];
+    var childIndex = 0;
+    for (final child in element.children.whereType<XmlElement>()) {
+      final childName = child.name.local.toLowerCase();
+      if (childName == 'math') {
+        continue;
+      }
+      if (name == 'step' && childName == 'p') {
+        continue;
+      }
+      children.add(
+        _writersideSemanticElement(
+          child,
+          '$path.c${childIndex++}',
+          inheritedAttributes: name == 'deflist' && childName == 'def'
+              ? {
+                  if (busyMarkWritersideIsCollapsible(attributes))
+                    busyMarkWritersideCollapsibleAttribute: 'true',
+                }
+              : const {},
+        ),
+      );
+    }
+    final inlines = _writersideXmlInlines(element.children, path);
+    final text = inlines.map((inline) => inline.text).join().trim();
+    return switch (name) {
+      'chapter' => PreviewBlock(
+        kind: PreviewBlockKind.heading,
+        text: title,
+        level: 2,
+        inlines: title.isEmpty ? const [] : parseInlineMarkdown(title),
+        children: children,
+        attributes: attributes,
+      ),
+      'procedure' => PreviewBlock(
+        kind: PreviewBlockKind.procedure,
+        text: title,
+        inlines: title.isEmpty ? const [] : parseInlineMarkdown(title),
+        children: children,
+        attributes: attributes,
+      ),
+      'step' => PreviewBlock(
+        kind: PreviewBlockKind.list,
+        text: text,
+        inlines: inlines,
+        children: children,
+        attributes: {...attributes, 'ordered': 'true'},
+      ),
+      'code-block' => _writersideCodeBlockPreview(
+        element,
+        attributes,
+        expressionId: '$path.math',
+      ),
+      'deflist' => PreviewBlock(
+        kind: PreviewBlockKind.definitionList,
+        text: '',
+        children: children,
+        attributes: attributes,
+      ),
+      'def' => PreviewBlock(
+        kind: PreviewBlockKind.definition,
+        text: title,
+        inlines: title.isEmpty ? const [] : parseInlineMarkdown(title),
+        children: children,
+        attributes: attributes,
+      ),
+      'note' || 'tip' || 'warning' || 'quote' => PreviewBlock(
+        kind: name == 'quote'
+            ? PreviewBlockKind.quote
+            : PreviewBlockKind.admonition,
+        text: text,
+        inlines: inlines,
+        children: children,
+        attributes: {...attributes, 'style': name},
+      ),
+      'tabs' || 'tab' => PreviewBlock(
+        kind: PreviewBlockKind.tabs,
+        text: title,
+        children: children,
+        attributes: attributes,
+      ),
+      _ => PreviewBlock(
+        kind: PreviewBlockKind.paragraph,
+        text: text,
+        inlines: inlines,
+        children: children,
+        attributes: attributes,
+      ),
+    };
+  }
+
+  PreviewBlock _writersideCodeBlockPreview(
+    XmlElement element,
+    Map<String, String> attributes, {
+    required String expressionId,
+  }) {
+    final language = element.getAttribute('lang');
+    final text = element.innerText
+        .replaceFirst(RegExp(r'^\n'), '')
+        .replaceFirst(RegExp(r'\n\s*$'), '');
+    if (language?.trim().toLowerCase() == 'tex') {
+      return PreviewBlock(
+        kind: PreviewBlockKind.math,
+        text: text,
+        attributes: {
+          ...attributes,
+          if (language != null) 'language': language,
+          busyMarkMathExpressionAttribute: text,
+          busyMarkMathDisplayAttribute: 'true',
+          busyMarkMathSourceFormAttribute:
+              BusyMathSourceForm.writersideTexElement.name,
+          'expressionId': expressionId,
+        },
+      );
+    }
+    return PreviewBlock(
+      kind: PreviewBlockKind.code,
+      text: text,
+      language: language,
+      visualization: VisualizationDescriptor.maybeForFenceLanguage(language),
+      attributes: attributes,
+    );
+  }
+
+  List<PreviewInline> _writersideXmlInlines(
+    Iterable<XmlNode> nodes,
+    String path,
+  ) {
+    final result = <PreviewInline>[];
+    var index = 0;
+    for (final node in nodes) {
+      if (node is XmlText) {
+        final text = node.value.replaceAll(RegExp(r'\s+'), ' ');
+        if (text.trim().isNotEmpty) {
+          result.add(PreviewInline(kind: PreviewInlineKind.text, text: text));
+        }
+        continue;
+      }
+      if (node is! XmlElement) {
+        continue;
+      }
+      final name = node.name.local.toLowerCase();
+      if ({
+        'chapter',
+        'procedure',
+        'step',
+        'code-block',
+        'deflist',
+        'def',
+        'p',
+        'note',
+        'tip',
+        'warning',
+        'quote',
+        'tabs',
+        'tab',
+      }.contains(name)) {
+        continue;
+      }
+      if (name == 'math') {
+        result.add(
+          PreviewInline(
+            kind: PreviewInlineKind.math,
+            text: node.innerText,
+            attributes: {
+              busyMarkMathSourceFormAttribute:
+                  BusyMathSourceForm.writersideElement.name,
+              'expressionId': '$path.math${index++}',
+            },
+          ),
+        );
+        continue;
+      }
+      final nested = _writersideXmlInlines(node.children, '$path.i${index++}');
+      final kind = switch (name) {
+        'strong' || 'b' => PreviewInlineKind.strong,
+        'em' || 'i' => PreviewInlineKind.emphasis,
+        'code' => PreviewInlineKind.code,
+        'a' => PreviewInlineKind.link,
+        _ => PreviewInlineKind.text,
+      };
+      final nestedText = nested.map((inline) => inline.text).join();
+      result.add(
+        PreviewInline(
+          kind: kind,
+          text: nestedText,
+          destination: name == 'a' ? node.getAttribute('href') : null,
+          children: nested,
+        ),
+      );
+    }
+    return result;
+  }
+
+  PreviewBlock _blockquote(BusyBlock block, String path) {
+    final style = busyAdmonitionStyleFromName(block.attributes['style']);
+    final writersideAdmonition =
+        block.attributes[busyMarkWritersideAdmonitionAttribute] == 'true';
+    return PreviewBlock(
+      kind: writersideAdmonition && style != BusyAdmonitionStyle.quote
+          ? PreviewBlockKind.admonition
+          : PreviewBlockKind.quote,
+      text: block.children.isEmpty
+          ? _plainText(block.inlines)
+          : block.children.map((child) => child.plainText).join('\n'),
+      inlines:
+          block.children.length == 1 &&
+              block.children.single.kind == BusyBlockKind.paragraph
+          ? _inlines(
+              block.children.single.inlines,
+              'block-${block.children.single.id}.i',
+            )
+          : block.children.isEmpty
+          ? _inlines(block.inlines, 'block-${block.id}.i')
+          : const [],
+      children: [
+        for (final (index, child) in block.children.indexed)
+          _block(child, '$path.b$index'),
+      ],
+      attributes: block.attributes,
+    );
+  }
+
+  PreviewBlock _writersideAdmonition(BusyBlock block, String path) {
+    final style =
+        busyAdmonitionStyleFromName(
+          block.attributes['style'] ?? block.attributes['element'],
+        ) ??
+        BusyAdmonitionStyle.note;
+    return PreviewBlock(
+      kind: style == BusyAdmonitionStyle.quote
+          ? PreviewBlockKind.quote
+          : PreviewBlockKind.admonition,
+      text: block.children.isEmpty
+          ? _plainText(block.inlines)
+          : block.children.map((child) => child.plainText).join('\n'),
+      inlines: _inlines(block.inlines, 'block-${block.id}.i'),
+      children: [
+        for (final (index, child) in block.children.indexed)
+          _block(child, '$path.b$index'),
+      ],
+      attributes: {...block.attributes, 'style': style.name},
+    );
+  }
+
   PreviewBlock _withSourceSpan(PreviewBlock block, SourceSpan? span) {
     if (span == null) {
       return block;
@@ -294,11 +652,14 @@ class BusyMarkPreviewBuilder {
     );
   }
 
-  List<PreviewInline> _inlines(List<BusyInline> inlines) {
-    return [for (final inline in inlines) _inline(inline)];
+  List<PreviewInline> _inlines(List<BusyInline> inlines, String path) {
+    return [
+      for (final (index, inline) in inlines.indexed)
+        _inline(inline, '$path$index'),
+    ];
   }
 
-  PreviewInline _inline(BusyInline inline) {
+  PreviewInline _inline(BusyInline inline, String path) {
     return PreviewInline(
       kind: switch (inline.kind) {
         BusyInlineKind.text ||
@@ -307,6 +668,7 @@ class BusyMarkPreviewBuilder {
         BusyInlineKind.writersideVariable ||
         BusyInlineKind.html ||
         BusyInlineKind.unknown => PreviewInlineKind.text,
+        BusyInlineKind.math => PreviewInlineKind.math,
         BusyInlineKind.strong => PreviewInlineKind.strong,
         BusyInlineKind.emphasis => PreviewInlineKind.emphasis,
         BusyInlineKind.underline => PreviewInlineKind.underline,
@@ -317,7 +679,11 @@ class BusyMarkPreviewBuilder {
       },
       text: inline.kind == BusyInlineKind.softBreak ? ' ' : inline.text,
       destination: inline.destination,
-      children: _inlines(inline.children),
+      children: _inlines(inline.children, '$path.i'),
+      attributes: {
+        ...inline.attributes,
+        if (inline.kind == BusyInlineKind.math) 'expressionId': 'inline-$path',
+      },
     );
   }
 
diff --git a/lib/src/markdown/raw_html_policy.dart b/lib/src/markdown/raw_html_policy.dart
index a6b792ce..dfdb973a 100644
--- a/lib/src/markdown/raw_html_policy.dart
+++ b/lib/src/markdown/raw_html_policy.dart
@@ -94,6 +94,7 @@ const unsafeHtmlTags = {
   'iframe',
   'object',
   'embed',
+  'video',
   'applet',
   'canvas',
   'svg',
diff --git a/lib/src/math/math_cache.dart b/lib/src/math/math_cache.dart
new file mode 100644
index 00000000..7c212f82
--- /dev/null
+++ b/lib/src/math/math_cache.dart
@@ -0,0 +1,30 @@
+import 'dart:collection';
+
+import 'math_models.dart';
+
+class MathRenderCache {
+  MathRenderCache({this.maximumEntries = 256});
+
+  final int maximumEntries;
+  final LinkedHashMap<String, RenderedMathResult> _entries = LinkedHashMap();
+
+  RenderedMathResult? get(String key) {
+    final result = _entries.remove(key);
+    if (result != null) {
+      _entries[key] = result;
+    }
+    return result;
+  }
+
+  void put(String key, RenderedMathResult result) {
+    _entries.remove(key);
+    _entries[key] = result;
+    while (_entries.length > maximumEntries) {
+      _entries.remove(_entries.keys.first);
+    }
+  }
+
+  int get length => _entries.length;
+
+  void clear() => _entries.clear();
+}
diff --git a/lib/src/math/math_coordinator.dart b/lib/src/math/math_coordinator.dart
new file mode 100644
index 00000000..b22bb63d
--- /dev/null
+++ b/lib/src/math/math_coordinator.dart
@@ -0,0 +1,245 @@
+import 'dart:async';
+
+import '../visualization/visualization_renderer.dart';
+import 'math_cache.dart';
+import 'math_models.dart';
+import 'math_renderer.dart';
+import 'math_svg_preprocessor.dart';
+
+class MathCoordinator {
+  MathCoordinator({
+    required this.renderer,
+    MathRenderCache? cache,
+    this.preprocessor = const MathSvgPreprocessor(),
+  }) : cache = cache ?? MathRenderCache();
+
+  final MathRenderer renderer;
+  final MathRenderCache cache;
+  final MathSvgPreprocessor preprocessor;
+  final List<_PendingMathRender> _pending = [];
+  final Map<String, int> _latestRevisions = {};
+  final Map<String, VisualizationCancellationToken> _activeTokens = {};
+  var _flushScheduled = false;
+  var _disposed = false;
+  var _instanceSequence = 0;
+
+  Future<MathRenderResult> render(MathRenderRequest request) {
+    if (_disposed) {
+      throw StateError('MathCoordinator has been disposed.');
+    }
+    final latest = _latestRevisions[request.blockKey];
+    if (latest != null && request.editRevision < latest) {
+      return Future.error(const MathSupersededException());
+    }
+    _latestRevisions[request.blockKey] = request.editRevision;
+    _activeTokens.remove(request.blockKey)?.cancel();
+    final token = VisualizationCancellationToken();
+    _activeTokens[request.blockKey] = token;
+
+    final cached = cache.get(request.cacheKey);
+    if (cached != null) {
+      _activeTokens.remove(request.blockKey);
+      return Future.value(_forInstance(cached, request));
+    }
+    final completer = Completer<MathRenderResult>();
+    _pending.add(
+      _PendingMathRender(request: request, token: token, completer: completer),
+    );
+    if (!_flushScheduled) {
+      _flushScheduled = true;
+      scheduleMicrotask(_flush);
+    }
+    return completer.future;
+  }
+
+  Future<List<MathRenderResult>> renderAll(
+    Iterable<MathRenderRequest> requests,
+  ) {
+    return Future.wait([for (final request in requests) render(request)]);
+  }
+
+  void cancel(String blockKey) {
+    _latestRevisions.remove(blockKey);
+    _activeTokens.remove(blockKey)?.cancel();
+  }
+
+  void dispose() {
+    if (_disposed) {
+      return;
+    }
+    _disposed = true;
+    for (final token in _activeTokens.values) {
+      token.cancel();
+    }
+    _activeTokens.clear();
+    for (final item in _pending) {
+      if (!item.completer.isCompleted) {
+        item.completer.completeError(const MathSupersededException());
+      }
+    }
+    _pending.clear();
+  }
+
+  Future<void> _flush() async {
+    _flushScheduled = false;
+    if (_disposed) {
+      return;
+    }
+    while (_pending.isNotEmpty) {
+      final batch = <_PendingMathRender>[];
+      var aggregateCharacters = 0;
+      for (final item in _pending) {
+        if (batch.length >= busyMarkMaximumMathBatchExpressions ||
+            (batch.isNotEmpty &&
+                aggregateCharacters + item.request.expression.length >
+                    busyMarkMaximumMathBatchCharacters)) {
+          break;
+        }
+        batch.add(item);
+        aggregateCharacters += item.request.expression.length;
+      }
+      _pending.removeRange(0, batch.length);
+      final active = batch.where((item) => !item.token.isCancelled).toList();
+      for (final item in batch.where((item) => item.token.isCancelled)) {
+        _supersede(item);
+      }
+      if (active.isEmpty) {
+        continue;
+      }
+      final uncached = <_PendingMathRender>[];
+      for (final item in active) {
+        final cached = cache.get(item.request.cacheKey);
+        if (cached == null) {
+          uncached.add(item);
+        } else {
+          _completeRendered(item, cached);
+        }
+      }
+      if (uncached.isEmpty) {
+        continue;
+      }
+      final groups = <String, List<_PendingMathRender>>{};
+      for (final item in uncached) {
+        groups.putIfAbsent(item.request.cacheKey, () => []).add(item);
+      }
+      final leaders = [for (final group in groups.values) group.first];
+      final batchToken = VisualizationCancellationToken();
+      void cancelBatchWhenObsolete() {
+        if (uncached.every((item) => item.token.isCancelled)) {
+          batchToken.cancel();
+        }
+      }
+
+      for (final item in uncached) {
+        item.token.onCancel(cancelBatchWhenObsolete);
+      }
+      try {
+        final results = await renderer.renderBatch([
+          for (final item in leaders) item.request,
+        ], batchToken);
+        for (var index = 0; index < leaders.length; index++) {
+          final leader = leaders[index];
+          final result = results[index];
+          if (result is RenderedMathResult) {
+            cache.put(leader.request.cacheKey, result);
+          }
+          for (final item in groups[leader.request.cacheKey]!) {
+            if (_isSuperseded(item)) {
+              _supersede(item);
+              continue;
+            }
+            if (result is RenderedMathResult) {
+              _completeRendered(item, result);
+            } else if (!item.completer.isCompleted) {
+              item.completer.complete(_failureForInstance(result, item));
+              _removeActiveToken(item);
+            }
+          }
+        }
+      } on VisualizationCancelledException {
+        for (final item in uncached) {
+          _supersede(item);
+        }
+      } on Object catch (error, stackTrace) {
+        for (final item in uncached) {
+          if (!item.completer.isCompleted) {
+            item.completer.completeError(error, stackTrace);
+          }
+        }
+      } finally {
+        for (final item in uncached) {
+          item.token.removeListener(cancelBatchWhenObsolete);
+        }
+      }
+    }
+  }
+
+  bool _isSuperseded(_PendingMathRender item) {
+    return item.token.isCancelled ||
+        _latestRevisions[item.request.blockKey] != item.request.editRevision ||
+        !identical(_activeTokens[item.request.blockKey], item.token);
+  }
+
+  void _supersede(_PendingMathRender item) {
+    if (!item.completer.isCompleted) {
+      item.completer.completeError(const MathSupersededException());
+    }
+  }
+
+  void _completeRendered(_PendingMathRender item, RenderedMathResult result) {
+    if (_isSuperseded(item)) {
+      _supersede(item);
+      return;
+    }
+    if (!item.completer.isCompleted) {
+      item.completer.complete(_forInstance(result, item.request));
+    }
+    _removeActiveToken(item);
+  }
+
+  MathRenderResult _failureForInstance(
+    MathRenderResult result,
+    _PendingMathRender item,
+  ) {
+    if (result is FailedMathResult) {
+      return FailedMathResult(
+        expressionId: item.request.expressionId,
+        kind: result.kind,
+        code: result.code,
+        debugDetail: result.debugDetail,
+      );
+    }
+    return result;
+  }
+
+  void _removeActiveToken(_PendingMathRender item) {
+    if (identical(_activeTokens[item.request.blockKey], item.token)) {
+      _activeTokens.remove(item.request.blockKey);
+    }
+  }
+
+  RenderedMathResult _forInstance(
+    RenderedMathResult result,
+    MathRenderRequest request,
+  ) {
+    final prefix =
+        'bm-${request.expressionId}-${request.editRevision}-${_instanceSequence++}';
+    return result.copyWith(
+      expressionId: request.expressionId,
+      svg: preprocessor.rebaseLocalIds(result.svg, prefix),
+      vectorSvg: preprocessor.rebaseLocalIds(result.vectorSvg, prefix),
+    );
+  }
+}
+
+class _PendingMathRender {
+  const _PendingMathRender({
+    required this.request,
+    required this.token,
+    required this.completer,
+  });
+
+  final MathRenderRequest request;
+  final VisualizationCancellationToken token;
+  final Completer<MathRenderResult> completer;
+}
diff --git a/lib/src/math/math_models.dart b/lib/src/math/math_models.dart
new file mode 100644
index 00000000..d4a59ed8
--- /dev/null
+++ b/lib/src/math/math_models.dart
@@ -0,0 +1,131 @@
+import 'dart:convert';
+
+import 'package:crypto/crypto.dart';
+import 'package:flutter/foundation.dart';
+
+const busyMarkMathJaxVersion = '4.1.3';
+const busyMarkMathJaxFontVersion = '4.1.3';
+const busyMarkMathPackageProfileVersion = 'busymark-math-v1';
+const busyMarkMathMacroProfileVersion = 'busymark-macros-v1';
+const busyMarkMathSvgNormalizationVersion = 'generated-svg-v1';
+const busyMarkMaximumMathExpressionCharacters = 16 * 1024;
+const busyMarkMaximumMathBatchExpressions = 128;
+const busyMarkMaximumMathBatchCharacters = 256 * 1024;
+const busyMarkMaximumMathSvgBytes = 2 * 1024 * 1024;
+
+@immutable
+class MathRenderRequest {
+  const MathRenderRequest({
+    required this.expressionId,
+    required this.expression,
+    required this.display,
+    required this.blockKey,
+    required this.editRevision,
+    required this.em,
+    required this.ex,
+    required this.containerWidth,
+    this.renderProfile = 'preview',
+  });
+
+  final String expressionId;
+  final String expression;
+  final bool display;
+  final String blockKey;
+  final int editRevision;
+  final double em;
+  final double ex;
+  final double containerWidth;
+  final String renderProfile;
+
+  double get widthBucket => (containerWidth / 16).round() * 16.0;
+
+  String get cacheKey => sha256
+      .convert(
+        utf8.encode(
+          [
+            busyMarkMathJaxVersion,
+            busyMarkMathJaxFontVersion,
+            busyMarkMathPackageProfileVersion,
+            busyMarkMathMacroProfileVersion,
+            busyMarkMathSvgNormalizationVersion,
+            expression,
+            '$display',
+            renderProfile,
+            em.toStringAsFixed(3),
+            ex.toStringAsFixed(3),
+            widthBucket.toStringAsFixed(0),
+          ].join('\u0000'),
+        ),
+      )
+      .toString();
+}
+
+enum MathRenderErrorKind {
+  invalidTex,
+  resourceLimit,
+  timeout,
+  rendererUnavailable,
+  unsafeOutput,
+  cancelled,
+}
+
+sealed class MathRenderResult {
+  const MathRenderResult({required this.expressionId});
+
+  final String expressionId;
+  bool get isSuccessful => this is RenderedMathResult;
+}
+
+@immutable
+class RenderedMathResult extends MathRenderResult {
+  const RenderedMathResult({
+    required super.expressionId,
+    required this.svg,
+    required this.vectorSvg,
+    required this.width,
+    required this.height,
+    required this.depth,
+    required this.baseline,
+  });
+
+  final String svg;
+  final String vectorSvg;
+  final double width;
+  final double height;
+  final double depth;
+  final double baseline;
+
+  RenderedMathResult copyWith({
+    String? expressionId,
+    String? svg,
+    String? vectorSvg,
+  }) {
+    return RenderedMathResult(
+      expressionId: expressionId ?? this.expressionId,
+      svg: svg ?? this.svg,
+      vectorSvg: vectorSvg ?? this.vectorSvg,
+      width: width,
+      height: height,
+      depth: depth,
+      baseline: baseline,
+    );
+  }
+}
+
+@immutable
+class FailedMathResult extends MathRenderResult {
+  const FailedMathResult({
+    required super.expressionId,
+    required this.kind,
+    required this.code,
+    this.debugDetail,
+  });
+
+  final MathRenderErrorKind kind;
+  final String code;
+  final String? debugDetail;
+}
+
+class MathSupersededException implements Exception {
+  const MathSupersededException();
+}
diff --git a/lib/src/math/math_providers.dart b/lib/src/math/math_providers.dart
new file mode 100644
index 00000000..7db11fe0
--- /dev/null
+++ b/lib/src/math/math_providers.dart
@@ -0,0 +1,13 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../visualization/visualization_providers.dart';
+import 'math_coordinator.dart';
+import 'math_renderer.dart';
+
+final mathCoordinatorProvider = Provider<MathCoordinator>((ref) {
+  final coordinator = MathCoordinator(
+    renderer: MathRenderer(host: ref.watch(webRenderHostProvider)),
+  );
+  ref.onDispose(coordinator.dispose);
+  return coordinator;
+});
diff --git a/lib/src/math/math_renderer.dart b/lib/src/math/math_renderer.dart
new file mode 100644
index 00000000..2d1900ad
--- /dev/null
+++ b/lib/src/math/math_renderer.dart
@@ -0,0 +1,205 @@
+import 'dart:async';
+
+import '../visualization/generated_svg_normalizer.dart';
+import '../visualization/visualization_renderer.dart';
+import '../visualization/web_render_host.dart';
+import 'math_models.dart';
+import 'math_svg_preprocessor.dart';
+
+class MathRenderer {
+  const MathRenderer({
+    required this.host,
+    this.preprocessor = const MathSvgPreprocessor(),
+    this.svgNormalizer = const GeneratedSvgNormalizer(
+      maximumBytes: busyMarkMaximumMathSvgBytes,
+    ),
+  });
+
+  final WebRenderHost host;
+  final MathSvgPreprocessor preprocessor;
+  final GeneratedSvgNormalizer svgNormalizer;
+
+  Future<List<MathRenderResult>> renderBatch(
+    List<MathRenderRequest> requests,
+    VisualizationCancellationToken cancellationToken,
+  ) async {
+    if (requests.isEmpty) {
+      return const [];
+    }
+    if (requests.length > busyMarkMaximumMathBatchExpressions ||
+        requests.fold<int>(
+              0,
+              (total, request) => total + request.expression.length,
+            ) >
+            busyMarkMaximumMathBatchCharacters) {
+      return [
+        for (final request in requests)
+          _failure(request.expressionId, 'math.resourceLimit'),
+      ];
+    }
+
+    final valid = <MathRenderRequest>[];
+    final immediate = <String, MathRenderResult>{};
+    for (final request in requests) {
+      if (request.expression.isEmpty ||
+          request.expression.length > busyMarkMaximumMathExpressionCharacters) {
+        immediate[request.expressionId] = _failure(
+          request.expressionId,
+          request.expression.isEmpty ? 'math.invalidTex' : 'math.resourceLimit',
+        );
+      } else {
+        valid.add(request);
+      }
+    }
+    if (valid.isEmpty) {
+      return [for (final request in requests) immediate[request.expressionId]!];
+    }
+
+    try {
+      final hostIds = <String, MathRenderRequest>{};
+      final payload = <Map<String, Object?>>[];
+      for (final (index, request) in valid.indexed) {
+        final hostId = 'math-$index-${request.cacheKey.substring(0, 12)}';
+        hostIds[hostId] = request;
+        payload.add({
+          'id': hostId,
+          'expression': request.expression,
+          'display': request.display,
+          'em': request.em,
+          'ex': request.ex,
+          'containerWidth': request.widthBucket,
+          'renderProfile': request.renderProfile,
+          'svgIdPrefix': 'bm-${request.cacheKey.substring(0, 16)}',
+        });
+      }
+      final response = await host.renderMathBatch(
+        expressions: payload,
+        cancellationToken: cancellationToken,
+      );
+      cancellationToken.throwIfCancelled();
+      final byExpression = <String, MathRenderResult>{...immediate};
+      final rawResults = response['results'];
+      if (rawResults is! List<Object?>) {
+        throw const WebRenderHostException(
+          'math.rendererUnavailable',
+          'The MathJax host returned an invalid response.',
+        );
+      }
+      for (final raw in rawResults.whereType<Map<Object?, Object?>>()) {
+        final hostId = raw['id'] as String? ?? '';
+        final request = hostIds[hostId];
+        if (request == null) {
+          continue;
+        }
+        byExpression[request.expressionId] = _decodeResult(request, raw);
+      }
+      return [
+        for (final request in requests)
+          byExpression[request.expressionId] ??
+              _failure(request.expressionId, 'math.rendererUnavailable'),
+      ];
+    } on VisualizationCancelledException {
+      rethrow;
+    } on TimeoutException {
+      return [
+        for (final request in requests)
+          FailedMathResult(
+            expressionId: request.expressionId,
+            kind: MathRenderErrorKind.timeout,
+            code: 'math.timeout',
+          ),
+      ];
+    } on WebRenderHostException catch (error) {
+      return [
+        for (final request in requests)
+          FailedMathResult(
+            expressionId: request.expressionId,
+            kind: MathRenderErrorKind.rendererUnavailable,
+            code: 'math.rendererUnavailable',
+            debugDetail: error.toString(),
+          ),
+      ];
+    } on Object catch (error) {
+      return [
+        for (final request in requests)
+          FailedMathResult(
+            expressionId: request.expressionId,
+            kind: MathRenderErrorKind.rendererUnavailable,
+            code: 'math.rendererUnavailable',
+            debugDetail: error.toString(),
+          ),
+      ];
+    }
+  }
+
+  MathRenderResult _decodeResult(
+    MathRenderRequest request,
+    Map<Object?, Object?> raw,
+  ) {
+    final rawError = raw['error'];
+    if (rawError is Map<Object?, Object?>) {
+      return _failure(
+        request.expressionId,
+        rawError['code'] as String? ?? 'math.invalidTex',
+        debugDetail:
+            rawError['detail'] as String? ?? rawError['message'] as String?,
+      );
+    }
+    final source = raw['svg'];
+    if (source is! String || source.isEmpty) {
+      return _failure(request.expressionId, 'math.rendererUnavailable');
+    }
+    try {
+      final prepared = preprocessor.preprocess(
+        source,
+        ex: request.ex,
+        reportedDepth: (raw['depth'] as num?)?.toDouble(),
+      );
+      final normalized = svgNormalizer.normalize(prepared.svg);
+      final vector = normalized.vectorSafeSvg;
+      if (vector == null) {
+        return _failure(request.expressionId, 'math.unsafeOutput');
+      }
+      final width = (raw['width'] as num?)?.toDouble() ?? 1;
+      final height = (raw['height'] as num?)?.toDouble() ?? 1;
+      final depth = prepared.depth.clamp(0, height).toDouble();
+      return RenderedMathResult(
+        expressionId: request.expressionId,
+        svg: normalized.browserSafeSvg,
+        vectorSvg: vector,
+        width: width > 0 && width.isFinite ? width : 1,
+        height: height > 0 && height.isFinite ? height : 1,
+        depth: depth,
+        baseline: height - depth,
+      );
+    } on Object catch (error) {
+      return FailedMathResult(
+        expressionId: request.expressionId,
+        kind: MathRenderErrorKind.unsafeOutput,
+        code: 'math.unsafeOutput',
+        debugDetail: error.toString(),
+      );
+    }
+  }
+
+  FailedMathResult _failure(
+    String expressionId,
+    String code, {
+    String? debugDetail,
+  }) {
+    final kind = switch (code) {
+      'math.resourceLimit' => MathRenderErrorKind.resourceLimit,
+      'math.timeout' => MathRenderErrorKind.timeout,
+      'math.unsafeOutput' => MathRenderErrorKind.unsafeOutput,
+      'math.cancelled' => MathRenderErrorKind.cancelled,
+      'math.rendererUnavailable' => MathRenderErrorKind.rendererUnavailable,
+      _ => MathRenderErrorKind.invalidTex,
+    };
+    return FailedMathResult(
+      expressionId: expressionId,
+      kind: kind,
+      code: code,
+      debugDetail: debugDetail,
+    );
+  }
+}
diff --git a/lib/src/math/math_svg_preprocessor.dart b/lib/src/math/math_svg_preprocessor.dart
new file mode 100644
index 00000000..074f6b33
--- /dev/null
+++ b/lib/src/math/math_svg_preprocessor.dart
@@ -0,0 +1,166 @@
+import 'package:xml/xml.dart';
+
+class MathSvgPreprocessing {
+  const MathSvgPreprocessing({required this.svg, required this.depth});
+
+  final String svg;
+  final double depth;
+}
+
+class MathSvgPreprocessor {
+  const MathSvgPreprocessor();
+
+  static const _maximumStandaloneViewBoxDimension = 16000.0;
+
+  MathSvgPreprocessing preprocess(
+    String source, {
+    required double ex,
+    double? reportedDepth,
+  }) {
+    final document = XmlDocument.parse(source);
+    final root = document.rootElement;
+    if (root.name.local.toLowerCase() != 'svg') {
+      throw const FormatException('MathJax output is not SVG.');
+    }
+    final declarations = _styleDeclarations(root.getAttribute('style') ?? '');
+    final verticalAlign = declarations.remove('vertical-align');
+    if (declarations.isEmpty) {
+      root.removeAttribute('style');
+    } else {
+      root.setAttribute(
+        'style',
+        declarations.entries
+            .map((entry) => '${entry.key}:${entry.value}')
+            .join(';'),
+      );
+    }
+    _normalizeCoordinateRange(root);
+    final extractedDepth = _depthFromVerticalAlign(verticalAlign, ex);
+    return MathSvgPreprocessing(
+      svg: document.toXmlString(pretty: false),
+      depth: reportedDepth ?? extractedDepth,
+    );
+  }
+
+  void _normalizeCoordinateRange(XmlElement root) {
+    final values = root
+        .getAttribute('viewBox')
+        ?.trim()
+        .split(RegExp(r'[\s,]+'))
+        .map(double.tryParse)
+        .toList(growable: false);
+    if (values == null ||
+        values.length != 4 ||
+        values.any((value) => value == null || !value.isFinite)) {
+      return;
+    }
+    final width = values[2]!.abs();
+    final height = values[3]!.abs();
+    final scale = width > height
+        ? width / _maximumStandaloneViewBoxDimension
+        : height / _maximumStandaloneViewBoxDimension;
+    if (scale <= 1) {
+      return;
+    }
+    final originalChildren = root.children.toList(growable: false);
+    root.children.clear();
+    root.children.add(
+      XmlElement(XmlName.parts('g'), [
+        XmlAttribute(XmlName.parts('transform'), 'scale(${1 / scale})'),
+      ], originalChildren),
+    );
+    root.setAttribute(
+      'viewBox',
+      values.map((value) => value! / scale).join(' '),
+    );
+  }
+
+  String rebaseLocalIds(String source, String requestedPrefix) {
+    final document = XmlDocument.parse(source);
+    final prefix = requestedPrefix
+        .replaceAll(RegExp(r'[^A-Za-z0-9_.:-]'), '-')
+        .replaceFirst(RegExp(r'^[^A-Za-z_]'), 'm-');
+    final ids = <String, String>{};
+    var sequence = 0;
+    for (final element in <XmlElement>[
+      document.rootElement,
+      ...document.rootElement.descendants.whereType<XmlElement>(),
+    ]) {
+      final oldId = element.getAttribute('id');
+      if (oldId == null || oldId.isEmpty) {
+        continue;
+      }
+      final replacement = '$prefix-${sequence++}';
+      ids[oldId] = replacement;
+      element.setAttribute('id', replacement);
+    }
+    if (ids.isEmpty) {
+      return document.toXmlString(pretty: false);
+    }
+    for (final element in <XmlElement>[
+      document.rootElement,
+      ...document.rootElement.descendants.whereType<XmlElement>(),
+    ]) {
+      for (final attribute in element.attributes) {
+        var value = attribute.value;
+        for (final entry in ids.entries) {
+          if (value == '#${entry.key}') {
+            value = '#${entry.value}';
+          }
+          value = value.replaceAll(
+            'url(#${entry.key})',
+            'url(#${entry.value})',
+          );
+        }
+        attribute.value = value;
+      }
+    }
+    return document.toXmlString(pretty: false);
+  }
+
+  String resolveCurrentColor(String source, String color) {
+    final document = XmlDocument.parse(source);
+    final currentColor = RegExp(r'\bcurrentColor\b', caseSensitive: false);
+    for (final element in <XmlElement>[
+      document.rootElement,
+      ...document.rootElement.descendants.whereType<XmlElement>(),
+    ]) {
+      for (final attribute in element.attributes) {
+        attribute.value = attribute.value.replaceAll(currentColor, color);
+      }
+    }
+    return document.toXmlString(pretty: false);
+  }
+
+  Map<String, String> _styleDeclarations(String source) {
+    final result = <String, String>{};
+    for (final declaration in source.split(';')) {
+      final separator = declaration.indexOf(':');
+      if (separator <= 0) {
+        continue;
+      }
+      result[declaration.substring(0, separator).trim().toLowerCase()] =
+          declaration.substring(separator + 1).trim();
+    }
+    return result;
+  }
+
+  double _depthFromVerticalAlign(String? value, double ex) {
+    if (value == null) {
+      return 0;
+    }
+    final match = RegExp(
+      r'^(-?(?:\d+(?:\.\d*)?|\.\d+))(ex|em|px)?$',
+    ).firstMatch(value.trim());
+    if (match == null) {
+      return 0;
+    }
+    final amount = double.tryParse(match.group(1)!) ?? 0;
+    final pixels = switch (match.group(2)) {
+      'ex' => amount * ex,
+      'em' => amount * ex * 2,
+      _ => amount,
+    };
+    return pixels < 0 ? -pixels : 0;
+  }
+}
diff --git a/lib/src/math/math_widget.dart b/lib/src/math/math_widget.dart
new file mode 100644
index 00000000..92f3e81e
--- /dev/null
+++ b/lib/src/math/math_widget.dart
@@ -0,0 +1,290 @@
+import 'dart:async';
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+import '../app/busymark_design.dart';
+import '../app/localization.dart';
+import 'math_models.dart';
+import 'math_providers.dart';
+import 'math_svg_preprocessor.dart';
+
+var _nextMathWidgetInstance = 0;
+
+class BusyMarkInlineMath extends StatelessWidget {
+  const BusyMarkInlineMath({
+    super.key,
+    required this.expression,
+    required this.expressionId,
+    required this.editRevision,
+    required this.textStyle,
+    this.containerWidth = BusyMarkSizes.documentContentWidth,
+    this.onFailure,
+    this.onSuccess,
+  });
+
+  final String expression;
+  final String expressionId;
+  final int editRevision;
+  final TextStyle textStyle;
+  final double containerWidth;
+  final ValueChanged<FailedMathResult>? onFailure;
+  final VoidCallback? onSuccess;
+
+  @override
+  Widget build(BuildContext context) {
+    final fontSize =
+        textStyle.fontSize ?? DefaultTextStyle.of(context).style.fontSize ?? 16;
+    return _MathFormula(
+      expression: expression,
+      expressionId: expressionId,
+      editRevision: editRevision,
+      display: false,
+      em: fontSize,
+      ex: fontSize / 2,
+      containerWidth: containerWidth,
+      textStyle: textStyle,
+      onFailure: onFailure,
+      onSuccess: onSuccess,
+    );
+  }
+}
+
+class BusyMarkDisplayMath extends StatelessWidget {
+  const BusyMarkDisplayMath({
+    super.key,
+    required this.expression,
+    required this.expressionId,
+    required this.editRevision,
+    this.onFailure,
+    this.onSuccess,
+  });
+
+  final String expression;
+  final String expressionId;
+  final int editRevision;
+  final ValueChanged<FailedMathResult>? onFailure;
+  final VoidCallback? onSuccess;
+
+  @override
+  Widget build(BuildContext context) {
+    final style = DefaultTextStyle.of(context).style;
+    final fontSize = style.fontSize ?? 16;
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final availableWidth = constraints.maxWidth.isFinite
+            ? constraints.maxWidth
+            : BusyMarkSizes.documentContentWidth;
+        return _MathFormula(
+          expression: expression,
+          expressionId: expressionId,
+          editRevision: editRevision,
+          display: true,
+          em: fontSize,
+          ex: fontSize / 2,
+          containerWidth: availableWidth,
+          textStyle: style,
+          onFailure: onFailure,
+          onSuccess: onSuccess,
+        );
+      },
+    );
+  }
+}
+
+class _MathFormula extends ConsumerStatefulWidget {
+  const _MathFormula({
+    required this.expression,
+    required this.expressionId,
+    required this.editRevision,
+    required this.display,
+    required this.em,
+    required this.ex,
+    required this.containerWidth,
+    required this.textStyle,
+    this.onFailure,
+    this.onSuccess,
+  });
+
+  final String expression;
+  final String expressionId;
+  final int editRevision;
+  final bool display;
+  final double em;
+  final double ex;
+  final double containerWidth;
+  final TextStyle textStyle;
+  final ValueChanged<FailedMathResult>? onFailure;
+  final VoidCallback? onSuccess;
+
+  @override
+  ConsumerState<_MathFormula> createState() => _MathFormulaState();
+}
+
+class _MathFormulaState extends ConsumerState<_MathFormula> {
+  late final String _blockKey = 'math-widget-${_nextMathWidgetInstance++}';
+  late final _coordinator = ref.read(mathCoordinatorProvider);
+  Future<MathRenderResult>? _render;
+  String? _reportedOutcome;
+
+  @override
+  void initState() {
+    super.initState();
+    _scheduleRender();
+  }
+
+  @override
+  void didUpdateWidget(covariant _MathFormula oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.expression != widget.expression ||
+        oldWidget.display != widget.display ||
+        oldWidget.editRevision != widget.editRevision ||
+        oldWidget.em != widget.em ||
+        oldWidget.ex != widget.ex ||
+        oldWidget.containerWidth != widget.containerWidth) {
+      _scheduleRender();
+    }
+  }
+
+  @override
+  void dispose() {
+    _coordinator.cancel(_blockKey);
+    super.dispose();
+  }
+
+  void _scheduleRender() {
+    _reportedOutcome = null;
+    _render = _coordinator.render(
+      MathRenderRequest(
+        expressionId: widget.expressionId,
+        expression: widget.expression,
+        display: widget.display,
+        blockKey: _blockKey,
+        editRevision: widget.editRevision,
+        em: widget.em,
+        ex: widget.ex,
+        containerWidth: widget.containerWidth,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<MathRenderResult>(
+      future: _render,
+      builder: (context, snapshot) {
+        final result = snapshot.data;
+        if (result is RenderedMathResult) {
+          _reportOutcome('success', widget.onSuccess);
+          return _rendered(context, result);
+        }
+        if (result is FailedMathResult) {
+          _reportOutcome(
+            'failure:${result.code}',
+            widget.onFailure == null ? null : () => widget.onFailure!(result),
+          );
+        }
+        return _fallback(context, failed: result is FailedMathResult);
+      },
+    );
+  }
+
+  void _reportOutcome(String outcome, VoidCallback? callback) {
+    if (_reportedOutcome == outcome) {
+      return;
+    }
+    _reportedOutcome = outcome;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) callback?.call();
+    });
+  }
+
+  Widget _rendered(BuildContext context, RenderedMathResult result) {
+    final foreground =
+        widget.textStyle.color ?? DefaultTextStyle.of(context).style.color;
+    final svg = foreground == null
+        ? result.svg
+        : const MathSvgPreprocessor().resolveCurrentColor(
+            result.svg,
+            _svgColor(foreground),
+          );
+    final picture = Semantics(
+      image: true,
+      label: widget.expression,
+      child: ExcludeSemantics(
+        child: SvgPicture.string(
+          svg,
+          width: result.width,
+          height: result.height,
+          fit: BoxFit.fill,
+        ),
+      ),
+    );
+    if (!widget.display) {
+      return Baseline(
+        baseline: result.baseline,
+        baselineType: TextBaseline.alphabetic,
+        child: SizedBox(
+          width: math.max(1, result.width),
+          height: math.max(1, result.height),
+          child: picture,
+        ),
+      );
+    }
+    final formula = SizedBox(
+      width: math.max(1, result.width),
+      height: math.max(1, result.height),
+      child: picture,
+    );
+    if (result.width <= widget.containerWidth) {
+      return Center(child: formula);
+    }
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      child: formula,
+    );
+  }
+
+  Widget _fallback(BuildContext context, {required bool failed}) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    final style = widget.textStyle.copyWith(
+      fontFamily: BusyMarkTypography.monoFontFamily,
+      color: failed
+          ? Theme.of(context).colorScheme.error
+          : colors.mutedForeground,
+      backgroundColor: failed ? colors.admonitionWarning : colors.control,
+    );
+    final fallback = !widget.display
+        ? Text(
+            widget.expression,
+            style: style,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          )
+        : Container(
+            width: double.infinity,
+            padding: BusyMarkInsets.documentCodeBlock,
+            color: failed ? colors.admonitionWarning : colors.control,
+            child: SelectableText(widget.expression, style: style),
+          );
+    return failed
+        ? Tooltip(message: context.l10n.mathRenderFailed, child: fallback)
+        : fallback;
+  }
+}
+
+String _svgColor(Color color) {
+  final value = color.toARGB32();
+  final red = (value >> 16) & 0xff;
+  final green = (value >> 8) & 0xff;
+  final blue = value & 0xff;
+  final alpha = ((value >> 24) & 0xff) / 255;
+  if (alpha >= 1) {
+    return '#${red.toRadixString(16).padLeft(2, '0')}'
+        '${green.toRadixString(16).padLeft(2, '0')}'
+        '${blue.toRadixString(16).padLeft(2, '0')}';
+  }
+  return 'rgba($red,$green,$blue,${alpha.toStringAsFixed(3)})';
+}
diff --git a/lib/src/search/search_replace_service.dart b/lib/src/search/search_replace_service.dart
new file mode 100644
index 00000000..09e28fdf
--- /dev/null
+++ b/lib/src/search/search_replace_service.dart
@@ -0,0 +1,588 @@
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+
+import '../editor/source/source_document.dart';
+import '../editor/source/source_search.dart';
+import '../workspace/text_format_metadata.dart';
+import '../workspace/workspace_model.dart';
+import '../workspace/workspace_service.dart';
+
+class TextReplacementMatch {
+  const TextReplacementMatch({
+    required this.id,
+    required this.start,
+    required this.end,
+    required this.original,
+    required this.replacement,
+  });
+
+  final String id;
+  final int start;
+  final int end;
+  final String original;
+  final String replacement;
+}
+
+class TextReplacementPreview {
+  const TextReplacementPreview({
+    required this.source,
+    required this.options,
+    required this.replacement,
+    required this.matches,
+    this.invalidRegex = false,
+  });
+
+  final String source;
+  final SourceSearchOptions options;
+  final String replacement;
+  final List<TextReplacementMatch> matches;
+  final bool invalidRegex;
+
+  String apply({Set<String>? selectedMatchIds}) {
+    var result = source;
+    for (final match in matches.reversed) {
+      if (selectedMatchIds != null && !selectedMatchIds.contains(match.id)) {
+        continue;
+      }
+      result = result.replaceRange(match.start, match.end, match.replacement);
+    }
+    return result;
+  }
+}
+
+enum WorkspaceReplacementSourceKind { disk, dirtyBuffer }
+
+enum WorkspaceReplacementIssueKind {
+  oversized,
+  unreadable,
+  invalidUtf8,
+  truncated,
+  changedSincePreview,
+  bufferRevisionChanged,
+  normalizationRequired,
+  partialApplicationConflict,
+  applyFailed,
+}
+
+class WorkspaceReplacementIssue {
+  const WorkspaceReplacementIssue({
+    required this.kind,
+    required this.filePath,
+    this.preservedPath,
+  });
+
+  final WorkspaceReplacementIssueKind kind;
+  final String filePath;
+  final String? preservedPath;
+}
+
+class WorkspaceReplacementFilePreview {
+  const WorkspaceReplacementFilePreview({
+    required this.filePath,
+    required this.relativePath,
+    required this.sourceKind,
+    required this.originalText,
+    required this.matches,
+    required this.format,
+    this.bufferId,
+    this.bufferRevision,
+    this.diskSnapshot,
+  });
+
+  final String filePath;
+  final String relativePath;
+  final WorkspaceReplacementSourceKind sourceKind;
+  final String originalText;
+  final List<TextReplacementMatch> matches;
+  final TextFormatMetadata format;
+  final String? bufferId;
+  final int? bufferRevision;
+  final WorkspaceFileSnapshot? diskSnapshot;
+}
+
+class WorkspaceReplacementPreview {
+  const WorkspaceReplacementPreview({
+    required this.options,
+    required this.replacement,
+    required this.files,
+    required this.issues,
+  });
+
+  final SourceSearchOptions options;
+  final String replacement;
+  final List<WorkspaceReplacementFilePreview> files;
+  final List<WorkspaceReplacementIssue> issues;
+
+  int get matchCount =>
+      files.fold(0, (total, file) => total + file.matches.length);
+
+  bool get isComplete => !issues.any(
+    (issue) => issue.kind == WorkspaceReplacementIssueKind.truncated,
+  );
+}
+
+class WorkspaceReplacementApplyResult {
+  const WorkspaceReplacementApplyResult({
+    required this.appliedFiles,
+    required this.appliedMatches,
+    required this.issues,
+  });
+
+  final int appliedFiles;
+  final int appliedMatches;
+  final List<WorkspaceReplacementIssue> issues;
+}
+
+class SearchReplacementService {
+  const SearchReplacementService({
+    this.maximumFileBytes = 1024 * 1024,
+    this.maximumMatches = 5000,
+  });
+
+  final int maximumFileBytes;
+  final int maximumMatches;
+
+  TextReplacementPreview previewText({
+    required String source,
+    required SourceSearchOptions options,
+    required String replacement,
+    String idPrefix = 'match',
+  }) {
+    final search = searchSourceDocument(
+      SourceDocument(fullText: source),
+      options,
+    );
+    if (search.invalidRegex) {
+      return TextReplacementPreview(
+        source: source,
+        options: options,
+        replacement: replacement,
+        matches: const [],
+        invalidRegex: true,
+      );
+    }
+    RegExp? expression;
+    if (options.regex) {
+      expression = RegExp(
+        options.query,
+        caseSensitive: options.caseSensitive,
+        multiLine: true,
+      );
+    }
+    final matches = <TextReplacementMatch>[];
+    for (final (index, match) in search.matches.indexed) {
+      final original = source.substring(match.fullStart, match.fullEnd);
+      var renderedReplacement = replacement;
+      if (expression != null) {
+        final regexMatch = expression.matchAsPrefix(source, match.fullStart);
+        if (regexMatch is RegExpMatch && regexMatch.end == match.fullEnd) {
+          renderedReplacement = _expandRegexReplacement(
+            replacement,
+            regexMatch,
+          );
+        }
+      }
+      matches.add(
+        TextReplacementMatch(
+          id: '$idPrefix:$index:${match.fullStart}:${match.fullEnd}',
+          start: match.fullStart,
+          end: match.fullEnd,
+          original: original,
+          replacement: renderedReplacement,
+        ),
+      );
+    }
+    return TextReplacementPreview(
+      source: source,
+      options: options,
+      replacement: replacement,
+      matches: List.unmodifiable(matches),
+    );
+  }
+
+  Future<WorkspaceReplacementPreview> previewWorkspace({
+    required WorkspaceState state,
+    required WorkspaceService workspaceService,
+    required SourceSearchOptions options,
+    required String replacement,
+  }) async {
+    final workspace = state.workspace;
+    if (workspace == null || options.query.isEmpty) {
+      return WorkspaceReplacementPreview(
+        options: options,
+        replacement: replacement,
+        files: const [],
+        issues: const [],
+      );
+    }
+    final files = <WorkspaceReplacementFilePreview>[];
+    final issues = <WorkspaceReplacementIssue>[];
+    final candidates = <String, String>{
+      for (final file in workspace.files)
+        if (_isReplaceableTextPath(file.absolutePath))
+          file.absolutePath: file.relativePath,
+      for (final buffer in state.documentBuffers)
+        if (buffer.filePath case final path?)
+          path: p.relative(path, from: workspace.rootPath),
+    };
+    var remaining = maximumMatches;
+    final sortedPaths = candidates.keys.toList()..sort();
+    for (final path in sortedPaths) {
+      final buffer = state.bufferForPath(path);
+      late final String text;
+      late final TextFormatMetadata format;
+      WorkspaceFileSnapshot? snapshot;
+      if (buffer != null) {
+        text = buffer.text;
+        format = buffer.format;
+        snapshot = buffer.diskSnapshot;
+      } else {
+        final metadata = workspace.files
+            .where((file) => p.equals(file.absolutePath, path))
+            .firstOrNull;
+        if (metadata != null && metadata.size > maximumFileBytes) {
+          issues.add(
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.oversized,
+              filePath: path,
+            ),
+          );
+          continue;
+        }
+        try {
+          final loaded = await workspaceService.loadTextWithSnapshot(path);
+          text = loaded.text;
+          format = loaded.format;
+          snapshot = loaded.snapshot;
+        } on FormatException {
+          issues.add(
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.invalidUtf8,
+              filePath: path,
+            ),
+          );
+          continue;
+        } on FileSystemException {
+          issues.add(
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.unreadable,
+              filePath: path,
+            ),
+          );
+          continue;
+        }
+      }
+      final preview = previewText(
+        source: text,
+        options: options,
+        replacement: replacement,
+        idPrefix: path,
+      );
+      if (preview.matches.isEmpty) {
+        continue;
+      }
+      final retained = preview.matches.take(remaining).toList(growable: false);
+      files.add(
+        WorkspaceReplacementFilePreview(
+          filePath: path,
+          relativePath: candidates[path]!,
+          sourceKind: buffer?.isDirty == true
+              ? WorkspaceReplacementSourceKind.dirtyBuffer
+              : WorkspaceReplacementSourceKind.disk,
+          originalText: text,
+          matches: retained,
+          format: format,
+          bufferId: buffer?.id,
+          bufferRevision: buffer?.revision,
+          diskSnapshot: snapshot,
+        ),
+      );
+      remaining -= retained.length;
+      if (remaining <= 0) {
+        issues.add(
+          WorkspaceReplacementIssue(
+            kind: WorkspaceReplacementIssueKind.truncated,
+            filePath: path,
+          ),
+        );
+        break;
+      }
+    }
+    return WorkspaceReplacementPreview(
+      options: options,
+      replacement: replacement,
+      files: List.unmodifiable(files),
+      issues: List.unmodifiable(issues),
+    );
+  }
+
+  Future<WorkspaceReplacementApplyResult> applyWorkspace({
+    required WorkspaceReplacementPreview preview,
+    required Set<String> selectedMatchIds,
+    required WorkspaceState Function() currentState,
+    required void Function(String bufferId, String text) updateBuffer,
+    required WorkspaceService workspaceService,
+    Map<String, LineEndingNormalization> mixedLineEndingNormalizations =
+        const {},
+  }) async {
+    final issues = <WorkspaceReplacementIssue>[];
+    if (!preview.isComplete) {
+      return WorkspaceReplacementApplyResult(
+        appliedFiles: 0,
+        appliedMatches: 0,
+        issues: List.unmodifiable([
+          for (final issue in preview.issues)
+            if (issue.kind == WorkspaceReplacementIssueKind.truncated) issue,
+        ]),
+      );
+    }
+    final state = currentState();
+    final operations = <_WorkspaceReplacementOperation>[];
+    for (final file in preview.files) {
+      final selected = {
+        for (final match in file.matches)
+          if (selectedMatchIds.contains(match.id)) match.id,
+      };
+      if (selected.isEmpty) {
+        continue;
+      }
+      final currentBuffer = file.bufferId == null
+          ? null
+          : state.documentBuffers
+                .where((buffer) => buffer.id == file.bufferId)
+                .firstOrNull;
+      if (file.bufferId != null) {
+        if (currentBuffer == null ||
+            currentBuffer.revision != file.bufferRevision ||
+            currentBuffer.text != file.originalText) {
+          issues.add(
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.bufferRevisionChanged,
+              filePath: file.filePath,
+            ),
+          );
+          continue;
+        }
+      } else if (await workspaceService.fileChangedSince(
+        file.filePath,
+        file.diskSnapshot,
+      )) {
+        issues.add(
+          WorkspaceReplacementIssue(
+            kind: WorkspaceReplacementIssueKind.changedSincePreview,
+            filePath: file.filePath,
+          ),
+        );
+        continue;
+      }
+      final normalization = mixedLineEndingNormalizations[file.filePath];
+      if (file.bufferId == null &&
+          file.format.hasMixedLineEndings &&
+          normalization == null) {
+        issues.add(
+          WorkspaceReplacementIssue(
+            kind: WorkspaceReplacementIssueKind.normalizationRequired,
+            filePath: file.filePath,
+          ),
+        );
+        continue;
+      }
+      final textPreview = TextReplacementPreview(
+        source: file.originalText,
+        options: preview.options,
+        replacement: preview.replacement,
+        matches: file.matches,
+      );
+      final nextText = textPreview.apply(selectedMatchIds: selected);
+      operations.add(
+        _WorkspaceReplacementOperation(
+          file: file,
+          nextText: nextText,
+          selectedMatchCount: selected.length,
+          normalization: normalization,
+        ),
+      );
+    }
+    if (issues.isNotEmpty) {
+      return WorkspaceReplacementApplyResult(
+        appliedFiles: 0,
+        appliedMatches: 0,
+        issues: List.unmodifiable(issues),
+      );
+    }
+    final diskOperations = operations
+        .where((operation) => operation.file.bufferId == null)
+        .toList(growable: false);
+    try {
+      await workspaceService.saveFormattedTextBatch([
+        for (final operation in diskOperations)
+          WorkspaceBatchTextWrite(
+            path: operation.file.filePath,
+            text: operation.nextText,
+            expectedSnapshot: operation.file.diskSnapshot!,
+            format: operation.file.format,
+            mixedNormalization: operation.normalization,
+          ),
+      ]);
+    } on WorkspaceBatchWriteConflict catch (error) {
+      return WorkspaceReplacementApplyResult(
+        appliedFiles: 0,
+        appliedMatches: 0,
+        issues: [
+          WorkspaceReplacementIssue(
+            kind: WorkspaceReplacementIssueKind.changedSincePreview,
+            filePath: error.path,
+          ),
+        ],
+      );
+    } on WorkspaceBatchPartialApplicationConflict catch (error) {
+      return WorkspaceReplacementApplyResult(
+        appliedFiles: 0,
+        appliedMatches: 0,
+        issues: [
+          for (final file in error.files)
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.partialApplicationConflict,
+              filePath: file.targetPath,
+              preservedPath: file.preservedPath,
+            ),
+        ],
+      );
+    } on Object {
+      return WorkspaceReplacementApplyResult(
+        appliedFiles: 0,
+        appliedMatches: 0,
+        issues: [
+          for (final operation in diskOperations)
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.applyFailed,
+              filePath: operation.file.filePath,
+            ),
+        ],
+      );
+    }
+    final postWriteState = currentState();
+    final staleOpenOperations = <_WorkspaceReplacementOperation>[];
+    for (final operation in operations) {
+      final bufferId = operation.file.bufferId;
+      if (bufferId == null) {
+        continue;
+      }
+      final buffer = postWriteState.documentBuffers
+          .where((candidate) => candidate.id == bufferId)
+          .firstOrNull;
+      if (buffer == null ||
+          buffer.revision != operation.file.bufferRevision ||
+          buffer.text != operation.file.originalText) {
+        staleOpenOperations.add(operation);
+      }
+    }
+    if (staleOpenOperations.isNotEmpty) {
+      return WorkspaceReplacementApplyResult(
+        appliedFiles: diskOperations.length,
+        appliedMatches: diskOperations.fold(
+          0,
+          (total, operation) => total + operation.selectedMatchCount,
+        ),
+        issues: List.unmodifiable([
+          for (final operation in staleOpenOperations)
+            WorkspaceReplacementIssue(
+              kind: WorkspaceReplacementIssueKind.bufferRevisionChanged,
+              filePath: operation.file.filePath,
+            ),
+        ]),
+      );
+    }
+    for (final operation in operations) {
+      if (operation.file.bufferId case final bufferId?) {
+        updateBuffer(bufferId, operation.nextText);
+      }
+    }
+    return WorkspaceReplacementApplyResult(
+      appliedFiles: operations.length,
+      appliedMatches: operations.fold(
+        0,
+        (total, operation) => total + operation.selectedMatchCount,
+      ),
+      issues: List.unmodifiable(issues),
+    );
+  }
+
+  String _expandRegexReplacement(String replacement, RegExpMatch match) {
+    final output = StringBuffer();
+    for (var index = 0; index < replacement.length; index++) {
+      final character = replacement[index];
+      if (character != r'$' || index + 1 >= replacement.length) {
+        output.write(character);
+        continue;
+      }
+      final next = replacement[index + 1];
+      if (next == r'$') {
+        output.write(r'$');
+        index++;
+        continue;
+      }
+      if (next == '&') {
+        output.write(match.group(0) ?? '');
+        index++;
+        continue;
+      }
+      if (next == '{') {
+        final close = replacement.indexOf('}', index + 2);
+        if (close > index + 2) {
+          final name = replacement.substring(index + 2, close);
+          try {
+            output.write(match.namedGroup(name) ?? '');
+            index = close;
+            continue;
+          } on ArgumentError {
+            // Preserve an unknown capture reference literally.
+          }
+        }
+      }
+      if (_isDigit(next)) {
+        var end = index + 1;
+        while (end < replacement.length &&
+            end < index + 3 &&
+            _isDigit(replacement[end])) {
+          end++;
+        }
+        final group = int.parse(replacement.substring(index + 1, end));
+        if (group <= match.groupCount) {
+          output.write(match.group(group) ?? '');
+          index = end - 1;
+          continue;
+        }
+      }
+      output.write(r'$');
+    }
+    return output.toString();
+  }
+
+  bool _isDigit(String value) {
+    final unit = value.codeUnitAt(0);
+    return unit >= 48 && unit <= 57;
+  }
+
+  bool _isReplaceableTextPath(String path) {
+    return switch (p.extension(path).toLowerCase()) {
+      '.md' || '.markdown' || '.xml' || '.topic' || '.tree' || '.html' => true,
+      _ => false,
+    };
+  }
+}
+
+class _WorkspaceReplacementOperation {
+  const _WorkspaceReplacementOperation({
+    required this.file,
+    required this.nextText,
+    required this.selectedMatchCount,
+    required this.normalization,
+  });
+
+  final WorkspaceReplacementFilePreview file;
+  final String nextText;
+  final int selectedMatchCount;
+  final LineEndingNormalization? normalization;
+}
diff --git a/lib/src/visualization/visualization_card.dart b/lib/src/visualization/visualization_card.dart
index 29574938..64025ff5 100644
--- a/lib/src/visualization/visualization_card.dart
+++ b/lib/src/visualization/visualization_card.dart
@@ -12,7 +12,9 @@ import 'package:path/path.dart' as p;
 
 import '../app/busymark_design.dart';
 import '../app/busymark_glyphs.dart';
+import '../app/busymark_toast.dart';
 import '../app/localization.dart';
+import '../writerside/writerside_diagram_source_loader.dart';
 import 'visualization_coordinator.dart';
 import 'visualization_models.dart';
 import 'visualization_providers.dart';
@@ -29,6 +31,7 @@ class BusyMarkVisualizationCard extends ConsumerStatefulWidget {
     required this.sourceStartLine,
     required this.editRevision,
     required this.blockKey,
+    this.sourceReference,
     this.priority = VisualizationRenderPriority.visible,
     this.sourceEditor,
     this.onEditSource,
@@ -43,6 +46,7 @@ class BusyMarkVisualizationCard extends ConsumerStatefulWidget {
   final int sourceStartLine;
   final int editRevision;
   final String blockKey;
+  final String? sourceReference;
   final VisualizationRenderPriority priority;
   final Widget? sourceEditor;
   final VoidCallback? onEditSource;
@@ -106,6 +110,7 @@ class _BusyMarkVisualizationCardState
       _latestResult = null;
     }
     if (oldWidget.source != widget.source ||
+        oldWidget.sourceReference != widget.sourceReference ||
         oldWidget.documentPath != widget.documentPath ||
         oldWidget.workspaceRoot != widget.workspaceRoot ||
         oldWidget.descriptor.kind != widget.descriptor.kind ||
@@ -142,10 +147,36 @@ class _BusyMarkVisualizationCardState
   Future<void> _render() async {
     final serial = _requestSerial;
     final theme = _theme ?? VisualizationTheme.light;
+    var source = widget.source;
+    final sourceReference = widget.sourceReference?.trim() ?? '';
+    if (sourceReference.isNotEmpty) {
+      try {
+        source = await const WritersideDiagramSourceLoader().load(
+          reference: sourceReference,
+          documentPath: widget.documentPath,
+          workspaceRoot: widget.workspaceRoot,
+        );
+      } on WritersideDiagramSourceException {
+        if (!mounted || serial != _requestSerial) {
+          return;
+        }
+        setState(() {
+          _latestResult = FailedVisualizationResult(
+            code: 'visualization.sourceUnavailable',
+            message: context.l10n.visualizationRenderFailed,
+          );
+          _rendering = false;
+        });
+        return;
+      }
+    }
+    if (!mounted || serial != _requestSerial) {
+      return;
+    }
     final request = VisualizationRenderRequest(
       blockKey: widget.blockKey,
       kind: widget.descriptor.kind,
-      source: widget.source,
+      source: source,
       sourceStartLine: widget.sourceStartLine,
       documentPath: widget.documentPath,
       workspaceRoot: widget.workspaceRoot,
@@ -512,9 +543,11 @@ class _BusyMarkVisualizationCardState
           );
     } on Object catch (error) {
       if (mounted) {
-        ScaffoldMessenger.of(
+        BusyMarkToastOverlay.show(
           context,
-        ).showSnackBar(SnackBar(content: Text(error.toString())));
+          message: error.toString(),
+          priority: BusyMarkToastPriority.high,
+        );
       }
     }
   }
@@ -551,10 +584,9 @@ class _BusyMarkVisualizationCardState
         : (result as RasterVisualizationResult).pngBytes;
     await File(path).writeAsBytes(bytes, flush: true);
     if (mounted) {
-      ScaffoldMessenger.of(this.context).showSnackBar(
-        SnackBar(
-          content: Text(this.context.l10n.visualizationSaved(p.basename(path))),
-        ),
+      BusyMarkToastOverlay.show(
+        this.context,
+        message: this.context.l10n.visualizationSaved(p.basename(path)),
       );
     }
   }
@@ -590,15 +622,18 @@ class _BusyMarkVisualizationCardState
       }
       await host.copyPngToClipboard(pngBytes);
       if (mounted) {
-        ScaffoldMessenger.of(this.context).showSnackBar(
-          SnackBar(content: Text(this.context.l10n.visualizationImageCopied)),
+        BusyMarkToastOverlay.show(
+          this.context,
+          message: this.context.l10n.visualizationImageCopied,
         );
       }
     } on Object catch (error) {
       if (mounted) {
-        ScaffoldMessenger.of(
+        BusyMarkToastOverlay.show(
           this.context,
-        ).showSnackBar(SnackBar(content: Text(error.toString())));
+          message: error.toString(),
+          priority: BusyMarkToastPriority.high,
+        );
       }
     }
   }
diff --git a/lib/src/visualization/visualization_release_smoke.dart b/lib/src/visualization/visualization_release_smoke.dart
index 4f999e26..b61eb893 100644
--- a/lib/src/visualization/visualization_release_smoke.dart
+++ b/lib/src/visualization/visualization_release_smoke.dart
@@ -7,7 +7,11 @@ import 'package:path/path.dart' as p;
 
 import '../export/markdown_pdf_export_service.dart';
 import '../export/markdown_pdf_models.dart';
+import '../export/markdown_math_export.dart';
 import '../export/markdown_visualization_export.dart';
+import '../math/math_coordinator.dart';
+import '../math/math_models.dart';
+import '../math/math_renderer.dart';
 import 'd2_renderer.dart';
 import 'visualization_cache.dart';
 import 'visualization_coordinator.dart';
@@ -54,6 +58,7 @@ Future<int> runVisualizationReleaseSmoke(String reportPath) async {
     ),
     maximumConcurrentRenders: 1,
   );
+  final mathCoordinator = MathCoordinator(renderer: MathRenderer(host: host));
   final checks = <String, Object?>{};
   Future<void> checkpoint(String phase) async {
     await _writeReport(reportFile, {
@@ -86,10 +91,118 @@ Future<int> runVisualizationReleaseSmoke(String reportPath) async {
     );
     checks['mermaidFormat'] = await _expectDiagram(host, mermaid, 'Mermaid');
 
+    await checkpoint('rendering sequential NewCM math');
+    final doubleStruck = await _renderMath(
+      mathCoordinator,
+      expression: r'\mathbb{R}',
+      key: 'release-smoke-mathbb',
+    );
+    final calligraphic = await _renderMath(
+      mathCoordinator,
+      expression: r'\mathcal{L}',
+      key: 'release-smoke-mathcal',
+    );
+    final scientific = await _renderMath(
+      mathCoordinator,
+      expression:
+          r'\ce{2H2 + O2 -> 2H2O}\quad '
+          r'\Braket{\psi|\phi}+\cancel{x}+\upalpha+a\coloneqq b+\units{m}',
+      key: 'release-smoke-scientific',
+      display: true,
+    );
+    final bold = await _renderMath(
+      mathCoordinator,
+      expression: r'\boldsymbol{\alpha}',
+      key: 'release-smoke-boldsymbol',
+    );
+    final cases = await _renderMath(
+      mathCoordinator,
+      expression: r'f(x)=\begin{cases}x&x>0\\0&x\leq0\end{cases}',
+      key: 'release-smoke-cases',
+      display: true,
+    );
+    final generatedSymbol = await _renderMath(
+      mathCoordinator,
+      expression: r'90\degree',
+      key: 'release-smoke-gensymb',
+    );
+    final emphasizedEquation = await _renderMath(
+      mathCoordinator,
+      expression: r'\begin{empheq}{align}E&=mc^2\end{empheq}',
+      key: 'release-smoke-empheq',
+      display: true,
+    );
+    final ams = await _renderMath(
+      mathCoordinator,
+      expression: r'\begin{align}a&=b\end{align}',
+      key: 'release-smoke-ams',
+      display: true,
+    );
+    for (final entry in <String, MathRenderResult>{
+      'double-struck': doubleStruck,
+      'calligraphic': calligraphic,
+      'scientific profile': scientific,
+      'boldsymbol': bold,
+      'cases': cases,
+      'gensymb': generatedSymbol,
+      'empheq': emphasizedEquation,
+      'AMS': ams,
+    }.entries) {
+      final name = entry.key;
+      final result = entry.value;
+      if (result is! RenderedMathResult || !result.vectorSvg.contains('<svg')) {
+        final detail = result is FailedMathResult
+            ? '${result.code}: ${result.debugDetail ?? result.code}'
+            : result.runtimeType.toString();
+        throw StateError(
+          'MathJax did not render the $name expression: $detail',
+        );
+      }
+    }
+    checks['mathJaxVersion'] = busyMarkMathJaxVersion;
+    checks['mathJaxFontVersion'] = busyMarkMathJaxFontVersion;
+    checks['newCmSequential'] = true;
+    checks['mathVectorSvg'] = true;
+
+    await checkpoint('checking independent formula state and partial failure');
+    final macroDefinition = await _renderMath(
+      mathCoordinator,
+      expression: r'\newcommand{\busyisolated}{z}\busyisolated',
+      key: 'release-smoke-macro-definition',
+    );
+    final leakedMacro = await _renderMath(
+      mathCoordinator,
+      expression: r'\busyisolated',
+      key: 'release-smoke-macro-isolation',
+    );
+    final validAfterFailure = await _renderMath(
+      mathCoordinator,
+      expression: r'\sqrt{x^2+y^2}',
+      key: 'release-smoke-after-failure',
+    );
+    if (macroDefinition is! RenderedMathResult ||
+        leakedMacro is! FailedMathResult ||
+        leakedMacro.kind != MathRenderErrorKind.invalidTex ||
+        validAfterFailure is! RenderedMathResult) {
+      throw StateError('Math expression isolation or partial failure failed.');
+    }
+    checks['mathExpressionIsolation'] = true;
+    checks['mathPartialFailure'] = true;
+
     await checkpoint('terminating and recovering WebKit');
     await host.terminateWebProcessForReleaseSmoke();
     checks['webKitRecovery'] = true;
 
+    final mathAfterRecovery = await _renderMath(
+      mathCoordinator,
+      expression: r'\mathbb{R}\oplus\mathcal{L}',
+      key: 'release-smoke-math-recovery',
+    );
+    if (mathAfterRecovery is! RenderedMathResult) {
+      throw StateError('MathJax did not recover with the WebKit process.');
+    }
+    checks['mathWebKitRecovery'] = true;
+
     await checkpoint('rendering PlantUML after recovery');
     final plantUml = await _render(
       coordinator,
@@ -148,6 +261,9 @@ Future<int> runVisualizationReleaseSmoke(String reportPath) async {
           visualizationRenderer: MarkdownVisualizationExportRenderer(
             coordinator: coordinator,
           ),
+          mathRenderer: MarkdownMathExportRenderer(
+            coordinator: mathCoordinator,
+          ),
         ).export(
           MarkdownPdfExportRequest(
             source: _pdfSource,
@@ -186,6 +302,7 @@ Future<int> runVisualizationReleaseSmoke(String reportPath) async {
     return 1;
   } finally {
     coordinator.dispose();
+    mathCoordinator.dispose();
     try {
       await workingDirectory.delete(recursive: true);
     } on FileSystemException {
@@ -194,6 +311,27 @@ Future<int> runVisualizationReleaseSmoke(String reportPath) async {
   }
 }
 
+Future<MathRenderResult> _renderMath(
+  MathCoordinator coordinator, {
+  required String expression,
+  required String key,
+  bool display = false,
+}) {
+  return coordinator.render(
+    MathRenderRequest(
+      expressionId: key,
+      expression: expression,
+      display: display,
+      blockKey: key,
+      editRevision: 1,
+      em: 16,
+      ex: 8,
+      containerWidth: 720,
+      renderProfile: 'release-smoke',
+    ),
+  );
+}
+
 Future<VisualizationRenderResult> _render(
   VisualizationCoordinator coordinator,
   Directory workingDirectory, {
@@ -322,6 +460,12 @@ const _pdfSource =
     '''
 # Visualization release smoke
 
+Inline math remains in the sentence: \$x^2\$, \$\\frac{a}{b}\$, and \$\\Braket{\\psi|\\phi}\$.
+
+\$\$
+\\ce{2H2 + O2 -> 2H2O}
+\$\$
+
 ```mermaid
 flowchart LR
   source[Markdown] --> preview[Preview]
diff --git a/lib/src/visualization/web_render_host.dart b/lib/src/visualization/web_render_host.dart
index 45c09c76..4ec3ab11 100644
--- a/lib/src/visualization/web_render_host.dart
+++ b/lib/src/visualization/web_render_host.dart
@@ -24,6 +24,11 @@ class OpenApiSourceReference {
 }
 
 abstract interface class WebRenderHost {
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  });
+
   Future<Map<Object?, Object?>> renderMermaid({
     required String source,
     required VisualizationTheme theme,
@@ -74,11 +79,38 @@ class PlatformWebRenderHost implements WebRenderHost {
     ),
     this.renderTimeout = const Duration(seconds: 20),
     this.rasterTimeout = const Duration(seconds: 20),
+    this.mathTimeout = const Duration(seconds: 10),
+    this.mathTimeoutPerAdditionalExpression = const Duration(milliseconds: 250),
+    this.maximumMathTimeout = const Duration(seconds: 45),
   }) : _channel = channel;
 
   final MethodChannel _channel;
   final Duration renderTimeout;
   final Duration rasterTimeout;
+  final Duration mathTimeout;
+  final Duration mathTimeoutPerAdditionalExpression;
+  final Duration maximumMathTimeout;
+
+  Duration mathBatchTimeoutForExpressionCount(int expressionCount) {
+    final additional =
+        mathTimeoutPerAdditionalExpression *
+        (expressionCount - 1).clamp(0, 1 << 20);
+    final scaled = mathTimeout + additional;
+    return scaled > maximumMathTimeout ? maximumMathTimeout : scaled;
+  }
+
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) {
+    return _invokeMap(
+      'renderMathBatch',
+      {'expressions': expressions},
+      mathBatchTimeoutForExpressionCount(expressions.length),
+      cancellationToken,
+    );
+  }
 
   /// Release verification hook. The Linux runner accepts this operation only
   /// when `BUSYMARK_RELEASE_SMOKE=1` is present in its environment.
diff --git a/lib/src/workspace/document_buffer.dart b/lib/src/workspace/document_buffer.dart
new file mode 100644
index 00000000..fc2ed8cb
--- /dev/null
+++ b/lib/src/workspace/document_buffer.dart
@@ -0,0 +1,276 @@
+import 'dart:math' as math;
+
+import 'package:flutter/services.dart';
+
+import '../app/app_settings.dart';
+import '../editor/source/source_search.dart';
+import '../editor/wysiwyg/wysiwyg_session_state.dart';
+import 'text_format_metadata.dart';
+import 'workspace_file_snapshot.dart';
+
+const Object _bufferUnset = Object();
+
+enum DocumentDiskState { present, changed, deleted, conflict }
+
+class DocumentUndoState {
+  const DocumentUndoState({this.undo = const [], this.redo = const []});
+
+  static const historyLimit = 100;
+
+  final List<String> undo;
+  final List<String> redo;
+
+  DocumentUndoState push(String text) => DocumentUndoState(
+    undo: List.unmodifiable(
+      [...undo, text].skip(math.max(0, undo.length + 1 - historyLimit)),
+    ),
+    redo: const [],
+  );
+
+  DocumentUndoState afterUndo(String currentText) => DocumentUndoState(
+    undo: List.unmodifiable(undo.take(undo.length - 1)),
+    redo: List.unmodifiable(
+      [...redo, currentText].skip(math.max(0, redo.length + 1 - historyLimit)),
+    ),
+  );
+
+  DocumentUndoState afterRedo(String currentText) => DocumentUndoState(
+    undo: List.unmodifiable(
+      [...undo, currentText].skip(math.max(0, undo.length + 1 - historyLimit)),
+    ),
+    redo: List.unmodifiable(redo.take(redo.length - 1)),
+  );
+}
+
+class DocumentEditorState {
+  const DocumentEditorState({
+    this.mode = DocumentViewModePreference.editor,
+    this.selection = const TextSelection.collapsed(offset: 0),
+    this.scrollOffset = 0,
+    this.foldedRegionKeys = const {},
+    this.searchOptions = const SourceSearchOptions(),
+    this.searchReplacement = '',
+    this.searchCurrentMatchIndex,
+    this.undoState = const DocumentUndoState(),
+    this.wysiwygState = const WysiwygEditorSessionState(),
+  });
+
+  final DocumentViewModePreference mode;
+  final TextSelection selection;
+  final double scrollOffset;
+  final Set<String> foldedRegionKeys;
+  final SourceSearchOptions searchOptions;
+  final String searchReplacement;
+  final int? searchCurrentMatchIndex;
+  final DocumentUndoState undoState;
+  final WysiwygEditorSessionState wysiwygState;
+
+  DocumentEditorState copyWith({
+    DocumentViewModePreference? mode,
+    TextSelection? selection,
+    double? scrollOffset,
+    Set<String>? foldedRegionKeys,
+    SourceSearchOptions? searchOptions,
+    String? searchReplacement,
+    Object? searchCurrentMatchIndex = _bufferUnset,
+    DocumentUndoState? undoState,
+    WysiwygEditorSessionState? wysiwygState,
+  }) {
+    return DocumentEditorState(
+      mode: mode ?? this.mode,
+      selection: selection ?? this.selection,
+      scrollOffset: scrollOffset ?? this.scrollOffset,
+      foldedRegionKeys: Set.unmodifiable(
+        foldedRegionKeys ?? this.foldedRegionKeys,
+      ),
+      searchOptions: searchOptions ?? this.searchOptions,
+      searchReplacement: searchReplacement ?? this.searchReplacement,
+      searchCurrentMatchIndex: identical(searchCurrentMatchIndex, _bufferUnset)
+          ? this.searchCurrentMatchIndex
+          : searchCurrentMatchIndex as int?,
+      undoState: undoState ?? this.undoState,
+      wysiwygState: wysiwygState ?? this.wysiwygState,
+    );
+  }
+
+  Map<String, Object?> toJson() => {
+    'mode': mode.name,
+    'selectionBase': selection.baseOffset,
+    'selectionExtent': selection.extentOffset,
+    'scrollOffset': scrollOffset,
+    'foldedRegionKeys': foldedRegionKeys.toList(),
+    'searchQuery': searchOptions.query,
+    'searchCaseSensitive': searchOptions.caseSensitive,
+    'searchWholeWord': searchOptions.wholeWord,
+    'searchRegex': searchOptions.regex,
+    'searchReplacement': searchReplacement,
+    'searchCurrentMatchIndex': searchCurrentMatchIndex,
+    'wysiwygState': wysiwygState.toJson(),
+  };
+
+  factory DocumentEditorState.fromJson(Map<String, Object?> json) {
+    return DocumentEditorState(
+      mode: DocumentViewModePreference.values.firstWhere(
+        (value) => value.name == json['mode'],
+        orElse: () => DocumentViewModePreference.editor,
+      ),
+      selection: TextSelection(
+        baseOffset: (json['selectionBase'] as num?)?.toInt() ?? 0,
+        extentOffset: (json['selectionExtent'] as num?)?.toInt() ?? 0,
+      ),
+      scrollOffset: (json['scrollOffset'] as num?)?.toDouble() ?? 0,
+      foldedRegionKeys:
+          (json['foldedRegionKeys'] as List?)
+              ?.map((value) => value.toString())
+              .toSet() ??
+          const {},
+      searchOptions: SourceSearchOptions(
+        query: json['searchQuery']?.toString() ?? '',
+        caseSensitive: json['searchCaseSensitive'] as bool? ?? false,
+        wholeWord: json['searchWholeWord'] as bool? ?? false,
+        regex: json['searchRegex'] as bool? ?? false,
+      ),
+      searchReplacement: json['searchReplacement']?.toString() ?? '',
+      searchCurrentMatchIndex: (json['searchCurrentMatchIndex'] as num?)
+          ?.toInt(),
+      wysiwygState: WysiwygEditorSessionState.fromJson(
+        (json['wysiwygState'] as Map?)?.cast<String, Object?>() ?? const {},
+      ),
+    );
+  }
+}
+
+class DocumentBuffer {
+  const DocumentBuffer({
+    required this.id,
+    required this.text,
+    required this.lastSavedText,
+    required this.dirty,
+    this.filePath,
+    this.untitledName,
+    this.diskSnapshot,
+    this.format = TextFormatMetadata.utf8Lf,
+    this.editorState = const DocumentEditorState(),
+    this.revision = 0,
+    this.diskState = DocumentDiskState.present,
+    this.diskVersionText,
+    this.diskVersionSnapshot,
+    this.recovered = false,
+  });
+
+  factory DocumentBuffer.file({
+    required String id,
+    required String filePath,
+    required String text,
+    required WorkspaceFileSnapshot snapshot,
+    required TextFormatMetadata format,
+    DocumentViewModePreference mode = DocumentViewModePreference.editor,
+  }) {
+    return DocumentBuffer(
+      id: id,
+      filePath: filePath,
+      text: text,
+      lastSavedText: text,
+      dirty: false,
+      diskSnapshot: snapshot,
+      format: format,
+      editorState: DocumentEditorState(mode: mode),
+    );
+  }
+
+  factory DocumentBuffer.untitled({
+    required String id,
+    required String name,
+    String text = '',
+    DocumentViewModePreference mode = DocumentViewModePreference.editor,
+  }) {
+    return DocumentBuffer(
+      id: id,
+      untitledName: name,
+      text: text,
+      lastSavedText: '',
+      dirty: true,
+      editorState: DocumentEditorState(mode: mode),
+    );
+  }
+
+  final String id;
+  final String? filePath;
+  final String? untitledName;
+  final String text;
+  final String lastSavedText;
+  final bool dirty;
+  final WorkspaceFileSnapshot? diskSnapshot;
+  final TextFormatMetadata format;
+  final DocumentEditorState editorState;
+  final int revision;
+  final DocumentDiskState diskState;
+  final String? diskVersionText;
+  final WorkspaceFileSnapshot? diskVersionSnapshot;
+  final bool recovered;
+
+  bool get isUntitled => filePath == null;
+  bool get isDirty => dirty;
+  bool get hasConflict => diskState == DocumentDiskState.conflict;
+  bool get deletedOnDisk => diskState == DocumentDiskState.deleted;
+  String get identity => filePath ?? id;
+  String get displayName => untitledName ?? filePath?.split('/').last ?? id;
+
+  DocumentBuffer edited(String nextText) {
+    if (nextText == text) {
+      return this;
+    }
+    return copyWith(
+      text: nextText,
+      dirty: nextText != lastSavedText || isUntitled,
+      format: format.copyWith(hasFinalNewline: nextText.endsWith('\n')),
+      revision: revision + 1,
+      editorState: editorState.copyWith(
+        undoState: editorState.undoState.push(text),
+      ),
+    );
+  }
+
+  DocumentBuffer copyWith({
+    Object? filePath = _bufferUnset,
+    Object? untitledName = _bufferUnset,
+    String? text,
+    String? lastSavedText,
+    bool? dirty,
+    Object? diskSnapshot = _bufferUnset,
+    TextFormatMetadata? format,
+    DocumentEditorState? editorState,
+    int? revision,
+    DocumentDiskState? diskState,
+    Object? diskVersionText = _bufferUnset,
+    Object? diskVersionSnapshot = _bufferUnset,
+    bool? recovered,
+  }) {
+    return DocumentBuffer(
+      id: id,
+      filePath: identical(filePath, _bufferUnset)
+          ? this.filePath
+          : filePath as String?,
+      untitledName: identical(untitledName, _bufferUnset)
+          ? this.untitledName
+          : untitledName as String?,
+      text: text ?? this.text,
+      lastSavedText: lastSavedText ?? this.lastSavedText,
+      dirty: dirty ?? this.dirty,
+      diskSnapshot: identical(diskSnapshot, _bufferUnset)
+          ? this.diskSnapshot
+          : diskSnapshot as WorkspaceFileSnapshot?,
+      format: format ?? this.format,
+      editorState: editorState ?? this.editorState,
+      revision: revision ?? this.revision,
+      diskState: diskState ?? this.diskState,
+      diskVersionText: identical(diskVersionText, _bufferUnset)
+          ? this.diskVersionText
+          : diskVersionText as String?,
+      diskVersionSnapshot: identical(diskVersionSnapshot, _bufferUnset)
+          ? this.diskVersionSnapshot
+          : diskVersionSnapshot as WorkspaceFileSnapshot?,
+      recovered: recovered ?? this.recovered,
+    );
+  }
+}
diff --git a/lib/src/workspace/presentation/document_format_indicator.dart b/lib/src/workspace/presentation/document_format_indicator.dart
new file mode 100644
index 00000000..a05d8190
--- /dev/null
+++ b/lib/src/workspace/presentation/document_format_indicator.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+
+import '../../app/busymark_design.dart';
+import '../../app/localization.dart';
+import '../text_format_metadata.dart';
+
+/// Compact active-document format status for the pane header.
+///
+/// Encoding and final-newline details stay available without recreating the
+/// old full-width footer. A BOM is included in the visible label because its
+/// presence is otherwise impossible to infer from the editor text.
+class BusyMarkDocumentFormatIndicator extends StatelessWidget {
+  const BusyMarkDocumentFormatIndicator({super.key, required this.format});
+
+  final TextFormatMetadata format;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    final lineEnding = switch (format.lineEnding) {
+      DocumentLineEnding.none || DocumentLineEnding.lf => 'LF',
+      DocumentLineEnding.crlf => 'CRLF',
+      DocumentLineEnding.mixed => 'LF/CRLF',
+    };
+    final encoding = format.hasUtf8Bom ? 'UTF-8 BOM' : 'UTF-8';
+    final label = format.hasUtf8Bom ? 'BOM · $lineEnding' : lineEnding;
+    final details = format.hasFinalNewline
+        ? context.l10n.documentFormatWithFinalNewline(encoding, lineEnding)
+        : context.l10n.documentFormatWithoutFinalNewline(encoding, lineEnding);
+
+    return Tooltip(
+      message: details,
+      child: Semantics(
+        label: details,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: BusyMarkSpacing.xs),
+          child: Text(
+            label,
+            maxLines: 1,
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: colors.mutedForeground,
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/workspace/presentation/settings_screen.dart b/lib/src/workspace/presentation/settings_screen.dart
index 1d2eb1dc..33542ae9 100644
--- a/lib/src/workspace/presentation/settings_screen.dart
+++ b/lib/src/workspace/presentation/settings_screen.dart
@@ -126,6 +126,13 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
         title: l10n.settingsWindowSectionTitle,
         filled: true,
         children: [
+          BusyMarkSwitchRow(
+            title: l10n.settingsReopenWorkspaceOnStartupTitle,
+            subtitle: l10n.settingsReopenWorkspaceOnStartupDescription,
+            value: settings.reopenPreviousWorkspaceOnStartup,
+            onChanged: controller.setReopenPreviousWorkspaceOnStartup,
+            leading: const Icon(BusyMarkGlyphs.history),
+          ),
           BusyMarkSwitchRow(
             title: l10n.settingsConfirmCloseWithUnsavedChangesTitle,
             subtitle: l10n.settingsConfirmCloseWithUnsavedChangesDescription,
@@ -341,6 +348,8 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
         _selectPage(SettingsPage.appearance);
       case BusyMarkMainMenuAction.keyboardShortcuts:
         showBusyMarkKeyboardShortcutsDialog(context);
+      case BusyMarkMainMenuAction.commandPalette:
+        return;
       case BusyMarkMainMenuAction.markdownAndHtml:
         showBusyMarkMarkdownHtmlDialog(context);
       case BusyMarkMainMenuAction.reportIssue:
@@ -971,7 +980,8 @@ class _AiSettingsPage extends ConsumerStatefulWidget {
 class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
   late final TextEditingController _endpointController;
   late final TextEditingController _apiKeyController;
-  List<AiModelInfo> _models = const [];
+  late AiProviderKind _configurationProvider;
+  final Map<AiProviderKind, List<AiModelInfo>> _modelsByProvider = {};
   String? _status;
   BusyMarkStatusKind _statusKind = BusyMarkStatusKind.information;
   var _testing = false;
@@ -980,11 +990,14 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
   @override
   void initState() {
     super.initState();
+    final settings = ref.read(appSettingsControllerProvider);
+    _configurationProvider =
+        settings.defaultAiProviderKind ?? AiProviderKind.ollamaLocal;
     _endpointController = TextEditingController(
-      text: ref.read(appSettingsControllerProvider).aiOllamaEndpoint,
+      text: settings.aiOllamaEndpoint,
     );
     _apiKeyController = TextEditingController();
-    unawaited(_loadCredentialState());
+    unawaited(_loadCredentialState(_configurationProvider));
   }
 
   @override
@@ -998,44 +1011,36 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
   Widget build(BuildContext context) {
     final settings = ref.watch(appSettingsControllerProvider);
     final controller = ref.read(appSettingsControllerProvider.notifier);
-    final providerKind = settings.aiProviderKind;
-    final enabled = providerKind != null;
+    final enabled = settings.defaultAiProviderKind != null;
+    final providerKind = _configurationProvider;
     final local = providerKind == AiProviderKind.ollamaLocal;
-    final cloud = providerKind?.isCloud ?? false;
-    final provider = providerKind == null
-        ? null
-        : ref.watch(aiProviderRegistryProvider).require(providerKind);
-    final selectedModel = providerKind == null
-        ? ''
-        : settings.selectedAiModel(providerKind);
+    final cloud = providerKind.isCloud;
+    final provider = ref
+        .watch(aiProviderRegistryProvider)
+        .require(providerKind);
+    final selectedModel = settings.selectedAiModel(providerKind);
     final modelNames = <String>{
       if (selectedModel.isNotEmpty) selectedModel,
-      if (provider != null)
-        for (final values in provider.capabilities.recommendedModels.values)
-          ...values,
-      for (final model in _models) model.name,
+      for (final values in provider.capabilities.recommendedModels.values)
+        ...values,
+      for (final model
+          in _modelsByProvider[providerKind] ?? const <AiModelInfo>[])
+        model.name,
     }.toList(growable: false);
     final usage = ref.watch(aiMonthlyUsageProvider).value;
     return BusyMarkGroupedList(
       title: context.l10n.ai,
       filled: true,
       children: [
-        Padding(
-          padding: const EdgeInsets.all(BusyMarkSpacing.md),
-          child: BusyMarkStatusBox(
-            message: _privacyDescription(providerKind),
-            kind: BusyMarkStatusKind.information,
-          ),
-        ),
         BusyMarkActionRow(
-          title: context.l10n.aiProvider,
+          title: context.l10n.aiDefaultProvider,
           leading: const Icon(BusyMarkGlyphs.ai),
           trailing: SizedBox(
             width: BusyMarkSizes.controlRowWidth,
             child: BusyMarkPopupSelector<AiProviderPreference>(
               value: settings.aiProviderPreference,
               label: _providerLabel(settings.aiProviderPreference),
-              tooltip: context.l10n.aiProvider,
+              tooltip: context.l10n.aiDefaultProvider,
               options: [
                 BusyMarkPopupSelectorOption(
                   value: AiProviderPreference.disabled,
@@ -1055,7 +1060,29 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
                 ),
               ],
               onSelected: (preference) =>
-                  unawaited(_selectProvider(preference)),
+                  unawaited(_selectDefaultProvider(preference)),
+            ),
+          ),
+        ),
+        BusyMarkActionRow(
+          title: context.l10n.aiConfigureProvider,
+          leading: const Icon(BusyMarkGlyphs.settings),
+          trailing: SizedBox(
+            width: BusyMarkSizes.controlRowWidth,
+            child: BusyMarkPopupSelector<AiProviderKind>(
+              value: providerKind,
+              label: _providerKindLabel(providerKind),
+              tooltip: context.l10n.aiConfigureProvider,
+              options: [
+                for (final kind in AiProviderKind.values)
+                  BusyMarkPopupSelectorOption(
+                    value: kind,
+                    label: _providerKindLabel(kind),
+                  ),
+              ],
+              onSelected: !_testing
+                  ? (kind) => unawaited(_selectConfigurationProvider(kind))
+                  : (_) {},
             ),
           ),
         ),
@@ -1070,7 +1097,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
           ),
         if (cloud) ...[
           BusyMarkGroupedTextEntry(
-            key: ValueKey('ai-api-key-${providerKind!.id}'),
+            key: ValueKey('ai-api-key-${providerKind.id}'),
             label: context.l10n.aiApiKey,
             hintText: _credentialConfigured
                 ? context.l10n.aiApiKeyStoredHint
@@ -1157,9 +1184,8 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
                       for (final model in modelNames)
                         BusyMarkPopupSelectorOption(value: model, label: model),
                     ],
-                    onSelected: enabled
-                        ? (model) => _saveSelectedModel(providerKind, model)
-                        : (_) {},
+                    onSelected: (model) =>
+                        _saveSelectedModel(providerKind, model),
                   ),
           ),
         ),
@@ -1173,7 +1199,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
                   child: CircularProgressIndicator(strokeWidth: 2),
                 )
               : const Icon(BusyMarkGlyphs.refresh),
-          onTap: enabled && !_testing && (!cloud || _credentialConfigured)
+          onTap: !_testing && (!cloud || _credentialConfigured)
               ? _testConnection
               : null,
         ),
@@ -1209,12 +1235,13 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
     );
     try {
       var settings = ref.read(appSettingsControllerProvider);
-      final providerKind = settings.aiProviderKind;
-      if (providerKind == null) {
-        throw AiException(
-          AiFailureCode.invalidConfiguration,
-          l10n.aiEnableProvider,
-        );
+      final providerKind = _configurationProvider;
+      if (providerKind.isCloud && !settings.hasCloudConsent(providerKind)) {
+        final confirmed = await _confirmCloudConsent(providerKind);
+        if (!confirmed) {
+          return;
+        }
+        settings = ref.read(appSettingsControllerProvider);
       }
       if (providerKind == AiProviderKind.ollamaLocal) {
         final endpoint = AiPolicy.validateLocalOllamaEndpoint(
@@ -1268,7 +1295,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
         return;
       }
       setState(() {
-        _models = health!.models;
+        _modelsByProvider[providerKind] = health!.models;
         final verified = l10n.aiGenerationVerified(
           health.model.displayName ?? health.model.name,
           health.models.length,
@@ -1301,7 +1328,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
     }
   }
 
-  Future<void> _selectProvider(AiProviderPreference preference) async {
+  Future<void> _selectDefaultProvider(AiProviderPreference preference) async {
     final kind = switch (preference) {
       AiProviderPreference.disabled => null,
       AiProviderPreference.ollamaLocal => AiProviderKind.ollamaLocal,
@@ -1310,30 +1337,9 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
     };
     final settings = ref.read(appSettingsControllerProvider);
     if (kind?.isCloud == true && !settings.hasCloudConsent(kind!)) {
-      final confirmed = await showBusyMarkModalDialog<bool>(
-        context,
-        builder: (dialogContext) => BusyMarkDialogShell(
-          title: dialogContext.l10n.aiCloudConsentTitle(kind.displayName),
-          actions: [
-            BusyMarkDialogButton(
-              label: dialogContext.l10n.cancel,
-              onPressed: () => Navigator.pop(dialogContext, false),
-            ),
-            BusyMarkDialogButton(
-              label: dialogContext.l10n.aiCloudConsentEnable(kind.displayName),
-              suggested: true,
-              onPressed: () => Navigator.pop(dialogContext, true),
-            ),
-          ],
-          children: [Text(dialogContext.l10n.aiCloudConsentMessage)],
-        ),
-      );
-      if (confirmed != true || !mounted) {
+      if (!await _confirmCloudConsent(kind) || !mounted) {
         return;
       }
-      await ref
-          .read(appSettingsControllerProvider.notifier)
-          .grantAiCloudProviderConsent(kind.id);
     }
     await ref
         .read(appSettingsControllerProvider.notifier)
@@ -1341,31 +1347,35 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
     if (!mounted) {
       return;
     }
+  }
+
+  Future<void> _selectConfigurationProvider(AiProviderKind provider) async {
+    if (provider == _configurationProvider) {
+      return;
+    }
     _apiKeyController.clear();
     setState(() {
-      _models = const [];
+      _configurationProvider = provider;
       _status = null;
       _credentialConfigured = false;
     });
-    await _loadCredentialState();
+    await _loadCredentialState(provider);
   }
 
-  Future<void> _loadCredentialState() async {
-    final kind = ref.read(appSettingsControllerProvider).aiProviderKind;
-    if (kind?.isCloud != true) {
-      if (mounted) {
+  Future<void> _loadCredentialState(AiProviderKind kind) async {
+    if (!kind.isCloud) {
+      if (mounted && _configurationProvider == kind) {
         setState(() => _credentialConfigured = false);
       }
       return;
     }
     try {
-      final stored = await ref.read(aiSecretStoreProvider).read(kind!);
-      if (mounted &&
-          ref.read(appSettingsControllerProvider).aiProviderKind == kind) {
+      final stored = await ref.read(aiSecretStoreProvider).read(kind);
+      if (mounted && _configurationProvider == kind) {
         setState(() => _credentialConfigured = stored != null);
       }
     } on AiException catch (error) {
-      if (mounted) {
+      if (mounted && _configurationProvider == kind) {
         setState(() {
           _status = error.message;
           _statusKind = BusyMarkStatusKind.error;
@@ -1379,7 +1389,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
       await ref
           .read(aiSecretStoreProvider)
           .write(provider, _apiKeyController.text);
-      if (mounted) {
+      if (mounted && _configurationProvider == provider) {
         _apiKeyController.clear();
         setState(() {
           _credentialConfigured = true;
@@ -1388,7 +1398,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
         });
       }
     } on AiException catch (error) {
-      if (mounted) {
+      if (mounted && _configurationProvider == provider) {
         setState(() {
           _status = error.message;
           _statusKind = BusyMarkStatusKind.error;
@@ -1400,7 +1410,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
   Future<void> _removeApiKey(AiProviderKind provider) async {
     try {
       await ref.read(aiSecretStoreProvider).delete(provider);
-      if (mounted) {
+      if (mounted && _configurationProvider == provider) {
         _apiKeyController.clear();
         setState(() {
           _credentialConfigured = false;
@@ -1409,7 +1419,7 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
         });
       }
     } on AiException catch (error) {
-      if (mounted) {
+      if (mounted && _configurationProvider == provider) {
         setState(() {
           _status = error.message;
           _statusKind = BusyMarkStatusKind.error;
@@ -1435,13 +1445,42 @@ class _AiSettingsPageState extends ConsumerState<_AiSettingsPage> {
         AiProviderPreference.gemini => 'Google Gemini',
       };
 
-  String _privacyDescription(AiProviderKind? provider) => switch (provider) {
-    null => context.l10n.aiPrivacyDisabled,
-    AiProviderKind.ollamaLocal => context.l10n.aiPrivacyLocal,
-    AiProviderKind.openAi ||
-    AiProviderKind.gemini => context.l10n.aiPrivacyCloud(provider.displayName),
+  String _providerKindLabel(AiProviderKind provider) => switch (provider) {
+    AiProviderKind.ollamaLocal => context.l10n.aiLocalOllama,
+    AiProviderKind.openAi => 'OpenAI',
+    AiProviderKind.gemini => 'Google Gemini',
   };
 
+  Future<bool> _confirmCloudConsent(AiProviderKind provider) async {
+    final confirmed = await showBusyMarkModalDialog<bool>(
+      context,
+      builder: (dialogContext) => BusyMarkDialogShell(
+        title: dialogContext.l10n.aiCloudConsentTitle(provider.displayName),
+        actions: [
+          BusyMarkDialogButton(
+            label: dialogContext.l10n.cancel,
+            onPressed: () => Navigator.pop(dialogContext, false),
+          ),
+          BusyMarkDialogButton(
+            label: dialogContext.l10n.aiCloudConsentEnable(
+              provider.displayName,
+            ),
+            suggested: true,
+            onPressed: () => Navigator.pop(dialogContext, true),
+          ),
+        ],
+        children: [Text(dialogContext.l10n.aiCloudConsentMessage)],
+      ),
+    );
+    if (confirmed != true || !mounted) {
+      return false;
+    }
+    await ref
+        .read(appSettingsControllerProvider.notifier)
+        .grantAiCloudProviderConsent(provider.id);
+    return mounted;
+  }
+
   Future<void> _saveEndpoint(String value) async {
     try {
       final endpoint = AiPolicy.validateLocalOllamaEndpoint(value);
diff --git a/lib/src/workspace/presentation/welcome_screen.dart b/lib/src/workspace/presentation/welcome_screen.dart
index a5874987..a4a07fe3 100644
--- a/lib/src/workspace/presentation/welcome_screen.dart
+++ b/lib/src/workspace/presentation/welcome_screen.dart
@@ -42,8 +42,6 @@ class _WelcomeScreenState extends ConsumerState<WelcomeScreen> {
     extensions: <String>['md', 'markdown'],
     mimeTypes: <String>['text/markdown', 'text/x-markdown'],
   );
-  var _startupPathConsumed = false;
-
   @override
   Widget build(BuildContext context) {
     final state = ref.watch(workspaceControllerProvider);
@@ -58,13 +56,33 @@ class _WelcomeScreenState extends ConsumerState<WelcomeScreen> {
       });
     });
     final startupPath = ref.watch(startupPathProvider);
-    if (!_startupPathConsumed &&
-        startupPath != null &&
-        startupPath.isNotEmpty) {
-      _startupPathConsumed = true;
+    final startupNavigation = ref.read(startupNavigationGuardProvider);
+    if (startupNavigation.claimStartupPath(startupPath)) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (mounted) {
-          unawaited(_openPath(startupPath));
+          unawaited(_openPath(startupPath!));
+        }
+      });
+    } else if (startupNavigation.claimSessionRestore(startupPath)) {
+      WidgetsBinding.instance.addPostFrameCallback((_) async {
+        if (!mounted) {
+          return;
+        }
+        final settingsController = ref.read(
+          appSettingsControllerProvider.notifier,
+        );
+        await settingsController.waitUntilLoaded();
+        if (!mounted) {
+          return;
+        }
+        final reopenCleanSession = ref
+            .read(appSettingsControllerProvider)
+            .reopenPreviousWorkspaceOnStartup;
+        final restored = await ref
+            .read(workspaceControllerProvider.notifier)
+            .restoreStartupSession(reopenCleanSession: reopenCleanSession);
+        if (restored && mounted) {
+          this.context.go('/workspace');
         }
       });
     }
@@ -272,6 +290,8 @@ class _WelcomeScreenState extends ConsumerState<WelcomeScreen> {
         context.go(settingsLocation(SettingsReturnTarget.welcome));
       case BusyMarkMainMenuAction.keyboardShortcuts:
         showBusyMarkKeyboardShortcutsDialog(context);
+      case BusyMarkMainMenuAction.commandPalette:
+        return;
       case BusyMarkMainMenuAction.markdownAndHtml:
         showBusyMarkMarkdownHtmlDialog(context);
       case BusyMarkMainMenuAction.reportIssue:
@@ -865,8 +885,9 @@ BusyMarkStatusKind busyMarkWorkspaceMessageStatusKind(
   return switch (code) {
     WorkspaceMessageCode.chooseWhereToSaveMarkdown =>
       BusyMarkStatusKind.information,
-    WorkspaceMessageCode.saveBlockedFileChangedOnDisk =>
-      BusyMarkStatusKind.warning,
+    WorkspaceMessageCode.recoveryRestored => BusyMarkStatusKind.information,
+    WorkspaceMessageCode.saveBlockedFileChangedOnDisk ||
+    WorkspaceMessageCode.recoveryDamaged => BusyMarkStatusKind.warning,
     WorkspaceMessageCode.openFailed ||
     WorkspaceMessageCode.createWritersideProjectFailed ||
     WorkspaceMessageCode.createWritersideTopicFailed ||
diff --git a/lib/src/workspace/presentation/workspace_screen.dart b/lib/src/workspace/presentation/workspace_screen.dart
index 90cc81e3..2c6839ee 100644
--- a/lib/src/workspace/presentation/workspace_screen.dart
+++ b/lib/src/workspace/presentation/workspace_screen.dart
@@ -13,6 +13,8 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../ai/ai_edit_ui.dart';
+import '../../ai/ai_models.dart';
+import '../../assets/asset_ingestion_service.dart';
 import '../../app/app_settings.dart';
 import '../../app/app_router.dart';
 import '../../app/busymark_dialogs.dart';
@@ -20,16 +22,19 @@ import '../../app/busymark_design.dart';
 import '../../app/busymark_glyphs.dart';
 import '../../app/busymark_main_menu.dart';
 import '../../app/busymark_search_field.dart';
-import '../../app/busymark_shortcuts.dart';
+import '../../app/busymark_toast.dart';
+import '../../app/command_registry.dart';
 import '../../app/localization.dart';
 import '../../app/window_control_service.dart';
 import '../../core/diagnostic.dart';
 import '../../core/diagnostic_localizations.dart';
 import '../../core/path_utils.dart'
     show isTextDocumentationPath, slugForHeading;
+import '../../core/source_span.dart';
 import '../../core/uri_utils.dart';
 import '../../editor/document_callout.dart';
 import '../../editor/document_code_block.dart';
+import '../../editor/document_collapsible.dart';
 import '../../editor/document_layout.dart';
 import '../../editor/document_list_marker.dart';
 import '../../editor/document_surface.dart';
@@ -42,6 +47,8 @@ import '../../editor/source/source_document.dart';
 import '../../editor/source/source_editor.dart';
 import '../../editor/source/source_search.dart';
 import '../../editor/wysiwyg/wysiwyg_editor.dart';
+import '../../editor/wysiwyg/wysiwyg_session_state.dart';
+import '../../editor/writerside_video_view.dart';
 import '../../feedback/presentation/feedback_dialog.dart';
 import '../../export/markdown_pdf_export_ui.dart';
 import '../../git/application/git_controller.dart';
@@ -56,13 +63,20 @@ import '../../markdown/markdown_parser.dart';
 import '../../markdown/markdown_section_editor.dart';
 import '../../markdown/markdown_toc_generator.dart';
 import '../../markdown/preview_model.dart';
+import '../../math/math_widget.dart';
 import '../../platform/linux_header_bar_service.dart';
+import '../../search/search_replace_service.dart';
 import '../../visualization/visualization_card.dart';
 import '../../visualization/visualization_models.dart';
 import '../../writerside/writerside_model.dart';
+import '../../writerside/writerside_toc_editor.dart';
 import '../../writerside/writerside_topic_creator.dart';
 import '../../writerside/writerside_topic_removal_service.dart';
+import '../../writerside/writerside_video.dart';
 import '../workspace_controller.dart';
+import '../document_buffer.dart';
+import 'document_format_indicator.dart';
+import '../text_format_metadata.dart';
 import '../workspace_glyphs.dart';
 import '../workspace_model.dart';
 import '../workspace_message.dart';
@@ -144,6 +158,14 @@ class _WorkspaceSearchController extends Notifier<_WorkspaceSearchState> {
   _WorkspaceSearchState build() {
     _loadText = ref.read(workspaceServiceProvider).loadText;
     ref.listen<WorkspaceState>(workspaceControllerProvider, (previous, next) {
+      if (previous?.activeBufferId != next.activeBufferId) {
+        final options = next.activeBuffer?.editorState.searchOptions;
+        if (options != null) {
+          state = state
+              .withOptions(options)
+              .copyWith(matches: const [], searching: false);
+        }
+      }
       refresh(next);
     });
     ref.onDispose(() {
@@ -165,6 +187,18 @@ class _WorkspaceSearchController extends Notifier<_WorkspaceSearchState> {
       matches: inputChanged ? const [] : state.matches,
       searching: false,
     );
+    final buffer = ref.read(workspaceControllerProvider).activeBuffer;
+    if (buffer != null &&
+        !_sameSourceSearchOptions(
+          buffer.editorState.searchOptions,
+          state.options,
+        )) {
+      ref
+          .read(workspaceControllerProvider.notifier)
+          .updateActiveEditorState(
+            buffer.editorState.copyWith(searchOptions: state.options),
+          );
+    }
     _schedule(ref.read(workspaceControllerProvider));
   }
 
@@ -373,6 +407,16 @@ class _WorkspaceSearchState {
   }
 }
 
+bool _sameSourceSearchOptions(
+  SourceSearchOptions first,
+  SourceSearchOptions second,
+) {
+  return first.query == second.query &&
+      first.caseSensitive == second.caseSensitive &&
+      first.wholeWord == second.wholeWord &&
+      first.regex == second.regex;
+}
+
 class _SearchNavigationTarget {
   const _SearchNavigationTarget({
     required this.filePath,
@@ -417,6 +461,8 @@ class WorkspaceScreen extends ConsumerWidget {
       return const WelcomeScreen();
     }
     final searchState = ref.watch(_workspaceSearchProvider);
+    final documentViewMode =
+        state.activeBuffer?.editorState.mode ?? settings.documentViewMode;
     final gitState = ref.watch(gitControllerProvider);
     final searchResults = _workspaceSearchResults(context, searchState.matches);
 
@@ -440,14 +486,14 @@ class WorkspaceScreen extends ConsumerWidget {
     final workspaceContent = Expanded(
       child: Column(
         children: [
-          if (_shouldShowEditorTabs(workspace, gitState))
+          if (_shouldShowEditorTabs(state, gitState))
             _EditorTabStrip(state: state, gitState: gitState),
           Expanded(
             child: gitState.selectedDiffForDisplay == null
                 ? _EditorPreviewSplit(
                     state: state,
                     outline: documentOutline,
-                    viewMode: settings.documentViewMode,
+                    viewMode: documentViewMode,
                     editorFontSize: settings.editorFontSize,
                     editorToolbarPlacement: settings.editorToolbarPlacement,
                     editorToolbarDirection: settings.editorToolbarDirection,
@@ -468,7 +514,7 @@ class WorkspaceScreen extends ConsumerWidget {
                         : null,
                     openFilePath: gitState.selectedDiffOpenFilePath,
                     workspace: workspace,
-                    viewMode: settings.documentViewMode,
+                    viewMode: documentViewMode,
                     hasUnsavedEditorChanges: state.isDirty,
                     editorFontSize: settings.editorFontSize,
                     onOpenFile: (relativePath) =>
@@ -557,6 +603,9 @@ class WorkspaceScreen extends ConsumerWidget {
           sidebarToggleVisible: hasSidebar,
           backVisible: true,
         );
+    final commandRegistry =
+        BusyMarkCommandRegistryScope.maybeOf(context) ??
+        BusyMarkCommandCatalog.metadata;
 
     return HeaderBarConfigurationPublisher(
       synchronizer: headerBar.configurationSynchronizer,
@@ -564,23 +613,25 @@ class WorkspaceScreen extends ConsumerWidget {
       enabled: headerBar.isAvailable,
       child: Shortcuts(
         shortcuts: {
-          BusyMarkAppShortcutActivators.search: const _OpenSearchIntent(),
-          BusyMarkSidebarShortcutActivators.files:
+          commandRegistry[BusyMarkCommandIds.search]!.shortcut!.activator:
+              const _OpenSearchIntent(),
+          commandRegistry[BusyMarkCommandIds.sidebarFiles]!.shortcut!.activator:
               const _SelectSidebarTabIntent(_SidebarTab.files),
           const SingleActivator(LogicalKeyboardKey.numpad1, control: true):
               const _SelectSidebarTabIntent(_SidebarTab.files),
-          BusyMarkSidebarShortcutActivators.toc: const _SelectSidebarTabIntent(
-            _SidebarTab.toc,
-          ),
+          commandRegistry[BusyMarkCommandIds.sidebarToc]!.shortcut!.activator:
+              const _SelectSidebarTabIntent(_SidebarTab.toc),
           const SingleActivator(LogicalKeyboardKey.numpad2, control: true):
               const _SelectSidebarTabIntent(_SidebarTab.toc),
-          BusyMarkSidebarShortcutActivators.outline:
-              const _SelectSidebarTabIntent(_SidebarTab.outline),
+          commandRegistry[BusyMarkCommandIds.sidebarOutline]!
+              .shortcut!
+              .activator: const _SelectSidebarTabIntent(
+            _SidebarTab.outline,
+          ),
           const SingleActivator(LogicalKeyboardKey.numpad3, control: true):
               const _SelectSidebarTabIntent(_SidebarTab.outline),
-          BusyMarkSidebarShortcutActivators.git: const _SelectSidebarTabIntent(
-            _SidebarTab.git,
-          ),
+          commandRegistry[BusyMarkCommandIds.sidebarGit]!.shortcut!.activator:
+              const _SelectSidebarTabIntent(_SidebarTab.git),
           const SingleActivator(LogicalKeyboardKey.numpad4, control: true):
               const _SelectSidebarTabIntent(_SidebarTab.git),
         },
@@ -616,7 +667,9 @@ class WorkspaceScreen extends ConsumerWidget {
                         child: BusyMarkHeaderIconButton(
                           tooltip: context.l10n.welcome,
                           icon: BusyMarkGlyphs.home,
-                          shortcut: BusyMarkAppShortcutLabels.back,
+                          shortcut: commandRegistry[BusyMarkCommandIds.back]
+                              ?.shortcut
+                              ?.label,
                           onPressed: () async {
                             final router = GoRouter.of(context);
                             if (await confirmSafeToContinue(context, ref)) {
@@ -658,7 +711,10 @@ class WorkspaceScreen extends ConsumerWidget {
                               : context.l10n.showSidebar,
                           icon: BusyMarkGlyphs.sidebar,
                           selected: settings.sidebarVisible,
-                          shortcut: BusyMarkSidebarShortcutLabels.toggleSidebar,
+                          shortcut:
+                              commandRegistry[BusyMarkCommandIds.toggleSidebar]
+                                  ?.shortcut
+                                  ?.label,
                           onPressed: () {
                             final visible = !settings.sidebarVisible;
                             if (!visible) {
@@ -673,18 +729,19 @@ class WorkspaceScreen extends ConsumerWidget {
                           tooltip: context.l10n.search,
                           icon: BusyMarkGlyphs.search,
                           selected: searchState.active,
-                          shortcut: BusyMarkAppShortcutLabels.search,
+                          shortcut: commandRegistry[BusyMarkCommandIds.search]
+                              ?.shortcut
+                              ?.label,
                           onPressed: () => _toggleSearch(ref),
                         ),
                         BusyMarkHeaderPopupMenuButton<
                           DocumentViewModePreference
                         >(
                           tooltip: context.l10n.viewMode,
-                          icon: _documentViewModeIcon(
-                            settings.documentViewMode,
-                          ),
+                          icon: _documentViewModeIcon(documentViewMode),
                           shortcut: _documentViewModeShortcut(
-                            settings.documentViewMode,
+                            documentViewMode,
+                            commandRegistry,
                           ),
                           itemBuilder: (context) => [
                             for (final mode
@@ -693,13 +750,22 @@ class WorkspaceScreen extends ConsumerWidget {
                                 value: mode,
                                 label: _documentViewModeLabel(context, mode),
                                 icon: _documentViewModeIcon(mode),
-                                shortcut: _documentViewModeShortcut(mode),
-                                checked: mode == settings.documentViewMode,
+                                shortcut: _documentViewModeShortcut(
+                                  mode,
+                                  commandRegistry,
+                                ),
+                                checked: mode == documentViewMode,
                                 trailingCheck: true,
                               ),
                           ],
-                          onSelected: (mode) =>
+                          onSelected: (mode) {
+                            ref
+                                .read(workspaceControllerProvider.notifier)
+                                .updateActiveEditorMode(mode);
+                            unawaited(
                               settingsController.setDocumentViewMode(mode),
+                            );
+                          },
                         ),
                         BusyMarkMainMenuButton(
                           canExportPdf: canExportPdf,
@@ -820,35 +886,29 @@ class WorkspaceScreen extends ConsumerWidget {
     WidgetRef ref,
     HeaderBarAction action,
   ) {
-    final settings = ref.read(appSettingsControllerProvider);
-    final settingsController = ref.read(appSettingsControllerProvider.notifier);
+    final commands =
+        BusyMarkCommandRegistryScope.read(context) ??
+        BusyMarkCommandCatalog.metadata;
+    void execute(String id) => unawaited(commands.execute(id));
     switch (action) {
       case HeaderBarAction.back:
-        unawaited(() async {
-          if (await confirmSafeToContinue(context, ref) && context.mounted) {
-            context.go('/');
-          }
-        }());
+        execute(BusyMarkCommandIds.back);
       case HeaderBarAction.sidebarToggle:
-        final visible = !settings.sidebarVisible;
-        if (!visible) {
-          _clearGitDetailSelection(ref);
-        }
-        unawaited(settingsController.setSidebarVisible(visible));
+        execute(BusyMarkCommandIds.toggleSidebar);
       case HeaderBarAction.refresh:
         unawaited(_validateActiveAndShowProblems(context, ref));
       case HeaderBarAction.save:
-        break;
+        execute(BusyMarkCommandIds.save);
       case HeaderBarAction.exportPdf:
-        unawaited(exportWorkspaceToPdf(context, ref));
+        execute(BusyMarkCommandIds.exportPdf);
       case HeaderBarAction.fullScreen:
-        break;
+        execute(BusyMarkCommandIds.fullScreen);
       case HeaderBarAction.settings:
-        context.go(settingsLocation(SettingsReturnTarget.workspace));
+        execute(BusyMarkCommandIds.settings);
       case HeaderBarAction.keyboardShortcuts:
-        showBusyMarkKeyboardShortcutsDialog(context);
+        execute(BusyMarkCommandIds.keyboardShortcuts);
       case HeaderBarAction.markdownAndHtml:
-        showBusyMarkMarkdownHtmlDialog(context);
+        execute(BusyMarkCommandIds.markdownAndHtml);
       case HeaderBarAction.reportIssue:
         final headerBar = ref.read(linuxHeaderBarServiceProvider);
         showBusyMarkFeedbackDialog(
@@ -858,29 +918,13 @@ class WorkspaceScreen extends ConsumerWidget {
       case HeaderBarAction.aboutBusyMark:
         showBusyMarkAboutDialog(context);
       case HeaderBarAction.viewModeEditor:
-        unawaited(
-          settingsController.setDocumentViewMode(
-            DocumentViewModePreference.editor,
-          ),
-        );
+        execute(BusyMarkCommandIds.viewEditor);
       case HeaderBarAction.viewModeSource:
-        unawaited(
-          settingsController.setDocumentViewMode(
-            DocumentViewModePreference.source,
-          ),
-        );
+        execute(BusyMarkCommandIds.viewSource);
       case HeaderBarAction.viewModePreview:
-        unawaited(
-          settingsController.setDocumentViewMode(
-            DocumentViewModePreference.preview,
-          ),
-        );
+        execute(BusyMarkCommandIds.viewReading);
       case HeaderBarAction.viewModeSplit:
-        unawaited(
-          settingsController.setDocumentViewMode(
-            DocumentViewModePreference.split,
-          ),
-        );
+        execute(BusyMarkCommandIds.viewSplit);
       case HeaderBarAction.sidebarFiles:
         _selectSidebarShortcut(ref, _SidebarTab.files);
       case HeaderBarAction.sidebarToc:
@@ -890,7 +934,7 @@ class WorkspaceScreen extends ConsumerWidget {
       case HeaderBarAction.sidebarGit:
         _selectSidebarShortcut(ref, _SidebarTab.git);
       case HeaderBarAction.search:
-        _toggleSearch(ref);
+        execute(BusyMarkCommandIds.search);
       case HeaderBarAction.menu:
         break;
     }
@@ -912,6 +956,8 @@ class WorkspaceScreen extends ConsumerWidget {
         context.go(settingsLocation(SettingsReturnTarget.workspace));
       case BusyMarkMainMenuAction.keyboardShortcuts:
         showBusyMarkKeyboardShortcutsDialog(context);
+      case BusyMarkMainMenuAction.commandPalette:
+        return;
       case BusyMarkMainMenuAction.markdownAndHtml:
         showBusyMarkMarkdownHtmlDialog(context);
       case BusyMarkMainMenuAction.reportIssue:
@@ -951,10 +997,9 @@ class WorkspaceScreen extends ConsumerWidget {
       ref
           .read(workspaceControllerProvider.notifier)
           .updateActiveText(result.source, sourceFilePath: filePath);
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(context.l10n.markdownTocUpdated(result.entryCount)),
-        ),
+      BusyMarkToastOverlay.show(
+        context,
+        message: context.l10n.markdownTocUpdated(result.entryCount),
       );
     } on MarkdownTocException catch (error) {
       final message = switch (error.failure) {
@@ -962,9 +1007,11 @@ class WorkspaceScreen extends ConsumerWidget {
           context.l10n.markdownTocMalformedMarkers,
         MarkdownTocFailure.noHeadings => context.l10n.markdownTocNoHeadings,
       };
-      ScaffoldMessenger.of(
+      BusyMarkToastOverlay.show(
         context,
-      ).showSnackBar(SnackBar(content: Text(message)));
+        message: message,
+        priority: BusyMarkToastPriority.high,
+      );
     }
   }
 
@@ -1022,17 +1069,17 @@ class WorkspaceScreen extends ConsumerWidget {
     };
   }
 
-  String _documentViewModeShortcut(DocumentViewModePreference mode) {
-    return switch (mode) {
-      DocumentViewModePreference.editor =>
-        BusyMarkDocumentViewShortcutLabels.editor,
-      DocumentViewModePreference.source =>
-        BusyMarkDocumentViewShortcutLabels.source,
-      DocumentViewModePreference.preview =>
-        BusyMarkDocumentViewShortcutLabels.reading,
-      DocumentViewModePreference.split =>
-        BusyMarkDocumentViewShortcutLabels.split,
+  String _documentViewModeShortcut(
+    DocumentViewModePreference mode,
+    BusyMarkCommandRegistry commands,
+  ) {
+    final id = switch (mode) {
+      DocumentViewModePreference.editor => BusyMarkCommandIds.viewEditor,
+      DocumentViewModePreference.source => BusyMarkCommandIds.viewSource,
+      DocumentViewModePreference.preview => BusyMarkCommandIds.viewReading,
+      DocumentViewModePreference.split => BusyMarkCommandIds.viewSplit,
     };
+    return commands[id]!.shortcut!.label;
   }
 
   Future<void> _openSearchResult(
@@ -1046,10 +1093,6 @@ class WorkspaceScreen extends ConsumerWidget {
     }
     final activePath = workspace.activeFilePath ?? workspace.markdown?.filePath;
     if (activePath != result.filePath) {
-      if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-          !context.mounted) {
-        return;
-      }
       await ref
           .read(workspaceControllerProvider.notifier)
           .openActiveFile(result.filePath);
@@ -1079,7 +1122,7 @@ class WorkspaceScreen extends ConsumerWidget {
       return;
     }
     final headerBar = ref.read(linuxHeaderBarServiceProvider);
-    final count = workspace.diagnostics.length;
+    final count = workspace.allDiagnostics.length;
     unawaited(
       showBusyMarkModalDialog<void>(
         context,
@@ -1129,8 +1172,10 @@ Future<void> _openGitDiffFile(
   }
   final absolutePath = p.normalize(p.join(repo.rootPath, repoRelativePath));
   if (!File(absolutePath).existsSync()) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text(context.l10n.errorPathDoesNotExist(absolutePath))),
+    BusyMarkToastOverlay.show(
+      context,
+      message: context.l10n.errorPathDoesNotExist(absolutePath),
+      priority: BusyMarkToastPriority.high,
     );
     await ref.read(gitControllerProvider.notifier).refresh();
     return;
@@ -1143,16 +1188,18 @@ Future<void> _openGitDiffFile(
       ? _isOpenableExternalTextPath(absolutePath)
       : _isOpenableTextDocument(workspaceFile);
   if (!openable) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text(context.l10n.cannotOpenFileTypeInEditor)),
+    BusyMarkToastOverlay.show(
+      context,
+      message: context.l10n.cannotOpenFileTypeInEditor,
+      priority: BusyMarkToastPriority.high,
     );
     return;
   }
-  if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-      !context.mounted) {
+  final fileInWorkspace = workspaceFile != null;
+  if (!fileInWorkspace &&
+      (!await confirmSafeToContinue(context, ref) || !context.mounted)) {
     return;
   }
-  final fileInWorkspace = workspaceFile != null;
   final controller = ref.read(workspaceControllerProvider.notifier);
   if (fileInWorkspace) {
     await controller.openActiveFile(absolutePath);
@@ -1459,8 +1506,11 @@ Future<void> _performWorkspacePathAction(
   required String name,
   required String path,
   required _PathMenuAction action,
+  VoidCallback? onRefineWithAi,
 }) async {
-  if (path.isEmpty && action != _PathMenuAction.copyName) {
+  if (path.isEmpty &&
+      action != _PathMenuAction.copyName &&
+      action != _PathMenuAction.refineWithAi) {
     return;
   }
   switch (action) {
@@ -1470,15 +1520,18 @@ Future<void> _performWorkspacePathAction(
       await _copyToClipboard(path);
     case _PathMenuAction.openInFiles:
       await _openInFiles(context, path);
+    case _PathMenuAction.refineWithAi:
+      onRefineWithAi?.call();
   }
 }
 
-enum _PathMenuAction { copyName, copyPath, openInFiles }
+enum _PathMenuAction { copyName, copyPath, openInFiles, refineWithAi }
 
 List<PopupMenuEntry<_PathMenuAction>> _sidebarPathMenuItems(
   BuildContext context, {
   String? copyNameLabel,
   bool pathActionsEnabled = true,
+  bool showRefineWithAi = false,
 }) {
   return [
     BusyMarkPopupMenuItem(
@@ -1499,6 +1552,13 @@ List<PopupMenuEntry<_PathMenuAction>> _sidebarPathMenuItems(
       icon: BusyMarkGlyphs.folderOpen,
       enabled: pathActionsEnabled,
     ),
+    if (showRefineWithAi) const PopupMenuDivider(height: BusyMarkSpacing.sm),
+    if (showRefineWithAi)
+      BusyMarkPopupMenuItem(
+        value: _PathMenuAction.refineWithAi,
+        label: context.l10n.aiRefineWithAi,
+        icon: BusyMarkGlyphs.ai,
+      ),
   ];
 }
 
@@ -1869,6 +1929,8 @@ class _SidebarState extends ConsumerState<_Sidebar> {
                 _loadWorkspaceGitMenuItems(menuContext, ref, repository),
             onGitAction: (menuContext, action) =>
                 _performWorkspaceGitAction(menuContext, ref, action),
+            onRefineActiveDocument: () =>
+                unawaited(_refineActiveDocumentWithAi(context)),
           ),
           Expanded(
             child: widget.searchState.active
@@ -1877,6 +1939,7 @@ class _SidebarState extends ConsumerState<_Sidebar> {
                     results: widget.searchResults,
                     searching: widget.searchState.searching,
                     onOpenResult: widget.onOpenSearchResult,
+                    onReviewReplacement: _reviewWorkspaceReplacement,
                   )
                 : _topicUsageReview != null
                 ? _WritersideTopicUsagesSidebar(
@@ -1951,12 +2014,22 @@ class _SidebarState extends ConsumerState<_Sidebar> {
     }
   }
 
+  Future<void> _refineActiveDocumentWithAi(BuildContext context) async {
+    final state = ref.read(workspaceControllerProvider);
+    final workspace = state.workspace;
+    if (workspace == null ||
+        !(_activeWorkspaceDocumentKind(workspace)?.supportsAiMarkdownEditing ??
+            false) ||
+        state.activeText.isEmpty) {
+      return;
+    }
+    await _refineActiveSourceRangesWithAi(context, ref, const [
+      _SourceTextRange.fullDocument(),
+    ]);
+  }
+
   Future<void> _showFileHistory(DocumentFile file) async {
     if (widget.workspace.activeFilePath != file.absolutePath) {
-      if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-          !mounted) {
-        return;
-      }
       final opened = await ref
           .read(workspaceControllerProvider.notifier)
           .openActiveFile(file.absolutePath);
@@ -2106,15 +2179,10 @@ class _SidebarState extends ConsumerState<_Sidebar> {
     BuildContext context,
     WritersideTopicUsage usage,
   ) async {
-    if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-        !mounted ||
-        !context.mounted) {
-      return;
-    }
     final opened = await ref
         .read(workspaceControllerProvider.notifier)
         .openActiveFile(usage.filePath);
-    if (!opened || !mounted) {
+    if (!opened || !mounted || !context.mounted) {
       return;
     }
     ref
@@ -2131,10 +2199,181 @@ class _SidebarState extends ConsumerState<_Sidebar> {
     }
     final message = ref.read(workspaceControllerProvider).message;
     if (message != null) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(localizeWorkspaceMessage(context, message))),
+      final status = busyMarkWorkspaceMessageStatusKind(message.code);
+      final highPriority =
+          status == BusyMarkStatusKind.warning ||
+          status == BusyMarkStatusKind.error;
+      BusyMarkToastOverlay.show(
+        context,
+        message: localizeWorkspaceMessage(context, message),
+        duration: highPriority
+            ? const Duration(seconds: 8)
+            : const Duration(seconds: 5),
+        priority: highPriority
+            ? BusyMarkToastPriority.high
+            : BusyMarkToastPriority.normal,
+      );
+    }
+  }
+
+  Future<void> _reviewWorkspaceReplacement() async {
+    var replacement = '';
+    final headerBar = ref.read(linuxHeaderBarServiceProvider);
+    final requested = await showBusyMarkModalEditorDialog<String>(
+      context,
+      headerBarService: headerBar.isAvailable ? headerBar : null,
+      maxWidth: BusyMarkSizes.dialogCompact,
+      builder: (dialogContext) => BusyMarkModalEditorScaffold(
+        title: context.l10n.workspaceReplace,
+        cancelLabel: context.l10n.cancel,
+        saveLabel: context.l10n.reviewReplacements,
+        onCancel: () => Navigator.pop(dialogContext),
+        onSave: () => Navigator.pop(dialogContext, replacement),
+        children: [
+          BusyMarkGroupedList(
+            filled: true,
+            children: [
+              BusyMarkGroupedTextEntry(
+                label: context.l10n.sourceSearchReplacement,
+                autofocus: true,
+                onChanged: (value) => replacement = value,
+                onSubmitted: (value) => Navigator.pop(dialogContext, value),
+              ),
+            ],
+          ),
+          const SizedBox(height: BusyMarkSpacing.lg),
+        ],
+      ),
+    );
+    if (requested == null || !mounted) {
+      return;
+    }
+    final service = const SearchReplacementService();
+    final preview = await service.previewWorkspace(
+      state: ref.read(workspaceControllerProvider),
+      workspaceService: ref.read(workspaceServiceProvider),
+      options: widget.searchState.options,
+      replacement: requested,
+    );
+    if (!mounted) {
+      return;
+    }
+    if (preview.files.isEmpty && preview.issues.isEmpty) {
+      BusyMarkToastOverlay.show(context, message: context.l10n.noResults);
+      return;
+    }
+    final selected = await showBusyMarkModalEditorDialog<Set<String>>(
+      context,
+      headerBarService: headerBar.isAvailable ? headerBar : null,
+      maxWidth: BusyMarkSizes.dialogWide,
+      maxHeight: 800,
+      builder: (dialogContext) =>
+          _WorkspaceReplacementReviewDialog(preview: preview),
+    );
+    if (selected == null || selected.isEmpty || !mounted) {
+      return;
+    }
+    final normalizations = <String, LineEndingNormalization>{};
+    final mixedFiles = preview.files.where(
+      (file) =>
+          file.bufferId == null &&
+          file.format.hasMixedLineEndings &&
+          file.matches.any((match) => selected.contains(match.id)),
+    );
+    for (final file in mixedFiles) {
+      final normalization = await _chooseReplacementLineEnding(
+        context,
+        file.relativePath,
+      );
+      if (normalization == null || !mounted) {
+        return;
+      }
+      normalizations[file.filePath] = normalization;
+    }
+    final controller = ref.read(workspaceControllerProvider.notifier);
+    final result = await service.applyWorkspace(
+      preview: preview,
+      selectedMatchIds: selected,
+      currentState: () => ref.read(workspaceControllerProvider),
+      updateBuffer: controller.updateDocumentText,
+      workspaceService: ref.read(workspaceServiceProvider),
+      mixedLineEndingNormalizations: normalizations,
+    );
+    await controller.refreshWorkspaceFromDiskPreservingOpenTabs();
+    await controller.validateActive();
+    await ref.read(gitControllerProvider.notifier).refresh();
+    ref
+        .read(_workspaceSearchProvider.notifier)
+        .refresh(ref.read(workspaceControllerProvider));
+    if (!mounted) {
+      return;
+    }
+    final summary = context.l10n.workspaceReplaceApplied(
+      result.appliedMatches,
+      result.appliedFiles,
+      result.issues.length,
+    );
+    if (result.issues.isNotEmpty) {
+      await showBusyMarkModalDialog<void>(
+        context,
+        headerBarService: headerBar.isAvailable ? headerBar : null,
+        builder: (dialogContext) => BusyMarkDialogShell(
+          title: context.l10n.workspaceReplace,
+          maxWidth: BusyMarkSizes.dialogWide,
+          actions: [
+            BusyMarkDialogButton(
+              label: context.l10n.close,
+              onPressed: () => Navigator.pop(dialogContext),
+            ),
+          ],
+          children: [
+            Text(summary),
+            const SizedBox(height: BusyMarkSpacing.md),
+            BusyMarkGroupedList(
+              title: context.l10n.skippedFiles,
+              filled: true,
+              children: [
+                for (final issue in result.issues)
+                  BusyMarkActionRow(
+                    title: busyMarkLtrIsolateFor(context, issue.filePath),
+                    subtitle: _workspaceReplacementIssueLabel(context, issue),
+                    leading: const Icon(BusyMarkGlyphs.warning),
+                  ),
+              ],
+            ),
+          ],
+        ),
       );
+      return;
     }
+    BusyMarkToastOverlay.show(context, message: summary);
+  }
+
+  Future<LineEndingNormalization?> _chooseReplacementLineEnding(
+    BuildContext context,
+    String fileName,
+  ) {
+    return showBusyMarkModalDialog<LineEndingNormalization>(
+      context,
+      builder: (dialogContext) => BusyMarkDialogShell(
+        title: context.l10n.normalizeLineEndings,
+        actions: [
+          BusyMarkPushButton.standard(
+            onPressed: () =>
+                Navigator.pop(dialogContext, LineEndingNormalization.lf),
+            child: Text(LineEndingNormalization.lf.name.toUpperCase()),
+          ),
+          BusyMarkPushButton.suggested(
+            onPressed: () =>
+                Navigator.pop(dialogContext, LineEndingNormalization.crlf),
+            child: Text(LineEndingNormalization.crlf.name.toUpperCase()),
+          ),
+        ],
+        children: [
+          Text(context.l10n.workspaceReplaceMixedLineEndings(fileName)),
+        ],
+      ),
+    );
   }
 
   int _initialSidebarTabIndex(Workspace workspace) {
@@ -2204,13 +2443,17 @@ IconData _sidebarTabIcon(_SidebarTab tab, TextDirection direction) {
   };
 }
 
-String? _sidebarTabShortcut(_SidebarTab tab) {
-  return switch (tab) {
-    _SidebarTab.files => BusyMarkSidebarShortcutLabels.files,
-    _SidebarTab.toc => BusyMarkSidebarShortcutLabels.toc,
-    _SidebarTab.outline => BusyMarkSidebarShortcutLabels.outline,
-    _SidebarTab.git => BusyMarkSidebarShortcutLabels.git,
+String? _sidebarTabShortcut(BuildContext context, _SidebarTab tab) {
+  final commands =
+      BusyMarkCommandRegistryScope.read(context) ??
+      BusyMarkCommandCatalog.metadata;
+  final id = switch (tab) {
+    _SidebarTab.files => BusyMarkCommandIds.sidebarFiles,
+    _SidebarTab.toc => BusyMarkCommandIds.sidebarToc,
+    _SidebarTab.outline => BusyMarkCommandIds.sidebarOutline,
+    _SidebarTab.git => BusyMarkCommandIds.sidebarGit,
   };
+  return commands[id]?.shortcut?.label;
 }
 
 String? _gitBranchLabel(BuildContext context, GitRepositoryInfo? repository) {
@@ -2276,6 +2519,7 @@ class _SidebarHeader extends StatelessWidget {
     required this.onSelectTab,
     required this.loadGitMenuItems,
     required this.onGitAction,
+    required this.onRefineActiveDocument,
   });
 
   final Workspace workspace;
@@ -2291,6 +2535,7 @@ class _SidebarHeader extends StatelessWidget {
   loadGitMenuItems;
   final Future<void> Function(BuildContext context, _GitMenuAction action)
   onGitAction;
+  final VoidCallback onRefineActiveDocument;
 
   @override
   Widget build(BuildContext context) {
@@ -2354,7 +2599,7 @@ class _SidebarHeader extends StatelessWidget {
                             tab,
                             Directionality.of(context),
                           ),
-                          shortcut: _sidebarTabShortcut(tab),
+                          shortcut: _sidebarTabShortcut(context, tab),
                           checked: tab == selectedTab,
                           trailingCheck: true,
                         ),
@@ -2442,7 +2687,7 @@ class _SidebarHeader extends StatelessWidget {
                   const SizedBox(width: BusyMarkSpacing.sm),
                   BusyMarkHeaderPopupMenuButton<_PathMenuAction>(
                     key: const ValueKey('workspace-sidebar-outline-file-menu'),
-                    tooltip: context.l10n.fileActions,
+                    tooltip: context.l10n.actions,
                     icon: BusyMarkGlyphs.menuVertical,
                     transparent: true,
                     borderRadius: BusyMarkRadius.nativeHeaderButton,
@@ -2451,6 +2696,7 @@ class _SidebarHeader extends StatelessWidget {
                       menuContext,
                       copyNameLabel: menuContext.l10n.copyFileName,
                       pathActionsEnabled: hasActiveDocumentPath,
+                      showRefineWithAi: true,
                     ),
                     onSelected: (action) => unawaited(
                       _performWorkspacePathAction(
@@ -2458,6 +2704,7 @@ class _SidebarHeader extends StatelessWidget {
                         name: activeDocumentName,
                         path: activeDocumentPath,
                         action: action,
+                        onRefineWithAi: onRefineActiveDocument,
                       ),
                     ),
                   ),
@@ -3374,7 +3621,11 @@ class _FilesTabState extends ConsumerState<_FilesTab> {
     }
     return Shortcuts(
       shortcuts: {
-        BusyMarkTreeShortcutActivators.deleteSelection:
+        (BusyMarkCommandRegistryScope.maybeOf(context) ??
+                    BusyMarkCommandCatalog.metadata)[BusyMarkCommandIds
+                    .treeDeleteSelection]!
+                .shortcut!
+                .activator:
             const _DeleteSelectedFileTreeEntryIntent(),
       },
       child: Actions(
@@ -3447,13 +3698,10 @@ class _FilesTabState extends ConsumerState<_FilesTab> {
                     : openable
                     ? () async {
                         selectEntry();
-                        if (await saveOrConfirmSafeToChangeActiveFile(
-                          context,
-                          ref,
-                        )) {
-                          await ref
-                              .read(workspaceControllerProvider.notifier)
-                              .openActiveFile(file.absolutePath);
+                        await ref
+                            .read(workspaceControllerProvider.notifier)
+                            .openActiveFile(file.absolutePath);
+                        if (mounted) {
                           _clearGitDetailSelection(ref);
                         }
                       }
@@ -3777,7 +4025,12 @@ Future<_FileTreeAction?> _showFileTreeMenu(
             ? context.l10n.safeDeleteTopicFile
             : context.l10n.delete,
         icon: BusyMarkGlyphs.delete,
-        shortcut: BusyMarkTreeShortcutLabels.deleteSelection,
+        shortcut:
+            (BusyMarkCommandRegistryScope.read(context) ??
+                    BusyMarkCommandCatalog.metadata)[BusyMarkCommandIds
+                    .treeDeleteSelection]
+                ?.shortcut
+                ?.label,
       ),
       const PopupMenuDivider(height: BusyMarkSpacing.sm),
       BusyMarkPopupMenuItem(
@@ -4437,7 +4690,9 @@ class _TocTabState extends ConsumerState<_TocTab> {
   late Set<String> _expandedNodeKeys;
   late final FocusNode _treeFocusNode;
   String? _selectedNodePathKey;
-  _TocTreeClipboardEntry? _cutEntry;
+  Set<String> _selectedNodePathKeys = {};
+  String? _selectionAnchorPathKey;
+  List<_TocTreeClipboardEntry> _cutEntries = [];
 
   @override
   void initState() {
@@ -4478,7 +4733,9 @@ class _TocTabState extends ConsumerState<_TocTab> {
         widget.workspace,
         treePath: _selectedInstanceTreePath,
       );
-      _cutEntry = null;
+      _cutEntries = [];
+      _selectedNodePathKeys = {};
+      _selectionAnchorPathKey = null;
       return;
     }
     if (nextStructureKey != _tocStructureKey) {
@@ -4493,7 +4750,9 @@ class _TocTabState extends ConsumerState<_TocTab> {
         widget.workspace,
         treePath: _selectedInstanceTreePath,
       );
-      _cutEntry = null;
+      _cutEntries = [];
+      _selectedNodePathKeys = {};
+      _selectionAnchorPathKey = null;
       _selectedNodePathKey = _activeTocNodePathKey(
         widget.workspace,
         treePath: _selectedInstanceTreePath,
@@ -4587,7 +4846,11 @@ class _TocTabState extends ConsumerState<_TocTab> {
     }
     return Shortcuts(
       shortcuts: {
-        BusyMarkTreeShortcutActivators.deleteSelection:
+        (BusyMarkCommandRegistryScope.maybeOf(context) ??
+                    BusyMarkCommandCatalog.metadata)[BusyMarkCommandIds
+                    .treeDeleteSelection]!
+                .shortcut!
+                .activator:
             const _RemoveSelectedTocEntryIntent(),
       },
       child: Actions(
@@ -4595,14 +4858,26 @@ class _TocTabState extends ConsumerState<_TocTab> {
           _RemoveSelectedTocEntryIntent:
               CallbackAction<_RemoveSelectedTocEntryIntent>(
                 onInvoke: (_) {
-                  final entry = selectedEntry;
-                  if (entry != null) {
+                  final selectedEntries = entries
+                      .where(
+                        (entry) => _selectedNodePathKeys.isEmpty
+                            ? entry.pathKey == selectedEntry?.pathKey
+                            : _selectedNodePathKeys.contains(entry.pathKey),
+                      )
+                      .toList();
+                  if (selectedEntries.isNotEmpty) {
                     unawaited(
-                      _removeTocEntry(
-                        context,
-                        instanceTreePath: instance.sourceTreePath,
-                        entry: entry,
-                      ),
+                      selectedEntries.length == 1
+                          ? _removeTocEntry(
+                              context,
+                              instanceTreePath: instance.sourceTreePath,
+                              entry: selectedEntries.single,
+                            )
+                          : _removeTocEntries(
+                              context,
+                              instanceTreePath: instance.sourceTreePath,
+                              entries: selectedEntries,
+                            ),
                     );
                   }
                   return null;
@@ -4634,7 +4909,9 @@ class _TocTabState extends ConsumerState<_TocTab> {
                         widget.workspace,
                         treePath: treePath,
                       );
-                      _cutEntry = null;
+                      _selectedNodePathKeys = {};
+                      _selectionAnchorPathKey = null;
+                      _cutEntries = [];
                     });
                     final selected = _tocInstanceForTreePath(module, treePath);
                     if (selected != null) {
@@ -4684,11 +4961,22 @@ class _TocTabState extends ConsumerState<_TocTab> {
               final topicPath = writersideTopic?.filePath;
               final rawLabel = _tocNodeLabel(context, node);
               final label = _tocNodeDisplayLabel(context, node);
-              void selectEntry() {
+              _TreeSelectionModifiers selectEntry() {
                 _treeFocusNode.requestFocus();
-                if (_selectedNodePathKey != entry.pathKey) {
-                  setState(() => _selectedNodePathKey = entry.pathKey);
-                }
+                final modifiers = _treeSelectionModifiers();
+                final update = _updatedTreeSelection(
+                  visibleKeys: [for (final item in entries) item.pathKey],
+                  selectedKeys: _selectedNodePathKeys,
+                  anchorKey: _selectionAnchorPathKey,
+                  clickedIndex: index - 1,
+                  modifiers: modifiers,
+                );
+                setState(() {
+                  _selectedNodePathKey = entry.pathKey;
+                  _selectedNodePathKeys = update.selectedKeys;
+                  _selectionAnchorPathKey = update.anchorKey;
+                });
+                return modifiers;
               }
 
               void toggle() {
@@ -4702,9 +4990,12 @@ class _TocTabState extends ConsumerState<_TocTab> {
               }
 
               return _SidebarTreeRow(
+                key: ValueKey('workspace-sidebar-toc-row-${entry.pathKey}'),
                 title: label,
                 enabled: true,
-                selected: _selectedNodePathKey == null
+                selected: _selectedNodePathKeys.isNotEmpty
+                    ? _selectedNodePathKeys.contains(entry.pathKey)
+                    : _selectedNodePathKey == null
                     ? topicPath == widget.workspace.activeFilePath
                     : entry.pathKey == _selectedNodePathKey,
                 depth: entry.depth,
@@ -4721,13 +5012,8 @@ class _TocTabState extends ConsumerState<_TocTab> {
                 onToggle: hasChildren ? toggle : null,
                 onTap: topicPath != null
                     ? () async {
-                        selectEntry();
-                        final canOpen =
-                            await saveOrConfirmSafeToChangeActiveFile(
-                              context,
-                              ref,
-                            );
-                        if (!canOpen || !mounted || !context.mounted) {
+                        final modifiers = selectEntry();
+                        if (modifiers.control || modifiers.shift) {
                           return;
                         }
                         await ref
@@ -4739,19 +5025,35 @@ class _TocTabState extends ConsumerState<_TocTab> {
                       }
                     : hasChildren
                     ? () {
-                        selectEntry();
+                        final modifiers = selectEntry();
+                        if (modifiers.control || modifiers.shift) {
+                          return;
+                        }
                         toggle();
                       }
                     : () {
                         selectEntry();
                       },
                 onSecondaryTapUp: (details) {
-                  selectEntry();
+                  if (!_selectedNodePathKeys.contains(entry.pathKey)) {
+                    setState(() {
+                      _selectedNodePathKey = entry.pathKey;
+                      _selectedNodePathKeys = {entry.pathKey};
+                      _selectionAnchorPathKey = entry.pathKey;
+                    });
+                  }
+                  final selectedEntries = [
+                    for (final item in entries)
+                      if (_selectedNodePathKeys.contains(item.pathKey)) item,
+                  ];
                   unawaited(
                     _showTopicContextMenu(
                       context,
                       instanceTreePath: instance.sourceTreePath,
                       entry: entry,
+                      selectedEntries: selectedEntries.isEmpty
+                          ? [entry]
+                          : selectedEntries,
                       topic: writersideTopic,
                       rawLabel: rawLabel,
                       canEditStructure:
@@ -4808,8 +5110,10 @@ class _TocTabState extends ConsumerState<_TocTab> {
         return;
       }
       setState(() {
-        _cutEntry = null;
+        _cutEntries = [];
         _selectedNodePathKey = null;
+        _selectedNodePathKeys = {};
+        _selectionAnchorPathKey = null;
       });
       _clearGitDetailSelection(ref);
       return;
@@ -4838,16 +5142,143 @@ class _TocTabState extends ConsumerState<_TocTab> {
       return;
     }
     setState(() {
-      _cutEntry = null;
+      _cutEntries = [];
+      _selectedNodePathKey = null;
+      _selectedNodePathKeys = {};
+      _selectionAnchorPathKey = null;
+    });
+    _clearGitDetailSelection(ref);
+  }
+
+  Future<void> _removeTocEntries(
+    BuildContext context, {
+    required String instanceTreePath,
+    required List<_TocTreeEntry> entries,
+  }) async {
+    if (entries.isEmpty ||
+        entries.any((entry) => !entry.canEditStructureIn(instanceTreePath)) ||
+        entries.any(
+          (entry) => !_tocTreeEntryStillMatches(
+            widget.workspace,
+            instanceTreePath,
+            entry,
+          ),
+        )) {
+      return;
+    }
+    final requests = <WritersideTocRemovalRequest>[];
+    for (final entry in entries) {
+      final rawNode = _rawTocNodeForEntry(
+        widget.workspace,
+        instanceTreePath,
+        entry,
+      );
+      if (rawNode == null || entry.editPath == null) {
+        return;
+      }
+      requests.add(
+        WritersideTocRemovalRequest(
+          entryPath: entry.editPath!,
+          expectedIdentity: WritersideTocNodeIdentity.fromNode(rawNode),
+        ),
+      );
+    }
+    final labels = entries
+        .map((entry) => _tocNodeLabel(context, entry.node))
+        .join(', ');
+    final confirmed = await _confirmRemoveTocEntry(context, ref, name: labels);
+    if (!confirmed || !context.mounted || !mounted) {
+      return;
+    }
+    final canRemove = await saveOrConfirmSafeToChangeActiveFile(context, ref);
+    if (!canRemove || !context.mounted || !mounted) {
+      return;
+    }
+    final removed = await ref
+        .read(workspaceControllerProvider.notifier)
+        .removeWritersideTocEntries(
+          treePath: instanceTreePath,
+          requests: requests,
+        );
+    if (!mounted || !removed) {
+      return;
+    }
+    setState(() {
+      _cutEntries = [];
       _selectedNodePathKey = null;
+      _selectedNodePathKeys = {};
+      _selectionAnchorPathKey = null;
     });
     _clearGitDetailSelection(ref);
   }
 
+  Future<void> _copyTocEntries(List<_TocTreeEntry> entries) async {
+    final module = widget.workspace.writersideModule;
+    final pieces = <String>[];
+    final state = ref.read(workspaceControllerProvider);
+    final activePath = state.workspace?.activeFilePath;
+    for (final entry in entries) {
+      final reference = entry.node.topicReference;
+      final topic = reference == null || entry.node.origin != null
+          ? null
+          : module?.topicByReference(reference);
+      if (topic == null) {
+        pieces.add(_tocNodeLabel(context, entry.node));
+      } else if (activePath != null && p.equals(activePath, topic.filePath)) {
+        pieces.add(state.activeText);
+      } else {
+        pieces.add(
+          await ref.read(workspaceServiceProvider).loadText(topic.filePath),
+        );
+      }
+    }
+    await _copyToClipboard(pieces.join('\n'));
+  }
+
+  Future<void> _refineTocTopicsWithAi(
+    BuildContext context,
+    List<WritersideTopic> topics,
+  ) async {
+    final uniqueTopics = <String, WritersideTopic>{
+      for (final topic in topics) topic.filePath: topic,
+    }.values.toList();
+    for (final topic in uniqueTopics) {
+      if (!context.mounted || !mounted) {
+        return;
+      }
+      final currentPath = ref
+          .read(workspaceControllerProvider)
+          .workspace
+          ?.activeFilePath;
+      if (currentPath == null || !p.equals(currentPath, topic.filePath)) {
+        if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
+            !context.mounted ||
+            !mounted) {
+          return;
+        }
+        final opened = await ref
+            .read(workspaceControllerProvider.notifier)
+            .openActiveFile(topic.filePath);
+        if (!opened || !mounted || !context.mounted) {
+          return;
+        }
+      }
+      final refined = await _refineActiveSourceRangesWithAi(
+        context,
+        ref,
+        const [_SourceTextRange.fullDocument()],
+      );
+      if (!refined) {
+        return;
+      }
+    }
+  }
+
   Future<void> _showTopicContextMenu(
     BuildContext context, {
     required String instanceTreePath,
     required _TocTreeEntry entry,
+    required List<_TocTreeEntry> selectedEntries,
     required WritersideTopic? topic,
     required String rawLabel,
     required bool canEditStructure,
@@ -4860,16 +5291,32 @@ class _TocTabState extends ConsumerState<_TocTab> {
     final gitRelativePath = topicPath == null
         ? null
         : _gitRelativePathForFileTreeEntry(ref, topicPath);
-    final cutEntry = _cutEntry;
     final rawNode = canEditStructure
         ? _rawTocNodeForEntry(widget.workspace, instanceTreePath, entry)
         : null;
     final canPaste =
-        cutEntry != null &&
-        _tocClipboardEntryStillMatches(widget.workspace, cutEntry) &&
+        _cutEntries.isNotEmpty &&
+        _cutEntries.every(
+          (source) => _tocClipboardEntryStillMatches(widget.workspace, source),
+        ) &&
         canEditStructure &&
         rawNode != null &&
-        _canPasteTocTreeEntry(cutEntry, instanceTreePath, entry.editPath!);
+        _canPasteTocTreeEntries(_cutEntries, instanceTreePath, entry.editPath!);
+    final selectedTopics = [
+      for (final selected in selectedEntries)
+        if (selected.node.topicReference case final reference?)
+          if (selected.node.origin == null)
+            widget.workspace.writersideModule?.topicByReference(reference),
+    ].nonNulls.toList();
+    final canRefineSelection =
+        selectedTopics.length == selectedEntries.length &&
+        selectedTopics.every(
+          (selectedTopic) =>
+              selectedTopic.format == WritersideTopicFormat.markdown,
+        );
+    final canEditSelection = selectedEntries.every(
+      (selected) => selected.canEditStructureIn(instanceTreePath),
+    );
     final action = await _showTocTreeMenu(
       context,
       position,
@@ -4878,6 +5325,9 @@ class _TocTabState extends ConsumerState<_TocTab> {
       showPaste: canPaste,
       enableGitActions: gitRelativePath != null,
       canEditStructure: canEditStructure,
+      multipleSelection: selectedEntries.length > 1,
+      canRefineSelection: canRefineSelection,
+      canEditSelection: canEditSelection,
     );
     if (!mounted || !context.mounted || action == null) {
       return;
@@ -4888,6 +5338,20 @@ class _TocTabState extends ConsumerState<_TocTab> {
       return;
     }
     switch (action) {
+      case _TocTreeAction.copy:
+        await _copyTocEntries(selectedEntries);
+      case _TocTreeAction.refineWithAi:
+        if (canRefineSelection) {
+          await _refineTocTopicsWithAi(context, selectedTopics);
+        }
+      case _TocTreeAction.deleteSelection:
+        if (canEditSelection) {
+          await _removeTocEntries(
+            context,
+            instanceTreePath: instanceTreePath,
+            entries: selectedEntries,
+          );
+        }
       case _TocTreeAction.newSiblingTopic:
         if (!canEditStructure) {
           return;
@@ -4936,31 +5400,48 @@ class _TocTabState extends ConsumerState<_TocTab> {
           return;
         }
         if (renamed) {
-          setState(() => _cutEntry = null);
+          setState(() => _cutEntries = []);
           _clearGitDetailSelection(ref);
         }
       case _TocTreeAction.cut:
-        if (!canEditStructure || rawNode == null) {
+        if (!canEditSelection) {
           return;
         }
-        setState(() {
-          _cutEntry = _TocTreeClipboardEntry(
-            treePath: instanceTreePath,
-            nodePath: entry.editPath!,
-            nodeFingerprint: _tocNodeFingerprint(rawNode),
-            nodeIdentity: WritersideTocNodeIdentity.fromNode(rawNode),
+        final clipboardEntries = <_TocTreeClipboardEntry>[];
+        for (final selected in _topLevelTocEntries(selectedEntries)) {
+          final selectedRawNode = _rawTocNodeForEntry(
+            widget.workspace,
+            instanceTreePath,
+            selected,
           );
-        });
+          if (selectedRawNode == null || selected.editPath == null) {
+            return;
+          }
+          clipboardEntries.add(
+            _TocTreeClipboardEntry(
+              treePath: instanceTreePath,
+              nodePath: selected.editPath!,
+              nodeFingerprint: _tocNodeFingerprint(selectedRawNode),
+              nodeIdentity: WritersideTocNodeIdentity.fromNode(selectedRawNode),
+            ),
+          );
+        }
+        setState(() {
+          _cutEntries = clipboardEntries;
+        });
       case _TocTreeAction.pasteAfter:
       case _TocTreeAction.pasteAsChild:
         if (!canEditStructure || rawNode == null) {
           return;
         }
-        final source = _cutEntry;
-        if (source == null ||
-            !_tocClipboardEntryStillMatches(widget.workspace, source)) {
-          if (source != null && mounted) {
-            setState(() => _cutEntry = null);
+        final sources = List<_TocTreeClipboardEntry>.of(_cutEntries);
+        if (sources.isEmpty ||
+            sources.any(
+              (source) =>
+                  !_tocClipboardEntryStillMatches(widget.workspace, source),
+            )) {
+          if (sources.isNotEmpty && mounted) {
+            setState(() => _cutEntries = []);
           }
           return;
         }
@@ -4969,28 +5450,47 @@ class _TocTabState extends ConsumerState<_TocTab> {
             !mounted ||
             !context.mounted ||
             !entryIsCurrent() ||
-            !_tocClipboardEntryStillMatches(widget.workspace, source)) {
+            sources.any(
+              (source) =>
+                  !_tocClipboardEntryStillMatches(widget.workspace, source),
+            )) {
           return;
         }
-        final moved = await ref
-            .read(workspaceControllerProvider.notifier)
-            .moveWritersideTocEntry(
-              treePath: instanceTreePath,
-              sourcePath: source.nodePath,
-              placement: action == _TocTreeAction.pasteAsChild
-                  ? WritersideTopicCreatePlacement.child
-                  : WritersideTopicCreatePlacement.sibling,
-              referencePath: entry.editPath!,
-              sourceIdentity: source.nodeIdentity,
-              referenceIdentity: WritersideTocNodeIdentity.fromNode(rawNode),
-            );
+        final placement = action == _TocTreeAction.pasteAsChild
+            ? WritersideTopicCreatePlacement.child
+            : WritersideTopicCreatePlacement.sibling;
+        final controller = ref.read(workspaceControllerProvider.notifier);
+        final moved = sources.length == 1
+            ? await controller.moveWritersideTocEntry(
+                treePath: instanceTreePath,
+                sourcePath: sources.single.nodePath,
+                placement: placement,
+                referencePath: entry.editPath!,
+                sourceIdentity: sources.single.nodeIdentity,
+                referenceIdentity: WritersideTocNodeIdentity.fromNode(rawNode),
+              )
+            : await controller.moveWritersideTocEntries(
+                treePath: instanceTreePath,
+                sources: [
+                  for (final source in sources)
+                    WritersideTocMoveEntry(
+                      sourcePath: source.nodePath,
+                      sourceIdentity: source.nodeIdentity,
+                    ),
+                ],
+                placement: placement,
+                referencePath: entry.editPath!,
+                referenceIdentity: WritersideTocNodeIdentity.fromNode(rawNode),
+              );
         if (!mounted) {
           return;
         }
         if (moved) {
           setState(() {
-            _cutEntry = null;
+            _cutEntries = [];
             _selectedNodePathKey = null;
+            _selectedNodePathKeys = {};
+            _selectionAnchorPathKey = null;
           });
           _clearGitDetailSelection(ref);
         }
@@ -5016,8 +5516,10 @@ class _TocTabState extends ConsumerState<_TocTab> {
         );
         if (mounted && result != null) {
           setState(() {
-            _cutEntry = null;
+            _cutEntries = [];
             _selectedNodePathKey = null;
+            _selectedNodePathKeys = {};
+            _selectionAnchorPathKey = null;
           });
           _clearGitDetailSelection(ref);
         }
@@ -5095,7 +5597,9 @@ class _TocTabState extends ConsumerState<_TocTab> {
       setState(() {
         _selectedInstanceTreePath = result.treePath;
         _selectedNodePathKey = null;
-        _cutEntry = null;
+        _selectedNodePathKeys = {};
+        _selectionAnchorPathKey = null;
+        _cutEntries = [];
       });
     }
   }
@@ -5166,15 +5670,31 @@ class _TocTreeClipboardEntry {
   final WritersideTocNodeIdentity nodeIdentity;
 }
 
+List<_TocTreeEntry> _topLevelTocEntries(List<_TocTreeEntry> entries) {
+  final result = <_TocTreeEntry>[];
+  for (final entry in entries) {
+    if (result.any(
+      (candidate) => _tocPathContains(candidate.path, entry.path),
+    )) {
+      continue;
+    }
+    result.add(entry);
+  }
+  return result;
+}
+
 class _RemoveSelectedTocEntryIntent extends Intent {
   const _RemoveSelectedTocEntryIntent();
 }
 
 enum _TocTreeAction {
+  copy,
   newSiblingTopic,
   newChildTopic,
   rename,
   cut,
+  refineWithAi,
+  deleteSelection,
   pasteAfter,
   pasteAsChild,
   removeFromToc,
@@ -5194,94 +5714,146 @@ Future<_TocTreeAction?> _showTocTreeMenu(
   required bool showPaste,
   required bool enableGitActions,
   required bool canEditStructure,
+  required bool multipleSelection,
+  required bool canRefineSelection,
+  required bool canEditSelection,
 }) {
   return _showSidebarTreeMenu<_TocTreeAction>(
     context,
     position,
     items: [
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.newSiblingTopic,
-        label: context.l10n.newSiblingTopic,
-        icon: BusyMarkGlyphs.newDocument,
-        enabled: canEditStructure,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.newChildTopic,
-        label: context.l10n.newChildTopic,
-        icon: BusyMarkGlyphs.tree,
-        enabled: canEditStructure,
-      ),
-      const PopupMenuDivider(height: BusyMarkSpacing.sm),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.rename,
-        label: context.l10n.renameTopicFile,
-        icon: BusyMarkGlyphs.edit,
-        enabled: hasTopicFile,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.cut,
-        label: context.l10n.cut,
-        icon: BusyMarkGlyphs.cut,
-        enabled: canEditStructure,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.pasteAfter,
-        label: context.l10n.pasteAfterTopic,
-        icon: BusyMarkGlyphs.paste,
-        enabled: showPaste,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.pasteAsChild,
-        label: context.l10n.pasteAsChildTopic,
-        icon: BusyMarkGlyphs.tree,
-        enabled: showPaste,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.removeFromToc,
-        label: context.l10n.removeTocElement,
-        icon: BusyMarkGlyphs.outdentFor(Directionality.of(context)),
-        shortcut: BusyMarkTreeShortcutLabels.deleteSelection,
-        enabled: canEditStructure,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.delete,
-        label: context.l10n.safeDeleteTopicFile,
-        icon: BusyMarkGlyphs.delete,
-        enabled: hasTopicFile,
-      ),
-      const PopupMenuDivider(height: BusyMarkSpacing.sm),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.copyName,
-        label: context.l10n.copyName,
-        icon: BusyMarkGlyphs.copy,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.copyPath,
-        label: context.l10n.copyPath,
-        icon: BusyMarkGlyphs.copy,
-        enabled: hasTopicFile,
-      ),
-      const PopupMenuDivider(height: BusyMarkSpacing.sm),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.openInFiles,
-        label: context.l10n.openInFiles,
-        icon: BusyMarkGlyphs.folderOpen,
-        enabled: hasTopicFile,
-      ),
-      BusyMarkPopupMenuItem(
-        value: _TocTreeAction.addToGit,
-        label: context.l10n.addToGit,
-        icon: BusyMarkGlyphs.branch,
-        enabled: enableGitActions,
-      ),
-      if (showHistory) const PopupMenuDivider(height: BusyMarkSpacing.sm),
-      if (showHistory)
+      if (multipleSelection) ...[
         BusyMarkPopupMenuItem(
-          value: _TocTreeAction.fileHistory,
-          label: context.l10n.fileHistory,
-          icon: BusyMarkGlyphs.documentHistory,
+          value: _TocTreeAction.copy,
+          label: context.l10n.copy,
+          icon: BusyMarkGlyphs.copy,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.cut,
+          label: context.l10n.cut,
+          icon: BusyMarkGlyphs.cut,
+          enabled: canEditSelection,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.refineWithAi,
+          label: context.l10n.aiRefineWithAi,
+          icon: BusyMarkGlyphs.ai,
+          enabled: canRefineSelection,
+        ),
+        const PopupMenuDivider(height: BusyMarkSpacing.sm),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.deleteSelection,
+          label: context.l10n.delete,
+          icon: BusyMarkGlyphs.delete,
+          enabled: canEditSelection,
+        ),
+      ] else ...[
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.copy,
+          label: context.l10n.copy,
+          icon: BusyMarkGlyphs.copy,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.refineWithAi,
+          label: context.l10n.aiRefineWithAi,
+          icon: BusyMarkGlyphs.ai,
+          enabled: canRefineSelection,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.copyName,
+          label: context.l10n.copyName,
+          icon: BusyMarkGlyphs.copy,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.copyPath,
+          label: context.l10n.copyPath,
+          icon: BusyMarkGlyphs.copy,
+          enabled: hasTopicFile,
+        ),
+        const PopupMenuDivider(height: BusyMarkSpacing.sm),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.newSiblingTopic,
+          label: context.l10n.newSiblingTopic,
+          icon: BusyMarkGlyphs.newDocument,
+          enabled: canEditStructure,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.newChildTopic,
+          label: context.l10n.newChildTopic,
+          icon: BusyMarkGlyphs.tree,
+          enabled: canEditStructure,
+        ),
+        const PopupMenuDivider(height: BusyMarkSpacing.sm),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.rename,
+          label: context.l10n.renameTopicFile,
+          icon: BusyMarkGlyphs.edit,
+          enabled: hasTopicFile,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.cut,
+          label: context.l10n.cut,
+          icon: BusyMarkGlyphs.cut,
+          enabled: canEditStructure,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.pasteAfter,
+          label: context.l10n.pasteAfterTopic,
+          icon: BusyMarkGlyphs.paste,
+          enabled: showPaste,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.pasteAsChild,
+          label: context.l10n.pasteAsChildTopic,
+          icon: BusyMarkGlyphs.tree,
+          enabled: showPaste,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.removeFromToc,
+          label: context.l10n.removeTocElement,
+          icon: BusyMarkGlyphs.outdentFor(Directionality.of(context)),
+          shortcut:
+              (BusyMarkCommandRegistryScope.read(context) ??
+                      BusyMarkCommandCatalog.metadata)[BusyMarkCommandIds
+                      .treeDeleteSelection]
+                  ?.shortcut
+                  ?.label,
+          enabled: canEditStructure,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.delete,
+          label: context.l10n.safeDeleteTopicFile,
+          icon: BusyMarkGlyphs.delete,
+          enabled: hasTopicFile,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.deleteSelection,
+          label: context.l10n.delete,
+          icon: BusyMarkGlyphs.delete,
+          enabled: canEditSelection,
+        ),
+        const PopupMenuDivider(height: BusyMarkSpacing.sm),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.openInFiles,
+          label: context.l10n.openInFiles,
+          icon: BusyMarkGlyphs.folderOpen,
+          enabled: hasTopicFile,
+        ),
+        BusyMarkPopupMenuItem(
+          value: _TocTreeAction.addToGit,
+          label: context.l10n.addToGit,
+          icon: BusyMarkGlyphs.branch,
           enabled: enableGitActions,
         ),
+        if (showHistory) const PopupMenuDivider(height: BusyMarkSpacing.sm),
+        if (showHistory)
+          BusyMarkPopupMenuItem(
+            value: _TocTreeAction.fileHistory,
+            label: context.l10n.fileHistory,
+            icon: BusyMarkGlyphs.documentHistory,
+            enabled: enableGitActions,
+          ),
+      ],
     ],
   );
 }
@@ -5298,6 +5870,14 @@ bool _canPasteTocTreeEntry(
   return !_tocPathContains(source.nodePath, targetPath);
 }
 
+bool _canPasteTocTreeEntries(
+  List<_TocTreeClipboardEntry> sources,
+  String targetTreePath,
+  List<int> targetPath,
+) => sources.every(
+  (source) => _canPasteTocTreeEntry(source, targetTreePath, targetPath),
+);
+
 bool _tocClipboardEntryStillMatches(
   Workspace workspace,
   _TocTreeClipboardEntry source,
@@ -6270,6 +6850,196 @@ WritersideInstance _defaultWritersideInstance(WritersideModule module) {
       module.instances.first;
 }
 
+typedef _TreeSelectionModifiers = ({bool control, bool shift});
+typedef _TreeSelectionUpdate = ({Set<String> selectedKeys, String anchorKey});
+
+_TreeSelectionModifiers _treeSelectionModifiers() {
+  final keyboard = HardwareKeyboard.instance;
+  return (
+    control: keyboard.isControlPressed || keyboard.isMetaPressed,
+    shift: keyboard.isShiftPressed,
+  );
+}
+
+_TreeSelectionUpdate _updatedTreeSelection({
+  required List<String> visibleKeys,
+  required Set<String> selectedKeys,
+  required String? anchorKey,
+  required int clickedIndex,
+  required _TreeSelectionModifiers modifiers,
+}) {
+  final clickedKey = visibleKeys[clickedIndex];
+  if (modifiers.shift) {
+    final anchorIndex = anchorKey == null ? -1 : visibleKeys.indexOf(anchorKey);
+    final rangeStart = math.min(
+      anchorIndex < 0 ? clickedIndex : anchorIndex,
+      clickedIndex,
+    );
+    final rangeEnd = math.max(
+      anchorIndex < 0 ? clickedIndex : anchorIndex,
+      clickedIndex,
+    );
+    final range = visibleKeys.getRange(rangeStart, rangeEnd + 1);
+    return (
+      selectedKeys: modifiers.control
+          ? ({...selectedKeys, ...range})
+          : range.toSet(),
+      anchorKey: anchorIndex < 0 ? clickedKey : anchorKey!,
+    );
+  }
+  if (modifiers.control) {
+    final next = {...selectedKeys};
+    if (!next.remove(clickedKey)) {
+      next.add(clickedKey);
+    }
+    return (selectedKeys: next, anchorKey: clickedKey);
+  }
+  return (selectedKeys: {clickedKey}, anchorKey: clickedKey);
+}
+
+class _SourceTextRange {
+  const _SourceTextRange(this.start, this.end) : fullDocument = false;
+
+  const _SourceTextRange.fullDocument()
+    : start = 0,
+      end = 0,
+      fullDocument = true;
+
+  final int start;
+  final int end;
+  final bool fullDocument;
+}
+
+List<_SourceTextRange> _mergeSourceTextRanges(
+  Iterable<_SourceTextRange> ranges,
+) {
+  final sorted = ranges.toList()
+    ..sort((left, right) => left.start.compareTo(right.start));
+  final merged = <_SourceTextRange>[];
+  for (final range in sorted) {
+    if (range.end <= range.start) {
+      continue;
+    }
+    if (merged.isEmpty || range.start > merged.last.end) {
+      merged.add(range);
+      continue;
+    }
+    final previous = merged.removeLast();
+    merged.add(
+      _SourceTextRange(previous.start, math.max(previous.end, range.end)),
+    );
+  }
+  return merged;
+}
+
+String _sourceTextForRanges(String source, List<_SourceTextRange> ranges) =>
+    ranges.map((range) => source.substring(range.start, range.end)).join();
+
+String _sourceWithoutRanges(String source, List<_SourceTextRange> ranges) {
+  var result = source;
+  for (final range in ranges.reversed) {
+    result = result.replaceRange(range.start, range.end, '');
+  }
+  return result;
+}
+
+List<MarkdownSectionEditor> _selectedMarkdownSections(
+  String source,
+  List<MarkdownHeading> headings,
+  Set<int> selectedIndexes,
+) {
+  final sections = <MarkdownSectionEditor>[];
+  final sortedIndexes = selectedIndexes.toList()..sort();
+  for (final index in sortedIndexes) {
+    final section = MarkdownSectionEditor.fromHeadings(
+      source: source,
+      headings: headings,
+      headingIndex: index,
+    );
+    if (sections.isNotEmpty && section.startOffset < sections.last.endOffset) {
+      continue;
+    }
+    sections.add(section);
+  }
+  return sections;
+}
+
+Future<bool> _refineActiveSourceRangesWithAi(
+  BuildContext context,
+  WidgetRef ref,
+  List<_SourceTextRange> requestedRanges,
+) async {
+  for (final requestedRange in requestedRanges.reversed) {
+    if (!context.mounted) {
+      return false;
+    }
+    final state = ref.read(workspaceControllerProvider);
+    final workspace = state.workspace;
+    if (workspace == null) {
+      return false;
+    }
+    final path = workspace.activeFilePath ?? workspace.markdown?.filePath;
+    final source = state.activeText;
+    final start = requestedRange.fullDocument ? 0 : requestedRange.start;
+    final end = requestedRange.fullDocument
+        ? source.length
+        : requestedRange.end;
+    if (start < 0 || end <= start || end > source.length) {
+      return false;
+    }
+    final result = await showBusyMarkAiEdit(
+      context,
+      ref,
+      AiEditorSnapshot(
+        documentSource: source,
+        selectionStart: start,
+        selectionEnd: end,
+        anchorOffset: start,
+        sourceRevision: ref
+            .read(workspaceControllerProvider.notifier)
+            .editRevision,
+        targetId: path ?? 'untitled',
+        documentPath: path,
+        blockTargetAvailable: false,
+      ),
+      fixedTarget: requestedRange.fullDocument
+          ? AiEditTargetKind.document
+          : AiEditTargetKind.selection,
+    );
+    if (result == null || !context.mounted) {
+      return false;
+    }
+    final invocation = result.invocation;
+    final replacementStart = invocation.replacementStart;
+    final replacementEnd = invocation.replacementEnd;
+    if (replacementStart == null ||
+        replacementEnd == null ||
+        replacementStart < 0 ||
+        replacementEnd < replacementStart ||
+        replacementEnd > source.length ||
+        invocation.documentSource != source ||
+        !_isSameActiveDocument(
+          ref.read(workspaceControllerProvider),
+          workspaceId: workspace.id,
+          activePath: path,
+          source: source,
+        )) {
+      return false;
+    }
+    ref
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveText(
+          source.replaceRange(
+            replacementStart,
+            replacementEnd,
+            result.replacement,
+          ),
+          sourceFilePath: path,
+        );
+  }
+  return true;
+}
+
 class _OutlineTab extends ConsumerStatefulWidget {
   const _OutlineTab({required this.workspace, required this.headings});
 
@@ -6288,6 +7058,8 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
   late Set<String> _expandedNodeKeys;
   final _treeScrollController = ScrollController();
   String? _revealedActiveNodeKey;
+  Set<String> _selectedNodeKeys = {};
+  String? _selectionAnchorKey;
 
   @override
   void initState() {
@@ -6307,6 +7079,8 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
       _outlineStateKey = nextKey;
       _expandedNodeKeys = _initialExpandedOutlineNodeKeys(widget.headings);
       _revealedActiveNodeKey = null;
+      _selectedNodeKeys = {};
+      _selectionAnchorKey = null;
     }
   }
 
@@ -6356,28 +7130,57 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
   }
 
   Future<void> _showSectionMenu(
-    DocumentOutlineHeading heading,
-    int headingIndex,
+    List<_OutlineTreeEntry> entries,
+    Map<String, int> headingIndexes,
+    int clickedEntryIndex,
     Offset position,
   ) async {
-    final capabilities = _outlineSectionCapabilities(
-      widget.headings,
-      headingIndex,
-    );
+    final clickedHeading = entries[clickedEntryIndex].node.heading;
+    final clickedKey = _outlineNodeKey(clickedHeading);
+    if (!_selectedNodeKeys.contains(clickedKey)) {
+      setState(() {
+        _selectedNodeKeys = {clickedKey};
+        _selectionAnchorKey = clickedKey;
+      });
+    }
+    final selectedHeadings = <({DocumentOutlineHeading heading, int index})>[
+      for (final entry in entries)
+        if (_selectedNodeKeys.contains(_outlineNodeKey(entry.node.heading)))
+          (
+            heading: entry.node.heading,
+            index: headingIndexes[_outlineNodeKey(entry.node.heading)]!,
+          ),
+    ];
+    if (selectedHeadings.isEmpty) {
+      selectedHeadings.add((
+        heading: clickedHeading,
+        index: headingIndexes[clickedKey]!,
+      ));
+    }
+    final multiple = selectedHeadings.length > 1;
+    final capabilities = multiple
+        ? null
+        : _outlineSectionCapabilities(
+            widget.headings,
+            selectedHeadings.single.index,
+          );
     final action = await showBusyMarkContextMenu<_OutlineSectionAction>(
       context,
       position,
-      items: _outlineSectionMenuItems(context, capabilities),
+      items: _outlineSectionMenuItems(
+        context,
+        capabilities,
+        multipleSelection: multiple,
+      ),
     );
     if (action == null || !mounted) {
       return;
     }
-    await _runSectionAction(heading, headingIndex, action);
+    await _runSectionAction(selectedHeadings, action);
   }
 
   Future<void> _runSectionAction(
-    DocumentOutlineHeading heading,
-    int preferredIndex,
+    List<({DocumentOutlineHeading heading, int index})> selectedHeadings,
     _OutlineSectionAction action,
   ) async {
     final initialState = ref.read(workspaceControllerProvider);
@@ -6409,45 +7212,62 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
         )) {
       return;
     }
-    final headingIndex = _resolveParsedOutlineHeadingIndex(
+    final resolvedIndexes = <int>{};
+    for (final selected in selectedHeadings) {
+      final index = _resolveParsedOutlineHeadingIndex(
+        parsed.headings,
+        selected.heading,
+        selected.index,
+      );
+      if (index >= 0) {
+        resolvedIndexes.add(index);
+      }
+    }
+    if (resolvedIndexes.isEmpty) {
+      return;
+    }
+    final sections = _selectedMarkdownSections(
+      source,
       parsed.headings,
-      heading,
-      preferredIndex,
+      resolvedIndexes,
     );
-    if (headingIndex < 0) {
+    final ranges = _mergeSourceTextRanges([
+      for (final section in sections)
+        _SourceTextRange(section.startOffset, section.endOffset),
+    ]);
+    if (ranges.isEmpty) {
       return;
     }
-    final section = MarkdownSectionEditor.fromHeadings(
-      source: source,
-      headings: parsed.headings,
-      headingIndex: headingIndex,
-    );
+    final singleSection = sections.length == 1 ? sections.single : null;
     String? updatedSource;
     switch (action) {
       case _OutlineSectionAction.copy:
-        await _copyToClipboard(section.sectionText);
+        await _copyToClipboard(_sourceTextForRanges(source, ranges));
         return;
       case _OutlineSectionAction.cut:
-        await _copyToClipboard(section.sectionText);
-        updatedSource = section.withoutSection();
+        await _copyToClipboard(_sourceTextForRanges(source, ranges));
+        updatedSource = _sourceWithoutRanges(source, ranges);
+      case _OutlineSectionAction.refineWithAi:
+        await _refineActiveSourceRangesWithAi(context, ref, ranges);
+        return;
       case _OutlineSectionAction.delete:
         final confirmed = await _confirmDeleteOutlineSection(
           context,
           ref,
-          heading.text,
+          selectedHeadings.map((selected) => selected.heading.text).join(', '),
         );
         if (!confirmed || !mounted) {
           return;
         }
-        updatedSource = section.withoutSection();
+        updatedSource = _sourceWithoutRanges(source, ranges);
       case _OutlineSectionAction.promote:
-        updatedSource = section.promote();
+        updatedSource = singleSection?.promote();
       case _OutlineSectionAction.demote:
-        updatedSource = section.demote();
+        updatedSource = singleSection?.demote();
       case _OutlineSectionAction.moveUp:
-        updatedSource = section.moveUp();
+        updatedSource = singleSection?.moveUp();
       case _OutlineSectionAction.moveDown:
-        updatedSource = section.moveDown();
+        updatedSource = singleSection?.moveDown();
     }
     if (!mounted ||
         updatedSource == null ||
@@ -6502,6 +7322,9 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
         final headingIndex = headingIndexes[key]!;
         final expanded = _expandedNodeKeys.contains(key);
         final hasChildren = node.children.isNotEmpty;
+        final selected = _selectedNodeKeys.isEmpty
+            ? key == activeNodeKey
+            : _selectedNodeKeys.contains(key);
         void toggle() {
           setState(() {
             _revealedActiveNodeKey = null;
@@ -6522,9 +7345,14 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
             leading: _HeadingBadge(level: heading.level),
             hasChildren: hasChildren,
             expanded: expanded,
-            selected: key == activeNodeKey,
+            selected: selected,
             onToggle: hasChildren ? toggle : null,
             onTap: () {
+              final modifiers = _treeSelectionModifiers();
+              _updateOutlineSelection(entries, index, modifiers);
+              if (modifiers.control || modifiers.shift) {
+                return;
+              }
               _setOutlineViewportTarget(
                 ref,
                 workspace: widget.workspace,
@@ -6543,18 +7371,45 @@ class _OutlineTabState extends ConsumerState<_OutlineTab> {
                   );
             },
             onSecondaryTapUp: (details) => unawaited(
-              _showSectionMenu(heading, headingIndex, details.globalPosition),
+              _showSectionMenu(
+                entries,
+                headingIndexes,
+                index,
+                details.globalPosition,
+              ),
             ),
           ),
         );
       },
     );
   }
+
+  void _updateOutlineSelection(
+    List<_OutlineTreeEntry> entries,
+    int clickedIndex,
+    _TreeSelectionModifiers modifiers,
+  ) {
+    final keys = [
+      for (final entry in entries) _outlineNodeKey(entry.node.heading),
+    ];
+    final update = _updatedTreeSelection(
+      visibleKeys: keys,
+      selectedKeys: _selectedNodeKeys,
+      anchorKey: _selectionAnchorKey,
+      clickedIndex: clickedIndex,
+      modifiers: modifiers,
+    );
+    setState(() {
+      _selectedNodeKeys = update.selectedKeys;
+      _selectionAnchorKey = update.anchorKey;
+    });
+  }
 }
 
 enum _OutlineSectionAction {
   copy,
   cut,
+  refineWithAi,
   delete,
   promote,
   demote,
@@ -6603,8 +7458,9 @@ _OutlineSectionCapabilities _outlineSectionCapabilities(
 
 List<PopupMenuEntry<_OutlineSectionAction>> _outlineSectionMenuItems(
   BuildContext context,
-  _OutlineSectionCapabilities capabilities,
-) {
+  _OutlineSectionCapabilities? capabilities, {
+  required bool multipleSelection,
+}) {
   final direction = Directionality.of(context);
   return [
     BusyMarkPopupMenuItem(
@@ -6617,32 +7473,39 @@ List<PopupMenuEntry<_OutlineSectionAction>> _outlineSectionMenuItems(
       label: context.l10n.cut,
       icon: BusyMarkGlyphs.cut,
     ),
-    const PopupMenuDivider(height: BusyMarkSpacing.sm),
-    BusyMarkPopupMenuItem(
-      value: _OutlineSectionAction.promote,
-      label: context.l10n.promoteSection,
-      icon: BusyMarkGlyphs.outdentFor(direction),
-      enabled: capabilities.canPromote,
-    ),
     BusyMarkPopupMenuItem(
-      value: _OutlineSectionAction.demote,
-      label: context.l10n.demoteSection,
-      icon: BusyMarkGlyphs.indentFor(direction),
-      enabled: capabilities.canDemote,
-    ),
-    const PopupMenuDivider(height: BusyMarkSpacing.sm),
-    BusyMarkPopupMenuItem(
-      value: _OutlineSectionAction.moveUp,
-      label: context.l10n.moveSectionUp,
-      icon: BusyMarkGlyphs.upArrow,
-      enabled: capabilities.canMoveUp,
-    ),
-    BusyMarkPopupMenuItem(
-      value: _OutlineSectionAction.moveDown,
-      label: context.l10n.moveSectionDown,
-      icon: BusyMarkGlyphs.downArrow,
-      enabled: capabilities.canMoveDown,
+      value: _OutlineSectionAction.refineWithAi,
+      label: context.l10n.aiRefineWithAi,
+      icon: BusyMarkGlyphs.ai,
     ),
+    if (!multipleSelection) ...[
+      const PopupMenuDivider(height: BusyMarkSpacing.sm),
+      BusyMarkPopupMenuItem(
+        value: _OutlineSectionAction.promote,
+        label: context.l10n.promoteSection,
+        icon: BusyMarkGlyphs.outdentFor(direction),
+        enabled: capabilities!.canPromote,
+      ),
+      BusyMarkPopupMenuItem(
+        value: _OutlineSectionAction.demote,
+        label: context.l10n.demoteSection,
+        icon: BusyMarkGlyphs.indentFor(direction),
+        enabled: capabilities.canDemote,
+      ),
+      const PopupMenuDivider(height: BusyMarkSpacing.sm),
+      BusyMarkPopupMenuItem(
+        value: _OutlineSectionAction.moveUp,
+        label: context.l10n.moveSectionUp,
+        icon: BusyMarkGlyphs.upArrow,
+        enabled: capabilities.canMoveUp,
+      ),
+      BusyMarkPopupMenuItem(
+        value: _OutlineSectionAction.moveDown,
+        label: context.l10n.moveSectionDown,
+        icon: BusyMarkGlyphs.downArrow,
+        enabled: capabilities.canMoveDown,
+      ),
+    ],
     const PopupMenuDivider(height: BusyMarkSpacing.sm),
     BusyMarkPopupMenuItem(
       value: _OutlineSectionAction.delete,
@@ -6984,12 +7847,12 @@ class _SidebarEmptyState extends StatelessWidget {
   }
 }
 
-bool _shouldShowEditorTabs(Workspace workspace, GitState gitState) {
-  return switch (workspace.kind) {
-        WorkspaceKind.markdownFolder || WorkspaceKind.writersideModule => true,
-        WorkspaceKind.untitledMarkdown || WorkspaceKind.singleMarkdown => false,
-      } &&
-      (workspace.openFilePaths.isNotEmpty ||
+bool _shouldShowEditorTabs(WorkspaceState state, GitState gitState) {
+  final workspace = state.workspace!;
+  return (state.documentBuffers.length > 1 ||
+          workspace.kind == WorkspaceKind.markdownFolder ||
+          workspace.kind == WorkspaceKind.writersideModule) &&
+      (state.documentBuffers.isNotEmpty ||
           gitState.openDiffFilePaths.isNotEmpty ||
           gitState.selectedDiffForDisplay != null);
 }
@@ -7009,6 +7872,8 @@ class _EditorTabStrip extends ConsumerWidget {
     final entries = workspaceTabEntries(
       workspace: workspace,
       gitState: gitState,
+      documentBuffers: state.documentBuffers,
+      activeBufferId: state.activeBufferId,
     );
     if (entries.isEmpty) {
       return const SizedBox.shrink();
@@ -7021,29 +7886,41 @@ class _EditorTabStrip extends ConsumerWidget {
       ),
       child: SizedBox(
         height: BusyMarkSizes.paneHeaderHeight,
-        child: ListView.separated(
-          scrollDirection: Axis.horizontal,
-          padding: const EdgeInsets.fromLTRB(
-            BusyMarkSpacing.sm,
-            BusyMarkSpacing.xs,
-            BusyMarkSpacing.sm,
-            0,
-          ),
-          itemBuilder: (context, index) {
-            final entry = entries[index];
-            return _WorkspaceTabButton(
-              title: _tabTitle(context, workspace, entry),
-              icon: _tabIcon(workspace, entry),
-              diff: entry.kind == WorkspaceTabKind.gitDiff,
-              active: entry.active,
-              dirty: _tabDirty(workspace, entry),
-              onSelected: () => _selectTab(context, ref, workspace, entry),
-              onClose: () => _closeTab(context, ref, workspace, entry),
-            );
-          },
-          separatorBuilder: (context, index) =>
-              const SizedBox(width: BusyMarkSpacing.xs),
-          itemCount: entries.length,
+        child: Row(
+          children: [
+            Expanded(
+              child: ListView.separated(
+                scrollDirection: Axis.horizontal,
+                padding: const EdgeInsets.fromLTRB(
+                  BusyMarkSpacing.sm,
+                  BusyMarkSpacing.xs,
+                  BusyMarkSpacing.sm,
+                  0,
+                ),
+                itemBuilder: (context, index) {
+                  final entry = entries[index];
+                  return _WorkspaceTabButton(
+                    title: _tabTitle(context, workspace, entry),
+                    icon: _tabIcon(workspace, entry),
+                    diff: entry.kind == WorkspaceTabKind.gitDiff,
+                    active: entry.active,
+                    dirty: _tabDirty(workspace, entry),
+                    onSelected: () =>
+                        _selectTab(context, ref, workspace, entry),
+                    onClose: () => _closeTab(context, ref, workspace, entry),
+                  );
+                },
+                separatorBuilder: (context, index) =>
+                    const SizedBox(width: BusyMarkSpacing.xs),
+                itemCount: entries.length,
+              ),
+            ),
+            if (gitState.selectedDiffForDisplay == null)
+              if (state.activeBuffer case final buffer?) ...[
+                BusyMarkDocumentFormatIndicator(format: buffer.format),
+                const SizedBox(width: BusyMarkSpacing.xs),
+              ],
+          ],
         ),
       ),
     );
@@ -7055,7 +7932,8 @@ class _EditorTabStrip extends ConsumerWidget {
     WorkspaceTabEntry entry,
   ) {
     return switch (entry.kind) {
-      WorkspaceTabKind.file => _relativeDocumentPath(workspace, entry.path),
+      WorkspaceTabKind.file =>
+        entry.untitledName ?? _relativeDocumentPath(workspace, entry.path),
       WorkspaceTabKind.gitDiff =>
         entry.path.isEmpty ? context.l10n.gitDiff : _diffTabTitle(entry.path),
     };
@@ -7065,14 +7943,14 @@ class _EditorTabStrip extends ConsumerWidget {
     if (entry.kind == WorkspaceTabKind.gitDiff) {
       return null;
     }
-    final file = _documentFileForPath(workspace, entry.path);
+    final file = entry.path.isEmpty
+        ? null
+        : _documentFileForPath(workspace, entry.path);
     return _documentKindIcon(file?.kind ?? DocumentKind.markdown);
   }
 
   bool _tabDirty(Workspace workspace, WorkspaceTabEntry entry) {
-    return entry.kind == WorkspaceTabKind.file &&
-        entry.path == workspace.activeFilePath &&
-        state.isDirty;
+    return entry.kind == WorkspaceTabKind.file && entry.dirty;
   }
 
   Future<void> _selectTab(
@@ -7084,17 +7962,13 @@ class _EditorTabStrip extends ConsumerWidget {
     final gitController = ref.read(gitControllerProvider.notifier);
     switch (entry.kind) {
       case WorkspaceTabKind.file:
-        if (entry.path == workspace.activeFilePath) {
+        if (entry.bufferId == state.activeBufferId) {
           gitController.deactivateDiffFile();
           return;
         }
-        if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-            !context.mounted) {
-          return;
-        }
         await ref
             .read(workspaceControllerProvider.notifier)
-            .openActiveFile(entry.path);
+            .activateDocumentBuffer(entry.bufferId!);
         gitController.deactivateDiffFile();
       case WorkspaceTabKind.gitDiff:
         if (entry.path.isEmpty) {
@@ -7113,15 +7987,18 @@ class _EditorTabStrip extends ConsumerWidget {
     final gitController = ref.read(gitControllerProvider.notifier);
     switch (entry.kind) {
       case WorkspaceTabKind.file:
-        final currentWorkspaceFile = entry.path == workspace.activeFilePath;
-        if (currentWorkspaceFile &&
-            (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-                !context.mounted)) {
-          return;
+        final controller = ref.read(workspaceControllerProvider.notifier);
+        if (entry.dirty) {
+          if (entry.bufferId != state.activeBufferId) {
+            await controller.activateDocumentBuffer(entry.bufferId!);
+          }
+          if (!context.mounted ||
+              !await confirmSafeToCloseActiveDocument(context, ref) ||
+              !context.mounted) {
+            return;
+          }
         }
-        await ref
-            .read(workspaceControllerProvider.notifier)
-            .closeOpenFileTab(entry.path);
+        await controller.closeDocumentBuffer(entry.bufferId!);
         gitController.deactivateDiffFile();
       case WorkspaceTabKind.gitDiff:
         if (entry.path.isEmpty) {
@@ -7463,6 +8340,7 @@ class _GitDiffDocumentViewState extends State<_GitDiffDocumentView> {
               children: [
                 if (sourceVisible)
                   Expanded(
+                    key: const ValueKey('git-diff-source-pane'),
                     child: GitDiffViewer(
                       diff: diff,
                       hasUnsavedEditorChanges: widget.hasUnsavedEditorChanges,
@@ -7491,6 +8369,7 @@ class _GitDiffDocumentViewState extends State<_GitDiffDocumentView> {
                   ),
                 if (previewVisible)
                   Expanded(
+                    key: const ValueKey('git-diff-preview-pane'),
                     child: Column(
                       children: [
                         if (widget.comparisonLabel == null &&
@@ -8614,127 +9493,390 @@ class _EditorPreviewSplitState extends ConsumerState<_EditorPreviewSplit> {
         );
     final activeEditorPath = _activeEditorPath();
     final searchState = ref.watch(_workspaceSearchProvider);
+    final activeBuffer = widget.state.activeBuffer;
     return DecoratedBox(
       decoration: BoxDecoration(color: colors.view),
-      child: Row(
+      child: Column(
         children: [
-          if (wysiwygVisible)
-            Expanded(
-              child: BusyMarkWysiwygEditor(
-                document: wysiwygDocument,
-                headerBarService: headerBar,
-                workspaceRoot: _imageWorkspaceRoot(widget.state.workspace),
-                writersideRoot:
-                    widget.state.workspace?.writersideModule?.rootPath,
-                imagesDir:
-                    widget
-                        .state
-                        .workspace
-                        ?.writersideModule
-                        ?.effectiveImagesDir ??
-                    'images',
-                allowRemoteImages: allowRemoteImages,
-                onRemoteImageBlocked: () =>
-                    unawaited(_showRemoteImagesPrompt(context, ref)),
-                onDocumentChanged: _cacheWysiwygDocument,
-                onSourceChanged: _handleWysiwygSourceChanged,
-                toolbarPlacement: widget.editorToolbarPlacement,
-                toolbarDirection: widget.editorToolbarDirection,
-                onToolbarPlacementChanged: ref
-                    .read(appSettingsControllerProvider.notifier)
-                    .setEditorToolbarPlacement,
-                onToolbarDirectionChanged: ref
-                    .read(appSettingsControllerProvider.notifier)
-                    .setEditorToolbarDirection,
-                scrollToHeadingId: _wysiwygScrollHeadingId,
-                scrollToBlockId: _wysiwygScrollBlockId,
-                scrollToSearchQuery: _wysiwygSearchQuery,
-                scrollRequest: _wysiwygScrollRequest,
-                onVisibleHeadingChanged: _handleWysiwygVisibleHeadingChanged,
-                documentLayout: standaloneDocumentLayout,
-                visualizationRevision: ref
-                    .read(workspaceControllerProvider.notifier)
-                    .editRevision,
-                onOpenSearch: () => ref
-                    .read(workspaceSearchOpenRequestProvider.notifier)
-                    .request(),
-                onCloseSearch: () => ref
-                    .read(workspaceSearchCloseRequestProvider.notifier)
-                    .request(),
-                onAiEdit:
-                    (_activeDocumentKind(
-                          widget.state.workspace,
-                        )?.supportsAiMarkdownEditing ??
-                        false)
-                    ? (snapshot) => showBusyMarkAiEdit(context, ref, snapshot)
-                    : null,
+          if (activeBuffer?.recovered == true)
+            _RecoveredDocumentBanner(
+              buffer: activeBuffer!,
+              onSave: () => unawaited(
+                (BusyMarkCommandRegistryScope.read(context) ??
+                        BusyMarkCommandCatalog.metadata)
+                    .execute(BusyMarkCommandIds.save),
+              ),
+              onSaveAs: () => unawaited(saveActiveToNewLocation(context, ref)),
+              onDiscard: () => unawaited(
+                activeBuffer.deletedOnDisk
+                    ? ref
+                          .read(workspaceControllerProvider.notifier)
+                          .closeDocumentBuffer(activeBuffer.id, discard: true)
+                    : ref
+                          .read(workspaceControllerProvider.notifier)
+                          .discardActiveChanges(),
               ),
             ),
-          if (sourceVisible)
-            Expanded(
-              child: BusyMarkSourceEditor(
-                key: _sourceEditorKey,
-                text: widget.state.activeText,
-                language: _sourceSyntaxLanguage(widget.state.workspace),
-                filePath: activeEditorPath,
-                diagnostics:
-                    widget.state.workspace?.diagnostics ?? const <Diagnostic>[],
-                editorFontSize: widget.editorFontSize,
-                wordWrap: widget.wordWrap,
-                searchActive: searchState.active,
-                searchOptions: searchState.options,
-                onSearchOptionsChanged: (options) {
-                  final current = ref.read(_workspaceSearchProvider);
-                  ref
-                      .read(_workspaceSearchProvider.notifier)
-                      .set(current.withOptions(options));
-                },
-                onOpenSearch: () => ref
-                    .read(workspaceSearchOpenRequestProvider.notifier)
-                    .request(),
-                onCloseSearch: () => ref
-                    .read(workspaceSearchCloseRequestProvider.notifier)
-                    .request(),
-                onVisibleLineChanged: _handleSourceVisibleLineChanged,
-                onChanged: _handleSourceChanged,
-                editRevision: ref
-                    .read(workspaceControllerProvider.notifier)
-                    .editRevision,
-                onAiEdit:
-                    (_activeDocumentKind(
-                          widget.state.workspace,
-                        )?.supportsAiMarkdownEditing ??
-                        false)
-                    ? (snapshot) => showBusyMarkAiEdit(context, ref, snapshot)
-                    : null,
+          if (activeBuffer != null &&
+              activeBuffer.diskState != DocumentDiskState.present &&
+              activeBuffer.diskState != DocumentDiskState.changed)
+            _ExternalFileBanner(
+              buffer: activeBuffer,
+              onCompare: activeBuffer.diskVersionText == null
+                  ? null
+                  : () => _showExternalFileComparison(context, activeBuffer),
+              onReload: activeBuffer.filePath == null
+                  ? null
+                  : () => unawaited(
+                      ref
+                          .read(workspaceControllerProvider.notifier)
+                          .reloadBufferFromDisk(activeBuffer.id),
+                    ),
+              onKeepMine: () => ref
+                  .read(workspaceControllerProvider.notifier)
+                  .keepBufferVersion(activeBuffer.id),
+              onSave: () => unawaited(
+                (BusyMarkCommandRegistryScope.read(context) ??
+                        BusyMarkCommandCatalog.metadata)
+                    .execute(BusyMarkCommandIds.save),
               ),
+              onSaveAs: () => unawaited(saveActiveToNewLocation(context, ref)),
             ),
-          if (sourceVisible && previewVisible)
-            VerticalDivider(
-              width: BusyMarkStroke.hairline,
-              color: colors.subtleBorder,
+          Expanded(
+            child: Row(
+              children: [
+                if (wysiwygVisible)
+                  Expanded(
+                    key: const ValueKey('document-wysiwyg-pane'),
+                    child: BusyMarkWysiwygEditor(
+                      document: wysiwygDocument,
+                      documentId: activeBuffer?.id,
+                      initialSessionState:
+                          activeBuffer?.editorState.wysiwygState ??
+                          const WysiwygEditorSessionState(),
+                      useExternalUndoHistory: true,
+                      onSessionChanged: (documentId, session) {
+                        final latest = ref
+                            .read(workspaceControllerProvider)
+                            .documentBuffers
+                            .where((buffer) => buffer.id == documentId)
+                            .firstOrNull;
+                        if (latest == null ||
+                            _sameWysiwygSession(
+                              latest.editorState.wysiwygState,
+                              session,
+                            )) {
+                          return;
+                        }
+                        ref
+                            .read(workspaceControllerProvider.notifier)
+                            .updateDocumentEditorState(
+                              documentId,
+                              latest.editorState.copyWith(
+                                wysiwygState: session,
+                              ),
+                            );
+                      },
+                      headerBarService: headerBar,
+                      workspaceRoot: _imageWorkspaceRoot(
+                        widget.state.workspace,
+                      ),
+                      writersideRoot:
+                          widget.state.workspace?.writersideModule?.rootPath,
+                      imagesDir:
+                          widget
+                              .state
+                              .workspace
+                              ?.writersideModule
+                              ?.effectiveImagesDir ??
+                          'images',
+                      assetWorkspaceKind:
+                          switch (widget.state.workspace?.kind) {
+                            WorkspaceKind.writersideModule =>
+                              AssetWorkspaceKind.writerside,
+                            WorkspaceKind.markdownFolder =>
+                              AssetWorkspaceKind.markdownWorkspace,
+                            WorkspaceKind.singleMarkdown =>
+                              AssetWorkspaceKind.standalone,
+                            WorkspaceKind.untitledMarkdown ||
+                            null => AssetWorkspaceKind.standalone,
+                          },
+                      onAssetSaveRequired: () =>
+                          unawaited(saveActiveToNewLocation(context, ref)),
+                      allowRemoteImages: allowRemoteImages,
+                      onRemoteImageBlocked: () =>
+                          unawaited(_showRemoteImagesPrompt(context, ref)),
+                      onDocumentChanged: _cacheWysiwygDocument,
+                      onSourceChanged: _handleWysiwygSourceChanged,
+                      toolbarPlacement: widget.editorToolbarPlacement,
+                      toolbarDirection: widget.editorToolbarDirection,
+                      onToolbarPlacementChanged: ref
+                          .read(appSettingsControllerProvider.notifier)
+                          .setEditorToolbarPlacement,
+                      onToolbarDirectionChanged: ref
+                          .read(appSettingsControllerProvider.notifier)
+                          .setEditorToolbarDirection,
+                      scrollToHeadingId: _wysiwygScrollHeadingId,
+                      scrollToBlockId: _wysiwygScrollBlockId,
+                      scrollToSearchQuery: _wysiwygSearchQuery,
+                      scrollRequest: _wysiwygScrollRequest,
+                      onVisibleHeadingChanged:
+                          _handleWysiwygVisibleHeadingChanged,
+                      documentLayout: standaloneDocumentLayout,
+                      visualizationRevision: ref
+                          .read(workspaceControllerProvider.notifier)
+                          .editRevision,
+                      onOpenSearch: () => ref
+                          .read(workspaceSearchOpenRequestProvider.notifier)
+                          .request(),
+                      onCloseSearch: () => ref
+                          .read(workspaceSearchCloseRequestProvider.notifier)
+                          .request(),
+                      onUndo: () => ref
+                          .read(workspaceControllerProvider.notifier)
+                          .undoActiveBuffer(),
+                      onRedo: () => ref
+                          .read(workspaceControllerProvider.notifier)
+                          .redoActiveBuffer(),
+                      onAiEdit:
+                          (_activeDocumentKind(
+                                widget.state.workspace,
+                              )?.supportsAiMarkdownEditing ??
+                              false)
+                          ? (snapshot) =>
+                                showBusyMarkAiEdit(context, ref, snapshot)
+                          : null,
+                      onMathDiagnostic: (expressionId, code, sourceSpan) => ref
+                          .read(workspaceControllerProvider.notifier)
+                          .updateMathRenderDiagnostic(
+                            expressionId: expressionId,
+                            code: code,
+                            sourceSpan: sourceSpan,
+                          ),
+                    ),
+                  ),
+                if (sourceVisible)
+                  Expanded(
+                    key: const ValueKey('document-source-pane'),
+                    child: BusyMarkSourceEditor(
+                      key: _sourceEditorKey,
+                      text: widget.state.activeText,
+                      language: _sourceSyntaxLanguage(widget.state.workspace),
+                      filePath: activeEditorPath,
+                      documentId: activeBuffer?.id,
+                      diagnostics:
+                          widget.state.workspace?.allDiagnostics ??
+                          const <Diagnostic>[],
+                      editorFontSize: widget.editorFontSize,
+                      wordWrap: widget.wordWrap,
+                      searchActive: searchState.active,
+                      searchOptions: searchState.options,
+                      searchReplacement:
+                          activeBuffer?.editorState.searchReplacement ?? '',
+                      onSearchReplacementChanged: activeBuffer == null
+                          ? null
+                          : (replacement) {
+                              final latest = ref
+                                  .read(workspaceControllerProvider)
+                                  .documentBuffers
+                                  .where(
+                                    (candidate) =>
+                                        candidate.id == activeBuffer.id,
+                                  )
+                                  .firstOrNull;
+                              if (latest != null) {
+                                ref
+                                    .read(workspaceControllerProvider.notifier)
+                                    .updateDocumentEditorState(
+                                      latest.id,
+                                      latest.editorState.copyWith(
+                                        searchReplacement: replacement,
+                                      ),
+                                    );
+                              }
+                            },
+                      onSearchOptionsChanged: (options) {
+                        final current = ref.read(_workspaceSearchProvider);
+                        ref
+                            .read(_workspaceSearchProvider.notifier)
+                            .set(current.withOptions(options));
+                      },
+                      initialSelection: activeBuffer?.editorState.selection,
+                      initialScrollOffset:
+                          activeBuffer?.editorState.scrollOffset ?? 0,
+                      initialFoldedRegionKeys:
+                          activeBuffer?.editorState.foldedRegionKeys ??
+                          const {},
+                      onSessionChanged: activeBuffer == null
+                          ? null
+                          : (selection, scrollOffset, foldedRegionKeys) {
+                              final latest = ref
+                                  .read(workspaceControllerProvider)
+                                  .documentBuffers
+                                  .where(
+                                    (candidate) =>
+                                        candidate.id == activeBuffer.id,
+                                  )
+                                  .firstOrNull;
+                              if (latest == null) {
+                                return;
+                              }
+                              ref
+                                  .read(workspaceControllerProvider.notifier)
+                                  .updateDocumentEditorState(
+                                    latest.id,
+                                    latest.editorState.copyWith(
+                                      selection: selection,
+                                      scrollOffset: scrollOffset,
+                                      foldedRegionKeys: foldedRegionKeys,
+                                    ),
+                                  );
+                            },
+                      onOpenSearch: () => ref
+                          .read(workspaceSearchOpenRequestProvider.notifier)
+                          .request(),
+                      onCloseSearch: () => ref
+                          .read(workspaceSearchCloseRequestProvider.notifier)
+                          .request(),
+                      onVisibleLineChanged: _handleSourceVisibleLineChanged,
+                      onChanged: _handleSourceChanged,
+                      onUndo: () {
+                        final controller = ref.read(
+                          workspaceControllerProvider.notifier,
+                        );
+                        return controller.undoActiveBuffer()
+                            ? ref.read(workspaceControllerProvider).activeText
+                            : null;
+                      },
+                      onRedo: () {
+                        final controller = ref.read(
+                          workspaceControllerProvider.notifier,
+                        );
+                        return controller.redoActiveBuffer()
+                            ? ref.read(workspaceControllerProvider).activeText
+                            : null;
+                      },
+                      editRevision: ref
+                          .read(workspaceControllerProvider.notifier)
+                          .editRevision,
+                      onAiEdit:
+                          (_activeDocumentKind(
+                                widget.state.workspace,
+                              )?.supportsAiMarkdownEditing ??
+                              false)
+                          ? (snapshot) =>
+                                showBusyMarkAiEdit(context, ref, snapshot)
+                          : null,
+                    ),
+                  ),
+                if (sourceVisible && previewVisible)
+                  VerticalDivider(
+                    width: BusyMarkStroke.hairline,
+                    color: colors.subtleBorder,
+                  ),
+                if (previewVisible)
+                  Expanded(
+                    key: const ValueKey('document-preview-pane'),
+                    child: _PreviewPane(
+                      preview: widget.state.preview,
+                      workspace: widget.state.workspace,
+                      activeSource: widget.state.activeText,
+                      editRevision: ref
+                          .read(workspaceControllerProvider.notifier)
+                          .editRevision,
+                      visualizationsEnabled: true,
+                      onVisualizationDiagnostic: _openVisualizationSourceLine,
+                      onEditVisualizationSource: _openVisualizationSourceLine,
+                      controller: _previewScrollController,
+                      itemPositionsListener: _previewItemPositionsListener,
+                      onBlockContextAvailable: _rememberPreviewBlockContext,
+                      onBlockContextUnavailable: _forgetPreviewBlockContext,
+                      documentLayout: sourceVisible
+                          ? BusyMarkDocumentLayoutSpec.splitPreview
+                          : standaloneDocumentLayout,
+                    ),
+                  ),
+              ],
             ),
-          if (previewVisible)
-            Expanded(
-              child: _PreviewPane(
-                preview: widget.state.preview,
-                workspace: widget.state.workspace,
-                activeSource: widget.state.activeText,
-                editRevision: ref
-                    .read(workspaceControllerProvider.notifier)
-                    .editRevision,
-                visualizationsEnabled: true,
-                onVisualizationDiagnostic: _openVisualizationSourceLine,
-                onEditVisualizationSource: _openVisualizationSourceLine,
-                controller: _previewScrollController,
-                itemPositionsListener: _previewItemPositionsListener,
-                onBlockContextAvailable: _rememberPreviewBlockContext,
-                onBlockContextUnavailable: _forgetPreviewBlockContext,
-                documentLayout: sourceVisible
-                    ? BusyMarkDocumentLayoutSpec.splitPreview
-                    : standaloneDocumentLayout,
-              ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _showExternalFileComparison(
+    BuildContext context,
+    DocumentBuffer buffer,
+  ) async {
+    final diskText = buffer.diskVersionText;
+    if (diskText == null) {
+      return;
+    }
+    final path = buffer.filePath ?? buffer.displayName;
+    final diskLines = diskText.split('\n');
+    final mineLines = buffer.text.split('\n');
+    final lines = <GitDiffLine>[
+      for (final (index, line) in diskLines.indexed)
+        GitDiffLine(
+          kind: GitDiffLineKind.removed,
+          content: line,
+          oldLineNumber: index + 1,
+        ),
+      for (final (index, line) in mineLines.indexed)
+        GitDiffLine(
+          kind: GitDiffLineKind.added,
+          content: line,
+          newLineNumber: index + 1,
+        ),
+    ];
+    final diff = GitDiff(
+      title: context.l10n.externalChangesTitle(p.basename(path)),
+      rawPatch: '',
+      hasBinaryFiles: false,
+      files: [
+        GitDiffFile(
+          oldPath: path,
+          newPath: path,
+          status: GitDiffFileStatus.modified,
+          binary: false,
+          additions: mineLines.length,
+          deletions: diskLines.length,
+          hunks: [
+            GitDiffHunk(
+              oldStart: 1,
+              oldCount: diskLines.length,
+              newStart: 1,
+              newCount: mineLines.length,
+              heading: '',
+              lines: lines,
+            ),
+          ],
+        ),
+      ],
+    );
+    await showBusyMarkModalDialog<void>(
+      context,
+      builder: (context) => BusyMarkDialogShell(
+        title: diff.title,
+        maxWidth: BusyMarkSizes.dialogWide,
+        actions: [
+          BusyMarkDialogButton(
+            label: context.l10n.close,
+            onPressed: () => Navigator.pop(context),
+          ),
+        ],
+        children: [
+          SizedBox(
+            height: MediaQuery.sizeOf(context).height * 0.65,
+            child: GitDiffViewer(
+              diff: diff,
+              hasUnsavedEditorChanges: false,
+              showHeader: false,
+              showFileActions: false,
+              onOpenFile: (_) {},
+              onClose: () {},
             ),
+          ),
         ],
       ),
     );
@@ -9211,7 +10353,156 @@ DocumentOutlineHeading? _outlineHeadingAtOrBeforeLine(
     }
     result = heading;
   }
-  return result;
+  return result;
+}
+
+bool _sameWysiwygSession(
+  WysiwygEditorSessionState left,
+  WysiwygEditorSessionState right,
+) {
+  return left.activeBlockId == right.activeBlockId &&
+      left.anchorBlockId == right.anchorBlockId &&
+      left.anchorOffset == right.anchorOffset &&
+      left.extentBlockId == right.extentBlockId &&
+      left.extentOffset == right.extentOffset &&
+      left.viewportBlockId == right.viewportBlockId &&
+      (left.viewportAlignment - right.viewportAlignment).abs() < 0.001;
+}
+
+class _ExternalFileBanner extends StatelessWidget {
+  const _ExternalFileBanner({
+    required this.buffer,
+    required this.onCompare,
+    required this.onReload,
+    required this.onKeepMine,
+    required this.onSave,
+    required this.onSaveAs,
+  });
+
+  final DocumentBuffer buffer;
+  final VoidCallback? onCompare;
+  final VoidCallback? onReload;
+  final VoidCallback onKeepMine;
+  final VoidCallback onSave;
+  final VoidCallback onSaveAs;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    final deleted = buffer.deletedOnDisk;
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        color: colors.admonitionWarning,
+        border: Border(bottom: BorderSide(color: colors.subtleBorder)),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: BusyMarkSpacing.md,
+          vertical: BusyMarkSpacing.sm,
+        ),
+        child: Row(
+          children: [
+            Icon(
+              deleted ? BusyMarkGlyphs.delete : BusyMarkGlyphs.warning,
+              size: BusyMarkSizes.iconSm,
+            ),
+            const SizedBox(width: BusyMarkSpacing.sm),
+            Expanded(
+              child: Text(
+                deleted
+                    ? context.l10n.externalFileDeleted
+                    : context.l10n.externalFileChanged,
+              ),
+            ),
+            if (onCompare != null)
+              BusyMarkPushButton.standard(
+                onPressed: onCompare,
+                child: Text(context.l10n.compare),
+              ),
+            if (onReload != null) ...[
+              const SizedBox(width: BusyMarkSpacing.xs),
+              BusyMarkPushButton.standard(
+                onPressed: onReload,
+                child: Text(context.l10n.reloadFromDisk),
+              ),
+            ],
+            const SizedBox(width: BusyMarkSpacing.xs),
+            BusyMarkPushButton.standard(
+              onPressed: onKeepMine,
+              child: Text(context.l10n.keepMine),
+            ),
+            const SizedBox(width: BusyMarkSpacing.xs),
+            BusyMarkPushButton.standard(
+              onPressed: onSave,
+              child: Text(context.l10n.save),
+            ),
+            const SizedBox(width: BusyMarkSpacing.xs),
+            BusyMarkPushButton.standard(
+              onPressed: onSaveAs,
+              child: Text(context.l10n.saveAs),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _RecoveredDocumentBanner extends StatelessWidget {
+  const _RecoveredDocumentBanner({
+    required this.buffer,
+    required this.onSave,
+    required this.onSaveAs,
+    required this.onDiscard,
+  });
+
+  final DocumentBuffer buffer;
+  final VoidCallback onSave;
+  final VoidCallback onSaveAs;
+  final VoidCallback onDiscard;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = BusyMarkSurfaceColors.of(context);
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        color: colors.admonitionTip,
+        border: Border(bottom: BorderSide(color: colors.subtleBorder)),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: BusyMarkSpacing.md,
+          vertical: BusyMarkSpacing.sm,
+        ),
+        child: Row(
+          children: [
+            const Icon(BusyMarkGlyphs.history, size: BusyMarkSizes.iconSm),
+            const SizedBox(width: BusyMarkSpacing.sm),
+            Expanded(
+              child: Text(
+                context.l10n.recoveredDocumentReview(buffer.displayName),
+              ),
+            ),
+            BusyMarkPushButton.standard(
+              onPressed: onSave,
+              child: Text(context.l10n.save),
+            ),
+            const SizedBox(width: BusyMarkSpacing.xs),
+            BusyMarkPushButton.standard(
+              onPressed: onSaveAs,
+              child: Text(context.l10n.saveAs),
+            ),
+            const SizedBox(width: BusyMarkSpacing.xs),
+            BusyMarkPushButton.destructive(
+              context: context,
+              onPressed: onDiscard,
+              child: Text(context.l10n.discard),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }
 
 class _PreviewPane extends StatelessWidget {
@@ -9257,17 +10548,18 @@ class _PreviewPane extends StatelessWidget {
     return DecoratedBox(
       decoration: BoxDecoration(color: colors.view),
       child: SelectionArea(
-        child: BusyMarkDocumentContentFrame(
-          layout: documentLayout,
-          contentKey: const ValueKey('preview-document-content'),
-          child: ScrollablePositionedList.builder(
-            key: const ValueKey('preview-document-scroll'),
-            itemScrollController: controller,
-            itemPositionsListener: itemPositionsListener,
-            padding: documentLayout.scrollPadding,
-            itemCount: document.blocks.length,
-            itemBuilder: (context, index) =>
-                _keyedPreviewBlock(context, index, document.blocks[index]),
+        child: ScrollablePositionedList.builder(
+          key: const ValueKey('preview-document-scroll'),
+          itemScrollController: controller,
+          itemPositionsListener: itemPositionsListener,
+          padding: documentLayout.scrollPadding,
+          itemCount: document.blocks.length,
+          itemBuilder: (context, index) => BusyMarkDocumentContentFrame(
+            layout: documentLayout,
+            contentKey: index == 0
+                ? const ValueKey('preview-document-content')
+                : null,
+            child: _keyedPreviewBlock(context, index, document.blocks[index]),
           ),
         ),
       ),
@@ -9359,7 +10651,7 @@ class _PreviewBlockContextAnchorState
   }
 }
 
-class _PreviewBlockView extends StatelessWidget {
+class _PreviewBlockView extends ConsumerWidget {
   const _PreviewBlockView(
     this.block, {
     required this.workspace,
@@ -9385,7 +10677,7 @@ class _PreviewBlockView extends StatelessWidget {
   final ValueChanged<int>? onEditVisualizationSource;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final colors = BusyMarkSurfaceColors.of(context);
     final displayBlock = _localizedPreviewBlock(context, block);
     final inheritedDirection = Directionality.of(context);
@@ -9394,6 +10686,33 @@ class _PreviewBlockView extends StatelessWidget {
       inheritedDirection,
     );
     final child = switch (displayBlock.kind) {
+      PreviewBlockKind.heading
+          when busyMarkWritersideIsCollapsible(displayBlock.attributes) =>
+        BusyMarkDocumentCollapsible(
+          key: ValueKey(
+            'preview-collapsible-${displayBlock.attributes['editorBlockId'] ?? displayBlock.attributes['id'] ?? displayBlock.sourceStartOffset}',
+          ),
+          initiallyExpanded: busyMarkWritersideInitiallyExpanded(
+            displayBlock.attributes,
+          ),
+          kindLabel: displayBlock.text.isEmpty
+              ? context.l10n.chapter
+              : displayBlock.text,
+          margin: first
+              ? BusyMarkInsets.documentHeadingBlock.copyWith(top: 0)
+              : BusyMarkInsets.documentHeadingBlock,
+          header: _PreviewInlineText(
+            key: headingKey,
+            block: displayBlock,
+            style: _diffPreviewTextStyle(
+              context,
+              displayBlock,
+              busyMarkDocumentHeadingTextStyle(context, displayBlock.level),
+            ),
+            editRevision: editRevision,
+          ),
+          child: _previewChildBlocks(displayBlock.children, first: true),
+        ),
       PreviewBlockKind.heading => Padding(
         padding: first
             ? BusyMarkInsets.documentHeadingBlock.copyWith(top: 0)
@@ -9406,11 +10725,68 @@ class _PreviewBlockView extends StatelessWidget {
             displayBlock,
             busyMarkDocumentHeadingTextStyle(context, displayBlock.level),
           ),
+          editRevision: editRevision,
+        ),
+      ),
+      PreviewBlockKind.math => Padding(
+        padding: first
+            ? BusyMarkInsets.documentParagraphBlock.copyWith(top: 0)
+            : BusyMarkInsets.documentParagraphBlock,
+        child: BusyMarkDisplayMath(
+          expression: displayBlock.text,
+          expressionId:
+              displayBlock.attributes['expressionId'] ??
+              'display-${displayBlock.sourceStartOffset ?? 0}',
+          editRevision: editRevision,
+          onFailure: (failure) => _reportMathDiagnostic(
+            ref,
+            displayBlock,
+            displayBlock.attributes['expressionId'] ??
+                'display-${displayBlock.sourceStartOffset ?? 0}',
+            failure.code,
+          ),
+          onSuccess: () => _reportMathDiagnostic(
+            ref,
+            displayBlock,
+            displayBlock.attributes['expressionId'] ??
+                'display-${displayBlock.sourceStartOffset ?? 0}',
+            null,
+          ),
         ),
       ),
       PreviewBlockKind.code
-          when visualizationsEnabled && displayBlock.visualization != null =>
+          when visualizationsEnabled &&
+              displayBlock.visualization != null &&
+              !busyMarkWritersideIsCollapsible(displayBlock.attributes) =>
         _visualizationCard(displayBlock),
+      PreviewBlockKind.code
+          when busyMarkWritersideIsCollapsible(displayBlock.attributes) =>
+        BusyMarkDocumentCollapsible(
+          key: ValueKey(
+            'preview-collapsible-${displayBlock.attributes['editorBlockId'] ?? displayBlock.sourceStartOffset}',
+          ),
+          initiallyExpanded: busyMarkWritersideInitiallyExpanded(
+            displayBlock.attributes,
+          ),
+          kindLabel: _collapsibleCodeTitle(context, displayBlock),
+          framed: true,
+          margin: BusyMarkInsets.documentCodeBlock,
+          header: Text(
+            _collapsibleCodeTitle(context, displayBlock),
+            style: busyMarkDocumentCodeTextStyle(context),
+          ),
+          child: Padding(
+            padding: BusyMarkInsets.documentCodeContent,
+            child: Text.rich(
+              _diffPreviewCodeTextSpan(
+                context,
+                displayBlock,
+                busyMarkDocumentCodeTextStyle(context),
+              ),
+              textDirection: blockDirection,
+            ),
+          ),
+        ),
       PreviewBlockKind.code => BusyMarkDocumentCodeBlock(
         backgroundColor: _diffPreviewCodeBackground(context, displayBlock),
         child: Text.rich(
@@ -9426,20 +10802,110 @@ class _PreviewBlockView extends StatelessWidget {
         block: displayBlock,
         workspace: workspace,
       ),
+      PreviewBlockKind.video => _PreviewVideoBlock(
+        block: displayBlock,
+        workspace: workspace,
+      ),
       PreviewBlockKind.admonition => BusyMarkDocumentAdmonition(
         style: displayBlock.attributes['style'],
-        child: _PreviewInlineText(
-          block: displayBlock,
-          style: _diffPreviewTextStyle(context, displayBlock, null),
-        ),
+        child: displayBlock.children.isEmpty
+            ? _PreviewInlineText(
+                block: displayBlock,
+                style: _diffPreviewTextStyle(context, displayBlock, null),
+                editRevision: editRevision,
+              )
+            : _previewChildBlocks(displayBlock.children, first: true),
       ),
       PreviewBlockKind.tabs => BusyMarkDocumentCallout(
         icon: BusyMarkGlyphs.tab,
         child: Text(displayBlock.text),
       ),
+      PreviewBlockKind.procedure
+          when busyMarkWritersideIsCollapsible(displayBlock.attributes) =>
+        BusyMarkDocumentCollapsible(
+          key: ValueKey(
+            'preview-collapsible-${displayBlock.attributes['editorBlockId'] ?? displayBlock.sourceStartOffset}',
+          ),
+          initiallyExpanded: busyMarkWritersideInitiallyExpanded(
+            displayBlock.attributes,
+          ),
+          kindLabel: displayBlock.text.isEmpty
+              ? context.l10n.procedure
+              : displayBlock.text,
+          framed: true,
+          header: Text(
+            displayBlock.text,
+            style: busyMarkDocumentBodyTextStyle(
+              context,
+            ).copyWith(fontWeight: FontWeight.w600),
+          ),
+          child: Padding(
+            padding: const EdgeInsetsDirectional.only(
+              start: BusyMarkSpacing.md,
+              end: BusyMarkSpacing.md,
+              bottom: BusyMarkSpacing.md,
+            ),
+            child: _previewChildBlocks(displayBlock.children, first: true),
+          ),
+        ),
       PreviewBlockKind.procedure => BusyMarkDocumentCallout(
         icon: BusyMarkGlyphs.orderedList,
-        child: Text(displayBlock.text),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            if (displayBlock.text.isNotEmpty) Text(displayBlock.text),
+            if (displayBlock.children.isNotEmpty)
+              _previewChildBlocks(displayBlock.children, first: true),
+          ],
+        ),
+      ),
+      PreviewBlockKind.definitionList => _previewChildBlocks(
+        displayBlock.children,
+        first: true,
+      ),
+      PreviewBlockKind.definition
+          when busyMarkWritersideIsCollapsible(displayBlock.attributes) =>
+        BusyMarkDocumentCollapsible(
+          key: ValueKey(
+            'preview-definition-${displayBlock.text}-${displayBlock.sourceStartOffset}',
+          ),
+          initiallyExpanded: busyMarkWritersideInitiallyExpanded(
+            displayBlock.attributes,
+          ),
+          kindLabel: displayBlock.text,
+          framed: true,
+          header: _PreviewInlineText(
+            block: displayBlock,
+            style: busyMarkDocumentBodyTextStyle(
+              context,
+            ).copyWith(fontWeight: FontWeight.w600),
+            editRevision: editRevision,
+          ),
+          child: Padding(
+            padding: const EdgeInsetsDirectional.only(
+              start: BusyMarkSpacing.md,
+              end: BusyMarkSpacing.md,
+              bottom: BusyMarkSpacing.md,
+            ),
+            child: _previewChildBlocks(displayBlock.children, first: true),
+          ),
+        ),
+      PreviewBlockKind.definition => BusyMarkDocumentCallout(
+        icon: BusyMarkGlyphs.info,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            _PreviewInlineText(
+              block: displayBlock,
+              style: busyMarkDocumentBodyTextStyle(
+                context,
+              ).copyWith(fontWeight: FontWeight.w600),
+              editRevision: editRevision,
+            ),
+            if (displayBlock.children.isNotEmpty)
+              _previewChildBlocks(displayBlock.children, first: true),
+          ],
+        ),
       ),
       PreviewBlockKind.list => Padding(
         padding: busyMarkDocumentListItemPadding(
@@ -9468,6 +10934,7 @@ class _PreviewBlockView extends StatelessWidget {
                   child: _PreviewInlineText(
                     block: displayBlock,
                     style: _diffPreviewTextStyle(context, displayBlock, null),
+                    editRevision: editRevision,
                   ),
                 ),
               ],
@@ -9488,11 +10955,15 @@ class _PreviewBlockView extends StatelessWidget {
             ? _PreviewInlineText(
                 block: displayBlock,
                 style: _diffPreviewTextStyle(context, displayBlock, null),
+                editRevision: editRevision,
               )
             : _previewChildBlocks(displayBlock.children, first: true),
       ),
       PreviewBlockKind.thematicBreak => const BusyMarkDocumentThematicBreak(),
-      PreviewBlockKind.table => _PreviewTable(block: displayBlock),
+      PreviewBlockKind.table => _PreviewTable(
+        block: displayBlock,
+        editRevision: editRevision,
+      ),
       PreviewBlockKind.container
           when displayBlock.attributes['htmlTag'] == 'figure' =>
         _PreviewFigure(block: displayBlock, workspace: workspace, first: first),
@@ -9517,6 +10988,7 @@ class _PreviewBlockView extends StatelessWidget {
         child: _PreviewInlineText(
           block: displayBlock,
           style: _diffPreviewTextStyle(context, displayBlock, null),
+          editRevision: editRevision,
         ),
       ),
     };
@@ -9525,6 +10997,35 @@ class _PreviewBlockView extends StatelessWidget {
         : Directionality(textDirection: blockDirection, child: child);
   }
 
+  void _reportMathDiagnostic(
+    WidgetRef ref,
+    PreviewBlock sourceBlock,
+    String expressionId,
+    String? code,
+  ) {
+    ref
+        .read(workspaceControllerProvider.notifier)
+        .updateMathRenderDiagnostic(
+          expressionId: expressionId,
+          code: code,
+          sourceSpan: _previewMathSourceSpan(workspace, sourceBlock),
+        );
+  }
+
+  String _collapsibleCodeTitle(BuildContext context, PreviewBlock block) {
+    final configured = block
+        .attributes[busyMarkWritersideCollapsedTitleAttribute]
+        ?.trim();
+    if (configured != null && configured.isNotEmpty) {
+      return configured;
+    }
+    final firstLine = block.text
+        .split('\n')
+        .map((line) => line.trim())
+        .firstWhere((line) => line.isNotEmpty, orElse: () => '');
+    return firstLine.isEmpty ? context.l10n.codeBlock : firstLine;
+  }
+
   Color _diffPreviewCodeBackground(BuildContext context, PreviewBlock block) {
     final colors = BusyMarkSurfaceColors.of(context);
     if (_diffPreviewCodeLineTones(block).isNotEmpty) {
@@ -9550,6 +11051,7 @@ class _PreviewBlockView extends StatelessWidget {
       key: ValueKey('visualization-$documentPath-$blockIdentity'),
       descriptor: descriptor,
       source: block.text,
+      sourceReference: block.attributes['src'],
       sourceFence: _visualizationSourceFence(block, descriptor),
       documentPath: documentPath,
       workspaceRoot: workspace?.rootPath ?? '',
@@ -9680,6 +11182,7 @@ class _PreviewBlockView extends StatelessWidget {
         element == 'chapter' ? context.l10n.chapter : context.l10n.topic,
       PreviewBlockKind.code => context.l10n.codeBlock,
       PreviewBlockKind.image => context.l10n.image,
+      PreviewBlockKind.video => context.l10n.video,
       PreviewBlockKind.admonition => switch (block.attributes['style']) {
         'warning' => context.l10n.warning,
         'tip' => context.l10n.tip,
@@ -9689,6 +11192,8 @@ class _PreviewBlockView extends StatelessWidget {
         element == 'tab' ? context.l10n.tab : context.l10n.tabs,
       PreviewBlockKind.procedure =>
         element == 'step' ? context.l10n.step : context.l10n.procedure,
+      PreviewBlockKind.definitionList ||
+      PreviewBlockKind.definition => block.text,
       PreviewBlockKind.paragraph =>
         element == 'a'
             ? context.l10n.link
@@ -9737,9 +11242,10 @@ String _previewDirectionalText(PreviewBlock block) {
 }
 
 class _PreviewTable extends StatelessWidget {
-  const _PreviewTable({required this.block});
+  const _PreviewTable({required this.block, this.editRevision = 0});
 
   final PreviewBlock block;
+  final int editRevision;
 
   @override
   Widget build(BuildContext context) {
@@ -9777,6 +11283,7 @@ class _PreviewTable extends StatelessWidget {
                       child: index < row.children.length
                           ? _PreviewInlineText(
                               block: row.children[index],
+                              editRevision: editRevision,
                               style: row.attributes['header'] == 'true'
                                   ? busyMarkDocumentBodyTextStyle(
                                       context,
@@ -9795,10 +11302,16 @@ class _PreviewTable extends StatelessWidget {
 }
 
 class _PreviewInlineText extends ConsumerWidget {
-  const _PreviewInlineText({super.key, required this.block, this.style});
+  const _PreviewInlineText({
+    super.key,
+    required this.block,
+    this.style,
+    this.editRevision = 0,
+  });
 
   final PreviewBlock block;
   final TextStyle? style;
+  final int editRevision;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -9813,6 +11326,16 @@ class _PreviewInlineText extends ConsumerWidget {
     final inlines = block.inlines.isEmpty
         ? [PreviewInline(kind: PreviewInlineKind.text, text: block.text)]
         : block.inlines;
+    void reportMathDiagnostic(String expressionId, String? code) {
+      ref
+          .read(workspaceControllerProvider.notifier)
+          .updateMathRenderDiagnostic(
+            expressionId: expressionId,
+            code: code,
+            sourceSpan: _previewMathSourceSpan(workspace, block),
+          );
+    }
+
     return Padding(
       padding: const EdgeInsetsDirectional.only(
         end: BusyMarkDocumentTextGeometry.editableLayoutInset,
@@ -9832,6 +11355,8 @@ class _PreviewInlineText extends ConsumerWidget {
                     unawaited(_showRemoteImagesPrompt(context, ref)),
                 onLinkTap: (destination) =>
                     _openPreviewLink(context, ref, destination),
+                editRevision: editRevision,
+                onMathDiagnostic: reportMathDiagnostic,
               ),
           ],
         ),
@@ -10201,6 +11726,50 @@ class _PreviewImageBlock extends ConsumerWidget {
   }
 }
 
+class _PreviewVideoBlock extends ConsumerWidget {
+  const _PreviewVideoBlock({required this.block, required this.workspace});
+
+  final PreviewBlock block;
+  final Workspace? workspace;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final activeFilePath =
+        workspace?.activeFilePath ?? workspace?.markdown?.filePath ?? '';
+    final settings = ref.watch(appSettingsControllerProvider);
+    final allowRemoteImages = settings.allowsRemoteImagesForWorkspace(
+      _remoteImageWorkspacePath(workspace),
+    );
+    final source = block.attributes['src'] ?? block.text;
+    return Padding(
+      padding: BusyMarkInsets.documentImageBlock,
+      child: Align(
+        alignment: AlignmentDirectional.centerStart,
+        child: BusyMarkWritersideVideoView(
+          source: source,
+          previewSource: block.attributes['preview-src'],
+          activeFilePath: activeFilePath,
+          workspaceRoot: _imageWorkspaceRoot(workspace),
+          writersideRoot: workspace?.writersideModule?.rootPath,
+          imagesDir:
+              workspace?.writersideModule?.effectiveImagesDir ?? 'images',
+          allowRemoteImages: allowRemoteImages,
+          onRemoteImageBlocked: () =>
+              unawaited(_showRemoteImagesPrompt(context, ref)),
+          onOpenFailed: () => _showPreviewLinkMessage(
+            context,
+            context.l10n.couldNotOpenTarget(source),
+          ),
+          width: busyMarkVideoDimension(block.attributes['width']),
+          height: busyMarkVideoDimension(block.attributes['height']),
+          miniPlayer: block.attributes['mini-player'] == 'true',
+          borderEffect: block.attributes['border-effect'] ?? 'none',
+        ),
+      ),
+    );
+  }
+}
+
 String? _imageWorkspaceRoot(Workspace? workspace) {
   if (workspace == null) {
     return null;
@@ -10257,6 +11826,8 @@ InlineSpan _previewInlineSpan(
   required bool allowRemoteImages,
   required VoidCallback? onRemoteImageBlocked,
   required Future<void> Function(String destination) onLinkTap,
+  required int editRevision,
+  required void Function(String expressionId, String? code) onMathDiagnostic,
   String? inheritedLinkDestination,
   TextStyle? inheritedStyle,
 }) {
@@ -10296,6 +11867,8 @@ InlineSpan _previewInlineSpan(
       allowRemoteImages: allowRemoteImages,
       onRemoteImageBlocked: onRemoteImageBlocked,
       onLinkTap: onLinkTap,
+      editRevision: editRevision,
+      onMathDiagnostic: onMathDiagnostic,
       inheritedLinkDestination: linkDestination,
       inheritedStyle: style,
     );
@@ -10424,9 +11997,55 @@ InlineSpan _previewInlineSpan(
         TextStyle(color: colors.mutedForeground, fontStyle: FontStyle.italic),
       ),
     ),
+    PreviewInlineKind.math => WidgetSpan(
+      alignment: PlaceholderAlignment.baseline,
+      baseline: TextBaseline.alphabetic,
+      child: BusyMarkInlineMath(
+        expression: inline.text,
+        expressionId:
+            inline.attributes['expressionId'] ??
+            'inline-${Object.hash(inline.text, inline.attributes)}',
+        editRevision: editRevision,
+        textStyle: mergeStyle(null) ?? DefaultTextStyle.of(context).style,
+        onFailure: (failure) => onMathDiagnostic(
+          inline.attributes['expressionId'] ??
+              'inline-${Object.hash(inline.text, inline.attributes)}',
+          failure.code,
+        ),
+        onSuccess: () => onMathDiagnostic(
+          inline.attributes['expressionId'] ??
+              'inline-${Object.hash(inline.text, inline.attributes)}',
+          null,
+        ),
+      ),
+    ),
   };
 }
 
+SourceSpan? _previewMathSourceSpan(Workspace? workspace, PreviewBlock block) {
+  final filePath = workspace?.activeFilePath;
+  final startOffset = block.sourceStartOffset;
+  final endOffset = block.sourceEndOffset;
+  final startLine = block.sourceStartLine;
+  final endLine = block.sourceEndLine;
+  if (filePath == null ||
+      startOffset == null ||
+      endOffset == null ||
+      startLine == null ||
+      endLine == null) {
+    return null;
+  }
+  return SourceSpan(
+    filePath: filePath,
+    startOffset: startOffset,
+    endOffset: endOffset,
+    startLine: startLine,
+    startColumn: 1,
+    endLine: endLine,
+    endColumn: 1,
+  );
+}
+
 InlineSpan _previewInlineImageSpan(
   BuildContext context,
   PreviewInline inline,
@@ -10601,10 +12220,6 @@ Future<void> _openPreviewLink(
     return;
   }
   if (workspace.activeFilePath != file.absolutePath) {
-    if (!await saveOrConfirmSafeToChangeActiveFile(context, ref) ||
-        !context.mounted) {
-      return;
-    }
     await ref
         .read(workspaceControllerProvider.notifier)
         .openActiveFile(file.absolutePath);
@@ -10702,7 +12317,11 @@ void _navigatePreviewAnchor(
 }
 
 void _showPreviewLinkMessage(BuildContext context, String message) {
-  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message)));
+  BusyMarkToastOverlay.show(
+    context,
+    message: message,
+    priority: BusyMarkToastPriority.high,
+  );
 }
 
 enum _RemoteImagesPromptAction { cancel, allowWorkspace, allowAlways }
@@ -10790,7 +12409,7 @@ class _ProblemsList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final diagnostics = workspace.diagnostics;
+    final diagnostics = workspace.allDiagnostics;
     return BusyMarkGroupedSurface(
       child: diagnostics.isEmpty
           ? _EmptyPane(
@@ -10814,12 +12433,14 @@ class _SearchSidebar extends StatelessWidget {
     required this.results,
     required this.searching,
     required this.onOpenResult,
+    required this.onReviewReplacement,
   });
 
   final String query;
   final List<_WorkspaceSearchResult> results;
   final bool searching;
   final Future<void> Function(_WorkspaceSearchResult result) onOpenResult;
+  final Future<void> Function() onReviewReplacement;
 
   @override
   Widget build(BuildContext context) {
@@ -10845,44 +12466,194 @@ class _SearchSidebar extends StatelessWidget {
       );
     }
     final groups = _workspaceSearchFileGroups(results);
-    return ListView(
-      padding: BusyMarkInsets.sidebarList,
+    return Column(
       children: [
-        for (final group in groups) ...[
-          Padding(
-            padding: const EdgeInsets.fromLTRB(
-              BusyMarkSpacing.sm,
-              BusyMarkSpacing.sm,
-              BusyMarkSpacing.sm,
-              BusyMarkSpacing.xxs,
+        Padding(
+          padding: const EdgeInsets.fromLTRB(
+            BusyMarkSpacing.sm,
+            BusyMarkSpacing.sm,
+            BusyMarkSpacing.sm,
+            0,
+          ),
+          child: SizedBox(
+            width: double.infinity,
+            child: BusyMarkPushButton.standard(
+              onPressed: () => unawaited(onReviewReplacement()),
+              child: Text(context.l10n.workspaceReplace),
             ),
-            child: Text(
-              busyMarkLtrIsolateFor(context, group.relativePath),
-              maxLines: 1,
+          ),
+        ),
+        Expanded(
+          child: ListView(
+            padding: BusyMarkInsets.sidebarList,
+            children: [
+              for (final group in groups) ...[
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(
+                    BusyMarkSpacing.sm,
+                    BusyMarkSpacing.sm,
+                    BusyMarkSpacing.sm,
+                    BusyMarkSpacing.xxs,
+                  ),
+                  child: Text(
+                    busyMarkLtrIsolateFor(context, group.relativePath),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                      color: colors.mutedForeground,
+                      fontWeight: FontWeight.w700,
+                      letterSpacing: 0,
+                    ),
+                  ),
+                ),
+                for (final result in group.results) ...[
+                  _SearchResultRow(
+                    result: result,
+                    onOpen: () => onOpenResult(result),
+                  ),
+                  Divider(
+                    height: BusyMarkStroke.hairline,
+                    color: colors.subtleBorder,
+                  ),
+                ],
+              ],
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _WorkspaceReplacementReviewDialog extends StatefulWidget {
+  const _WorkspaceReplacementReviewDialog({required this.preview});
+
+  final WorkspaceReplacementPreview preview;
+
+  @override
+  State<_WorkspaceReplacementReviewDialog> createState() =>
+      _WorkspaceReplacementReviewDialogState();
+}
+
+class _WorkspaceReplacementReviewDialogState
+    extends State<_WorkspaceReplacementReviewDialog> {
+  late final Set<String> _selected = {
+    for (final file in widget.preview.files)
+      for (final match in file.matches) match.id,
+  };
+
+  @override
+  Widget build(BuildContext context) {
+    return BusyMarkModalEditorScaffold(
+      title: context.l10n.reviewReplacements,
+      cancelLabel: context.l10n.cancel,
+      saveLabel: context.l10n.applyReplacements,
+      onCancel: () => Navigator.pop(context),
+      onSave: _selected.isEmpty || !widget.preview.isComplete
+          ? null
+          : () => Navigator.pop(context, Set.unmodifiable(_selected)),
+      children: [
+        for (final file in widget.preview.files)
+          _replacementFileGroup(context, file),
+        if (widget.preview.issues.isNotEmpty)
+          BusyMarkGroupedList(
+            title: context.l10n.skippedFiles,
+            filled: true,
+            children: [
+              for (final issue in widget.preview.issues)
+                BusyMarkActionRow(
+                  title: busyMarkLtrIsolateFor(context, issue.filePath),
+                  subtitle: _workspaceReplacementIssueLabel(context, issue),
+                  leading: const Icon(BusyMarkGlyphs.warning),
+                ),
+            ],
+          ),
+        const SizedBox(height: BusyMarkSpacing.lg),
+      ],
+    );
+  }
+
+  Widget _replacementFileGroup(
+    BuildContext context,
+    WorkspaceReplacementFilePreview file,
+  ) {
+    final ids = file.matches.map((match) => match.id).toSet();
+    final selectedCount = ids.intersection(_selected).length;
+    return BusyMarkGroupedList(
+      title: busyMarkLtrIsolateFor(context, file.relativePath),
+      description: file.sourceKind == WorkspaceReplacementSourceKind.dirtyBuffer
+          ? context.l10n.workspaceReplaceDirtyBuffer
+          : context.l10n.workspaceReplaceDiskContent,
+      filled: true,
+      children: [
+        CheckboxListTile(
+          value: selectedCount == 0
+              ? false
+              : selectedCount == ids.length
+              ? true
+              : null,
+          tristate: true,
+          title: Text(context.l10n.selectFileMatches(file.matches.length)),
+          onChanged: (selected) {
+            setState(() {
+              if (selected == true) {
+                _selected.addAll(ids);
+              } else {
+                _selected.removeAll(ids);
+              }
+            });
+          },
+        ),
+        for (final match in file.matches)
+          CheckboxListTile(
+            value: _selected.contains(match.id),
+            title: Text(
+              '${match.original} → ${match.replacement}',
+              maxLines: 2,
               overflow: TextOverflow.ellipsis,
-              style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                color: colors.mutedForeground,
-                fontWeight: FontWeight.w700,
-                letterSpacing: 0,
-              ),
             ),
+            onChanged: (selected) {
+              setState(() {
+                if (selected == true) {
+                  _selected.add(match.id);
+                } else {
+                  _selected.remove(match.id);
+                }
+              });
+            },
           ),
-          for (final result in group.results) ...[
-            _SearchResultRow(
-              result: result,
-              onOpen: () => onOpenResult(result),
-            ),
-            Divider(
-              height: BusyMarkStroke.hairline,
-              color: colors.subtleBorder,
-            ),
-          ],
-        ],
       ],
     );
   }
 }
 
+String _workspaceReplacementIssueLabel(
+  BuildContext context,
+  WorkspaceReplacementIssue issue,
+) {
+  return switch (issue.kind) {
+    WorkspaceReplacementIssueKind.oversized =>
+      context.l10n.workspaceReplaceIssueOversized,
+    WorkspaceReplacementIssueKind.unreadable =>
+      context.l10n.workspaceReplaceIssueUnreadable,
+    WorkspaceReplacementIssueKind.invalidUtf8 =>
+      context.l10n.workspaceReplaceIssueInvalidUtf8,
+    WorkspaceReplacementIssueKind.truncated =>
+      context.l10n.workspaceReplaceIssueTruncated,
+    WorkspaceReplacementIssueKind.changedSincePreview =>
+      context.l10n.workspaceReplaceIssueFileChanged,
+    WorkspaceReplacementIssueKind.bufferRevisionChanged =>
+      context.l10n.workspaceReplaceIssueBufferChanged,
+    WorkspaceReplacementIssueKind.normalizationRequired =>
+      context.l10n.workspaceReplaceIssueNormalizationRequired,
+    WorkspaceReplacementIssueKind.partialApplicationConflict =>
+      '${context.l10n.workspaceReplaceIssuePartialConflict}'
+          '${issue.preservedPath == null ? '' : '\n${busyMarkLtrIsolateFor(context, issue.preservedPath!)}'}',
+    WorkspaceReplacementIssueKind.applyFailed =>
+      context.l10n.workspaceReplaceIssueApplyFailed,
+  };
+}
+
 class _SearchResultRow extends StatelessWidget {
   const _SearchResultRow({required this.result, required this.onOpen});
 
@@ -11331,23 +13102,24 @@ class _DiagnosticRow extends ConsumerWidget {
       child: InkWell(
         hoverColor: busyMarkRowHoverColor(context),
         onTap: () async {
-          if (await saveOrConfirmSafeToChangeActiveFile(context, ref)) {
-            await ref
-                .read(workspaceControllerProvider.notifier)
-                .openActiveFile(diagnostic.filePath);
-            final line = diagnostic.line;
-            if (line != null) {
-              ref
-                  .read(_sourceNavigationTargetProvider.notifier)
-                  .set(
-                    _SourceNavigationTarget(
-                      filePath: diagnostic.filePath,
-                      line: line,
-                    ),
-                  );
-            }
-            _clearGitDetailSelection(ref);
+          final opened = await ref
+              .read(workspaceControllerProvider.notifier)
+              .openActiveFile(diagnostic.filePath);
+          if (!opened || !context.mounted) {
+            return;
+          }
+          final line = diagnostic.line;
+          if (line != null) {
+            ref
+                .read(_sourceNavigationTargetProvider.notifier)
+                .set(
+                  _SourceNavigationTarget(
+                    filePath: diagnostic.filePath,
+                    line: line,
+                  ),
+                );
           }
+          _clearGitDetailSelection(ref);
         },
         child: Padding(
           padding: BusyMarkInsets.searchResultRow,
diff --git a/lib/src/workspace/recovery_persistence.dart b/lib/src/workspace/recovery_persistence.dart
new file mode 100644
index 00000000..d9281656
--- /dev/null
+++ b/lib/src/workspace/recovery_persistence.dart
@@ -0,0 +1,255 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+import 'document_buffer.dart';
+import 'session_persistence.dart';
+import 'text_format_metadata.dart';
+import 'workspace_file_snapshot.dart';
+
+class DocumentRecoveryEntry {
+  const DocumentRecoveryEntry({
+    required this.id,
+    required this.workspacePath,
+    required this.filePath,
+    required this.untitledName,
+    required this.text,
+    required this.lastSavedText,
+    required this.diskSnapshot,
+    required this.format,
+    required this.editorState,
+    required this.revision,
+  });
+
+  factory DocumentRecoveryEntry.fromBuffer(
+    DocumentBuffer buffer, {
+    required String? workspacePath,
+  }) {
+    return DocumentRecoveryEntry(
+      id: buffer.id,
+      workspacePath: workspacePath,
+      filePath: buffer.filePath,
+      untitledName: buffer.untitledName,
+      text: buffer.text,
+      lastSavedText: buffer.lastSavedText,
+      diskSnapshot: buffer.diskSnapshot,
+      format: buffer.format,
+      editorState: buffer.editorState,
+      revision: buffer.revision,
+    );
+  }
+
+  final String id;
+  final String? workspacePath;
+  final String? filePath;
+  final String? untitledName;
+  final String text;
+  final String lastSavedText;
+  final WorkspaceFileSnapshot? diskSnapshot;
+  final TextFormatMetadata format;
+  final DocumentEditorState editorState;
+  final int revision;
+
+  Map<String, Object?> toJson() => {
+    'id': id,
+    'workspacePath': workspacePath,
+    'filePath': filePath,
+    'untitledName': untitledName,
+    'text': text,
+    'lastSavedText': lastSavedText,
+    'diskSnapshot': diskSnapshot?.toJson(),
+    'format': format.toJson(),
+    'editorState': editorState.toJson(),
+    'revision': revision,
+  };
+
+  factory DocumentRecoveryEntry.fromJson(Map<String, Object?> json) {
+    final snapshot = json['diskSnapshot'];
+    return DocumentRecoveryEntry(
+      id: json['id']?.toString() ?? '',
+      workspacePath: json['workspacePath']?.toString(),
+      filePath: json['filePath']?.toString(),
+      untitledName: json['untitledName']?.toString(),
+      text: json['text']?.toString() ?? '',
+      lastSavedText: json['lastSavedText']?.toString() ?? '',
+      diskSnapshot: snapshot is Map
+          ? WorkspaceFileSnapshot.fromJson(snapshot.cast<String, Object?>())
+          : null,
+      format: TextFormatMetadata.fromJson(
+        (json['format'] as Map?)?.cast<String, Object?>() ?? const {},
+      ),
+      editorState: DocumentEditorState.fromJson(
+        (json['editorState'] as Map?)?.cast<String, Object?>() ?? const {},
+      ),
+      revision: (json['revision'] as num?)?.toInt() ?? 0,
+    );
+  }
+}
+
+class RecoverySnapshot {
+  const RecoverySnapshot({
+    required this.cleanShutdown,
+    required this.entries,
+    this.readErrors = 0,
+  });
+
+  final bool cleanShutdown;
+  final List<DocumentRecoveryEntry> entries;
+  final int readErrors;
+}
+
+abstract interface class DocumentRecoveryStore {
+  Future<RecoverySnapshot> beginRun();
+
+  Future<void> writeEntries(List<DocumentRecoveryEntry> entries);
+
+  Future<void> markCleanShutdown();
+
+  Future<void> clear();
+}
+
+class MemoryDocumentRecoveryStore implements DocumentRecoveryStore {
+  RecoverySnapshot value = const RecoverySnapshot(
+    cleanShutdown: true,
+    entries: [],
+  );
+
+  @override
+  Future<RecoverySnapshot> beginRun() async {
+    final previous = value;
+    value = RecoverySnapshot(cleanShutdown: false, entries: previous.entries);
+    return previous;
+  }
+
+  @override
+  Future<void> writeEntries(List<DocumentRecoveryEntry> entries) async {
+    value = RecoverySnapshot(cleanShutdown: false, entries: entries);
+  }
+
+  @override
+  Future<void> markCleanShutdown() async {
+    value = RecoverySnapshot(cleanShutdown: true, entries: value.entries);
+  }
+
+  @override
+  Future<void> clear() async {
+    value = const RecoverySnapshot(cleanShutdown: true, entries: []);
+  }
+}
+
+class JsonDocumentRecoveryStore implements DocumentRecoveryStore {
+  JsonDocumentRecoveryStore({this.filePathOverride})
+    : _fallbackDirectory = Directory(
+        p.join(
+          Directory.systemTemp.path,
+          'busymark-test-$pid-${DateTime.now().microsecondsSinceEpoch}',
+        ),
+      );
+
+  final String? filePathOverride;
+  final Directory _fallbackDirectory;
+
+  @override
+  Future<RecoverySnapshot> beginRun() async {
+    final current = await _load();
+    await _write(cleanShutdown: false, entries: current.entries);
+    return current;
+  }
+
+  @override
+  Future<void> writeEntries(List<DocumentRecoveryEntry> entries) {
+    return _write(cleanShutdown: false, entries: entries);
+  }
+
+  @override
+  Future<void> markCleanShutdown() async {
+    final current = await _load();
+    await _write(cleanShutdown: true, entries: current.entries);
+  }
+
+  @override
+  Future<void> clear() => _write(cleanShutdown: true, entries: const []);
+
+  Future<RecoverySnapshot> _load() async {
+    final file = await _file();
+    if (!await file.exists()) {
+      return const RecoverySnapshot(cleanShutdown: true, entries: []);
+    }
+    try {
+      final decoded = (jsonDecode(await file.readAsString()) as Map)
+          .cast<String, Object?>();
+      final entries = <DocumentRecoveryEntry>[];
+      var readErrors = 0;
+      final encodedEntries = decoded['entries'];
+      if (encodedEntries is List) {
+        for (final encodedEntry in encodedEntries) {
+          try {
+            if (encodedEntry is! Map || encodedEntry['text'] is! String) {
+              throw const FormatException('Invalid recovery entry');
+            }
+            final entry = DocumentRecoveryEntry.fromJson(
+              encodedEntry.cast<String, Object?>(),
+            );
+            if (entry.id.isEmpty) {
+              throw const FormatException('Recovery entry has no identity');
+            }
+            entries.add(entry);
+          } on Object {
+            readErrors++;
+          }
+        }
+      } else if (encodedEntries != null) {
+        readErrors++;
+      }
+      return RecoverySnapshot(
+        cleanShutdown: decoded['cleanShutdown'] as bool? ?? false,
+        entries: List.unmodifiable(entries),
+        readErrors: readErrors,
+      );
+    } on Object {
+      await _quarantineMalformedFile(file);
+      return const RecoverySnapshot(
+        cleanShutdown: false,
+        entries: [],
+        readErrors: 1,
+      );
+    }
+  }
+
+  Future<void> _quarantineMalformedFile(File file) async {
+    final quarantine = File(
+      '${file.path}.corrupt-${DateTime.now().microsecondsSinceEpoch}',
+    );
+    try {
+      await file.rename(quarantine.path);
+    } on Object {
+      // The read error is still returned to the controller for user notice.
+    }
+  }
+
+  Future<void> _write({
+    required bool cleanShutdown,
+    required List<DocumentRecoveryEntry> entries,
+  }) async {
+    await writeAtomicJson(await _file(), {
+      'version': 1,
+      'cleanShutdown': cleanShutdown,
+      'entries': entries.map((entry) => entry.toJson()).toList(),
+    });
+  }
+
+  Future<File> _file() async {
+    if (filePathOverride case final path?) {
+      return File(path);
+    }
+    late final Directory directory;
+    try {
+      directory = await getApplicationSupportDirectory();
+    } on Object {
+      directory = _fallbackDirectory;
+    }
+    return File(p.join(directory.path, 'recovery.json'));
+  }
+}
diff --git a/lib/src/workspace/session_persistence.dart b/lib/src/workspace/session_persistence.dart
new file mode 100644
index 00000000..d0025e83
--- /dev/null
+++ b/lib/src/workspace/session_persistence.dart
@@ -0,0 +1,210 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+import 'document_buffer.dart';
+
+class DocumentSessionEntry {
+  const DocumentSessionEntry({
+    required this.id,
+    required this.filePath,
+    required this.untitledName,
+    required this.editorState,
+  });
+
+  final String id;
+  final String? filePath;
+  final String? untitledName;
+  final DocumentEditorState editorState;
+
+  Map<String, Object?> toJson() => {
+    'id': id,
+    'filePath': filePath,
+    'untitledName': untitledName,
+    'editorState': editorState.toJson(),
+  };
+
+  factory DocumentSessionEntry.fromJson(Map<String, Object?> json) {
+    return DocumentSessionEntry(
+      id: json['id']?.toString() ?? '',
+      filePath: json['filePath']?.toString(),
+      untitledName: json['untitledName']?.toString(),
+      editorState: DocumentEditorState.fromJson(
+        (json['editorState'] as Map?)?.cast<String, Object?>() ?? const {},
+      ),
+    );
+  }
+}
+
+class WorkspaceSessionSnapshot {
+  const WorkspaceSessionSnapshot({
+    required this.workspacePath,
+    required this.tabs,
+    required this.activeBufferId,
+  });
+
+  final String? workspacePath;
+  final List<DocumentSessionEntry> tabs;
+  final String? activeBufferId;
+
+  Map<String, Object?> toJson() => {
+    'version': 1,
+    'workspacePath': workspacePath,
+    'activeBufferId': activeBufferId,
+    'tabs': tabs.map((entry) => entry.toJson()).toList(),
+  };
+
+  factory WorkspaceSessionSnapshot.fromJson(Map<String, Object?> json) {
+    return WorkspaceSessionSnapshot(
+      workspacePath: json['workspacePath']?.toString(),
+      tabs:
+          (json['tabs'] as List?)
+              ?.whereType<Map>()
+              .map(
+                (entry) => DocumentSessionEntry.fromJson(
+                  entry.cast<String, Object?>(),
+                ),
+              )
+              .where((entry) => entry.id.isNotEmpty)
+              .toList() ??
+          const [],
+      activeBufferId: json['activeBufferId']?.toString(),
+    );
+  }
+}
+
+abstract interface class DocumentSessionStore {
+  Future<WorkspaceSessionSnapshot?> load();
+
+  Future<void> save(WorkspaceSessionSnapshot snapshot);
+
+  Future<void> clear();
+}
+
+class MemoryDocumentSessionStore implements DocumentSessionStore {
+  WorkspaceSessionSnapshot? value;
+
+  @override
+  Future<WorkspaceSessionSnapshot?> load() async => value;
+
+  @override
+  Future<void> save(WorkspaceSessionSnapshot snapshot) async {
+    value = snapshot;
+  }
+
+  @override
+  Future<void> clear() async {
+    value = null;
+  }
+}
+
+class JsonDocumentSessionStore implements DocumentSessionStore {
+  JsonDocumentSessionStore({this.filePathOverride})
+    : _fallbackDirectory = Directory(
+        p.join(
+          Directory.systemTemp.path,
+          'busymark-test-$pid-${DateTime.now().microsecondsSinceEpoch}',
+        ),
+      );
+
+  final String? filePathOverride;
+  final Directory _fallbackDirectory;
+
+  @override
+  Future<WorkspaceSessionSnapshot?> load() async {
+    final file = await _file();
+    if (!await file.exists()) {
+      return null;
+    }
+    final source = await file.readAsString();
+    if (source.trim().isEmpty) {
+      return null;
+    }
+    return WorkspaceSessionSnapshot.fromJson(
+      (jsonDecode(source) as Map).cast<String, Object?>(),
+    );
+  }
+
+  @override
+  Future<void> save(WorkspaceSessionSnapshot snapshot) async {
+    await _writeAtomic(await _file(), snapshot.toJson());
+  }
+
+  @override
+  Future<void> clear() async {
+    final file = await _file();
+    if (await file.exists()) {
+      await file.delete();
+    }
+  }
+
+  Future<File> _file() async {
+    if (filePathOverride case final path?) {
+      return File(path);
+    }
+    late final Directory directory;
+    try {
+      directory = await getApplicationSupportDirectory();
+    } on Object {
+      directory = _fallbackDirectory;
+    }
+    return File(p.join(directory.path, 'session.json'));
+  }
+}
+
+Future<void> writeAtomicJson(File target, Map<String, Object?> json) {
+  return _writeAtomic(target, json);
+}
+
+Future<void> _writeAtomic(File target, Map<String, Object?> json) async {
+  await target.parent.create(recursive: true);
+  await _setPrivatePermissions(target.parent, directory: true);
+  final staging = await target.parent.createTemp('.busymark-state-');
+  await _setPrivatePermissions(staging, directory: true);
+  final staged = File(p.join(staging.path, p.basename(target.path)));
+  try {
+    await staged.writeAsString(
+      const JsonEncoder.withIndent('  ').convert(json),
+      flush: true,
+    );
+    await _setPrivatePermissions(staged, directory: false);
+    await staged.rename(target.path);
+    await _setPrivatePermissions(target, directory: false);
+  } finally {
+    try {
+      if (await staged.exists()) {
+        await staged.delete();
+      }
+    } on Object {
+      // Cleanup must not hide the persistence result.
+    }
+    try {
+      if (await staging.exists()) {
+        await staging.delete(recursive: true);
+      }
+    } on Object {
+      // Cleanup must not hide the persistence result.
+    }
+  }
+}
+
+Future<void> _setPrivatePermissions(
+  FileSystemEntity entity, {
+  required bool directory,
+}) async {
+  if (Platform.isWindows) {
+    return;
+  }
+  final result = await Process.run('chmod', [
+    directory ? '700' : '600',
+    entity.path,
+  ]);
+  if (result.exitCode != 0) {
+    throw FileSystemException(
+      'Could not restrict application state permissions: ${result.stderr}',
+      entity.path,
+    );
+  }
+}
diff --git a/lib/src/workspace/text_format_metadata.dart b/lib/src/workspace/text_format_metadata.dart
new file mode 100644
index 00000000..1678f693
--- /dev/null
+++ b/lib/src/workspace/text_format_metadata.dart
@@ -0,0 +1,188 @@
+import 'dart:convert';
+
+enum DocumentLineEnding { none, lf, crlf, mixed }
+
+enum LineEndingNormalization { lf, crlf }
+
+class MixedLineEndingNormalizationRequired implements Exception {
+  const MixedLineEndingNormalizationRequired();
+
+  @override
+  String toString() =>
+      'A document with mixed line endings must be normalized before saving.';
+}
+
+class TextFormatMetadata {
+  const TextFormatMetadata({
+    required this.hasUtf8Bom,
+    required this.lineEnding,
+    required this.hasFinalNewline,
+    this.lfCount = 0,
+    this.crlfCount = 0,
+    this.crCount = 0,
+  });
+
+  static const utf8Lf = TextFormatMetadata(
+    hasUtf8Bom: false,
+    lineEnding: DocumentLineEnding.lf,
+    hasFinalNewline: false,
+  );
+
+  final bool hasUtf8Bom;
+  final DocumentLineEnding lineEnding;
+  final bool hasFinalNewline;
+  final int lfCount;
+  final int crlfCount;
+  final int crCount;
+
+  bool get hasMixedLineEndings => lineEnding == DocumentLineEnding.mixed;
+
+  TextFormatMetadata copyWith({
+    bool? hasUtf8Bom,
+    DocumentLineEnding? lineEnding,
+    bool? hasFinalNewline,
+    int? lfCount,
+    int? crlfCount,
+    int? crCount,
+  }) {
+    return TextFormatMetadata(
+      hasUtf8Bom: hasUtf8Bom ?? this.hasUtf8Bom,
+      lineEnding: lineEnding ?? this.lineEnding,
+      hasFinalNewline: hasFinalNewline ?? this.hasFinalNewline,
+      lfCount: lfCount ?? this.lfCount,
+      crlfCount: crlfCount ?? this.crlfCount,
+      crCount: crCount ?? this.crCount,
+    );
+  }
+
+  String get statusLabel => switch (lineEnding) {
+    DocumentLineEnding.none || DocumentLineEnding.lf => 'LF',
+    DocumentLineEnding.crlf => 'CRLF',
+    DocumentLineEnding.mixed => 'Mixed',
+  };
+
+  TextFormatMetadata normalized(LineEndingNormalization normalization) {
+    return TextFormatMetadata(
+      hasUtf8Bom: hasUtf8Bom,
+      lineEnding: switch (normalization) {
+        LineEndingNormalization.lf => DocumentLineEnding.lf,
+        LineEndingNormalization.crlf => DocumentLineEnding.crlf,
+      },
+      hasFinalNewline: hasFinalNewline,
+      lfCount: normalization == LineEndingNormalization.lf
+          ? lfCount + crlfCount + crCount
+          : 0,
+      crlfCount: normalization == LineEndingNormalization.crlf
+          ? lfCount + crlfCount + crCount
+          : 0,
+    );
+  }
+
+  List<int> encode(
+    String canonicalText, {
+    LineEndingNormalization? mixedNormalization,
+  }) {
+    return utf8.encode(
+      formattedText(canonicalText, mixedNormalization: mixedNormalization),
+    );
+  }
+
+  String formattedText(
+    String canonicalText, {
+    LineEndingNormalization? mixedNormalization,
+  }) {
+    var effective = this;
+    if (hasMixedLineEndings) {
+      if (mixedNormalization == null) {
+        throw const MixedLineEndingNormalizationRequired();
+      }
+      effective = normalized(mixedNormalization);
+    }
+    var text = canonicalText.replaceAll('\r\n', '\n').replaceAll('\r', '\n');
+    if (effective.hasFinalNewline) {
+      if (!text.endsWith('\n')) {
+        text = '$text\n';
+      }
+    } else {
+      text = text.replaceFirst(RegExp(r'\n+$'), '');
+    }
+    if (effective.lineEnding == DocumentLineEnding.crlf) {
+      text = text.replaceAll('\n', '\r\n');
+    }
+    return effective.hasUtf8Bom ? '\uFEFF$text' : text;
+  }
+
+  Map<String, Object?> toJson() => {
+    'hasUtf8Bom': hasUtf8Bom,
+    'lineEnding': lineEnding.name,
+    'hasFinalNewline': hasFinalNewline,
+    'lfCount': lfCount,
+    'crlfCount': crlfCount,
+    'crCount': crCount,
+  };
+
+  factory TextFormatMetadata.fromJson(Map<String, Object?> json) {
+    return TextFormatMetadata(
+      hasUtf8Bom: json['hasUtf8Bom'] as bool? ?? false,
+      lineEnding: DocumentLineEnding.values.firstWhere(
+        (value) => value.name == json['lineEnding'],
+        orElse: () => DocumentLineEnding.lf,
+      ),
+      hasFinalNewline: json['hasFinalNewline'] as bool? ?? false,
+      lfCount: (json['lfCount'] as num?)?.toInt() ?? 0,
+      crlfCount: (json['crlfCount'] as num?)?.toInt() ?? 0,
+      crCount: (json['crCount'] as num?)?.toInt() ?? 0,
+    );
+  }
+}
+
+class DecodedUtf8Document {
+  const DecodedUtf8Document({required this.text, required this.format});
+
+  final String text;
+  final TextFormatMetadata format;
+}
+
+DecodedUtf8Document decodeUtf8Document(List<int> bytes) {
+  final hasBom =
+      bytes.length >= 3 &&
+      bytes[0] == 0xef &&
+      bytes[1] == 0xbb &&
+      bytes[2] == 0xbf;
+  final decoded = utf8.decode(hasBom ? bytes.sublist(3) : bytes);
+  var lf = 0;
+  var crlf = 0;
+  var cr = 0;
+  for (var index = 0; index < decoded.length; index++) {
+    final unit = decoded.codeUnitAt(index);
+    if (unit == 13) {
+      if (index + 1 < decoded.length && decoded.codeUnitAt(index + 1) == 10) {
+        crlf++;
+        index++;
+      } else {
+        cr++;
+      }
+    } else if (unit == 10) {
+      lf++;
+    }
+  }
+  final styles = [if (lf > 0) 'lf', if (crlf > 0) 'crlf', if (cr > 0) 'cr'];
+  final lineEnding = styles.isEmpty
+      ? DocumentLineEnding.none
+      : styles.length > 1 || cr > 0
+      ? DocumentLineEnding.mixed
+      : crlf > 0
+      ? DocumentLineEnding.crlf
+      : DocumentLineEnding.lf;
+  return DecodedUtf8Document(
+    text: decoded.replaceAll('\r\n', '\n').replaceAll('\r', '\n'),
+    format: TextFormatMetadata(
+      hasUtf8Bom: hasBom,
+      lineEnding: lineEnding,
+      hasFinalNewline: decoded.endsWith('\n') || decoded.endsWith('\r'),
+      lfCount: lf,
+      crlfCount: crlf,
+      crCount: cr,
+    ),
+  );
+}
diff --git a/lib/src/workspace/workspace_controller.dart b/lib/src/workspace/workspace_controller.dart
index c0f16790..9a33615d 100644
--- a/lib/src/workspace/workspace_controller.dart
+++ b/lib/src/workspace/workspace_controller.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -7,6 +8,7 @@ import 'package:path/path.dart' as p;
 import '../app/app_settings.dart';
 import '../core/debug_log.dart';
 import '../core/diagnostic.dart';
+import '../core/source_span.dart';
 import '../markdown/busymark_document.dart';
 import '../markdown/document_outline.dart';
 import '../markdown/preview_model.dart';
@@ -14,14 +16,57 @@ import '../writerside/writerside_project_creator.dart';
 import '../writerside/writerside_instance_service.dart';
 import '../writerside/writerside_topic_removal_service.dart';
 import '../writerside/writerside_topic_creator.dart';
+import '../writerside/writerside_toc_editor.dart';
+import 'document_buffer.dart';
+import 'recovery_persistence.dart';
+import 'session_persistence.dart';
+import 'text_format_metadata.dart';
 import 'workspace_model.dart';
 import 'workspace_message.dart';
+import 'workspace_file_monitor.dart';
 import 'workspace_service.dart';
 
 final workspaceServiceProvider = Provider<WorkspaceService>(
   (ref) => const WorkspaceService(),
 );
 
+final documentSessionStoreProvider = Provider<DocumentSessionStore>(
+  (ref) => _runningUnderFlutterTest
+      ? MemoryDocumentSessionStore()
+      : JsonDocumentSessionStore(),
+);
+
+final documentRecoveryStoreProvider = Provider<DocumentRecoveryStore>(
+  (ref) => _runningUnderFlutterTest
+      ? MemoryDocumentRecoveryStore()
+      : JsonDocumentRecoveryStore(),
+);
+
+final _runningUnderFlutterTest = Platform.environment.containsKey(
+  'FLUTTER_TEST',
+);
+
+bool _sameRuntimeDiagnostics(List<Diagnostic> left, List<Diagnostic> right) {
+  if (left.length != right.length) {
+    return false;
+  }
+  for (var index = 0; index < left.length; index++) {
+    if (left[index].code != right[index].code ||
+        left[index].filePath != right[index].filePath ||
+        left[index].args['runtimeMathKey'] !=
+            right[index].args['runtimeMathKey']) {
+      return false;
+    }
+  }
+  return true;
+}
+
+final workspaceFileMonitorProvider = Provider<WorkspaceFileMonitor>((ref) {
+  final monitor = WorkspaceFileMonitor();
+  ref.onDispose(() => unawaited(monitor.dispose()));
+  return monitor;
+});
+
 final workspaceControllerProvider =
     NotifierProvider<WorkspaceController, WorkspaceState>(
       WorkspaceController.new,
@@ -47,26 +92,50 @@ final workspaceSearchCloseRequestProvider =
 class ActiveDocumentSaveTarget {
   const ActiveDocumentSaveTarget._({
     required this.workspaceId,
+    required this.bufferId,
     required this.path,
     required this.documentRevision,
     required this.editRevision,
     required this.snapshot,
     required this.text,
     required this.workspaceKind,
+    required this.format,
   });
 
   final String workspaceId;
+  final String bufferId;
   final String? path;
   final int documentRevision;
   final int editRevision;
   final WorkspaceFileSnapshot? snapshot;
   final String text;
   final WorkspaceKind workspaceKind;
+  final TextFormatMetadata format;
+
+  bool get needsSaveLocation => path == null;
+}
+
+class SaveAllResult {
+  const SaveAllResult({
+    this.savedBufferIds = const [],
+    this.failedBufferIds = const [],
+    this.conflictBufferIds = const [],
+    this.normalizationRequiredBufferIds = const [],
+  });
+
+  final List<String> savedBufferIds;
+  final List<String> failedBufferIds;
+  final List<String> conflictBufferIds;
+  final List<String> normalizationRequiredBufferIds;
 
-  bool get needsSaveLocation =>
-      workspaceKind == WorkspaceKind.untitledMarkdown || path == null;
+  bool get succeeded =>
+      failedBufferIds.isEmpty &&
+      conflictBufferIds.isEmpty &&
+      normalizationRequiredBufferIds.isEmpty;
 }
 
+enum _BufferWriteResult { saved, failed, conflict }
+
 class WorkspaceSearchRequestController extends Notifier<int> {
   @override
   int build() => 0;
@@ -81,42 +150,697 @@ class WorkspaceController extends Notifier<WorkspaceState> {
 
   late WorkspaceService _service;
   late AppSettingsController _settingsController;
-  Timer? _autoSaveDebounce;
-  Future<bool>? _activeSave;
-  ActiveDocumentSaveTarget? _activeSaveTarget;
+  late DocumentSessionStore _sessionStore;
+  late DocumentRecoveryStore _recoveryStore;
+  late WorkspaceFileMonitor _fileMonitor;
+  StreamSubscription<WorkspaceFileMonitorEvent>? _fileMonitorSubscription;
+  final _autoSaveDebounces = <String, Timer>{};
+  final _bufferWriteQueues = <String, Future<void>>{};
+  Timer? _persistenceDebounce;
+  Timer? _workspaceRefreshDebounce;
   var _derivedRefreshRunning = false;
   var _derivedRefreshPending = false;
   var _pendingPreviewRefresh = false;
   var _editRevision = 0;
   var _activeDocumentRevision = 0;
+  var _untitledSequence = 0;
+  final _intentionallyRemovedPaths = <String>{};
+  late Future<RecoverySnapshot> _recoveryStart;
+  Future<void> _persistenceWrites = Future.value();
+
+  int get editRevision => state.activeBuffer?.revision ?? _editRevision;
 
-  int get editRevision => _editRevision;
+  void updateMathRenderDiagnostic({
+    required String expressionId,
+    required String? code,
+    SourceSpan? sourceSpan,
+  }) {
+    final workspace = state.workspace;
+    if (workspace == null) {
+      return;
+    }
+    final filePath =
+        sourceSpan?.filePath ?? workspace.activeFilePath ?? workspace.rootPath;
+    final runtimeKey = '$filePath\u0000$expressionId';
+    final diagnostics = [
+      for (final diagnostic in workspace.runtimeDiagnostics)
+        if (diagnostic.args['runtimeMathKey'] != runtimeKey) diagnostic,
+      if (code != null)
+        Diagnostic(
+          code: code,
+          severity: DiagnosticSeverity.error,
+          filePath: filePath,
+          sourceSpan: sourceSpan,
+          args: {'runtimeMathKey': runtimeKey},
+        ),
+    ];
+    if (_sameRuntimeDiagnostics(workspace.runtimeDiagnostics, diagnostics)) {
+      return;
+    }
+    state = state.copyWith(
+      workspace: workspace.copyWith(
+        runtimeDiagnostics: List.unmodifiable(diagnostics),
+      ),
+    );
+  }
 
   @override
   WorkspaceState build() {
     _service = ref.read(workspaceServiceProvider);
     _settingsController = ref.read(appSettingsControllerProvider.notifier);
+    _sessionStore = ref.read(documentSessionStoreProvider);
+    _recoveryStore = ref.read(documentRecoveryStoreProvider);
+    _fileMonitor = ref.read(workspaceFileMonitorProvider);
+    _fileMonitorSubscription = _fileMonitor.events.listen(
+      (event) => unawaited(_handleFileMonitorEvent(event)),
+    );
+    _recoveryStart = _recoveryStore.beginRun();
     ref.listen<AppSettings>(appSettingsControllerProvider, (previous, next) {
       if (!next.autoSave) {
-        _autoSaveDebounce?.cancel();
+        _cancelAllAutoSaves();
         return;
       }
-      if (state.isDirty) {
+      if (state.dirtyBuffers.any((buffer) => buffer.filePath != null)) {
         _scheduleAutoSave();
       }
     });
     ref.onDispose(() {
       _cancelPendingDerivedRefresh();
-      _autoSaveDebounce?.cancel();
+      _cancelAllAutoSaves();
+      _persistenceDebounce?.cancel();
+      _workspaceRefreshDebounce?.cancel();
+      unawaited(_fileMonitorSubscription?.cancel());
     });
     return const WorkspaceState();
   }
 
+  Future<bool> restorePreviousSession() async {
+    if (state.workspace != null) {
+      return state.documentBuffers.isNotEmpty;
+    }
+    final recovery = await _recoveryStart;
+    final session = await _sessionStore.load();
+    // Entries are authoritative even if the last shutdown was marked clean.
+    // This protects users when close confirmation is disabled while dirty
+    // buffers still exist.
+    final recoverEntries = recovery.entries;
+    if (session == null && recoverEntries.isEmpty) {
+      if (recovery.readErrors > 0) {
+        state = state.copyWith(
+          message: WorkspaceMessage(
+            WorkspaceMessageCode.recoveryDamaged,
+            error: recovery.readErrors,
+          ),
+        );
+      }
+      return false;
+    }
+    final workspacePath =
+        session?.workspacePath ??
+        recoverEntries
+            .map((entry) => entry.workspacePath)
+            .whereType<String>()
+            .firstOrNull ??
+        recoverEntries
+            .map((entry) => entry.filePath)
+            .whereType<String>()
+            .firstOrNull;
+    final sessionEntries = session?.tabs ?? const <DocumentSessionEntry>[];
+    try {
+      late final Workspace workspace;
+      if (workspacePath == null) {
+        workspace = _service.createUntitledMarkdown();
+      } else if (await _service.pathExists(workspacePath)) {
+        workspace = await _service.openPath(workspacePath);
+      } else {
+        final activeEntry = sessionEntries
+            .where((entry) => entry.id == session?.activeBufferId)
+            .firstOrNull;
+        final activeRecovery = recoverEntries
+            .where((entry) => entry.id == session?.activeBufferId)
+            .firstOrNull;
+        final activePath =
+            activeEntry?.filePath ??
+            activeRecovery?.filePath ??
+            sessionEntries
+                .map((entry) => entry.filePath)
+                .whereType<String>()
+                .firstOrNull ??
+            recoverEntries
+                .map((entry) => entry.filePath)
+                .whereType<String>()
+                .firstOrNull;
+        final seedText = activeRecovery?.text ?? '';
+        final parsed = _service.createUntitledMarkdown(source: seedText);
+        final standalone = p.extension(workspacePath).isNotEmpty;
+        workspace = Workspace(
+          id: 'missing:$workspacePath',
+          rootPath: workspacePath,
+          kind: standalone
+              ? WorkspaceKind.singleMarkdown
+              : WorkspaceKind.markdownFolder,
+          openedAt: DateTime.now(),
+          activeFilePath: activePath,
+          openFilePaths: [
+            for (final entry in sessionEntries)
+              if (entry.filePath != null) entry.filePath!,
+            for (final entry in recoverEntries)
+              if (entry.filePath != null) entry.filePath!,
+          ],
+          files: const [],
+          diagnostics: parsed.diagnostics,
+          markdown: parsed.markdown,
+        );
+      }
+      final recoveryById = {
+        for (final entry in recoverEntries) entry.id: entry,
+      };
+      final recoveryByPath = {
+        for (final entry in recoverEntries)
+          if (entry.filePath != null) entry.filePath!: entry,
+      };
+      final buffers = <DocumentBuffer>[];
+      for (final entry in sessionEntries) {
+        final recovered =
+            recoveryById[entry.id] ??
+            (entry.filePath == null ? null : recoveryByPath[entry.filePath]);
+        final buffer = await _restoreSessionBuffer(entry, recovered);
+        if (buffer != null) {
+          buffers.add(buffer);
+        }
+      }
+      for (final recovered in recoverEntries) {
+        if (buffers.any((buffer) => buffer.id == recovered.id)) {
+          continue;
+        }
+        final buffer = await _restoreRecoveryBuffer(recovered);
+        if (buffer != null) {
+          buffers.add(buffer);
+        }
+      }
+      if (buffers.isEmpty) {
+        return false;
+      }
+      final activeId =
+          buffers.any((buffer) => buffer.id == session?.activeBufferId)
+          ? session!.activeBufferId!
+          : buffers.first.id;
+      final active = buffers.firstWhere((buffer) => buffer.id == activeId);
+      final openPaths = [
+        for (final buffer in buffers)
+          if (buffer.filePath != null) buffer.filePath!,
+      ];
+      final nextWorkspace = workspace.copyWith(
+        activeFilePath: active.filePath,
+        activeFileSnapshot: active.diskSnapshot,
+        openFilePaths: openPaths,
+      );
+      final reparsed = await _service.reparseActive(nextWorkspace, active.text);
+      state = WorkspaceState(
+        workspace: reparsed,
+        preview: _safePreview(reparsed, active.text),
+        documentBuffers: buffers,
+        activeBufferId: active.id,
+        message: recovery.readErrors > 0
+            ? WorkspaceMessage(
+                WorkspaceMessageCode.recoveryDamaged,
+                error: recovery.readErrors,
+              )
+            : recoverEntries.isNotEmpty
+            ? WorkspaceMessage(
+                WorkspaceMessageCode.recoveryRestored,
+                error: recoverEntries.length,
+              )
+            : null,
+      );
+      _editRevision = active.revision;
+      await _startMonitoring(reparsed);
+      await _settingsController.setDocumentViewMode(active.editorState.mode);
+      _schedulePersistence();
+      return true;
+    } on Object catch (error, stackTrace) {
+      busyMarkDebugLogError(
+        '[BusyMark] Session restore failed',
+        error,
+        stackTrace,
+      );
+      return false;
+    }
+  }
+
+  /// Restores startup state when the previous run needs recovery, or when the
+  /// user has explicitly enabled clean-session reopening.
+  Future<bool> restoreStartupSession({required bool reopenCleanSession}) async {
+    final recovery = await _recoveryStart;
+    final needsRecovery =
+        !recovery.cleanShutdown || recovery.entries.isNotEmpty;
+    if (!reopenCleanSession && !needsRecovery) {
+      return false;
+    }
+    return restorePreviousSession();
+  }
+
+  Future<DocumentBuffer?> _restoreSessionBuffer(
+    DocumentSessionEntry session,
+    DocumentRecoveryEntry? recovery,
+  ) async {
+    if (recovery != null) {
+      return _restoreRecoveryBuffer(recovery, editorState: session.editorState);
+    }
+    final path = session.filePath;
+    if (path == null) {
+      return null;
+    }
+    if (!await _service.pathExists(path)) {
+      const text = '';
+      return DocumentBuffer(
+        id: session.id,
+        filePath: path,
+        text: text,
+        lastSavedText: text,
+        dirty: false,
+        format: TextFormatMetadata.utf8Lf,
+        editorState: session.editorState,
+        diskState: DocumentDiskState.deleted,
+      );
+    }
+    final load = await _service.loadTextWithSnapshot(path);
+    return _fileBuffer(path, load).copyWith(editorState: session.editorState);
+  }
+
+  Future<DocumentBuffer?> _restoreRecoveryBuffer(
+    DocumentRecoveryEntry recovery, {
+    DocumentEditorState? editorState,
+  }) async {
+    final path = recovery.filePath;
+    if (path == null) {
+      return DocumentBuffer.untitled(
+        id: recovery.id,
+        name: recovery.untitledName ?? 'Untitled',
+        text: recovery.text,
+        mode: (editorState ?? recovery.editorState).mode,
+      ).copyWith(
+        editorState: editorState ?? recovery.editorState,
+        format: recovery.format,
+        revision: recovery.revision,
+        recovered: true,
+      );
+    }
+    if (!await _service.pathExists(path)) {
+      return DocumentBuffer(
+        id: recovery.id,
+        filePath: path,
+        text: recovery.text,
+        lastSavedText: recovery.lastSavedText,
+        dirty: true,
+        diskSnapshot: recovery.diskSnapshot,
+        format: recovery.format,
+        editorState: editorState ?? recovery.editorState,
+        revision: recovery.revision,
+        diskState: DocumentDiskState.deleted,
+        recovered: true,
+      );
+    }
+    final disk = await _service.loadTextWithSnapshot(path);
+    final conflict =
+        recovery.diskSnapshot == null ||
+        disk.snapshot.differsFrom(recovery.diskSnapshot!);
+    return DocumentBuffer(
+      id: recovery.id,
+      filePath: path,
+      text: recovery.text,
+      lastSavedText: recovery.lastSavedText,
+      dirty: true,
+      diskSnapshot: recovery.diskSnapshot,
+      format: recovery.format,
+      editorState: editorState ?? recovery.editorState,
+      revision: recovery.revision,
+      diskState: conflict
+          ? DocumentDiskState.conflict
+          : DocumentDiskState.present,
+      diskVersionText: conflict ? disk.text : null,
+      diskVersionSnapshot: conflict ? disk.snapshot : null,
+      recovered: true,
+    );
+  }
+
+  void _schedulePersistence() {
+    _persistenceDebounce?.cancel();
+    if (_runningUnderFlutterTest) {
+      unawaited(flushPersistence());
+      return;
+    }
+    _persistenceDebounce = Timer(
+      const Duration(milliseconds: 700),
+      () => unawaited(flushPersistence()),
+    );
+  }
+
+  Future<void> flushPersistence() {
+    _persistenceDebounce?.cancel();
+    final snapshot = state;
+    final prior = _persistenceWrites.then<void>((_) {}, onError: (_, _) {});
+    final write = prior.then((_) => _persistSnapshot(snapshot));
+    _persistenceWrites = write;
+    return write;
+  }
+
+  Future<void> _persistSnapshot(WorkspaceState snapshot) async {
+    await _recoveryStart;
+    final workspace = snapshot.workspace;
+    if (workspace == null) {
+      await _recoveryStore.writeEntries(const []);
+      await _sessionStore.clear();
+      return;
+    }
+    final workspacePath = switch (workspace.kind) {
+      WorkspaceKind.untitledMarkdown => null,
+      WorkspaceKind.singleMarkdown =>
+        snapshot.documentBuffers
+            .map((buffer) => buffer.filePath)
+            .whereType<String>()
+            .firstOrNull,
+      WorkspaceKind.markdownFolder ||
+      WorkspaceKind.writersideModule => workspace.rootPath,
+    };
+    await _recoveryStore.writeEntries([
+      for (final buffer in snapshot.documentBuffers)
+        if (buffer.isDirty || buffer.isUntitled)
+          DocumentRecoveryEntry.fromBuffer(
+            buffer,
+            workspacePath: workspacePath,
+          ),
+    ]);
+    await _sessionStore.save(
+      WorkspaceSessionSnapshot(
+        workspacePath: workspacePath,
+        activeBufferId: snapshot.activeBufferId,
+        tabs: [
+          for (final buffer in snapshot.documentBuffers)
+            DocumentSessionEntry(
+              id: buffer.id,
+              filePath: buffer.filePath,
+              untitledName: buffer.untitledName,
+              editorState: buffer.editorState,
+            ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> markCleanShutdown() async {
+    await _settleWritesForShutdown();
+    await flushPersistence();
+    if (state.documentBuffers.any(
+      (buffer) => buffer.isDirty || buffer.isUntitled,
+    )) {
+      // Keep the run unclean while recovery data is still needed.
+      return;
+    }
+    await _recoveryStore.markCleanShutdown();
+  }
+
+  Future<void> discardRecoveryForShutdown() async {
+    await _settleWritesForShutdown();
+    await flushPersistence();
+    await _recoveryStore.clear();
+  }
+
+  Future<void> _settleWritesForShutdown() async {
+    _cancelAllAutoSaves();
+    await _drainBufferWrites();
+    // A write that retained a newer dirty revision can schedule another
+    // debounce while the queue is draining. Shutdown owns the final save or
+    // recovery decision, so do not let that timer outlive it.
+    _cancelAllAutoSaves();
+  }
+
+  Future<void> _startMonitoring(Workspace workspace) async {
+    if (workspace.kind == WorkspaceKind.untitledMarkdown ||
+        workspace.rootPath.isEmpty ||
+        !Directory(workspace.rootPath).existsSync()) {
+      await _fileMonitor.stop();
+      return;
+    }
+    await _fileMonitor.start(
+      rootPath: workspace.rootPath,
+      openFilePaths: state.documentBuffers
+          .map((buffer) => buffer.filePath)
+          .whereType<String>(),
+    );
+  }
+
+  Future<void> _handleFileMonitorEvent(WorkspaceFileMonitorEvent event) async {
+    final matching = state.documentBuffers.where((buffer) {
+      final path = buffer.filePath;
+      return path != null &&
+          (p.equals(path, event.path) ||
+              (event.destinationPath != null &&
+                  p.equals(path, event.destinationPath!)));
+    }).toList();
+    for (final buffer in matching) {
+      await _applyExternalFileState(buffer, event);
+    }
+    final workspaceRoot = state.workspace?.rootPath;
+    if (workspaceRoot == null ||
+        (!p.equals(workspaceRoot, event.path) &&
+            !p.isWithin(workspaceRoot, event.path))) {
+      return;
+    }
+    _workspaceRefreshDebounce?.cancel();
+    _workspaceRefreshDebounce = Timer(
+      const Duration(milliseconds: 250),
+      () => unawaited(refreshWorkspaceFromDiskPreservingOpenTabs()),
+    );
+  }
+
+  Future<void> _applyExternalFileState(
+    DocumentBuffer original,
+    WorkspaceFileMonitorEvent event,
+  ) async {
+    final current = state.documentBuffers
+        .where((buffer) => buffer.id == original.id)
+        .firstOrNull;
+    final path = current?.filePath;
+    if (current == null || path == null) {
+      return;
+    }
+    final destinationPath = event.destinationPath;
+    if (event.kind == WorkspaceFileEventKind.moved &&
+        destinationPath != null &&
+        p.equals(path, event.path)) {
+      await _applyExternalMove(current, destinationPath);
+      return;
+    }
+    if (event.kind == WorkspaceFileEventKind.deleted &&
+        !await _service.pathExists(path)) {
+      _updateBufferFromMonitor(
+        current.copyWith(diskState: DocumentDiskState.deleted),
+      );
+      return;
+    }
+    try {
+      final disk = await _service.loadTextWithSnapshot(path);
+      if (_sameFileSnapshot(current.diskSnapshot, disk.snapshot)) {
+        return;
+      }
+      if (current.isDirty) {
+        _updateBufferFromMonitor(
+          current.copyWith(
+            diskState: DocumentDiskState.conflict,
+            diskVersionText: disk.text,
+            diskVersionSnapshot: disk.snapshot,
+          ),
+        );
+        return;
+      }
+      final reloaded = current.copyWith(
+        text: disk.text,
+        lastSavedText: disk.text,
+        dirty: false,
+        diskSnapshot: disk.snapshot,
+        format: disk.format,
+        revision: current.revision + 1,
+        diskState: DocumentDiskState.present,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+      );
+      _updateBufferFromMonitor(reloaded);
+      if (state.activeBufferId == reloaded.id && state.workspace != null) {
+        final workspace = state.workspace!.copyWith(
+          activeFileSnapshot: disk.snapshot,
+        );
+        final reparsed = await _service.reparseActive(workspace, disk.text);
+        if (state.activeBufferId == reloaded.id &&
+            state.activeBuffer?.revision == reloaded.revision) {
+          state = state.copyWith(
+            workspace: reparsed,
+            preview: _safePreview(reparsed, disk.text),
+          );
+        }
+      }
+    } on FileSystemException {
+      _updateBufferFromMonitor(
+        current.copyWith(diskState: DocumentDiskState.deleted),
+      );
+    } on FormatException {
+      // Invalid UTF-8 remains on disk and must not replace an editable buffer.
+    }
+  }
+
+  Future<void> _applyExternalMove(
+    DocumentBuffer current,
+    String destinationPath,
+  ) async {
+    final oldPath = current.filePath;
+    if (oldPath == null) {
+      return;
+    }
+    try {
+      final disk = await _service.loadTextWithSnapshot(destinationPath);
+      final contentChanged = !_sameFileSnapshot(
+        current.diskSnapshot,
+        disk.snapshot,
+      );
+      final remapped = current.copyWith(
+        filePath: destinationPath,
+        text: current.isDirty || !contentChanged ? current.text : disk.text,
+        lastSavedText: contentChanged && !current.isDirty
+            ? disk.text
+            : current.lastSavedText,
+        dirty: current.isDirty,
+        diskSnapshot: contentChanged && !current.isDirty
+            ? disk.snapshot
+            : current.diskSnapshot,
+        format: contentChanged && !current.isDirty
+            ? disk.format
+            : current.format,
+        revision: contentChanged && !current.isDirty
+            ? current.revision + 1
+            : current.revision,
+        diskState: current.isDirty && contentChanged
+            ? DocumentDiskState.conflict
+            : DocumentDiskState.present,
+        diskVersionText: current.isDirty && contentChanged ? disk.text : null,
+        diskVersionSnapshot: current.isDirty && contentChanged
+            ? disk.snapshot
+            : null,
+      );
+      final workspace = state.workspace;
+      final remappedTabs = workspace == null
+          ? const <String>[]
+          : [
+              for (final openPath in workspace.openFilePaths)
+                p.equals(openPath, oldPath) ? destinationPath : openPath,
+            ];
+      final active = state.activeBufferId == current.id;
+      state = state.copyWith(
+        documentBuffers: _replaceBuffer(state.documentBuffers, remapped),
+        workspace: workspace?.copyWith(
+          activeFilePath: active ? destinationPath : workspace.activeFilePath,
+          activeFileSnapshot: active
+              ? remapped.diskSnapshot
+              : workspace.activeFileSnapshot,
+          openFilePaths: remappedTabs,
+        ),
+      );
+      _fileMonitor.updateOpenFilePaths(
+        state.documentBuffers
+            .map((buffer) => buffer.filePath)
+            .whereType<String>(),
+      );
+      if (active && state.workspace != null) {
+        final reparsed = await _service.reparseActive(
+          state.workspace!,
+          remapped.text,
+        );
+        if (state.activeBufferId == current.id &&
+            state.activeBuffer?.filePath == destinationPath) {
+          state = state.copyWith(
+            workspace: reparsed.copyWith(
+              activeFileSnapshot: remapped.diskSnapshot,
+              openFilePaths: remappedTabs,
+            ),
+            preview: _safePreview(reparsed, remapped.text),
+          );
+        }
+      }
+      _schedulePersistence();
+    } on FileSystemException {
+      _updateBufferFromMonitor(
+        current.copyWith(diskState: DocumentDiskState.deleted),
+      );
+    } on FormatException {
+      // Keep the old buffer and path when the move target cannot be decoded.
+    }
+  }
+
+  void _updateBufferFromMonitor(DocumentBuffer buffer) {
+    state = state.copyWith(
+      documentBuffers: _replaceBuffer(state.documentBuffers, buffer),
+      workspace: state.activeBufferId == buffer.id
+          ? state.workspace?.copyWith(activeFileSnapshot: buffer.diskSnapshot)
+          : state.workspace,
+    );
+    _schedulePersistence();
+  }
+
+  Future<bool> reloadBufferFromDisk(String bufferId) async {
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == bufferId)
+        .firstOrNull;
+    final path = buffer?.filePath;
+    if (buffer == null || path == null || !await _service.pathExists(path)) {
+      return false;
+    }
+    final disk = await _service.loadTextWithSnapshot(path);
+    final reloaded = buffer.copyWith(
+      text: disk.text,
+      lastSavedText: disk.text,
+      dirty: false,
+      diskSnapshot: disk.snapshot,
+      format: disk.format,
+      revision: buffer.revision + 1,
+      diskState: DocumentDiskState.present,
+      diskVersionText: null,
+      diskVersionSnapshot: null,
+      recovered: false,
+    );
+    _updateBufferFromMonitor(reloaded);
+    if (state.activeBufferId == bufferId && state.workspace != null) {
+      final workspace = await _service.reparseActive(
+        state.workspace!.copyWith(activeFileSnapshot: disk.snapshot),
+        disk.text,
+      );
+      state = state.copyWith(
+        workspace: workspace,
+        preview: _safePreview(workspace, disk.text),
+      );
+    }
+    return true;
+  }
+
+  void keepBufferVersion(String bufferId) {
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == bufferId)
+        .firstOrNull;
+    if (buffer == null) {
+      return;
+    }
+    _updateBufferFromMonitor(
+      buffer.copyWith(
+        diskState: buffer.filePath == null
+            ? DocumentDiskState.present
+            : DocumentDiskState.changed,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+      ),
+    );
+  }
+
   bool get activeDocumentNeedsSaveLocation {
     final workspace = state.workspace;
-    return workspace != null &&
-        (workspace.kind == WorkspaceKind.untitledMarkdown ||
-            workspace.activeFilePath == null);
+    return workspace != null && state.activeBuffer?.filePath == null;
   }
 
   ActiveDocumentSaveTarget? captureActiveDocumentSaveTarget() {
@@ -124,14 +848,20 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     if (workspace == null) {
       return null;
     }
+    final buffer = state.activeBuffer;
+    if (buffer == null) {
+      return null;
+    }
     return ActiveDocumentSaveTarget._(
       workspaceId: workspace.id,
-      path: workspace.activeFilePath,
+      bufferId: buffer.id,
+      path: buffer.filePath,
       documentRevision: _activeDocumentRevision,
-      editRevision: _editRevision,
-      snapshot: workspace.activeFileSnapshot,
-      text: state.activeText,
+      editRevision: buffer.revision,
+      snapshot: buffer.diskSnapshot,
+      text: buffer.text,
       workspaceKind: workspace.kind,
+      format: buffer.format,
     );
   }
 
@@ -143,30 +873,51 @@ class WorkspaceController extends Notifier<WorkspaceState> {
           activeFilePath: target.path,
         ) &&
         workspace != null &&
-        _editRevision == target.editRevision &&
-        state.activeText == target.text &&
-        _sameFileSnapshot(workspace.activeFileSnapshot, target.snapshot);
+        state.activeBuffer?.id == target.bufferId &&
+        state.activeBuffer?.revision == target.editRevision &&
+        state.activeBuffer?.text == target.text &&
+        _sameFileSnapshot(state.activeBuffer?.diskSnapshot, target.snapshot);
   }
 
   Future<void> createMarkdownFile() async {
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
     _invalidateActiveDocumentOperations();
     _resetSaveTracking(dirty: true);
     final viewModeChange = _showEditorForNewFile();
-    final workspace = _service.createUntitledMarkdown();
+    final currentWorkspace = state.workspace;
+    final untitledWorkspace = _service.createUntitledMarkdown();
+    final workspace = currentWorkspace == null
+        ? untitledWorkspace
+        : currentWorkspace.copyWith(
+            activeFilePath: null,
+            activeFileSnapshot: null,
+            markdown: untitledWorkspace.markdown,
+          );
+    final sequence = ++_untitledSequence;
+    final buffer = DocumentBuffer.untitled(
+      id: 'untitled:${DateTime.now().microsecondsSinceEpoch}:$sequence',
+      name: 'Untitled $sequence',
+      mode:
+          _settingsController.state.documentViewMode ==
+              DocumentViewModePreference.preview
+          ? DocumentViewModePreference.editor
+          : _settingsController.state.documentViewMode,
+    );
     state = WorkspaceState(
       workspace: workspace,
       preview: _safePreview(workspace, ''),
-      isDirty: true,
+      documentBuffers: [...state.documentBuffers, buffer],
+      activeBufferId: buffer.id,
       isLoading: false,
     );
+    await _startMonitoring(workspace);
+    _schedulePersistence();
     await viewModeChange;
   }
 
   Future<void> openPath(String path) async {
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
+    _cancelAllAutoSaves();
     final operationRevision = _invalidateActiveDocumentOperations();
     _resetSaveTracking();
     state = const WorkspaceState(isLoading: true);
@@ -184,11 +935,22 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       if (!_isCurrentActiveDocumentOperation(operationRevision)) {
         return;
       }
+      final buffer = load == null || active == null
+          ? null
+          : _fileBuffer(
+              active,
+              load,
+              mode: _settingsController.state.documentViewMode,
+            );
       state = WorkspaceState(
         workspace: loadedWorkspace,
         activeText: text,
         preview: preview,
+        documentBuffers: buffer == null ? const [] : [buffer],
+        activeBufferId: buffer?.id,
       );
+      await _startMonitoring(loadedWorkspace);
+      _schedulePersistence();
       _resetSaveTracking();
       final recentPath = workspace.kind == WorkspaceKind.singleMarkdown
           ? workspace.activeFilePath ?? workspace.rootPath
@@ -220,7 +982,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     WritersideProjectCreateRequest request,
   ) async {
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
+    _cancelAllAutoSaves();
     final operationRevision = _invalidateActiveDocumentOperations();
     _resetSaveTracking();
     state = const WorkspaceState(isLoading: true);
@@ -238,11 +1000,22 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       if (!_isCurrentActiveDocumentOperation(operationRevision)) {
         return false;
       }
+      final buffer = load == null || active == null
+          ? null
+          : _fileBuffer(
+              active,
+              load,
+              mode: _settingsController.state.documentViewMode,
+            );
       state = WorkspaceState(
         workspace: loadedWorkspace,
         activeText: text,
         preview: preview,
+        documentBuffers: buffer == null ? const [] : [buffer],
+        activeBufferId: buffer?.id,
       );
+      await _startMonitoring(loadedWorkspace);
+      _schedulePersistence();
       _resetSaveTracking();
       await _settingsController.recordOpenedWorkspace(
         path: workspace.rootPath,
@@ -281,7 +1054,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       return false;
     }
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
+    _cancelAllAutoSaves();
     final operationRevision = _invalidateActiveDocumentOperations();
     _resetSaveTracking();
     state = state.copyWith(isLoading: true, clearMessage: true);
@@ -310,11 +1083,30 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       if (!_isCurrentActiveDocumentOperation(operationRevision)) {
         return false;
       }
+      final existing = active == null ? null : state.bufferForPath(active);
+      final buffer =
+          existing ??
+          (load == null || active == null
+              ? null
+              : _fileBuffer(
+                  active,
+                  load,
+                  mode: _settingsController.state.documentViewMode,
+                ));
+      final buffers = buffer == null
+          ? state.documentBuffers
+          : existing != null
+          ? state.documentBuffers
+          : [...state.documentBuffers, buffer];
       state = WorkspaceState(
         workspace: tabbedWorkspace,
         activeText: text,
         preview: _safePreview(tabbedWorkspace, text),
+        documentBuffers: buffers,
+        activeBufferId: buffer?.id,
       );
+      await _startMonitoring(tabbedWorkspace);
+      _schedulePersistence();
       _resetSaveTracking();
       return true;
     } on Object catch (error, stackTrace) {
@@ -397,10 +1189,6 @@ class WorkspaceController extends Notifier<WorkspaceState> {
   Future<void> openFolder(String path) => openPath(path);
 
   Future<bool> openActiveFile(String path) async {
-    final workspace = state.workspace;
-    if (workspace?.activeFilePath != path && !await autoSaveActiveIfNeeded()) {
-      return false;
-    }
     return _openActiveFile(path);
   }
 
@@ -408,6 +1196,22 @@ class WorkspaceController extends Notifier<WorkspaceState> {
 
   Future<bool> activatePreviousOpenFileTab() => _activateOpenFileTab(-1);
 
+  Future<bool> activateDocumentBuffer(String bufferId) async {
+    final workspace = state.workspace;
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == bufferId)
+        .firstOrNull;
+    if (workspace == null || buffer == null) {
+      return false;
+    }
+    return _activateBuffer(
+      workspace,
+      buffer,
+      documentBuffers: state.documentBuffers,
+      openFilePaths: workspace.openFilePaths,
+    );
+  }
+
   Future<bool> closeActiveOpenFileTab() async {
     final activeFilePath = state.workspace?.activeFilePath;
     if (activeFilePath == null) {
@@ -418,10 +1222,10 @@ class WorkspaceController extends Notifier<WorkspaceState> {
 
   Future<bool> closeAllOpenFileTabs() async {
     final workspace = state.workspace;
-    if (workspace == null || workspace.openFilePaths.isEmpty) {
+    if (workspace == null || state.documentBuffers.isEmpty) {
       return false;
     }
-    if (!await autoSaveActiveIfNeeded()) {
+    if (state.hasUnsavedChanges) {
       return false;
     }
     _clearOpenFileTabs(workspace);
@@ -467,10 +1271,15 @@ class WorkspaceController extends Notifier<WorkspaceState> {
   }
 
   Future<bool> deleteWorkspaceEntity(String path) async {
-    return _runWorkspaceFileOperation((workspace) async {
-      await _service.deleteEntity(workspace, path);
-      return null;
-    });
+    _intentionallyRemovedPaths.add(p.normalize(path));
+    try {
+      return await _runWorkspaceFileOperation((workspace) async {
+        await _service.deleteEntity(workspace, path);
+        return null;
+      });
+    } finally {
+      _intentionallyRemovedPaths.remove(p.normalize(path));
+    }
   }
 
   Future<bool> moveWritersideTocEntry({
@@ -495,6 +1304,26 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     });
   }
 
+  Future<bool> moveWritersideTocEntries({
+    required String treePath,
+    required List<WritersideTocMoveEntry> sources,
+    required WritersideTopicCreatePlacement placement,
+    required List<int>? referencePath,
+    WritersideTocNodeIdentity? referenceIdentity,
+  }) {
+    return _runWorkspaceFileOperation((workspace) async {
+      await _service.moveWritersideTocEntries(
+        workspace,
+        treePath: treePath,
+        sources: sources,
+        placement: placement,
+        referencePath: referencePath,
+        referenceIdentity: referenceIdentity,
+      );
+      return null;
+    });
+  }
+
   Future<bool> removeWritersideTocEntry({
     required String treePath,
     required List<int> nodePath,
@@ -511,6 +1340,20 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     });
   }
 
+  Future<bool> removeWritersideTocEntries({
+    required String treePath,
+    required List<WritersideTocRemovalRequest> requests,
+  }) {
+    return _runWorkspaceFileOperation((workspace) async {
+      await _service.removeWritersideTocEntries(
+        workspace,
+        treePath: treePath,
+        requests: requests,
+      );
+      return null;
+    });
+  }
+
   Future<bool> renameWritersideTopicFile(String topicPath, String newFileName) {
     final activeFilePath = state.workspace?.activeFilePath;
     return _runWorkspaceFileOperation((workspace) async {
@@ -603,9 +1446,11 @@ class WorkspaceController extends Notifier<WorkspaceState> {
 
   Future<bool> closeOpenFileTab(String path) async {
     final workspace = state.workspace;
-    if (workspace == null ||
-        !_supportsOpenFileTabs(workspace) ||
-        !workspace.openFilePaths.contains(path)) {
+    if (workspace == null || !workspace.openFilePaths.contains(path)) {
+      return false;
+    }
+    final closingBuffer = state.bufferForPath(path);
+    if (closingBuffer?.isDirty == true) {
       return false;
     }
     final closedIndex = workspace.openFilePaths.indexOf(path);
@@ -613,16 +1458,28 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       for (final openPath in workspace.openFilePaths)
         if (openPath != path) openPath,
     ];
-    if (workspace.activeFilePath == path && !await autoSaveActiveIfNeeded()) {
-      return false;
-    }
+    final remainingBuffers = [
+      for (final buffer in state.documentBuffers)
+        if (buffer.filePath != path) buffer,
+    ];
     if (nextOpenFilePaths.isEmpty) {
-      _clearOpenFileTabs(workspace);
+      final nextUntitled = remainingBuffers.firstOrNull;
+      if (nextUntitled == null) {
+        _clearOpenFileTabs(workspace);
+      } else {
+        await _activateBuffer(
+          workspace,
+          nextUntitled,
+          documentBuffers: remainingBuffers,
+          openFilePaths: nextOpenFilePaths,
+        );
+      }
       return true;
     }
     if (workspace.activeFilePath != path) {
       state = state.copyWith(
         workspace: workspace.copyWith(openFilePaths: nextOpenFilePaths),
+        documentBuffers: remainingBuffers,
         clearMessage: true,
       );
       return true;
@@ -633,27 +1490,81 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     return _openActiveFile(
       nextOpenFilePaths[nextIndex],
       openFilePaths: nextOpenFilePaths,
+      documentBuffers: remainingBuffers,
     );
   }
 
-  Future<bool> _activateOpenFileTab(int delta) async {
-    final workspace = state.workspace;
-    if (workspace == null ||
-        !_supportsOpenFileTabs(workspace) ||
-        workspace.openFilePaths.length < 2) {
+  Future<bool> closeDocumentBuffer(
+    String bufferId, {
+    bool discard = false,
+  }) async {
+    _cancelAutoSave(bufferId);
+    return _enqueueBufferWrite(
+      bufferId,
+      () => _closeDocumentBufferNow(bufferId, discard: discard),
+    );
+  }
+
+  Future<bool> _closeDocumentBufferNow(
+    String bufferId, {
+    required bool discard,
+  }) async {
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == bufferId)
+        .firstOrNull;
+    if (buffer == null || (buffer.isDirty && !discard)) {
       return false;
     }
-    final activeFilePath = workspace.activeFilePath;
-    final activeIndex = activeFilePath == null
+    if (buffer.filePath case final path?) {
+      if (buffer.isDirty) {
+        state = state.copyWith(
+          documentBuffers: _replaceBuffer(
+            state.documentBuffers,
+            buffer.copyWith(dirty: false),
+          ),
+        );
+      }
+      return closeOpenFileTab(path);
+    }
+    final workspace = state.workspace;
+    if (workspace == null) {
+      return false;
+    }
+    final remaining = [
+      for (final candidate in state.documentBuffers)
+        if (candidate.id != bufferId) candidate,
+    ];
+    if (remaining.isEmpty) {
+      state = const WorkspaceState();
+      _fileMonitor.updateOpenFilePaths(const <String>[]);
+      _schedulePersistence();
+      return true;
+    }
+    return _activateBuffer(
+      workspace,
+      remaining.last,
+      documentBuffers: remaining,
+      openFilePaths: workspace.openFilePaths,
+    );
+  }
+
+  Future<bool> _activateOpenFileTab(int delta) async {
+    final workspace = state.workspace;
+    if (workspace == null || state.documentBuffers.length < 2) {
+      return false;
+    }
+    final activeIndex = state.activeBufferId == null
         ? -1
-        : workspace.openFilePaths.indexOf(activeFilePath);
+        : state.documentBuffers.indexWhere(
+            (buffer) => buffer.id == state.activeBufferId,
+          );
     final nextIndex = activeIndex < 0
         ? 0
-        : (activeIndex + delta) % workspace.openFilePaths.length;
+        : (activeIndex + delta) % state.documentBuffers.length;
     final normalizedIndex = nextIndex < 0
-        ? nextIndex + workspace.openFilePaths.length
+        ? nextIndex + state.documentBuffers.length
         : nextIndex;
-    return openActiveFile(workspace.openFilePaths[normalizedIndex]);
+    return activateDocumentBuffer(state.documentBuffers[normalizedIndex].id);
   }
 
   void _clearOpenFileTabs(Workspace workspace) {
@@ -661,7 +1572,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       return;
     }
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
+    _cancelAllAutoSaves();
     _invalidateActiveDocumentOperations();
     _resetSaveTracking();
     final List<Diagnostic> diagnostics = switch (workspace.kind) {
@@ -682,21 +1593,36 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       ),
       activeText: '',
       preview: null,
-      isDirty: false,
+      documentBuffers: const [],
+      activeBufferId: null,
       clearMessage: true,
     );
+    _fileMonitor.updateOpenFilePaths(const <String>[]);
+    _schedulePersistence();
   }
 
   Future<bool> _openActiveFile(
     String path, {
     List<String>? openFilePaths,
+    List<DocumentBuffer>? documentBuffers,
   }) async {
     final workspace = state.workspace;
     if (workspace == null) {
       return false;
     }
+    final buffers = documentBuffers ?? state.documentBuffers;
+    final existing = buffers
+        .where((buffer) => buffer.filePath == path)
+        .firstOrNull;
+    if (existing != null) {
+      return _activateBuffer(
+        workspace,
+        existing,
+        documentBuffers: buffers,
+        openFilePaths: openFilePaths ?? _openFileTabPaths(workspace, path),
+      );
+    }
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
     final operationRevision = _invalidateActiveDocumentOperations();
     try {
       final load = await _service.loadTextWithSnapshot(path);
@@ -712,13 +1638,25 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       if (!_isCurrentActiveDocumentOperation(operationRevision)) {
         return false;
       }
+      final buffer = _fileBuffer(
+        path,
+        load,
+        mode: _settingsController.state.documentViewMode,
+      );
       state = state.copyWith(
         workspace: reparsed,
         activeText: load.text,
         preview: _safePreview(reparsed, load.text),
-        isDirty: false,
+        documentBuffers: [...buffers, buffer],
+        activeBufferId: buffer.id,
         clearMessage: true,
       );
+      _fileMonitor.updateOpenFilePaths(
+        [
+          ...buffers,
+          buffer,
+        ].map((candidate) => candidate.filePath).whereType<String>(),
+      );
       _resetSaveTracking();
       return true;
     } on Object catch (error, stackTrace) {
@@ -740,6 +1678,147 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     }
   }
 
+  Future<bool> _activateBuffer(
+    Workspace workspace,
+    DocumentBuffer buffer, {
+    required List<DocumentBuffer> documentBuffers,
+    required List<String> openFilePaths,
+  }) async {
+    _cancelPendingDerivedRefresh();
+    final operationRevision = _invalidateActiveDocumentOperations();
+    final nextWorkspace = workspace.copyWith(
+      activeFilePath: buffer.filePath,
+      activeFileSnapshot: buffer.diskSnapshot,
+      openFilePaths: openFilePaths,
+      markdown: buffer.filePath == null ? workspace.markdown : null,
+    );
+    final reparsed = await _service.reparseActive(nextWorkspace, buffer.text);
+    if (!_isCurrentActiveDocumentOperation(operationRevision)) {
+      return false;
+    }
+    state = state.copyWith(
+      workspace: reparsed,
+      preview: _safePreview(reparsed, buffer.text),
+      documentBuffers: documentBuffers,
+      activeBufferId: buffer.id,
+      clearMessage: true,
+    );
+    _fileMonitor.updateOpenFilePaths(
+      documentBuffers
+          .map((candidate) => candidate.filePath)
+          .whereType<String>(),
+    );
+    _schedulePersistence();
+    _editRevision = buffer.revision;
+    unawaited(_settingsController.setDocumentViewMode(buffer.editorState.mode));
+    return true;
+  }
+
+  void updateActiveEditorState(DocumentEditorState editorState) {
+    final buffer = state.activeBuffer;
+    if (buffer == null) {
+      return;
+    }
+    updateDocumentEditorState(buffer.id, editorState);
+  }
+
+  void updateDocumentEditorState(
+    String bufferId,
+    DocumentEditorState editorState,
+  ) {
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == bufferId)
+        .firstOrNull;
+    if (buffer == null) {
+      return;
+    }
+    state = state.copyWith(
+      documentBuffers: _replaceBuffer(
+        state.documentBuffers,
+        buffer.copyWith(editorState: editorState),
+      ),
+    );
+    _schedulePersistence();
+  }
+
+  bool updateDocumentText(String bufferId, String text) {
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == bufferId)
+        .firstOrNull;
+    if (buffer == null) {
+      return false;
+    }
+    if (state.activeBufferId == bufferId) {
+      updateActiveText(text, sourceFilePath: buffer.filePath);
+      return true;
+    }
+    final next = buffer.edited(text);
+    if (identical(next, buffer)) {
+      return true;
+    }
+    state = state.copyWith(
+      documentBuffers: _replaceBuffer(state.documentBuffers, next),
+    );
+    _schedulePersistence();
+    return true;
+  }
+
+  void updateActiveEditorMode(DocumentViewModePreference mode) {
+    final buffer = state.activeBuffer;
+    if (buffer == null || buffer.editorState.mode == mode) {
+      return;
+    }
+    updateActiveEditorState(buffer.editorState.copyWith(mode: mode));
+  }
+
+  bool undoActiveBuffer() {
+    final buffer = state.activeBuffer;
+    if (buffer == null || buffer.editorState.undoState.undo.isEmpty) {
+      return false;
+    }
+    final undo = buffer.editorState.undoState;
+    final text = undo.undo.last;
+    final next = buffer.copyWith(
+      text: text,
+      dirty: text != buffer.lastSavedText || buffer.isUntitled,
+      format: buffer.format.copyWith(hasFinalNewline: text.endsWith('\n')),
+      revision: buffer.revision + 1,
+      editorState: buffer.editorState.copyWith(
+        undoState: undo.afterUndo(buffer.text),
+      ),
+    );
+    state = state.copyWith(
+      documentBuffers: _replaceBuffer(state.documentBuffers, next),
+    );
+    _requestDerivedRefresh(rebuildPreview: true);
+    _schedulePersistence();
+    return true;
+  }
+
+  bool redoActiveBuffer() {
+    final buffer = state.activeBuffer;
+    if (buffer == null || buffer.editorState.undoState.redo.isEmpty) {
+      return false;
+    }
+    final undo = buffer.editorState.undoState;
+    final text = undo.redo.last;
+    final next = buffer.copyWith(
+      text: text,
+      dirty: text != buffer.lastSavedText || buffer.isUntitled,
+      format: buffer.format.copyWith(hasFinalNewline: text.endsWith('\n')),
+      revision: buffer.revision + 1,
+      editorState: buffer.editorState.copyWith(
+        undoState: undo.afterRedo(buffer.text),
+      ),
+    );
+    state = state.copyWith(
+      documentBuffers: _replaceBuffer(state.documentBuffers, next),
+    );
+    _requestDerivedRefresh(rebuildPreview: true);
+    _schedulePersistence();
+    return true;
+  }
+
   void updateActiveText(String text, {String? sourceFilePath}) {
     _updateActiveText(
       text,
@@ -760,6 +1839,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
       sourceFilePath: sourceFilePath,
       rebuildPreview: false,
       liveOutline: document.outline,
+      preserveFinalNewline: true,
     );
   }
 
@@ -781,6 +1861,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     required bool rebuildPreview,
     String? sourceFilePath,
     List<DocumentOutlineHeading>? liveOutline,
+    bool preserveFinalNewline = false,
   }) {
     final workspace = state.workspace;
     final activeEditorPath =
@@ -788,9 +1869,26 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     if (sourceFilePath != null && activeEditorPath != sourceFilePath) {
       return;
     }
-    _editRevision++;
+    final activeBuffer = state.activeBuffer;
+    if (activeBuffer == null) {
+      return;
+    }
+    final effectiveText = preserveFinalNewline
+        ? _withFinalNewlinePolicy(text, activeBuffer.format.hasFinalNewline)
+        : text;
+    final nextBuffer = activeBuffer.edited(effectiveText);
+    if (identical(nextBuffer, activeBuffer)) {
+      return;
+    }
+    _editRevision = nextBuffer.revision;
     state = state.copyWith(
-      activeText: text,
+      workspace: workspace?.copyWith(
+        runtimeDiagnostics: [
+          for (final diagnostic in workspace.runtimeDiagnostics)
+            if (diagnostic.filePath != activeEditorPath) diagnostic,
+        ],
+      ),
+      documentBuffers: _replaceBuffer(state.documentBuffers, nextBuffer),
       liveOutline: workspace == null || liveOutline == null
           ? null
           : ActiveDocumentOutline(
@@ -799,10 +1897,10 @@ class WorkspaceController extends Notifier<WorkspaceState> {
               source: text,
               headings: liveOutline,
             ),
-      isDirty: true,
     );
+    _schedulePersistence();
     _requestDerivedRefresh(rebuildPreview: rebuildPreview);
-    _scheduleAutoSave();
+    _scheduleAutoSave(nextBuffer.id);
   }
 
   void _requestDerivedRefresh({required bool rebuildPreview}) {
@@ -853,7 +1951,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     final workspaceId = workspace.id;
     final activeFilePath = workspace.activeFilePath;
     final text = state.activeText;
-    final editRevision = _editRevision;
+    final editRevision = state.activeBuffer?.revision ?? _editRevision;
     final operationRevision = _activeDocumentRevision;
     try {
       final preview = await _service.buildPreviewAsync(workspace, text);
@@ -863,7 +1961,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
             activeFilePath: activeFilePath,
           ) ||
           state.activeText != text ||
-          _editRevision != editRevision) {
+          state.activeBuffer?.revision != editRevision) {
         return;
       }
       state = state.copyWith(preview: preview);
@@ -878,69 +1976,46 @@ class WorkspaceController extends Notifier<WorkspaceState> {
   }
 
   Future<bool> autoSaveActiveIfNeeded() async {
-    _autoSaveDebounce?.cancel();
-    if (!_settingsController.state.autoSave || !state.isDirty) {
+    final buffer = state.activeBuffer;
+    if (buffer == null) {
       return true;
     }
-    if (!_canAutoSaveActive()) {
-      return false;
-    }
-    return saveActive();
+    _cancelAutoSave(buffer.id);
+    return _autoSaveBufferIfNeeded(buffer.id);
   }
 
   Future<bool> saveActive({
     bool overwriteExternalChanges = false,
     ActiveDocumentSaveTarget? target,
+    LineEndingNormalization? mixedLineEndingNormalization,
   }) async {
     final operationTarget = target ?? captureActiveDocumentSaveTarget();
     if (operationTarget == null ||
         !isActiveDocumentSaveTargetCurrent(operationTarget)) {
       return false;
     }
-    _autoSaveDebounce?.cancel();
+    _cancelAutoSave(operationTarget.bufferId);
     _cancelPendingDerivedRefresh();
-    final inFlight = _activeSave;
-    if (inFlight != null) {
-      if (_sameSaveTarget(_activeSaveTarget, operationTarget)) {
-        return inFlight;
-      }
-      final completed = await inFlight;
-      // The preceding save may have advanced the controller-owned disk
-      // snapshot. Re-pin only that snapshot; document and edit identity must
-      // still match the queued request.
-      final refreshedTarget = _refreshActiveDocumentSaveTarget(operationTarget);
+    return _enqueueBufferWrite(operationTarget.bufferId, () async {
+      // An earlier queued write may have advanced the known disk snapshot.
+      // Re-pin that controller-owned snapshot without changing the text or
+      // revision approved by this save request.
+      final refreshedTarget = _refreshBufferSaveTarget(operationTarget);
       if (refreshedTarget == null) {
         return false;
       }
-      if (!state.isDirty && completed) {
-        return completed;
-      }
-      return saveActive(
+      return _saveActiveNow(
+        refreshedTarget,
         overwriteExternalChanges: overwriteExternalChanges,
-        target: refreshedTarget,
+        mixedLineEndingNormalization: mixedLineEndingNormalization,
       );
-    }
-    late final Future<bool> operation;
-    operation = _saveActiveNow(
-      operationTarget,
-      overwriteExternalChanges: overwriteExternalChanges,
-    );
-    _activeSave = operation;
-    _activeSaveTarget = operationTarget;
-    unawaited(
-      operation.whenComplete(() {
-        if (identical(_activeSave, operation)) {
-          _activeSave = null;
-          _activeSaveTarget = null;
-        }
-      }),
-    );
-    return operation;
+    });
   }
 
   Future<bool> _saveActiveNow(
     ActiveDocumentSaveTarget target, {
     required bool overwriteExternalChanges,
+    required LineEndingNormalization? mixedLineEndingNormalization,
   }) async {
     final active = target.path;
     if (active == null) {
@@ -958,7 +2033,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
         active,
         target.snapshot,
       );
-      if (!isActiveDocumentSaveTargetCurrent(target)) {
+      if (!_isBufferSaveTargetCurrent(target)) {
         return false;
       }
       if (changedOnDisk) {
@@ -970,61 +2045,70 @@ class WorkspaceController extends Notifier<WorkspaceState> {
         return false;
       }
     }
-    if (!isActiveDocumentSaveTargetCurrent(target)) {
+    if (!_isBufferSaveTargetCurrent(target)) {
       return false;
     }
     try {
-      final snapshot = await _service.saveText(active, target.text);
+      final snapshot = await _service.saveText(
+        active,
+        target.format.formattedText(
+          target.text,
+          mixedNormalization: mixedLineEndingNormalization,
+        ),
+      );
       final currentWorkspace = state.workspace;
-      if (!_isCurrentActiveDocument(
-            target.documentRevision,
-            workspaceId: target.workspaceId,
-            activeFilePath: active,
-          ) ||
-          currentWorkspace == null) {
+      final currentBuffer = state.documentBuffers
+          .where((buffer) => buffer.id == target.bufferId)
+          .firstOrNull;
+      if (currentWorkspace == null ||
+          currentWorkspace.id != target.workspaceId ||
+          currentBuffer == null ||
+          currentBuffer.filePath != active) {
         return false;
       }
-      final reparsed = await _service.reparseActive(
-        currentWorkspace.copyWith(activeFileSnapshot: snapshot),
-        target.text,
+      final savedFormat =
+          target.format.hasMixedLineEndings &&
+              mixedLineEndingNormalization != null
+          ? target.format.normalized(mixedLineEndingNormalization)
+          : target.format;
+      final unchanged =
+          currentBuffer.revision == target.editRevision &&
+          currentBuffer.text == target.text;
+      final savedBuffer = currentBuffer.copyWith(
+        lastSavedText: target.text,
+        dirty: currentBuffer.text != target.text,
+        diskSnapshot: snapshot,
+        format: unchanged ? savedFormat : currentBuffer.format,
+        diskState: DocumentDiskState.present,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+        recovered: false,
       );
-      final latestWorkspace = state.workspace;
-      if (!_isCurrentActiveDocument(
-            target.documentRevision,
-            workspaceId: target.workspaceId,
-            activeFilePath: active,
-          ) ||
-          latestWorkspace == null) {
-        return false;
+      final remainsActive = state.activeBufferId == target.bufferId;
+      final nextWorkspace = remainsActive
+          ? currentWorkspace.copyWith(activeFileSnapshot: snapshot)
+          : currentWorkspace;
+      state = state.copyWith(
+        workspace: nextWorkspace,
+        documentBuffers: _replaceBuffer(state.documentBuffers, savedBuffer),
+        clearMessage: true,
+      );
+      if (savedBuffer.isDirty) {
+        _scheduleAutoSave(target.bufferId);
       }
-      if (_editRevision == target.editRevision &&
-          state.activeText == target.text) {
-        final nextWorkspace = reparsed.copyWith(
-          activeFileSnapshot: snapshot,
-          openFilePaths: latestWorkspace.openFilePaths,
-          files: latestWorkspace.files,
-        );
-        state = state.copyWith(
-          workspace: nextWorkspace,
-          preview: _safePreview(nextWorkspace, target.text),
-          isDirty: false,
-          clearMessage: true,
-        );
-      } else {
-        state = state.copyWith(
-          workspace: latestWorkspace.copyWith(activeFileSnapshot: snapshot),
-          isDirty: true,
-          clearMessage: true,
+      _schedulePersistence();
+      if (remainsActive && unchanged) {
+        await _refreshActiveBufferAfterDiskUpdate(
+          bufferId: target.bufferId,
+          workspaceId: target.workspaceId,
+          text: target.text,
+          editRevision: target.editRevision,
+          snapshot: snapshot,
         );
-        _scheduleAutoSave();
       }
       return true;
     } on Object catch (error) {
-      if (_isCurrentActiveDocument(
-        target.documentRevision,
-        workspaceId: target.workspaceId,
-        activeFilePath: active,
-      )) {
+      if (_workspaceContainsBuffer(target.workspaceId, target.bufferId)) {
         state = state.copyWith(
           message: WorkspaceMessage(
             WorkspaceMessageCode.saveFailed,
@@ -1036,61 +2120,315 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     }
   }
 
+  Future<void> _refreshActiveBufferAfterDiskUpdate({
+    required String bufferId,
+    required String workspaceId,
+    required String text,
+    required int editRevision,
+    required WorkspaceFileSnapshot? snapshot,
+  }) async {
+    final workspace = state.workspace;
+    if (workspace == null ||
+        workspace.id != workspaceId ||
+        state.activeBufferId != bufferId) {
+      return;
+    }
+    try {
+      final reparsed = await _service.reparseActive(workspace, text);
+      final currentWorkspace = state.workspace;
+      final currentBuffer = state.documentBuffers
+          .where((buffer) => buffer.id == bufferId)
+          .firstOrNull;
+      if (currentWorkspace == null ||
+          currentWorkspace.id != workspaceId ||
+          state.activeBufferId != bufferId ||
+          currentBuffer == null ||
+          currentBuffer.revision != editRevision ||
+          currentBuffer.text != text ||
+          !_sameFileSnapshot(currentBuffer.diskSnapshot, snapshot)) {
+        return;
+      }
+      final nextWorkspace = reparsed.copyWith(
+        activeFileSnapshot: snapshot,
+        openFilePaths: currentWorkspace.openFilePaths,
+        files: currentWorkspace.files,
+      );
+      state = state.copyWith(
+        workspace: nextWorkspace,
+        preview: _safePreview(nextWorkspace, text),
+      );
+    } on Object catch (error, stackTrace) {
+      busyMarkDebugLogError(
+        '[BusyMark] Document reparse after disk update failed',
+        error,
+        stackTrace,
+      );
+    }
+  }
+
+  Future<SaveAllResult> saveAll({
+    Map<String, LineEndingNormalization> mixedLineEndingNormalizations =
+        const {},
+  }) async {
+    _cancelAllAutoSaves();
+    final saved = <String>[];
+    final failed = <String>[];
+    final conflicts = <String>[];
+    final normalizationRequired = <String>[];
+    final targets = [
+      for (final buffer in state.documentBuffers)
+        if (buffer.isDirty && buffer.filePath != null) buffer,
+    ];
+    final writes = <({String id, Future<_BufferWriteResult> result})>[];
+    for (final target in targets) {
+      if (target.format.hasMixedLineEndings &&
+          !mixedLineEndingNormalizations.containsKey(target.id)) {
+        normalizationRequired.add(target.id);
+        continue;
+      }
+      writes.add((
+        id: target.id,
+        result: _enqueueBufferWrite(
+          target.id,
+          () => _saveBufferForSaveAll(
+            target,
+            mixedLineEndingNormalizations[target.id],
+          ),
+        ),
+      ));
+    }
+    for (final write in writes) {
+      switch (await write.result) {
+        case _BufferWriteResult.saved:
+          saved.add(write.id);
+        case _BufferWriteResult.failed:
+          failed.add(write.id);
+        case _BufferWriteResult.conflict:
+          conflicts.add(write.id);
+      }
+    }
+    _schedulePersistence();
+    _scheduleAutoSave();
+    return SaveAllResult(
+      savedBufferIds: List.unmodifiable(saved),
+      failedBufferIds: List.unmodifiable(failed),
+      conflictBufferIds: List.unmodifiable(conflicts),
+      normalizationRequiredBufferIds: List.unmodifiable(normalizationRequired),
+    );
+  }
+
+  Future<_BufferWriteResult> _saveBufferForSaveAll(
+    DocumentBuffer target,
+    LineEndingNormalization? normalization,
+  ) async {
+    final current = state.documentBuffers
+        .where((buffer) => buffer.id == target.id)
+        .firstOrNull;
+    if (current == null) {
+      return _BufferWriteResult.failed;
+    }
+    if (!current.isDirty && current.text == target.text) {
+      return _BufferWriteResult.saved;
+    }
+    if (current.diskState != DocumentDiskState.present) {
+      return _BufferWriteResult.conflict;
+    }
+    final path = target.filePath!;
+    if (await _service.fileChangedSince(path, current.diskSnapshot)) {
+      return _BufferWriteResult.conflict;
+    }
+    try {
+      final snapshot = await _service.saveText(
+        path,
+        target.format.formattedText(
+          target.text,
+          mixedNormalization: normalization,
+        ),
+      );
+      final latest = state.documentBuffers
+          .where((buffer) => buffer.id == target.id)
+          .firstOrNull;
+      if (latest == null) {
+        return _BufferWriteResult.failed;
+      }
+      final unchanged = latest.revision == target.revision;
+      final savedFormat =
+          target.format.hasMixedLineEndings && normalization != null
+          ? target.format.normalized(normalization)
+          : target.format;
+      final next = latest.copyWith(
+        lastSavedText: target.text,
+        dirty: !unchanged,
+        diskSnapshot: snapshot,
+        format: unchanged ? savedFormat : latest.format,
+        diskState: DocumentDiskState.present,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+        recovered: false,
+      );
+      state = state.copyWith(
+        documentBuffers: _replaceBuffer(state.documentBuffers, next),
+        workspace: state.activeBufferId == target.id
+            ? state.workspace?.copyWith(activeFileSnapshot: snapshot)
+            : state.workspace,
+      );
+      return _BufferWriteResult.saved;
+    } on Object {
+      return _BufferWriteResult.failed;
+    }
+  }
+
   Future<bool> saveActiveAs(
     String path, {
     ActiveDocumentSaveTarget? target,
     bool overwriteExisting = false,
+    LineEndingNormalization? mixedLineEndingNormalization,
   }) async {
     final operationTarget = target ?? captureActiveDocumentSaveTarget();
     if (operationTarget == null ||
         !isActiveDocumentSaveTargetCurrent(operationTarget)) {
       return false;
     }
-    _autoSaveDebounce?.cancel();
+    _cancelAutoSave(operationTarget.bufferId);
     _cancelPendingDerivedRefresh();
-    final operationRevision = _invalidateActiveDocumentOperations();
+    return _enqueueBufferWrite(operationTarget.bufferId, () async {
+      final refreshedTarget = _refreshBufferSaveTarget(operationTarget);
+      if (refreshedTarget == null) {
+        return false;
+      }
+      return _saveActiveAsNow(
+        path,
+        target: refreshedTarget,
+        overwriteExisting: overwriteExisting,
+        mixedLineEndingNormalization: mixedLineEndingNormalization,
+      );
+    });
+  }
+
+  Future<bool> _saveActiveAsNow(
+    String path, {
+    required ActiveDocumentSaveTarget target,
+    required bool overwriteExisting,
+    required LineEndingNormalization? mixedLineEndingNormalization,
+  }) async {
     try {
+      late final WorkspaceFileSnapshot savedSnapshot;
       if (overwriteExisting) {
-        await _service.saveTextReplacingPath(path, operationTarget.text);
+        savedSnapshot = await _service.saveTextReplacingPath(
+          path,
+          target.format.formattedText(
+            target.text,
+            mixedNormalization: mixedLineEndingNormalization,
+          ),
+        );
       } else {
-        await _service.saveNewText(path, operationTarget.text);
+        savedSnapshot = await _service.saveNewText(
+          path,
+          target.format.formattedText(
+            target.text,
+            mixedNormalization: mixedLineEndingNormalization,
+          ),
+        );
       }
-      if (!_isSaveAsSourceDocumentCurrent(operationRevision, operationTarget)) {
+      var currentWorkspace = state.workspace;
+      var currentBuffer = state.documentBuffers
+          .where((buffer) => buffer.id == target.bufferId)
+          .firstOrNull;
+      if (currentWorkspace == null ||
+          currentWorkspace.id != target.workspaceId ||
+          currentBuffer == null ||
+          currentBuffer.filePath != target.path) {
         return false;
       }
-      final savedWorkspace = await _service.openPath(path);
-      if (!_isSaveAsSourceDocumentCurrent(operationRevision, operationTarget)) {
+      final replaceWorkspace =
+          currentWorkspace.kind == WorkspaceKind.untitledMarkdown;
+      Workspace? openedWorkspace;
+      if (replaceWorkspace) {
+        openedWorkspace = await _service.openPath(path);
+      }
+      currentWorkspace = state.workspace;
+      currentBuffer = state.documentBuffers
+          .where((buffer) => buffer.id == target.bufferId)
+          .firstOrNull;
+      if (currentWorkspace == null ||
+          currentWorkspace.id != target.workspaceId ||
+          currentBuffer == null ||
+          currentBuffer.filePath != target.path) {
         return false;
       }
-      final latestText = state.activeText;
       final hasNewerEdits =
-          _editRevision != operationTarget.editRevision ||
-          latestText != operationTarget.text;
+          currentBuffer.revision != target.editRevision ||
+          currentBuffer.text != target.text;
+      final savedFormat =
+          target.format.hasMixedLineEndings &&
+              mixedLineEndingNormalization != null
+          ? target.format.normalized(mixedLineEndingNormalization)
+          : target.format;
+      final savedBuffer = currentBuffer.copyWith(
+        filePath: path,
+        untitledName: null,
+        lastSavedText: target.text,
+        dirty: hasNewerEdits,
+        diskSnapshot: savedSnapshot,
+        format: hasNewerEdits ? currentBuffer.format : savedFormat,
+        diskState: DocumentDiskState.present,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+        recovered: false,
+      );
+      final buffers = _replaceBuffer(state.documentBuffers, savedBuffer);
+      final activeBufferId = state.activeBufferId;
+      final activeBuffer = buffers
+          .where((buffer) => buffer.id == activeBufferId)
+          .firstOrNull;
+      final tabPaths = [
+        for (final buffer in buffers)
+          if (buffer.filePath != null) buffer.filePath!,
+      ];
+      final workspaceBase = openedWorkspace ?? currentWorkspace;
+      final savedWorkspace = workspaceBase.copyWith(
+        activeFilePath: activeBuffer?.filePath,
+        activeFileSnapshot: activeBuffer?.diskSnapshot,
+        openFilePaths: tabPaths,
+        markdown: activeBuffer?.filePath == null
+            ? currentWorkspace.markdown
+            : null,
+      );
       _cancelPendingDerivedRefresh();
-      state = WorkspaceState(
+      state = state.copyWith(
         workspace: savedWorkspace,
-        activeText: hasNewerEdits ? latestText : operationTarget.text,
-        preview: _safePreview(
-          savedWorkspace,
-          hasNewerEdits ? latestText : operationTarget.text,
-        ),
-        isDirty: hasNewerEdits,
+        documentBuffers: buffers,
+        clearMessage: true,
       );
+      await _startMonitoring(savedWorkspace);
       if (hasNewerEdits) {
-        if (_settingsController.state.validateOnEdit) {
+        if (state.activeBufferId == savedBuffer.id &&
+            _settingsController.state.validateOnEdit) {
           unawaited(validateActive());
         }
-        _scheduleAutoSave();
-      } else {
+        _scheduleAutoSave(savedBuffer.id);
+      } else if (state.activeBufferId == savedBuffer.id) {
         _resetSaveTracking();
       }
+      final activeAfterSave = state.activeBuffer;
+      if (activeAfterSave != null &&
+          (replaceWorkspace || activeAfterSave.id == savedBuffer.id)) {
+        await _refreshActiveBufferAfterDiskUpdate(
+          bufferId: activeAfterSave.id,
+          workspaceId: savedWorkspace.id,
+          text: activeAfterSave.text,
+          editRevision: activeAfterSave.revision,
+          snapshot: activeAfterSave.diskSnapshot,
+        );
+      }
       await _settingsController.recordOpenedWorkspace(
         path: path,
         kind: savedWorkspace.kind.name,
       );
+      _schedulePersistence();
       return true;
     } on Object catch (error) {
-      if (_isSaveAsSourceDocumentCurrent(operationRevision, operationTarget)) {
+      if (_workspaceContainsBuffer(target.workspaceId, target.bufferId)) {
         state = state.copyWith(
           message: WorkspaceMessage(
             WorkspaceMessageCode.saveFailed,
@@ -1129,39 +2467,85 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     if (!state.isDirty) {
       return true;
     }
-    _autoSaveDebounce?.cancel();
+    _cancelAutoSave(operationTarget.bufferId);
     _cancelPendingDerivedRefresh();
-    final workspace = state.workspace;
-    if (workspace == null) {
+    return _enqueueBufferWrite(
+      operationTarget.bufferId,
+      () => _discardBufferChangesNow(operationTarget),
+    );
+  }
+
+  Future<bool> _discardBufferChangesNow(
+    ActiveDocumentSaveTarget operationTarget,
+  ) async {
+    final refreshedTarget = _refreshBufferSaveTarget(operationTarget);
+    if (refreshedTarget == null) {
       return false;
     }
-    final active = operationTarget.path;
-    final operationRevision = _invalidateActiveDocumentOperations();
-    if (workspace.kind == WorkspaceKind.untitledMarkdown || active == null) {
-      state = const WorkspaceState();
-      _resetSaveTracking();
+    final current = state.documentBuffers
+        .where((buffer) => buffer.id == refreshedTarget.bufferId)
+        .firstOrNull;
+    if (current == null) {
+      return false;
+    }
+    if (!current.isDirty) {
       return true;
     }
+    final workspace = state.workspace;
+    if (workspace == null || workspace.id != refreshedTarget.workspaceId) {
+      return false;
+    }
+    final active = refreshedTarget.path;
+    if (active == null) {
+      return _closeDocumentBufferNow(refreshedTarget.bufferId, discard: true);
+    }
     try {
       final load = await _service.loadTextWithSnapshot(active);
-      if (!_isPinnedOperationCurrent(operationRevision, operationTarget)) {
+      if (!_isBufferSaveTargetCurrent(refreshedTarget)) {
         return false;
       }
-      final nextWorkspace = workspace.copyWith(
-        activeFileSnapshot: load.snapshot,
+      final currentBuffer = state.documentBuffers
+          .where((buffer) => buffer.id == refreshedTarget.bufferId)
+          .firstOrNull;
+      if (currentBuffer == null) {
+        return false;
+      }
+      final discardedBuffer = currentBuffer.copyWith(
+        text: load.text,
+        lastSavedText: load.text,
+        dirty: false,
+        diskSnapshot: load.snapshot,
+        format: load.format,
+        revision: currentBuffer.revision + 1,
+        diskState: DocumentDiskState.present,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+        recovered: false,
       );
-      final reparsed = await _service.reparseActive(nextWorkspace, load.text);
-      if (!_isPinnedOperationCurrent(operationRevision, operationTarget)) {
+      final remainsActive = state.activeBufferId == refreshedTarget.bufferId;
+      final currentWorkspace = state.workspace;
+      if (currentWorkspace == null ||
+          currentWorkspace.id != refreshedTarget.workspaceId) {
         return false;
       }
       state = state.copyWith(
-        workspace: reparsed,
-        activeText: load.text,
-        preview: _safePreview(reparsed, load.text),
-        isDirty: false,
+        workspace: remainsActive
+            ? currentWorkspace.copyWith(activeFileSnapshot: load.snapshot)
+            : currentWorkspace,
+        documentBuffers: _replaceBuffer(state.documentBuffers, discardedBuffer),
         clearMessage: true,
       );
-      _resetSaveTracking();
+      _schedulePersistence();
+      if (remainsActive) {
+        _resetSaveTracking();
+        await _refreshActiveBufferAfterDiskUpdate(
+          bufferId: discardedBuffer.id,
+          workspaceId: refreshedTarget.workspaceId,
+          text: load.text,
+          editRevision: discardedBuffer.revision,
+          snapshot: load.snapshot,
+        );
+      }
       return true;
     } on Object catch (error, stackTrace) {
       busyMarkDebugLogError(
@@ -1170,9 +2554,11 @@ class WorkspaceController extends Notifier<WorkspaceState> {
         stackTrace,
         context: {'active': busyMarkLogPath(active)},
       );
-      if (_isPinnedOperationCurrent(operationRevision, operationTarget)) {
+      if (_workspaceContainsBuffer(
+        refreshedTarget.workspaceId,
+        refreshedTarget.bufferId,
+      )) {
         state = state.copyWith(
-          isDirty: true,
           message: WorkspaceMessage(
             WorkspaceMessageCode.couldNotOpenFile,
             error: error,
@@ -1185,60 +2571,105 @@ class WorkspaceController extends Notifier<WorkspaceState> {
 
   Future<bool> refreshWorkspaceFromDiskPreservingOpenTabs() async {
     final workspace = state.workspace;
-    if (workspace == null || state.isDirty) {
+    if (workspace == null) {
       return false;
     }
     final operationRevision = _invalidateActiveDocumentOperations();
     _cancelPendingDerivedRefresh();
-    _autoSaveDebounce?.cancel();
+    _cancelAllAutoSaves();
     state = state.copyWith(isLoading: true, clearMessage: true);
     try {
       final openTarget = workspace.kind == WorkspaceKind.singleMarkdown
           ? workspace.activeFilePath ?? workspace.rootPath
           : workspace.rootPath;
       final refreshed = await _service.openPath(openTarget);
+      final refreshedWorkspace = workspace.kind == WorkspaceKind.singleMarkdown
+          ? workspace.copyWith(
+              files: _mergedDocumentFiles(workspace.files, refreshed.files),
+              diagnostics: refreshed.diagnostics,
+              markdown: refreshed.markdown,
+            )
+          : refreshed;
       final existingFiles = {
         for (final file in refreshed.files) file.absolutePath: file,
       };
-      final retainedTabs = [
-        for (final path in workspace.openFilePaths)
-          if (existingFiles.containsKey(path)) path,
+      final buffers = <DocumentBuffer>[];
+      for (final buffer in state.documentBuffers) {
+        final path = buffer.filePath;
+        if (path == null) {
+          buffers.add(buffer);
+          continue;
+        }
+        if (_intentionallyRemovedPaths.any(
+          (removed) => p.equals(path, removed) || p.isWithin(removed, path),
+        )) {
+          continue;
+        }
+        final exists = workspace.kind == WorkspaceKind.singleMarkdown
+            ? await _service.pathExists(path)
+            : existingFiles.containsKey(path);
+        if (!exists) {
+          buffers.add(buffer.copyWith(diskState: DocumentDiskState.deleted));
+          continue;
+        }
+        if (buffer.isDirty) {
+          buffers.add(buffer);
+          continue;
+        }
+        final load = await _service.loadTextWithSnapshot(path);
+        buffers.add(
+          buffer.copyWith(
+            text: load.text,
+            lastSavedText: load.text,
+            dirty: false,
+            diskSnapshot: load.snapshot,
+            format: load.format,
+            diskState: DocumentDiskState.present,
+          ),
+        );
+      }
+      var activeBuffer = buffers
+          .where((buffer) => buffer.id == state.activeBufferId)
+          .firstOrNull;
+      activeBuffer ??= buffers.firstOrNull;
+      if (activeBuffer == null && refreshed.activeFilePath != null) {
+        final load = await _service.loadTextWithSnapshot(
+          refreshed.activeFilePath!,
+        );
+        activeBuffer = _fileBuffer(
+          refreshed.activeFilePath!,
+          load,
+          mode: _settingsController.state.documentViewMode,
+        );
+        buffers.add(activeBuffer);
+      }
+      final active = activeBuffer?.filePath;
+      final tabPaths = [
+        for (final buffer in buffers)
+          if (buffer.filePath != null) buffer.filePath!,
       ];
-      final previousActive = workspace.activeFilePath;
-      final active =
-          previousActive != null && existingFiles.containsKey(previousActive)
-          ? previousActive
-          : retainedTabs.isNotEmpty
-          ? retainedTabs.first
-          : refreshed.activeFilePath;
-      final load = active == null
-          ? null
-          : await _service.loadTextWithSnapshot(active);
-      final tabPaths = _supportsOpenFileTabs(refreshed)
-          ? _retainedOpenFileTabPaths(
-              current: workspace,
-              refreshed: refreshed,
-              activeFilePath: active,
-            )
-          : active == null
-          ? const <String>[]
-          : <String>[active];
-      final nextWorkspace = refreshed.copyWith(
+      final nextWorkspace = refreshedWorkspace.copyWith(
         activeFilePath: active,
-        activeFileSnapshot: load?.snapshot,
+        activeFileSnapshot: activeBuffer?.diskSnapshot,
         openFilePaths: tabPaths,
       );
-      final reparsed = load == null
+      final reparsed = activeBuffer == null
           ? nextWorkspace.copyWith(markdown: null)
-          : await _service.reparseActive(nextWorkspace, load.text);
+          : await _service.reparseActive(nextWorkspace, activeBuffer.text);
       if (!_isCurrentActiveDocumentOperation(operationRevision)) {
         return false;
       }
       state = WorkspaceState(
         workspace: reparsed,
-        activeText: load?.text ?? '',
-        preview: load == null ? null : _safePreview(reparsed, load.text),
+        activeText: activeBuffer?.text ?? '',
+        preview: activeBuffer == null
+            ? null
+            : _safePreview(reparsed, activeBuffer.text),
+        documentBuffers: buffers,
+        activeBufferId: activeBuffer?.id,
       );
+      _fileMonitor.updateOpenFilePaths(tabPaths);
+      _schedulePersistence();
       _resetSaveTracking();
       return true;
     } on Object catch (error, stackTrace) {
@@ -1324,6 +2755,14 @@ class WorkspaceController extends Notifier<WorkspaceState> {
         activeFilePath: remappedActive ?? activeFilePath,
         openFilePaths: remappedTabs,
       ),
+      documentBuffers: [
+        for (final buffer in state.documentBuffers)
+          if (_remapMovedPath(buffer.filePath, sourcePath, targetPath)
+              case final remapped?)
+            buffer.copyWith(filePath: remapped)
+          else
+            buffer,
+      ],
     );
   }
 
@@ -1335,7 +2774,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     final workspaceId = workspace.id;
     final activeFilePath = workspace.activeFilePath;
     final text = state.activeText;
-    final editRevision = _editRevision;
+    final editRevision = state.activeBuffer?.revision ?? _editRevision;
     final operationRevision = _activeDocumentRevision;
     try {
       final reparsed = await _service.reparseActive(workspace, text);
@@ -1347,7 +2786,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
           ) ||
           currentWorkspace == null ||
           state.activeText != text ||
-          _editRevision != editRevision) {
+          state.activeBuffer?.revision != editRevision) {
         return;
       }
       final currentSnapshot = currentWorkspace.activeFileSnapshot;
@@ -1367,7 +2806,7 @@ class WorkspaceController extends Notifier<WorkspaceState> {
             activeFilePath: activeFilePath,
           ) &&
           state.activeText == text &&
-          _editRevision == editRevision) {
+          state.activeBuffer?.revision == editRevision) {
         state = state.copyWith(
           message: WorkspaceMessage(
             WorkspaceMessageCode.validationFailed,
@@ -1401,19 +2840,137 @@ class WorkspaceController extends Notifier<WorkspaceState> {
     );
   }
 
-  void _scheduleAutoSave() {
-    _autoSaveDebounce?.cancel();
-    if (!_settingsController.state.autoSave || !_canAutoSaveActive()) {
+  void _scheduleAutoSave([String? bufferId]) {
+    if (!_settingsController.state.autoSave) {
       return;
     }
-    _autoSaveDebounce = Timer(_autoSaveDelay, () {
-      unawaited(autoSaveActiveIfNeeded());
+    final targets = bufferId == null
+        ? state.dirtyBuffers
+        : state.documentBuffers.where((buffer) => buffer.id == bufferId);
+    for (final buffer in targets) {
+      if (!_canAutoSave(buffer)) {
+        continue;
+      }
+      _cancelAutoSave(buffer.id);
+      late final Timer timer;
+      timer = Timer(_autoSaveDelay, () {
+        if (identical(_autoSaveDebounces[buffer.id], timer)) {
+          _autoSaveDebounces.remove(buffer.id);
+        }
+        unawaited(_autoSaveBufferIfNeeded(buffer.id));
+      });
+      _autoSaveDebounces[buffer.id] = timer;
+    }
+  }
+
+  bool _canAutoSave(DocumentBuffer buffer) {
+    return buffer.isDirty &&
+        buffer.filePath != null &&
+        buffer.diskState == DocumentDiskState.present &&
+        !buffer.format.hasMixedLineEndings;
+  }
+
+  void _cancelAutoSave(String bufferId) {
+    _autoSaveDebounces.remove(bufferId)?.cancel();
+  }
+
+  void _cancelAllAutoSaves() {
+    for (final timer in _autoSaveDebounces.values) {
+      timer.cancel();
+    }
+    _autoSaveDebounces.clear();
+  }
+
+  Future<T> _enqueueBufferWrite<T>(
+    String bufferId,
+    Future<T> Function() write,
+  ) {
+    final prior = _bufferWriteQueues[bufferId] ?? Future<void>.value();
+    final result = prior.then((_) => write());
+    late final Future<void> tail;
+    tail = result.then<void>((_) {}, onError: (_, _) {}).whenComplete(() {
+      if (identical(_bufferWriteQueues[bufferId], tail)) {
+        _bufferWriteQueues.remove(bufferId);
+      }
     });
+    _bufferWriteQueues[bufferId] = tail;
+    return result;
   }
 
-  bool _canAutoSaveActive() {
-    final workspace = state.workspace;
-    return workspace != null && workspace.activeFilePath != null;
+  Future<void> _drainBufferWrites() async {
+    while (_bufferWriteQueues.isNotEmpty) {
+      await Future.wait(_bufferWriteQueues.values.toList(growable: false));
+    }
+  }
+
+  Future<bool> _autoSaveBufferIfNeeded(String bufferId) =>
+      _enqueueBufferWrite(bufferId, () => _autoSaveBufferNow(bufferId));
+
+  Future<bool> _autoSaveBufferNow(String bufferId) async {
+    if (!_settingsController.state.autoSave) {
+      return true;
+    }
+    final target = state.documentBuffers
+        .where((buffer) => buffer.id == bufferId)
+        .firstOrNull;
+    if (target == null || !target.isDirty) {
+      return true;
+    }
+    if (!_canAutoSave(target)) {
+      return false;
+    }
+    final path = target.filePath!;
+    if (await _service.fileChangedSince(path, target.diskSnapshot)) {
+      return false;
+    }
+    final beforeWrite = state.documentBuffers
+        .where((buffer) => buffer.id == bufferId)
+        .firstOrNull;
+    if (beforeWrite == null || beforeWrite.revision != target.revision) {
+      _scheduleAutoSave(bufferId);
+      return false;
+    }
+    try {
+      final snapshot = await _service.saveText(
+        path,
+        target.format.formattedText(target.text),
+      );
+      final current = state.documentBuffers
+          .where((buffer) => buffer.id == bufferId)
+          .firstOrNull;
+      if (current == null) {
+        return false;
+      }
+      final next = current.copyWith(
+        lastSavedText: target.text,
+        dirty: current.text != target.text,
+        diskSnapshot: snapshot,
+        diskState: DocumentDiskState.present,
+        diskVersionText: null,
+        diskVersionSnapshot: null,
+        recovered: false,
+      );
+      state = state.copyWith(
+        documentBuffers: _replaceBuffer(state.documentBuffers, next),
+        workspace: state.activeBufferId == bufferId
+            ? state.workspace?.copyWith(activeFileSnapshot: snapshot)
+            : state.workspace,
+        clearMessage: true,
+      );
+      _schedulePersistence();
+      if (next.isDirty) {
+        _scheduleAutoSave(bufferId);
+      }
+      return true;
+    } on Object catch (error) {
+      state = state.copyWith(
+        message: WorkspaceMessage(
+          WorkspaceMessageCode.saveFailed,
+          error: error,
+        ),
+      );
+      return false;
+    }
   }
 
   void _resetSaveTracking({bool dirty = false}) {
@@ -1441,77 +2998,114 @@ class WorkspaceController extends Notifier<WorkspaceState> {
         workspace.activeFilePath == activeFilePath;
   }
 
-  bool _isPinnedOperationCurrent(
-    int operationRevision,
-    ActiveDocumentSaveTarget target,
-  ) {
-    final workspace = state.workspace;
-    return _isCurrentActiveDocument(
-          operationRevision,
-          workspaceId: target.workspaceId,
-          activeFilePath: target.path,
-        ) &&
-        workspace != null &&
-        _editRevision == target.editRevision &&
-        state.activeText == target.text &&
-        _sameFileSnapshot(workspace.activeFileSnapshot, target.snapshot);
+  bool _workspaceContainsBuffer(String workspaceId, String bufferId) {
+    return state.workspace?.id == workspaceId &&
+        state.documentBuffers.any((buffer) => buffer.id == bufferId);
   }
 
-  bool _isSaveAsSourceDocumentCurrent(
-    int operationRevision,
-    ActiveDocumentSaveTarget target,
-  ) {
+  bool _isBufferSaveTargetCurrent(ActiveDocumentSaveTarget target) {
     final workspace = state.workspace;
-    return _isCurrentActiveDocument(
-          operationRevision,
-          workspaceId: target.workspaceId,
-          activeFilePath: target.path,
-        ) &&
-        workspace != null &&
-        _sameFileSnapshot(workspace.activeFileSnapshot, target.snapshot);
-  }
-
-  bool _sameSaveTarget(
-    ActiveDocumentSaveTarget? first,
-    ActiveDocumentSaveTarget second,
-  ) {
-    return first != null &&
-        first.workspaceId == second.workspaceId &&
-        first.path == second.path &&
-        first.documentRevision == second.documentRevision &&
-        first.editRevision == second.editRevision &&
-        first.text == second.text &&
-        first.workspaceKind == second.workspaceKind &&
-        _sameFileSnapshot(first.snapshot, second.snapshot);
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == target.bufferId)
+        .firstOrNull;
+    return workspace != null &&
+        workspace.id == target.workspaceId &&
+        workspace.kind == target.workspaceKind &&
+        buffer != null &&
+        buffer.filePath == target.path &&
+        buffer.revision == target.editRevision &&
+        buffer.text == target.text &&
+        _sameFileSnapshot(buffer.diskSnapshot, target.snapshot);
   }
 
-  ActiveDocumentSaveTarget? _refreshActiveDocumentSaveTarget(
+  ActiveDocumentSaveTarget? _refreshBufferSaveTarget(
     ActiveDocumentSaveTarget target,
   ) {
     final workspace = state.workspace;
-    if (!_isCurrentActiveDocument(
-          target.documentRevision,
-          workspaceId: target.workspaceId,
-          activeFilePath: target.path,
-        ) ||
-        workspace == null ||
-        _editRevision != target.editRevision ||
-        state.activeText != target.text ||
-        workspace.kind != target.workspaceKind) {
+    final buffer = state.documentBuffers
+        .where((candidate) => candidate.id == target.bufferId)
+        .firstOrNull;
+    if (workspace == null ||
+        workspace.id != target.workspaceId ||
+        workspace.kind != target.workspaceKind ||
+        buffer == null ||
+        buffer.filePath != target.path ||
+        buffer.revision != target.editRevision ||
+        buffer.text != target.text) {
       return null;
     }
     return ActiveDocumentSaveTarget._(
       workspaceId: target.workspaceId,
+      bufferId: target.bufferId,
       path: target.path,
       documentRevision: target.documentRevision,
       editRevision: target.editRevision,
-      snapshot: workspace.activeFileSnapshot,
+      snapshot: buffer.diskSnapshot,
       text: target.text,
       workspaceKind: target.workspaceKind,
+      format: buffer.format,
     );
   }
 }
 
+DocumentBuffer _fileBuffer(
+  String path,
+  WorkspaceFileLoad load, {
+  DocumentViewModePreference mode = DocumentViewModePreference.editor,
+}) {
+  final format =
+      load.format.lfCount == 0 &&
+          load.format.crlfCount == 0 &&
+          load.format.crCount == 0 &&
+          load.text.endsWith('\n')
+      ? load.format.copyWith(
+          lineEnding: DocumentLineEnding.lf,
+          hasFinalNewline: true,
+        )
+      : load.format;
+  return DocumentBuffer.file(
+    id: 'file:$path',
+    filePath: path,
+    text: load.text,
+    snapshot: load.snapshot,
+    format: format,
+    mode: mode,
+  );
+}
+
+List<DocumentBuffer> _replaceBuffer(
+  List<DocumentBuffer> buffers,
+  DocumentBuffer replacement,
+) {
+  return List.unmodifiable([
+    for (final buffer in buffers)
+      if (buffer.id == replacement.id) replacement else buffer,
+  ]);
+}
+
+List<DocumentFile> _mergedDocumentFiles(
+  List<DocumentFile> current,
+  List<DocumentFile> refreshed,
+) {
+  final refreshedPaths = {for (final file in refreshed) file.absolutePath};
+  return List.unmodifiable([
+    for (final file in current)
+      if (!refreshedPaths.contains(file.absolutePath)) file,
+    ...refreshed,
+  ]);
+}
+
+String _withFinalNewlinePolicy(String text, bool hasFinalNewline) {
+  if (hasFinalNewline) {
+    return text.endsWith('\n') ? text : '$text\n';
+  }
+  return text.replaceFirst(RegExp(r'\n+$'), '');
+}
+
+extension _ControllerFirstOrNull<T> on Iterable<T> {
+  T? get firstOrNull => isEmpty ? null : first;
+}
+
 bool _sameFileSnapshot(
   WorkspaceFileSnapshot? first,
   WorkspaceFileSnapshot? second,
@@ -1531,8 +3125,10 @@ List<String> _openFileTabPaths(Workspace workspace, String path) {
 
 bool _supportsOpenFileTabs(Workspace workspace) {
   return switch (workspace.kind) {
-    WorkspaceKind.markdownFolder || WorkspaceKind.writersideModule => true,
-    WorkspaceKind.untitledMarkdown || WorkspaceKind.singleMarkdown => false,
+    WorkspaceKind.singleMarkdown ||
+    WorkspaceKind.markdownFolder ||
+    WorkspaceKind.writersideModule => true,
+    WorkspaceKind.untitledMarkdown => false,
   };
 }
 
diff --git a/lib/src/workspace/workspace_file_monitor.dart b/lib/src/workspace/workspace_file_monitor.dart
new file mode 100644
index 00000000..17faf53d
--- /dev/null
+++ b/lib/src/workspace/workspace_file_monitor.dart
@@ -0,0 +1,164 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+
+enum WorkspaceFileEventKind { changed, deleted, moved, workspaceChanged }
+
+class WorkspaceFileMonitorEvent {
+  const WorkspaceFileMonitorEvent({
+    required this.kind,
+    required this.path,
+    this.destinationPath,
+    this.isDirectory = false,
+  });
+
+  final WorkspaceFileEventKind kind;
+  final String path;
+  final String? destinationPath;
+  final bool isDirectory;
+}
+
+class WorkspaceFileMonitor {
+  WorkspaceFileMonitor({this.debounce = const Duration(milliseconds: 180)});
+
+  final Duration debounce;
+  final _controller = StreamController<WorkspaceFileMonitorEvent>.broadcast();
+  final _subscriptions = <String, StreamSubscription<FileSystemEvent>>{};
+  Timer? _debounceTimer;
+  final _pending = <String, WorkspaceFileMonitorEvent>{};
+  Set<String> _openFilePaths = const {};
+  String? _rootPath;
+
+  Stream<WorkspaceFileMonitorEvent> get events => _controller.stream;
+
+  Future<void> start({
+    required String rootPath,
+    required Iterable<String> openFilePaths,
+  }) async {
+    await stop();
+    _rootPath = p.normalize(p.absolute(rootPath));
+    _openFilePaths = {
+      for (final path in openFilePaths) p.normalize(p.absolute(path)),
+    };
+    _syncSubscriptions();
+  }
+
+  void updateOpenFilePaths(Iterable<String> paths) {
+    _openFilePaths = {for (final path in paths) p.normalize(p.absolute(path))};
+    _syncSubscriptions();
+  }
+
+  Future<void> stop() async {
+    _debounceTimer?.cancel();
+    _debounceTimer = null;
+    _pending.clear();
+    final subscriptions = _subscriptions.values.toList(growable: false);
+    _subscriptions.clear();
+    await Future.wait([
+      for (final subscription in subscriptions) subscription.cancel(),
+    ]);
+    _rootPath = null;
+    _openFilePaths = const {};
+  }
+
+  Future<void> dispose() async {
+    await stop();
+    await _controller.close();
+  }
+
+  void _syncSubscriptions() {
+    final rootPath = _rootPath;
+    if (rootPath == null) {
+      return;
+    }
+    final desired = <String, bool>{
+      if (Directory(rootPath).existsSync()) rootPath: true,
+      for (final path in _openFilePaths)
+        if (!p.equals(p.dirname(path), rootPath) &&
+            !p.isWithin(rootPath, path) &&
+            Directory(p.dirname(path)).existsSync())
+          p.dirname(path): false,
+    };
+    for (final path in _subscriptions.keys.toList(growable: false)) {
+      if (desired.containsKey(path)) {
+        continue;
+      }
+      final subscription = _subscriptions.remove(path);
+      if (subscription != null) {
+        unawaited(subscription.cancel());
+      }
+    }
+    for (final entry in desired.entries) {
+      if (_subscriptions.containsKey(entry.key)) {
+        continue;
+      }
+      try {
+        _subscriptions[entry.key] = Directory(entry.key)
+            .watch(recursive: entry.value, events: FileSystemEvent.all)
+            .listen(
+              (event) => _receive(event, workspaceRoot: entry.value),
+              onError: (_) {},
+            );
+      } on FileSystemException {
+        // A directory can disappear between existsSync and watch(). A later
+        // open-path update or monitor restart will attempt it again.
+      }
+    }
+  }
+
+  void _receive(FileSystemEvent event, {required bool workspaceRoot}) {
+    final path = p.normalize(p.absolute(event.path));
+    if (_isBusyMarkTemporaryPath(path)) {
+      return;
+    }
+    final destination =
+        event is FileSystemMoveEvent && event.destination != null
+        ? p.normalize(p.absolute(event.destination!))
+        : null;
+    final openPath =
+        _openFilePaths.contains(path) ||
+        (destination != null && _openFilePaths.contains(destination));
+    if (!workspaceRoot && !openPath) {
+      return;
+    }
+    final kind = event is FileSystemDeleteEvent
+        ? WorkspaceFileEventKind.deleted
+        : event is FileSystemMoveEvent
+        ? WorkspaceFileEventKind.moved
+        : openPath
+        ? WorkspaceFileEventKind.changed
+        : WorkspaceFileEventKind.workspaceChanged;
+    _pending[path] = WorkspaceFileMonitorEvent(
+      kind: kind,
+      path: path,
+      destinationPath: destination,
+      isDirectory: event.isDirectory,
+    );
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(debounce, _flush);
+  }
+
+  void _flush() {
+    final events = _pending.values.toList(growable: false);
+    _pending.clear();
+    for (final event in events) {
+      if (!_controller.isClosed) {
+        _controller.add(event);
+      }
+    }
+  }
+
+  bool _isBusyMarkTemporaryPath(String path) {
+    final basename = p.basename(path);
+    return basename.contains('.busymark-save-') ||
+        path
+            .split(p.separator)
+            .any(
+              (part) =>
+                  part.startsWith('.busymark-state-') ||
+                  part.startsWith('.busymark-settings-') ||
+                  part.startsWith('.busymark-export-'),
+            );
+  }
+}
diff --git a/lib/src/workspace/workspace_file_snapshot.dart b/lib/src/workspace/workspace_file_snapshot.dart
new file mode 100644
index 00000000..a8193eee
--- /dev/null
+++ b/lib/src/workspace/workspace_file_snapshot.dart
@@ -0,0 +1,48 @@
+import 'text_format_metadata.dart';
+
+class WorkspaceFileSnapshot {
+  const WorkspaceFileSnapshot({
+    required this.modifiedAt,
+    required this.size,
+    required this.contentHash,
+  });
+
+  final DateTime modifiedAt;
+  final int size;
+  final String contentHash;
+
+  bool differsFrom(WorkspaceFileSnapshot other) {
+    if (contentHash.isNotEmpty && other.contentHash.isNotEmpty) {
+      return contentHash != other.contentHash;
+    }
+    return modifiedAt != other.modifiedAt || size != other.size;
+  }
+
+  Map<String, Object?> toJson() => {
+    'modifiedAt': modifiedAt.toIso8601String(),
+    'size': size,
+    'contentHash': contentHash,
+  };
+
+  factory WorkspaceFileSnapshot.fromJson(Map<String, Object?> json) {
+    return WorkspaceFileSnapshot(
+      modifiedAt:
+          DateTime.tryParse(json['modifiedAt']?.toString() ?? '') ??
+          DateTime.fromMillisecondsSinceEpoch(0),
+      size: (json['size'] as num?)?.toInt() ?? 0,
+      contentHash: json['contentHash']?.toString() ?? '',
+    );
+  }
+}
+
+class WorkspaceFileLoad {
+  const WorkspaceFileLoad({
+    required this.text,
+    required this.snapshot,
+    this.format = TextFormatMetadata.utf8Lf,
+  });
+
+  final String text;
+  final WorkspaceFileSnapshot snapshot;
+  final TextFormatMetadata format;
+}
diff --git a/lib/src/workspace/workspace_message.dart b/lib/src/workspace/workspace_message.dart
index 95194c7c..1f345e67 100644
--- a/lib/src/workspace/workspace_message.dart
+++ b/lib/src/workspace/workspace_message.dart
@@ -13,6 +13,8 @@ enum WorkspaceMessageCode {
   saveFailed,
   fileOperationFailed,
   validationFailed,
+  recoveryRestored,
+  recoveryDamaged,
 }
 
 class WorkspaceMessage {
@@ -45,6 +47,12 @@ String localizeWorkspaceMessage(
       l10n.workspaceErrorFileOperationFailed(error),
     WorkspaceMessageCode.validationFailed =>
       l10n.workspaceErrorValidationFailed(error),
+    WorkspaceMessageCode.recoveryRestored => l10n.workspaceRecoveryRestored(
+      (message.error as num?)?.toInt() ?? 0,
+    ),
+    WorkspaceMessageCode.recoveryDamaged => l10n.workspaceRecoveryDamaged(
+      (message.error as num?)?.toInt() ?? 0,
+    ),
   };
 }
 
diff --git a/lib/src/workspace/workspace_model.dart b/lib/src/workspace/workspace_model.dart
index f3378c88..f78ec113 100644
--- a/lib/src/workspace/workspace_model.dart
+++ b/lib/src/workspace/workspace_model.dart
@@ -3,7 +3,11 @@ import '../markdown/document_outline.dart';
 import '../markdown/markdown_model.dart';
 import '../markdown/preview_model.dart';
 import '../writerside/writerside_model.dart';
+import 'document_buffer.dart';
 import 'workspace_message.dart';
+import 'workspace_file_snapshot.dart';
+
+export 'workspace_file_snapshot.dart';
 
 const Object _copyWithUnset = _CopyWithUnset();
 
@@ -58,35 +62,6 @@ class ActiveDocumentOutline {
   }
 }
 
-class WorkspaceFileSnapshot {
-  const WorkspaceFileSnapshot({
-    required this.modifiedAt,
-    required this.size,
-    required this.contentHash,
-  });
-
-  final DateTime modifiedAt;
-  final int size;
-  final String contentHash;
-
-  bool differsFrom(WorkspaceFileSnapshot other) {
-    // A timestamp-only change cannot lose user content. Prefer the hashes when
-    // both snapshots have one so metadata touches and filesystem timestamp
-    // rounding do not produce false external-edit conflicts.
-    if (contentHash.isNotEmpty && other.contentHash.isNotEmpty) {
-      return contentHash != other.contentHash;
-    }
-    return modifiedAt != other.modifiedAt || size != other.size;
-  }
-}
-
-class WorkspaceFileLoad {
-  const WorkspaceFileLoad({required this.text, required this.snapshot});
-
-  final String text;
-  final WorkspaceFileSnapshot snapshot;
-}
-
 class DocumentFile {
   const DocumentFile({
     required this.absolutePath,
@@ -121,6 +96,7 @@ class Workspace {
     required this.openedAt,
     required this.files,
     required this.diagnostics,
+    this.runtimeDiagnostics = const [],
     this.directories = const [],
     List<String> openFilePaths = const [],
     this.activeFilePath,
@@ -143,6 +119,9 @@ class Workspace {
   final List<DocumentFile> files;
   final List<WorkspaceDirectory> directories;
   final List<Diagnostic> diagnostics;
+  final List<Diagnostic> runtimeDiagnostics;
+  List<Diagnostic> get allDiagnostics =>
+      sortDiagnostics([...diagnostics, ...runtimeDiagnostics]);
   final ParsedMarkdownDocument? markdown;
   final WritersideModule? writersideModule;
 
@@ -154,6 +133,7 @@ class Workspace {
     List<DocumentFile>? files,
     List<WorkspaceDirectory>? directories,
     List<Diagnostic>? diagnostics,
+    List<Diagnostic>? runtimeDiagnostics,
     Object? markdown = _copyWithUnset,
     Object? writersideModule = _copyWithUnset,
   }) {
@@ -186,6 +166,7 @@ class Workspace {
       files: files ?? this.files,
       directories: directories ?? this.directories,
       diagnostics: diagnostics ?? this.diagnostics,
+      runtimeDiagnostics: runtimeDiagnostics ?? this.runtimeDiagnostics,
       markdown: nextMarkdown,
       writersideModule: nextWritersideModule,
     );
@@ -215,23 +196,59 @@ List<String> _normalizedOpenFilePaths(
 class WorkspaceState {
   const WorkspaceState({
     this.workspace,
-    this.activeText = '',
+    String activeText = '',
     this.preview,
     this.liveOutline,
-    this.isDirty = false,
+    bool isDirty = false,
+    this.documentBuffers = const [],
+    this.activeBufferId,
     this.isLoading = false,
     this.message,
-  });
+  }) : _legacyActiveText = activeText,
+       _legacyIsDirty = isDirty;
 
   final Workspace? workspace;
-  final String activeText;
+  final String _legacyActiveText;
   final PreviewDocument? preview;
   final ActiveDocumentOutline? liveOutline;
-  final bool isDirty;
+  final bool _legacyIsDirty;
+  final List<DocumentBuffer> documentBuffers;
+  final String? activeBufferId;
   final bool isLoading;
   final WorkspaceMessage? message;
 
-  bool get hasUnsavedChanges => isDirty;
+  DocumentBuffer? get activeBuffer {
+    final id = activeBufferId;
+    if (id == null) {
+      return null;
+    }
+    for (final buffer in documentBuffers) {
+      if (buffer.id == id) {
+        return buffer;
+      }
+    }
+    return null;
+  }
+
+  String get activeText => activeBuffer?.text ?? _legacyActiveText;
+
+  bool get isDirty => activeBuffer?.isDirty ?? _legacyIsDirty;
+
+  bool get hasUnsavedChanges => documentBuffers.isEmpty
+      ? _legacyIsDirty
+      : documentBuffers.any((buffer) => buffer.isDirty);
+
+  List<DocumentBuffer> get dirtyBuffers =>
+      List.unmodifiable(documentBuffers.where((buffer) => buffer.isDirty));
+
+  DocumentBuffer? bufferForPath(String path) {
+    for (final buffer in documentBuffers) {
+      if (buffer.filePath == path) {
+        return buffer;
+      }
+    }
+    return null;
+  }
 
   WorkspaceState copyWith({
     Workspace? workspace,
@@ -239,6 +256,8 @@ class WorkspaceState {
     Object? preview = _copyWithUnset,
     Object? liveOutline = _copyWithUnset,
     bool? isDirty,
+    List<DocumentBuffer>? documentBuffers,
+    Object? activeBufferId = _copyWithUnset,
     bool? isLoading,
     WorkspaceMessage? message,
     bool clearMessage = false,
@@ -254,10 +273,14 @@ class WorkspaceState {
         : this.liveOutline;
     return WorkspaceState(
       workspace: workspace ?? this.workspace,
-      activeText: activeText ?? this.activeText,
+      activeText: activeText ?? _legacyActiveText,
       preview: nextPreview,
       liveOutline: nextLiveOutline,
-      isDirty: isDirty ?? this.isDirty,
+      isDirty: isDirty ?? _legacyIsDirty,
+      documentBuffers: documentBuffers ?? this.documentBuffers,
+      activeBufferId: identical(activeBufferId, _copyWithUnset)
+          ? this.activeBufferId
+          : activeBufferId as String?,
       isLoading: isLoading ?? this.isLoading,
       message: clearMessage ? null : message ?? this.message,
     );
diff --git a/lib/src/workspace/workspace_safety.dart b/lib/src/workspace/workspace_safety.dart
index d9b8b7b7..7c0a3690 100644
--- a/lib/src/workspace/workspace_safety.dart
+++ b/lib/src/workspace/workspace_safety.dart
@@ -11,6 +11,7 @@ import '../app/localization.dart';
 import '../platform/linux_header_bar_service.dart';
 import 'workspace_controller.dart';
 import 'workspace_message.dart';
+import 'text_format_metadata.dart';
 
 enum _UnsavedChangesAction { cancel, discard, save }
 
@@ -27,12 +28,46 @@ Future<bool> confirmSafeToContinue(BuildContext context, WidgetRef ref) async {
   if (!state.hasUnsavedChanges) {
     return true;
   }
-  final controller = ref.read(workspaceControllerProvider.notifier);
-  final target = controller.captureActiveDocumentSaveTarget();
-  if (target == null) {
-    return false;
+  return _confirmUnsavedChanges(
+    context,
+    ref,
+    dirtyBufferIds: state.dirtyBuffers.map((buffer) => buffer.id).toList(),
+  );
+}
+
+Future<bool> confirmSafeToCloseActiveDocument(
+  BuildContext context,
+  WidgetRef ref,
+) async {
+  final active = ref.read(workspaceControllerProvider).activeBuffer;
+  if (active == null || !active.isDirty) {
+    return true;
   }
-  final fileName = target.path?.split('/').last ?? context.l10n.currentFile;
+  return _confirmUnsavedChanges(context, ref, dirtyBufferIds: [active.id]);
+}
+
+Future<bool> _confirmUnsavedChanges(
+  BuildContext context,
+  WidgetRef ref, {
+  required List<String> dirtyBufferIds,
+}) async {
+  final initialState = ref.read(workspaceControllerProvider);
+  final dirtyBuffers = [
+    for (final id in dirtyBufferIds)
+      if (initialState.documentBuffers
+              .where((buffer) => buffer.id == id && buffer.isDirty)
+              .firstOrNull
+          case final buffer?)
+        buffer,
+  ];
+  if (dirtyBuffers.isEmpty) {
+    return true;
+  }
+  final initialWorkspaceId = initialState.workspace?.id;
+  final initialActiveBufferId = initialState.activeBufferId;
+  final initialRevisions = {
+    for (final buffer in dirtyBuffers) buffer.id: buffer.revision,
+  };
   final headerBar = ref.read(linuxHeaderBarServiceProvider);
   final action = await showBusyMarkModalDialog<_UnsavedChangesAction>(
     context,
@@ -60,32 +95,152 @@ Future<bool> confirmSafeToContinue(BuildContext context, WidgetRef ref) async {
           onPressed: () => Navigator.pop(context, _UnsavedChangesAction.save),
         ),
       ],
-      children: [Text(context.l10n.unsavedChangesMessage(fileName))],
+      children: [
+        Text(
+          dirtyBuffers.length == 1
+              ? context.l10n.unsavedChangesMessage(
+                  dirtyBuffers.single.displayName,
+                )
+              : context.l10n.unsavedChangesMultipleMessage(dirtyBuffers.length),
+        ),
+        if (dirtyBuffers.length > 1) ...[
+          const SizedBox(height: BusyMarkSpacing.md),
+          BusyMarkGroupedList(
+            filled: true,
+            children: [
+              for (final buffer in dirtyBuffers)
+                BusyMarkActionRow(
+                  title: buffer.displayName,
+                  subtitle: buffer.filePath,
+                  leading: const Icon(BusyMarkGlyphs.document),
+                ),
+            ],
+          ),
+        ],
+      ],
     ),
   );
 
+  final currentState = ref.read(workspaceControllerProvider);
+  final currentDirtyIds = currentState.dirtyBuffers
+      .map((buffer) => buffer.id)
+      .toSet();
+  if (action != null &&
+      action != _UnsavedChangesAction.cancel &&
+      (currentState.workspace?.id != initialWorkspaceId ||
+          currentState.activeBufferId != initialActiveBufferId ||
+          !currentDirtyIds.containsAll(initialRevisions.keys) ||
+          initialRevisions.entries.any((entry) {
+            final current = currentState.documentBuffers
+                .where((buffer) => buffer.id == entry.key)
+                .firstOrNull;
+            return current == null || current.revision != entry.value;
+          }))) {
+    return false;
+  }
+
   if (action == _UnsavedChangesAction.discard) {
-    return controller.discardActiveChanges(target: target);
+    return _discardDirtyDocuments(ref, dirtyBufferIds);
   }
   if (action == _UnsavedChangesAction.save) {
     if (!context.mounted) {
       return false;
     }
-    return saveActiveWithOverwriteConfirmation(context, ref, target: target);
+    return _saveDirtyDocuments(context, ref, dirtyBufferIds);
   }
   return false;
 }
 
+Future<bool> _saveDirtyDocuments(
+  BuildContext context,
+  WidgetRef ref,
+  List<String> bufferIds,
+) async {
+  final controller = ref.read(workspaceControllerProvider.notifier);
+  final originalActiveId = ref.read(workspaceControllerProvider).activeBufferId;
+  for (final bufferId in bufferIds) {
+    final current = ref
+        .read(workspaceControllerProvider)
+        .documentBuffers
+        .where((buffer) => buffer.id == bufferId)
+        .firstOrNull;
+    if (current == null || !current.isDirty) {
+      continue;
+    }
+    if (!await controller.activateDocumentBuffer(bufferId) ||
+        !context.mounted ||
+        !await saveActiveWithOverwriteConfirmation(context, ref)) {
+      await _restoreActiveBuffer(ref, controller, originalActiveId);
+      return false;
+    }
+  }
+  await _restoreActiveBuffer(ref, controller, originalActiveId);
+  return bufferIds.every((id) {
+    final buffer = ref
+        .read(workspaceControllerProvider)
+        .documentBuffers
+        .where((candidate) => candidate.id == id)
+        .firstOrNull;
+    return buffer == null || !buffer.isDirty;
+  });
+}
+
+Future<bool> _discardDirtyDocuments(
+  WidgetRef ref,
+  List<String> bufferIds,
+) async {
+  final controller = ref.read(workspaceControllerProvider.notifier);
+  final originalActiveId = ref.read(workspaceControllerProvider).activeBufferId;
+  for (final bufferId in bufferIds) {
+    final current = ref
+        .read(workspaceControllerProvider)
+        .documentBuffers
+        .where((buffer) => buffer.id == bufferId)
+        .firstOrNull;
+    if (current == null || !current.isDirty) {
+      continue;
+    }
+    if (!await controller.activateDocumentBuffer(bufferId)) {
+      await _restoreActiveBuffer(ref, controller, originalActiveId);
+      return false;
+    }
+    final target = controller.captureActiveDocumentSaveTarget();
+    final discarded = current.deletedOnDisk
+        ? await controller.closeDocumentBuffer(bufferId, discard: true)
+        : await controller.discardActiveChanges(target: target);
+    if (!discarded) {
+      await _restoreActiveBuffer(ref, controller, originalActiveId);
+      return false;
+    }
+  }
+  await _restoreActiveBuffer(ref, controller, originalActiveId);
+  return true;
+}
+
+Future<void> _restoreActiveBuffer(
+  WidgetRef ref,
+  WorkspaceController controller,
+  String? bufferId,
+) async {
+  if (bufferId != null &&
+      ref
+          .read(workspaceControllerProvider)
+          .documentBuffers
+          .any((buffer) => buffer.id == bufferId)) {
+    await controller.activateDocumentBuffer(bufferId);
+  }
+}
+
 Future<bool> saveOrConfirmSafeToChangeActiveFile(
   BuildContext context,
   WidgetRef ref,
 ) async {
   final state = ref.read(workspaceControllerProvider);
-  if (!state.hasUnsavedChanges) {
+  if (!state.isDirty) {
     return true;
   }
   if (!ref.read(appSettingsControllerProvider).autoSave) {
-    return confirmSafeToContinue(context, ref);
+    return confirmSafeToCloseActiveDocument(context, ref);
   }
   return ref
       .read(workspaceControllerProvider.notifier)
@@ -107,9 +262,20 @@ Future<bool> saveActiveWithOverwriteConfirmation(
   if (operationTarget.needsSaveLocation) {
     return _saveActiveAs(context, ref, operationTarget);
   }
+  final normalization = await _chooseMixedLineEndingNormalization(
+    context,
+    ref,
+    operationTarget,
+  );
+  if (operationTarget.format.hasMixedLineEndings && normalization == null) {
+    return false;
+  }
   // The controller owns both the disk check and save serialization so a
   // separate preflight cannot race an already-running write.
-  final saved = await controller.saveActive(target: operationTarget);
+  final saved = await controller.saveActive(
+    target: operationTarget,
+    mixedLineEndingNormalization: normalization,
+  );
   if (saved) {
     return true;
   }
@@ -149,9 +315,22 @@ Future<bool> saveActiveWithOverwriteConfirmation(
   return controller.saveActive(
     overwriteExternalChanges: true,
     target: operationTarget,
+    mixedLineEndingNormalization: normalization,
   );
 }
 
+Future<bool> saveActiveToNewLocation(
+  BuildContext context,
+  WidgetRef ref,
+) async {
+  final controller = ref.read(workspaceControllerProvider.notifier);
+  final target = controller.captureActiveDocumentSaveTarget();
+  if (target == null) {
+    return false;
+  }
+  return _saveActiveAs(context, ref, target);
+}
+
 Future<bool> _saveActiveAs(
   BuildContext context,
   WidgetRef ref,
@@ -161,6 +340,17 @@ Future<bool> _saveActiveAs(
   if (!controller.isActiveDocumentSaveTargetCurrent(target)) {
     return false;
   }
+  final normalization = await _chooseMixedLineEndingNormalization(
+    context,
+    ref,
+    target,
+  );
+  if (target.format.hasMixedLineEndings && normalization == null) {
+    return false;
+  }
+  if (!context.mounted) {
+    return false;
+  }
   final activePath = target.path;
   final location = await getSaveLocation(
     acceptedTypeGroups: [_markdownSaveType(context)],
@@ -196,6 +386,42 @@ Future<bool> _saveActiveAs(
     savePath,
     target: target,
     overwriteExisting: overwriteExisting,
+    mixedLineEndingNormalization: normalization,
+  );
+}
+
+Future<LineEndingNormalization?> _chooseMixedLineEndingNormalization(
+  BuildContext context,
+  WidgetRef ref,
+  ActiveDocumentSaveTarget target,
+) async {
+  if (!target.format.hasMixedLineEndings) {
+    return null;
+  }
+  final headerBar = ref.read(linuxHeaderBarServiceProvider);
+  return showBusyMarkModalDialog<LineEndingNormalization>(
+    context,
+    headerBarService: headerBar.isAvailable ? headerBar : null,
+    builder: (context) => BusyMarkDialogShell(
+      title: context.l10n.normalizeLineEndings,
+      maxWidth: BusyMarkSizes.dialog,
+      actions: [
+        BusyMarkDialogButton(
+          label: context.l10n.cancel,
+          onPressed: () => Navigator.pop(context),
+        ),
+        BusyMarkDialogButton(
+          label: LineEndingNormalization.lf.name.toUpperCase(),
+          onPressed: () => Navigator.pop(context, LineEndingNormalization.lf),
+        ),
+        BusyMarkDialogButton(
+          label: LineEndingNormalization.crlf.name.toUpperCase(),
+          suggested: true,
+          onPressed: () => Navigator.pop(context, LineEndingNormalization.crlf),
+        ),
+      ],
+      children: [Text(context.l10n.mixedLineEndingsSavePrompt)],
+    ),
   );
 }
 
diff --git a/lib/src/workspace/workspace_service.dart b/lib/src/workspace/workspace_service.dart
index 1251f597..b0d8a06f 100644
--- a/lib/src/workspace/workspace_service.dart
+++ b/lib/src/workspace/workspace_service.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:crypto/crypto.dart' as crypto;
 import 'package:path/path.dart' as p;
+import 'package:xml/xml.dart';
 
 import '../core/anchored_path_guard.dart';
 import '../core/busymark_exception.dart';
@@ -10,9 +11,12 @@ import '../core/debug_log.dart';
 import '../core/diagnostic.dart';
 import '../core/linux_atomic_file_api.dart';
 import '../core/path_utils.dart';
+import '../markdown/busymark_document.dart';
 import '../markdown/markdown_model.dart';
 import '../markdown/markdown_parser.dart';
+import '../markdown/math_syntax.dart';
 import '../markdown/preview_model.dart';
+import '../visualization/visualization_models.dart';
 import '../writerside/writerside_module_service.dart';
 import '../writerside/writerside_instance_service.dart';
 import '../writerside/writerside_model.dart';
@@ -22,6 +26,49 @@ import '../writerside/writerside_topic_creator.dart';
 import '../writerside/writerside_topic_file_editor.dart';
 import '../writerside/writerside_topic_removal_service.dart';
 import 'workspace_model.dart';
+import 'text_format_metadata.dart';
+
+class WorkspaceBatchTextWrite {
+  const WorkspaceBatchTextWrite({
+    required this.path,
+    required this.text,
+    required this.expectedSnapshot,
+    required this.format,
+    this.mixedNormalization,
+  });
+
+  final String path;
+  final String text;
+  final WorkspaceFileSnapshot expectedSnapshot;
+  final TextFormatMetadata format;
+  final LineEndingNormalization? mixedNormalization;
+}
+
+class WorkspaceBatchWriteConflict implements Exception {
+  const WorkspaceBatchWriteConflict(this.path);
+
+  final String path;
+}
+
+class WorkspaceBatchPartialApplicationFile {
+  const WorkspaceBatchPartialApplicationFile({
+    required this.targetPath,
+    required this.preservedPath,
+  });
+
+  final String targetPath;
+  final String preservedPath;
+}
+
+class WorkspaceBatchPartialApplicationConflict implements Exception {
+  const WorkspaceBatchPartialApplicationConflict({
+    required this.files,
+    required this.cause,
+  });
+
+  final List<WorkspaceBatchPartialApplicationFile> files;
+  final Object cause;
+}
 
 class WorkspaceService {
   const WorkspaceService({
@@ -36,9 +83,12 @@ class WorkspaceService {
     this.writersideTopicRemovalService = const WritersideTopicRemovalService(),
     this.scanOptions = const WorkspaceScanOptions(),
     Future<void> Function(String targetPath)? beforeNewFilePublish,
+    Future<void> Function(String targetPath, int committedCount)?
+    afterBatchFileCommit,
   }) : writersideService = writersideService ?? const WritersideModuleService(),
        _useWorkspaceScanOptionsForWriterside = writersideService == null,
-       _beforeNewFilePublish = beforeNewFilePublish;
+       _beforeNewFilePublish = beforeNewFilePublish,
+       _afterBatchFileCommit = afterBatchFileCommit;
 
   final MarkdownParser markdownParser;
   final MarkdownPreviewBuilder previewBuilder;
@@ -52,6 +102,8 @@ class WorkspaceService {
   final WorkspaceScanOptions scanOptions;
   final bool _useWorkspaceScanOptionsForWriterside;
   final Future<void> Function(String targetPath)? _beforeNewFilePublish;
+  final Future<void> Function(String targetPath, int committedCount)?
+  _afterBatchFileCommit;
 
   Workspace createUntitledMarkdown({String source = ''}) {
     const fileName = '';
@@ -190,6 +242,30 @@ class WorkspaceService {
     );
   }
 
+  Future<void> moveWritersideTocEntries(
+    Workspace workspace, {
+    required String treePath,
+    required List<WritersideTocMoveEntry> sources,
+    required WritersideTopicCreatePlacement placement,
+    required List<int>? referencePath,
+    WritersideTocNodeIdentity? referenceIdentity,
+  }) async {
+    final module = await _currentWritersideModule(workspace);
+    final instance = _writersideInstanceForTree(module, treePath);
+    await writersideTocEditor.moveSubtrees(
+      WritersideTocEditTarget(
+        rootPath: module.rootPath,
+        treePath: instance.sourceTreePath,
+      ),
+      WritersideTocBatchMoveRequest(
+        sources: sources,
+        placement: placement,
+        referencePath: referencePath,
+        referenceIdentity: referenceIdentity,
+      ),
+    );
+  }
+
   Future<void> removeWritersideTocEntry(
     Workspace workspace, {
     required String treePath,
@@ -208,6 +284,22 @@ class WorkspaceService {
     );
   }
 
+  Future<void> removeWritersideTocEntries(
+    Workspace workspace, {
+    required String treePath,
+    required List<WritersideTocRemovalRequest> requests,
+  }) async {
+    final module = await _currentWritersideModule(workspace);
+    final instance = _writersideInstanceForTree(module, treePath);
+    await writersideTocEditor.removeEntries(
+      WritersideTocEditTarget(
+        rootPath: module.rootPath,
+        treePath: instance.sourceTreePath,
+      ),
+      requests,
+    );
+  }
+
   Future<String> renameWritersideTopicFile(
     Workspace workspace,
     String topicPath,
@@ -367,9 +459,11 @@ class WorkspaceService {
     final file = File(path);
     final bytes = await file.readAsBytes();
     final stat = await file.stat();
+    final decoded = decodeUtf8Document(bytes);
     return WorkspaceFileLoad(
-      text: utf8.decode(bytes),
+      text: decoded.text,
       snapshot: _snapshotFromBytes(stat, bytes),
+      format: decoded.format,
     );
   }
 
@@ -411,8 +505,21 @@ class WorkspaceService {
   /// published with Linux's atomic no-replace rename operation (or an atomic
   /// hard-link fallback). It fails if any filesystem entity already has the
   /// final name.
-  Future<WorkspaceFileSnapshot> saveNewText(String path, String text) async {
-    final bytes = utf8.encode(text);
+  Future<WorkspaceFileSnapshot> saveNewText(String path, String text) {
+    return saveNewFormattedText(path, text);
+  }
+
+  Future<WorkspaceFileSnapshot> saveNewFormattedText(
+    String path,
+    String text, {
+    TextFormatMetadata? format,
+    LineEndingNormalization? mixedNormalization,
+  }) async {
+    final bytes = _encodeDocumentText(
+      text,
+      format: format,
+      mixedNormalization: mixedNormalization,
+    );
     final staged = await _stageNewSave(path, bytes);
     try {
       final stat = await staged.file.stat();
@@ -430,8 +537,21 @@ class WorkspaceService {
   Future<WorkspaceFileSnapshot> saveTextReplacingPath(
     String path,
     String text,
-  ) async {
-    final bytes = utf8.encode(text);
+  ) {
+    return saveFormattedTextReplacingPath(path, text);
+  }
+
+  Future<WorkspaceFileSnapshot> saveFormattedTextReplacingPath(
+    String path,
+    String text, {
+    TextFormatMetadata? format,
+    LineEndingNormalization? mixedNormalization,
+  }) async {
+    final bytes = _encodeDocumentText(
+      text,
+      format: format,
+      mixedNormalization: mixedNormalization,
+    );
     final staged = await _stageNewSave(path, bytes);
     try {
       final targetType = await FileSystemEntity.type(path, followLinks: false);
@@ -446,11 +566,24 @@ class WorkspaceService {
     }
   }
 
-  Future<WorkspaceFileSnapshot> saveText(String path, String text) async {
+  Future<WorkspaceFileSnapshot> saveText(String path, String text) {
+    return saveFormattedText(path, text);
+  }
+
+  Future<WorkspaceFileSnapshot> saveFormattedText(
+    String path,
+    String text, {
+    TextFormatMetadata? format,
+    LineEndingNormalization? mixedNormalization,
+  }) async {
     final savePath = await _saveTargetPath(path);
     final target = File(savePath);
     final existingStat = await target.stat();
-    final bytes = utf8.encode(text);
+    final bytes = _encodeDocumentText(
+      text,
+      format: format,
+      mixedNormalization: mixedNormalization,
+    );
     final temp = _temporarySaveFile(savePath);
     var renamed = false;
     try {
@@ -470,6 +603,194 @@ class WorkspaceService {
     }
   }
 
+  /// Replaces a group of existing files as one recoverable transaction.
+  ///
+  /// Every source snapshot is checked before any target is changed. Staged
+  /// files are atomically exchanged with their targets; if a later exchange
+  /// fails, already-exchanged files are rolled back.
+  Future<Map<String, WorkspaceFileSnapshot>> saveFormattedTextBatch(
+    List<WorkspaceBatchTextWrite> writes,
+  ) async {
+    if (writes.isEmpty) {
+      return const {};
+    }
+    if (!Platform.isLinux || !LinuxAtomicFileApi.instance.isAvailable) {
+      throw UnsupportedError(
+        'Transactional workspace replacement requires Linux renameat2.',
+      );
+    }
+    final paths = <String>{};
+    final staged = <_StagedBatchTextWrite>[];
+    final committed = <_StagedBatchTextWrite>[];
+    final preservedArtifacts = <String>{};
+    try {
+      for (final write in writes) {
+        final savePath = await _saveTargetPath(write.path);
+        if (!paths.add(p.normalize(p.absolute(savePath)))) {
+          throw ArgumentError('Duplicate batch write path: ${write.path}');
+        }
+        final target = File(savePath);
+        final originalBytes = await target.readAsBytes();
+        final originalStat = await target.stat();
+        final originalSnapshot = _snapshotFromBytes(
+          originalStat,
+          originalBytes,
+        );
+        if (originalSnapshot.differsFrom(write.expectedSnapshot)) {
+          throw WorkspaceBatchWriteConflict(write.path);
+        }
+        final bytes = _encodeDocumentText(
+          write.text,
+          format: write.format,
+          mixedNormalization: write.mixedNormalization,
+        );
+        final directory = await target.parent.createTemp(
+          '.busymark-save-batch-',
+        );
+        final stagedFile = File(p.join(directory.path, 'contents'));
+        await stagedFile.writeAsBytes(bytes, flush: true);
+        await _copyFileMode(originalStat, stagedFile);
+        staged.add(
+          _StagedBatchTextWrite(
+            requestPath: write.path,
+            target: target,
+            directory: directory,
+            stagedFile: stagedFile,
+            expectedSnapshot: write.expectedSnapshot,
+            bytes: bytes,
+          ),
+        );
+      }
+      // Close the validation/staging race before the first exchange.
+      for (final write in staged) {
+        final current = await fileSnapshot(write.target.path);
+        if (current.differsFrom(write.expectedSnapshot)) {
+          throw WorkspaceBatchWriteConflict(write.requestPath);
+        }
+      }
+      for (final write in staged) {
+        final error = LinuxAtomicFileApi.instance.exchange(
+          write.stagedFile.absolute.path,
+          write.target.absolute.path,
+        );
+        if (error != null) {
+          throw FileSystemException(
+            'Could not commit workspace replacement batch',
+            write.requestPath,
+            OSError('atomic exchange failed', error),
+          );
+        }
+        final displacedBytes = await write.stagedFile.readAsBytes();
+        final displacedSnapshot = _snapshotFromBytes(
+          await write.stagedFile.stat(),
+          displacedBytes,
+        );
+        if (displacedSnapshot.differsFrom(write.expectedSnapshot)) {
+          final conflict = await _rollbackBatchWrite(write);
+          if (conflict != null) {
+            preservedArtifacts.add(conflict.preservedPath);
+            throw WorkspaceBatchPartialApplicationConflict(
+              files: [conflict],
+              cause: WorkspaceBatchWriteConflict(write.requestPath),
+            );
+          }
+          throw WorkspaceBatchWriteConflict(write.requestPath);
+        }
+        committed.add(write);
+        await _afterBatchFileCommit?.call(write.target.path, committed.length);
+      }
+      return {
+        for (final write in staged)
+          write.requestPath: _snapshotFromBytes(
+            await write.target.stat(),
+            write.bytes,
+          ),
+      };
+    } on Object catch (error, stackTrace) {
+      final conflicts = <WorkspaceBatchPartialApplicationFile>[
+        if (error case WorkspaceBatchPartialApplicationConflict partial)
+          ...partial.files,
+      ];
+      preservedArtifacts.addAll(
+        conflicts.map((conflict) => conflict.preservedPath),
+      );
+      for (final write in committed.reversed) {
+        final conflict = await _rollbackBatchWrite(write);
+        if (conflict != null) {
+          conflicts.add(conflict);
+          preservedArtifacts.add(conflict.preservedPath);
+        }
+      }
+      if (conflicts.isNotEmpty) {
+        throw WorkspaceBatchPartialApplicationConflict(
+          files: List.unmodifiable(conflicts),
+          cause: error is WorkspaceBatchPartialApplicationConflict
+              ? error.cause
+              : error,
+        );
+      }
+      Error.throwWithStackTrace(error, stackTrace);
+    } finally {
+      for (final write in staged) {
+        if (preservedArtifacts.contains(write.stagedFile.path)) {
+          continue;
+        }
+        await _deleteSaveArtifactBestEffort(write.stagedFile);
+        try {
+          if (await write.directory.exists()) {
+            await write.directory.delete();
+          }
+        } on Object {
+          // Cleanup must not hide a commit or rollback result.
+        }
+      }
+    }
+  }
+
+  Future<WorkspaceBatchPartialApplicationFile?> _rollbackBatchWrite(
+    _StagedBatchTextWrite write,
+  ) async {
+    final conflict = WorkspaceBatchPartialApplicationFile(
+      targetPath: write.requestPath,
+      preservedPath: write.stagedFile.path,
+    );
+    if (!await _fileMatchesBytes(write.target, write.bytes)) {
+      return conflict;
+    }
+    final rollbackError = LinuxAtomicFileApi.instance.exchange(
+      write.stagedFile.absolute.path,
+      write.target.absolute.path,
+    );
+    if (rollbackError != null) {
+      return conflict;
+    }
+    if (await _fileMatchesBytes(write.stagedFile, write.bytes)) {
+      return null;
+    }
+
+    // The target changed after validation but before the exchange. Put that
+    // concurrent version back when possible, and preserve the displaced data.
+    LinuxAtomicFileApi.instance.exchange(
+      write.stagedFile.absolute.path,
+      write.target.absolute.path,
+    );
+    return conflict;
+  }
+
+  Future<bool> _fileMatchesBytes(File file, List<int> expected) async {
+    try {
+      final type = await FileSystemEntity.type(file.path, followLinks: false);
+      if (type != FileSystemEntityType.file) {
+        return false;
+      }
+      final actual = await file.readAsBytes();
+      return actual.length == expected.length &&
+          crypto.sha256.convert(actual) == crypto.sha256.convert(expected);
+    } on Object {
+      return false;
+    }
+  }
+
   Future<String> createFile(
     Workspace workspace,
     String directoryPath,
@@ -1342,11 +1663,16 @@ class WorkspaceService {
       'note',
       'tip',
       'warning',
+      'quote',
       'tabs',
       'tab',
       'code-block',
+      'deflist',
+      'def',
       'img',
+      'video',
       'a',
+      'math',
     }.contains(name);
   }
 
@@ -1355,9 +1681,13 @@ class WorkspaceService {
       'chapter' => PreviewBlockKind.heading,
       'procedure' => PreviewBlockKind.procedure,
       'note' || 'tip' || 'warning' => PreviewBlockKind.admonition,
+      'quote' => PreviewBlockKind.quote,
       'tabs' || 'tab' => PreviewBlockKind.tabs,
       'code-block' => PreviewBlockKind.code,
+      'deflist' => PreviewBlockKind.definitionList,
+      'def' => PreviewBlockKind.definition,
       'img' => PreviewBlockKind.image,
+      'video' => PreviewBlockKind.video,
       _ => PreviewBlockKind.paragraph,
     };
   }
@@ -1371,16 +1701,131 @@ class WorkspaceService {
       'note' ||
       'tip' ||
       'warning' ||
+      'quote' ||
       'tabs' ||
       'tab' ||
       'code-block' ||
+      'deflist' ||
+      'def' ||
       'img' ||
+      'video' ||
       'a' => '',
       _ => name,
     };
   }
 
   List<PreviewBlock> _xmlPreviewBlocks(String source, String? title) {
+    try {
+      final document = XmlDocument.parse(source);
+      final blocks = <PreviewBlock>[];
+      var mathIndex = 0;
+      for (final element in document.descendants.whereType<XmlElement>()) {
+        final name = element.name.local;
+        if (!_visibleSemanticElement(name)) {
+          continue;
+        }
+        if (_insideXmlAdmonition(element)) {
+          continue;
+        }
+        if (_insideOwnedXmlCollapsible(element)) {
+          continue;
+        }
+        final attributes = {
+          'element': name,
+          for (final attribute in element.attributes)
+            attribute.name.local: attribute.value,
+        };
+        if (name == 'math') {
+          final expression = element.innerText;
+          blocks.add(
+            PreviewBlock(
+              kind: PreviewBlockKind.paragraph,
+              text: expression,
+              inlines: [
+                PreviewInline(
+                  kind: PreviewInlineKind.math,
+                  text: expression,
+                  attributes: {
+                    busyMarkMathSourceFormAttribute:
+                        BusyMathSourceForm.writersideElement.name,
+                    'expressionId': 'topic-math-${mathIndex++}',
+                  },
+                ),
+              ],
+              attributes: attributes,
+            ),
+          );
+          continue;
+        }
+        if (name == 'code-block') {
+          blocks.add(
+            _xmlCodeBlockPreview(
+              element,
+              attributes,
+              nextMathId: () => 'topic-math-${mathIndex++}',
+            ),
+          );
+          continue;
+        }
+        if ((name == 'chapter' || name == 'procedure' || name == 'deflist') &&
+            busyMarkWritersideIsCollapsible(attributes)) {
+          blocks.add(
+            _xmlSemanticPreviewBlock(
+              element,
+              nextMathId: () => 'topic-math-${mathIndex++}',
+            ),
+          );
+          continue;
+        }
+        final admonitionStyle = busyAdmonitionStyleFromName(name);
+        if (admonitionStyle != null) {
+          final text = element.innerText.trim();
+          final inlines = _xmlPreviewInlines(
+            element.children,
+            nextMathId: () => 'topic-math-${mathIndex++}',
+          );
+          blocks.add(
+            PreviewBlock(
+              kind: admonitionStyle == BusyAdmonitionStyle.quote
+                  ? PreviewBlockKind.quote
+                  : PreviewBlockKind.admonition,
+              text: text,
+              inlines: inlines.isEmpty && text.isNotEmpty
+                  ? [PreviewInline(kind: PreviewInlineKind.text, text: text)]
+                  : inlines,
+              attributes: {...attributes, 'style': admonitionStyle.name},
+            ),
+          );
+          continue;
+        }
+        blocks.add(
+          PreviewBlock(
+            kind: _semanticKind(name),
+            text: switch (name) {
+              'video' => element.getAttribute('src') ?? '',
+              'chapter' ||
+              'procedure' ||
+              'def' => element.getAttribute('title') ?? '',
+              'code-block' =>
+                element.innerText
+                    .replaceFirst(RegExp(r'^\n'), '')
+                    .replaceFirst(RegExp(r'\n\s*$'), ''),
+              _ => _semanticText(name, title),
+            },
+            language: name == 'code-block'
+                ? element.getAttribute('lang')
+                : null,
+            attributes: attributes,
+          ),
+        );
+      }
+      if (blocks.isNotEmpty) {
+        return blocks;
+      }
+    } on Object {
+      // The ordinary semantic-element fallback below still provides a useful
+      // preview while the user repairs malformed topic XML.
+    }
     final names = RegExp(
       r'<\s*([A-Za-z][A-Za-z0-9_-]*)\b',
     ).allMatches(source).map((match) => match.group(1)!).toList();
@@ -1397,6 +1842,276 @@ class WorkspaceService {
           ),
     ];
   }
+
+  bool _insideXmlAdmonition(XmlElement element) {
+    XmlNode? parent = element.parent;
+    while (parent != null) {
+      if (parent is XmlElement &&
+          busyAdmonitionStyleFromName(parent.name.local) != null) {
+        return true;
+      }
+      parent = parent.parent;
+    }
+    return false;
+  }
+
+  bool _insideOwnedXmlCollapsible(XmlElement element) {
+    XmlNode? parent = element.parent;
+    while (parent != null) {
+      if (parent is XmlElement) {
+        final name = parent.name.local.toLowerCase();
+        if ({'chapter', 'procedure', 'deflist'}.contains(name) &&
+            busyMarkWritersideIsCollapsible({
+              for (final attribute in parent.attributes)
+                attribute.name.local: attribute.value,
+            })) {
+          return true;
+        }
+      }
+      parent = parent.parent;
+    }
+    return false;
+  }
+
+  PreviewBlock _xmlSemanticPreviewBlock(
+    XmlElement element, {
+    required String Function() nextMathId,
+    Map<String, String> inheritedAttributes = const {},
+  }) {
+    final name = element.name.local.toLowerCase();
+    final attributes = <String, String>{
+      ...inheritedAttributes,
+      'element': name,
+      for (final attribute in element.attributes)
+        attribute.name.local: attribute.value,
+    };
+    final title = element.getAttribute('title')?.trim() ?? '';
+    final children = <PreviewBlock>[];
+    for (final child in element.children.whereType<XmlElement>()) {
+      final childName = child.name.local.toLowerCase();
+      if (!_visibleSemanticElement(childName) || childName == 'math') {
+        continue;
+      }
+      if (name == 'step' && childName == 'p') {
+        continue;
+      }
+      children.add(
+        _xmlSemanticPreviewBlock(
+          child,
+          nextMathId: nextMathId,
+          inheritedAttributes: name == 'deflist' && childName == 'def'
+              ? {
+                  if (busyMarkWritersideIsCollapsible(attributes))
+                    busyMarkWritersideCollapsibleAttribute: 'true',
+                }
+              : const {},
+        ),
+      );
+    }
+    final inlines = _xmlPreviewInlines(
+      element.children,
+      nextMathId: nextMathId,
+    );
+    final text = inlines.map((inline) => inline.text).join().trim();
+    return switch (name) {
+      'chapter' => PreviewBlock(
+        kind: PreviewBlockKind.heading,
+        text: title,
+        level: 2,
+        inlines: title.isEmpty ? const [] : parseInlineMarkdown(title),
+        children: children,
+        attributes: attributes,
+      ),
+      'procedure' => PreviewBlock(
+        kind: PreviewBlockKind.procedure,
+        text: title,
+        inlines: title.isEmpty ? const [] : parseInlineMarkdown(title),
+        children: children,
+        attributes: attributes,
+      ),
+      'step' => PreviewBlock(
+        kind: PreviewBlockKind.list,
+        text: text,
+        inlines: inlines,
+        children: children,
+        attributes: {...attributes, 'ordered': 'true'},
+      ),
+      'code-block' => _xmlCodeBlockPreview(
+        element,
+        attributes,
+        nextMathId: nextMathId,
+      ),
+      'deflist' => PreviewBlock(
+        kind: PreviewBlockKind.definitionList,
+        text: '',
+        children: children,
+        attributes: attributes,
+      ),
+      'def' => PreviewBlock(
+        kind: PreviewBlockKind.definition,
+        text: title,
+        inlines: title.isEmpty ? const [] : parseInlineMarkdown(title),
+        children: children,
+        attributes: attributes,
+      ),
+      'note' || 'tip' || 'warning' || 'quote' => PreviewBlock(
+        kind: name == 'quote'
+            ? PreviewBlockKind.quote
+            : PreviewBlockKind.admonition,
+        text: text,
+        inlines: inlines,
+        children: children,
+        attributes: {...attributes, 'style': name},
+      ),
+      _ => PreviewBlock(
+        kind: _semanticKind(name),
+        text: text,
+        inlines: inlines,
+        children: children,
+        attributes: attributes,
+      ),
+    };
+  }
+
+  PreviewBlock _xmlCodeBlockPreview(
+    XmlElement element,
+    Map<String, String> attributes, {
+    required String Function() nextMathId,
+  }) {
+    final language = element.getAttribute('lang');
+    final text = element.innerText
+        .replaceFirst(RegExp(r'^\n'), '')
+        .replaceFirst(RegExp(r'\n\s*$'), '');
+    if (language?.trim().toLowerCase() == 'tex') {
+      return PreviewBlock(
+        kind: PreviewBlockKind.math,
+        text: text,
+        attributes: {
+          ...attributes,
+          if (language != null) 'language': language,
+          busyMarkMathExpressionAttribute: text,
+          busyMarkMathDisplayAttribute: 'true',
+          busyMarkMathSourceFormAttribute:
+              BusyMathSourceForm.writersideTexElement.name,
+          'expressionId': nextMathId(),
+        },
+      );
+    }
+    return PreviewBlock(
+      kind: PreviewBlockKind.code,
+      text: text,
+      language: language,
+      visualization: VisualizationDescriptor.maybeForFenceLanguage(language),
+      attributes: attributes,
+    );
+  }
+
+  List<PreviewInline> _xmlPreviewInlines(
+    Iterable<XmlNode> nodes, {
+    required String Function() nextMathId,
+  }) {
+    final result = <PreviewInline>[];
+    for (final node in nodes) {
+      if (node is XmlText) {
+        final text = node.value.replaceAll(RegExp(r'\s+'), ' ');
+        if (text.trim().isNotEmpty) {
+          result.add(PreviewInline(kind: PreviewInlineKind.text, text: text));
+        }
+        continue;
+      }
+      if (node is! XmlElement) {
+        continue;
+      }
+      final name = node.name.local.toLowerCase();
+      if (name == 'math') {
+        final expression = node.innerText;
+        result.add(
+          PreviewInline(
+            kind: PreviewInlineKind.math,
+            text: expression,
+            attributes: {
+              busyMarkMathSourceFormAttribute:
+                  BusyMathSourceForm.writersideElement.name,
+              'expressionId': nextMathId(),
+            },
+          ),
+        );
+        continue;
+      }
+      if (name == 'img') {
+        result.add(
+          PreviewInline(
+            kind: PreviewInlineKind.image,
+            text: node.getAttribute('alt') ?? '',
+            destination: node.getAttribute('src'),
+          ),
+        );
+        continue;
+      }
+      final children = _xmlPreviewInlines(
+        node.children,
+        nextMathId: nextMathId,
+      );
+      final text = node.innerText;
+      switch (name) {
+        case 'b' || 'strong':
+          result.add(
+            PreviewInline(
+              kind: PreviewInlineKind.strong,
+              text: text,
+              children: children,
+            ),
+          );
+          break;
+        case 'i' || 'emphasis':
+          result.add(
+            PreviewInline(
+              kind: PreviewInlineKind.emphasis,
+              text: text,
+              children: children,
+            ),
+          );
+          break;
+        case 'code' || 'control' || 'path' || 'shortcut':
+          result.add(PreviewInline(kind: PreviewInlineKind.code, text: text));
+          break;
+        case 'a':
+          result.add(
+            PreviewInline(
+              kind: PreviewInlineKind.link,
+              text: text,
+              destination:
+                  node.getAttribute('href') ?? node.getAttribute('anchor'),
+              children: children,
+            ),
+          );
+          break;
+        default:
+          result.addAll(children);
+          break;
+      }
+      if (name == 'p' && result.isNotEmpty) {
+        result.add(
+          const PreviewInline(kind: PreviewInlineKind.text, text: '\n'),
+        );
+      }
+    }
+    while (result.lastOrNull?.kind == PreviewInlineKind.text &&
+        result.lastOrNull?.text.trim().isEmpty == true) {
+      result.removeLast();
+    }
+    return result;
+  }
+}
+
+List<int> _encodeDocumentText(
+  String text, {
+  TextFormatMetadata? format,
+  LineEndingNormalization? mixedNormalization,
+}) {
+  return format == null
+      ? utf8.encode(text)
+      : format.encode(text, mixedNormalization: mixedNormalization);
 }
 
 class _StagedSave {
@@ -1406,6 +2121,24 @@ class _StagedSave {
   final File file;
 }
 
+class _StagedBatchTextWrite {
+  const _StagedBatchTextWrite({
+    required this.requestPath,
+    required this.target,
+    required this.directory,
+    required this.stagedFile,
+    required this.expectedSnapshot,
+    required this.bytes,
+  });
+
+  final String requestPath;
+  final File target;
+  final Directory directory;
+  final File stagedFile;
+  final WorkspaceFileSnapshot expectedSnapshot;
+  final List<int> bytes;
+}
+
 extension _FirstOrNull<T> on Iterable<T> {
   T? get firstOrNull => isEmpty ? null : first;
 }
diff --git a/lib/src/workspace/workspace_tabs.dart b/lib/src/workspace/workspace_tabs.dart
index 01c24fe6..62e3fa9f 100644
--- a/lib/src/workspace/workspace_tabs.dart
+++ b/lib/src/workspace/workspace_tabs.dart
@@ -1,4 +1,5 @@
 import '../git/application/git_controller.dart';
+import 'document_buffer.dart';
 import 'workspace_model.dart';
 
 enum WorkspaceTabKind { file, gitDiff }
@@ -8,10 +9,25 @@ class WorkspaceTabEntry {
     required this.kind,
     required this.path,
     required this.active,
+    this.bufferId,
+    this.untitledName,
+    this.dirty = false,
   });
 
-  const WorkspaceTabEntry.file({required String path, required bool active})
-    : this._(kind: WorkspaceTabKind.file, path: path, active: active);
+  const WorkspaceTabEntry.file({
+    required String path,
+    required bool active,
+    String? bufferId,
+    String? untitledName,
+    bool dirty = false,
+  }) : this._(
+         kind: WorkspaceTabKind.file,
+         path: path,
+         active: active,
+         bufferId: bufferId,
+         untitledName: untitledName,
+         dirty: dirty,
+       );
 
   const WorkspaceTabEntry.gitDiff({required String path, required bool active})
     : this._(kind: WorkspaceTabKind.gitDiff, path: path, active: active);
@@ -19,21 +35,36 @@ class WorkspaceTabEntry {
   final WorkspaceTabKind kind;
   final String path;
   final bool active;
+  final String? bufferId;
+  final String? untitledName;
+  final bool dirty;
 
-  String get key => '${kind.name}:$path';
+  String get key => '${kind.name}:${bufferId ?? path}';
 }
 
 List<WorkspaceTabEntry> workspaceTabEntries({
   required Workspace workspace,
   required GitState gitState,
+  List<DocumentBuffer>? documentBuffers,
+  String? activeBufferId,
 }) {
   final diffActive = gitState.selectedDiffForDisplay != null;
   return [
-    for (final path in workspace.openFilePaths)
-      WorkspaceTabEntry.file(
-        path: path,
-        active: !diffActive && path == workspace.activeFilePath,
-      ),
+    if (documentBuffers != null)
+      for (final buffer in documentBuffers)
+        WorkspaceTabEntry.file(
+          path: buffer.filePath ?? '',
+          bufferId: buffer.id,
+          untitledName: buffer.untitledName,
+          dirty: buffer.isDirty,
+          active: !diffActive && buffer.id == activeBufferId,
+        )
+    else
+      for (final path in workspace.openFilePaths)
+        WorkspaceTabEntry.file(
+          path: path,
+          active: !diffActive && path == workspace.activeFilePath,
+        ),
     for (final path in gitState.openDiffFilePaths)
       WorkspaceTabEntry.gitDiff(
         path: path,
diff --git a/lib/src/writerside/writerside_diagram_source_loader.dart b/lib/src/writerside/writerside_diagram_source_loader.dart
new file mode 100644
index 00000000..6a3a3dda
--- /dev/null
+++ b/lib/src/writerside/writerside_diagram_source_loader.dart
@@ -0,0 +1,91 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+
+import '../core/anchored_path_guard.dart';
+
+enum WritersideDiagramSourceFailure {
+  invalidReference,
+  outsideWorkspace,
+  missing,
+  tooLarge,
+  invalidUtf8,
+}
+
+class WritersideDiagramSourceException implements Exception {
+  const WritersideDiagramSourceException(this.failure);
+
+  final WritersideDiagramSourceFailure failure;
+}
+
+/// Loads a Writerside diagram's `src` file without allowing the document to
+/// escape the open project or traverse symlinks.
+class WritersideDiagramSourceLoader {
+  const WritersideDiagramSourceLoader({this.maximumBytes = 2 * 1024 * 1024});
+
+  final int maximumBytes;
+
+  Future<String> load({
+    required String reference,
+    required String documentPath,
+    required String workspaceRoot,
+  }) async {
+    final source = reference.trim();
+    final parsed = Uri.tryParse(source);
+    if (source.isEmpty ||
+        source.contains('\u0000') ||
+        p.isAbsolute(source) ||
+        (parsed?.hasScheme ?? false) ||
+        documentPath.trim().isEmpty ||
+        workspaceRoot.trim().isEmpty) {
+      throw const WritersideDiagramSourceException(
+        WritersideDiagramSourceFailure.invalidReference,
+      );
+    }
+
+    try {
+      final anchor = await captureCanonicalDirectoryAnchor(workspaceRoot);
+      final candidate = p.normalize(p.join(p.dirname(documentPath), source));
+      final resolved = await resolveAnchoredPath(
+        anchor,
+        candidate,
+        allowRoot: false,
+      );
+      if (resolved.type != FileSystemEntityType.file) {
+        throw const WritersideDiagramSourceException(
+          WritersideDiagramSourceFailure.missing,
+        );
+      }
+      final file = File(resolved.path);
+      if (await file.length() > maximumBytes) {
+        throw const WritersideDiagramSourceException(
+          WritersideDiagramSourceFailure.tooLarge,
+        );
+      }
+      final bytes = await file.readAsBytes();
+      if (bytes.length > maximumBytes) {
+        throw const WritersideDiagramSourceException(
+          WritersideDiagramSourceFailure.tooLarge,
+        );
+      }
+      try {
+        return utf8.decode(bytes, allowMalformed: false);
+      } on FormatException {
+        throw const WritersideDiagramSourceException(
+          WritersideDiagramSourceFailure.invalidUtf8,
+        );
+      }
+    } on WritersideDiagramSourceException {
+      rethrow;
+    } on AnchoredPathViolation {
+      throw const WritersideDiagramSourceException(
+        WritersideDiagramSourceFailure.outsideWorkspace,
+      );
+    } on FileSystemException {
+      throw const WritersideDiagramSourceException(
+        WritersideDiagramSourceFailure.missing,
+      );
+    }
+  }
+}
diff --git a/lib/src/writerside/writerside_instance_service.dart b/lib/src/writerside/writerside_instance_service.dart
index b6c0da74..f83da82c 100644
--- a/lib/src/writerside/writerside_instance_service.dart
+++ b/lib/src/writerside/writerside_instance_service.dart
@@ -10,6 +10,7 @@ import '../core/busymark_exception.dart';
 import '../core/diagnostic.dart';
 import '../core/path_utils.dart';
 import '../core/uri_utils.dart';
+import '../markdown/busymark_document.dart';
 import '../markdown/markdown_model.dart';
 import '../markdown/markdown_parser.dart';
 import 'writerside_model.dart';
@@ -514,6 +515,19 @@ class WritersideInstanceService {
         yield link.destination;
       }
     }
+    for (final block in _walkBusyBlocks(document.busyDocument.blocks)) {
+      if (block.kind != BusyBlockKind.video) {
+        continue;
+      }
+      final source = block.attributes['src'];
+      if (source != null) {
+        yield source;
+      }
+      final previewSource = block.attributes['preview-src'];
+      if (previewSource != null) {
+        yield previewSource;
+      }
+    }
     for (final block in document.xmlBlocks) {
       try {
         final fragment = XmlDocumentFragment.parse(block.rawXml);
@@ -525,6 +539,12 @@ class WritersideInstanceService {
           if (source != null) {
             yield source;
           }
+          if (element.name.local == 'video') {
+            final previewSource = element.getAttribute('preview-src');
+            if (previewSource != null) {
+              yield previewSource;
+            }
+          }
         }
       } on XmlParserException {
         // The Markdown parser reports malformed semantic XML separately.
@@ -532,6 +552,13 @@ class WritersideInstanceService {
     }
   }
 
+  Iterable<BusyBlock> _walkBusyBlocks(Iterable<BusyBlock> blocks) sync* {
+    for (final block in blocks) {
+      yield block;
+      yield* _walkBusyBlocks(block.children);
+    }
+  }
+
   Future<AnchoredPathResolution?> _resolveReferencedMedia(
     CanonicalPathAnchor sourceAnchor,
     String markdownPath,
diff --git a/lib/src/writerside/writerside_model.dart b/lib/src/writerside/writerside_model.dart
index 53e9e56b..7092c9bc 100644
--- a/lib/src/writerside/writerside_model.dart
+++ b/lib/src/writerside/writerside_model.dart
@@ -422,6 +422,26 @@ class WritersideTopicTitleOverride {
   final String title;
 }
 
+class WritersideVideo {
+  const WritersideVideo({
+    required this.source,
+    required this.span,
+    this.previewSource,
+    this.width,
+    this.height,
+    this.miniPlayer = false,
+    this.borderEffect = 'none',
+  });
+
+  final String source;
+  final String? previewSource;
+  final String? width;
+  final String? height;
+  final bool miniPlayer;
+  final String borderEffect;
+  final SourceSpan span;
+}
+
 class WritersideTopic {
   const WritersideTopic({
     required this.id,
@@ -433,6 +453,7 @@ class WritersideTopic {
     required this.elementIds,
     required this.links,
     required this.images,
+    required this.videos,
     required this.variables,
     required this.includes,
     required this.diagnostics,
@@ -451,6 +472,7 @@ class WritersideTopic {
   final List<WritersideElementId> elementIds;
   final List<MarkdownLink> links;
   final List<MarkdownImage> images;
+  final List<WritersideVideo> videos;
   final List<MarkdownVariableToken> variables;
   final List<WritersideInclude> includes;
   final List<Diagnostic> diagnostics;
diff --git a/lib/src/writerside/writerside_module_service.dart b/lib/src/writerside/writerside_module_service.dart
index 02b04305..dd105520 100644
--- a/lib/src/writerside/writerside_module_service.dart
+++ b/lib/src/writerside/writerside_module_service.dart
@@ -13,6 +13,7 @@ import '../core/uri_utils.dart';
 import 'writerside_model.dart';
 import 'writerside_parsers.dart';
 import 'writerside_tree_resolver.dart';
+import 'writerside_video.dart';
 
 class WritersideModuleService {
   const WritersideModuleService({
@@ -1085,6 +1086,68 @@ class WritersideModuleService {
           );
         }
       }
+      for (final video in topic.videos) {
+        final source = video.source.trim();
+        if (source.isEmpty) {
+          continue;
+        }
+        final uri = Uri.tryParse(source);
+        if (uri != null && uri.hasScheme) {
+          if (resolveWritersideHostedVideoSource(source) == null) {
+            diagnostics.add(
+              Diagnostic(
+                code: 'writerside.video.unsupported-source',
+                severity: DiagnosticSeverity.warning,
+                filePath: topic.filePath,
+                args: {'source': source},
+                sourceSpan: video.span,
+              ),
+            );
+          }
+          continue;
+        }
+        if (!busyMarkWritersideVideoExtensions.contains(
+              p.extension(source).toLowerCase(),
+            ) ||
+            !_localImageExistsInAnyRoot(
+              module,
+              topic,
+              source,
+              validatedImageDirs,
+            )) {
+          diagnostics.add(
+            Diagnostic(
+              code: 'writerside.video.missing-file',
+              severity: DiagnosticSeverity.error,
+              filePath: topic.filePath,
+              args: {'source': source},
+              sourceSpan: video.span,
+            ),
+          );
+          continue;
+        }
+        final preview = writersideVideoPreviewSource(
+          source,
+          video.previewSource,
+        );
+        if (preview.isEmpty ||
+            !_localImageExistsInAnyRoot(
+              module,
+              topic,
+              preview,
+              validatedImageDirs,
+            )) {
+          diagnostics.add(
+            Diagnostic(
+              code: 'writerside.video.missing-preview',
+              severity: DiagnosticSeverity.warning,
+              filePath: topic.filePath,
+              args: {'preview': preview},
+              sourceSpan: video.span,
+            ),
+          );
+        }
+      }
       for (final include in topic.includes) {
         if (include.from == null || include.from!.isEmpty) {
           diagnostics.add(
diff --git a/lib/src/writerside/writerside_parsers.dart b/lib/src/writerside/writerside_parsers.dart
index e34b537b..7d304f21 100644
--- a/lib/src/writerside/writerside_parsers.dart
+++ b/lib/src/writerside/writerside_parsers.dart
@@ -4,6 +4,7 @@ import 'package:xml/xml.dart';
 import '../core/diagnostic.dart';
 import '../core/path_utils.dart';
 import '../core/source_span.dart';
+import '../markdown/busymark_document.dart';
 import '../markdown/markdown_model.dart';
 import '../markdown/markdown_parser.dart';
 import 'writerside_model.dart';
@@ -1004,6 +1005,39 @@ class WritersideTopicParser {
         )
         .toList();
     final titleOverrides = _topicTitleOverrides(source);
+    final videos = <WritersideVideo>[];
+    void collectVideos(Iterable<BusyBlock> blocks) {
+      for (final block in blocks) {
+        if (block.kind == BusyBlockKind.video) {
+          final src = block.attributes['src']?.trim() ?? '';
+          videos.add(
+            WritersideVideo(
+              source: src,
+              previewSource: _trimmedOrNull(block.attributes['preview-src']),
+              width: _trimmedOrNull(block.attributes['width']),
+              height: _trimmedOrNull(block.attributes['height']),
+              miniPlayer: block.attributes['mini-player'] == 'true',
+              borderEffect: block.attributes['border-effect'] ?? 'none',
+              span: block.sourceSpan ?? SourceSpan.entireFile(filePath, source),
+            ),
+          );
+        }
+        collectVideos(block.children);
+      }
+    }
+
+    collectVideos(parsed.busyDocument.blocks);
+    final topicDiagnostics = <Diagnostic>[
+      ..._writersideMarkdownDiagnostics(parsed.diagnostics),
+      for (final video in videos)
+        if (video.source.isEmpty)
+          Diagnostic(
+            code: 'writerside.video.missing-source',
+            severity: DiagnosticSeverity.warning,
+            filePath: filePath,
+            sourceSpan: video.span,
+          ),
+    ];
     return WritersideTopic(
       id: p.basenameWithoutExtension(filePath),
       filePath: filePath,
@@ -1014,9 +1048,10 @@ class WritersideTopicParser {
       elementIds: ids,
       links: parsed.links,
       images: parsed.images,
+      videos: videos,
       variables: parsed.variables,
       includes: includes,
-      diagnostics: _writersideMarkdownDiagnostics(parsed.diagnostics),
+      diagnostics: sortDiagnostics(topicDiagnostics),
       webFileName: _webFileName(source),
       markdown: parsed,
       titleOverrides: titleOverrides,
@@ -1035,6 +1070,7 @@ class WritersideTopicParser {
     final ids = <WritersideElementId>[];
     final links = <MarkdownLink>[];
     final images = <MarkdownImage>[];
+    final videos = <WritersideVideo>[];
     final variables = <MarkdownVariableToken>[];
     final includes = <WritersideInclude>[];
     final titleOverrides = <WritersideTopicTitleOverride>[];
@@ -1164,6 +1200,32 @@ class WritersideTopicParser {
                 span: _elementSpan(filePath, source, 'img', src),
               ),
             );
+          case 'video':
+            final src = element.getAttribute('src')?.trim() ?? '';
+            final span = _elementSpan(filePath, source, 'video', src);
+            videos.add(
+              WritersideVideo(
+                source: src,
+                previewSource: _trimmedOrNull(
+                  element.getAttribute('preview-src'),
+                ),
+                width: _trimmedOrNull(element.getAttribute('width')),
+                height: _trimmedOrNull(element.getAttribute('height')),
+                miniPlayer: element.getAttribute('mini-player') == 'true',
+                borderEffect: element.getAttribute('border-effect') ?? 'none',
+                span: span,
+              ),
+            );
+            if (src.isEmpty) {
+              diagnostics.add(
+                Diagnostic(
+                  code: 'writerside.video.missing-source',
+                  severity: DiagnosticSeverity.warning,
+                  filePath: filePath,
+                  sourceSpan: span,
+                ),
+              );
+            }
           case 'include':
             includes.add(
               WritersideInclude(
@@ -1209,6 +1271,7 @@ class WritersideTopicParser {
       elementIds: ids,
       links: links,
       images: images,
+      videos: videos,
       variables: variables,
       includes: includes,
       diagnostics: sortDiagnostics(diagnostics),
@@ -1263,6 +1326,11 @@ String? _webFileName(String source) {
   return value == null || value.isEmpty ? null : value;
 }
 
+String? _trimmedOrNull(String? value) {
+  final trimmed = value?.trim();
+  return trimmed == null || trimmed.isEmpty ? null : trimmed;
+}
+
 Diagnostic _xmlError(
   String code,
   String filePath,
diff --git a/lib/src/writerside/writerside_project_creator.dart b/lib/src/writerside/writerside_project_creator.dart
index 8205d8cd..6c2bb533 100644
--- a/lib/src/writerside/writerside_project_creator.dart
+++ b/lib/src/writerside/writerside_project_creator.dart
@@ -391,9 +391,7 @@ class WritersideProjectCreator {
   }
 
   String _startTopic({required String title}) {
-    return '# ${_markdownHeadingText(title)}\n\n'
-        'Start writing your documentation here.\n\n'
-        'This Writerside-compatible starter project was created by BusyMark.\n';
+    return '# ${_markdownHeadingText(title)}\n';
   }
 
   String _markdownHeadingText(String value) {
diff --git a/lib/src/writerside/writerside_toc_editor.dart b/lib/src/writerside/writerside_toc_editor.dart
index 4a7661fe..016b936b 100644
--- a/lib/src/writerside/writerside_toc_editor.dart
+++ b/lib/src/writerside/writerside_toc_editor.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:math' as math;
 
 import 'package:path/path.dart' as p;
 import 'package:xml/xml.dart';
@@ -44,6 +45,27 @@ class WritersideTocMoveRequest {
   final WritersideTocNodeIdentity? referenceIdentity;
 }
 
+class WritersideTocMoveEntry {
+  const WritersideTocMoveEntry({required this.sourcePath, this.sourceIdentity});
+
+  final List<int> sourcePath;
+  final WritersideTocNodeIdentity? sourceIdentity;
+}
+
+class WritersideTocBatchMoveRequest {
+  const WritersideTocBatchMoveRequest({
+    required this.sources,
+    required this.placement,
+    this.referencePath,
+    this.referenceIdentity,
+  });
+
+  final List<WritersideTocMoveEntry> sources;
+  final WritersideTopicCreatePlacement placement;
+  final List<int>? referencePath;
+  final WritersideTocNodeIdentity? referenceIdentity;
+}
+
 class WritersideTocMutationResult {
   const WritersideTocMutationResult({required this.treePath, this.entryPath});
 
@@ -53,6 +75,16 @@ class WritersideTocMutationResult {
   final List<int>? entryPath;
 }
 
+class WritersideTocRemovalRequest {
+  const WritersideTocRemovalRequest({
+    required this.entryPath,
+    this.expectedIdentity,
+  });
+
+  final List<int> entryPath;
+  final WritersideTocNodeIdentity? expectedIdentity;
+}
+
 /// Performs structural Writerside TOC mutations inside a guarded module root.
 class WritersideTocEditor {
   const WritersideTocEditor({
@@ -133,6 +165,105 @@ class WritersideTocEditor {
     );
   }
 
+  /// Moves several complete subtrees as one ordered group.
+  Future<WritersideTocMutationResult> moveSubtrees(
+    WritersideTocEditTarget target,
+    WritersideTocBatchMoveRequest request,
+  ) async {
+    if (request.sources.isEmpty) {
+      throw const BusyMarkException('writerside.toc.path-invalid');
+    }
+    for (final source in request.sources) {
+      _validatePath(source.sourcePath, role: 'source');
+    }
+    for (var left = 0; left < request.sources.length; left += 1) {
+      for (var right = left + 1; right < request.sources.length; right += 1) {
+        final leftPath = request.sources[left].sourcePath;
+        final rightPath = request.sources[right].sourcePath;
+        if (_isSameOrDescendant(leftPath, rightPath) ||
+            _isSameOrDescendant(rightPath, leftPath)) {
+          throw const BusyMarkException('writerside.toc.move-invalid-target');
+        }
+      }
+    }
+    final referencePath = request.referencePath;
+    if (request.placement == WritersideTopicCreatePlacement.root) {
+      if (referencePath != null) {
+        throw _invalidPath(referencePath, role: 'destination');
+      }
+    } else if (referencePath == null) {
+      throw const BusyMarkException('writerside.toc.destination-required');
+    } else {
+      _validatePath(referencePath, role: 'destination');
+      for (final source in request.sources) {
+        if (_isSameOrDescendant(source.sourcePath, referencePath)) {
+          throw BusyMarkException(
+            'writerside.toc.move-invalid-target',
+            args: {
+              'source': _pathLabel(source.sourcePath),
+              'destination': _pathLabel(referencePath),
+            },
+          );
+        }
+      }
+    }
+
+    final session = await _load(target);
+    final elements = <XmlElement>[];
+    for (final source in request.sources) {
+      final element = _elementAtPath(
+        session.root,
+        source.sourcePath,
+        role: 'source',
+      );
+      if (!(source.sourceIdentity?.matches(element) ?? true)) {
+        throw _invalidPath(source.sourcePath, role: 'source');
+      }
+      elements.add(element);
+    }
+    if (elements.toSet().length != elements.length) {
+      throw const BusyMarkException('writerside.toc.move-invalid-target');
+    }
+    final reference = referencePath == null
+        ? null
+        : _elementAtPath(session.root, referencePath, role: 'destination');
+    if (reference != null &&
+        !(request.referenceIdentity?.matches(reference) ?? true)) {
+      throw _invalidPath(referencePath!, role: 'destination');
+    }
+    for (final element in elements) {
+      final parent = element.parent;
+      if (parent is! XmlElement || !parent.children.remove(element)) {
+        throw const BusyMarkException('writerside.toc.move-invalid-target');
+      }
+    }
+    switch (request.placement) {
+      case WritersideTopicCreatePlacement.root:
+        session.root.children.addAll(elements);
+      case WritersideTopicCreatePlacement.sibling:
+        final parent = reference!.parent;
+        if (parent is! XmlElement) {
+          throw const BusyMarkException('writerside.toc.move-invalid-target');
+        }
+        final index = parent.children.indexOf(reference);
+        if (index < 0) {
+          throw const BusyMarkException('writerside.toc.move-invalid-target');
+        }
+        parent.children.insertAll(index + 1, elements);
+      case WritersideTopicCreatePlacement.child:
+        reference!.children.addAll(elements);
+    }
+    final firstPath = _pathOfElement(session.root, elements.first);
+    if (firstPath == null) {
+      throw const BusyMarkException('writerside.toc.move-invalid-target');
+    }
+    await _write(session);
+    return WritersideTocMutationResult(
+      treePath: session.treePath,
+      entryPath: firstPath,
+    );
+  }
+
   /// Removes one TOC entry while retaining its direct `toc-element` children.
   ///
   /// Promoted children are inserted at the removed entry's position and keep
@@ -167,6 +298,70 @@ class WritersideTocEditor {
     return WritersideTocMutationResult(treePath: session.treePath);
   }
 
+  /// Removes several exact TOC entries in one guarded tree-file update.
+  ///
+  /// Descendants are removed before their selected ancestors, and siblings
+  /// are removed from the end backwards so every request keeps referring to
+  /// the tree snapshot the user selected.
+  Future<WritersideTocMutationResult> removeEntries(
+    WritersideTocEditTarget target,
+    List<WritersideTocRemovalRequest> requests,
+  ) async {
+    if (requests.isEmpty) {
+      throw const BusyMarkException('writerside.toc.path-invalid');
+    }
+    for (final request in requests) {
+      _validatePath(request.entryPath, role: 'source');
+    }
+    final session = await _load(target);
+    final entries = <({List<int> path, XmlElement element})>[];
+    for (final request in requests) {
+      final entry = _elementAtPath(
+        session.root,
+        request.entryPath,
+        role: 'source',
+      );
+      if (!(request.expectedIdentity?.matches(entry) ?? true)) {
+        throw _invalidPath(request.entryPath, role: 'source');
+      }
+      entries.add((path: request.entryPath, element: entry));
+    }
+    entries.sort((left, right) {
+      final depth = right.path.length.compareTo(left.path.length);
+      if (depth != 0) {
+        return depth;
+      }
+      final length = math.min(left.path.length, right.path.length);
+      for (var index = 0; index < length; index += 1) {
+        final order = right.path[index].compareTo(left.path[index]);
+        if (order != 0) {
+          return order;
+        }
+      }
+      return 0;
+    });
+    for (final (:element, :path) in entries) {
+      final parent = element.parent;
+      if (parent is! XmlElement) {
+        throw _invalidPath(path, role: 'source');
+      }
+      final rawIndex = parent.children.indexOf(element);
+      if (rawIndex < 0) {
+        throw _invalidPath(path, role: 'source');
+      }
+      final promotedChildren = element.childElements
+          .where(_isTocElement)
+          .toList();
+      for (final child in promotedChildren) {
+        element.children.remove(child);
+      }
+      parent.children.removeAt(rawIndex);
+      parent.children.insertAll(rawIndex, promotedChildren);
+    }
+    await _write(session);
+    return WritersideTocMutationResult(treePath: session.treePath);
+  }
+
   Future<_TocEditSession> _load(WritersideTocEditTarget target) async {
     final rootPath = normalizePath(target.rootPath);
     final CanonicalPathAnchor anchor;
diff --git a/lib/src/writerside/writerside_video.dart b/lib/src/writerside/writerside_video.dart
new file mode 100644
index 00000000..cebdc05d
--- /dev/null
+++ b/lib/src/writerside/writerside_video.dart
@@ -0,0 +1,316 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+import 'package:path/path.dart' as p;
+
+import '../core/local_image_resolver.dart';
+
+const busyMarkWritersideVideoExtensions = {
+  '.avi',
+  '.m4v',
+  '.mkv',
+  '.mov',
+  '.mp4',
+  '.ogv',
+  '.webm',
+};
+
+const _hostedVideoPosterTimeout = Duration(seconds: 5);
+const _maximumHostedVideoMetadataBytes = 64 * 1024;
+const _maximumHostedVideoPosterCacheEntries = 64;
+final _hostedVideoPosterCache = <String, String>{};
+final _pendingHostedVideoPosters = <String, Future<String?>>{};
+
+enum WritersideVideoPlaybackKind { localFile, youtube, vimeo }
+
+typedef WritersideVideoPosterLoader =
+    Future<String?> Function(WritersideVideoPlaybackSource source);
+
+class WritersideVideoPlaybackSource {
+  const WritersideVideoPlaybackSource({
+    required this.kind,
+    required this.value,
+  });
+
+  final WritersideVideoPlaybackKind kind;
+  final String value;
+}
+
+/// Resolves an authored Writerside source to the minimal trusted value needed
+/// by the native player. Hosted services are reduced to a validated video ID;
+/// local media is reduced to a canonical file path.
+WritersideVideoPlaybackSource? resolveWritersideVideoPlaybackSource({
+  required String source,
+  required String activeFilePath,
+  required String? workspaceRoot,
+  required String? writersideRoot,
+  required String imagesDir,
+}) {
+  final value = source.trim();
+  if (value.isEmpty) {
+    return null;
+  }
+  final parsed = Uri.tryParse(value);
+  if (parsed != null && parsed.hasScheme) {
+    return resolveWritersideHostedVideoSource(value);
+  }
+  if (p.isAbsolute(value) ||
+      !busyMarkWritersideVideoExtensions.contains(
+        p.extension(value.split('?').first.split('#').first).toLowerCase(),
+      )) {
+    return null;
+  }
+  final resolved = resolveLocalMediaPath(
+    activeFilePath: activeFilePath,
+    destination: value,
+    workspaceRoot: workspaceRoot,
+    writersideRoot: writersideRoot,
+    imagesDir: imagesDir,
+  );
+  return resolved == null
+      ? null
+      : WritersideVideoPlaybackSource(
+          kind: WritersideVideoPlaybackKind.localFile,
+          value: resolved,
+        );
+}
+
+/// Reduces a supported hosted Writerside URL to a validated provider and ID.
+/// Query strings and authored paths are never forwarded to the native player.
+WritersideVideoPlaybackSource? resolveWritersideHostedVideoSource(
+  String source,
+) {
+  final parsed = Uri.tryParse(source.trim());
+  if (parsed == null ||
+      parsed.scheme.toLowerCase() != 'https' ||
+      parsed.userInfo.isNotEmpty ||
+      parsed.host.isEmpty) {
+    return null;
+  }
+  final youtubeId = _youtubeVideoId(parsed);
+  if (youtubeId != null) {
+    return WritersideVideoPlaybackSource(
+      kind: WritersideVideoPlaybackKind.youtube,
+      value: youtubeId,
+    );
+  }
+  final vimeoId = _vimeoVideoId(parsed);
+  if (vimeoId != null) {
+    return WritersideVideoPlaybackSource(
+      kind: WritersideVideoPlaybackKind.vimeo,
+      value: vimeoId,
+    );
+  }
+  return null;
+}
+
+/// Resolves a Writerside video source without granting arbitrary URL schemes
+/// or local filesystem access outside the document's existing media roots.
+Uri? resolveWritersideVideoUri({
+  required String source,
+  required String activeFilePath,
+  required String? workspaceRoot,
+  required String? writersideRoot,
+  required String imagesDir,
+}) {
+  final playback = resolveWritersideVideoPlaybackSource(
+    source: source,
+    activeFilePath: activeFilePath,
+    workspaceRoot: workspaceRoot,
+    writersideRoot: writersideRoot,
+    imagesDir: imagesDir,
+  );
+  if (playback == null) {
+    return null;
+  }
+  return playback.kind == WritersideVideoPlaybackKind.localFile
+      ? Uri.file(playback.value)
+      : Uri.parse(source.trim());
+}
+
+bool isSupportedWritersideVideoHost(String host) {
+  final value = host.trim().toLowerCase();
+  return value == 'youtu.be' ||
+      value == 'youtube.com' ||
+      value.endsWith('.youtube.com') ||
+      value == 'youtube-nocookie.com' ||
+      value.endsWith('.youtube-nocookie.com') ||
+      value == 'vimeo.com' ||
+      value.endsWith('.vimeo.com');
+}
+
+String? _youtubeVideoId(Uri uri) {
+  if (!_youtubeHost(uri.host)) {
+    return null;
+  }
+  final segments = uri.pathSegments.where((part) => part.isNotEmpty).toList();
+  String? candidate;
+  if (uri.host.toLowerCase() == 'youtu.be') {
+    candidate = segments.firstOrNull;
+  } else if (uri.path == '/watch') {
+    candidate = uri.queryParameters['v'];
+  } else if (segments.length >= 2 &&
+      const {'embed', 'shorts', 'v'}.contains(segments.first)) {
+    candidate = segments[1];
+  }
+  return candidate != null &&
+          RegExp(r'^[A-Za-z0-9_-]{6,64}$').hasMatch(candidate)
+      ? candidate
+      : null;
+}
+
+String? _vimeoVideoId(Uri uri) {
+  if (!_vimeoHost(uri.host)) {
+    return null;
+  }
+  final candidate = uri.pathSegments
+      .where((part) => RegExp(r'^\d{1,20}$').hasMatch(part))
+      .lastOrNull;
+  return candidate;
+}
+
+bool _youtubeHost(String host) {
+  final value = host.toLowerCase();
+  return value == 'youtu.be' ||
+      value == 'youtube.com' ||
+      value.endsWith('.youtube.com') ||
+      value == 'youtube-nocookie.com' ||
+      value.endsWith('.youtube-nocookie.com');
+}
+
+bool _vimeoHost(String host) {
+  final value = host.toLowerCase();
+  return value == 'vimeo.com' || value.endsWith('.vimeo.com');
+}
+
+String writersideVideoPreviewSource(String source, String? previewSource) {
+  final explicit = previewSource?.trim() ?? '';
+  if (explicit.isNotEmpty) {
+    return explicit;
+  }
+  final value = source.trim();
+  final uri = Uri.tryParse(value);
+  if (value.isEmpty || (uri != null && uri.hasScheme)) {
+    return '';
+  }
+  final suffixStart = value.indexOf(RegExp(r'[?#]'));
+  final path = suffixStart < 0 ? value : value.substring(0, suffixStart);
+  return p.setExtension(path, '.png');
+}
+
+/// Resolves the provider-owned poster for a validated hosted video.
+///
+/// YouTube has a deterministic thumbnail URL. Vimeo exposes its thumbnail via
+/// the official unauthenticated oEmbed endpoint. Only HTTPS image URLs on
+/// Vimeo's image CDN are accepted from that metadata response.
+Future<String?> loadWritersideHostedVideoPoster(
+  WritersideVideoPlaybackSource source, {
+  http.Client? client,
+}) async {
+  if (source.kind == WritersideVideoPlaybackKind.youtube) {
+    if (!RegExp(r'^[A-Za-z0-9_-]{6,64}$').hasMatch(source.value)) {
+      return null;
+    }
+    return 'https://i.ytimg.com/vi/${source.value}/hqdefault.jpg';
+  }
+  if (source.kind != WritersideVideoPlaybackKind.vimeo) {
+    return null;
+  }
+  if (!RegExp(r'^\d{1,20}$').hasMatch(source.value)) {
+    return null;
+  }
+  final cacheKey = '${source.kind.name}:${source.value}';
+  if (client == null) {
+    final cached = _hostedVideoPosterCache[cacheKey];
+    if (cached != null) {
+      return cached;
+    }
+    final pending = _pendingHostedVideoPosters[cacheKey];
+    if (pending != null) {
+      return pending;
+    }
+  }
+  final future = _loadVimeoPoster(source.value, client: client);
+  if (client != null) {
+    return future;
+  }
+  _pendingHostedVideoPosters[cacheKey] = future;
+  try {
+    final poster = await future;
+    if (poster != null) {
+      _hostedVideoPosterCache[cacheKey] = poster;
+      if (_hostedVideoPosterCache.length >
+          _maximumHostedVideoPosterCacheEntries) {
+        _hostedVideoPosterCache.remove(_hostedVideoPosterCache.keys.first);
+      }
+    }
+    return poster;
+  } finally {
+    _pendingHostedVideoPosters.remove(cacheKey);
+  }
+}
+
+Future<String?> _loadVimeoPoster(String videoId, {http.Client? client}) async {
+  final ownedClient = client == null;
+  final effectiveClient = client ?? http.Client();
+  try {
+    final requestUri = Uri.https('vimeo.com', '/api/oembed.json', {
+      'url': 'https://vimeo.com/$videoId',
+      'width': '1280',
+    });
+    final response = await effectiveClient
+        .get(requestUri, headers: const {'Accept': 'application/json'})
+        .timeout(_hostedVideoPosterTimeout);
+    if (response.statusCode < 200 ||
+        response.statusCode >= 300 ||
+        response.bodyBytes.length > _maximumHostedVideoMetadataBytes) {
+      return null;
+    }
+    final decoded = jsonDecode(utf8.decode(response.bodyBytes));
+    if (decoded is! Map<String, dynamic>) {
+      return null;
+    }
+    final value = decoded['thumbnail_url'];
+    if (value is! String) {
+      return null;
+    }
+    final poster = Uri.tryParse(value);
+    if (poster == null ||
+        poster.scheme != 'https' ||
+        poster.userInfo.isNotEmpty ||
+        poster.host.isEmpty ||
+        (poster.hasPort && poster.port != 443) ||
+        !_isVimeoImageHost(poster.host)) {
+      return null;
+    }
+    return poster.toString();
+  } on Object {
+    return null;
+  } finally {
+    if (ownedClient) {
+      effectiveClient.close();
+    }
+  }
+}
+
+bool _isVimeoImageHost(String host) {
+  final value = host.toLowerCase();
+  return value == 'vimeocdn.com' || value.endsWith('.vimeocdn.com');
+}
+
+double? busyMarkVideoDimension(String? value) {
+  if (value == null) {
+    return null;
+  }
+  final number = RegExp(
+    r'^\s*([0-9]+(?:\.[0-9]+)?)',
+  ).firstMatch(value)?.group(1);
+  final parsed = number == null ? null : double.tryParse(number);
+  return parsed == null || parsed <= 0 ? null : parsed;
+}
+
+extension _FirstOrNull<T> on Iterable<T> {
+  T? get firstOrNull => isEmpty ? null : first;
+
+  T? get lastOrNull => isEmpty ? null : last;
+}
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index 20adbe77..ff692ddd 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -119,6 +119,9 @@ add_custom_command(
     "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/package.json"
     "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/package-lock.json"
     "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/render_engines.js"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/mathjax_renderer.js"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/mermaid_math_disabled.js"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/build_render_engines.js"
     "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/reference.js"
     "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/bootstrap.js"
     "${CMAKE_CURRENT_SOURCE_DIR}/../tools/visualization/harness.html"
diff --git a/linux/io.busystack.busymark.metainfo.xml b/linux/io.busystack.busymark.metainfo.xml
index a7521570..b319f97f 100644
--- a/linux/io.busystack.busymark.metainfo.xml
+++ b/linux/io.busystack.busymark.metainfo.xml
@@ -63,6 +63,7 @@
   <url type="bugtracker">https://github.com/busystack/busymark/issues</url>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="0.3.1" date="2026-08-23" />
     <release version="0.3.0" date="2026-08-20" />
     <release version="0.2.5" date="2026-08-17" />
     <release version="0.2.0" date="2026-07-03" />
diff --git a/linux/runner/CMakeLists.txt b/linux/runner/CMakeLists.txt
index 7cc785f1..4d8b9860 100644
--- a/linux/runner/CMakeLists.txt
+++ b/linux/runner/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(${BINARY_NAME}
   "main.cc"
   "my_application.cc"
   "secure_credential_host.cc"
+  "video_player_host.cc"
   "web_render_host.cc"
   "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
 )
diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc
index f2d9331d..5cfd8427 100644
--- a/linux/runner/my_application.cc
+++ b/linux/runner/my_application.cc
@@ -11,11 +11,13 @@
 
 #include "flutter/generated_plugin_registrant.h"
 #include "secure_credential_host.h"
+#include "video_player_host.h"
 #include "web_render_host.h"
 
 constexpr char kApplicationDisplayName[] = "BusyMark";
 constexpr char kHeaderBarChannel[] = "com.busymark.app/headerbar";
 constexpr char kNativeMenuChannel[] = "busymark/native_menus";
+constexpr char kAssetInputChannel[] = "com.busymark.app/asset_input";
 constexpr gint kHeaderButtonHeight = 32;
 constexpr gint kHeaderButtonSpacing = 8;
 constexpr gint kHeaderSidebarInset = 8;
@@ -81,11 +83,14 @@ struct _MyApplication {
   char** dart_entrypoint_arguments;
   FlMethodChannel* header_bar_channel;
   FlMethodChannel* native_menu_channel;
+  FlMethodChannel* asset_input_channel;
   FlMethodChannel* secure_credential_channel;
   BusyMarkWebRenderHost* visualization_host;
+  BusyMarkVideoPlayerHost* video_player_host;
   GtkCssProvider* header_bar_css_provider;
   GtkWindow* main_window;
   GtkWidget* flutter_view;
+  GtkWidget* flutter_overlay;
   GtkWidget* titlebar_handle;
   GtkWidget* titlebar_overlay;
   GtkWidget* modal_scrim;
@@ -2231,8 +2236,24 @@ struct NativeMenuSession {
 struct NativeMenuHandlerData {
   GtkWidget* view;
   NativeMenuSession* active;
+  GdkEvent* trigger_event;
+  gulong event_signal_id;
 };
 
+static gboolean native_menu_capture_trigger_event(GtkWidget*,
+                                                  GdkEvent* event,
+                                                  gpointer user_data) {
+  auto* data = static_cast<NativeMenuHandlerData*>(user_data);
+  if (event == nullptr ||
+      (event->type != GDK_BUTTON_PRESS && event->type != GDK_KEY_PRESS &&
+       event->type != GDK_TOUCH_BEGIN)) {
+    return GDK_EVENT_PROPAGATE;
+  }
+  g_clear_pointer(&data->trigger_event, gdk_event_free);
+  data->trigger_event = gdk_event_copy(event);
+  return GDK_EVENT_PROPAGATE;
+}
+
 static void native_menu_session_respond(NativeMenuSession* session,
                                         gint selected_index) {
   if (session->method_call == nullptr) {
@@ -2732,7 +2753,8 @@ static void show_native_menu(NativeMenuHandlerData* data,
   gtk_menu_popup_at_rect(
       GTK_MENU(session->menu), rect_window, &window_anchor,
       open_above ? GDK_GRAVITY_NORTH_WEST : GDK_GRAVITY_SOUTH_WEST,
-      open_above ? GDK_GRAVITY_SOUTH_WEST : GDK_GRAVITY_NORTH_WEST, nullptr);
+      open_above ? GDK_GRAVITY_SOUTH_WEST : GDK_GRAVITY_NORTH_WEST,
+      data->trigger_event);
   if (focus_first) {
     gtk_menu_shell_select_first(GTK_MENU_SHELL(session->menu), TRUE);
   } else {
@@ -2746,10 +2768,14 @@ static void native_menu_handler_data_free(gpointer user_data) {
     native_menu_session_dispose(data->active);
   }
   if (data->view != nullptr) {
+    if (data->event_signal_id != 0) {
+      g_signal_handler_disconnect(data->view, data->event_signal_id);
+    }
     g_object_remove_weak_pointer(
         G_OBJECT(data->view),
         reinterpret_cast<gpointer*>(&data->view));
   }
+  g_clear_pointer(&data->trigger_event, gdk_event_free);
   g_free(data);
 }
 
@@ -2784,11 +2810,103 @@ static void register_native_menu_channel(MyApplication* self, FlView* view) {
   data->view = GTK_WIDGET(view);
   g_object_add_weak_pointer(G_OBJECT(data->view),
                             reinterpret_cast<gpointer*>(&data->view));
+  data->event_signal_id =
+      g_signal_connect(data->view, "event",
+                       G_CALLBACK(native_menu_capture_trigger_event), data);
   fl_method_channel_set_method_call_handler(
       self->native_menu_channel, native_menu_method_call_cb, data,
       native_menu_handler_data_free);
 }
 
+static FlValue* local_paths_from_uris(gchar** uris) {
+  FlValue* paths = fl_value_new_list();
+  if (uris == nullptr) {
+    return paths;
+  }
+  for (gchar** current = uris; *current != nullptr; current++) {
+    g_autoptr(GError) error = nullptr;
+    g_autofree gchar* path = g_filename_from_uri(*current, nullptr, &error);
+    if (path != nullptr) {
+      fl_value_append_take(paths, fl_value_new_string(path));
+    }
+  }
+  return paths;
+}
+
+static void asset_input_method_call_cb(FlMethodChannel*,
+                                       FlMethodCall* method_call,
+                                       gpointer) {
+  const gchar* method = fl_method_call_get_name(method_call);
+  GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+  if (strcmp(method, "readClipboardImageFiles") == 0) {
+    g_auto(GStrv) uris = gtk_clipboard_wait_for_uris(clipboard);
+    g_autoptr(FlValue) paths = local_paths_from_uris(uris);
+    fl_method_call_respond_success(method_call, paths, nullptr);
+    return;
+  }
+  if (strcmp(method, "readClipboardImagePng") == 0) {
+    g_autoptr(GdkPixbuf) pixbuf = gtk_clipboard_wait_for_image(clipboard);
+    if (pixbuf == nullptr) {
+      g_autoptr(FlValue) result = fl_value_new_null();
+      fl_method_call_respond_success(method_call, result, nullptr);
+      return;
+    }
+    gchar* buffer = nullptr;
+    gsize length = 0;
+    g_autoptr(GError) error = nullptr;
+    if (!gdk_pixbuf_save_to_buffer(pixbuf, &buffer, &length, "png", &error,
+                                   nullptr)) {
+      g_autoptr(FlValue) details = fl_value_new_null();
+      fl_method_call_respond_error(
+          method_call, "asset.clipboard-encode-failed",
+          error != nullptr ? error->message : "Could not encode clipboard image.",
+          details, nullptr);
+      return;
+    }
+    g_autoptr(GBytes) bytes = g_bytes_new_take(buffer, length);
+    g_autoptr(FlValue) result = fl_value_new_uint8_list_from_bytes(bytes);
+    fl_method_call_respond_success(method_call, result, nullptr);
+    return;
+  }
+  fl_method_call_respond_not_implemented(method_call, nullptr);
+}
+
+static void asset_drag_data_received_cb(GtkWidget*,
+                                        GdkDragContext* context,
+                                        gint,
+                                        gint,
+                                        GtkSelectionData* selection,
+                                        guint,
+                                        guint time,
+                                        gpointer user_data) {
+  auto* self = MY_APPLICATION(user_data);
+  g_auto(GStrv) uris = gtk_selection_data_get_uris(selection);
+  g_autoptr(FlValue) paths = local_paths_from_uris(uris);
+  const gboolean accepted = fl_value_get_length(paths) > 0;
+  if (accepted && self->asset_input_channel != nullptr) {
+    fl_method_channel_invoke_method(self->asset_input_channel,
+                                    "assetFilesDropped", paths, nullptr,
+                                    nullptr, nullptr);
+  }
+  gtk_drag_finish(context, accepted, FALSE, time);
+}
+
+static void register_asset_input_channel(MyApplication* self, FlView* view) {
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  self->asset_input_channel = fl_method_channel_new(
+      fl_engine_get_binary_messenger(fl_view_get_engine(view)),
+      kAssetInputChannel, FL_METHOD_CODEC(codec));
+  fl_method_channel_set_method_call_handler(
+      self->asset_input_channel, asset_input_method_call_cb, self, nullptr);
+  GtkTargetEntry targets[] = {
+      {const_cast<gchar*>("text/uri-list"), 0, 0},
+  };
+  gtk_drag_dest_set(GTK_WIDGET(view), GTK_DEST_DEFAULT_ALL, targets, 1,
+                    GDK_ACTION_COPY);
+  g_signal_connect(view, "drag-data-received",
+                   G_CALLBACK(asset_drag_data_received_cb), self);
+}
+
 // Called when first Flutter frame received.
 static void first_frame_cb(MyApplication* self, FlView* view) {
   gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view)));
@@ -2845,7 +2963,13 @@ static void my_application_activate(GApplication* application) {
   GtkWidget* window_content = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start(GTK_BOX(window_content), self->titlebar_handle, FALSE,
                      FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(window_content), GTK_WIDGET(view), TRUE, TRUE, 0);
+  self->flutter_overlay = gtk_overlay_new();
+  gtk_widget_set_hexpand(self->flutter_overlay, TRUE);
+  gtk_widget_set_vexpand(self->flutter_overlay, TRUE);
+  gtk_container_add(GTK_CONTAINER(self->flutter_overlay), GTK_WIDGET(view));
+  gtk_widget_show(self->flutter_overlay);
+  gtk_box_pack_start(GTK_BOX(window_content), self->flutter_overlay, TRUE,
+                     TRUE, 0);
   gtk_widget_show(window_content);
   gtk_container_add(GTK_CONTAINER(window), window_content);
 
@@ -2856,11 +2980,15 @@ static void my_application_activate(GApplication* application) {
   fl_register_plugins(FL_PLUGIN_REGISTRY(view));
   register_header_bar_channel(self, view);
   register_native_menu_channel(self, view);
+  register_asset_input_channel(self, view);
   self->secure_credential_channel =
       busymark_secure_credential_channel_new(view);
   self->visualization_host =
       busymark_web_render_host_new(GTK_APPLICATION(self), window);
   busymark_web_render_host_register_channel(self->visualization_host, view);
+  self->video_player_host =
+      busymark_video_player_host_new(self->flutter_overlay);
+  busymark_video_player_host_register_channel(self->video_player_host, view);
 
   gtk_widget_grab_focus(GTK_WIDGET(view));
   schedule_header_bar_focus_state_refresh(self);
@@ -2917,11 +3045,16 @@ static void my_application_dispose(GObject* object) {
   g_clear_object(&self->header_bar_css_provider);
   g_clear_object(&self->header_bar_channel);
   g_clear_object(&self->native_menu_channel);
+  g_clear_object(&self->asset_input_channel);
   g_clear_object(&self->secure_credential_channel);
   if (self->visualization_host != nullptr) {
     busymark_web_render_host_shutdown(self->visualization_host);
   }
   g_clear_object(&self->visualization_host);
+  if (self->video_player_host != nullptr) {
+    busymark_video_player_host_shutdown(self->video_player_host);
+  }
+  g_clear_object(&self->video_player_host);
   g_clear_object(&self->main_menu_model);
   g_clear_object(&self->view_mode_menu_model);
   g_clear_object(&self->view_mode_action);
@@ -2955,11 +3088,14 @@ static void my_application_init(MyApplication* self) {
   self->dart_entrypoint_arguments = nullptr;
   self->header_bar_channel = nullptr;
   self->native_menu_channel = nullptr;
+  self->asset_input_channel = nullptr;
   self->secure_credential_channel = nullptr;
   self->visualization_host = nullptr;
+  self->video_player_host = nullptr;
   self->header_bar_css_provider = nullptr;
   self->main_window = nullptr;
   self->flutter_view = nullptr;
+  self->flutter_overlay = nullptr;
   self->titlebar_handle = nullptr;
   self->titlebar_box = nullptr;
   self->titlebar_overlay = nullptr;
diff --git a/linux/runner/video_player_host.cc b/linux/runner/video_player_host.cc
new file mode 100644
index 00000000..42e4d80b
--- /dev/null
+++ b/linux/runner/video_player_host.cc
@@ -0,0 +1,668 @@
+#include "video_player_host.h"
+
+#include <webkit2/webkit2.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+
+namespace {
+
+constexpr char kChannelName[] = "com.busymark.app/video_player";
+constexpr gdouble kMinimumPlayerSize = 24.0;
+constexpr gdouble kMaximumPlayerSize = 8192.0;
+constexpr gdouble kMaximumPlayerCoordinate = 32768.0;
+constexpr gsize kMaximumPlayerIdLength = 128;
+constexpr gsize kMaximumSourceLength = 8192;
+constexpr gsize kMaximumLabelLength = 256;
+// Hosted players require an HTTPS page identity. In particular, YouTube
+// rejects embeds without an HTTP Referer (player error 153). BusyMark's
+// published homepage is its source repository, so use that stable identity
+// instead of the opaque about:blank origin produced by load_html().
+constexpr char kHostedPlayerBaseUri[] =
+    "https://github.com/busystack/busymark/";
+constexpr char kHostedPlayerOriginParameter[] =
+    "https%3A%2F%2Fgithub.com";
+
+enum class PlayerKind { kLocalFile, kYoutube, kVimeo };
+
+struct VideoPlayer {
+  GtkWidget* web_view;
+  PlayerKind kind;
+  gchar* allowed_local_uri;
+};
+
+struct PlayerGeometry {
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+};
+
+void video_player_free(gpointer data) {
+  auto* player = static_cast<VideoPlayer*>(data);
+  if (player == nullptr) {
+    return;
+  }
+  if (player->web_view != nullptr && GTK_IS_WIDGET(player->web_view)) {
+    gtk_widget_destroy(player->web_view);
+  }
+  g_free(player->allowed_local_uri);
+  g_free(player);
+}
+
+const gchar* lookup_string(FlValue* args, const gchar* key) {
+  if (args == nullptr || fl_value_get_type(args) != FL_VALUE_TYPE_MAP) {
+    return nullptr;
+  }
+  FlValue* value = fl_value_lookup_string(args, key);
+  return value != nullptr && fl_value_get_type(value) == FL_VALUE_TYPE_STRING
+             ? fl_value_get_string(value)
+             : nullptr;
+}
+
+gboolean lookup_double(FlValue* args,
+                       const gchar* key,
+                       gdouble* value_out) {
+  if (args == nullptr || fl_value_get_type(args) != FL_VALUE_TYPE_MAP) {
+    return FALSE;
+  }
+  FlValue* value = fl_value_lookup_string(args, key);
+  if (value == nullptr) {
+    return FALSE;
+  }
+  if (fl_value_get_type(value) == FL_VALUE_TYPE_FLOAT) {
+    *value_out = fl_value_get_float(value);
+    return TRUE;
+  }
+  if (fl_value_get_type(value) == FL_VALUE_TYPE_INT) {
+    *value_out = static_cast<gdouble>(fl_value_get_int(value));
+    return TRUE;
+  }
+  return FALSE;
+}
+
+gboolean lookup_bool(FlValue* args,
+                     const gchar* key,
+                     gboolean* value_out) {
+  if (args == nullptr || fl_value_get_type(args) != FL_VALUE_TYPE_MAP) {
+    return FALSE;
+  }
+  FlValue* value = fl_value_lookup_string(args, key);
+  if (value == nullptr || fl_value_get_type(value) != FL_VALUE_TYPE_BOOL) {
+    return FALSE;
+  }
+  *value_out = fl_value_get_bool(value);
+  return TRUE;
+}
+
+void respond_bool(FlMethodCall* method_call, gboolean value) {
+  g_autoptr(FlValue) result = fl_value_new_bool(value);
+  fl_method_call_respond_success(method_call, result, nullptr);
+}
+
+void respond_error(FlMethodCall* method_call,
+                   const gchar* code,
+                   const gchar* message) {
+  fl_method_call_respond_error(method_call, code, message, nullptr, nullptr);
+}
+
+gboolean is_valid_player_id(const gchar* value) {
+  if (value == nullptr || value[0] == '\0') {
+    return FALSE;
+  }
+  const gsize length = strlen(value);
+  if (length > kMaximumPlayerIdLength) {
+    return FALSE;
+  }
+  for (gsize index = 0; index < length; index++) {
+    if (!g_ascii_isalnum(value[index]) && value[index] != '-' &&
+        value[index] != '_') {
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
+
+gboolean is_valid_youtube_id(const gchar* value) {
+  if (value == nullptr) {
+    return FALSE;
+  }
+  const gsize length = strlen(value);
+  if (length < 6 || length > 64) {
+    return FALSE;
+  }
+  for (gsize index = 0; index < length; index++) {
+    if (!g_ascii_isalnum(value[index]) && value[index] != '-' &&
+        value[index] != '_') {
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
+
+gboolean is_valid_vimeo_id(const gchar* value) {
+  if (value == nullptr) {
+    return FALSE;
+  }
+  const gsize length = strlen(value);
+  if (length == 0 || length > 20) {
+    return FALSE;
+  }
+  for (gsize index = 0; index < length; index++) {
+    if (!g_ascii_isdigit(value[index])) {
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
+
+gboolean has_video_extension(const gchar* path) {
+  g_autofree gchar* lower = g_ascii_strdown(path, -1);
+  return g_str_has_suffix(lower, ".avi") ||
+         g_str_has_suffix(lower, ".m4v") ||
+         g_str_has_suffix(lower, ".mkv") ||
+         g_str_has_suffix(lower, ".mov") ||
+         g_str_has_suffix(lower, ".mp4") ||
+         g_str_has_suffix(lower, ".ogv") ||
+         g_str_has_suffix(lower, ".webm");
+}
+
+gchar* validated_local_uri(const gchar* path) {
+  if (path == nullptr || path[0] != '/' || strlen(path) > kMaximumSourceLength ||
+      !has_video_extension(path)) {
+    return nullptr;
+  }
+  char* resolved = realpath(path, nullptr);
+  if (resolved == nullptr || !g_file_test(resolved, G_FILE_TEST_IS_REGULAR)) {
+    std::free(resolved);
+    return nullptr;
+  }
+  g_autoptr(GError) error = nullptr;
+  gchar* uri = g_filename_to_uri(resolved, nullptr, &error);
+  std::free(resolved);
+  return error == nullptr ? uri : nullptr;
+}
+
+gboolean decode_geometry(FlValue* args, PlayerGeometry* geometry) {
+  if (!lookup_double(args, "x", &geometry->x) ||
+      !lookup_double(args, "y", &geometry->y) ||
+      !lookup_double(args, "width", &geometry->width) ||
+      !lookup_double(args, "height", &geometry->height)) {
+    return FALSE;
+  }
+  return std::isfinite(geometry->x) && std::isfinite(geometry->y) &&
+         std::isfinite(geometry->width) && std::isfinite(geometry->height) &&
+         geometry->x >= 0 && geometry->y >= 0 &&
+         geometry->x <= kMaximumPlayerCoordinate &&
+         geometry->y <= kMaximumPlayerCoordinate &&
+         geometry->width >= kMinimumPlayerSize &&
+         geometry->height >= kMinimumPlayerSize &&
+         geometry->width <= kMaximumPlayerSize &&
+         geometry->height <= kMaximumPlayerSize;
+}
+
+void apply_geometry(GtkWidget* widget, const PlayerGeometry& geometry) {
+  gtk_widget_set_halign(widget, GTK_ALIGN_START);
+  gtk_widget_set_valign(widget, GTK_ALIGN_START);
+  gtk_widget_set_margin_start(widget, static_cast<gint>(std::round(geometry.x)));
+  gtk_widget_set_margin_top(widget, static_cast<gint>(std::round(geometry.y)));
+  gtk_widget_set_size_request(widget,
+                              static_cast<gint>(std::round(geometry.width)),
+                              static_cast<gint>(std::round(geometry.height)));
+}
+
+gboolean host_matches(const gchar* host, const gchar* suffix) {
+  if (host == nullptr || suffix == nullptr) {
+    return FALSE;
+  }
+  if (g_ascii_strcasecmp(host, suffix) == 0) {
+    return TRUE;
+  }
+  const gsize host_length = strlen(host);
+  const gsize suffix_length = strlen(suffix);
+  return host_length > suffix_length &&
+         host[host_length - suffix_length - 1] == '.' &&
+         g_ascii_strcasecmp(host + host_length - suffix_length, suffix) == 0;
+}
+
+gboolean is_embedded_service_host(PlayerKind kind, const gchar* host) {
+  if (kind == PlayerKind::kYoutube) {
+    return host_matches(host, "youtube-nocookie.com") ||
+           host_matches(host, "youtube.com") ||
+           host_matches(host, "googlevideo.com") ||
+           host_matches(host, "ytimg.com") ||
+           host_matches(host, "gstatic.com") ||
+           host_matches(host, "google.com") ||
+           g_ascii_strcasecmp(host, "jnn-pa.googleapis.com") == 0 ||
+           g_ascii_strcasecmp(host, "yt3.ggpht.com") == 0;
+  }
+  if (kind == PlayerKind::kVimeo) {
+    return host_matches(host, "vimeo.com") ||
+           host_matches(host, "vimeocdn.com") ||
+           host_matches(host, "akamaized.net") ||
+           host_matches(host, "cloudfront.net");
+  }
+  return FALSE;
+}
+
+gboolean is_allowed_player_uri(PlayerKind kind,
+                               const gchar* allowed_local_uri,
+                               const gchar* uri) {
+  if (uri == nullptr) {
+    return FALSE;
+  }
+  if (g_str_has_prefix(uri, "about:blank") ||
+      g_str_has_prefix(uri, "data:") || g_str_has_prefix(uri, "blob:")) {
+    return TRUE;
+  }
+  if (kind == PlayerKind::kLocalFile) {
+    // load_html() uses this exact URI for BusyMark's fixed local-player shell.
+    // It does not grant access to any path below the filesystem root.
+    if (g_strcmp0(uri, "file:///") == 0) {
+      return TRUE;
+    }
+    return allowed_local_uri != nullptr &&
+           g_strcmp0(uri, allowed_local_uri) == 0;
+  }
+  // This exact URI identifies BusyMark's in-memory hosted-player shell. No
+  // network request is made for it by load_html().
+  if (g_strcmp0(uri, kHostedPlayerBaseUri) == 0) {
+    return TRUE;
+  }
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(GUri) parsed = g_uri_parse(uri, G_URI_FLAGS_NONE, &error);
+  return parsed != nullptr &&
+         g_ascii_strcasecmp(g_uri_get_scheme(parsed), "https") == 0 &&
+         is_embedded_service_host(kind, g_uri_get_host(parsed));
+}
+
+void resource_load_started_cb(WebKitWebView*,
+                              WebKitWebResource*,
+                              WebKitURIRequest* request,
+                              gpointer user_data) {
+  auto* player = static_cast<VideoPlayer*>(user_data);
+  const gchar* uri = webkit_uri_request_get_uri(request);
+  if (!is_allowed_player_uri(player->kind, player->allowed_local_uri, uri)) {
+    // resource-load-started exposes the request before it is sent. Replacing a
+    // rejected request with about:blank keeps it inside the fixed player shell
+    // without relying on a nonexistent WebKitWebResource::send-request signal.
+    webkit_uri_request_set_uri(request, "about:blank");
+    return;
+  }
+  if (player->kind != PlayerKind::kYoutube) {
+    return;
+  }
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(GUri) parsed = g_uri_parse(uri, G_URI_FLAGS_NONE, &error);
+  if (parsed == nullptr ||
+      !host_matches(g_uri_get_host(parsed), "youtube-nocookie.com")) {
+    return;
+  }
+  SoupMessageHeaders* headers = webkit_uri_request_get_http_headers(request);
+  if (headers != nullptr) {
+    soup_message_headers_replace(headers, "Referer", kHostedPlayerBaseUri);
+  }
+}
+
+gboolean decide_policy_cb(WebKitWebView* web_view,
+                          WebKitPolicyDecision* decision,
+                          WebKitPolicyDecisionType type,
+                          gpointer user_data) {
+  if (type != WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION) {
+    return FALSE;
+  }
+  auto* player = static_cast<VideoPlayer*>(user_data);
+  auto* navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION(decision);
+  WebKitNavigationAction* action =
+      webkit_navigation_policy_decision_get_navigation_action(
+          navigation_decision);
+  const WebKitNavigationType navigation_type =
+      webkit_navigation_action_get_navigation_type(action);
+  WebKitURIRequest* request =
+      webkit_navigation_action_get_request(action);
+  const gchar* uri = webkit_uri_request_get_uri(request);
+  const gchar* current_uri = webkit_web_view_get_uri(web_view);
+  const gboolean initial_load = current_uri == nullptr;
+  if (!is_allowed_player_uri(player->kind, player->allowed_local_uri, uri) ||
+      (!initial_load && navigation_type != WEBKIT_NAVIGATION_TYPE_RELOAD &&
+       navigation_type != WEBKIT_NAVIGATION_TYPE_OTHER)) {
+    webkit_policy_decision_ignore(decision);
+    return TRUE;
+  }
+  return FALSE;
+}
+
+GtkWidget* create_web_view_cb(WebKitWebView*,
+                              WebKitNavigationAction*,
+                              gpointer) {
+  return nullptr;
+}
+
+gboolean permission_request_cb(WebKitWebView*,
+                               WebKitPermissionRequest* request,
+                               gpointer) {
+  webkit_permission_request_deny(request);
+  return TRUE;
+}
+
+gboolean context_menu_cb(WebKitWebView*,
+                         WebKitContextMenu*,
+                         GdkEvent*,
+                         WebKitHitTestResult*,
+                         gpointer) {
+  return TRUE;
+}
+
+WebKitSettings* create_player_settings() {
+  WebKitSettings* settings = webkit_settings_new();
+  webkit_settings_set_enable_javascript(settings, TRUE);
+  webkit_settings_set_enable_html5_local_storage(settings, FALSE);
+  webkit_settings_set_enable_html5_database(settings, FALSE);
+  webkit_settings_set_javascript_can_open_windows_automatically(settings,
+                                                                FALSE);
+  webkit_settings_set_enable_developer_extras(settings, FALSE);
+  webkit_settings_set_enable_page_cache(settings, FALSE);
+  webkit_settings_set_enable_site_specific_quirks(settings, FALSE);
+  webkit_settings_set_enable_media_stream(settings, FALSE);
+  webkit_settings_set_enable_mediasource(settings, TRUE);
+  webkit_settings_set_enable_media(settings, TRUE);
+  webkit_settings_set_enable_webrtc(settings, FALSE);
+  // The host itself is created only after BusyMark's Flutter Play action.
+  // Permit that already-authorized action to start playback without requiring
+  // an artificial second click inside the newly created native child.
+  webkit_settings_set_media_playback_requires_user_gesture(settings, FALSE);
+  webkit_settings_set_enable_back_forward_navigation_gestures(settings,
+                                                              FALSE);
+  return settings;
+}
+
+gchar* player_html(PlayerKind kind,
+                   const gchar* value,
+                   const gchar* local_uri,
+                   gboolean mini_player,
+                   const gchar* play_label,
+                   const gchar* pause_label,
+                   const gchar* border_effect) {
+  constexpr char kHeadTemplate[] =
+      "<!doctype html><html><head><meta charset=\"utf-8\">"
+      "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\">"
+      "<meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'none';"
+      "style-src 'unsafe-inline'; script-src 'unsafe-inline'; media-src file: blob:;"
+      "frame-src https://www.youtube-nocookie.com https://player.vimeo.com;"
+      "connect-src 'none'; img-src data: blob:\">"
+      "<style>html,body{margin:0;width:100%%;height:100%%;overflow:hidden;"
+      "background:#000;color:#fff}video,iframe{display:block;border:0;width:100%%;"
+      "height:100%%}button{position:absolute;inset:0;margin:auto;width:64px;"
+      "height:64px;border:1px solid #ffffff80;border-radius:50%%;background:#111d;"
+      "color:#fff;font:28px sans-serif}body.line,body.rounded{box-sizing:border-box;"
+      "border:1px solid #666}body.rounded{border-radius:8px}body.rounded video,"
+      "body.rounded iframe{border-radius:7px}</style></head><body class=\"%s\">";
+  constexpr char kTail[] = "</body></html>";
+  g_autofree gchar* head = g_strdup_printf(kHeadTemplate, border_effect);
+  if (kind == PlayerKind::kLocalFile) {
+    g_autofree gchar* escaped_uri = g_markup_escape_text(local_uri, -1);
+    if (mini_player) {
+      g_autofree gchar* escaped_play_label =
+          g_markup_escape_text(play_label, -1);
+      g_autofree gchar* escaped_pause_label =
+          g_markup_escape_text(pause_label, -1);
+      return g_strdup_printf(
+          "%s<video id=\"v\" autoplay playsinline preload=\"metadata\" src=\"%s\">"
+          "</video><button id=\"p\" aria-label=\"%s\" data-play=\"%s\" "
+          "data-pause=\"%s\">&#9654;</button>"
+          "<script>const v=document.getElementById('v'),p=document.getElementById('p');"
+          "p.onclick=()=>v.paused?v.play():v.pause();"
+          "v.onplay=()=>{p.textContent='❚❚';p.setAttribute('aria-label',p.dataset.pause)};"
+          "v.onpause=()=>{p.textContent='▶';p.setAttribute('aria-label',p.dataset.play)};"
+          "</script>%s",
+          head, escaped_uri, escaped_play_label, escaped_play_label,
+          escaped_pause_label, kTail);
+    }
+    return g_strdup_printf(
+        "%s<video autoplay controls playsinline preload=\"metadata\" src=\"%s\">"
+        "</video>%s",
+        head, escaped_uri, kTail);
+  }
+  if (kind == PlayerKind::kYoutube) {
+    return g_strdup_printf(
+        "%s<iframe allow=\"autoplay; encrypted-media; picture-in-picture\" "
+        "referrerpolicy=\"strict-origin-when-cross-origin\" allowfullscreen "
+        "src=\"https://www.youtube-nocookie.com/embed/%s?autoplay=1&playsinline=1&rel=0&"
+        "controls=%d&origin=%s\"></iframe>%s",
+        head, value, mini_player ? 0 : 1, kHostedPlayerOriginParameter, kTail);
+  }
+  return g_strdup_printf(
+      "%s<iframe allow=\"autoplay; encrypted-media; picture-in-picture\" "
+      "referrerpolicy=\"strict-origin-when-cross-origin\" allowfullscreen "
+      "src=\"https://player.vimeo.com/video/%s?autoplay=1&dnt=1&controls=%d\"></iframe>%s",
+      head, value, mini_player ? 0 : 1, kTail);
+}
+
+}  // namespace
+
+struct _BusyMarkVideoPlayerHost {
+  GObject parent_instance;
+  GtkWidget* overlay;
+  FlMethodChannel* channel;
+  WebKitWebContext* context;
+  GHashTable* players;
+  gboolean shutting_down;
+};
+
+G_DEFINE_TYPE(BusyMarkVideoPlayerHost,
+              busymark_video_player_host,
+              G_TYPE_OBJECT)
+
+namespace {
+
+VideoPlayer* create_player(BusyMarkVideoPlayerHost* self,
+                           PlayerKind kind,
+                           const gchar* value,
+                           gchar* local_uri,
+                           gboolean mini_player,
+                           const gchar* play_label,
+                           const gchar* pause_label,
+                           const gchar* border_effect) {
+  auto* player = g_new0(VideoPlayer, 1);
+  player->kind = kind;
+  player->allowed_local_uri = local_uri;
+  player->web_view = webkit_web_view_new_with_context(self->context);
+  g_autoptr(WebKitSettings) settings = create_player_settings();
+  webkit_web_view_set_settings(WEBKIT_WEB_VIEW(player->web_view), settings);
+  GdkRGBA black = {};
+  gdk_rgba_parse(&black, "#000000");
+  webkit_web_view_set_background_color(WEBKIT_WEB_VIEW(player->web_view),
+                                       &black);
+  g_signal_connect(player->web_view, "decide-policy",
+                   G_CALLBACK(decide_policy_cb), player);
+  g_signal_connect(player->web_view, "create", G_CALLBACK(create_web_view_cb),
+                   player);
+  g_signal_connect(player->web_view, "permission-request",
+                   G_CALLBACK(permission_request_cb), player);
+  g_signal_connect(player->web_view, "context-menu",
+                   G_CALLBACK(context_menu_cb), player);
+  g_signal_connect(player->web_view, "resource-load-started",
+                   G_CALLBACK(resource_load_started_cb), player);
+  g_autofree gchar* html =
+      player_html(kind, value, local_uri, mini_player, play_label, pause_label,
+                  border_effect);
+  webkit_web_view_load_html(WEBKIT_WEB_VIEW(player->web_view), html,
+                            kind == PlayerKind::kLocalFile ? "file:///"
+                                                          : kHostedPlayerBaseUri);
+  return player;
+}
+
+gboolean show_player(BusyMarkVideoPlayerHost* self,
+                     FlValue* args,
+                     const gchar** error_message) {
+  const gchar* player_id = lookup_string(args, "playerId");
+  const gchar* kind_value = lookup_string(args, "kind");
+  const gchar* value = lookup_string(args, "value");
+  const gchar* play_label = lookup_string(args, "playLabel");
+  const gchar* pause_label = lookup_string(args, "pauseLabel");
+  const gchar* border_effect = lookup_string(args, "borderEffect");
+  gboolean mini_player = FALSE;
+  PlayerGeometry geometry = {};
+  if (!is_valid_player_id(player_id) || kind_value == nullptr ||
+      value == nullptr || strlen(value) > kMaximumSourceLength ||
+      play_label == nullptr || play_label[0] == '\0' ||
+      strlen(play_label) > kMaximumLabelLength ||
+      !g_utf8_validate(play_label, -1, nullptr) || pause_label == nullptr ||
+      pause_label[0] == '\0' || strlen(pause_label) > kMaximumLabelLength ||
+      !g_utf8_validate(pause_label, -1, nullptr) ||
+      border_effect == nullptr ||
+      (g_strcmp0(border_effect, "none") != 0 &&
+       g_strcmp0(border_effect, "line") != 0 &&
+       g_strcmp0(border_effect, "rounded") != 0) ||
+      !lookup_bool(args, "miniPlayer", &mini_player) ||
+      !decode_geometry(args, &geometry)) {
+    *error_message = "The video player request is invalid.";
+    return FALSE;
+  }
+
+  PlayerKind kind;
+  gchar* local_uri = nullptr;
+  if (g_strcmp0(kind_value, "localFile") == 0) {
+    kind = PlayerKind::kLocalFile;
+    local_uri = validated_local_uri(value);
+    if (local_uri == nullptr) {
+      *error_message = "The local video path is unavailable or unsafe.";
+      return FALSE;
+    }
+  } else if (g_strcmp0(kind_value, "youtube") == 0 &&
+             is_valid_youtube_id(value)) {
+    kind = PlayerKind::kYoutube;
+  } else if (g_strcmp0(kind_value, "vimeo") == 0 &&
+             is_valid_vimeo_id(value)) {
+    kind = PlayerKind::kVimeo;
+  } else {
+    *error_message = "The hosted video identifier is invalid.";
+    return FALSE;
+  }
+
+  g_hash_table_remove(self->players, player_id);
+  VideoPlayer* player =
+      create_player(self, kind, value, local_uri, mini_player, play_label,
+                    pause_label, border_effect);
+  apply_geometry(player->web_view, geometry);
+  gtk_overlay_add_overlay(GTK_OVERLAY(self->overlay), player->web_view);
+  gtk_overlay_set_overlay_pass_through(GTK_OVERLAY(self->overlay),
+                                       player->web_view, FALSE);
+  gtk_widget_show(player->web_view);
+  g_hash_table_insert(self->players, g_strdup(player_id), player);
+  return TRUE;
+}
+
+void method_call_cb(FlMethodChannel*,
+                    FlMethodCall* method_call,
+                    gpointer user_data) {
+  auto* self = BUSYMARK_VIDEO_PLAYER_HOST(user_data);
+  const gchar* method = fl_method_call_get_name(method_call);
+  FlValue* args = fl_method_call_get_args(method_call);
+  if (self->shutting_down) {
+    respond_bool(method_call, FALSE);
+    return;
+  }
+  if (g_strcmp0(method, "show") == 0) {
+    const gchar* message = nullptr;
+    if (!show_player(self, args, &message)) {
+      respond_error(method_call, "video.invalidRequest", message);
+      return;
+    }
+    respond_bool(method_call, TRUE);
+    return;
+  }
+  const gchar* player_id = lookup_string(args, "playerId");
+  if (!is_valid_player_id(player_id)) {
+    respond_error(method_call, "video.invalidRequest",
+                  "The video player identifier is invalid.");
+    return;
+  }
+  if (g_strcmp0(method, "hide") == 0) {
+    g_hash_table_remove(self->players, player_id);
+    respond_bool(method_call, TRUE);
+    return;
+  }
+  if (g_strcmp0(method, "update") == 0) {
+    PlayerGeometry geometry = {};
+    auto* player = static_cast<VideoPlayer*>(
+        g_hash_table_lookup(self->players, player_id));
+    if (player == nullptr || !decode_geometry(args, &geometry)) {
+      respond_bool(method_call, FALSE);
+      return;
+    }
+    apply_geometry(player->web_view, geometry);
+    respond_bool(method_call, TRUE);
+    return;
+  }
+  fl_method_call_respond_not_implemented(method_call, nullptr);
+}
+
+}  // namespace
+
+BusyMarkVideoPlayerHost* busymark_video_player_host_new(GtkWidget* overlay) {
+  g_return_val_if_fail(GTK_IS_OVERLAY(overlay), nullptr);
+  auto* self = BUSYMARK_VIDEO_PLAYER_HOST(
+      g_object_new(busymark_video_player_host_get_type(), nullptr));
+  self->overlay = overlay;
+  self->context = webkit_web_context_new_ephemeral();
+  webkit_web_context_set_cache_model(self->context,
+                                     WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+  webkit_web_context_set_spell_checking_enabled(self->context, FALSE);
+  webkit_web_context_set_sandbox_enabled(self->context, TRUE);
+  WebKitCookieManager* cookie_manager =
+      webkit_web_context_get_cookie_manager(self->context);
+  webkit_cookie_manager_set_accept_policy(cookie_manager,
+                                          WEBKIT_COOKIE_POLICY_ACCEPT_NEVER);
+  return self;
+}
+
+void busymark_video_player_host_register_channel(
+    BusyMarkVideoPlayerHost* self,
+    FlView* view) {
+  g_return_if_fail(BUSYMARK_IS_VIDEO_PLAYER_HOST(self));
+  g_return_if_fail(FL_IS_VIEW(view));
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  self->channel = fl_method_channel_new(
+      fl_engine_get_binary_messenger(fl_view_get_engine(view)), kChannelName,
+      FL_METHOD_CODEC(codec));
+  fl_method_channel_set_method_call_handler(self->channel, method_call_cb,
+                                            self, nullptr);
+}
+
+void busymark_video_player_host_shutdown(BusyMarkVideoPlayerHost* self) {
+  g_return_if_fail(BUSYMARK_IS_VIDEO_PLAYER_HOST(self));
+  if (self->shutting_down) {
+    return;
+  }
+  self->shutting_down = TRUE;
+  g_hash_table_remove_all(self->players);
+}
+
+static void busymark_video_player_host_dispose(GObject* object) {
+  auto* self = BUSYMARK_VIDEO_PLAYER_HOST(object);
+  busymark_video_player_host_shutdown(self);
+  g_clear_object(&self->channel);
+  g_clear_object(&self->context);
+  self->overlay = nullptr;
+  G_OBJECT_CLASS(busymark_video_player_host_parent_class)->dispose(object);
+}
+
+static void busymark_video_player_host_finalize(GObject* object) {
+  auto* self = BUSYMARK_VIDEO_PLAYER_HOST(object);
+  g_clear_pointer(&self->players, g_hash_table_unref);
+  G_OBJECT_CLASS(busymark_video_player_host_parent_class)->finalize(object);
+}
+
+static void busymark_video_player_host_class_init(
+    BusyMarkVideoPlayerHostClass* klass) {
+  GObjectClass* object_class = G_OBJECT_CLASS(klass);
+  object_class->dispose = busymark_video_player_host_dispose;
+  object_class->finalize = busymark_video_player_host_finalize;
+}
+
+static void busymark_video_player_host_init(BusyMarkVideoPlayerHost* self) {
+  self->players =
+      g_hash_table_new_full(g_str_hash, g_str_equal, g_free, video_player_free);
+}
diff --git a/linux/runner/video_player_host.h b/linux/runner/video_player_host.h
new file mode 100644
index 00000000..248c20ca
--- /dev/null
+++ b/linux/runner/video_player_host.h
@@ -0,0 +1,21 @@
+#ifndef BUSYMARK_VIDEO_PLAYER_HOST_H_
+#define BUSYMARK_VIDEO_PLAYER_HOST_H_
+
+#include <flutter_linux/flutter_linux.h>
+#include <gtk/gtk.h>
+
+G_DECLARE_FINAL_TYPE(BusyMarkVideoPlayerHost,
+                     busymark_video_player_host,
+                     BUSYMARK,
+                     VIDEO_PLAYER_HOST,
+                     GObject)
+
+BusyMarkVideoPlayerHost* busymark_video_player_host_new(GtkWidget* overlay);
+
+void busymark_video_player_host_register_channel(
+    BusyMarkVideoPlayerHost* self,
+    FlView* view);
+
+void busymark_video_player_host_shutdown(BusyMarkVideoPlayerHost* self);
+
+#endif  // BUSYMARK_VIDEO_PLAYER_HOST_H_
diff --git a/linux/runner/web_render_host.cc b/linux/runner/web_render_host.cc
index 07f15cec..327375c0 100644
--- a/linux/runner/web_render_host.cc
+++ b/linux/runner/web_render_host.cc
@@ -711,7 +711,8 @@ gchar* encode_arguments(FlValue* args, GError** error) {
 }
 
 gboolean is_render_operation(const gchar* method) {
-  return g_strcmp0(method, "renderMermaid") == 0 ||
+  return g_strcmp0(method, "renderMathBatch") == 0 ||
+         g_strcmp0(method, "renderMermaid") == 0 ||
          g_strcmp0(method, "renderPlantUml") == 0 ||
          g_strcmp0(method, "inspectOpenApi") == 0 ||
          g_strcmp0(method, "parseOpenApi") == 0 ||
@@ -966,14 +967,9 @@ BusyMarkWebRenderHost* busymark_web_render_host_new(
   webkit_web_context_set_cache_model(self->context,
                                      WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
   webkit_web_context_set_spell_checking_enabled(self->context, FALSE);
-  // The auto-connected Snap browser-support interface uses allow-sandbox:
-  // false. Inside that package, snapd's strict AppArmor/seccomp confinement is
-  // the outer sandbox; everywhere else retain WebKit's subprocess sandbox.
-  const gchar* snap_root = g_getenv("SNAP");
-  const gboolean strictly_confined_snap =
-      snap_root != nullptr && snap_root[0] != '\0';
-  webkit_web_context_set_sandbox_enabled(self->context,
-                                         !strictly_confined_snap);
+  // Retain WebKit's subprocess sandbox as an independent defense-in-depth
+  // boundary inside both strict Snap and conventional Linux packages.
+  webkit_web_context_set_sandbox_enabled(self->context, TRUE);
   webkit_web_context_register_uri_scheme(self->context, kScheme,
                                          uri_scheme_request_cb, self,
                                          nullptr);
diff --git a/pubspec.yaml b/pubspec.yaml
index 0654da4d..1e6ebb48 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: busymark
 description: Local-first Markdown and Writerside-compatible documentation editor.
 publish_to: 'none'
-version: 0.3.0
+version: 0.3.1
 
 environment:
   sdk: ^3.12.1
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7e638221..9c03c3dd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: busymark
 title: BusyMark
-version: "0.3.0"
+version: "0.3.1"
 summary: Markdown and Writerside documentation editor
 # Snap Store listing translations are managed outside this Flutter package.
 # Update store metadata when approved translated listing text is supplied.
@@ -39,6 +39,7 @@ apps:
       - desktop
       - desktop-legacy
       - browser-support
+      - audio-playback
       - gsettings
       - opengl
       - wayland
@@ -57,6 +58,8 @@ apps:
 parts:
   busymark:
     plugin: flutter
+    build-attributes:
+      - enable-patchelf
     source: .
     flutter-target: lib/main.dart
     flutter-channel: stable
@@ -72,6 +75,12 @@ parts:
       - libhandy-1-0
       - libsecret-1-0
       - libwebkit2gtk-4.1-0
+      - libgtk-3-0t64
+      - gstreamer1.0-libav
+      - gstreamer1.0-plugins-bad
+      - gstreamer1.0-plugins-base
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-plugins-ugly
       - libx11-6
       - libxdamage1
       - libxext6
@@ -91,9 +100,35 @@ parts:
       rm -rf "$CRAFT_PART_BUILD/build"
       rm -rf "$CRAFT_PART_BUILD/.dart_tool"
       rm -rf "$CRAFT_PART_BUILD/linux/flutter/ephemeral"
-      craftctl default
+      if [ ! -x "$CRAFT_PART_BUILD/flutter-distro/bin/flutter" ]; then
+        git clone --depth 1 -b stable https://github.com/flutter/flutter.git \
+          "$CRAFT_PART_BUILD/flutter-distro"
+      fi
+      export CI=true
+      flutter --no-version-check precache --linux
+      flutter --no-version-check pub get
+      flutter --no-version-check build linux --release --verbose \
+        --target lib/main.dart
+      cp -r build/linux/*/release/bundle/* "$CRAFT_PART_INSTALL/"
+
+  desktop-integration:
+    after: [busymark]
+    plugin: nil
+    build-packages:
+      - patchelf
     override-prime: |
       craftctl default
+      # Drop a stale plugin that is not part of BusyMark's dependency graph.
+      rm -f "$CRAFT_PRIME/lib/libflutter_secure_storage_linux_plugin.so"
+      # Keep the library's own directory alongside its two BLAS siblings.
+      patchelf --set-rpath \
+        '$ORIGIN/lapack:$ORIGIN/blas:$ORIGIN:/snap/core24/current/lib/x86_64-linux-gnu' \
+        "$CRAFT_PRIME/usr/lib/x86_64-linux-gnu/libsphinxbase.so.3.0.0"
+      # libcaca's optional OpenGL backend is unused and pulls in GLUT/GLU.
+      rm -f \
+        "$CRAFT_PRIME/usr/lib/x86_64-linux-gnu/caca/libgl_plugin.so" \
+        "$CRAFT_PRIME/usr/lib/x86_64-linux-gnu/caca/libgl_plugin.so.0" \
+        "$CRAFT_PRIME/usr/lib/x86_64-linux-gnu/caca/libgl_plugin.so.0.0.0"
       mkdir -p "$CRAFT_PRIME/share/themes" "$CRAFT_PRIME/share/icons"
       cp -a "$CRAFT_PRIME/usr/share/themes"/Yaru* "$CRAFT_PRIME/share/themes/"
       cp -a "$CRAFT_PRIME/usr/share/icons"/Yaru* "$CRAFT_PRIME/share/icons/"
diff --git a/test/fixtures/markdown/writerside_markdown.md b/test/fixtures/markdown/writerside_markdown.md
index c0cc2e17..eb9d3111 100644
--- a/test/fixtures/markdown/writerside_markdown.md
+++ b/test/fixtures/markdown/writerside_markdown.md
@@ -3,7 +3,7 @@
 <var name="product" value="BusyMark"/>
 
 > Use %product% for docs.
-> {style="note"}
+{style="note"}
 
 <tabs>
 <tab title="Dart">
diff --git a/test/fixtures/writerside/basic_project/topics/math.topic b/test/fixtures/writerside/basic_project/topics/math.topic
new file mode 100644
index 00000000..231d91f6
--- /dev/null
+++ b/test/fixtures/writerside/basic_project/topics/math.topic
@@ -0,0 +1,5 @@
+<topic xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/topic.v2.xsd"
+       id="math" title="Mathematics">
+  <p>Euler's identity is <math>e^{i\pi}+1=0 \land x &lt; y</math>.</p>
+</topic>
diff --git a/test/src/ai_edit_ui_test.dart b/test/src/ai_edit_ui_test.dart
index 66664cf4..9ac66c79 100644
--- a/test/src/ai_edit_ui_test.dart
+++ b/test/src/ai_edit_ui_test.dart
@@ -6,6 +6,7 @@ import 'package:busymark/src/ai/ai_models.dart';
 import 'package:busymark/src/ai/ai_provider.dart';
 import 'package:busymark/src/ai/ai_provider_registry.dart';
 import 'package:busymark/src/ai/ai_providers.dart';
+import 'package:busymark/src/ai/ai_secret_store.dart';
 import 'package:busymark/src/app/app_settings.dart';
 import 'package:busymark/src/app/app_theme.dart';
 import 'package:busymark/src/app/busymark_design.dart';
@@ -18,8 +19,11 @@ void main() {
   testWidgets('document-only AI snapshot opens a usable configuration', (
     tester,
   ) async {
+    final container = _aiContainer();
+    addTearDown(container.dispose);
     await tester.pumpWidget(
-      ProviderScope(
+      UncontrolledProviderScope(
+        container: container,
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
@@ -53,6 +57,7 @@ void main() {
         ),
       ),
     );
+    await _pumpSettings(tester, container);
 
     await tester.tap(find.text('Open AI'));
     await tester.pumpAndSettle();
@@ -74,8 +79,13 @@ void main() {
   ) async {
     const source = '# Guide\n\nText to refine.\n';
     final selectionStart = source.indexOf('Text');
+    final container = _aiContainer(
+      secrets: {AiProviderKind.gemini: 'gemini-key'},
+    );
+    addTearDown(container.dispose);
     await tester.pumpWidget(
-      ProviderScope(
+      UncontrolledProviderScope(
+        container: container,
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
@@ -108,11 +118,54 @@ void main() {
         ),
       ),
     );
+    await _pumpSettings(tester, container);
 
     await tester.tap(find.text('Open AI'));
     await tester.pumpAndSettle();
 
     expect(find.byType(BusyMarkModalEditorScaffold), findsOneWidget);
+    final providerSelector = tester.widget<BusyMarkComboRow<AiProviderKind>>(
+      find.byKey(const ValueKey('ai-edit-provider')),
+    );
+    expect(providerSelector.values, [
+      AiProviderKind.ollamaLocal,
+      AiProviderKind.gemini,
+    ]);
+    expect(providerSelector.selected, AiProviderKind.ollamaLocal);
+    final localModelSelector = tester.widget<BusyMarkComboRow<String>>(
+      find.byKey(const ValueKey('ai-edit-model')),
+    );
+    expect(localModelSelector.values, ['', 'test-model']);
+    expect(localModelSelector.selected, '');
+    providerSelector.onSelected(AiProviderKind.gemini);
+    await tester.pump();
+    expect(
+      tester
+          .widget<BusyMarkComboRow<AiProviderKind>>(
+            find.byKey(const ValueKey('ai-edit-provider')),
+          )
+          .selected,
+      AiProviderKind.gemini,
+    );
+    final geminiModelSelector = tester.widget<BusyMarkComboRow<String>>(
+      find.byKey(const ValueKey('ai-edit-model')),
+    );
+    expect(geminiModelSelector.values, [
+      '',
+      'gemini-3.6-flash',
+      'gemini-3.5-flash-lite',
+      'gemini-3.5-flash',
+    ]);
+    geminiModelSelector.onSelected('gemini-3.5-flash');
+    await tester.pump();
+    expect(
+      tester
+          .widget<BusyMarkComboRow<String>>(
+            find.byKey(const ValueKey('ai-edit-model')),
+          )
+          .selected,
+      'gemini-3.5-flash',
+    );
     expect(find.byType(BusyMarkComboRow<AiEditTargetKind>), findsOneWidget);
     expect(find.byType(BusyMarkComboRow<AiEditContextKind>), findsOneWidget);
     expect(find.byType(DropdownButtonFormField), findsNothing);
@@ -138,6 +191,336 @@ void main() {
     expect(changeSelector.dy, lessThan(changeContent.dy));
     expect(changeContent.dy, lessThan(contextSelector.dy));
     expect(contextSelector.dy, lessThan(sharedContent.dy));
+    final bottomSpacing = tester.widget<SizedBox>(
+      find.byKey(const ValueKey('ai-context-disclosure-bottom-spacing')),
+    );
+    expect(bottomSpacing.height, BusyMarkSpacing.lg);
+  });
+
+  testWidgets('Refine with AI sends the explicitly selected model', (
+    tester,
+  ) async {
+    const source = 'Text to refine.\n';
+    final settings = AppSettings.defaults().copyWith(
+      aiProviderPreference: AiProviderPreference.ollamaLocal,
+      aiOllamaModel: 'preferred-model',
+      aiModelRoutingPreference: AiModelRoutingPreference.automatic,
+    );
+    final provider = _ImmediateAiProvider(model: 'alternate-model');
+    final container = ProviderContainer(
+      overrides: [
+        localSettingsStoreProvider.overrideWithValue(
+          _MemorySettingsStore(settings.toJson()),
+        ),
+        aiSecretStoreProvider.overrideWithValue(_MemoryAiSecretStore()),
+        aiProviderRegistryProvider.overrideWithValue(
+          AiProviderRegistry([provider]),
+        ),
+      ],
+    );
+    addTearDown(container.dispose);
+    container.read(appSettingsControllerProvider);
+
+    await tester.pumpWidget(
+      UncontrolledProviderScope(
+        container: container,
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: Consumer(
+              builder: (context, ref, child) => ElevatedButton(
+                onPressed: () => unawaited(
+                  showBusyMarkAiEdit(
+                    context,
+                    ref,
+                    const AiEditorSnapshot(
+                      documentSource: source,
+                      selectionStart: 0,
+                      selectionEnd: 15,
+                      anchorOffset: 0,
+                      sourceRevision: 1,
+                      targetId: 'guide.md',
+                      documentPath: 'guide.md',
+                    ),
+                  ),
+                ),
+                child: const Text('Open AI'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpSettings(tester, container);
+
+    await tester.tap(find.text('Open AI'));
+    await tester.pumpAndSettle();
+    await tester.enterText(
+      find.byKey(const ValueKey('ai-edit-instruction')),
+      'Improve this text.',
+    );
+    final modelSelector = tester.widget<BusyMarkComboRow<String>>(
+      find.byKey(const ValueKey('ai-edit-model')),
+    );
+    expect(modelSelector.values, ['', 'preferred-model', 'alternate-model']);
+    modelSelector.onSelected('alternate-model');
+    await tester.pump();
+    await tester.tap(find.text('Generate proposal'));
+    await tester.pumpAndSettle();
+
+    expect(provider.requests, hasLength(1));
+    expect(provider.requests.single.modelCandidates, ['alternate-model']);
+
+    await tester.tap(find.text('Cancel'));
+    await tester.pumpAndSettle();
+  });
+
+  testWidgets('AI proposal uses an explicitly selected provider', (
+    tester,
+  ) async {
+    final settings = AppSettings.defaults().copyWith(
+      aiProviderPreference: AiProviderPreference.ollamaLocal,
+      aiOllamaModel: 'local-model',
+      aiGeminiModel: 'gemini-model',
+      aiModelRoutingPreference: AiModelRoutingPreference.fixed,
+      aiCloudProviderConsentIds: [AiProviderKind.gemini.id],
+    );
+    final local = _ImmediateAiProvider(
+      kind: AiProviderKind.ollamaLocal,
+      model: 'local-model',
+    );
+    final gemini = _ImmediateAiProvider(
+      kind: AiProviderKind.gemini,
+      model: 'gemini-model',
+    );
+    final container = ProviderContainer(
+      overrides: [
+        localSettingsStoreProvider.overrideWithValue(
+          _MemorySettingsStore(settings.toJson()),
+        ),
+        aiProviderRegistryProvider.overrideWithValue(
+          AiProviderRegistry([local, gemini]),
+        ),
+      ],
+    );
+    addTearDown(container.dispose);
+    container.read(appSettingsControllerProvider);
+
+    await tester.pumpWidget(
+      UncontrolledProviderScope(
+        container: container,
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: Consumer(
+              builder: (context, ref, child) => ElevatedButton(
+                onPressed: () => unawaited(
+                  showBusyMarkAiProposal(
+                    context,
+                    ref,
+                    const AiEditInvocation(
+                      feature: AiFeature.draftCommitMessage,
+                      scope: AiScope.gitDiff,
+                      input: 'diff --git a/guide.md b/guide.md',
+                      replacementOriginal: '',
+                      sourceRevision: 0,
+                      targetId: 'git-commit:/repo',
+                      documentPath: null,
+                      contentFormat: AiContentFormat.plainText,
+                      enforceDocumentRevision: false,
+                    ),
+                    providerKind: AiProviderKind.gemini,
+                  ),
+                ),
+                child: const Text('Generate'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpSettings(tester, container);
+
+    await tester.tap(find.text('Generate'));
+    await tester.pumpAndSettle();
+
+    expect(local.requests, isEmpty);
+    expect(gemini.requests, hasLength(1));
+    expect(gemini.requests.single.provider, AiProviderKind.gemini);
+    expect(find.textContaining('Google Gemini'), findsWidgets);
+
+    await tester.tap(find.text('Cancel'));
+    await tester.pumpAndSettle();
+  });
+
+  testWidgets('provider chooser exposes only configured providers', (
+    tester,
+  ) async {
+    final settings = AppSettings.defaults().copyWith(
+      aiProviderPreference: AiProviderPreference.ollamaLocal,
+      aiOllamaModel: 'local-model',
+    );
+    final container = ProviderContainer(
+      overrides: [
+        localSettingsStoreProvider.overrideWithValue(
+          _MemorySettingsStore(settings.toJson()),
+        ),
+        aiSecretStoreProvider.overrideWithValue(
+          _MemoryAiSecretStore({AiProviderKind.gemini: 'gemini-key'}),
+        ),
+      ],
+    );
+    addTearDown(container.dispose);
+    container.read(appSettingsControllerProvider);
+    AiProviderKind? selected;
+
+    await tester.pumpWidget(
+      UncontrolledProviderScope(
+        container: container,
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: Consumer(
+              builder: (context, ref, child) => ElevatedButton(
+                onPressed: () async {
+                  selected = await chooseBusyMarkAiProvider(context, ref);
+                },
+                child: const Text('Choose provider'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpSettings(tester, container);
+
+    await tester.tap(find.text('Choose provider'));
+    await tester.pumpAndSettle();
+    final selector = tester.widget<BusyMarkComboRow<AiProviderKind>>(
+      find.byKey(const ValueKey('ai-provider-choice')),
+    );
+    expect(selector.values, [
+      AiProviderKind.ollamaLocal,
+      AiProviderKind.gemini,
+    ]);
+    expect(selector.selected, AiProviderKind.ollamaLocal);
+    selector.onSelected(AiProviderKind.gemini);
+    await tester.pump();
+    await tester.tap(find.text('Generate proposal'));
+    await tester.pumpAndSettle();
+
+    expect(selected, AiProviderKind.gemini);
+  });
+
+  testWidgets(
+    'configured local provider remains available when Gemini is default',
+    (tester) async {
+      final settings = AppSettings.defaults().copyWith(
+        aiProviderPreference: AiProviderPreference.gemini,
+        aiOllamaModel: 'local-model',
+        aiCloudProviderConsentIds: [AiProviderKind.gemini.id],
+      );
+      final container = ProviderContainer(
+        overrides: [
+          localSettingsStoreProvider.overrideWithValue(
+            _MemorySettingsStore(settings.toJson()),
+          ),
+          aiSecretStoreProvider.overrideWithValue(
+            _MemoryAiSecretStore({AiProviderKind.gemini: 'gemini-key'}),
+          ),
+        ],
+      );
+      addTearDown(container.dispose);
+      container.read(appSettingsControllerProvider);
+
+      await tester.pumpWidget(
+        UncontrolledProviderScope(
+          container: container,
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Scaffold(
+              body: Consumer(
+                builder: (context, ref, child) => ElevatedButton(
+                  onPressed: () =>
+                      unawaited(chooseBusyMarkAiProvider(context, ref)),
+                  child: const Text('Choose provider'),
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+      await _pumpSettings(tester, container);
+
+      await tester.tap(find.text('Choose provider'));
+      await tester.pumpAndSettle();
+      final selector = tester.widget<BusyMarkComboRow<AiProviderKind>>(
+        find.byKey(const ValueKey('ai-provider-choice')),
+      );
+      expect(selector.values, [
+        AiProviderKind.gemini,
+        AiProviderKind.ollamaLocal,
+      ]);
+      expect(selector.selected, AiProviderKind.gemini);
+    },
+  );
+
+  testWidgets('fixed AI target cannot widen a sidebar selection', (
+    tester,
+  ) async {
+    const source = '# First\n\nSelected section.\n\n# Last\n';
+    final start = source.indexOf('# First');
+    final end = source.indexOf('# Last');
+    final container = _aiContainer();
+    addTearDown(container.dispose);
+    await tester.pumpWidget(
+      UncontrolledProviderScope(
+        container: container,
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: Consumer(
+              builder: (context, ref, child) => ElevatedButton(
+                onPressed: () => unawaited(
+                  showBusyMarkAiEdit(
+                    context,
+                    ref,
+                    AiEditorSnapshot(
+                      documentSource: source,
+                      selectionStart: start,
+                      selectionEnd: end,
+                      anchorOffset: start,
+                      sourceRevision: 1,
+                      targetId: 'outline.md',
+                      documentPath: 'outline.md',
+                      blockTargetAvailable: false,
+                    ),
+                    fixedTarget: AiEditTargetKind.selection,
+                  ),
+                ),
+                child: const Text('Open fixed AI'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpSettings(tester, container);
+
+    await tester.tap(find.text('Open fixed AI'));
+    await tester.pumpAndSettle();
+
+    final selector = tester.widget<BusyMarkComboRow<AiEditTargetKind>>(
+      find.byType(BusyMarkComboRow<AiEditTargetKind>),
+    );
+    expect(selector.values, [AiEditTargetKind.selection]);
+    expect(selector.selected, AiEditTargetKind.selection);
+    expect(find.textContaining('Selected section.'), findsNWidgets(2));
   });
 
   testWidgets('proposal Apply refuses stale external source content', (
@@ -237,17 +620,52 @@ void main() {
   });
 }
 
+Future<void> _pumpSettings(
+  WidgetTester tester,
+  ProviderContainer container,
+) async {
+  for (var index = 0; index < 20; index += 1) {
+    await tester.pump();
+    if (container.read(appSettingsControllerProvider).aiProviderPreference !=
+        AiProviderPreference.disabled) {
+      return;
+    }
+  }
+  fail('App settings did not finish loading.');
+}
+
 class _ImmediateAiProvider implements AiProvider {
+  _ImmediateAiProvider({
+    this.kind = AiProviderKind.ollamaLocal,
+    this.model = 'test-model',
+  });
+
+  final AiProviderKind kind;
+  final String model;
+  final List<AiRequest> requests = [];
+
   @override
-  String get id => AiProviderKind.ollamaLocal.id;
+  String get id => kind.id;
 
   @override
-  AiProviderCapabilities get capabilities => const AiProviderCapabilities(
-    kind: AiProviderKind.ollamaLocal,
+  AiProviderCapabilities get capabilities => AiProviderCapabilities(
+    kind: kind,
     streaming: true,
-    modelDiscovery: false,
+    modelDiscovery: kind == AiProviderKind.ollamaLocal,
     maximumConcurrentRequests: 1,
-    recommendedModels: {},
+    recommendedModels: switch (kind) {
+      AiProviderKind.ollamaLocal => {},
+      AiProviderKind.openAi => const {
+        AiModelClass.fast: ['gpt-5.6-luna'],
+        AiModelClass.balanced: ['gpt-5.6-terra'],
+        AiModelClass.strong: ['gpt-5.6-sol'],
+      },
+      AiProviderKind.gemini => const {
+        AiModelClass.fast: ['gemini-3.5-flash-lite'],
+        AiModelClass.balanced: ['gemini-3.6-flash'],
+        AiModelClass.strong: ['gemini-3.5-flash'],
+      },
+    },
   );
 
   @override
@@ -255,7 +673,8 @@ class _ImmediateAiProvider implements AiProvider {
     AiRequest request, {
     required AiCancellationToken cancellationToken,
   }) async* {
-    yield const AiStarted(providerId: 'ollama-local', model: 'test-model');
+    requests.add(request);
+    yield AiStarted(providerId: kind.id, model: model);
     yield const AiTextDelta('Improve documentation');
     yield const AiCompleted();
   }
@@ -263,7 +682,7 @@ class _ImmediateAiProvider implements AiProvider {
   @override
   Future<List<AiModelInfo>> listModels({
     AiCancellationToken? cancellationToken,
-  }) async => const [AiModelInfo(name: 'test-model')];
+  }) async => [AiModelInfo(name: model)];
 
   @override
   Future<AiHealthResult> checkHealth({
@@ -285,3 +704,52 @@ class _MemorySettingsStore implements LocalSettingsStore {
     value = json;
   }
 }
+
+class _MemoryAiSecretStore implements AiSecretStore {
+  _MemoryAiSecretStore([Map<AiProviderKind, String>? values])
+    : _values = {...?values};
+
+  final Map<AiProviderKind, String> _values;
+
+  @override
+  Future<void> delete(AiProviderKind provider) async {
+    _values.remove(provider);
+  }
+
+  @override
+  Future<String?> read(AiProviderKind provider) async => _values[provider];
+
+  @override
+  Future<void> write(AiProviderKind provider, String secret) async {
+    _values[provider] = secret;
+  }
+}
+
+ProviderContainer _aiContainer({Map<AiProviderKind, String>? secrets}) {
+  final settings = AppSettings.defaults().copyWith(
+    aiProviderPreference: AiProviderPreference.ollamaLocal,
+  );
+  final container = ProviderContainer(
+    overrides: [
+      localSettingsStoreProvider.overrideWithValue(
+        _MemorySettingsStore(settings.toJson()),
+      ),
+      aiSecretStoreProvider.overrideWithValue(_MemoryAiSecretStore(secrets)),
+      aiProviderRegistryProvider.overrideWithValue(
+        AiProviderRegistry([
+          _ImmediateAiProvider(),
+          _ImmediateAiProvider(
+            kind: AiProviderKind.openAi,
+            model: 'gpt-5.6-terra',
+          ),
+          _ImmediateAiProvider(
+            kind: AiProviderKind.gemini,
+            model: 'gemini-3.6-flash',
+          ),
+        ]),
+      ),
+    ],
+  );
+  container.read(appSettingsControllerProvider);
+  return container;
+}
diff --git a/test/src/ai_packaging_audit_test.dart b/test/src/ai_packaging_audit_test.dart
index aab9124d..dc6aa2ca 100644
--- a/test/src/ai_packaging_audit_test.dart
+++ b/test/src/ai_packaging_audit_test.dart
@@ -22,7 +22,7 @@ void main() {
     expect(workflow, contains('libsecret-1-dev'));
     expect(snapcraft, contains('- libsecret-1-dev'));
     expect(snapcraft, contains('- libsecret-1-0'));
-    expect(snapcraft, contains('- desktop'));
+    expect(snapcraft, contains('confinement: strict'));
   });
 
   test('real local AI qualification covers every shipped action', () {
diff --git a/test/src/app_router_test.dart b/test/src/app_router_test.dart
index ae7521cd..ac32951a 100644
--- a/test/src/app_router_test.dart
+++ b/test/src/app_router_test.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:busymark/l10n/generated/app_localizations_en.dart';
+import 'package:busymark/src/app/app_settings.dart';
 import 'package:busymark/src/app/app_router.dart';
 import 'package:busymark/src/app/busymark_app.dart';
 import 'package:busymark/src/app/busymark_shortcuts.dart';
@@ -90,6 +91,9 @@ void main() {
         ProviderScope(
           overrides: [
             linuxHeaderBarServiceProvider.overrideWithValue(headerBar),
+            localSettingsStoreProvider.overrideWithValue(
+              _MemorySettingsStore(),
+            ),
             workspaceControllerProvider.overrideWith(
               () => _StaleWorkspaceController(),
             ),
@@ -123,6 +127,56 @@ void main() {
       expect(find.text(l10n.createMarkdownFile), findsOneWidget);
     },
   );
+
+  testWidgets('returning to Welcome does not restore the session again', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          linuxHeaderBarServiceProvider.overrideWithValue(
+            _FallbackHeaderBarService(),
+          ),
+          localSettingsStoreProvider.overrideWithValue(
+            _MemorySettingsStore(
+              AppSettings.defaults()
+                  .copyWith(reopenPreviousWorkspaceOnStartup: true)
+                  .toJson(),
+            ),
+          ),
+          workspaceControllerProvider.overrideWith(
+            _RestoringWorkspaceController.new,
+          ),
+        ],
+        child: const BusyMarkApp(),
+      ),
+    );
+    for (var index = 0; index < 30; index += 1) {
+      await tester.pump(const Duration(milliseconds: 100));
+      if (find
+          .byTooltip('${l10n.welcome} (${BusyMarkAppShortcutLabels.back})')
+          .evaluate()
+          .isNotEmpty) {
+        break;
+      }
+    }
+
+    expect(
+      find.byTooltip('${l10n.welcome} (${BusyMarkAppShortcutLabels.back})'),
+      findsOneWidget,
+    );
+    await tester.tap(
+      find.byTooltip('${l10n.welcome} (${BusyMarkAppShortcutLabels.back})'),
+    );
+    await tester.pumpAndSettle();
+    await tester.pump(const Duration(milliseconds: 500));
+
+    expect(find.text(l10n.createMarkdownFile), findsOneWidget);
+    expect(
+      find.byTooltip('${l10n.welcome} (${BusyMarkAppShortcutLabels.back})'),
+      findsNothing,
+    );
+  });
 }
 
 class _FallbackHeaderBarService extends LinuxHeaderBarService {
@@ -153,4 +207,57 @@ class _StaleWorkspaceController extends WorkspaceController {
       ),
     );
   }
+
+  @override
+  Future<bool> restoreStartupSession({
+    required bool reopenCleanSession,
+  }) async => false;
+}
+
+class _RestoringWorkspaceController extends WorkspaceController {
+  @override
+  WorkspaceState build() => const WorkspaceState();
+
+  @override
+  Future<bool> restoreStartupSession({required bool reopenCleanSession}) =>
+      restorePreviousSession();
+
+  @override
+  Future<bool> restorePreviousSession() async {
+    state = WorkspaceState(
+      workspace: Workspace(
+        id: 'restored-workspace',
+        rootPath: '/tmp/restored.md',
+        kind: WorkspaceKind.singleMarkdown,
+        openedAt: DateTime(2026),
+        activeFilePath: '/tmp/restored.md',
+        files: [
+          DocumentFile(
+            absolutePath: '/tmp/restored.md',
+            relativePath: 'restored.md',
+            kind: DocumentKind.markdown,
+            size: 20,
+            lastModified: DateTime(2026),
+          ),
+        ],
+        diagnostics: const [],
+      ),
+    );
+    return true;
+  }
+}
+
+class _MemorySettingsStore implements LocalSettingsStore {
+  _MemorySettingsStore([Map<String, Object?>? value])
+    : value = value ?? <String, Object?>{};
+
+  Map<String, Object?> value;
+
+  @override
+  Future<Map<String, Object?>> load() async => value;
+
+  @override
+  Future<void> save(Map<String, Object?> json) async {
+    value = json;
+  }
 }
diff --git a/test/src/app_settings_test.dart b/test/src/app_settings_test.dart
index 45497582..11547865 100644
--- a/test/src/app_settings_test.dart
+++ b/test/src/app_settings_test.dart
@@ -13,6 +13,23 @@ void main() {
     final settings = AppSettings.defaults();
 
     expect(settings.confirmCloseWithUnsavedChanges, isTrue);
+    expect(settings.reopenPreviousWorkspaceOnStartup, isFalse);
+    expect(settings.toJson()['reopenPreviousWorkspaceOnStartup'], isFalse);
+  });
+
+  test('reopen workspace setting is migration-safe', () {
+    expect(
+      AppSettings.fromJson(
+        const <String, Object?>{},
+      ).reopenPreviousWorkspaceOnStartup,
+      isFalse,
+    );
+    expect(
+      AppSettings.fromJson(const <String, Object?>{
+        'reopenPreviousWorkspaceOnStartup': true,
+      }).reopenPreviousWorkspaceOnStartup,
+      isTrue,
+    );
   });
 
   test('document view mode defaults to editor', () {
@@ -46,8 +63,10 @@ void main() {
       defaults
           .copyWith(
             aiProviderPreference: AiProviderPreference.openAi,
+            aiOllamaEndpoint: 'http://localhost:11434',
             aiOllamaModel: 'local-model',
             aiOpenAiModel: 'gpt-5.6-sol',
+            aiGeminiModel: 'gemini-custom',
             aiModelRoutingPreference: AiModelRoutingPreference.fixed,
             aiCloudProviderConsentIds: const ['openai'],
           )
@@ -55,8 +74,10 @@ void main() {
     );
 
     expect(reloaded.aiProviderPreference, AiProviderPreference.openAi);
+    expect(reloaded.aiOllamaEndpoint, 'http://localhost:11434');
     expect(reloaded.aiOllamaModel, 'local-model');
     expect(reloaded.aiOpenAiModel, 'gpt-5.6-sol');
+    expect(reloaded.aiGeminiModel, 'gemini-custom');
     expect(reloaded.aiModelRoutingPreference, AiModelRoutingPreference.fixed);
     expect(reloaded.aiCloudProviderConsentIds, ['openai']);
     final serialized = jsonEncode(reloaded.toJson()).toLowerCase();
@@ -291,14 +312,22 @@ void main() {
     await Future<void>.delayed(Duration.zero);
 
     await controller.setConfirmCloseWithUnsavedChanges(false);
+    await controller.setReopenPreviousWorkspaceOnStartup(true);
 
     expect(store.value['confirmCloseWithUnsavedChanges'], isFalse);
+    expect(store.value['reopenPreviousWorkspaceOnStartup'], isTrue);
     expect(
       container
           .read(appSettingsControllerProvider)
           .confirmCloseWithUnsavedChanges,
       isFalse,
     );
+    expect(
+      container
+          .read(appSettingsControllerProvider)
+          .reopenPreviousWorkspaceOnStartup,
+      isTrue,
+    );
   });
 
   test('auto save setting persists', () async {
diff --git a/test/src/app_smoke_test.dart b/test/src/app_smoke_test.dart
index 849c13ee..10d1baa6 100644
--- a/test/src/app_smoke_test.dart
+++ b/test/src/app_smoke_test.dart
@@ -31,13 +31,11 @@ import 'package:busymark/src/editor/markdown_image_view.dart';
 import 'package:busymark/src/editor/source/source_editor.dart';
 import 'package:busymark/src/editor/source/source_read_only_view.dart';
 import 'package:busymark/src/feedback/presentation/feedback_dialog.dart';
-import 'package:busymark/src/export/writerside_pdf_export_service.dart';
-import 'package:busymark/src/export/writerside_pdf_export_ui.dart';
-import 'package:busymark/src/export/writerside_pdf_models.dart';
 import 'package:busymark/src/git/application/git_controller.dart';
 import 'package:busymark/src/git/domain/git_models.dart';
 import 'package:busymark/src/git/presentation/git_diff_viewer.dart';
 import 'package:busymark/src/markdown/preview_model.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
 import 'package:busymark/src/platform/linux_header_bar_service.dart';
 import 'package:busymark/src/writerside/writerside_model.dart';
 import 'package:busymark/src/writerside/writerside_topic_creator.dart';
@@ -577,6 +575,19 @@ void main() {
     await tester.tap(find.text(l10n.settingsWindowSectionTitle));
     await tester.pumpAndSettle();
 
+    expect(
+      find.text(l10n.settingsReopenWorkspaceOnStartupTitle),
+      findsOneWidget,
+    );
+    expect(
+      find.text(l10n.settingsReopenWorkspaceOnStartupDescription),
+      findsOneWidget,
+    );
+    await tester.tap(find.text(l10n.settingsReopenWorkspaceOnStartupTitle));
+    await tester.pumpAndSettle();
+
+    expect(settingsStore.value['reopenPreviousWorkspaceOnStartup'], isTrue);
+
     expect(
       find.text(l10n.settingsConfirmCloseWithUnsavedChangesTitle),
       findsOneWidget,
@@ -1228,7 +1239,7 @@ void main() {
     expect(find.text(l10n.workspaceKindUnsavedMarkdown), findsWidgets);
   });
 
-  testWidgets('Ctrl+N with unsaved changes opens confirmation dialog', (
+  testWidgets('Ctrl+N keeps unsaved documents in independent tabs', (
     tester,
   ) async {
     final service = _StartupWorkspaceService();
@@ -1294,14 +1305,19 @@ void main() {
     );
     await tester.pumpAndSettle();
 
-    expect(find.text(l10n.unsavedChanges), findsOneWidget);
-
-    await tester.sendKeyEvent(LogicalKeyboardKey.escape);
-    await tester.pumpAndSettle();
-
     expect(find.text(l10n.unsavedChanges), findsNothing);
-    expect(service.untitledCount, 0);
-    expect(container.read(workspaceControllerProvider).isDirty, isTrue);
+    expect(service.untitledCount, 1);
+    expect(
+      container.read(workspaceControllerProvider).documentBuffers,
+      hasLength(2),
+    );
+    expect(
+      container
+          .read(workspaceControllerProvider)
+          .documentBuffers
+          .where((buffer) => buffer.isDirty),
+      hasLength(2),
+    );
 
     await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
     await tester.sendKeyDownEvent(LogicalKeyboardKey.keyN);
@@ -1317,20 +1333,13 @@ void main() {
     );
     await tester.pumpAndSettle();
 
-    expect(find.text(l10n.unsavedChanges), findsOneWidget);
-
-    await tester.tap(find.text(l10n.discard));
-    await tester.pumpAndSettle();
-    for (
-      var attempt = 0;
-      attempt < 10 && service.untitledCount == 0;
-      attempt++
-    ) {
-      await tester.pump(const Duration(milliseconds: 100));
-    }
-
-    expect(service.untitledCount, 1);
-    expect(find.text(l10n.workspaceKindUnsavedMarkdown), findsWidgets);
+    expect(find.text(l10n.unsavedChanges), findsNothing);
+    expect(service.untitledCount, 2);
+    expect(
+      container.read(workspaceControllerProvider).documentBuffers,
+      hasLength(3),
+    );
+    await tester.pump(const Duration(milliseconds: 800));
   });
 
   testWidgets('Topics defaults creation to root and exposes file-style menu', (
@@ -1412,9 +1421,6 @@ void main() {
       overrides: [
         linuxHeaderBarServiceProvider.overrideWithValue(headerBarService),
         localSettingsStoreProvider.overrideWithValue(_MemorySettingsStore()),
-        writersidePdfExportServiceProvider.overrideWithValue(
-          const _OptionsOnlyWritersidePdfExportService(),
-        ),
         workspaceControllerProvider.overrideWith(() => controller),
       ],
     );
@@ -1439,6 +1445,11 @@ void main() {
       await tester.pumpAndSettle();
     }
 
+    Finder popupMenuItem(String label) => find.byWidgetPredicate(
+      (widget) =>
+          widget is BusyMarkPopupMenuItem<Object?> && widget.label == label,
+    );
+
     await openPopup(find.byTooltip(l10n.sidebarViewMenu));
     await tester.tap(find.text(l10n.files));
     await tester.pump(const Duration(milliseconds: 300));
@@ -1616,6 +1627,8 @@ void main() {
     await openPopup(find.text('Nested entry'), buttons: kSecondaryButton);
 
     for (final label in [
+      l10n.copy,
+      l10n.aiRefineWithAi,
       l10n.newSiblingTopic,
       l10n.newChildTopic,
       l10n.renameTopicFile,
@@ -1624,13 +1637,14 @@ void main() {
       l10n.pasteAsChildTopic,
       l10n.removeTocElement,
       l10n.safeDeleteTopicFile,
+      l10n.delete,
       l10n.copyName,
       l10n.copyPath,
       l10n.openInFiles,
       l10n.addToGit,
       l10n.fileHistory,
     ]) {
-      expect(find.text(label), findsOneWidget);
+      expect(popupMenuItem(label), findsOneWidget);
     }
 
     await tester.tap(find.text(l10n.newChildTopic));
@@ -1668,6 +1682,39 @@ void main() {
     );
     expect(controller.createdTopicRequest!.referenceTocPath, [0, 0]);
 
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+    await tester.tap(find.byKey(const ValueKey('workspace-sidebar-toc-row-1')));
+    await tester.tap(find.byKey(const ValueKey('workspace-sidebar-toc-row-2')));
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+    await tester.pump();
+    await openPopup(find.text('target.md'), buttons: kSecondaryButton);
+    for (final label in [
+      l10n.copy,
+      l10n.cut,
+      l10n.aiRefineWithAi,
+      l10n.delete,
+    ]) {
+      expect(popupMenuItem(label), findsOneWidget);
+    }
+    expect(find.text(l10n.newSiblingTopic), findsNothing);
+    expect(find.text(l10n.copyName), findsNothing);
+    await tester.sendKeyEvent(LogicalKeyboardKey.escape);
+    await tester.pumpAndSettle();
+
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+    await tester.tap(find.byKey(const ValueKey('workspace-sidebar-toc-row-1')));
+    await tester.tap(find.byKey(const ValueKey('workspace-sidebar-toc-row-1')));
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.shiftLeft);
+    await tester.tap(find.byKey(const ValueKey('workspace-sidebar-toc-row-2')));
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.shiftLeft);
+    await tester.pump();
+    await openPopup(find.text('target.md'), buttons: kSecondaryButton);
+    expect(find.text(l10n.aiRefineWithAi), findsOneWidget);
+    expect(find.text(l10n.newSiblingTopic), findsNothing);
+    await tester.sendKeyEvent(LogicalKeyboardKey.escape);
+    await tester.pumpAndSettle();
+
     await openPopup(find.text('Nested entry'), buttons: kSecondaryButton);
 
     await tester.tap(find.text(l10n.cut));
@@ -1768,7 +1815,8 @@ void main() {
     }
     expect(find.byType(BusyMarkModalEditorSurface), findsOneWidget);
     expect(find.byType(BusyMarkModalEditorScaffold), findsOneWidget);
-    expect(find.text(l10n.writersidePdfExportDescription), findsOneWidget);
+    expect(find.text(l10n.pdfPageSize), findsOneWidget);
+    expect(find.text(l10n.pdfIncludePageNumbers), findsOneWidget);
     await tester.tap(find.text(l10n.cancel));
     await tester.pumpAndSettle();
   });
@@ -1849,6 +1897,14 @@ void main() {
     await controller.openActiveFile(third.path);
     await tester.pump(const Duration(milliseconds: 100));
 
+    expect(find.text('LF'), findsOneWidget);
+    expect(find.text('CRLF'), findsNothing);
+    expect(
+      find.ancestor(of: find.text('LF'), matching: find.byType(InkWell)),
+      findsNothing,
+    );
+    expect(find.textContaining('UTF-8'), findsNothing);
+    expect(find.textContaining('Final newline'), findsNothing);
     expect(
       container.read(workspaceControllerProvider).workspace?.openFilePaths,
       [first.path, second.path, third.path],
@@ -1864,9 +1920,7 @@ void main() {
     await pressControlShortcut(LogicalKeyboardKey.tab);
 
     expect(find.text(l10n.unsavedChanges), findsNothing);
-    expect(service.saveCount, 1);
-    expect(service.savedPath, third.path);
-    expect(service.savedText, '# Edited third\n');
+    expect(service.saveCount, 0);
     expect(
       container.read(workspaceControllerProvider).workspace?.activeFilePath,
       first.path,
@@ -1881,6 +1935,10 @@ void main() {
 
     await pressControlShortcut(LogicalKeyboardKey.keyW);
 
+    expect(find.text(l10n.unsavedChanges), findsOneWidget);
+    await tester.tap(find.text(l10n.discard));
+    await tester.pumpAndSettle();
+
     expect(
       container.read(workspaceControllerProvider).workspace?.activeFilePath,
       second.path,
@@ -1889,7 +1947,6 @@ void main() {
       container.read(workspaceControllerProvider).workspace?.openFilePaths,
       [first.path, second.path],
     );
-
     await pressControlShortcut(LogicalKeyboardKey.keyW, shift: true);
 
     expect(
@@ -1901,6 +1958,7 @@ void main() {
       isEmpty,
     );
     expect(find.text(l10n.noOpenFile), findsWidgets);
+    await tester.pump(const Duration(milliseconds: 800));
   });
 
   testWidgets('Git diff files are shown as separate editor tabs', (
@@ -2047,6 +2105,9 @@ void main() {
     expect(find.byTooltip(l10n.gitBehindCount(3)), findsOneWidget);
     expect(find.byTooltip(l10n.gitAheadCount(2)), findsOneWidget);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -2095,6 +2156,9 @@ void main() {
     expect(find.byTooltip(l10n.sourceSearchNextMatch), findsOneWidget);
     expect(find.byType(TextField), findsOneWidget);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.editor);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.editor);
@@ -2132,6 +2196,9 @@ void main() {
     );
     expect(find.byType(TextField), findsOneWidget);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.split);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.split);
@@ -2177,6 +2244,9 @@ void main() {
     expect(find.byTooltip(l10n.sourceSearchPreviousMatch), findsOneWidget);
     expect(find.byTooltip(l10n.sourceSearchNextMatch), findsOneWidget);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.source);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.source);
@@ -2702,19 +2772,20 @@ void main() {
     );
     expect(outlineFileMenu, findsOneWidget);
     expect(find.byTooltip(first.path), findsOneWidget);
-    expect(find.byTooltip(l10n.fileActions), findsOneWidget);
+    expect(find.byTooltip(l10n.actions), findsOneWidget);
 
-    await tester.tap(find.byTooltip(l10n.fileActions));
+    await tester.tap(find.byTooltip(l10n.actions));
     await tester.pumpAndSettle();
     expect(find.text(l10n.copyFileName), findsOneWidget);
     expect(find.text(l10n.copyPath), findsOneWidget);
     expect(find.text(l10n.openInFiles), findsOneWidget);
+    expect(find.text(l10n.aiRefineWithAi), findsOneWidget);
 
     await tester.tap(find.text(l10n.copyFileName));
     await tester.pumpAndSettle();
     expect(clipboardText, 'Intro.md');
 
-    await tester.tap(find.byTooltip(l10n.fileActions));
+    await tester.tap(find.byTooltip(l10n.actions));
     await tester.pumpAndSettle();
     await tester.tap(find.text(l10n.copyPath));
     await tester.pumpAndSettle();
@@ -3435,7 +3506,14 @@ void main() {
       }
     }
 
-    final sourceField = find.byType(TextField).last;
+    final sourceField = find.descendant(
+      of: find.byType(BusyMarkSourceEditor),
+      matching: find.byType(TextField),
+    );
+    expect(
+      tester.widget<TextField>(sourceField).controller?.text,
+      '# Introduction.md\n',
+    );
     await tester.tap(sourceField);
     await tester.enterText(sourceField, '# Edited Introduction\n');
     await tester.pump();
@@ -3911,6 +3989,9 @@ void main() {
     expect(editorContent, findsOneWidget);
     expect(editorScroll, findsOneWidget);
     final editorRect = tester.getRect(editorContent);
+    final editorScrollRect = tester.getRect(editorScroll);
+    expect(editorScrollRect.width, greaterThan(editorRect.width));
+    expect(editorScrollRect.right, greaterThan(editorRect.right));
     final editorHeadingRect = tester.getRect(
       find.descendant(of: editorContent, matching: find.byType(TextField)),
     );
@@ -3934,6 +4015,9 @@ void main() {
         );
     expect(editorPadding, expectedStandalone.scrollPadding);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -3946,6 +4030,11 @@ void main() {
     expect(previewContent, findsOneWidget);
     expect(previewScroll, findsOneWidget);
     final previewRect = tester.getRect(previewContent);
+    final previewScrollRect = tester.getRect(previewScroll);
+    expect(previewScrollRect.width, closeTo(editorScrollRect.width, 0.1));
+    expect(previewScrollRect.right, closeTo(editorScrollRect.right, 0.1));
+    expect(previewScrollRect.width, greaterThan(previewRect.width));
+    expect(previewScrollRect.right, greaterThan(previewRect.right));
     final previewHeading = find.descendant(
       of: previewContent,
       matching: find.byWidgetPredicate(
@@ -3957,7 +4046,7 @@ void main() {
     expect(previewHeading, findsOneWidget);
     final previewHeadingRect = tester.getRect(previewHeading);
     final previewParagraph = find.descendant(
-      of: previewContent,
+      of: previewScroll,
       matching: find.byWidgetPredicate(
         (widget) =>
             widget is Text &&
@@ -3987,17 +4076,52 @@ void main() {
       tester.widget<ScrollablePositionedList>(previewScroll).padding,
       editorPadding,
     );
+    final previewControllerBeforeSplit = tester
+        .widget<ScrollablePositionedList>(previewScroll)
+        .itemScrollController;
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.split);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.split);
     await tester.pump(const Duration(milliseconds: 100));
 
+    expect(tester.takeException(), isNull);
+    expect(
+      tester
+          .widget<ScrollablePositionedList>(previewScroll)
+          .itemScrollController,
+      same(previewControllerBeforeSplit),
+    );
+
     final splitPaneRect = tester.getRect(previewScroll);
     final splitContentRect = tester.getRect(previewContent);
-    expect(splitContentRect.left, splitPaneRect.left);
-    expect(splitContentRect.right, splitPaneRect.right);
-    expect(splitContentRect.top, splitPaneRect.top);
+    expect(
+      splitContentRect.left,
+      closeTo(
+        splitPaneRect.left +
+            BusyMarkDocumentLayoutSpec.splitPreview.minimumInsets.left,
+        0.1,
+      ),
+    );
+    expect(
+      splitContentRect.right,
+      closeTo(
+        splitPaneRect.right -
+            BusyMarkDocumentLayoutSpec.splitPreview.minimumInsets.right,
+        0.1,
+      ),
+    );
+    expect(
+      splitContentRect.top,
+      closeTo(
+        splitPaneRect.top +
+            BusyMarkDocumentLayoutSpec.splitPreview.scrollPadding.top,
+        0.1,
+      ),
+    );
     expect(
       tester.widget<ScrollablePositionedList>(previewScroll).padding,
       BusyMarkDocumentLayoutSpec.splitPreview.scrollPadding,
@@ -4082,6 +4206,9 @@ void main() {
     expect(editorCheckedMarker.color, editorPrimary);
     expect(editorUncheckedMarker.color, editorMarkerColors.foreground);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -4174,6 +4301,9 @@ void main() {
     final editorTextRect = tester.getRect(editorText);
     final editorIconRect = tester.getRect(editorIcon);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -4280,6 +4410,9 @@ void main() {
     final editorTextRect = tester.getRect(editorField);
     final editorStyle = editorTextField.style;
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -4305,7 +4438,7 @@ void main() {
     expect(previewTextWidget.textSpan?.toPlainText(), code);
     expect(Directionality.of(tester.element(previewText)), TextDirection.ltr);
     final previewArabic = find.descendant(
-      of: find.byKey(const ValueKey('preview-document-content')),
+      of: find.byKey(const ValueKey('preview-document-scroll')),
       matching: find.byWidgetPredicate(
         (widget) => widget is RichText && widget.text.toPlainText() == 'مرحبا',
       ),
@@ -4477,16 +4610,17 @@ After break.
       ),
     );
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
     await tester.pump(const Duration(milliseconds: 100));
 
-    final previewContent = find.byKey(
-      const ValueKey('preview-document-content'),
-    );
+    final previewScroll = find.byKey(const ValueKey('preview-document-scroll'));
     Finder previewHeading(String text) => find.descendant(
-      of: previewContent,
+      of: previewScroll,
       matching: find.byWidgetPredicate(
         (widget) => widget is Text && widget.textSpan?.toPlainText() == text,
       ),
@@ -4508,7 +4642,7 @@ After break.
       expect(previewStyle?.height, editorStyle?.height);
     }
     final previewBody = find.descendant(
-      of: previewContent,
+      of: previewScroll,
       matching: find.byWidgetPredicate(
         (widget) =>
             widget is Text &&
@@ -4556,7 +4690,7 @@ After break.
 <warning>Shared warning.</warning>
 
 ![Shared image](missing.png){ width="320" }
-''');
+''', writerside: true);
     final container = ProviderContainer(
       overrides: [
         linuxHeaderBarServiceProvider.overrideWithValue(headerBarService),
@@ -4598,6 +4732,9 @@ After break.
     expect(editorImageWidget.width, 320);
     expect(editorImageWidget.maxWidth, 320);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -4770,6 +4907,9 @@ After break.
       }
     }
     expect(container.read(workspaceControllerProvider).workspace, isNotNull);
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.editor);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.editor);
@@ -5007,7 +5147,7 @@ After break.
       find.byKey(const ValueKey('workspace-sidebar-outline-file-menu')),
       findsOneWidget,
     );
-    expect(find.byTooltip(l10n.fileActions), findsOneWidget);
+    expect(find.byTooltip(l10n.actions), findsOneWidget);
     final primarySidebarLabel = find.descendant(
       of: find.byKey(const ValueKey('workspace-sidebar-primary-label')),
       matching: find.byType(Text),
@@ -5176,6 +5316,10 @@ Child body.
 
 Beta body.
 
+''';
+    const gammaSection = '''### Gamma
+
+Gamma body.
 ''';
     String? clipboardText;
     tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
@@ -5276,6 +5420,7 @@ Beta body.
     for (final label in [
       l10n.copy,
       l10n.cut,
+      l10n.aiRefineWithAi,
       l10n.promoteSection,
       l10n.demoteSection,
       l10n.moveSectionUp,
@@ -5334,6 +5479,44 @@ Beta body.
     expect(find.text(l10n.confirmDeleteSectionMessage('Beta')), findsOneWidget);
     await tester.tap(find.widgetWithText(BusyMarkDialogButton, l10n.delete));
     await expectSource(source.replaceFirst(betaSection, ''));
+
+    await resetSource();
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+    await tester.tap(headingRow('Alpha'));
+    await tester.tap(headingRow('Gamma'));
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+    await tester.pump();
+    await openMenu('Gamma');
+    expect(menuItem(l10n.copy), findsOneWidget);
+    expect(menuItem(l10n.cut), findsOneWidget);
+    expect(menuItem(l10n.aiRefineWithAi), findsOneWidget);
+    expect(menuItem(l10n.delete), findsOneWidget);
+    expect(menuItem(l10n.promoteSection), findsNothing);
+    await tester.tap(find.text(l10n.copy));
+    await tester.pumpAndSettle();
+    expect(clipboardText, '$alphaSection$gammaSection');
+
+    await openMenu('Gamma');
+    await tester.tap(find.text(l10n.cut));
+    await expectSource(
+      source.replaceFirst(alphaSection, '').replaceFirst(gammaSection, ''),
+    );
+    expect(clipboardText, '$alphaSection$gammaSection');
+
+    await resetSource();
+    await tester.tap(headingRow('Beta'));
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.shiftLeft);
+    await tester.tap(headingRow('Gamma'));
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.shiftLeft);
+    await tester.pump();
+    await openMenu('Gamma');
+    await tester.tap(find.text(l10n.delete));
+    await tester.pumpAndSettle();
+    expect(find.text(l10n.confirmDeleteSectionTitle), findsOneWidget);
+    await tester.tap(find.widgetWithText(BusyMarkDialogButton, l10n.delete));
+    await expectSource(
+      source.replaceFirst(betaSection, '').replaceFirst(gammaSection, ''),
+    );
   });
 
   testWidgets('outline highlights the heading at the document viewport', (
@@ -5498,6 +5681,9 @@ Beta body.
     );
     expectSelectedOutlineRow(2);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.editor);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.editor);
@@ -5544,6 +5730,9 @@ Beta body.
     );
     expectSelectedOutlineRow(1);
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.source);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.source);
@@ -6891,6 +7080,9 @@ Draft paragraph.
     expect(editorMarkerText.style?.fontWeight, FontWeight.w600);
     expect(editorAfterListGap, greaterThan(editorItemGap + BusyMarkSpacing.xs));
 
+    container
+        .read(workspaceControllerProvider.notifier)
+        .updateActiveEditorMode(DocumentViewModePreference.preview);
     await container
         .read(appSettingsControllerProvider.notifier)
         .setDocumentViewMode(DocumentViewModePreference.preview);
@@ -7419,24 +7611,6 @@ class _FallbackHeaderBarService extends LinuxHeaderBarService {
   Stream<HeaderBarAction> get actions => const Stream.empty();
 }
 
-class _OptionsOnlyWritersidePdfExportService
-    extends WritersidePdfExportService {
-  const _OptionsOnlyWritersidePdfExportService();
-
-  @override
-  Future<List<String>> discoverProjectConfigurations({
-    required String moduleRoot,
-    required String buildConfigDirectory,
-  }) async => const [];
-
-  @override
-  Future<List<WritersidePdfKeymapLayout>> discoverLayouts({
-    required String moduleRoot,
-    required String buildConfigDirectory,
-    required String instanceId,
-  }) async => const [];
-}
-
 class _MutableWorkspaceController extends WorkspaceController {
   _MutableWorkspaceController(this.initialState);
 
@@ -7789,13 +7963,20 @@ GitFileStatus _gitStatusFile(
 }
 
 class _SearchWorkspaceService extends WorkspaceService {
-  const _SearchWorkspaceService(this.source);
+  const _SearchWorkspaceService(this.source, {this.writerside = false});
 
   final String source;
+  final bool writerside;
 
   @override
   Future<Workspace> openPath(String path) async {
-    final markdown = markdownParser.parse(filePath: path, source: source);
+    final markdown = markdownParser.parse(
+      filePath: path,
+      source: source,
+      mode: writerside
+          ? MarkdownMode.writersideMarkdown
+          : MarkdownMode.commonMark,
+    );
     return Workspace(
       id: path,
       rootPath: path,
@@ -7807,7 +7988,9 @@ class _SearchWorkspaceService extends WorkspaceService {
         DocumentFile(
           absolutePath: path,
           relativePath: 'search-scroll.md',
-          kind: DocumentKind.markdown,
+          kind: writerside
+              ? DocumentKind.writersideMarkdownTopic
+              : DocumentKind.markdown,
           size: source.length,
           lastModified: DateTime(2026),
         ),
diff --git a/test/src/asset_ingestion_service_test.dart b/test/src/asset_ingestion_service_test.dart
new file mode 100644
index 00000000..b3c7730e
--- /dev/null
+++ b/test/src/asset_ingestion_service_test.dart
@@ -0,0 +1,146 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:busymark/src/assets/asset_ingestion_service.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  final png = base64Decode(
+    'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=',
+  );
+
+  test('ingests workspace images with safe names and portable paths', () async {
+    final workspace = await Directory.systemTemp.createTemp('busymark-assets-');
+    addTearDown(() => workspace.delete(recursive: true));
+    final document = File(p.join(workspace.path, 'docs', 'guide.md'));
+    await document.parent.create(recursive: true);
+    await document.writeAsString('# Guide\n');
+    final source = File(p.join(workspace.path, 'Screen shot (1).txt'));
+    await source.writeAsBytes(png);
+    const service = AssetIngestionService();
+
+    final result = await service.ingestFile(
+      sourcePath: source.path,
+      request: AssetIngestionRequest(
+        documentFilePath: document.path,
+        workspaceKind: AssetWorkspaceKind.markdownWorkspace,
+        workspaceRoot: workspace.path,
+      ),
+      origin: AssetIngestionOrigin.imagePicker,
+    );
+
+    expect(
+      result.absolutePath,
+      p.join(workspace.path, 'images', 'Screen-shot-1.png'),
+    );
+    expect(result.markdownPath, '../images/Screen-shot-1.png');
+    expect(result.mimeType, 'image/png');
+    expect(result.reusedExisting, isFalse);
+    expect(await File(result.absolutePath).readAsBytes(), png);
+  });
+
+  test('reuses identical assets and resolves name collisions', () async {
+    final workspace = await Directory.systemTemp.createTemp('busymark-assets-');
+    addTearDown(() => workspace.delete(recursive: true));
+    final document = File(p.join(workspace.path, 'note.md'))
+      ..writeAsStringSync('');
+    const service = AssetIngestionService();
+    final request = AssetIngestionRequest(
+      documentFilePath: document.path,
+      workspaceKind: AssetWorkspaceKind.markdownWorkspace,
+      workspaceRoot: workspace.path,
+    );
+
+    final first = await service.ingestBytes(
+      bytes: png,
+      suggestedFileName: 'image.png',
+      request: request,
+      origin: AssetIngestionOrigin.screenshotPaste,
+    );
+    final reused = await service.ingestBytes(
+      bytes: png,
+      suggestedFileName: 'different.png',
+      request: request,
+      origin: AssetIngestionOrigin.clipboardImageFile,
+    );
+    await File(first.absolutePath).writeAsBytes(<int>[...png.take(8), 1]);
+    final collision = await service.ingestBytes(
+      bytes: png,
+      suggestedFileName: 'image.png',
+      request: request,
+      origin: AssetIngestionOrigin.dragAndDrop,
+    );
+
+    expect(reused.absolutePath, first.absolutePath);
+    expect(reused.reusedExisting, isTrue);
+    expect(p.basename(collision.absolutePath), 'image-2.png');
+  });
+
+  test('uses the configured Writerside images directory', () async {
+    final project = await Directory.systemTemp.createTemp(
+      'busymark-ws-assets-',
+    );
+    addTearDown(() => project.delete(recursive: true));
+    final document = File(p.join(project.path, 'topics', 'guide.md'));
+    await document.parent.create(recursive: true);
+    await document.writeAsString('');
+
+    final result = await const AssetIngestionService().ingestBytes(
+      bytes: png,
+      suggestedFileName: 'diagram.png',
+      request: AssetIngestionRequest(
+        documentFilePath: document.path,
+        workspaceKind: AssetWorkspaceKind.writerside,
+        writersideRoot: project.path,
+        imagesDir: 'media/images',
+      ),
+      origin: AssetIngestionOrigin.imagePicker,
+    );
+
+    expect(
+      result.absolutePath,
+      p.join(project.path, 'media', 'images', 'diagram.png'),
+    );
+    expect(result.markdownPath, '../media/images/diagram.png');
+  });
+
+  test('requires saving untitled documents and rejects non-images', () async {
+    const service = AssetIngestionService();
+    const untitled = AssetIngestionRequest(
+      documentFilePath: '',
+      workspaceKind: AssetWorkspaceKind.standalone,
+    );
+
+    expect(
+      () => service.ingestBytes(
+        bytes: png,
+        suggestedFileName: 'image.png',
+        request: untitled,
+        origin: AssetIngestionOrigin.imagePicker,
+      ),
+      throwsA(isA<AssetSaveRequiredException>()),
+    );
+
+    final directory = await Directory.systemTemp.createTemp('busymark-assets-');
+    addTearDown(() => directory.delete(recursive: true));
+    expect(
+      () => service.ingestBytes(
+        bytes: utf8.encode('not an image'),
+        suggestedFileName: 'fake.png',
+        request: AssetIngestionRequest(
+          documentFilePath: p.join(directory.path, 'note.md'),
+          workspaceKind: AssetWorkspaceKind.standalone,
+        ),
+        origin: AssetIngestionOrigin.imagePicker,
+      ),
+      throwsA(
+        isA<AssetIngestionException>().having(
+          (error) => error.code,
+          'code',
+          'asset.invalid-image-type',
+        ),
+      ),
+    );
+  });
+}
diff --git a/test/src/busymark_design_test.dart b/test/src/busymark_design_test.dart
index 91510893..5f9eb6cc 100644
--- a/test/src/busymark_design_test.dart
+++ b/test/src/busymark_design_test.dart
@@ -1322,8 +1322,12 @@ void main() {
                 color: colors.view,
                 child: BusyMarkWysiwygToolbar(
                   onBlockCommand: (_) {},
+                  onAdmonitionCommand: (_) {},
+                  admonitionsEnabled: true,
                   onInlineCommand: (_) {},
                   onLinkCommand: () {},
+                  onInlineMathCommand: () {},
+                  onDisplayMathCommand: () {},
                   onImageCommand: () {},
                   onInlineImageCommand: () {},
                   onTableCommand: () {},
@@ -1341,7 +1345,7 @@ void main() {
       await tester.pump();
 
       final toolbar = find.byType(BusyMarkWysiwygToolbar);
-      final popup = tester.widget<BusyMarkHeaderPopupMenuButton>(
+      final popups = tester.widgetList<BusyMarkHeaderPopupMenuButton>(
         find.descendant(
           of: toolbar,
           matching: find.byWidgetPredicate(
@@ -1349,13 +1353,26 @@ void main() {
           ),
         ),
       );
-      expect(popup.transparent, isFalse);
-      expect(popup.elevated, isTrue);
-      expect(popup.foregroundColor, BusyMarkLinuxPalette.white);
-      expect(popup.backgroundColor?.resolve({}), accent);
+      expect(popups, hasLength(2));
+      expect(popups.every((popup) => !popup.transparent), isTrue);
+      expect(popups.every((popup) => popup.elevated), isTrue);
       expect(
-        popup.backgroundColor?.resolve({WidgetState.disabled}),
-        colors.disabledControl,
+        popups.every(
+          (popup) => popup.foregroundColor == BusyMarkLinuxPalette.white,
+        ),
+        isTrue,
+      );
+      expect(
+        popups.every((popup) => popup.backgroundColor?.resolve({}) == accent),
+        isTrue,
+      );
+      expect(
+        popups.every(
+          (popup) =>
+              popup.backgroundColor?.resolve({WidgetState.disabled}) ==
+              colors.disabledControl,
+        ),
+        isTrue,
       );
       final l10n = AppLocalizations.of(tester.element(toolbar));
       final buttons = tester
@@ -1374,9 +1391,12 @@ void main() {
         l10n.strikethrough,
         l10n.inlineCode,
         l10n.link,
+        l10n.inlineMath,
         l10n.hardLineBreak,
+        l10n.admonition,
         l10n.blockquote,
         l10n.codeBlock,
+        l10n.displayMath,
         l10n.htmlBlock,
         l10n.thematicBreak,
         l10n.unorderedList,
diff --git a/test/src/busymark_document_test.dart b/test/src/busymark_document_test.dart
index d7699de2..26cb8c8d 100644
--- a/test/src/busymark_document_test.dart
+++ b/test/src/busymark_document_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:ui' show CheckedState;
+import 'dart:ui' show BoxHeightStyle, CheckedState;
 
 import 'package:busymark/l10n/generated/app_localizations.dart';
 import 'package:busymark/l10n/generated/app_localizations_de.dart';
@@ -2890,6 +2890,7 @@ void main() {}
             text: firstParagraph,
             style: painter.style as TextStyle,
           ),
+          strutStyle: StrutStyle.fromTextStyle(painter.style as TextStyle),
           textDirection: painter.textDirection as TextDirection,
           textScaler: painter.textScaler as TextScaler,
           locale: painter.locale as Locale?,
@@ -2904,15 +2905,32 @@ void main() {}
       boxHeightStyle: BusyMarkDocumentTextGeometry.selectionHeightStyle,
       boxWidthStyle: BusyMarkDocumentTextGeometry.selectionWidthStyle,
     );
+    final tightHighlightBoxes = painterText.getBoxesForSelection(
+      TextSelection(
+        baseOffset: exampleStart,
+        extentOffset: exampleStart + 'example.'.length,
+      ),
+      boxHeightStyle: BoxHeightStyle.tight,
+      boxWidthStyle: BusyMarkDocumentTextGeometry.selectionWidthStyle,
+    );
     painterText.dispose();
 
     expect(highlightBoxes, hasLength(exampleBoxes.length));
+    expect(tightHighlightBoxes, hasLength(highlightBoxes.length));
     for (var index = 0; index < exampleBoxes.length; index += 1) {
       expect(highlightBoxes[index].top, closeTo(exampleBoxes[index].top, 0.01));
       expect(
         highlightBoxes[index].bottom,
         closeTo(exampleBoxes[index].bottom, 0.01),
       );
+      expect(
+        highlightBoxes[index].top,
+        lessThan(tightHighlightBoxes[index].top),
+      );
+      expect(
+        highlightBoxes[index].bottom,
+        greaterThan(tightHighlightBoxes[index].bottom),
+      );
     }
   });
 
@@ -4297,6 +4315,110 @@ void main() {}
     expect(controller.markdown, 'Hello **bold!** world\n');
   });
 
+  testWidgets('WYSIWYG link dialog submits with Enter', (tester) async {
+    final parsed = parser.parse(filePath: 'topic.md', source: 'Linked word\n');
+    var markdown = parsed.source;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SizedBox(
+            width: 900,
+            height: 640,
+            child: BusyMarkWysiwygEditor(
+              document: parsed.busyDocument,
+              onSourceChanged: (filePath, value) => markdown = value,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    final editorField = tester.widget<TextField>(find.byType(TextField).first);
+    editorField.focusNode!.requestFocus();
+    editorField.controller!.selection = const TextSelection(
+      baseOffset: 0,
+      extentOffset: 6,
+    );
+    await tester.tap(find.byIcon(BusyMarkGlyphs.link));
+    await tester.pumpAndSettle();
+
+    final destinationField = find.byKey(
+      const ValueKey('wysiwyg-link-destination-field'),
+    );
+    await tester.enterText(destinationField, 'https://example.com');
+    await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+    await tester.pumpAndSettle();
+
+    expect(destinationField, findsNothing);
+    expect(markdown, '[Linked](https://example.com) word\n');
+  });
+
+  for (final (selectionDescription, selection) in const [
+    ('caret is inside it', TextSelection.collapsed(offset: 8)),
+    ('its text is selected', TextSelection(baseOffset: 6, extentOffset: 14)),
+  ]) {
+    testWidgets(
+      'WYSIWYG link dialog edits an existing link when $selectionDescription',
+      (tester) async {
+        const oldDestination = 'https://old.example';
+        const newDestination = 'https://new.example';
+        final parsed = parser.parse(
+          filePath: 'topic.md',
+          source: 'Visit [BusyMark]($oldDestination) today\n',
+        );
+        var markdown = parsed.source;
+
+        await tester.pumpWidget(
+          MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Scaffold(
+              body: SizedBox(
+                width: 900,
+                height: 640,
+                child: BusyMarkWysiwygEditor(
+                  document: parsed.busyDocument,
+                  onSourceChanged: (filePath, value) => markdown = value,
+                ),
+              ),
+            ),
+          ),
+        );
+        await tester.pump();
+
+        final editorField = tester.widget<TextField>(
+          find.byType(TextField).first,
+        );
+        editorField.focusNode!.requestFocus();
+        editorField.controller!.selection = selection;
+        await tester.tap(find.byIcon(BusyMarkGlyphs.link));
+        await tester.pumpAndSettle();
+
+        final destinationField = find.byKey(
+          const ValueKey('wysiwyg-link-destination-field'),
+        );
+        final destinationInput = find.descendant(
+          of: destinationField,
+          matching: find.byType(EditableText),
+        );
+        expect(
+          tester.widget<EditableText>(destinationInput).controller.text,
+          oldDestination,
+        );
+
+        await tester.enterText(destinationField, newDestination);
+        await tester.tap(find.text(AppLocalizationsEn().apply));
+        await tester.pumpAndSettle();
+
+        expect(markdown, 'Visit [BusyMark]($newDestination) today\n');
+      },
+    );
+  }
+
   test(
     'WYSIWYG inline command toggles selected mark without dropping links',
     () {
@@ -5564,6 +5686,85 @@ void main() {}
     expect(controller.markdown, '');
   });
 
+  test('table alignment survives parsing, edits, and structural changes', () {
+    const source =
+        '| Left | Center | Right | Default |\n'
+        '| :--- | :---: | ---: | --- |\n'
+        '| a | b | c | d |\n';
+    final parsed = parser.parse(filePath: 'topic.md', source: source);
+    final table = parsed.busyDocument.blocks.single;
+    final header = table.children.first.children;
+
+    expect(header.map((cell) => cell.attributes['align']), [
+      'left',
+      'center',
+      'right',
+      isNull,
+    ]);
+
+    final controller = BusyMarkWysiwygDocumentController(
+      document: parsed.busyDocument,
+    );
+    String tableId() => controller.document.blocks.single.id;
+    final firstBodyCell = table.children[1].children.first.id;
+    controller.updateTableCellText(tableId(), firstBodyCell, 'edited');
+    controller.insertTableRow(tableId(), 0, after: false);
+    controller.insertTableColumn(tableId(), 1, after: true);
+
+    expect(
+      controller.markdown,
+      '|  |  |  |  |  |\n'
+      '| :--- | :---: | --- | ---: | --- |\n'
+      '| Left | Center |  | Right | Default |\n'
+      '| edited | b |  | c | d |\n',
+    );
+
+    controller.deleteTableColumn(tableId(), 2);
+    expect(
+      controller.markdown,
+      '|  |  |  |  |\n'
+      '| :--- | :---: | ---: | --- |\n'
+      '| Left | Center | Right | Default |\n'
+      '| edited | b | c | d |\n',
+    );
+
+    final roundTrip = parser.parse(
+      filePath: 'topic.md',
+      source: controller.markdown,
+    );
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(roundTrip.busyDocument),
+      controller.markdown,
+    );
+  });
+
+  test('table column alignment command supports all Markdown alignments', () {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: '| A | B |\n| --- | --- |\n| a | b |\n',
+    );
+    final controller = BusyMarkWysiwygDocumentController(
+      document: parsed.busyDocument,
+    );
+    final tableId = controller.document.blocks.single.id;
+
+    controller.setTableColumnAlignment(tableId, 0, BusyTableAlignment.left);
+    controller.setTableColumnAlignment(tableId, 1, BusyTableAlignment.center);
+    expect(controller.markdown, contains('| :--- | :---: |'));
+
+    controller.setTableColumnAlignment(tableId, 0, BusyTableAlignment.right);
+    controller.setTableColumnAlignment(
+      tableId,
+      1,
+      BusyTableAlignment.unspecified,
+    );
+    expect(controller.markdown, contains('| ---: | --- |'));
+    expect(
+      controller.tableColumnAlignment(tableId, 0),
+      BusyTableAlignment.right,
+    );
+  });
+
   testWidgets('WYSIWYG table cells are formatted and editable', (tester) async {
     final parsed = parser.parse(
       filePath: 'topic.md',
@@ -5633,6 +5834,14 @@ void main() {}
     );
     expect(headerField.onChanged, isNotNull);
     expect(bodyField.onChanged, isNotNull);
+    expect(
+      headerField.selectionHeightStyle,
+      BusyMarkDocumentTextGeometry.selectionHeightStyle,
+    );
+    expect(
+      bodyField.selectionHeightStyle,
+      BusyMarkDocumentTextGeometry.selectionHeightStyle,
+    );
 
     headerField.onChanged!('Name');
     await tester.pump();
@@ -5647,6 +5856,16 @@ void main() {}
       '| Alice | Cell |\n',
     );
 
+    await tester.tap(find.byTooltip('Column 1'));
+    await tester.pumpAndSettle();
+    expect(find.text('Alignment: Unspecified'), findsOneWidget);
+    expect(find.text('Alignment: Left'), findsOneWidget);
+    expect(find.text('Alignment: Center'), findsOneWidget);
+    expect(find.text('Alignment: Right'), findsOneWidget);
+    await tester.tap(find.text('Alignment: Left'));
+    await tester.pumpAndSettle();
+    expect(markdown, contains('| :--- | --- |'));
+
     await tester.tap(deleteTableFinder);
     await tester.pump();
 
diff --git a/test/src/busymark_toast_test.dart b/test/src/busymark_toast_test.dart
new file mode 100644
index 00000000..0bbad477
--- /dev/null
+++ b/test/src/busymark_toast_test.dart
@@ -0,0 +1,148 @@
+import 'package:busymark/src/app/app_theme.dart';
+import 'package:busymark/src/app/busymark_toast.dart';
+import 'package:busymark/src/app/system_accent.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('toast works when hosted above the Navigator', (tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: buildBusyMarkTheme(
+          brightness: Brightness.light,
+          accentColor: busyMarkDefaultAccentColor,
+        ),
+        builder: (context, child) => BusyMarkToastOverlay(child: child!),
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: Center(
+              child: ElevatedButton(
+                onPressed: () => BusyMarkToastOverlay.show(
+                  context,
+                  message: 'Commit succeeded',
+                  duration: Duration.zero,
+                ),
+                child: const Text('Commit'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Commit'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Commit succeeded'), findsOneWidget);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('toast appears at the bottom center and dismisses itself', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      _toastApp(
+        Builder(
+          builder: (context) => Center(
+            child: ElevatedButton(
+              onPressed: () => BusyMarkToastOverlay.show(
+                context,
+                message: 'Document saved',
+                duration: const Duration(seconds: 1),
+              ),
+              child: const Text('Show'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Show'));
+    await tester.pumpAndSettle(const Duration(milliseconds: 200));
+
+    expect(find.text('Document saved'), findsOneWidget);
+    final messageCenter = tester.getCenter(find.text('Document saved'));
+    expect(messageCenter.dx, closeTo(400, 120));
+    expect(messageCenter.dy, greaterThan(500));
+
+    await tester.pump(const Duration(seconds: 1));
+    await tester.pumpAndSettle(const Duration(milliseconds: 200));
+    expect(find.text('Document saved'), findsNothing);
+  });
+
+  testWidgets('toast action runs and dismisses the toast', (tester) async {
+    var actionInvoked = false;
+    await tester.pumpWidget(
+      _toastApp(
+        Builder(
+          builder: (context) => Center(
+            child: ElevatedButton(
+              onPressed: () => BusyMarkToastOverlay.show(
+                context,
+                message: 'PDF exported',
+                actionLabel: 'Open',
+                onAction: () => actionInvoked = true,
+                duration: Duration.zero,
+              ),
+              child: const Text('Export'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Export'));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Open'));
+    await tester.pumpAndSettle();
+
+    expect(actionInvoked, isTrue);
+    expect(find.text('PDF exported'), findsNothing);
+  });
+
+  testWidgets('toasts queue instead of covering each other', (tester) async {
+    await tester.pumpWidget(
+      _toastApp(
+        Builder(
+          builder: (context) => Center(
+            child: ElevatedButton(
+              onPressed: () {
+                BusyMarkToastOverlay.show(
+                  context,
+                  message: 'First message',
+                  duration: const Duration(milliseconds: 500),
+                );
+                BusyMarkToastOverlay.show(
+                  context,
+                  message: 'Second message',
+                  duration: Duration.zero,
+                );
+              },
+              child: const Text('Show both'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Show both'));
+    await tester.pump(const Duration(milliseconds: 200));
+    expect(find.text('First message'), findsOneWidget);
+    expect(find.text('Second message'), findsNothing);
+
+    await tester.pump(const Duration(milliseconds: 500));
+    await tester.pump(const Duration(milliseconds: 200));
+    expect(find.text('First message'), findsNothing);
+    expect(find.text('Second message'), findsOneWidget);
+  });
+}
+
+Widget _toastApp(Widget child) {
+  return MaterialApp(
+    theme: buildBusyMarkTheme(
+      brightness: Brightness.light,
+      accentColor: busyMarkDefaultAccentColor,
+    ),
+    home: BusyMarkToastOverlay(child: Scaffold(body: child)),
+  );
+}
diff --git a/test/src/command_registry_test.dart b/test/src/command_registry_test.dart
new file mode 100644
index 00000000..c22a5b9e
--- /dev/null
+++ b/test/src/command_registry_test.dart
@@ -0,0 +1,163 @@
+import 'package:busymark/src/app/command_registry.dart';
+import 'package:busymark/src/app/busymark_shortcuts.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter/widgets.dart';
+
+void main() {
+  test('catalog includes every editor command with an executable callback', () {
+    final registry = BusyMarkCommandCatalog.create();
+
+    for (final action in BusyMarkEditorShortcutAction.values) {
+      final command = registry['editor.${action.name}'];
+      expect(command, isNotNull, reason: action.name);
+      expect(command!.execute, isNotNull, reason: action.name);
+    }
+  });
+
+  BusyMarkCommand command(
+    String id, {
+    BusyMarkShortcutDefinition? shortcut,
+    BusyMarkCommandScope scope = BusyMarkCommandScope.application,
+  }) {
+    return BusyMarkCommand(
+      id: id,
+      label: (_) => id,
+      category: (_) => 'Test',
+      scope: scope,
+      shortcut: shortcut,
+    );
+  }
+
+  test('catalog exposes stable unique IDs for all migrated shortcuts', () {
+    final registry = BusyMarkCommandCatalog.create();
+
+    expect(registry.commands, isNotEmpty);
+    expect(registry[BusyMarkCommandIds.save]?.shortcut?.label, 'Ctrl+S');
+    expect(
+      registry[BusyMarkCommandIds.commandPalette]?.shortcut?.label,
+      'Ctrl+Shift+P',
+    );
+    expect(
+      registry.commands.map((command) => command.id).toSet().length,
+      registry.commands.length,
+    );
+    expect(registry[BusyMarkCommandIds.editorRefineWithAi]?.execute, isNotNull);
+    expect(
+      registry[BusyMarkCommandIds.editorRefineWithAi]?.disabledReason,
+      isNotNull,
+    );
+  });
+
+  test('rejects duplicate command IDs', () {
+    expect(
+      () => BusyMarkCommandRegistry([
+        command('test.duplicate'),
+        command('test.duplicate'),
+      ]),
+      throwsA(isA<BusyMarkCommandRegistryValidationException>()),
+    );
+  });
+
+  test('rejects shortcut conflicts in the same command scope', () {
+    const shortcut = BusyMarkShortcutDefinition(
+      label: 'Ctrl+J',
+      activator: SingleActivator(LogicalKeyboardKey.keyJ, control: true),
+    );
+
+    expect(
+      () => BusyMarkCommandRegistry([
+        command('test.first', shortcut: shortcut),
+        command('test.second', shortcut: shortcut),
+      ]),
+      throwsA(isA<BusyMarkCommandRegistryValidationException>()),
+    );
+  });
+
+  test('allows the same shortcut in distinct focus scopes', () {
+    const shortcut = BusyMarkShortcutDefinition(
+      label: 'Ctrl+J',
+      activator: SingleActivator(LogicalKeyboardKey.keyJ, control: true),
+    );
+
+    expect(
+      () => BusyMarkCommandRegistry([
+        command('test.first', shortcut: shortcut),
+        command(
+          'test.second',
+          shortcut: shortcut,
+          scope: BusyMarkCommandScope.editor,
+        ),
+      ]),
+      returnsNormally,
+    );
+  });
+
+  test('executes only visible enabled bound commands', () async {
+    var calls = 0;
+    final registry = BusyMarkCommandRegistry([
+      BusyMarkCommand(
+        id: 'test.run',
+        label: (_) => 'Run',
+        category: (_) => 'Test',
+        scope: BusyMarkCommandScope.application,
+        execute: () => calls++,
+      ),
+      BusyMarkCommand(
+        id: 'test.disabled',
+        label: (_) => 'Disabled',
+        category: (_) => 'Test',
+        scope: BusyMarkCommandScope.application,
+        enabled: () => false,
+        execute: () => calls++,
+      ),
+    ]);
+
+    expect(await registry.execute('test.run'), isTrue);
+    expect(await registry.execute('test.disabled'), isFalse);
+    expect(await registry.execute('test.missing'), isFalse);
+    expect(calls, 1);
+  });
+
+  testWidgets('contextual commands execute against the captured editor', (
+    tester,
+  ) async {
+    final registry = BusyMarkCommandCatalog.create();
+    var calls = 0;
+    late BuildContext editorContext;
+    final focusNode = FocusNode();
+    addTearDown(focusNode.dispose);
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: Actions(
+          actions: {
+            BusyMarkContextCommandIntent: BusyMarkContextCommandAction(
+              isCommandEnabled: (id) => id == 'editor.bold',
+              onCommand: (_) => calls++,
+            ),
+          },
+          child: Focus(
+            focusNode: focusNode,
+            child: Builder(
+              builder: (context) {
+                editorContext = context;
+                return const SizedBox();
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+    focusNode.requestFocus();
+    await tester.pump();
+
+    expect(registry.canExecuteInContext('editor.bold', editorContext), isTrue);
+    expect(
+      registry.canExecuteInContext('editor.italic', editorContext),
+      isFalse,
+    );
+    expect(await registry.executeInContext('editor.bold', editorContext), true);
+    expect(calls, 1);
+  });
+}
diff --git a/test/src/d2_renderer_test.dart b/test/src/d2_renderer_test.dart
index f5aed9f6..8ff451d5 100644
--- a/test/src/d2_renderer_test.dart
+++ b/test/src/d2_renderer_test.dart
@@ -257,6 +257,12 @@ class _RasterHost implements WebRenderHost {
   double? lastScale;
   String? lastSvg;
 
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) => throw UnimplementedError();
+
   @override
   Future<void> copyPngToClipboard(Uint8List pngBytes) async {}
 
diff --git a/test/src/document_format_indicator_test.dart b/test/src/document_format_indicator_test.dart
new file mode 100644
index 00000000..756d2040
--- /dev/null
+++ b/test/src/document_format_indicator_test.dart
@@ -0,0 +1,85 @@
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/app/app_theme.dart';
+import 'package:busymark/src/app/busymark_design.dart';
+import 'package:busymark/src/workspace/presentation/document_format_indicator.dart';
+import 'package:busymark/src/workspace/text_format_metadata.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('shows only a compact line-ending label', (tester) async {
+    await _pumpIndicator(
+      tester,
+      const TextFormatMetadata(
+        hasUtf8Bom: false,
+        lineEnding: DocumentLineEnding.lf,
+        hasFinalNewline: true,
+        lfCount: 2,
+      ),
+    );
+
+    expect(find.text('LF'), findsOneWidget);
+    expect(find.textContaining('UTF-8'), findsNothing);
+    expect(find.textContaining('Final newline'), findsNothing);
+    expect(
+      tester.widget<Tooltip>(find.byType(Tooltip)).message,
+      'UTF-8 · LF · Final newline',
+    );
+    final size = tester.getSize(find.byType(BusyMarkDocumentFormatIndicator));
+    expect(size.width, lessThan(80));
+    expect(size.height, lessThan(32));
+  });
+
+  testWidgets('makes BOM visible and keeps final-newline detail compact', (
+    tester,
+  ) async {
+    await _pumpIndicator(
+      tester,
+      const TextFormatMetadata(
+        hasUtf8Bom: true,
+        lineEnding: DocumentLineEnding.crlf,
+        hasFinalNewline: false,
+        crlfCount: 2,
+      ),
+    );
+
+    expect(find.text('BOM · CRLF'), findsOneWidget);
+    expect(
+      tester.widget<Tooltip>(find.byType(Tooltip)).message,
+      'UTF-8 BOM · CRLF · No final newline',
+    );
+  });
+
+  testWidgets('uses a compact technical label for mixed line endings', (
+    tester,
+  ) async {
+    await _pumpIndicator(
+      tester,
+      const TextFormatMetadata(
+        hasUtf8Bom: false,
+        lineEnding: DocumentLineEnding.mixed,
+        hasFinalNewline: true,
+        lfCount: 1,
+        crlfCount: 1,
+      ),
+    );
+
+    expect(find.text('LF/CRLF'), findsOneWidget);
+  });
+}
+
+Future<void> _pumpIndicator(WidgetTester tester, TextFormatMetadata format) {
+  return tester.pumpWidget(
+    MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      theme: buildBusyMarkTheme(
+        brightness: Brightness.dark,
+        accentColor: BusyMarkLinuxPalette.blueAccent,
+      ),
+      home: Scaffold(
+        body: Center(child: BusyMarkDocumentFormatIndicator(format: format)),
+      ),
+    ),
+  );
+}
diff --git a/test/src/document_persistence_test.dart b/test/src/document_persistence_test.dart
new file mode 100644
index 00000000..5f2b089e
--- /dev/null
+++ b/test/src/document_persistence_test.dart
@@ -0,0 +1,191 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:busymark/src/app/app_settings.dart';
+import 'package:busymark/src/workspace/document_buffer.dart';
+import 'package:busymark/src/workspace/recovery_persistence.dart';
+import 'package:busymark/src/workspace/session_persistence.dart';
+import 'package:busymark/src/workspace/text_format_metadata.dart';
+import 'package:busymark/src/workspace/workspace_file_snapshot.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  test('file-backed edits update final-newline metadata', () {
+    final buffer = DocumentBuffer.file(
+      id: 'file:note',
+      filePath: '/workspace/note.md',
+      text: 'Saved\n',
+      snapshot: WorkspaceFileSnapshot(
+        modifiedAt: DateTime.utc(2026),
+        size: 6,
+        contentHash: 'saved',
+      ),
+      format: const TextFormatMetadata(
+        hasUtf8Bom: false,
+        lineEnding: DocumentLineEnding.lf,
+        hasFinalNewline: true,
+      ),
+    );
+
+    final removed = buffer.edited('Saved');
+    final restored = removed.edited('Saved\n');
+
+    expect(removed.format.hasFinalNewline, isFalse);
+    expect(removed.format.formattedText(removed.text), 'Saved');
+    expect(restored.format.hasFinalNewline, isTrue);
+    expect(restored.format.formattedText(restored.text), 'Saved\n');
+  });
+
+  test('session store keeps only tab identity and editor state', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-session-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final store = JsonDocumentSessionStore(
+      filePathOverride: p.join(directory.path, 'session.json'),
+    );
+    final snapshot = WorkspaceSessionSnapshot(
+      workspacePath: '/workspace',
+      activeBufferId: 'second',
+      tabs: [
+        DocumentSessionEntry(
+          id: 'first',
+          filePath: '/workspace/first.md',
+          untitledName: null,
+          editorState: const DocumentEditorState(
+            mode: DocumentViewModePreference.split,
+            selection: TextSelection(baseOffset: 2, extentOffset: 8),
+            scrollOffset: 42,
+            foldedRegionKeys: {'heading:2'},
+          ),
+        ),
+        const DocumentSessionEntry(
+          id: 'second',
+          filePath: null,
+          untitledName: 'Untitled 2',
+          editorState: DocumentEditorState(),
+        ),
+      ],
+    );
+
+    await store.save(snapshot);
+    final restored = await store.load();
+
+    expect(restored?.workspacePath, '/workspace');
+    expect(restored?.activeBufferId, 'second');
+    expect(restored?.tabs.map((entry) => entry.id), ['first', 'second']);
+    expect(
+      restored?.tabs.first.editorState.mode,
+      DocumentViewModePreference.split,
+    );
+    expect(
+      restored?.tabs.first.editorState.selection,
+      const TextSelection(baseOffset: 2, extentOffset: 8),
+    );
+    expect(restored?.tabs.first.editorState.scrollOffset, 42);
+    expect(restored?.tabs.first.editorState.foldedRegionKeys, {'heading:2'});
+    final persisted =
+        jsonDecode(
+              await File(p.join(directory.path, 'session.json')).readAsString(),
+            )
+            as Map<String, Object?>;
+    final firstTab = ((persisted['tabs'] as List).first as Map)
+        .cast<String, Object?>();
+    expect(firstTab, isNot(contains('lastKnownText')));
+    expect(firstTab, isNot(contains('diskSnapshot')));
+    expect(firstTab, isNot(contains('format')));
+    expect(
+      await File(p.join(directory.path, 'session.json')).readAsString(),
+      isNot(contains('# First')),
+    );
+  });
+
+  test('recovery store distinguishes clean and unclean runs', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-recovery-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final path = p.join(directory.path, 'recovery.json');
+    final store = JsonDocumentRecoveryStore(filePathOverride: path);
+    final buffer = DocumentBuffer(
+      id: 'file:note',
+      filePath: '/workspace/note.md',
+      text: '# Unsaved\n',
+      lastSavedText: '# Saved\n',
+      dirty: true,
+      diskSnapshot: WorkspaceFileSnapshot(
+        modifiedAt: DateTime.utc(2026),
+        size: 8,
+        contentHash: 'saved',
+      ),
+      format: const TextFormatMetadata(
+        hasUtf8Bom: true,
+        lineEnding: DocumentLineEnding.crlf,
+        hasFinalNewline: true,
+      ),
+    );
+
+    expect((await store.beginRun()).cleanShutdown, isTrue);
+    await store.writeEntries([
+      DocumentRecoveryEntry.fromBuffer(buffer, workspacePath: '/workspace'),
+    ]);
+
+    final afterCrash = JsonDocumentRecoveryStore(filePathOverride: path);
+    final recovered = await afterCrash.beginRun();
+    expect(recovered.cleanShutdown, isFalse);
+    expect(recovered.entries.single.text, '# Unsaved\n');
+    expect(recovered.entries.single.diskSnapshot?.contentHash, 'saved');
+    expect(recovered.entries.single.format.hasUtf8Bom, isTrue);
+
+    await afterCrash.markCleanShutdown();
+    final normalStart = JsonDocumentRecoveryStore(filePathOverride: path);
+    final cleanRecovery = await normalStart.beginRun();
+    expect(cleanRecovery.cleanShutdown, isTrue);
+    expect(cleanRecovery.entries.single.text, '# Unsaved\n');
+  });
+
+  test(
+    'recovery keeps valid entries when another record is malformed',
+    () async {
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-recovery-partial-',
+      );
+      addTearDown(() => directory.delete(recursive: true));
+      final path = p.join(directory.path, 'recovery.json');
+      final store = JsonDocumentRecoveryStore(filePathOverride: path);
+      final buffer = DocumentBuffer.untitled(
+        id: 'untitled:1',
+        name: 'Untitled 1',
+        text: 'Keep me',
+      );
+      await store.writeEntries([
+        DocumentRecoveryEntry.fromBuffer(buffer, workspacePath: null),
+      ]);
+      final decoded = jsonDecode(await File(path).readAsString()) as Map;
+      (decoded['entries'] as List).add({'id': 'broken', 'text': 42});
+      await File(path).writeAsString(jsonEncode(decoded));
+
+      final recovered = await store.beginRun();
+
+      expect(recovered.entries.single.id, 'untitled:1');
+      expect(recovered.entries.single.text, 'Keep me');
+      expect(recovered.readErrors, 1);
+    },
+  );
+
+  test('recovery state is written with private POSIX permissions', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-recovery-permissions-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final path = p.join(directory.path, 'recovery.json');
+    final store = JsonDocumentRecoveryStore(filePathOverride: path);
+
+    await store.writeEntries(const []);
+
+    expect((await File(path).stat()).mode & 0x1ff, 0x180);
+    expect((await directory.stat()).mode & 0x1ff, 0x1c0);
+  }, skip: Platform.isWindows ? 'POSIX permissions only.' : false);
+}
diff --git a/test/src/editor_ui_primitives_audit_test.dart b/test/src/editor_ui_primitives_audit_test.dart
index 437b239a..78b89903 100644
--- a/test/src/editor_ui_primitives_audit_test.dart
+++ b/test/src/editor_ui_primitives_audit_test.dart
@@ -54,7 +54,11 @@ void main() {
     expect(htmlBlock, isNot(matches(RegExp(r'(?<![A-Za-z])IconButton\('))));
     expect(tableEditor, contains('BusyMarkHeaderIconButton('));
     expect(tableMenu, contains('BusyMarkHeaderPopupMenuButton'));
-    expect(RegExp(r'BusyMarkPopupMenuItem\(').allMatches(tableMenu).length, 3);
+    expect(RegExp(r'BusyMarkPopupMenuItem\(').allMatches(tableMenu).length, 7);
+    expect(tableMenu, contains('_TableControlAction.alignUnspecified'));
+    expect(tableMenu, contains('_TableControlAction.alignLeft'));
+    expect(tableMenu, contains('_TableControlAction.alignCenter'));
+    expect(tableMenu, contains('_TableControlAction.alignRight'));
     expect(tableMenu, isNot(matches(RegExp(r'(?<![A-Za-z])PopupMenuItem\('))));
   });
 
diff --git a/test/src/git/git_author_identity_dialog_test.dart b/test/src/git/git_author_identity_dialog_test.dart
new file mode 100644
index 00000000..a319e72c
--- /dev/null
+++ b/test/src/git/git_author_identity_dialog_test.dart
@@ -0,0 +1,190 @@
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/app/app_theme.dart';
+import 'package:busymark/src/app/busymark_toast.dart';
+import 'package:busymark/src/git/application/git_controller.dart';
+import 'package:busymark/src/git/domain/git_models.dart';
+import 'package:busymark/src/git/presentation/git_author_identity_dialog.dart';
+import 'package:busymark/src/git/presentation/git_sidebar_tab.dart';
+import 'package:busymark/src/workspace/workspace_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('Enter submits Git identity and preserves global scope', (
+    tester,
+  ) async {
+    GitAuthorIdentityInput? result;
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        theme: buildBusyMarkTheme(
+          brightness: Brightness.light,
+          accentColor: const Color(0xFFB34CB4),
+        ),
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: ElevatedButton(
+              onPressed: () async {
+                result = await showGitAuthorIdentityDialog(context);
+              },
+              child: const Text('Commit'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Commit'));
+    await tester.pumpAndSettle();
+    expect(find.text('Git Author Identity'), findsOneWidget);
+
+    final fields = find.byType(TextFormField);
+    await tester.enterText(fields.at(0), 'Albert Gee');
+    await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+    await tester.enterText(fields.at(1), 'albert@example.com');
+    await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+    await tester.pumpAndSettle();
+
+    expect(find.text('Git Author Identity'), findsNothing);
+    expect(result?.name, 'Albert Gee');
+    expect(result?.email, 'albert@example.com');
+    expect(result?.globally, isTrue);
+  });
+
+  testWidgets('failed commit saves identity and retries the same commit', (
+    tester,
+  ) async {
+    final controller = _IdentityRecoveryGitController();
+    final workspace = Workspace(
+      id: '/repo',
+      rootPath: '/repo',
+      kind: WorkspaceKind.markdownFolder,
+      openedAt: DateTime(2026),
+      files: const [],
+      diagnostics: const [],
+    );
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [gitControllerProvider.overrideWith(() => controller)],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          theme: buildBusyMarkTheme(
+            brightness: Brightness.light,
+            accentColor: const Color(0xFFB34CB4),
+          ),
+          home: BusyMarkToastOverlay(
+            child: Scaffold(
+              body: GitSidebarTab(
+                workspace: workspace,
+                onOpenFile: (_) {},
+                onConfirmDiscard: (_) async => true,
+                onAfterWorkspaceFilesChanged: () async {},
+                onConfirmSwitchBranch: (_) async => true,
+                onConfirmPushSetUpstream: () async => true,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.enterText(find.byType(TextField), 'Document strict Git');
+    await tester.pump();
+    await tester.tap(find.text('Commit'));
+    await tester.pumpAndSettle();
+    expect(controller.commitMessages, ['Document strict Git']);
+    expect(find.text('Git Author Identity'), findsOneWidget);
+
+    final fields = find.byType(TextFormField);
+    await tester.enterText(fields.at(0), 'Albert Gee');
+    await tester.enterText(fields.at(1), 'albert@example.com');
+    await tester.pump();
+    await tester.tap(find.text('Save and Commit'));
+    await tester.pumpAndSettle();
+
+    expect(controller.commitMessages, [
+      'Document strict Git',
+      'Document strict Git',
+    ]);
+    expect(controller.configuredName, 'Albert Gee');
+    expect(controller.configuredEmail, 'albert@example.com');
+    expect(controller.configuredGlobally, isTrue);
+  });
+}
+
+class _IdentityRecoveryGitController extends GitController {
+  static const repository = GitRepositoryInfo(
+    rootPath: '/repo',
+    gitDirPath: '/repo/.git',
+    currentBranch: 'main',
+  );
+
+  final commitMessages = <String>[];
+  String? configuredName;
+  String? configuredEmail;
+  bool? configuredGlobally;
+
+  @override
+  GitState build() => const GitState(
+    availability: GitAvailability(
+      available: true,
+      executablePath: '/snap/busymark/current/usr/bin/git',
+      version: '2.50.0',
+    ),
+    repositoryInfo: repository,
+    statusSnapshot: GitStatusSnapshot(
+      repositoryInfo: repository,
+      files: [
+        GitFileStatus(
+          repoRelativePath: 'README.md',
+          absolutePath: '/repo/README.md',
+          indexStatus: GitFileChangeStatus.modified,
+          workTreeStatus: GitFileChangeStatus.unmodified,
+          category: GitFileStatusCategory.modified,
+          staged: true,
+          unstaged: false,
+          untracked: false,
+          conflicted: false,
+          renamed: false,
+          copied: false,
+          deleted: false,
+          ignored: false,
+        ),
+      ],
+    ),
+  );
+
+  @override
+  Future<bool> commit(String message) async {
+    commitMessages.add(message);
+    if (commitMessages.length == 1) {
+      state = state.copyWith(
+        lastError: const GitFailure(
+          code: GitFailureCode.authorIdentity,
+          userMessageKey: 'gitErrorAuthorIdentity',
+          rawMessage: 'Author identity unknown',
+          commandName: 'commit',
+        ),
+      );
+      return false;
+    }
+    state = state.copyWith(lastError: null, lastOperationMessage: 'Committed');
+    return true;
+  }
+
+  @override
+  Future<bool> configureAuthorIdentity({
+    required String name,
+    required String email,
+    required bool globally,
+  }) async {
+    configuredName = name;
+    configuredEmail = email;
+    configuredGlobally = globally;
+    state = state.copyWith(lastError: null);
+    return true;
+  }
+}
diff --git a/test/src/git/git_cli_gateway_integration_test.dart b/test/src/git/git_cli_gateway_integration_test.dart
index e9b1b7a9..3f1c1998 100644
--- a/test/src/git/git_cli_gateway_integration_test.dart
+++ b/test/src/git/git_cli_gateway_integration_test.dart
@@ -10,6 +10,43 @@ void main() {
     expect(const GitCliGateway().requiresWorkspaceTrust, isTrue);
   });
 
+  test(
+    'configures a repository author identity without terminal setup',
+    () async {
+      if (!await _gitAvailable()) {
+        markTestSkipped('Git executable is unavailable.');
+        return;
+      }
+      final root = await Directory.systemTemp.createTemp(
+        'busymark-git-identity-',
+      );
+      addTearDown(() async {
+        if (await root.exists()) {
+          await root.delete(recursive: true);
+        }
+      });
+      await _git(root.path, ['init']);
+      const gateway = GitCliGateway();
+      final info = await gateway.detectRepository(root.path);
+
+      await gateway.configureAuthorIdentity(
+        info!,
+        name: 'BusyMark User',
+        email: 'busymark@example.com',
+        globally: false,
+      );
+
+      expect(
+        await _gitOutput(root.path, ['config', '--local', 'user.name']),
+        'BusyMark User',
+      );
+      expect(
+        await _gitOutput(root.path, ['config', '--local', 'user.email']),
+        'busymark@example.com',
+      );
+    },
+  );
+
   test('runs core workflow in a temporary Git repository', () async {
     if (!await _gitAvailable()) {
       markTestSkipped('Git executable is unavailable.');
diff --git a/test/src/git/git_controller_test.dart b/test/src/git/git_controller_test.dart
index d4b7082b..d814064b 100644
--- a/test/src/git/git_controller_test.dart
+++ b/test/src/git/git_controller_test.dart
@@ -416,6 +416,25 @@ void main() {
     expect(gateway.commitCalls, 0);
   });
 
+  test('configures author identity through the active repository', () async {
+    final gateway = _FakeGitGateway(staged: true);
+    final container = _container(gateway);
+    final controller = container.read(gitControllerProvider.notifier);
+    controller.attachWorkspace(_workspace());
+    await controller.refresh();
+
+    final configured = await controller.configureAuthorIdentity(
+      name: 'Albert Gee',
+      email: 'albert@example.com',
+      globally: true,
+    );
+
+    expect(configured, isTrue);
+    expect(gateway.authorName, 'Albert Gee');
+    expect(gateway.authorEmail, 'albert@example.com');
+    expect(gateway.authorIdentityGlobal, isTrue);
+  });
+
   test('AI staged-diff fingerprint rejects obsolete commit context', () async {
     final gateway = _FakeGitGateway(staged: true)
       ..stagedRawPatch = 'diff --git a/a.md b/a.md\n+first\n';
@@ -1068,6 +1087,9 @@ class _FakeGitGateway implements GitRepositoryGateway {
   var detectCalls = 0;
   var statusCalls = 0;
   var commitCalls = 0;
+  String? authorName;
+  String? authorEmail;
+  bool? authorIdentityGlobal;
   var switchCalls = 0;
   var fetchCalls = 0;
   var restoreCalls = 0;
@@ -1176,6 +1198,19 @@ class _FakeGitGateway implements GitRepositoryGateway {
     return _result();
   }
 
+  @override
+  Future<GitOperationResult> configureAuthorIdentity(
+    GitRepositoryInfo repository, {
+    required String name,
+    required String email,
+    required bool globally,
+  }) async {
+    authorName = name;
+    authorEmail = email;
+    authorIdentityGlobal = globally;
+    return _result();
+  }
+
   @override
   Future<GitOperationResult> switchBranch(
     GitRepositoryInfo repository,
diff --git a/test/src/git/git_process_runner_test.dart b/test/src/git/git_process_runner_test.dart
index 6cc5ef7c..e7f80d43 100644
--- a/test/src/git/git_process_runner_test.dart
+++ b/test/src/git/git_process_runner_test.dart
@@ -72,12 +72,52 @@ void main() {
     expect(runner.timeouts, everyElement(greaterThan(Duration.zero)));
   });
 
+  test('gateway classifies a missing commit author identity', () async {
+    final gateway = GitCliGateway(
+      runner: const _AuthorIdentityGitRunner(),
+      locator: const _AvailableGitLocator(),
+    );
+
+    await expectLater(
+      gateway.commit(
+        const GitRepositoryInfo(
+          rootPath: '/repo',
+          gitDirPath: '/repo/.git',
+          currentBranch: 'main',
+        ),
+        'Document the release',
+      ),
+      throwsA(
+        isA<GitFailure>()
+            .having(
+              (failure) => failure.code,
+              'code',
+              GitFailureCode.authorIdentity,
+            )
+            .having(
+              (failure) => failure.userMessageKey,
+              'userMessageKey',
+              'gitErrorAuthorIdentity',
+            ),
+      ),
+    );
+  });
+
   test('snap packages the Linux process-group launcher', () {
     final snapcraft = File('snap/snapcraft.yaml').readAsStringSync();
 
     expect(snapcraft, contains(RegExp(r'^\s*- util-linux$', multiLine: true)));
   });
 
+  test('snap Git uses bundled helpers, templates, and SSH', () {
+    expect(gitEnvironmentForSnap('/snap/busymark/x1'), {
+      'GIT_EXEC_PATH': '/snap/busymark/x1/usr/lib/git-core',
+      'GIT_TEMPLATE_DIR': '/snap/busymark/x1/usr/share/git-core/templates',
+      'GIT_SSH': '/snap/busymark/x1/usr/bin/ssh',
+    });
+    expect(gitEnvironmentForSnap(''), isEmpty);
+  });
+
   test('snap launcher never falls back to the confined host setsid', () async {
     final snapRoot = await Directory.systemTemp.createTemp(
       'busymark-snap-launcher-',
@@ -292,6 +332,32 @@ class _PermissionDeniedGitRunner implements GitCommandRunner {
   }
 }
 
+class _AuthorIdentityGitRunner implements GitCommandRunner {
+  const _AuthorIdentityGitRunner();
+
+  @override
+  Future<GitProcessResult> run(
+    String executable,
+    List<String> arguments, {
+    String? workingDirectory,
+    required Duration timeout,
+    required String commandName,
+    Map<String, String> environment = const {},
+  }) async {
+    return GitProcessResult(
+      executable: executable,
+      arguments: arguments,
+      exitCode: 128,
+      stdoutBytes: const [],
+      stderrBytes:
+          ('Author identity unknown\n\n'
+                  'Please tell me who you are.\n'
+                  'fatal: unable to auto-detect email address')
+              .codeUnits,
+    );
+  }
+}
+
 class _FailedVersionGitRunner implements GitCommandRunner {
   const _FailedVersionGitRunner();
 
diff --git a/test/src/localization_audit_test.dart b/test/src/localization_audit_test.dart
index 83a8ce5b..5009eec6 100644
--- a/test/src/localization_audit_test.dart
+++ b/test/src/localization_audit_test.dart
@@ -33,8 +33,9 @@ void main() {
       _LiteralPattern('labelText literal', r"\blabelText:\s*'([^']+)'"),
       _LiteralPattern('semanticLabel literal', r"\bsemanticLabel:\s*'([^']+)'"),
       _LiteralPattern(
-        'SnackBar Text literal',
-        r"\bSnackBar\([^)]*content:\s*Text\(\s*'([^']*[A-Z][^']*)'",
+        'toast message literal',
+        r'\bBusyMarkToastOverlay\.(?:show|maybeShow)\([^)]*'
+            r"message:\s*'([^']*[A-Z][^']*)'",
         dotAll: true,
       ),
       _LiteralPattern(
@@ -294,12 +295,6 @@ void main() {
         l10n.diagnosticWritersideVariableUnresolved('api-version'),
         contains('$fsi%api-version%$pdi'),
       );
-      expect(
-        l10n.writersidePdfBuilderDownloadDescription(
-          'jetbrains/writerside-builder:2026.07.8925',
-        ),
-        contains('${fsi}jetbrains/writerside-builder:2026.07.8925$pdi'),
-      );
     }
   });
 
@@ -613,6 +608,7 @@ const _sharedEnglishMatches = <String>{
   'languageHindi',
   'languageEstonian',
   'writerside',
+  'video',
   'xml',
   'fileTypeMarkdown',
   'pdfPageSizeA4',
@@ -651,6 +647,7 @@ const _localeSpecificEnglishMatches = <String, Set<String>>{
     'shortcutGroupGeneral',
   },
   'fr': {
+    'actions',
     'source',
     'validation',
     'fileTypeImages',
@@ -678,7 +675,7 @@ const _localeSpecificEnglishMatches = <String, Set<String>>{
     'gitCommit',
   },
   'nb': {'systemTheme', 'systemLanguage', 'gitCommit', 'instanceStatus'},
-  'pl': {'folder', 'foldKindTag'},
+  'pl': {'folder', 'foldKindTag', 'aiModel'},
   'pt': {
     'editor',
     'link',
diff --git a/test/src/markdown_math_export_test.dart b/test/src/markdown_math_export_test.dart
new file mode 100644
index 00000000..52cd9248
--- /dev/null
+++ b/test/src/markdown_math_export_test.dart
@@ -0,0 +1,226 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:busymark/src/export/markdown_export_document.dart';
+import 'package:busymark/src/export/markdown_export_mapper.dart';
+import 'package:busymark/src/export/markdown_math_export.dart';
+import 'package:busymark/src/export/markdown_pdf_export_service.dart';
+import 'package:busymark/src/export/markdown_pdf_models.dart';
+import 'package:busymark/src/export/typst_compiler.dart';
+import 'package:busymark/src/export/typst_payload_builder.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/math/math_coordinator.dart';
+import 'package:busymark/src/math/math_renderer.dart';
+import 'package:busymark/src/visualization/visualization_renderer.dart';
+import 'package:busymark/src/visualization/web_render_host.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  test('uses each heading level effective text size for inline math', () async {
+    final root = await Directory.systemTemp.createTemp(
+      'busymark-heading-math-export-',
+    );
+    addTearDown(() => root.delete(recursive: true));
+    final host = _PdfMathHost();
+    final coordinator = MathCoordinator(renderer: MathRenderer(host: host));
+    addTearDown(coordinator.dispose);
+    final source = [
+      for (var level = 1; level <= 6; level++)
+        '${'#' * level} Heading \$h$level\$\n',
+    ].join('\n');
+    final mapped = const MarkdownExportMapper().map(
+      const MarkdownParser()
+          .parse(filePath: '/workspace/headings.md', source: source)
+          .busyDocument,
+    );
+
+    await MarkdownMathExportRenderer(coordinator: coordinator).prepare(
+      document: mapped,
+      exportRoot: root,
+      containerWidth: 480,
+      cancellationToken: MarkdownPdfCancellationToken(),
+    );
+
+    final requests = host.batches.expand((batch) => batch).toList();
+    expect(requests, hasLength(6));
+    for (var level = 1; level <= 6; level++) {
+      final request = requests.singleWhere(
+        (item) => item['expression'] == 'h$level',
+      );
+      final expected = busyMarkPdfHeadingTextSize(level);
+      expect(request['em'], expected, reason: 'heading level $level');
+      expect(request['ex'], expected / 2, reason: 'heading level $level');
+    }
+  });
+
+  test(
+    'prepares inline and display math as deterministic vector assets',
+    () async {
+      final root = await Directory.systemTemp.createTemp(
+        'busymark-math-export-',
+      );
+      addTearDown(() => root.delete(recursive: true));
+      final coordinator = MathCoordinator(
+        renderer: MathRenderer(host: _PdfMathHost()),
+      );
+      addTearDown(coordinator.dispose);
+      final parsed = const MarkdownParser().parse(
+        filePath: '/workspace/math.md',
+        source: r'''
+Text before $x^2$ and $\frac{a}{b}$ after.
+
+$$
+\ce{2H2 + O2 -> 2H2O}
+$$
+''',
+        validateLocalReferences: false,
+      );
+      final mapped = const MarkdownExportMapper().map(parsed.busyDocument);
+
+      final preparation =
+          await MarkdownMathExportRenderer(coordinator: coordinator).prepare(
+            document: mapped,
+            exportRoot: root,
+            containerWidth: 480,
+            cancellationToken: MarkdownPdfCancellationToken(),
+          );
+
+      expect(preparation.warnings, isEmpty);
+      final paragraph = preparation.document.blocks.firstWhere(
+        (block) => block.kind == MarkdownExportBlockKind.paragraph,
+      );
+      final inlineMath = paragraph.inlines
+          .where((inline) => inline.kind == MarkdownExportInlineKind.math)
+          .toList();
+      expect(inlineMath, hasLength(2));
+      expect(
+        inlineMath,
+        everyElement(
+          predicate<MarkdownExportInline>((inline) {
+            return inline.attributes['vector'] == 'true' &&
+                inline.attributes['depth'] == '2.0' &&
+                inline.attributes['asset']!.endsWith('.svg');
+          }),
+        ),
+      );
+      final display = preparation.document.blocks.firstWhere(
+        (block) => block.kind == MarkdownExportBlockKind.math,
+      );
+      expect(display.attributes['vector'], 'true');
+      expect(display.attributes['depth'], '2.0');
+      final generated = Directory(p.join(root.path, 'generated-assets'));
+      expect(
+        await generated
+            .list()
+            .where((entry) => entry.path.endsWith('.svg'))
+            .length,
+        3,
+      );
+      await for (final asset in generated.list().where(
+        (entry) => entry.path.endsWith('.svg'),
+      )) {
+        final svg = await File(asset.path).readAsString();
+        expect(svg, isNot(contains('currentColor')));
+        expect(svg, contains('#000000'));
+      }
+
+      final payload = const TypstPayloadBuilder().build(
+        document: preparation.document,
+        options: const MarkdownPdfOptions(),
+        assets: const {},
+      );
+      final json = jsonEncode(payload);
+      expect(json, contains('"kind":"math"'));
+      expect(json, contains('"depth":"2.0"'));
+      expect(json, contains('generated-assets/'));
+    },
+  );
+
+  final typstPath = Platform.environment['BUSYMARK_TYPST_PATH'];
+  final canRunTypst = typstPath != null && File(typstPath).existsSync();
+  test(
+    'Typst keeps MathJax SVG inline and exports failed math visibly',
+    () async {
+      final root = await Directory.systemTemp.createTemp('busymark-math-pdf-');
+      addTearDown(() => root.delete(recursive: true));
+      final coordinator = MathCoordinator(
+        renderer: MathRenderer(host: _PdfMathHost()),
+      );
+      addTearDown(coordinator.dispose);
+      final destination = p.join(root.path, 'math.pdf');
+      final result =
+          await MarkdownPdfExportService(
+            compilerLocator: TypstCompilerLocator(
+              environment: {'BUSYMARK_TYPST_PATH': typstPath!},
+            ),
+            mathRenderer: MarkdownMathExportRenderer(coordinator: coordinator),
+            templateLoader: () =>
+                File('assets/export/markdown.typ').readAsString(),
+          ).export(
+            MarkdownPdfExportRequest(
+              source: r'''
+Text before $x^2$ and $\frac{a}{b}$ after.
+
+$$\ce{2H2 + O2 -> 2H2O}$$
+
+Failed but visible: $BAD$.
+''',
+              filePath: p.join(root.path, 'math.md'),
+              workspaceRoot: root.path,
+              destinationPath: destination,
+              options: const MarkdownPdfOptions(),
+              overwrite: false,
+            ),
+          );
+
+      final bytes = await File(destination).readAsBytes();
+      expect(bytes.take(5), <int>[37, 80, 68, 70, 45]);
+      expect(
+        result.warnings.map((warning) => warning.code),
+        contains(MarkdownPdfWarningCode.mathRenderFailed),
+      );
+    },
+    skip: canRunTypst ? false : 'Set BUSYMARK_TYPST_PATH to run Typst math.',
+  );
+}
+
+class _PdfMathHost implements WebRenderHost {
+  final List<List<Map<String, Object?>>> batches = [];
+
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) async {
+    batches.add(expressions);
+    return {
+      'results': [
+        for (final item in expressions)
+          if (item['expression'] == 'BAD')
+            {
+              'id': item['id'],
+              'error': {
+                'code': 'math.invalidTex',
+                'message': 'The expression contains invalid TeX.',
+              },
+            }
+          else
+            {
+              'id': item['id'],
+              'svg': '''<svg xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 -10 30 14" style="vertical-align:-0.25ex">
+                <defs><path id="glyph" d="M0 0L10 10L20 0"/></defs>
+                <use href="#glyph" fill="currentColor"/>
+              </svg>''',
+              'width': 30,
+              'height': 14,
+              'depth': 2,
+            },
+      ],
+    };
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
diff --git a/test/src/markdown_pdf_export_service_test.dart b/test/src/markdown_pdf_export_service_test.dart
index d68f4b16..0439cd8e 100644
--- a/test/src/markdown_pdf_export_service_test.dart
+++ b/test/src/markdown_pdf_export_service_test.dart
@@ -2,6 +2,8 @@ import 'dart:io';
 
 import 'package:busymark/src/export/markdown_pdf_export_service.dart';
 import 'package:busymark/src/export/markdown_pdf_models.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:path/path.dart' as p;
 
@@ -82,4 +84,115 @@ void main() => print("Hello");
         ? false
         : 'Set BUSYMARK_TYPST_PATH to run the real Typst integration test.',
   );
+
+  test(
+    'Writerside video poster and link compile into a valid PDF',
+    () async {
+      final temporaryDirectory = await Directory.systemTemp.createTemp(
+        'busymark-video-export-test-',
+      );
+      addTearDown(() async {
+        if (await temporaryDirectory.exists()) {
+          await temporaryDirectory.delete(recursive: true);
+        }
+      });
+      final destination = p.join(temporaryDirectory.path, 'video.pdf');
+      final service = MarkdownPdfExportService(
+        parser: const _WritersideMarkdownParser(),
+        templateLoader: () => File('assets/export/markdown.typ').readAsString(),
+      );
+
+      final result = await service.export(
+        MarkdownPdfExportRequest(
+          source: '''# Video
+
+<video src="https://youtu.be/BeJu9bMPLGU" preview-src="../writerside/basic_project/images/logo.png" width="640"/>
+''',
+          filePath: p.absolute('test/fixtures/markdown/video.md'),
+          workspaceRoot: p.absolute('test/fixtures'),
+          destinationPath: destination,
+          options: const MarkdownPdfOptions(),
+          overwrite: false,
+        ),
+      );
+
+      final bytes = await File(destination).readAsBytes();
+      expect(bytes.take(5), [0x25, 0x50, 0x44, 0x46, 0x2d]);
+      expect(bytes.length, greaterThan(1000));
+      expect(result.warnings, isEmpty);
+    },
+    skip: canRunTypst
+        ? false
+        : 'Set BUSYMARK_TYPST_PATH to run the real Typst integration test.',
+  );
+
+  test(
+    'Writerside admonitions compile into a valid PDF',
+    () async {
+      final temporaryDirectory = await Directory.systemTemp.createTemp(
+        'busymark-admonition-export-test-',
+      );
+      addTearDown(() async {
+        if (await temporaryDirectory.exists()) {
+          await temporaryDirectory.delete(recursive: true);
+        }
+      });
+      final destination = p.join(temporaryDirectory.path, 'admonitions.pdf');
+      final service = MarkdownPdfExportService(
+        parser: const _WritersideMarkdownParser(),
+        templateLoader: () => File('assets/export/markdown.typ').readAsString(),
+      );
+
+      final result = await service.export(
+        MarkdownPdfExportRequest(
+          source: '''# Admonitions
+
+> Helpful tip.
+
+> Important note.
+{style="note"}
+
+> Dangerous operation.
+{style="warning"}
+
+<quote>Neutral quotation.</quote>
+''',
+          filePath: p.absolute('test/fixtures/markdown/admonitions.md'),
+          workspaceRoot: p.absolute('test/fixtures'),
+          destinationPath: destination,
+          options: const MarkdownPdfOptions(),
+          overwrite: false,
+        ),
+      );
+
+      final bytes = await File(destination).readAsBytes();
+      expect(bytes.take(5), [0x25, 0x50, 0x44, 0x46, 0x2d]);
+      expect(bytes.length, greaterThan(1000));
+      expect(result.warnings, isEmpty);
+    },
+    skip: canRunTypst
+        ? false
+        : 'Set BUSYMARK_TYPST_PATH to run the real Typst integration test.',
+  );
+}
+
+class _WritersideMarkdownParser extends MarkdownParser {
+  const _WritersideMarkdownParser();
+
+  @override
+  Future<ParsedMarkdownDocument> parseAsync({
+    required String filePath,
+    required String source,
+    MarkdownMode mode = MarkdownMode.commonMark,
+    String? workspaceRoot,
+    bool validateLocalReferences = true,
+  }) {
+    return super.parseAsync(
+      filePath: filePath,
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      workspaceRoot: workspaceRoot,
+      validateLocalReferences: validateLocalReferences,
+    );
+  }
 }
diff --git a/test/src/markdown_pdf_export_test.dart b/test/src/markdown_pdf_export_test.dart
index b91d1804..9c67b2c1 100644
--- a/test/src/markdown_pdf_export_test.dart
+++ b/test/src/markdown_pdf_export_test.dart
@@ -80,7 +80,7 @@ void main() {
       canExportActiveMarkdown(WorkspaceState(workspace: workspace)),
       isFalse,
     );
-    expect(defaultWritersideBuilderModuleName(module), 'BusyMark Test');
+    expect(defaultWritersideModuleName(module), 'BusyMark Test');
   });
 
   test('atomic PDF publication never replaces without confirmation', () async {
diff --git a/test/src/markdown_visualization_export_test.dart b/test/src/markdown_visualization_export_test.dart
index 9d6656c9..dc3dd8f0 100644
--- a/test/src/markdown_visualization_export_test.dart
+++ b/test/src/markdown_visualization_export_test.dart
@@ -10,6 +10,7 @@ import 'package:busymark/src/export/markdown_pdf_models.dart';
 import 'package:busymark/src/export/markdown_visualization_export.dart';
 import 'package:busymark/src/export/openapi_static_export_mapper.dart';
 import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
 import 'package:busymark/src/visualization/visualization_cache.dart';
 import 'package:busymark/src/visualization/visualization_coordinator.dart';
 import 'package:busymark/src/visualization/visualization_models.dart';
@@ -139,6 +140,53 @@ void main() {
     },
   );
 
+  test('loads a Writerside referenced diagram before PDF rendering', () async {
+    final topics = await Directory(
+      p.join(temporaryDirectory.path, 'topics'),
+    ).create();
+    final snippets = await Directory(
+      p.join(temporaryDirectory.path, 'codeSnippets'),
+    ).create();
+    final documentPath = p.join(topics.path, 'diagram.md');
+    await File(
+      p.join(snippets.path, 'graph.d2'),
+    ).writeAsString('loaded -> from_file\n');
+    const source = '''```D2
+```
+{ src="../codeSnippets/graph.d2" }
+''';
+    final parsed = const MarkdownParser().parse(
+      filePath: documentPath,
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      workspaceRoot: temporaryDirectory.path,
+      validateLocalReferences: false,
+    );
+    final recordingRenderer = _RecordingExportRenderer();
+    final recordingCoordinator = VisualizationCoordinator(
+      renderers: [recordingRenderer],
+      cache: VisualizationCache(
+        diskRoot: Directory(p.join(temporaryDirectory.path, 'recording-cache')),
+      ),
+    );
+    addTearDown(recordingCoordinator.dispose);
+
+    final preparation =
+        await MarkdownVisualizationExportRenderer(
+          coordinator: recordingCoordinator,
+        ).prepare(
+          document: parsed.busyDocument,
+          exportRoot: exportRoot,
+          documentPath: documentPath,
+          workspaceRoot: temporaryDirectory.path,
+          cancellationToken: MarkdownPdfCancellationToken(),
+        );
+
+    expect(preparation.blockOverrides, hasLength(1));
+    expect(recordingRenderer.requests, hasLength(1));
+    expect(recordingRenderer.requests.single.source, 'loaded -> from_file\n');
+  });
+
   test('static OpenAPI export contains selectable reference sections', () {
     const reference = OpenApiReferenceModel(
       title: 'Inventory',
@@ -407,3 +455,16 @@ class _ExportRenderer implements VisualizationRenderer {
     };
   }
 }
+
+class _RecordingExportRenderer extends _ExportRenderer {
+  final requests = <VisualizationRenderRequest>[];
+
+  @override
+  Future<VisualizationRenderResult> render(
+    VisualizationRenderRequest request,
+    VisualizationCancellationToken cancellationToken,
+  ) {
+    requests.add(request);
+    return super.render(request, cancellationToken);
+  }
+}
diff --git a/test/src/math_parser_test.dart b/test/src/math_parser_test.dart
new file mode 100644
index 00000000..fa3f4fab
--- /dev/null
+++ b/test/src/math_parser_test.dart
@@ -0,0 +1,280 @@
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/markdown/busymark_markdown_serializer.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/math_syntax.dart';
+import 'package:busymark/src/markdown/preview_model.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  const parser = MarkdownParser();
+  const serializer = BusyMarkMarkdownSerializer();
+
+  BusyDocument parse(String source, {bool writerside = false}) {
+    return parser
+        .parse(
+          filePath: writerside ? 'topic.md' : 'document.md',
+          source: source,
+          mode: writerside
+              ? MarkdownMode.writersideMarkdown
+              : MarkdownMode.commonMark,
+          validateLocalReferences: false,
+        )
+        .busyDocument;
+  }
+
+  test('parses several dollar formulas as semantic inline math', () {
+    final document = parse(r'Text $x$ then $\frac{a}{b}$ and **$z^2$**.');
+    final math = document.blocks
+        .expand(allInlines)
+        .where((inline) => inline.kind == BusyInlineKind.math)
+        .toList();
+
+    expect(math.map((inline) => inline.text), ['x', r'\frac{a}{b}', 'z^2']);
+    expect(
+      math.map((inline) => inline.attributes[busyMarkMathSourceFormAttribute]),
+      everyElement(BusyMathSourceForm.dollarInline.name),
+    );
+  });
+
+  test('parses the GitHub dollar-backtick form without delimiters', () {
+    final document = parse(r'Before $`\sqrt{x}`$ after.');
+    final math = document.blocks.single.inlines.singleWhere(
+      (inline) => inline.kind == BusyInlineKind.math,
+    );
+
+    expect(math.text, r'\sqrt{x}');
+    expect(
+      math.attributes[busyMarkMathSourceFormAttribute],
+      BusyMathSourceForm.githubDollarBacktick.name,
+    );
+  });
+
+  test('parses single-line and multiline display math as blocks', () {
+    final document = parse(r'''
+Paragraph before.
+
+$$x^2 + y^2$$
+
+$$
+\begin{aligned}
+a &= b \\
+c &= d
+\end{aligned}
+$$
+
+Paragraph after.
+''');
+    final math = document.blocks
+        .where((block) => block.kind == BusyBlockKind.math)
+        .toList();
+
+    expect(math, hasLength(2));
+    expect(math.first.plainText, 'x^2 + y^2');
+    expect(math.last.plainText, contains(r'\begin{aligned}'));
+    expect(math.every((block) => block.sourceSpan != null), isTrue);
+  });
+
+  test('math scanner stays aligned around every neighboring block kind', () {
+    final source = '''
+Paragraph.
+
+\$\$x\$\$
+
+# Heading
+
+- List
+
+> Quote
+
+```dart
+code();
+```
+
+---
+
+\$\$y\$\$
+
+Final paragraph.
+''';
+    final document = parse(source);
+
+    expect(
+      document.blocks.where((b) => b.kind == BusyBlockKind.math),
+      hasLength(2),
+    );
+    expect(document.blocks.every((block) => block.sourceSpan != null), isTrue);
+    expect(serializer.serialize(document), source);
+  });
+
+  test('math and Writerside tex fences follow document compatibility', () {
+    const source = '''
+```math
+E = mc^2
+```
+
+```tex
+F = ma
+```
+''';
+    final markdown = parse(source);
+    final writerside = parse(source, writerside: true);
+
+    expect(markdown.blocks.map((block) => block.kind), [
+      BusyBlockKind.math,
+      BusyBlockKind.codeBlock,
+    ]);
+    expect(writerside.blocks.map((block) => block.kind), [
+      BusyBlockKind.math,
+      BusyBlockKind.math,
+    ]);
+    expect(serializer.serialize(markdown), source);
+    expect(serializer.serialize(writerside), source);
+  });
+
+  test('Writerside semantic math is inline and remains source-preserving', () {
+    const source = 'The result is <math>\\mathbb{R}</math> here.\n';
+    final document = parse(source, writerside: true);
+    final math = document.blocks.single.inlines.singleWhere(
+      (inline) => inline.kind == BusyInlineKind.math,
+    );
+
+    expect(math.text, r'\mathbb{R}');
+    expect(
+      math.attributes[busyMarkMathSourceFormAttribute],
+      BusyMathSourceForm.writersideElement.name,
+    );
+    expect(serializer.serialize(document), source);
+  });
+
+  test(
+    'Writerside semantic math decodes XML entities but preserves source',
+    () {
+      const cases = <(String, String)>[
+        ('&lt;', '<'),
+        ('&gt;', '>'),
+        ('&amp;', '&'),
+        ('&#60;', '<'),
+        ('&#x3E;', '>'),
+        ('&unknown;', '&unknown;'),
+        ('&#1;', '&#1;'),
+        ('&#x110000;', '&#x110000;'),
+        ('&lt', '&lt'),
+      ];
+
+      for (final (encoded, decoded) in cases) {
+        final source = 'Before <math>x $encoded y</math> after.\n';
+        final document = parse(source, writerside: true);
+        final math = document.blocks.single.inlines.singleWhere(
+          (inline) => inline.kind == BusyInlineKind.math,
+        );
+
+        expect(math.text, 'x $decoded y', reason: encoded);
+        expect(
+          math.attributes[busyMarkMathRawExpressionAttribute],
+          'x $encoded y',
+          reason: encoded,
+        );
+        expect(serializer.serialize(document), source, reason: encoded);
+      }
+    },
+  );
+
+  test(
+    'escaped dollars, code, currency, empty and malformed forms stay text',
+    () {
+      final document = parse(
+        r'Cost is \$5, range $5-$10, code `$x$`, empty $$, and open $x.',
+      );
+
+      expect(
+        document.blocks
+            .expand(allInlines)
+            .where((inline) => inline.kind == BusyInlineKind.math),
+        isEmpty,
+      );
+      expect(serializer.serialize(document), contains(r'open $x'));
+
+      final emptyDisplay = parse(r'''$$
+
+$$
+''');
+      expect(
+        emptyDisplay.blocks.where((block) => block.kind == BusyBlockKind.math),
+        isEmpty,
+      );
+
+      final mixedCurrency = parse(
+        r'It costs $5 and the variable is $x$; another price is US$10.00.',
+      );
+      final math = mixedCurrency.blocks
+          .expand(allInlines)
+          .where((inline) => inline.kind == BusyInlineKind.math)
+          .toList();
+      expect(math.map((inline) => inline.text), ['x']);
+      expect(
+        serializer.serialize(mixedCurrency),
+        r'It costs $5 and the variable is $x$; another price is US$10.00.',
+      );
+    },
+  );
+
+  test('inline math survives list, blockquote, and table structure', () {
+    final document = parse(r'''
+- Item $x$
+
+> Quote $y$
+
+| Value |
+| --- |
+| $z$ |
+''');
+    final expressions = document.blocks
+        .expand(allInlines)
+        .where((inline) => inline.kind == BusyInlineKind.math)
+        .map((inline) => inline.text);
+
+    expect(expressions, containsAll(['x', 'y', 'z']));
+  });
+
+  test('CRLF math input and every original form round-trip untouched', () {
+    const source =
+        'Inline \$x\$ and \$`y`\$.\r\n\r\n\$\$\r\nz^2\r\n\$\$\r\n\r\n```math\r\na+b\r\n```\r\n';
+    final document = parse(source);
+
+    expect(serializer.serialize(document), source);
+  });
+
+  test('preview builder creates first-class inline and display math nodes', () {
+    final preview = const BusyMarkPreviewBuilder().build(
+      parse('Inline \$x\$ and another \$x\$.\n\n\$\$y\$\$\n'),
+    );
+
+    expect(preview.blocks.last.kind, PreviewBlockKind.math);
+    final inlineMath = preview.blocks.first.inlines
+        .where((inline) => inline.kind == PreviewInlineKind.math)
+        .toList();
+    expect(inlineMath, hasLength(2));
+    expect(
+      inlineMath.map((inline) => inline.attributes['expressionId']).toSet(),
+      hasLength(2),
+    );
+  });
+}
+
+Iterable<BusyInline> descendants(BusyInline inline) sync* {
+  for (final child in inline.children) {
+    yield child;
+    yield* descendants(child);
+  }
+}
+
+Iterable<BusyInline> allInlines(BusyBlock block) sync* {
+  yield* block.inlines;
+  for (final inline in block.inlines) {
+    yield* descendants(inline);
+  }
+  for (final child in block.children) {
+    yield* allInlines(child);
+  }
+}
diff --git a/test/src/math_renderer_test.dart b/test/src/math_renderer_test.dart
new file mode 100644
index 00000000..f9d26758
--- /dev/null
+++ b/test/src/math_renderer_test.dart
@@ -0,0 +1,330 @@
+import 'dart:async';
+
+import 'package:busymark/src/math/math_coordinator.dart';
+import 'package:busymark/src/math/math_models.dart';
+import 'package:busymark/src/math/math_renderer.dart';
+import 'package:busymark/src/math/math_svg_preprocessor.dart';
+import 'package:busymark/src/visualization/generated_svg_normalizer.dart';
+import 'package:busymark/src/visualization/visualization_renderer.dart';
+import 'package:busymark/src/visualization/web_render_host.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:xml/xml.dart';
+
+void main() {
+  test(
+    'renders multiple expressions in one batch and isolates failure',
+    () async {
+      final host = _MathHost();
+      final renderer = MathRenderer(host: host);
+      final requests = [
+        _request('one', r'\mathbb{R}', blockKey: 'one'),
+        _request('bad', r'\frac{', blockKey: 'bad'),
+      ];
+
+      final results = await renderer.renderBatch(
+        requests,
+        VisualizationCancellationToken(),
+      );
+
+      expect(host.calls, 1);
+      expect(host.batches.single, hasLength(2));
+      expect(results[0], isA<RenderedMathResult>());
+      expect(results[0].expressionId, 'one');
+      expect((results[0] as RenderedMathResult).depth, 2);
+      expect(results[1], isA<FailedMathResult>());
+      expect(
+        (results[1] as FailedMathResult).kind,
+        MathRenderErrorKind.invalidTex,
+      );
+    },
+  );
+
+  test(
+    'coalesces a large page, caches successes, and rebases local IDs',
+    () async {
+      final host = _MathHost();
+      final coordinator = MathCoordinator(renderer: MathRenderer(host: host));
+      addTearDown(coordinator.dispose);
+      final requests = [
+        for (var index = 0; index < 100; index++)
+          _request('expression-$index', 'x_$index', blockKey: 'block-$index'),
+      ];
+
+      final first = await coordinator.renderAll(requests);
+
+      expect(host.calls, 1, reason: 'one page must use one WebKit batch');
+      expect(first, everyElement(isA<RenderedMathResult>()));
+      final firstSvg = (first.first as RenderedMathResult).svg;
+      final cached = await coordinator.render(
+        _request('cached-instance', 'x_0', blockKey: 'cached-block'),
+      );
+      expect(host.calls, 1);
+      expect(cached, isA<RenderedMathResult>());
+      expect((cached as RenderedMathResult).svg, isNot(firstSvg));
+      expect(cached.svg, contains('cached-instance'));
+    },
+  );
+
+  test('deduplicates identical formulas pending in the same batch', () async {
+    final host = _MathHost();
+    final coordinator = MathCoordinator(renderer: MathRenderer(host: host));
+    addTearDown(coordinator.dispose);
+
+    final results = await coordinator.renderAll([
+      _request('first-instance', r'\mathbb{R}', blockKey: 'first-block'),
+      _request('second-instance', r'\mathbb{R}', blockKey: 'second-block'),
+    ]);
+
+    expect(host.calls, 1);
+    expect(host.batches.single, hasLength(1));
+    final first = results[0] as RenderedMathResult;
+    final second = results[1] as RenderedMathResult;
+    expect(first.expressionId, 'first-instance');
+    expect(second.expressionId, 'second-instance');
+    expect(first.svg, isNot(second.svg));
+    expect(first.svg, contains('first-instance'));
+    expect(second.svg, contains('second-instance'));
+  });
+
+  test('discards an obsolete block revision', () async {
+    final host = _MathHost(delay: const Duration(milliseconds: 20));
+    final coordinator = MathCoordinator(renderer: MathRenderer(host: host));
+    addTearDown(coordinator.dispose);
+
+    final obsolete = coordinator.render(
+      _request('old', 'x', blockKey: 'same', revision: 1),
+    );
+    final current = coordinator.render(
+      _request('new', 'y', blockKey: 'same', revision: 2),
+    );
+
+    await expectLater(obsolete, throwsA(isA<MathSupersededException>()));
+    expect(await current, isA<RenderedMathResult>());
+    expect(host.batches.single, hasLength(1));
+  });
+
+  test('cancels WebKit work after a sole request is superseded', () async {
+    final host = _MathHost(
+      delay: const Duration(seconds: 1),
+      waitForCancellation: true,
+    );
+    final coordinator = MathCoordinator(renderer: MathRenderer(host: host));
+    addTearDown(coordinator.dispose);
+
+    final obsolete = coordinator.render(
+      _request('old', 'x', blockKey: 'same', revision: 1),
+    );
+    await Future<void>.delayed(Duration.zero);
+    coordinator.cancel('same');
+
+    await expectLater(obsolete, throwsA(isA<MathSupersededException>()));
+    expect(host.sawCancellation, isTrue);
+  });
+
+  test('maps timeout and unavailable hosts to local math failures', () async {
+    final timeout =
+        await MathRenderer(
+          host: _ThrowingMathHost(TimeoutException('slow')),
+        ).renderBatch([
+          _request('timeout', 'x', blockKey: 'timeout'),
+        ], VisualizationCancellationToken());
+    final unavailable =
+        await MathRenderer(
+          host: _ThrowingMathHost(StateError('restarting')),
+        ).renderBatch([
+          _request('unavailable', 'x', blockKey: 'unavailable'),
+        ], VisualizationCancellationToken());
+
+    expect(
+      (timeout.single as FailedMathResult).kind,
+      MathRenderErrorKind.timeout,
+    );
+    expect(
+      (unavailable.single as FailedMathResult).kind,
+      MathRenderErrorKind.rendererUnavailable,
+    );
+  });
+
+  test('rejects oversized input before invoking WebKit', () async {
+    final host = _MathHost();
+    final renderer = MathRenderer(host: host);
+
+    final result = await renderer.renderBatch([
+      _request(
+        'large',
+        'x' * (busyMarkMaximumMathExpressionCharacters + 1),
+        blockKey: 'large',
+      ),
+    ], VisualizationCancellationToken());
+
+    expect(host.calls, 0);
+    expect(
+      (result.single as FailedMathResult).kind,
+      MathRenderErrorKind.resourceLimit,
+    );
+  });
+
+  test('extracts baseline style and preserves vector-safe MathJax SVG', () {
+    const source = '''
+<svg xmlns="http://www.w3.org/2000/svg" width="2ex" height="1.5ex"
+  viewBox="0 -1000 2000 1500" style="vertical-align: -0.25ex">
+  <defs><path id="MJX-NCM-I-1D465" d="M0 0L20 20"/></defs>
+  <use href="#MJX-NCM-I-1D465" fill="currentColor"/>
+</svg>
+''';
+    const preprocessor = MathSvgPreprocessor();
+
+    final prepared = preprocessor.preprocess(source, ex: 8);
+    final rebased = preprocessor.rebaseLocalIds(prepared.svg, 'formula-two');
+
+    expect(prepared.depth, 2);
+    expect(prepared.svg, isNot(contains('vertical-align')));
+    expect(prepared.svg, contains('<defs>'));
+    expect(rebased, contains('id="formula-two-0"'));
+    expect(rebased, contains('href="#formula-two-0"'));
+    expect(rebased, contains('currentColor'));
+  });
+
+  test('resolves currentColor without flattening explicit SVG colors', () {
+    const source = '''
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 10">
+  <path d="M0 0L10 10" fill="currentColor" stroke="#ff0000"/>
+  <path d="M10 0L20 10" style="fill:CURRENTCOLOR;stroke:#00ff00"/>
+</svg>
+''';
+    const preprocessor = MathSvgPreprocessor();
+
+    final resolved = preprocessor.resolveCurrentColor(source, '#123456');
+
+    expect(resolved, isNot(contains('currentColor')));
+    expect(resolved, isNot(contains('CURRENTCOLOR')));
+    expect(resolved, contains('fill="#123456"'));
+    expect(resolved, contains('stroke="#ff0000"'));
+    expect(resolved, contains('stroke:#00ff00'));
+    expect(
+      const GeneratedSvgNormalizer().normalize(resolved).vectorSafeSvg,
+      isNotNull,
+    );
+  });
+
+  test('rebases wide MathJax coordinates before secure normalization', () {
+    const source = '''
+<svg xmlns="http://www.w3.org/2000/svg" width="48ex" height="2.5ex"
+  viewBox="0 -750 24000 1250" style="vertical-align: -0.25ex">
+  <defs><path id="wide-glyph" d="M0 0L24000 1000"/></defs>
+  <use href="#wide-glyph" fill="currentColor"/>
+</svg>
+''';
+    const preprocessor = MathSvgPreprocessor();
+
+    final prepared = preprocessor.preprocess(source, ex: 8);
+    final document = XmlDocument.parse(prepared.svg);
+    final viewBox = document.rootElement
+        .getAttribute('viewBox')!
+        .split(' ')
+        .map(double.parse)
+        .toList();
+
+    expect(viewBox[2], 16000);
+    expect(prepared.svg, contains('transform="scale('));
+    expect(
+      const GeneratedSvgNormalizer().normalize(prepared.svg).vectorSafeSvg,
+      isNotNull,
+    );
+  });
+}
+
+MathRenderRequest _request(
+  String id,
+  String expression, {
+  required String blockKey,
+  int revision = 1,
+}) {
+  return MathRenderRequest(
+    expressionId: id,
+    expression: expression,
+    display: false,
+    blockKey: blockKey,
+    editRevision: revision,
+    em: 16,
+    ex: 8,
+    containerWidth: 800,
+  );
+}
+
+class _MathHost implements WebRenderHost {
+  _MathHost({this.delay = Duration.zero, this.waitForCancellation = false});
+
+  final Duration delay;
+  final bool waitForCancellation;
+  int calls = 0;
+  final List<List<Map<String, Object?>>> batches = [];
+  bool sawCancellation = false;
+
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) async {
+    calls++;
+    batches.add(expressions);
+    if (waitForCancellation) {
+      while (!cancellationToken.isCancelled) {
+        await Future<void>.delayed(const Duration(milliseconds: 5));
+      }
+      sawCancellation = true;
+    } else if (delay > Duration.zero) {
+      await Future<void>.delayed(delay);
+    }
+    cancellationToken.throwIfCancelled();
+    return {
+      'results': [
+        for (final item in expressions)
+          if ((item['expression'] as String).contains(r'\frac{'))
+            {
+              'id': item['id'],
+              'error': {
+                'code': 'math.invalidTex',
+                'message': 'The expression contains invalid TeX.',
+              },
+            }
+          else
+            {
+              'id': item['id'],
+              'svg': _svg(item['svgIdPrefix'] as String),
+              'width': 16,
+              'height': 12,
+              'depth': 2,
+            },
+      ],
+    };
+  }
+
+  String _svg(String prefix) =>
+      '''
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -10 16 12"
+ style="vertical-align:-0.25ex">
+ <defs><path id="$prefix-path" d="M0 0L10 10"/></defs>
+ <use href="#$prefix-path" fill="currentColor"/>
+</svg>''';
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _ThrowingMathHost implements WebRenderHost {
+  const _ThrowingMathHost(this.error);
+
+  final Object error;
+
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) {
+    return Future.error(error);
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
diff --git a/test/src/math_widget_test.dart b/test/src/math_widget_test.dart
new file mode 100644
index 00000000..bb55027f
--- /dev/null
+++ b/test/src/math_widget_test.dart
@@ -0,0 +1,212 @@
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/app/busymark_glyphs.dart';
+import 'package:busymark/src/math/math_widget.dart';
+import 'package:busymark/src/visualization/visualization_providers.dart';
+import 'package:busymark/src/visualization/visualization_renderer.dart';
+import 'package:busymark/src/visualization/web_render_host.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets(
+    'inline math applies MathJax baseline and surrounding text metrics',
+    (tester) async {
+      final host = _MathWidgetHost(width: 24, height: 18, depth: 5);
+
+      await tester.pumpWidget(
+        ProviderScope(
+          overrides: [webRenderHostProvider.overrideWithValue(host)],
+          child: const _InlineThemeHarness(),
+        ),
+      );
+      await _pumpRenderedMath(tester);
+
+      expect(find.byType(SvgPicture), findsOneWidget);
+      expect(find.bySemanticsLabel(r'x^2'), findsOneWidget);
+      expect(tester.widget<Baseline>(find.byType(Baseline)).baseline, 13);
+      expect(host.calls, 1);
+      expect(host.lastExpression?['em'], 20);
+      expect(host.lastExpression?['ex'], 10);
+
+      await tester.tap(find.byKey(const ValueKey('toggle-math-theme')));
+      await tester.pump();
+      expect(
+        host.calls,
+        1,
+        reason: 'currentColor SVG must be reusable when the UI theme changes',
+      );
+    },
+  );
+
+  testWidgets('wide display math scrolls horizontally without clipping', (
+    tester,
+  ) async {
+    final host = _MathWidgetHost(width: 900, height: 40, depth: 4);
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [webRenderHostProvider.overrideWithValue(host)],
+        child: _localizedApp(
+          const SizedBox(
+            width: 200,
+            child: BusyMarkDisplayMath(
+              expression: r'\sum_{i=1}^{100} a_i',
+              expressionId: 'wide',
+              editRevision: 1,
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpRenderedMath(tester);
+
+    final scroller = tester.widget<SingleChildScrollView>(
+      find.byType(SingleChildScrollView),
+    );
+    expect(scroller.scrollDirection, Axis.horizontal);
+    expect(
+      find.byWidgetPredicate(
+        (widget) => widget is SizedBox && widget.width == 900,
+      ),
+      findsOneWidget,
+    );
+    expect(host.lastExpression?['containerWidth'], 208);
+  });
+
+  testWidgets('failed formulas retain source and a localized explanation', (
+    tester,
+  ) async {
+    final host = _MathWidgetHost(fail: true);
+    String? failureCode;
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [webRenderHostProvider.overrideWithValue(host)],
+        child: _localizedApp(
+          BusyMarkDisplayMath(
+            expression: r'\frac{',
+            expressionId: 'invalid',
+            editRevision: 1,
+            onFailure: (failure) => failureCode = failure.code,
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+    await tester.pump();
+
+    expect(find.text(r'\frac{'), findsOneWidget);
+    expect(
+      find.byTooltip('The mathematical expression could not be rendered.'),
+      findsOneWidget,
+    );
+    expect(find.byType(SvgPicture), findsNothing);
+    expect(failureCode, 'math.invalidTex');
+  });
+}
+
+Widget _localizedApp(Widget child) {
+  return MaterialApp(
+    localizationsDelegates: AppLocalizations.localizationsDelegates,
+    supportedLocales: AppLocalizations.supportedLocales,
+    home: Scaffold(body: child),
+  );
+}
+
+class _InlineThemeHarness extends StatefulWidget {
+  const _InlineThemeHarness();
+
+  @override
+  State<_InlineThemeHarness> createState() => _InlineThemeHarnessState();
+}
+
+class _InlineThemeHarnessState extends State<_InlineThemeHarness> {
+  var dark = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      theme: ThemeData.light(),
+      darkTheme: ThemeData.dark(),
+      themeMode: dark ? ThemeMode.dark : ThemeMode.light,
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: Scaffold(
+        body: Column(
+          children: [
+            IconButton(
+              key: const ValueKey('toggle-math-theme'),
+              onPressed: () => setState(() => dark = !dark),
+              icon: const Icon(BusyMarkGlyphs.appearance),
+            ),
+            const BusyMarkInlineMath(
+              expression: r'x^2',
+              expressionId: 'inline',
+              editRevision: 1,
+              textStyle: TextStyle(fontSize: 20),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Future<void> _pumpRenderedMath(WidgetTester tester) async {
+  for (var attempt = 0; attempt < 20; attempt++) {
+    await tester.pump(const Duration(milliseconds: 10));
+    if (find.byType(SvgPicture).evaluate().isNotEmpty) return;
+  }
+}
+
+class _MathWidgetHost implements WebRenderHost {
+  _MathWidgetHost({
+    this.width = 20,
+    this.height = 14,
+    this.depth = 2,
+    this.fail = false,
+  });
+
+  final double width;
+  final double height;
+  final double depth;
+  final bool fail;
+  int calls = 0;
+  Map<String, Object?>? lastExpression;
+
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) async {
+    calls++;
+    lastExpression = expressions.single;
+    cancellationToken.throwIfCancelled();
+    return {
+      'results': [
+        if (fail)
+          {
+            'id': expressions.single['id'],
+            'error': {'code': 'math.invalidTex', 'message': 'Invalid TeX'},
+          }
+        else
+          {
+            'id': expressions.single['id'],
+            'svg': '''<svg xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 -10 20 14" style="vertical-align:-0.25ex">
+              <defs><path id="glyph" d="M0 0L10 10"/></defs>
+              <use href="#glyph" fill="currentColor"/>
+            </svg>''',
+            'width': width,
+            'height': height,
+            'depth': depth,
+          },
+      ],
+    };
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
diff --git a/test/src/native_headerbar_audit_test.dart b/test/src/native_headerbar_audit_test.dart
index cb4a956a..933c7d53 100644
--- a/test/src/native_headerbar_audit_test.dart
+++ b/test/src/native_headerbar_audit_test.dart
@@ -215,11 +215,19 @@ void main() {
     expect(service, contains('reportIssue'));
     expect(service, contains('fullScreen'));
     expect(app, contains('menu: l10n.mainMenu'));
-    expect(app, contains('settings: l10n.settings'));
-    expect(app, contains('keyboardShortcuts: l10n.keyboardShortcuts'));
-    expect(app, contains('markdownAndHtml: l10n.markdownAndHtml'));
+    expect(app, contains('settings: label(BusyMarkCommandIds.settings)'));
+    expect(
+      app,
+      contains(
+        'keyboardShortcuts: label(BusyMarkCommandIds.keyboardShortcuts)',
+      ),
+    );
+    expect(
+      app,
+      contains('markdownAndHtml: label(BusyMarkCommandIds.markdownAndHtml)'),
+    );
     expect(app, contains('reportIssue: l10n.reportIssue'));
-    expect(app, contains('fullScreen: l10n.fullScreen'));
+    expect(app, contains('fullScreen: label(BusyMarkCommandIds.fullScreen)'));
     expect(app, contains('aboutBusyMark: l10n.aboutBusyMark'));
     expect(dialogs, contains('showBusyMarkKeyboardShortcutsDialog'));
     expect(dialogs, contains('showBusyMarkMarkdownHtmlDialog'));
@@ -246,8 +254,14 @@ void main() {
     expect(mainMenu, contains('BusyMarkHeaderPopupMenuButton'));
     expect(mainMenu, contains('tooltip: l10n.mainMenu'));
     expect(mainMenu, contains('label: l10n.reportIssue'));
-    expect(mainMenu, contains('label: l10n.exportAsPdf'));
-    expect(mainMenu, contains('label: l10n.fullScreen'));
+    expect(
+      mainMenu,
+      contains('label: command(BusyMarkCommandIds.exportPdf).label(context)'),
+    );
+    expect(
+      mainMenu,
+      contains('label: command(BusyMarkCommandIds.fullScreen).label(context)'),
+    );
     expect(mainMenu, contains('enabled: canExportPdf'));
     expect(native, contains('GtkWidget* main_menu_button;'));
     expect(native, contains('GMenu* main_menu_model;'));
@@ -425,7 +439,9 @@ void main() {
     expect(snapcraft, contains('override-build:'));
     expect(snapcraft, contains(r'rm -rf "$CRAFT_PART_BUILD/build"'));
     expect(snapcraft, contains(r'rm -rf "$CRAFT_PART_BUILD/.dart_tool"'));
-    expect(snapcraft, contains('craftctl default'));
+    expect(snapcraft, contains('export CI=true'));
+    expect(snapcraft, contains('flutter --no-version-check precache --linux'));
+    expect(snapcraft, contains('flutter --no-version-check pub get'));
     expect(
       snapcraft,
       contains(
@@ -486,9 +502,20 @@ void main() {
     );
     expect(script, contains(r'stage_ldd_dependencies "$setsid_bin"'));
     expect(script, contains(r'test -x "$SNAP_ROOT/usr/bin/setsid"'));
-    expect(script, contains('squashfs-root/usr/bin/git'));
-    expect(script, contains('squashfs-root/usr/bin/setsid'));
+    expect(script, contains(r'unsquashfs -ll "$OUT" usr/bin/git'));
+    expect(script, contains(r'unsquashfs -ll "$OUT" usr/bin/setsid'));
     expect(script, contains('--skip-bundled-git'));
+    expect(script, contains('scaffold_has_bundled_git_tools'));
+    expect(
+      script,
+      contains(
+        'Retaining core24-compatible Git and OpenSSH tools from the snap scaffold',
+      ),
+    );
+    expect(script, contains('--no-install'));
+    expect(script, contains('item_indent = match.group(1)'));
+    expect(script, contains('f"{item_indent}- {item}\\n"'));
+    expect(script, contains('the currently installed snap was not changed'));
   });
 
   test('native headerbar uses the shared tooltip visuals', () {
@@ -1255,33 +1282,36 @@ void main() {
     expect(service, contains('viewModeSource'));
     expect(service, contains('viewModePreview'));
     expect(service, contains('viewModeSplit'));
-    expect(app, contains('editor: l10n.editor'));
-    expect(app, contains('source: l10n.source'));
-    expect(app, contains('preview: l10n.reading'));
-    expect(app, contains('split: l10n.split'));
+    expect(app, contains('editor: label(BusyMarkCommandIds.viewEditor)'));
+    expect(app, contains('source: label(BusyMarkCommandIds.viewSource)'));
+    expect(app, contains('preview: label(BusyMarkCommandIds.viewReading)'));
+    expect(app, contains('split: label(BusyMarkCommandIds.viewSplit)'));
     expect(
       app,
-      contains('editorShortcut: BusyMarkDocumentViewShortcutLabels.editor'),
+      contains('editorShortcut: shortcut(BusyMarkCommandIds.viewEditor)'),
     );
     expect(app, contains('editorGtkAccelerator:'));
-    expect(app, contains('BusyMarkDocumentViewShortcutGtkAccelerators.editor'));
+    expect(app, contains('accelerator(BusyMarkCommandIds.viewEditor)'));
+    expect(
+      app,
+      contains('sourceShortcut: shortcut(BusyMarkCommandIds.viewSource)'),
+    );
     expect(
       app,
-      contains('sourceShortcut: BusyMarkDocumentViewShortcutLabels.source'),
+      contains('previewShortcut: shortcut(BusyMarkCommandIds.viewReading)'),
     );
     expect(
       app,
-      contains('previewShortcut: BusyMarkDocumentViewShortcutLabels.reading'),
+      contains('splitShortcut: shortcut(BusyMarkCommandIds.viewSplit)'),
     );
     expect(
       app,
-      contains('splitShortcut: BusyMarkDocumentViewShortcutLabels.split'),
+      contains('sidebarShortcut: shortcut(BusyMarkCommandIds.toggleSidebar)'),
     );
     expect(
       app,
-      contains('sidebarShortcut: BusyMarkSidebarShortcutLabels.toggleSidebar'),
+      contains('searchShortcut: shortcut(BusyMarkCommandIds.search)'),
     );
-    expect(app, contains('searchShortcut: BusyMarkAppShortcutLabels.search'));
     expect(workspace, contains('case HeaderBarAction.viewModeEditor:'));
     expect(workspace, contains('case HeaderBarAction.viewModeSource:'));
     expect(workspace, contains('case HeaderBarAction.viewModePreview:'));
@@ -1463,8 +1493,11 @@ void main() {
     expect(nativeMenu, contains('GTK_IS_MENU(session->menu)'));
     expect(nativeMenu, contains('gtk_menu_attach_to_widget('));
     expect(nativeMenu, contains('gtk_widget_translate_coordinates('));
+    expect(nativeMenu, contains('native_menu_capture_trigger_event'));
+    expect(nativeMenu, contains('gdk_event_copy(event)'));
     expect(nativeMenu, contains('gtk_menu_popup_at_rect('));
     expect(nativeMenu, contains('rect_window, &window_anchor'));
+    expect(nativeMenu, contains('data->trigger_event)'));
     expect(nativeMenu, contains('GDK_GRAVITY_SOUTH_WEST'));
     expect(nativeMenu, contains('GDK_GRAVITY_NORTH_WEST'));
     expect(nativeMenu, contains('GDK_ANCHOR_FLIP_Y'));
diff --git a/test/src/openapi_dependency_resolver_test.dart b/test/src/openapi_dependency_resolver_test.dart
index 9e1a395e..dcc3456a 100644
--- a/test/src/openapi_dependency_resolver_test.dart
+++ b/test/src/openapi_dependency_resolver_test.dart
@@ -235,6 +235,12 @@ class _ReferenceHost implements WebRenderHost {
   final Map<String, List<String>> references;
   final List<String> inspectedSources = [];
 
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) => throw UnimplementedError();
+
   @override
   Future<void> copyPngToClipboard(Uint8List pngBytes) =>
       throw UnimplementedError();
diff --git a/test/src/search_replace_service_test.dart b/test/src/search_replace_service_test.dart
new file mode 100644
index 00000000..75f88646
--- /dev/null
+++ b/test/src/search_replace_service_test.dart
@@ -0,0 +1,448 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:busymark/src/editor/source/source_search.dart';
+import 'package:busymark/src/search/search_replace_service.dart';
+import 'package:busymark/src/workspace/document_buffer.dart';
+import 'package:busymark/src/workspace/workspace_model.dart';
+import 'package:busymark/src/workspace/workspace_service.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  const replacementService = SearchReplacementService();
+
+  test('previews and applies plain whole-word replacements', () {
+    final preview = replacementService.previewText(
+      source: 'cat scatter Cat',
+      options: const SourceSearchOptions(query: 'cat', wholeWord: true),
+      replacement: 'dog',
+    );
+
+    expect(preview.matches.map((match) => match.original), ['cat', 'Cat']);
+    expect(preview.apply(), 'dog scatter dog');
+  });
+
+  test('expands numbered and named regex capture groups', () {
+    final numbered = replacementService.previewText(
+      source: 'Ada Lovelace; Grace Hopper',
+      options: const SourceSearchOptions(query: r'(\w+) (\w+)', regex: true),
+      replacement: r'$2, $1',
+    );
+    final named = replacementService.previewText(
+      source: 'x=42',
+      options: const SourceSearchOptions(
+        query: r'(?<name>\w+)=(?<value>\d+)',
+        regex: true,
+      ),
+      replacement: r'${value}:${name}:$$:$&',
+    );
+
+    expect(numbered.apply(), 'Lovelace, Ada; Hopper, Grace');
+    expect(named.apply(), r'42:x:$:x=42');
+  });
+
+  test('applies only selected preview matches', () {
+    final preview = replacementService.previewText(
+      source: 'one one one',
+      options: const SourceSearchOptions(query: 'one'),
+      replacement: 'two',
+    );
+
+    expect(
+      preview.apply(selectedMatchIds: {preview.matches[1].id}),
+      'one two one',
+    );
+  });
+
+  test(
+    'workspace preview uses dirty buffers and writes closed files',
+    () async {
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-replace-',
+      );
+      addTearDown(() => directory.delete(recursive: true));
+      final openFile = File(p.join(directory.path, 'open.md'));
+      final closedFile = File(p.join(directory.path, 'closed.md'));
+      await openFile.writeAsString('disk cat');
+      await closedFile.writeAsString('closed cat');
+      const workspaceService = WorkspaceService();
+      final openLoad = await workspaceService.loadTextWithSnapshot(
+        openFile.path,
+      );
+      final buffer = DocumentBuffer.file(
+        id: 'open',
+        filePath: openFile.path,
+        text: openLoad.text,
+        snapshot: openLoad.snapshot,
+        format: openLoad.format,
+      ).edited('dirty cat');
+      final workspace = Workspace(
+        id: directory.path,
+        rootPath: directory.path,
+        kind: WorkspaceKind.markdownFolder,
+        openedAt: DateTime(2026),
+        activeFilePath: openFile.path,
+        openFilePaths: [openFile.path],
+        files: [
+          await _documentFile(openFile, directory.path),
+          await _documentFile(closedFile, directory.path),
+        ],
+        diagnostics: const [],
+      );
+      var state = WorkspaceState(
+        workspace: workspace,
+        documentBuffers: [buffer],
+        activeBufferId: buffer.id,
+      );
+
+      final preview = await replacementService.previewWorkspace(
+        state: state,
+        workspaceService: workspaceService,
+        options: const SourceSearchOptions(query: 'cat'),
+        replacement: 'dog',
+      );
+
+      expect(preview.files, hasLength(2));
+      expect(
+        preview.files
+            .singleWhere((file) => file.filePath == openFile.path)
+            .sourceKind,
+        WorkspaceReplacementSourceKind.dirtyBuffer,
+      );
+      final result = await replacementService.applyWorkspace(
+        preview: preview,
+        selectedMatchIds: {
+          for (final file in preview.files)
+            for (final match in file.matches) match.id,
+        },
+        currentState: () => state,
+        updateBuffer: (bufferId, text) {
+          state = state.copyWith(
+            documentBuffers: [state.documentBuffers.single.edited(text)],
+          );
+        },
+        workspaceService: workspaceService,
+      );
+
+      expect(result.appliedFiles, 2);
+      expect(state.documentBuffers.single.text, 'dirty dog');
+      expect(await openFile.readAsString(), 'disk cat');
+      expect(await closedFile.readAsString(), 'closed dog');
+    },
+  );
+
+  test('workspace apply skips stale dirty buffers', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-replace-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final file = File(p.join(directory.path, 'open.md'));
+    await file.writeAsString('cat');
+    const workspaceService = WorkspaceService();
+    final load = await workspaceService.loadTextWithSnapshot(file.path);
+    final buffer = DocumentBuffer.file(
+      id: 'open',
+      filePath: file.path,
+      text: load.text,
+      snapshot: load.snapshot,
+      format: load.format,
+    ).edited('cat dirty');
+    final workspace = Workspace(
+      id: directory.path,
+      rootPath: directory.path,
+      kind: WorkspaceKind.markdownFolder,
+      openedAt: DateTime(2026),
+      activeFilePath: file.path,
+      openFilePaths: [file.path],
+      files: [await _documentFile(file, directory.path)],
+      diagnostics: const [],
+    );
+    var state = WorkspaceState(
+      workspace: workspace,
+      documentBuffers: [buffer],
+      activeBufferId: buffer.id,
+    );
+    final preview = await replacementService.previewWorkspace(
+      state: state,
+      workspaceService: workspaceService,
+      options: const SourceSearchOptions(query: 'cat'),
+      replacement: 'dog',
+    );
+    state = state.copyWith(
+      documentBuffers: [state.documentBuffers.single.edited('changed again')],
+    );
+
+    final result = await replacementService.applyWorkspace(
+      preview: preview,
+      selectedMatchIds: {preview.files.single.matches.single.id},
+      currentState: () => state,
+      updateBuffer: (_, _) => fail('stale buffer must not be updated'),
+      workspaceService: workspaceService,
+    );
+
+    expect(result.appliedFiles, 0);
+    expect(
+      result.issues.single.kind,
+      WorkspaceReplacementIssueKind.bufferRevisionChanged,
+    );
+  });
+
+  test('truncated workspace previews cannot be applied', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-replace-truncated-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final file = File(p.join(directory.path, 'note.md'));
+    await file.writeAsString('cat cat');
+    const workspaceService = WorkspaceService();
+    const limitedService = SearchReplacementService(maximumMatches: 1);
+    final workspace = Workspace(
+      id: directory.path,
+      rootPath: directory.path,
+      kind: WorkspaceKind.markdownFolder,
+      openedAt: DateTime(2026),
+      files: [await _documentFile(file, directory.path)],
+      diagnostics: const [],
+    );
+    final state = WorkspaceState(workspace: workspace);
+    final preview = await limitedService.previewWorkspace(
+      state: state,
+      workspaceService: workspaceService,
+      options: const SourceSearchOptions(query: 'cat'),
+      replacement: 'dog',
+    );
+
+    expect(preview.isComplete, isFalse);
+    final result = await limitedService.applyWorkspace(
+      preview: preview,
+      selectedMatchIds: {preview.files.single.matches.single.id},
+      currentState: () => state,
+      updateBuffer: (_, _) => fail('no buffers should be updated'),
+      workspaceService: workspaceService,
+    );
+
+    expect(result.appliedFiles, 0);
+    expect(result.issues.single.kind, WorkspaceReplacementIssueKind.truncated);
+    expect(await file.readAsString(), 'cat cat');
+  });
+
+  test('stale later files abort before earlier files are changed', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-replace-preflight-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final first = File(p.join(directory.path, 'a.md'));
+    final second = File(p.join(directory.path, 'b.md'));
+    await first.writeAsString('cat first');
+    await second.writeAsString('cat second');
+    const workspaceService = WorkspaceService();
+    final workspace = Workspace(
+      id: directory.path,
+      rootPath: directory.path,
+      kind: WorkspaceKind.markdownFolder,
+      openedAt: DateTime(2026),
+      files: [
+        await _documentFile(first, directory.path),
+        await _documentFile(second, directory.path),
+      ],
+      diagnostics: const [],
+    );
+    final state = WorkspaceState(workspace: workspace);
+    final preview = await replacementService.previewWorkspace(
+      state: state,
+      workspaceService: workspaceService,
+      options: const SourceSearchOptions(query: 'cat'),
+      replacement: 'dog',
+    );
+    await second.writeAsString('changed after preview');
+
+    final result = await replacementService.applyWorkspace(
+      preview: preview,
+      selectedMatchIds: {
+        for (final file in preview.files)
+          for (final match in file.matches) match.id,
+      },
+      currentState: () => state,
+      updateBuffer: (_, _) => fail('no buffers should be updated'),
+      workspaceService: workspaceService,
+    );
+
+    expect(result.appliedFiles, 0);
+    expect(
+      result.issues.single.kind,
+      WorkspaceReplacementIssueKind.changedSincePreview,
+    );
+    expect(await first.readAsString(), 'cat first');
+    expect(await second.readAsString(), 'changed after preview');
+  });
+
+  test(
+    'rollback preserves a concurrent edit and reports displaced content',
+    () async {
+      if (!Platform.isLinux) {
+        return;
+      }
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-replace-rollback-conflict-',
+      );
+      addTearDown(() => directory.delete(recursive: true));
+      final first = File(p.join(directory.path, 'a.md'));
+      final second = File(p.join(directory.path, 'b.md'));
+      await first.writeAsString('cat first');
+      await second.writeAsString('cat second');
+      var injected = false;
+      final workspaceService = WorkspaceService(
+        afterBatchFileCommit: (targetPath, committedCount) async {
+          if (!injected && committedCount == 1) {
+            injected = true;
+            await first.writeAsString('external first');
+            await second.delete();
+          }
+        },
+      );
+      final workspace = Workspace(
+        id: directory.path,
+        rootPath: directory.path,
+        kind: WorkspaceKind.markdownFolder,
+        openedAt: DateTime(2026),
+        files: [
+          await _documentFile(first, directory.path),
+          await _documentFile(second, directory.path),
+        ],
+        diagnostics: const [],
+      );
+      final state = WorkspaceState(workspace: workspace);
+      final preview = await replacementService.previewWorkspace(
+        state: state,
+        workspaceService: workspaceService,
+        options: const SourceSearchOptions(query: 'cat'),
+        replacement: 'dog',
+      );
+
+      final result = await replacementService.applyWorkspace(
+        preview: preview,
+        selectedMatchIds: {
+          for (final file in preview.files)
+            for (final match in file.matches) match.id,
+        },
+        currentState: () => state,
+        updateBuffer: (_, _) => fail('no buffers should be updated'),
+        workspaceService: workspaceService,
+      );
+
+      expect(result.appliedFiles, 0);
+      expect(result.issues, hasLength(1));
+      expect(
+        result.issues.single.kind,
+        WorkspaceReplacementIssueKind.partialApplicationConflict,
+      );
+      expect(result.issues.single.filePath, first.path);
+      expect(await first.readAsString(), 'external first');
+      final preservedPath = result.issues.single.preservedPath;
+      expect(preservedPath, isNotNull);
+      expect(await File(preservedPath!).readAsString(), 'cat first');
+    },
+  );
+
+  test('workspace apply revalidates open buffers after disk writes', () async {
+    if (!Platform.isLinux) {
+      return;
+    }
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-replace-open-race-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final openFile = File(p.join(directory.path, 'open.md'));
+    final closedFile = File(p.join(directory.path, 'closed.md'));
+    await openFile.writeAsString('open cat');
+    await closedFile.writeAsString('closed cat');
+    final workspaceService = _PausedBatchWorkspaceService();
+    final openLoad = await workspaceService.loadTextWithSnapshot(openFile.path);
+    final buffer = DocumentBuffer.file(
+      id: 'open',
+      filePath: openFile.path,
+      text: openLoad.text,
+      snapshot: openLoad.snapshot,
+      format: openLoad.format,
+    ).edited('dirty cat');
+    final workspace = Workspace(
+      id: directory.path,
+      rootPath: directory.path,
+      kind: WorkspaceKind.markdownFolder,
+      openedAt: DateTime(2026),
+      activeFilePath: openFile.path,
+      openFilePaths: [openFile.path],
+      files: [
+        await _documentFile(openFile, directory.path),
+        await _documentFile(closedFile, directory.path),
+      ],
+      diagnostics: const [],
+    );
+    var state = WorkspaceState(
+      workspace: workspace,
+      documentBuffers: [buffer],
+      activeBufferId: buffer.id,
+    );
+    final preview = await replacementService.previewWorkspace(
+      state: state,
+      workspaceService: workspaceService,
+      options: const SourceSearchOptions(query: 'cat'),
+      replacement: 'dog',
+    );
+
+    final apply = replacementService.applyWorkspace(
+      preview: preview,
+      selectedMatchIds: {
+        for (final file in preview.files)
+          for (final match in file.matches) match.id,
+      },
+      currentState: () => state,
+      updateBuffer: (_, _) => fail('concurrent edit must not be overwritten'),
+      workspaceService: workspaceService,
+    );
+    await workspaceService.batchStarted.future;
+    state = state.copyWith(
+      documentBuffers: [state.documentBuffers.single.edited('newer edit')],
+    );
+    workspaceService.releaseBatch();
+    final result = await apply;
+
+    expect(result.appliedFiles, 1);
+    expect(result.appliedMatches, 1);
+    expect(result.issues, hasLength(1));
+    expect(
+      result.issues.single.kind,
+      WorkspaceReplacementIssueKind.bufferRevisionChanged,
+    );
+    expect(state.documentBuffers.single.text, 'newer edit');
+    expect(await closedFile.readAsString(), 'closed dog');
+  });
+}
+
+class _PausedBatchWorkspaceService extends WorkspaceService {
+  final batchStarted = Completer<void>();
+  final _release = Completer<void>();
+
+  void releaseBatch() => _release.complete();
+
+  @override
+  Future<Map<String, WorkspaceFileSnapshot>> saveFormattedTextBatch(
+    List<WorkspaceBatchTextWrite> writes,
+  ) async {
+    batchStarted.complete();
+    await _release.future;
+    return super.saveFormattedTextBatch(writes);
+  }
+}
+
+Future<DocumentFile> _documentFile(File file, String root) async {
+  final stat = await file.stat();
+  return DocumentFile(
+    absolutePath: file.path,
+    relativePath: p.relative(file.path, from: root),
+    kind: DocumentKind.markdown,
+    size: stat.size,
+    lastModified: stat.modified,
+  );
+}
diff --git a/test/src/source_audit_test.dart b/test/src/source_audit_test.dart
index 2fda56e2..eff822df 100644
--- a/test/src/source_audit_test.dart
+++ b/test/src/source_audit_test.dart
@@ -150,6 +150,8 @@ void main() {
       orderedEquals(<String>[
         'Icons'
             '.fork_right',
+        'Icons'
+            '.functions',
       ]),
     );
   });
@@ -866,9 +868,12 @@ void main() {
     );
     expect(
       sourceEditor,
-      contains('selectionHeightStyle: BoxHeightStyle.strut'),
+      contains('BusyMarkDocumentTextGeometry.selectionHeightStyle'),
+    );
+    expect(
+      sourceEditor,
+      contains('BusyMarkDocumentTextGeometry.selectionWidthStyle'),
     );
-    expect(sourceEditor, contains('selectionWidthStyle: BoxWidthStyle.tight'));
     expect(sourceEditor, contains('cursorColor: colors.foreground.withValues'));
     expect(sourceEditor, contains('BusyMarkAlpha.sourceCursor'));
     expect(
@@ -900,7 +905,7 @@ void main() {
         ),
       ),
     );
-    expect(workspace, contains('shortcut: _sidebarTabShortcut(tab)'));
+    expect(workspace, contains('shortcut: _sidebarTabShortcut(context, tab)'));
     expect(
       workspace,
       isNot(contains('BusyMarkSidebarShortcutActivators.history')),
@@ -1098,7 +1103,7 @@ void main() {
       contains("ValueKey('workspace-sidebar-outline-file-menu')"),
     );
     expect(workspace, contains('copyNameLabel: menuContext.l10n.copyFileName'));
-    expect(workspace, contains('tooltip: context.l10n.fileActions'));
+    expect(workspace, contains('tooltip: context.l10n.actions'));
     expect(workspace, isNot(contains('tooltip: context.l10n.openInFiles')));
     expect(workspace, contains('icon: WorkspaceGlyphs.branch'));
     expect(workspace, isNot(contains('boldLeadingIcon')));
@@ -1302,7 +1307,7 @@ void main() {
     expect(entries, contains('return YaruListTile.square('));
     expect(entries, contains('title: TextFormField('));
     expect(entries, contains('busyMarkGroupedTextFieldDecoration('));
-    expect(entries, contains('trailing: trailing'));
+    expect(entries, contains('trailing: widget.trailing'));
     expect(entries, isNot(contains('EditableText(')));
     expect(entries, isNot(contains('MouseRegion(')));
     expect(entries, isNot(contains('GestureDetector(')));
@@ -1364,15 +1369,15 @@ void main() {
     expect(workspace, contains('onSecondaryTapUp'));
     expect(
       RegExp(
-        r'BusyMarkTreeShortcutActivators\.deleteSelection',
+        r'BusyMarkCommandIds\s*\.treeDeleteSelection',
       ).allMatches(workspace).length,
-      greaterThanOrEqualTo(2),
+      greaterThanOrEqualTo(4),
     );
     expect(
       RegExp(
-        r'shortcut: BusyMarkTreeShortcutLabels\.deleteSelection',
+        r'BusyMarkCommandRegistryScope\.(?:read|maybeOf)\(context\)',
       ).allMatches(workspace).length,
-      greaterThanOrEqualTo(2),
+      greaterThanOrEqualTo(4),
     );
     expect(
       RegExp(
@@ -1691,7 +1696,7 @@ void main() {
     expect(serializer, contains('String _listItem('));
     expect(serializer, contains('String _indentBlock('));
     expect(toolbar, isNot(contains('transparent: true')));
-    expect(RegExp(r'transparent: false').allMatches(toolbar), hasLength(2));
+    expect(RegExp(r'transparent: false').allMatches(toolbar), hasLength(3));
     expect(toolbar, contains('BusyMarkHeaderIconButton('));
     expect(toolbar, contains('_editorToolbarButtonBackground(context)'));
     expect(toolbar, contains('return theme.colorScheme.primary'));
@@ -1699,11 +1704,11 @@ void main() {
       RegExp(
         r'foregroundColor: BusyMarkLinuxPalette\.white',
       ).allMatches(toolbar),
-      hasLength(2),
+      hasLength(3),
     );
     expect(toolbar, isNot(contains('busyMarkContainedControlBackground(')));
     expect(toolbar, isNot(contains('foregroundColor: colors.foreground')));
-    expect(RegExp(r'elevated: true').allMatches(toolbar), hasLength(2));
+    expect(RegExp(r'elevated: true').allMatches(toolbar), hasLength(3));
     expect(toolbar, isNot(contains('accented: true')));
     expect(toolbar, contains('clipBehavior: Clip.none'));
     expect(toolbar, contains('hitTestBehavior: HitTestBehavior.deferToChild'));
diff --git a/test/src/source_editor_widget_test.dart b/test/src/source_editor_widget_test.dart
index 8608fedd..65950fe6 100644
--- a/test/src/source_editor_widget_test.dart
+++ b/test/src/source_editor_widget_test.dart
@@ -8,6 +8,7 @@ import 'package:busymark/src/app/app_theme.dart';
 import 'package:busymark/src/app/busymark_design.dart';
 import 'package:busymark/src/core/diagnostic.dart';
 import 'package:busymark/src/core/source_span.dart';
+import 'package:busymark/src/editor/document_text_geometry.dart';
 import 'package:busymark/src/editor/source/source_editor.dart';
 import 'package:busymark/src/editor/source/source_gutter.dart'
     show sourceTextHeightBehavior;
@@ -491,6 +492,72 @@ void main() {
     expect(find.byTooltip(en.expandKind(en.foldKindSection)), findsOneWidget);
   });
 
+  testWidgets('source Replace All is one editor operation', (tester) async {
+    final en = AppLocalizationsEn();
+    var replacement = '';
+    var currentText = 'cat cat';
+    String? undoText;
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: StatefulBuilder(
+            builder: (context, setState) => SizedBox(
+              width: 900,
+              height: 600,
+              child: BusyMarkSourceEditor(
+                text: currentText,
+                language: SourceSyntaxLanguage.markdown,
+                filePath: '/project/topic.md',
+                diagnostics: const [],
+                editorFontSize: 14,
+                wordWrap: true,
+                searchActive: true,
+                searchOptions: const SourceSearchOptions(query: 'cat'),
+                searchReplacement: replacement,
+                onSearchReplacementChanged: (value) =>
+                    setState(() => replacement = value),
+                onSearchOptionsChanged: (_) {},
+                onChanged: (text, _) {
+                  undoText = currentText;
+                  setState(() => currentText = text);
+                },
+                onUndo: () {
+                  final previous = undoText;
+                  if (previous == null) {
+                    return null;
+                  }
+                  undoText = null;
+                  setState(() => currentText = previous);
+                  return previous;
+                },
+                onOpenSearch: () {},
+                onCloseSearch: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.enterText(
+      find.byKey(const ValueKey('source-search-replacement')),
+      'dog',
+    );
+    await tester.pump();
+    await tester.tap(find.byTooltip(en.sourceSearchReplaceAll));
+    await tester.pump();
+
+    expect(currentText, 'dog dog');
+
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+    await tester.sendKeyEvent(LogicalKeyboardKey.keyZ);
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+    await tester.pump();
+
+    expect(currentText, 'cat cat');
+  });
+
   testWidgets(
     'source editor gives glyphs, caret, and selection breathing room',
     (tester) async {
@@ -534,7 +601,14 @@ void main() {
       );
       expect(renderEditable, isNotNull);
       expect(field.style?.height, BusyMarkTypography.sourceEditorLineHeight);
-      expect(field.selectionHeightStyle, BoxHeightStyle.strut);
+      expect(
+        field.selectionHeightStyle,
+        BusyMarkDocumentTextGeometry.selectionHeightStyle,
+      );
+      expect(
+        BusyMarkDocumentTextGeometry.selectionHeightStyle,
+        BoxHeightStyle.strut,
+      );
       expect(
         field.cursorHeight,
         fontSize * BusyMarkTypography.sourceCursorHeightScale,
diff --git a/test/src/source_highlighter_test.dart b/test/src/source_highlighter_test.dart
index 07e82c7c..0d2983b8 100644
--- a/test/src/source_highlighter_test.dart
+++ b/test/src/source_highlighter_test.dart
@@ -623,6 +623,28 @@ void main() {
 
     expect(_spanStyle(spans, 'value')?.fontStyle, FontStyle.italic);
   });
+
+  testWidgets('markdown highlighter recognizes math without damaging code', (
+    tester,
+  ) async {
+    final spans = await _highlightMarkdown(
+      tester,
+      r'Formula $x^2$ and $`a_b`$; code `$not$`; escaped \$5 and $5-$10.'
+      '\n'
+      r'$$'
+      '\n'
+      r'\int_0^1 x\,dx'
+      '\n'
+      r'$$'
+      '\n',
+    );
+
+    final mathStyle = _spanStyle(spans, 'x^2');
+    expect(mathStyle?.color, isNotNull);
+    expect(_spanStyle(spans, 'a_b')?.color, mathStyle?.color);
+    expect(_spanStyle(spans, r'$not$')?.fontFamily, 'Ubuntu Mono');
+    expect(_spanStyle(spans, r'\int_0^1 x\,dx')?.color, mathStyle?.color);
+  });
 }
 
 Future<List<TextSpan>> _highlightMarkdown(
diff --git a/test/src/status_semantics_test.dart b/test/src/status_semantics_test.dart
index 79787851..404c456a 100644
--- a/test/src/status_semantics_test.dart
+++ b/test/src/status_semantics_test.dart
@@ -2,6 +2,7 @@ import 'package:busymark/l10n/generated/app_localizations.dart';
 import 'package:busymark/src/app/app_theme.dart';
 import 'package:busymark/src/app/busymark_design.dart';
 import 'package:busymark/src/app/system_accent.dart';
+import 'package:busymark/src/app/busymark_toast.dart';
 import 'package:busymark/src/git/application/git_controller.dart';
 import 'package:busymark/src/git/domain/git_models.dart';
 import 'package:busymark/src/git/presentation/git_sidebar_tab.dart';
@@ -86,49 +87,42 @@ void main() {
     }
   });
 
-  testWidgets('Git failures use their semantic status roles', (tester) async {
-    const cases = {
-      GitFailureCode.commandFailed: BusyMarkStatusKind.error,
-      GitFailureCode.dirtyWorkspace: BusyMarkStatusKind.warning,
-      GitFailureCode.stagedChanges: BusyMarkStatusKind.warning,
-      GitFailureCode.detachedHead: BusyMarkStatusKind.warning,
-      GitFailureCode.noUpstream: BusyMarkStatusKind.information,
-    };
+  testWidgets('Git failures use window-level toasts', (tester) async {
+    await tester.pumpWidget(_testApp(_gitSidebar()));
+    final controller = _gitController(tester);
 
-    for (final entry in cases.entries) {
-      await tester.pumpWidget(
-        _testApp(
-          _gitSidebar(
-            GitFailure(
-              code: entry.key,
-              userMessageKey: 'unused',
-              rawMessage: '',
-              commandName: 'test',
-            ),
-          ),
-        ),
-      );
-      await tester.pump();
+    controller.reportFailure(
+      const GitFailure(
+        code: GitFailureCode.commandFailed,
+        userMessageKey: 'unused',
+        rawMessage: 'Author identity unknown',
+        commandName: 'commit',
+      ),
+    );
+    await tester.pumpAndSettle(const Duration(milliseconds: 200));
 
-      final status = tester.widget<BusyMarkStatusBox>(
-        find.byType(BusyMarkStatusBox),
-      );
-      expect(status.kind, entry.value, reason: '${entry.key}');
-    }
+    expect(find.textContaining('Git command failed.'), findsOneWidget);
+    expect(find.textContaining('Author identity unknown'), findsOneWidget);
+    expect(
+      find.text(AppLocalizations.of(_gitContext(tester)).copy),
+      findsOneWidget,
+    );
+    expect(find.byType(BusyMarkStatusBox), findsNothing);
   });
 
-  testWidgets('successful Git operations use the success role', (tester) async {
-    await tester.pumpWidget(_testApp(_gitSidebar(null, message: 'Done')));
-    await tester.pump();
+  testWidgets('successful Git operations use window-level toasts', (
+    tester,
+  ) async {
+    await tester.pumpWidget(_testApp(_gitSidebar()));
+    _gitController(tester).reportSuccess('Done');
+    await tester.pumpAndSettle(const Duration(milliseconds: 200));
 
-    final status = tester.widget<BusyMarkStatusBox>(
-      find.byType(BusyMarkStatusBox),
-    );
-    expect(status.kind, BusyMarkStatusKind.success);
+    expect(find.text('Done'), findsOneWidget);
+    expect(find.byType(BusyMarkStatusBox), findsNothing);
   });
 }
 
-Widget _gitSidebar(GitFailure? failure, {String? message}) {
+Widget _gitSidebar() {
   const repository = GitRepositoryInfo(
     rootPath: '/repo',
     gitDirPath: '/repo/.git',
@@ -144,11 +138,8 @@ Widget _gitSidebar(GitFailure? failure, {String? message}) {
       repositoryInfo: repository,
       files: [],
     ),
-    lastError: failure,
-    lastOperationMessage: message,
   );
   return ProviderScope(
-    key: ValueKey((failure?.code, message)),
     overrides: [
       gitControllerProvider.overrideWith(() => _PresetGitController(state)),
     ],
@@ -178,10 +169,20 @@ Widget _testApp(Widget child) {
       brightness: Brightness.light,
       accentColor: busyMarkDefaultAccentColor,
     ),
-    home: Scaffold(body: child),
+    home: BusyMarkToastOverlay(child: Scaffold(body: child)),
   );
 }
 
+BuildContext _gitContext(WidgetTester tester) =>
+    tester.element(find.byType(GitSidebarTab));
+
+_PresetGitController _gitController(WidgetTester tester) {
+  return ProviderScope.containerOf(
+        _gitContext(tester),
+      ).read(gitControllerProvider.notifier)
+      as _PresetGitController;
+}
+
 class _PresetGitController extends GitController {
   _PresetGitController(this.initialState);
 
@@ -189,4 +190,12 @@ class _PresetGitController extends GitController {
 
   @override
   GitState build() => initialState;
+
+  void reportFailure(GitFailure failure) {
+    state = state.copyWith(lastError: failure, lastOperationMessage: null);
+  }
+
+  void reportSuccess(String message) {
+    state = state.copyWith(lastError: null, lastOperationMessage: message);
+  }
 }
diff --git a/test/src/text_format_metadata_test.dart b/test/src/text_format_metadata_test.dart
new file mode 100644
index 00000000..328b689a
--- /dev/null
+++ b/test/src/text_format_metadata_test.dart
@@ -0,0 +1,54 @@
+import 'dart:convert';
+
+import 'package:busymark/src/workspace/text_format_metadata.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  test('detects and preserves UTF-8 BOM, CRLF, and final newline', () {
+    final bytes = <int>[0xef, 0xbb, 0xbf, ...utf8.encode('one\r\ntwo\r\n')];
+
+    final decoded = decodeUtf8Document(bytes);
+
+    expect(decoded.text, 'one\ntwo\n');
+    expect(decoded.format.hasUtf8Bom, isTrue);
+    expect(decoded.format.lineEnding, DocumentLineEnding.crlf);
+    expect(decoded.format.hasFinalNewline, isTrue);
+    expect(decoded.format.encode(decoded.text), bytes);
+  });
+
+  test('preserves a missing final newline when saving edited text', () {
+    final decoded = decodeUtf8Document(utf8.encode('one\ntwo'));
+
+    expect(decoded.format.hasFinalNewline, isFalse);
+    expect(
+      utf8.decode(decoded.format.encode('changed\ntext\n')),
+      'changed\ntext',
+    );
+  });
+
+  test('requires an explicit normalization for mixed line endings', () {
+    final decoded = decodeUtf8Document(utf8.encode('one\r\ntwo\nthree'));
+
+    expect(decoded.format.lineEnding, DocumentLineEnding.mixed);
+    expect(
+      () => decoded.format.encode(decoded.text),
+      throwsA(isA<MixedLineEndingNormalizationRequired>()),
+    );
+    expect(
+      utf8.decode(
+        decoded.format.encode(
+          decoded.text,
+          mixedNormalization: LineEndingNormalization.crlf,
+        ),
+      ),
+      'one\r\ntwo\r\nthree',
+    );
+  });
+
+  test('rejects invalid UTF-8 instead of replacing bytes', () {
+    expect(
+      () => decodeUtf8Document(const [0xc3, 0x28]),
+      throwsA(isA<FormatException>()),
+    );
+  });
+}
diff --git a/test/src/visualization_card_test.dart b/test/src/visualization_card_test.dart
index f66268e9..cbf255b8 100644
--- a/test/src/visualization_card_test.dart
+++ b/test/src/visualization_card_test.dart
@@ -306,6 +306,12 @@ class _OpenReferenceHost implements WebRenderHost {
   String? lastTitle;
   Uint8List copiedPng = Uint8List(0);
 
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) => throw UnimplementedError();
+
   @override
   Future<void> copyPngToClipboard(Uint8List pngBytes) async {
     copiedPng = pngBytes;
diff --git a/test/src/visualization_packaging_audit_test.dart b/test/src/visualization_packaging_audit_test.dart
index 7257bfec..4aa30498 100644
--- a/test/src/visualization_packaging_audit_test.dart
+++ b/test/src/visualization_packaging_audit_test.dart
@@ -11,12 +11,25 @@ void main() {
       'linux/io.busystack.busymark.metainfo.xml',
     ).readAsStringSync();
 
-    expect(pubspec, contains(RegExp(r'^version: 0\.3\.0$', multiLine: true)));
+    expect(pubspec, contains(RegExp(r'^version: 0\.3\.1$', multiLine: true)));
     expect(
       snapcraft,
-      contains(RegExp(r'^version: "0\.3\.0"$', multiLine: true)),
+      contains(RegExp(r'^version: "0\.3\.1"$', multiLine: true)),
     );
     expect(snapcraft, contains(RegExp(r'^grade: stable$', multiLine: true)));
+    expect(
+      snapcraft,
+      contains(RegExp(r'^confinement: strict$', multiLine: true)),
+    );
+    expect(snapcraft, contains('extensions: [gnome]'));
+    expect(snapcraft, contains('XDG_CONFIG_HOME:'));
+    expect(snapcraft, contains('XDG_CACHE_HOME:'));
+    expect(snapcraft, contains('XDG_DATA_HOME:'));
+    expect(snapcraft, contains('- home'));
+    expect(snapcraft, contains('- network'));
+    expect(snapcraft, contains('- removable-media'));
+    expect(snapcraft, contains('- ssh-keys'));
+    expect(snapcraft, contains('- enable-patchelf'));
     expect(
       snapcraft,
       contains(
@@ -26,9 +39,9 @@ void main() {
         ),
       ),
     );
-    expect(metainfo, contains('<release version="0.3.0"'));
-    expect(pubspec, isNot(contains('0.3.04')));
-    expect(snapcraft, isNot(contains('0.3.04')));
+    expect(metainfo, contains('<release version="0.3.1"'));
+    expect(pubspec, isNot(contains('0.3.14')));
+    expect(snapcraft, isNot(contains('0.3.14')));
   });
 
   test(
@@ -41,22 +54,35 @@ void main() {
               )
               as Map<String, Object?>;
       final dependencies = package['dependencies'] as Map<String, Object?>;
+      final lock = File(
+        'tools/visualization/package-lock.json',
+      ).readAsStringSync();
+      final webBuild = File(
+        'tools/visualization/build_render_engines.js',
+      ).readAsStringSync();
       final cmake = File('linux/CMakeLists.txt').readAsStringSync();
 
-      expect(dependencies['mermaid'], '11.16.1');
+      expect(dependencies, isNot(contains('mermaid')));
+      expect(dependencies['@mermaid-js/parser'], '1.2.0');
       expect(dependencies['@plantuml/core'], '1.2026.6');
       expect(dependencies['@scalar/openapi-parser'], '0.28.14');
       expect(dependencies['@scalar/api-reference'], '1.65.1');
       expect(dependencies['@scalar/json-magic'], '0.13.0');
       expect(dependencies['yaml'], '2.9.0');
+      expect(dependencies['@mathjax/src'], '4.1.3');
+      expect(dependencies['@mathjax/mathjax-newcm-font'], '4.1.3');
+      expect(dependencies, isNot(contains('katex')));
+      expect(lock, isNot(contains('node_modules/katex')));
       expect((package['engines'] as Map<String, Object?>)['node'], '>=22');
       for (final checksum in [
-        'ebd9885111092c78cefc79a76f6c1dc34ed5b834b02ae8f338227ce79c003de4',
+        '0ee99b3bb82766e5d6c34b8cc768b8530ce8f1aaa13790ae368aebeef3de9d11',
         '798f99592eb03a6446519d2becf78e6f1008d0d25c75d60b37a0f46e39e3c413',
         '993bb7ebb3480cc574665b0eac52d9cd4a817fdf5b4444894bb70e174880513d',
         '68b6f22ca530ac50e3cd034c5189d89cc5457c3c2d325b44e90db05c9f08c573',
         'f1adefc461f3594afd4ad16974820a5a88b271f7e8051045c2ac7a34eb974d33',
         '008fa204cb1ba700e0272ba045abbf09a6ffe63456e8146ba97cac6c2ad1ef91',
+        '4611bed26b338dfc4b5757b8ed2d7ba82a85bcbd05d2729fb3465fba17b8896c',
+        '87d7b869c6a2a6169d9a53acc4eab6c846a9cbe11752738226461bb5070c8b88',
       ]) {
         expect(fetch, contains(checksum));
       }
@@ -65,6 +91,14 @@ void main() {
       expect(fetch, contains('--ignore-scripts'));
       expect(fetch, contains('NODE_MAJOR < 22'));
       expect(fetch, contains('THIRD_PARTY_NOTICES.md'));
+      expect(fetch, contains(r'mermaid@${MERMAID_VERSION}.tar.gz'));
+      expect(fetch, contains('packages/mermaid'));
+      expect(fetch, contains('build_render_engines.js'));
+      expect(webBuild, contains('katex: disabledMathModule'));
+      expect(
+        webBuild,
+        contains("path.join(mermaidSource, 'src', 'mermaid.ts')"),
+      );
       expect(cmake, contains('share/busymark/visualization'));
       expect(cmake, contains('bootstrap.js'));
     },
@@ -119,6 +153,7 @@ void main() {
     expect(workflow, contains('GDK_BACKEND=wayland'));
     expect(workflow, contains('snapcore/action-build@v1'));
     expect(workflow, contains('sudo snap install --dangerous'));
+    expect(workflow, isNot(contains('--dangerous --classic')));
     expect(workflow, contains('snap run busymark'));
     expect(workflow, contains('--visualization-release-smoke='));
     expect(workflow, contains('BUSYMARK_RELEASE_SMOKE=1'));
@@ -144,11 +179,20 @@ void main() {
       final bootstrap = File(
         'tools/visualization/bootstrap.js',
       ).readAsStringSync();
+      final math = File(
+        'tools/visualization/mathjax_renderer.js',
+      ).readAsStringSync();
+      final renderEngines = File(
+        'tools/visualization/render_engines.js',
+      ).readAsStringSync();
       final snapcraft = File('snap/snapcraft.yaml').readAsStringSync();
 
       expect(native, contains('webkit_web_context_new_ephemeral'));
       expect(native, contains('webkit_web_context_set_sandbox_enabled'));
-      expect(native, contains('strictly_confined_snap'));
+      expect(
+        native,
+        contains('webkit_web_context_set_sandbox_enabled(self->context, TRUE)'),
+      );
       expect(native, contains('WEBKIT_COOKIE_POLICY_ACCEPT_NEVER'));
       expect(
         native,
@@ -163,6 +207,7 @@ void main() {
       expect(native, contains('render_process_terminated_cb'));
       expect(native, contains('recreate_render_view'));
       expect(native, contains('terminateWebProcessForReleaseSmoke'));
+      expect(native, contains('"renderMathBatch"'));
       expect(native, contains('BUSYMARK_RELEASE_SMOKE'));
       expect(native, contains('gtk_widget_get_allocated_width'));
       expect(native, contains('snapshot_allocation_attempts'));
@@ -175,6 +220,30 @@ void main() {
         expect(html, isNot(contains('cdn.')));
       }
       expect(bootstrap, contains('createMemoryStorage'));
+      expect(renderEngines, contains("case 'renderMathBatch':"));
+      expect(math, contains("export const mathJaxVersion = '4.1.3'"));
+      expect(math, contains("export const mathJaxFontVersion = '4.1.3'"));
+      expect(math, contains('mathjax.asyncLoad = () => Promise.resolve()'));
+      expect(math, contains("URLs: 'none'"));
+      expect(math, contains("classes: 'none'"));
+      expect(math, contains("cssIDs: 'none'"));
+      expect(math, contains("styles: 'none'"));
+      expect(math, contains('maxBuffer: 20 * 1024'));
+      expect(math, contains('maxMacros: 500'));
+      expect(math, contains('maxTemplateSubtitutions: 2000'));
+      expect(math, contains("fontCache: 'local'"));
+      expect(math, contains('useXlink: false'));
+      expect(math, contains('clearExpressionDefinitions'));
+      expect(math, contains('tex.reset(0)'));
+      for (final disabledPackage in [
+        'AutoloadConfiguration',
+        'RequireConfiguration',
+        'SetOptionsConfiguration',
+        'TexHtmlConfiguration',
+        'PhysicsConfiguration',
+      ]) {
+        expect(math, isNot(contains(disabledPackage)));
+      }
       expect(scalar, contains('telemetry: false'));
       expect(scalar, contains('persistAuth: false'));
       expect(scalar, contains('hideTestRequestButton: true'));
diff --git a/test/src/visualization_raster_sizing_test.dart b/test/src/visualization_raster_sizing_test.dart
index ffd6e1f5..7388ea6f 100644
--- a/test/src/visualization_raster_sizing_test.dart
+++ b/test/src/visualization_raster_sizing_test.dart
@@ -154,6 +154,12 @@ class _LimitEnforcingRasterHost implements WebRenderHost {
   int? pixelWidth;
   int? pixelHeight;
 
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) => throw UnimplementedError();
+
   @override
   Future<Uint8List> rasterizeSvg({
     required String svg,
diff --git a/test/src/web_render_host_test.dart b/test/src/web_render_host_test.dart
index 14a63fd3..8eec18b2 100644
--- a/test/src/web_render_host_test.dart
+++ b/test/src/web_render_host_test.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:busymark/src/visualization/visualization_models.dart';
+import 'package:busymark/src/math/math_models.dart';
 import 'package:busymark/src/visualization/visualization_renderer.dart';
 import 'package:busymark/src/visualization/web_render_host.dart';
 import 'package:flutter/services.dart';
@@ -38,6 +39,74 @@ void main() {
     expect(arguments['requestId'], isA<String>());
   });
 
+  test('sends a MathJax batch in one cancellable host request', () async {
+    MethodCall? received;
+    messenger.setMockMethodCallHandler(channel, (call) async {
+      received = call;
+      return <String, Object?>{'results': <Object?>[]};
+    });
+    const host = PlatformWebRenderHost(channel: channel);
+    final expressions = <Map<String, Object?>>[
+      {'id': 'one', 'expression': 'x', 'display': false},
+      {'id': 'two', 'expression': r'\mathbb{R}', 'display': true},
+    ];
+
+    await host.renderMathBatch(
+      expressions: expressions,
+      cancellationToken: VisualizationCancellationToken(),
+    );
+
+    expect(received?.method, 'renderMathBatch');
+    final arguments = received?.arguments as Map<Object?, Object?>;
+    expect(arguments['expressions'], expressions);
+    expect(arguments['requestId'], isA<String>());
+  });
+
+  test('scales the MathJax timeout for sequential batch conversion', () {
+    const host = PlatformWebRenderHost(channel: channel);
+
+    expect(
+      host.mathBatchTimeoutForExpressionCount(1),
+      const Duration(seconds: 10),
+    );
+    expect(
+      host.mathBatchTimeoutForExpressionCount(128),
+      const Duration(milliseconds: 41750),
+    );
+    expect(
+      host.mathBatchTimeoutForExpressionCount(1000),
+      const Duration(seconds: 45),
+    );
+  });
+
+  test('applies the scaled timeout to a maximum accepted batch', () async {
+    messenger.setMockMethodCallHandler(channel, (call) async {
+      if (call.method == 'renderMathBatch') {
+        await Future<void>.delayed(const Duration(milliseconds: 40));
+        return <String, Object?>{'results': <Object?>[]};
+      }
+      return null;
+    });
+    const host = PlatformWebRenderHost(
+      channel: channel,
+      mathTimeout: Duration(milliseconds: 5),
+      mathTimeoutPerAdditionalExpression: Duration(milliseconds: 2),
+      maximumMathTimeout: Duration(seconds: 1),
+    );
+    final expressions = [
+      for (var index = 0; index < busyMarkMaximumMathBatchExpressions; index++)
+        <String, Object?>{'id': '$index', 'expression': 'x_$index'},
+    ];
+
+    await expectLater(
+      host.renderMathBatch(
+        expressions: expressions,
+        cancellationToken: VisualizationCancellationToken(),
+      ),
+      completes,
+    );
+  });
+
   test(
     'cancels the matching native request and rejects a late success',
     () async {
diff --git a/test/src/workspace_controller_test.dart b/test/src/workspace_controller_test.dart
index a6d89386..713b9b4b 100644
--- a/test/src/workspace_controller_test.dart
+++ b/test/src/workspace_controller_test.dart
@@ -2,7 +2,13 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:busymark/src/app/app_settings.dart';
+import 'package:busymark/src/core/source_span.dart';
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/workspace/document_buffer.dart';
+import 'package:busymark/src/workspace/recovery_persistence.dart';
+import 'package:busymark/src/workspace/session_persistence.dart';
 import 'package:busymark/src/workspace/workspace_controller.dart';
+import 'package:busymark/src/workspace/workspace_file_monitor.dart';
 import 'package:busymark/src/workspace/workspace_message.dart';
 import 'package:busymark/src/workspace/workspace_model.dart';
 import 'package:busymark/src/workspace/workspace_service.dart';
@@ -406,6 +412,53 @@ void main() {
     await directory.delete(recursive: true);
   });
 
+  test(
+    'saving multiple untitled documents creates normal file buffers',
+    () async {
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-multiple-untitled-',
+      );
+      final firstFile = File(p.join(directory.path, 'first.md'));
+      final secondFile = File(p.join(directory.path, 'second.md'));
+      final harness = await _createControllerHarness();
+      final settingsController = harness.settingsController;
+      final controller = harness.controller;
+
+      await controller.createMarkdownFile();
+      controller.updateActiveText('# First draft\n');
+      await controller.createMarkdownFile();
+      controller.updateActiveText('# Second draft\n');
+      expect(controller.state.documentBuffers, hasLength(2));
+
+      expect(await controller.saveActiveAs(secondFile.path), isTrue);
+      expect(controller.state.workspace?.kind, WorkspaceKind.singleMarkdown);
+      expect(controller.state.activeBuffer?.filePath, secondFile.path);
+      controller.updateActiveText('# Second saved again\n');
+      expect(await controller.saveActive(), isTrue);
+      expect(await secondFile.readAsString(), '# Second saved again\n');
+
+      expect(await controller.activatePreviousOpenFileTab(), isTrue);
+      expect(controller.state.activeBuffer?.filePath, isNull);
+      expect(await controller.saveActiveAs(firstFile.path), isTrue);
+      expect(controller.state.documentBuffers, hasLength(2));
+      expect(
+        controller.state.documentBuffers.map((buffer) => buffer.filePath),
+        containsAll([firstFile.path, secondFile.path]),
+      );
+
+      final firstId = controller.state.activeBuffer!.id;
+      expect(await controller.closeDocumentBuffer(firstId), isTrue);
+      expect(controller.state.documentBuffers, hasLength(1));
+      final secondId = controller.state.activeBuffer!.id;
+      expect(await controller.closeDocumentBuffer(secondId), isTrue);
+      expect(controller.state.documentBuffers, isEmpty);
+
+      controller.dispose();
+      settingsController.dispose();
+      await directory.delete(recursive: true);
+    },
+  );
+
   test(
     'save as refuses an existing file unless overwrite is explicit',
     () async {
@@ -531,6 +584,38 @@ void main() {
     await directory.delete(recursive: true);
   });
 
+  test('save as completes against its buffer after switching tabs', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-save-as-switch-tab-',
+    );
+    final file = File(p.join(directory.path, 'created.md'));
+    final service = _DelayedSaveAsWorkspaceService(pauseWrite: true);
+    final harness = await _createControllerHarness(service: service);
+    final controller = harness.controller;
+
+    await controller.createMarkdownFile();
+    controller.updateActiveText('# Saved in background\n');
+    final savedBufferId = controller.state.activeBuffer!.id;
+    final save = controller.saveActiveAs(file.path);
+    await service.writeStarted.future;
+
+    await controller.createMarkdownFile();
+    final activeUntitledId = controller.state.activeBuffer!.id;
+    service.releaseWrite();
+
+    expect(await save, isTrue);
+    final savedBuffer = controller.state.documentBuffers.singleWhere(
+      (buffer) => buffer.id == savedBufferId,
+    );
+    expect(savedBuffer.filePath, file.path);
+    expect(savedBuffer.isDirty, isFalse);
+    expect(controller.state.activeBuffer?.id, activeUntitledId);
+    expect(controller.state.activeBuffer?.isUntitled, isTrue);
+    expect(await file.readAsString(), '# Saved in background\n');
+
+    await directory.delete(recursive: true);
+  });
+
   test('save as preserves edits made while reopening the file', () async {
     final directory = await Directory.systemTemp.createTemp(
       'busymark-save-as-edit-during-open-',
@@ -714,6 +799,38 @@ void main() {
     settingsController.dispose();
   });
 
+  test('Save All writes every dirty file-backed buffer', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-save-all-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final first = File(p.join(directory.path, 'a.md'))
+      ..writeAsStringSync('# A\n');
+    final second = File(p.join(directory.path, 'b.md'))
+      ..writeAsStringSync('# B\n');
+    final harness = await _createControllerHarness();
+    final settingsController = harness.settingsController;
+    final controller = harness.controller;
+
+    await controller.openPath(directory.path);
+    controller.updateActiveText('# Edited A\n');
+    expect(await controller.openActiveFile(second.path), isTrue);
+    controller.updateActiveText('# Edited B\n');
+
+    final result = await controller.saveAll();
+
+    expect(result.savedBufferIds, hasLength(2));
+    expect(result.failedBufferIds, isEmpty);
+    expect(result.conflictBufferIds, isEmpty);
+    expect(controller.state.dirtyBuffers, isEmpty);
+    expect(controller.state.workspace?.activeFilePath, second.path);
+    expect(first.readAsStringSync(), '# Edited A\n');
+    expect(second.readAsStringSync(), '# Edited B\n');
+
+    controller.dispose();
+    settingsController.dispose();
+  });
+
   test('closing active file tabs selects a neighboring tab', () async {
     final harness = await _createControllerHarness();
     final settingsController = harness.settingsController;
@@ -838,6 +955,56 @@ void main() {
     settingsController.dispose();
   });
 
+  test(
+    'math renderer failures become source-linked runtime diagnostics',
+    () async {
+      final harness = await _createControllerHarness();
+      final controller = harness.controller;
+      await controller.openPath('test/fixtures/markdown/basic.md');
+      final path = controller.state.workspace!.activeFilePath!;
+      final span = SourceSpan.fromOffsets(
+        filePath: path,
+        source: controller.state.activeText,
+        startOffset: 0,
+        endOffset: 4,
+      );
+
+      controller.updateMathRenderDiagnostic(
+        expressionId: 'inline-b0-i0',
+        code: 'math.invalidTex',
+        sourceSpan: span,
+      );
+
+      final workspace = controller.state.workspace!;
+      expect(workspace.runtimeDiagnostics.single.code, 'math.invalidTex');
+      expect(workspace.runtimeDiagnostics.single.sourceSpan, same(span));
+      expect(
+        workspace.allDiagnostics,
+        contains(workspace.runtimeDiagnostics.single),
+      );
+
+      controller.updateMathRenderDiagnostic(
+        expressionId: 'inline-b0-i0',
+        code: null,
+        sourceSpan: span,
+      );
+      expect(controller.state.workspace!.runtimeDiagnostics, isEmpty);
+
+      controller.updateMathRenderDiagnostic(
+        expressionId: 'inline-b0-i0',
+        code: 'math.invalidTex',
+        sourceSpan: span,
+      );
+      controller.updateActiveText('${controller.state.activeText}\n');
+      expect(controller.state.workspace!.runtimeDiagnostics, isEmpty);
+      await _waitFor(
+        () =>
+            controller.state.workspace?.markdown?.source ==
+            controller.state.activeText,
+      );
+    },
+  );
+
   test('validate on edit setting controls live diagnostics only', () async {
     final harness = await _createControllerHarness();
     final settingsController = harness.settingsController;
@@ -880,6 +1047,27 @@ void main() {
     settingsController.dispose();
   });
 
+  test('auto save remains scheduled independently for inactive tabs', () async {
+    final service = _DelayedValidationWorkspaceService();
+    final harness = await _createControllerHarness(service: service);
+    final settingsController = harness.settingsController;
+    final controller = harness.controller;
+
+    await settingsController.setValidateOnEdit(false);
+    await controller.openPath(service.rootPath);
+    controller.updateActiveText('# Dirty A\n');
+    expect(await controller.openActiveFile(service.bPath), isTrue);
+    controller.updateActiveText('# Dirty B\n');
+
+    await _waitFor(() => service.savedTexts.length == 2);
+
+    expect(service.savedTexts, containsAll(['# Dirty A\n', '# Dirty B\n']));
+    expect(controller.state.dirtyBuffers, isEmpty);
+
+    controller.dispose();
+    settingsController.dispose();
+  });
+
   test(
     'auto save preserves dirty state when edits happen during save',
     () async {
@@ -934,6 +1122,195 @@ void main() {
     settingsController.dispose();
   });
 
+  test(
+    'manual save completes against its buffer after switching tabs',
+    () async {
+      final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+      final harness = await _createControllerHarness(service: service);
+      final controller = harness.controller;
+
+      await controller.openPath(service.path);
+      controller.updateActiveText('# Saved while inactive\n');
+      final savedBufferId = controller.state.activeBuffer!.id;
+      final save = controller.saveActive();
+      await service.firstSaveStarted.future;
+
+      await controller.createMarkdownFile();
+      expect(controller.state.activeBuffer?.id, isNot(savedBufferId));
+      service.releaseFirstSave();
+
+      expect(await save, isTrue);
+      final savedBuffer = controller.state.documentBuffers.singleWhere(
+        (buffer) => buffer.id == savedBufferId,
+      );
+      expect(savedBuffer.isDirty, isFalse);
+      expect(savedBuffer.lastSavedText, '# Saved while inactive\n');
+      expect(savedBuffer.diskSnapshot?.contentHash, '# Saved while inactive\n');
+      expect(controller.state.activeBuffer?.isUntitled, isTrue);
+    },
+  );
+
+  test('closing a buffer waits for its in-flight autosave', () async {
+    final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+    final harness = await _createControllerHarness(service: service);
+    final controller = harness.controller;
+
+    await controller.openPath(service.path);
+    controller.updateActiveText('# Pending close\n');
+    final bufferId = controller.state.activeBuffer!.id;
+    final autosave = controller.autoSaveActiveIfNeeded();
+    await service.firstSaveStarted.future;
+
+    var closeCompleted = false;
+    final close = controller.closeDocumentBuffer(bufferId, discard: true).then((
+      value,
+    ) {
+      closeCompleted = true;
+      return value;
+    });
+    await Future<void>.delayed(Duration.zero);
+    expect(closeCompleted, isFalse);
+    expect(
+      controller.state.documentBuffers.any((buffer) => buffer.id == bufferId),
+      isTrue,
+    );
+
+    service.releaseFirstSave();
+    expect(await autosave, isTrue);
+    expect(await close, isTrue);
+    expect(
+      controller.state.documentBuffers.any((buffer) => buffer.id == bufferId),
+      isFalse,
+    );
+  });
+
+  test('discard waits for its buffer in-flight autosave', () async {
+    final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+    final harness = await _createControllerHarness(service: service);
+    final controller = harness.controller;
+
+    await controller.openPath(service.path);
+    controller.updateActiveText('# Pending discard\n');
+    final autosave = controller.autoSaveActiveIfNeeded();
+    await service.firstSaveStarted.future;
+
+    var discardCompleted = false;
+    final discard = controller.discardActiveChanges().then((value) {
+      discardCompleted = true;
+      return value;
+    });
+    await Future<void>.delayed(Duration.zero);
+    expect(discardCompleted, isFalse);
+
+    service.releaseFirstSave();
+    expect(await autosave, isTrue);
+    expect(await discard, isTrue);
+    expect(controller.state.activeBuffer?.isDirty, isFalse);
+    expect(controller.state.activeBuffer?.diskState, DocumentDiskState.present);
+  });
+
+  test(
+    'manual save waits for an in-flight autosave of the same buffer',
+    () async {
+      final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+      final harness = await _createControllerHarness(service: service);
+      final controller = harness.controller;
+
+      await controller.openPath(service.path);
+      controller.updateActiveText('# Autosave revision\n');
+      final autosave = controller.autoSaveActiveIfNeeded();
+      await service.firstSaveStarted.future;
+
+      controller.updateActiveText('# Manual revision\n');
+      final manualSave = controller.saveActive();
+      await Future<void>.delayed(Duration.zero);
+
+      expect(service.savedTexts, ['# Autosave revision\n']);
+      service.releaseFirstSave();
+
+      expect(await autosave, isTrue);
+      expect(await manualSave, isTrue);
+      expect(service.completedTexts, [
+        '# Autosave revision\n',
+        '# Manual revision\n',
+      ]);
+      expect(service.diskText, '# Manual revision\n');
+      expect(controller.state.isDirty, isFalse);
+    },
+  );
+
+  test('Save All waits for an in-flight autosave of the same buffer', () async {
+    final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+    final harness = await _createControllerHarness(service: service);
+    final controller = harness.controller;
+
+    await controller.openPath(service.path);
+    controller.updateActiveText('# Autosave revision\n');
+    final autosave = controller.autoSaveActiveIfNeeded();
+    await service.firstSaveStarted.future;
+
+    controller.updateActiveText('# Save All revision\n');
+    final saveAll = controller.saveAll();
+    await Future<void>.delayed(Duration.zero);
+    expect(service.savedTexts, ['# Autosave revision\n']);
+
+    service.releaseFirstSave();
+    expect(await autosave, isTrue);
+    expect((await saveAll).succeeded, isTrue);
+    expect(service.diskText, '# Save All revision\n');
+    expect(controller.state.isDirty, isFalse);
+  });
+
+  test('Save As waits for an in-flight autosave of the same buffer', () async {
+    final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+    final harness = await _createControllerHarness(service: service);
+    final controller = harness.controller;
+
+    await controller.openPath(service.path);
+    controller.updateActiveText('# Autosave revision\n');
+    final autosave = controller.autoSaveActiveIfNeeded();
+    await service.firstSaveStarted.future;
+
+    controller.updateActiveText('# Save As revision\n');
+    final saveAs = controller.saveActiveAs('/tmp/busymark-save-as-copy.md');
+    await Future<void>.delayed(Duration.zero);
+    expect(service.savedTexts, ['# Autosave revision\n']);
+
+    service.releaseFirstSave();
+    expect(await autosave, isTrue);
+    expect(await saveAs, isTrue);
+    expect(service.diskText, '# Save As revision\n');
+    expect(
+      controller.state.activeBuffer?.filePath,
+      '/tmp/busymark-save-as-copy.md',
+    );
+    expect(controller.state.isDirty, isFalse);
+  });
+
+  test('clean shutdown waits for in-flight document writes', () async {
+    final service = _AutosaveWorkspaceService(pauseFirstSave: true);
+    final harness = await _createControllerHarness(service: service);
+    final controller = harness.controller;
+
+    await controller.openPath(service.path);
+    controller.updateActiveText('# Pending autosave\n');
+    final autosave = controller.autoSaveActiveIfNeeded();
+    await service.firstSaveStarted.future;
+
+    var shutdownCompleted = false;
+    final shutdown = controller.markCleanShutdown().then(
+      (_) => shutdownCompleted = true,
+    );
+    await Future<void>.delayed(Duration.zero);
+    expect(shutdownCompleted, isFalse);
+
+    service.releaseFirstSave();
+    expect(await autosave, isTrue);
+    await shutdown;
+    expect(shutdownCompleted, isTrue);
+    expect(service.diskText, '# Pending autosave\n');
+  });
+
   test(
     'save refuses to overwrite external file changes without force',
     () async {
@@ -1016,15 +1393,528 @@ void main() {
     settingsController.dispose();
     await directory.delete(recursive: true);
   });
+
+  test('saving preserves a manually removed final newline', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-final-newline-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final file = File(p.join(directory.path, 'note.md'));
+    await file.writeAsString('Saved\n');
+    final harness = await _createControllerHarness();
+
+    await harness.controller.openPath(file.path);
+    harness.controller.updateActiveText('Saved');
+
+    expect(await harness.controller.saveActive(), isTrue);
+    expect(await file.readAsString(), 'Saved');
+    expect(
+      harness.controller.state.activeBuffer?.format.hasFinalNewline,
+      false,
+    );
+  });
+
+  test('WYSIWYG list edits preserve a missing final newline', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-wysiwyg-final-newline-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final file = File(p.join(directory.path, 'note.md'));
+    await file.writeAsString('- original');
+    final harness = await _createControllerHarness();
+
+    await harness.controller.openPath(file.path);
+    final document = harness.controller.state.workspace!.markdown!.busyDocument;
+    harness.controller.updateActiveWysiwygText(
+      '- changed\n',
+      document: document,
+      sourceFilePath: file.path,
+    );
+
+    expect(harness.controller.state.activeBuffer?.text, '- changed');
+    expect(
+      harness.controller.state.activeBuffer?.format.hasFinalNewline,
+      isFalse,
+    );
+    expect(await harness.controller.saveActive(), isTrue);
+    expect(await file.readAsString(), '- changed');
+  });
+
+  test(
+    'Keep Mine retains the conflict snapshot until explicit overwrite',
+    () async {
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-keep-mine-',
+      );
+      addTearDown(() => directory.delete(recursive: true));
+      File(p.join(directory.path, 'a.md')).writeAsStringSync('Original\n');
+      File(p.join(directory.path, 'b.md')).writeAsStringSync('Other\n');
+      final monitor = WorkspaceFileMonitor(
+        debounce: const Duration(milliseconds: 10),
+      );
+      addTearDown(monitor.dispose);
+      final harness = await _createControllerHarness(fileMonitor: monitor);
+
+      await harness.controller.openPath(directory.path);
+      final path = harness.controller.state.activeBuffer!.filePath!;
+      final originalSnapshot =
+          harness.controller.state.activeBuffer!.diskSnapshot;
+      harness.controller.updateActiveText('Mine\n');
+      await File(path).writeAsString('External\n');
+      await _waitFor(
+        () => harness.controller.state.activeBuffer?.hasConflict == true,
+      );
+
+      harness.controller.keepBufferVersion(
+        harness.controller.state.activeBuffer!.id,
+      );
+
+      expect(
+        harness.controller.state.activeBuffer?.diskSnapshot,
+        same(originalSnapshot),
+      );
+      expect(
+        harness.controller.state.activeBuffer?.diskState,
+        DocumentDiskState.changed,
+      );
+      expect(await harness.controller.saveActive(), isFalse);
+      expect(await File(path).readAsString(), 'External\n');
+    },
+  );
+
+  test('external file moves remap the open document buffer', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-external-move-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    File(p.join(directory.path, 'a.md')).writeAsStringSync('A\n');
+    File(p.join(directory.path, 'b.md')).writeAsStringSync('B\n');
+    final monitor = WorkspaceFileMonitor(
+      debounce: const Duration(milliseconds: 10),
+    );
+    addTearDown(monitor.dispose);
+    final harness = await _createControllerHarness(fileMonitor: monitor);
+
+    await harness.controller.openPath(directory.path);
+    final oldPath = harness.controller.state.activeBuffer!.filePath!;
+    final newPath = p.join(directory.path, 'moved.md');
+    await File(oldPath).rename(newPath);
+    await _waitFor(
+      () => harness.controller.state.activeBuffer?.filePath == newPath,
+    );
+
+    expect(harness.controller.state.workspace?.activeFilePath, newPath);
+    expect(
+      harness.controller.state.workspace?.openFilePaths,
+      contains(newPath),
+    );
+    expect(
+      harness.controller.state.activeBuffer?.diskState,
+      DocumentDiskState.present,
+    );
+  });
+
+  test('monitors saved standalone tabs outside the workspace root', () async {
+    final firstDirectory = await Directory.systemTemp.createTemp(
+      'busymark-monitor-first-',
+    );
+    final secondDirectory = await Directory.systemTemp.createTemp(
+      'busymark-monitor-second-',
+    );
+    addTearDown(() => firstDirectory.delete(recursive: true));
+    addTearDown(() => secondDirectory.delete(recursive: true));
+    final firstPath = p.join(firstDirectory.path, 'first.md');
+    final secondPath = p.join(secondDirectory.path, 'second.md');
+    final monitor = WorkspaceFileMonitor(
+      debounce: const Duration(milliseconds: 10),
+    );
+    addTearDown(monitor.dispose);
+    final harness = await _createControllerHarness(fileMonitor: monitor);
+
+    await harness.controller.createMarkdownFile();
+    harness.controller.updateActiveText('First\n');
+    expect(await harness.controller.saveActiveAs(firstPath), isTrue);
+    await harness.controller.createMarkdownFile();
+    harness.controller.updateActiveText('Second\n');
+    expect(await harness.controller.saveActiveAs(secondPath), isTrue);
+
+    await File(secondPath).writeAsString('Changed externally\n');
+    await _waitFor(
+      () =>
+          harness.controller.state.activeBuffer?.text == 'Changed externally\n',
+    );
+
+    expect(harness.controller.state.activeBuffer?.filePath, secondPath);
+    expect(
+      harness.controller.state.activeBuffer?.diskState,
+      DocumentDiskState.present,
+    );
+    expect(harness.controller.state.workspace?.rootPath, firstDirectory.path);
+  });
+
+  test(
+    'standalone refresh preserves saved tabs in different directories',
+    () async {
+      final firstDirectory = await Directory.systemTemp.createTemp(
+        'busymark-refresh-first-',
+      );
+      final secondDirectory = await Directory.systemTemp.createTemp(
+        'busymark-refresh-second-',
+      );
+      addTearDown(() => firstDirectory.delete(recursive: true));
+      addTearDown(() => secondDirectory.delete(recursive: true));
+      final firstPath = p.join(firstDirectory.path, 'first.md');
+      final secondPath = p.join(secondDirectory.path, 'second.md');
+      final harness = await _createControllerHarness();
+      final controller = harness.controller;
+
+      await controller.createMarkdownFile();
+      controller.updateActiveText('First\n');
+      expect(await controller.saveActiveAs(firstPath), isTrue);
+      final firstBufferId = controller.state.activeBuffer!.id;
+      await controller.createMarkdownFile();
+      controller.updateActiveText('Second\n');
+      expect(await controller.saveActiveAs(secondPath), isTrue);
+
+      await File(firstPath).writeAsString('First changed externally\n');
+      expect(await controller.refreshWorkspaceFromDisk(), isTrue);
+
+      final firstBuffer = controller.state.documentBuffers.singleWhere(
+        (buffer) => buffer.id == firstBufferId,
+      );
+      expect(firstBuffer.text, 'First changed externally\n');
+      expect(firstBuffer.diskState, DocumentDiskState.present);
+      expect(controller.state.activeBuffer?.filePath, secondPath);
+      expect(controller.state.workspace?.rootPath, firstDirectory.path);
+    },
+  );
+
+  test(
+    'startup leaves a clean session closed unless reopening is enabled',
+    () async {
+      final missingPath = p.join(
+        Directory.systemTemp.path,
+        'busymark-clean-startup-session-missing.md',
+      );
+      final sessionStore = MemoryDocumentSessionStore()
+        ..value = WorkspaceSessionSnapshot(
+          workspacePath: missingPath,
+          activeBufferId: 'clean-session',
+          tabs: [
+            DocumentSessionEntry(
+              id: 'clean-session',
+              filePath: missingPath,
+              untitledName: null,
+              editorState: const DocumentEditorState(),
+            ),
+          ],
+        );
+      final harness = await _createControllerHarness(
+        sessionStore: sessionStore,
+      );
+
+      expect(
+        await harness.controller.restoreStartupSession(
+          reopenCleanSession: false,
+        ),
+        isFalse,
+      );
+      expect(harness.controller.state.workspace, isNull);
+
+      expect(
+        await harness.controller.restoreStartupSession(
+          reopenCleanSession: true,
+        ),
+        isTrue,
+      );
+      expect(harness.controller.state.activeBuffer?.filePath, missingPath);
+    },
+  );
+
+  test('startup restores an interrupted session without an opt-in', () async {
+    final missingPath = p.join(
+      Directory.systemTemp.path,
+      'busymark-interrupted-startup-session-missing.md',
+    );
+    final sessionStore = MemoryDocumentSessionStore()
+      ..value = WorkspaceSessionSnapshot(
+        workspacePath: missingPath,
+        activeBufferId: 'interrupted-session',
+        tabs: [
+          DocumentSessionEntry(
+            id: 'interrupted-session',
+            filePath: missingPath,
+            untitledName: null,
+            editorState: const DocumentEditorState(),
+          ),
+        ],
+      );
+    final recoveryStore = MemoryDocumentRecoveryStore()
+      ..value = const RecoverySnapshot(cleanShutdown: false, entries: []);
+    final harness = await _createControllerHarness(
+      sessionStore: sessionStore,
+      recoveryStore: recoveryStore,
+    );
+
+    expect(
+      await harness.controller.restoreStartupSession(reopenCleanSession: false),
+      isTrue,
+    );
+    expect(harness.controller.state.activeBuffer?.filePath, missingPath);
+  });
+
+  test('restored sessions retain tabs whose files are missing', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-missing-session-file-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final missingPath = p.join(directory.path, 'missing.md');
+    final sessionStore = MemoryDocumentSessionStore()
+      ..value = WorkspaceSessionSnapshot(
+        workspacePath: directory.path,
+        activeBufferId: 'missing',
+        tabs: [
+          DocumentSessionEntry(
+            id: 'missing',
+            filePath: missingPath,
+            untitledName: null,
+            editorState: const DocumentEditorState(),
+          ),
+        ],
+      );
+    final harness = await _createControllerHarness(sessionStore: sessionStore);
+
+    expect(await harness.controller.restorePreviousSession(), isTrue);
+    expect(harness.controller.state.activeBuffer?.filePath, missingPath);
+    expect(harness.controller.state.activeBuffer?.text, isEmpty);
+    expect(harness.controller.state.activeBuffer?.deletedOnDisk, isTrue);
+  });
+
+  test('restored standalone sessions retain a missing document', () async {
+    final directory = await Directory.systemTemp.createTemp(
+      'busymark-missing-standalone-session-',
+    );
+    addTearDown(() => directory.delete(recursive: true));
+    final missingPath = p.join(directory.path, 'missing.md');
+    final sessionStore = MemoryDocumentSessionStore()
+      ..value = WorkspaceSessionSnapshot(
+        workspacePath: missingPath,
+        activeBufferId: 'missing',
+        tabs: [
+          DocumentSessionEntry(
+            id: 'missing',
+            filePath: missingPath,
+            untitledName: null,
+            editorState: const DocumentEditorState(),
+          ),
+        ],
+      );
+    final harness = await _createControllerHarness(sessionStore: sessionStore);
+
+    expect(await harness.controller.restorePreviousSession(), isTrue);
+    expect(
+      harness.controller.state.workspace?.kind,
+      WorkspaceKind.singleMarkdown,
+    );
+    expect(harness.controller.state.activeBuffer?.filePath, missingPath);
+    expect(harness.controller.state.activeBuffer?.text, isEmpty);
+    expect(harness.controller.state.activeBuffer?.deletedOnDisk, isTrue);
+  });
+
+  test(
+    'mixed untitled and saved session restores as a standalone workspace',
+    () async {
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-mixed-standalone-session-',
+      );
+      addTearDown(() => directory.delete(recursive: true));
+      final savedFile = File(p.join(directory.path, 'saved.md'));
+      final sessionStore = MemoryDocumentSessionStore();
+      final recoveryStore = MemoryDocumentRecoveryStore();
+      final initial = await _createControllerHarness(
+        sessionStore: sessionStore,
+        recoveryStore: recoveryStore,
+      );
+
+      await initial.controller.createMarkdownFile();
+      initial.controller.updateActiveText('First untitled text');
+      await initial.controller.createMarkdownFile();
+      initial.controller.updateActiveText('Second saved text');
+      expect(await initial.controller.saveActiveAs(savedFile.path), isTrue);
+      await initial.controller.flushPersistence();
+
+      expect(sessionStore.value?.workspacePath, savedFile.path);
+
+      final restored = await _createControllerHarness(
+        sessionStore: sessionStore,
+        recoveryStore: recoveryStore,
+      );
+      expect(await restored.controller.restorePreviousSession(), isTrue);
+      expect(
+        restored.controller.state.workspace?.kind,
+        WorkspaceKind.singleMarkdown,
+      );
+      expect(restored.controller.state.documentBuffers, hasLength(2));
+      expect(
+        restored.controller.state.documentBuffers.any(
+          (buffer) => buffer.isUntitled && buffer.text == 'First untitled text',
+        ),
+        isTrue,
+      );
+      expect(
+        restored.controller.state.documentBuffers.any(
+          (buffer) =>
+              buffer.filePath == savedFile.path &&
+              buffer.text == 'Second saved text',
+        ),
+        isTrue,
+      );
+    },
+  );
+
+  test('clean marker cannot hide remaining recovery entries', () async {
+    final recoveryStore = MemoryDocumentRecoveryStore();
+    final sessionStore = MemoryDocumentSessionStore();
+    final recoveredBuffer = DocumentBuffer.untitled(
+      id: 'untitled:recovered',
+      name: 'Recovered',
+      text: 'Unsaved recovery',
+    );
+    recoveryStore.value = RecoverySnapshot(
+      cleanShutdown: true,
+      entries: [
+        DocumentRecoveryEntry.fromBuffer(recoveredBuffer, workspacePath: null),
+      ],
+    );
+    final harness = await _createControllerHarness(
+      sessionStore: sessionStore,
+      recoveryStore: recoveryStore,
+    );
+
+    expect(
+      await harness.controller.restoreStartupSession(reopenCleanSession: false),
+      isTrue,
+    );
+    expect(harness.controller.state.activeBuffer?.recovered, isTrue);
+    expect(
+      harness.controller.state.message?.code,
+      WorkspaceMessageCode.recoveryRestored,
+    );
+
+    await harness.controller.markCleanShutdown();
+    expect(recoveryStore.value.cleanShutdown, isFalse);
+    expect(recoveryStore.value.entries, isNotEmpty);
+  });
+
+  test(
+    'recovery text remains restorable when the later session save fails',
+    () async {
+      final recoveryStore = MemoryDocumentRecoveryStore();
+      final sessionStore = _FailingDocumentSessionStore();
+      final harness = await _createControllerHarness(
+        sessionStore: sessionStore,
+        recoveryStore: recoveryStore,
+      );
+
+      await harness.controller.createMarkdownFile();
+      harness.controller.updateActiveText('Latest unsaved text');
+      await harness.controller.flushPersistence();
+
+      // Simulate an older or absent recovery file immediately before the
+      // persistence attempt whose session write fails.
+      await recoveryStore.writeEntries(const []);
+      sessionStore.failSave = true;
+
+      await expectLater(
+        harness.controller.flushPersistence(),
+        throwsA(isA<StateError>()),
+      );
+
+      expect(recoveryStore.value.entries, hasLength(1));
+      expect(recoveryStore.value.entries.single.text, 'Latest unsaved text');
+
+      final restored = await _createControllerHarness(
+        sessionStore: MemoryDocumentSessionStore(),
+        recoveryStore: recoveryStore,
+      );
+      expect(await restored.controller.restorePreviousSession(), isTrue);
+      expect(restored.controller.state.activeText, 'Latest unsaved text');
+      expect(restored.controller.state.activeBuffer?.recovered, isTrue);
+    },
+  );
+
+  test(
+    'single-document session uses no workspace path after saved tabs close',
+    () async {
+      final directory = await Directory.systemTemp.createTemp(
+        'busymark-untitled-only-session-',
+      );
+      addTearDown(() => directory.delete(recursive: true));
+      final savedFile = File(p.join(directory.path, 'saved.md'));
+      final sessionStore = MemoryDocumentSessionStore();
+      final recoveryStore = MemoryDocumentRecoveryStore();
+      final initial = await _createControllerHarness(
+        sessionStore: sessionStore,
+        recoveryStore: recoveryStore,
+      );
+
+      await initial.controller.createMarkdownFile();
+      initial.controller.updateActiveText('Remaining untitled text');
+      await initial.controller.createMarkdownFile();
+      initial.controller.updateActiveText('Temporary saved text');
+      expect(await initial.controller.saveActiveAs(savedFile.path), isTrue);
+      final savedId = initial.controller.state.activeBuffer!.id;
+      expect(await initial.controller.closeDocumentBuffer(savedId), isTrue);
+      await initial.controller.flushPersistence();
+
+      expect(
+        initial.controller.state.workspace?.kind,
+        WorkspaceKind.singleMarkdown,
+      );
+      expect(initial.controller.state.documentBuffers, hasLength(1));
+      expect(initial.controller.state.activeBuffer?.isUntitled, isTrue);
+      expect(sessionStore.value?.workspacePath, isNull);
+
+      final restored = await _createControllerHarness(
+        sessionStore: sessionStore,
+        recoveryStore: recoveryStore,
+      );
+      expect(await restored.controller.restorePreviousSession(), isTrue);
+      expect(
+        restored.controller.state.workspace?.kind,
+        WorkspaceKind.untitledMarkdown,
+      );
+      expect(restored.controller.state.activeText, 'Remaining untitled text');
+    },
+  );
+}
+
+Future<void> _waitFor(bool Function() condition) async {
+  final deadline = DateTime.now().add(const Duration(seconds: 3));
+  while (!condition()) {
+    if (DateTime.now().isAfter(deadline)) {
+      fail('Timed out waiting for workspace state');
+    }
+    await Future<void>.delayed(const Duration(milliseconds: 20));
+  }
 }
 
 Future<_WorkspaceControllerHarness> _createControllerHarness({
   WorkspaceService service = const WorkspaceService(),
+  WorkspaceFileMonitor? fileMonitor,
+  DocumentSessionStore? sessionStore,
+  DocumentRecoveryStore? recoveryStore,
 }) async {
   final container = ProviderContainer(
     overrides: [
       localSettingsStoreProvider.overrideWithValue(_MemorySettingsStore()),
       workspaceServiceProvider.overrideWithValue(service),
+      if (fileMonitor != null)
+        workspaceFileMonitorProvider.overrideWithValue(fileMonitor),
+      if (sessionStore != null)
+        documentSessionStoreProvider.overrideWithValue(sessionStore),
+      if (recoveryStore != null)
+        documentRecoveryStoreProvider.overrideWithValue(recoveryStore),
     ],
   );
   addTearDown(container.dispose);
@@ -1114,24 +2004,68 @@ class _WorkspaceControllerDriver {
   Future<bool> closeOpenFileTab(String path) =>
       _notifier.closeOpenFileTab(path);
 
+  Future<bool> closeDocumentBuffer(String bufferId, {bool discard = false}) =>
+      _notifier.closeDocumentBuffer(bufferId, discard: discard);
+
   Future<bool> closeAllOpenFileTabs() => _notifier.closeAllOpenFileTabs();
 
   void updateActiveText(String text, {String? sourceFilePath}) {
     _notifier.updateActiveText(text, sourceFilePath: sourceFilePath);
   }
 
+  void updateActiveWysiwygText(
+    String text, {
+    required BusyDocument document,
+    String? sourceFilePath,
+  }) {
+    _notifier.updateActiveWysiwygText(
+      text,
+      document: document,
+      sourceFilePath: sourceFilePath,
+    );
+  }
+
+  void updateMathRenderDiagnostic({
+    required String expressionId,
+    required String? code,
+    SourceSpan? sourceSpan,
+  }) {
+    _notifier.updateMathRenderDiagnostic(
+      expressionId: expressionId,
+      code: code,
+      sourceSpan: sourceSpan,
+    );
+  }
+
   Future<bool> saveActive({bool overwriteExternalChanges = false}) =>
       _notifier.saveActive(overwriteExternalChanges: overwriteExternalChanges);
 
   Future<bool> saveActiveAs(String path, {bool overwriteExisting = false}) =>
       _notifier.saveActiveAs(path, overwriteExisting: overwriteExisting);
 
+  Future<SaveAllResult> saveAll() => _notifier.saveAll();
+
   Future<bool> autoSaveActiveIfNeeded() => _notifier.autoSaveActiveIfNeeded();
 
   Future<bool> discardActiveChanges() => _notifier.discardActiveChanges();
 
+  Future<bool> refreshWorkspaceFromDisk() =>
+      _notifier.refreshWorkspaceFromDiskPreservingOpenTabs();
+
+  void keepBufferVersion(String bufferId) =>
+      _notifier.keepBufferVersion(bufferId);
+
   Future<void> validateActive() => _notifier.validateActive();
 
+  Future<bool> restorePreviousSession() => _notifier.restorePreviousSession();
+
+  Future<bool> restoreStartupSession({required bool reopenCleanSession}) =>
+      _notifier.restoreStartupSession(reopenCleanSession: reopenCleanSession);
+
+  Future<void> markCleanShutdown() => _notifier.markCleanShutdown();
+
+  Future<void> flushPersistence() => _notifier.flushPersistence();
+
   void dispose() {}
 }
 
@@ -1168,6 +2102,18 @@ class _MemorySettingsStore implements LocalSettingsStore {
   }
 }
 
+class _FailingDocumentSessionStore extends MemoryDocumentSessionStore {
+  bool failSave = false;
+
+  @override
+  Future<void> save(WorkspaceSessionSnapshot snapshot) {
+    if (failSave) {
+      throw StateError('simulated session save failure');
+    }
+    return super.save(snapshot);
+  }
+}
+
 class _DelayedSaveAsWorkspaceService extends WorkspaceService {
   _DelayedSaveAsWorkspaceService({
     this.pauseWrite = false,
@@ -1218,6 +2164,8 @@ class _AutosaveWorkspaceService extends WorkspaceService {
   final bool pauseFirstSave;
   final path = '/tmp/busymark-autosave.md';
   final savedTexts = <String>[];
+  final completedTexts = <String>[];
+  String? diskText;
   final firstSaveStarted = Completer<void>();
   final _releaseFirstSave = Completer<void>();
 
@@ -1269,6 +2217,15 @@ class _AutosaveWorkspaceService extends WorkspaceService {
 
   @override
   Future<WorkspaceFileSnapshot> saveText(String path, String text) async {
+    return _recordSave(text);
+  }
+
+  @override
+  Future<WorkspaceFileSnapshot> saveNewText(String path, String text) async {
+    return _recordSave(text);
+  }
+
+  Future<WorkspaceFileSnapshot> _recordSave(String text) async {
     savedTexts.add(text);
     if (pauseFirstSave && savedTexts.length == 1) {
       firstSaveStarted.complete();
@@ -1276,6 +2233,8 @@ class _AutosaveWorkspaceService extends WorkspaceService {
     } else if (!firstSaveStarted.isCompleted) {
       firstSaveStarted.complete();
     }
+    completedTexts.add(text);
+    diskText = text;
     return WorkspaceFileSnapshot(
       modifiedAt: DateTime(2026, 1, savedTexts.length + 1),
       size: text.length,
diff --git a/test/src/workspace_safety_test.dart b/test/src/workspace_safety_test.dart
index 0b936227..e05276fa 100644
--- a/test/src/workspace_safety_test.dart
+++ b/test/src/workspace_safety_test.dart
@@ -392,77 +392,84 @@ void main() {
     expect(widgetRef.read(workspaceControllerProvider).isDirty, isFalse);
   });
 
-  testWidgets('save cancels when the active document changes during disk I/O', (
-    tester,
-  ) async {
-    final service = _IdentityWorkspaceService()
-      ..pendingFileChangedResult = Completer<bool>();
-    bool? saved;
-    late WidgetRef widgetRef;
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          localSettingsStoreProvider.overrideWithValue(
-            _MemorySettingsStore()
-              ..value = AppSettings.defaults()
-                  .copyWith(autoSave: false)
-                  .toJson(),
-          ),
-          workspaceServiceProvider.overrideWithValue(service),
-        ],
-        child: MaterialApp(
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          theme: buildBusyMarkTheme(
-            brightness: Brightness.light,
-            accentColor: Colors.green,
-          ),
-          home: Scaffold(
-            body: Consumer(
-              builder: (context, ref, child) {
-                widgetRef = ref;
-                return TextButton(
-                  onPressed: () async {
-                    saved = await saveActiveWithOverwriteConfirmation(
-                      context,
-                      ref,
-                    );
-                  },
-                  child: const Text('Save document'),
-                );
-              },
+  testWidgets(
+    'save completes for its buffer when the active document changes',
+    (tester) async {
+      final service = _IdentityWorkspaceService()
+        ..pendingFileChangedResult = Completer<bool>();
+      bool? saved;
+      late WidgetRef widgetRef;
+      await tester.pumpWidget(
+        ProviderScope(
+          overrides: [
+            localSettingsStoreProvider.overrideWithValue(
+              _MemorySettingsStore()
+                ..value = AppSettings.defaults()
+                    .copyWith(autoSave: false)
+                    .toJson(),
+            ),
+            workspaceServiceProvider.overrideWithValue(service),
+          ],
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            theme: buildBusyMarkTheme(
+              brightness: Brightness.light,
+              accentColor: Colors.green,
+            ),
+            home: Scaffold(
+              body: Consumer(
+                builder: (context, ref, child) {
+                  widgetRef = ref;
+                  return TextButton(
+                    onPressed: () async {
+                      saved = await saveActiveWithOverwriteConfirmation(
+                        context,
+                        ref,
+                      );
+                    },
+                    child: const Text('Save document'),
+                  );
+                },
+              ),
             ),
           ),
         ),
-      ),
-    );
+      );
 
-    final controller = widgetRef.read(workspaceControllerProvider.notifier);
-    await controller.openPath(service.rootPath);
-    controller.updateActiveText('# Edited A\n');
+      final controller = widgetRef.read(workspaceControllerProvider.notifier);
+      await controller.openPath(service.rootPath);
+      controller.updateActiveText('# Edited A\n');
 
-    await tester.tap(find.text('Save document'));
-    await service.fileChangeCheckStarted.future;
+      await tester.tap(find.text('Save document'));
+      await service.fileChangeCheckStarted.future;
 
-    expect(await controller.openActiveFile(service.secondPath), isTrue);
-    controller.updateActiveText('# Edited B\n');
-    service.pendingFileChangedResult!.complete(false);
-    await tester.pumpAndSettle();
+      expect(await controller.openActiveFile(service.secondPath), isTrue);
+      controller.updateActiveText('# Edited B\n');
+      service.pendingFileChangedResult!.complete(false);
+      await tester.pumpAndSettle();
 
-    expect(saved, isFalse);
-    expect(service.saves, isEmpty);
-    expect(service.documents[service.firstPath], '# External A\n');
-    expect(service.documents[service.secondPath], '# Original B\n');
-    expect(
-      widgetRef.read(workspaceControllerProvider).workspace?.activeFilePath,
-      service.secondPath,
-    );
-    expect(
-      widgetRef.read(workspaceControllerProvider).activeText,
-      '# Edited B\n',
-    );
-    expect(widgetRef.read(workspaceControllerProvider).isDirty, isTrue);
-  });
+      expect(saved, isTrue);
+      expect(service.saves, [(path: service.firstPath, text: '# Edited A\n')]);
+      expect(service.documents[service.firstPath], '# Edited A\n');
+      expect(service.documents[service.secondPath], '# Original B\n');
+      expect(
+        widgetRef.read(workspaceControllerProvider).workspace?.activeFilePath,
+        service.secondPath,
+      );
+      expect(
+        widgetRef.read(workspaceControllerProvider).activeText,
+        '# Edited B\n',
+      );
+      expect(widgetRef.read(workspaceControllerProvider).isDirty, isTrue);
+      final firstBuffer = widgetRef
+          .read(workspaceControllerProvider)
+          .documentBuffers
+          .singleWhere((buffer) => buffer.filePath == service.firstPath);
+      expect(firstBuffer.isDirty, isFalse);
+      expect(firstBuffer.lastSavedText, '# Edited A\n');
+    },
+  );
 
   testWidgets('Save As stays pinned while the file picker is open', (
     tester,
@@ -873,6 +880,143 @@ void main() {
     );
     expect(widgetRef.read(workspaceControllerProvider).isDirty, isTrue);
   });
+
+  testWidgets('workspace continuation resolves inactive dirty documents too', (
+    tester,
+  ) async {
+    final service = _IdentityWorkspaceService();
+    bool? safeToContinue;
+    late WidgetRef widgetRef;
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          localSettingsStoreProvider.overrideWithValue(
+            _MemorySettingsStore()
+              ..value = AppSettings.defaults()
+                  .copyWith(autoSave: false)
+                  .toJson(),
+          ),
+          workspaceServiceProvider.overrideWithValue(service),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          theme: buildBusyMarkTheme(
+            brightness: Brightness.light,
+            accentColor: Colors.green,
+          ),
+          home: Scaffold(
+            body: Consumer(
+              builder: (context, ref, child) {
+                widgetRef = ref;
+                return TextButton(
+                  onPressed: () async {
+                    safeToContinue = await confirmSafeToContinue(context, ref);
+                  },
+                  child: const Text('Navigate'),
+                );
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final controller = widgetRef.read(workspaceControllerProvider.notifier);
+    await controller.openPath(service.rootPath);
+    controller.updateActiveText('# Edited A\n');
+    await controller.openActiveFile(service.secondPath);
+    controller.updateActiveText('# Edited B\n');
+    expect(
+      widgetRef.read(workspaceControllerProvider).dirtyBuffers,
+      hasLength(2),
+    );
+
+    await tester.tap(find.text('Navigate'));
+    await tester.pumpAndSettle();
+    expect(find.text('a.md'), findsOneWidget);
+    expect(find.text('b.md'), findsOneWidget);
+    await tester.tap(find.text(l10n.discard));
+    await tester.pumpAndSettle();
+
+    expect(safeToContinue, isTrue);
+    expect(widgetRef.read(workspaceControllerProvider).dirtyBuffers, isEmpty);
+    expect(service.documents[service.firstPath], '# External A\n');
+    expect(service.documents[service.secondPath], '# Original B\n');
+  });
+
+  for (final action in [
+    (label: 'save', discard: false),
+    (label: 'discard', discard: true),
+  ]) {
+    testWidgets(
+      'closing one dirty tab can ${action.label} it while another stays dirty',
+      (tester) async {
+        final service = _IdentityWorkspaceService();
+        bool? safeToClose;
+        late WidgetRef widgetRef;
+        await tester.pumpWidget(
+          ProviderScope(
+            overrides: [
+              localSettingsStoreProvider.overrideWithValue(
+                _MemorySettingsStore()
+                  ..value = AppSettings.defaults()
+                      .copyWith(autoSave: false)
+                      .toJson(),
+              ),
+              workspaceServiceProvider.overrideWithValue(service),
+            ],
+            child: MaterialApp(
+              localizationsDelegates: AppLocalizations.localizationsDelegates,
+              supportedLocales: AppLocalizations.supportedLocales,
+              theme: buildBusyMarkTheme(
+                brightness: Brightness.light,
+                accentColor: Colors.green,
+              ),
+              home: Scaffold(
+                body: Consumer(
+                  builder: (context, ref, child) {
+                    widgetRef = ref;
+                    return TextButton(
+                      onPressed: () async {
+                        safeToClose = await confirmSafeToCloseActiveDocument(
+                          context,
+                          ref,
+                        );
+                      },
+                      child: const Text('Close active'),
+                    );
+                  },
+                ),
+              ),
+            ),
+          ),
+        );
+
+        final controller = widgetRef.read(workspaceControllerProvider.notifier);
+        await controller.openPath(service.rootPath);
+        controller.updateActiveText('# Edited A\n');
+        await controller.openActiveFile(service.secondPath);
+        controller.updateActiveText('# Edited B\n');
+        expect(
+          widgetRef.read(workspaceControllerProvider).dirtyBuffers,
+          hasLength(2),
+        );
+
+        await tester.tap(find.text('Close active'));
+        await tester.pumpAndSettle();
+        await tester.tap(find.text(action.discard ? l10n.discard : l10n.save));
+        await tester.pumpAndSettle();
+
+        expect(safeToClose, isTrue);
+        final state = widgetRef.read(workspaceControllerProvider);
+        expect(state.dirtyBuffers, hasLength(1));
+        expect(state.dirtyBuffers.single.filePath, service.firstPath);
+        expect(state.activeBuffer?.filePath, service.secondPath);
+        expect(state.activeBuffer?.isDirty, isFalse);
+      },
+    );
+  }
 }
 
 double _contrastRatio(Color foreground, Color background) {
diff --git a/test/src/writerside_admonition_test.dart b/test/src/writerside_admonition_test.dart
new file mode 100644
index 00000000..912c4699
--- /dev/null
+++ b/test/src/writerside_admonition_test.dart
@@ -0,0 +1,370 @@
+import 'dart:io';
+
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/editor/document_callout.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_document_controller.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_editor.dart';
+import 'package:busymark/src/export/markdown_export_document.dart';
+import 'package:busymark/src/export/markdown_export_mapper.dart';
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/markdown/busymark_markdown_serializer.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/preview_model.dart';
+import 'package:busymark/src/workspace/workspace_service.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  const parser = MarkdownParser();
+  const previewBuilder = BusyMarkPreviewBuilder();
+
+  test('Writerside blockquotes become typed admonitions and round-trip', () {
+    const source = '''> Default **tip**.
+
+> A *note*.
+{style="note"}
+
+> Warning text. {style="warning"}
+
+> Quoted text.
+{style="quote"}
+''';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final blocks = parsed.busyDocument.blocks;
+
+    expect(blocks, hasLength(4));
+    expect(blocks.map((block) => block.kind), {BusyBlockKind.blockquote});
+    expect(blocks.map((block) => block.attributes['style']), [
+      'tip',
+      'note',
+      'warning',
+      'quote',
+    ]);
+    expect(
+      blocks.every(
+        (block) =>
+            block.attributes[busyMarkWritersideAdmonitionAttribute] == 'true',
+      ),
+      isTrue,
+    );
+    expect(blocks[1].children.single.plainText, 'A note.');
+    expect(blocks[2].children.single.plainText, 'Warning text.');
+    expect(
+      blocks[1].children.single.inlines.map((inline) => inline.kind),
+      contains(BusyInlineKind.emphasis),
+    );
+
+    final preview = previewBuilder.build(parsed.busyDocument);
+    expect(preview.blocks.map((block) => block.kind), [
+      PreviewBlockKind.admonition,
+      PreviewBlockKind.admonition,
+      PreviewBlockKind.admonition,
+      PreviewBlockKind.quote,
+    ]);
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+      source,
+    );
+  });
+
+  test('ordinary Markdown blockquotes do not acquire Writerside semantics', () {
+    const source = '> Text {style="warning"}\n';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.commonMark,
+      validateLocalReferences: false,
+    );
+    final block = parsed.busyDocument.blocks.single;
+    final preview = previewBuilder.build(parsed.busyDocument).blocks.single;
+
+    expect(block.attributes[busyMarkWritersideAdmonitionAttribute], isNull);
+    expect(block.children.single.plainText, 'Text {style="warning"}');
+    expect(preview.kind, PreviewBlockKind.quote);
+  });
+
+  test(
+    'semantic admonition elements include quote and preserve attributes',
+    () {
+      const source = '''<tip>
+Helpful advice.
+</tip>
+
+<note title="Known issue">Important.</note>
+
+<warning>Danger.</warning>
+
+<quote>Neutral quotation.</quote>
+''';
+      final parsed = parser.parse(
+        filePath: 'topic.md',
+        source: source,
+        mode: MarkdownMode.writersideMarkdown,
+        validateLocalReferences: false,
+      );
+      final blocks = parsed.busyDocument.blocks;
+
+      expect(blocks, hasLength(4));
+      expect(
+        blocks.every(
+          (block) => block.kind == BusyBlockKind.writersideAdmonition,
+        ),
+        isTrue,
+      );
+      expect(blocks.map((block) => block.attributes['style']), [
+        'tip',
+        'note',
+        'warning',
+        'quote',
+      ]);
+      expect(
+        previewBuilder.build(parsed.busyDocument).blocks.last.kind,
+        PreviewBlockKind.quote,
+      );
+      expect(
+        const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+        source,
+      );
+
+      final controller = BusyMarkWysiwygDocumentController(
+        document: parsed.busyDocument,
+      );
+      controller.applyAdmonitionStyle(
+        blocks[1].id,
+        BusyAdmonitionStyle.warning,
+      );
+      final edited = controller.markdown;
+      expect(
+        edited,
+        contains('<warning title="Known issue">Important.</warning>'),
+      );
+      final reparsed = parser.parse(
+        filePath: 'topic.md',
+        source: edited,
+        mode: MarkdownMode.writersideMarkdown,
+        validateLocalReferences: false,
+      );
+      expect(reparsed.busyDocument.blocks[1].attributes['style'], 'warning');
+    },
+  );
+
+  test('admonition editing emits source that reparses semantically', () {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: 'Important information.\n',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final controller = BusyMarkWysiwygDocumentController(
+      document: parsed.busyDocument,
+    );
+
+    controller.applyAdmonitionStyle(
+      parsed.busyDocument.blocks.single.id,
+      BusyAdmonitionStyle.warning,
+    );
+    final source = controller.markdown;
+    expect(source, '> Important information.\n{style="warning"}\n');
+
+    final reparsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    expect(reparsed.busyDocument.blocks.single.attributes['style'], 'warning');
+    expect(
+      previewBuilder.build(reparsed.busyDocument).blocks.single.kind,
+      PreviewBlockKind.admonition,
+    );
+  });
+
+  test('editing inside an existing admonition changes its outer type', () {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: '> Existing note.\n{style="note"}\n',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final admonition = parsed.busyDocument.blocks.single;
+    final child = admonition.children.single;
+    final controller = BusyMarkWysiwygDocumentController(
+      document: parsed.busyDocument,
+    );
+
+    final targetId = controller.admonitionTargetId(child.id);
+    expect(targetId, admonition.id);
+    controller.applyAdmonitionStyle(targetId, BusyAdmonitionStyle.warning);
+
+    expect(controller.markdown, '> Existing note.\n{style="warning"}\n');
+    expect(controller.markdown, isNot(contains('> >')));
+  });
+
+  testWidgets('WYSIWYG Admonition menu applies the selected type', (
+    tester,
+  ) async {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: 'Important information.\n',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    var markdown = '';
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SizedBox(
+            width: 900,
+            height: 640,
+            child: BusyMarkWysiwygEditor(
+              document: parsed.busyDocument,
+              onSourceChanged: (_, source) => markdown = source,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byTooltip('Admonition'), findsOneWidget);
+    await tester.tap(find.byTooltip('Admonition'));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Warning'));
+    await tester.pumpAndSettle();
+
+    expect(markdown, contains('{style="warning"}'));
+    expect(find.byType(BusyMarkDocumentAdmonition), findsOneWidget);
+    final reparsed = parser.parse(
+      filePath: 'topic.md',
+      source: markdown,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    expect(reparsed.busyDocument.blocks.single.attributes['style'], 'warning');
+  });
+
+  testWidgets('ordinary Markdown does not show the Writerside editing menu', (
+    tester,
+  ) async {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: 'Paragraph.\n',
+      validateLocalReferences: false,
+    );
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: BusyMarkWysiwygEditor(
+            document: parsed.busyDocument,
+            onSourceChanged: (_, _) {},
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byTooltip('Admonition'), findsNothing);
+  });
+
+  test(
+    'Writerside .topic preview keeps content inside its admonition',
+    () async {
+      final root = Directory.systemTemp.createTempSync('busymark-admonition-');
+      addTearDown(() => root.deleteSync(recursive: true));
+      final topics = Directory(p.join(root.path, 'topics'))..createSync();
+      File(p.join(root.path, 'writerside.cfg')).writeAsStringSync('''
+<ihp>
+  <module name="Admonition test"/>
+  <topics dir="topics"/>
+  <images dir="images"/>
+  <instance src="guide.tree"/>
+</ihp>
+''');
+      File(p.join(root.path, 'guide.tree')).writeAsStringSync('''
+<instance-profile id="guide" name="Guide" start-page="admonitions.topic">
+  <toc-element topic="admonitions.topic"/>
+</instance-profile>
+''');
+      const source = '''<topic id="admonitions" title="Admonitions">
+  <tip><p>Use <b>safe</b> mode with <math>x &lt; y</math>.</p></tip>
+  <note>Known limitation.</note>
+  <warning>Data can be lost.</warning>
+  <quote>Neutral quotation.</quote>
+</topic>''';
+      final topicPath = p.join(topics.path, 'admonitions.topic');
+      File(topicPath).writeAsStringSync(source);
+
+      const service = WorkspaceService();
+      final workspace = await service.openPath(root.path);
+      final preview = service.buildPreview(
+        workspace.copyWith(activeFilePath: topicPath),
+        source,
+      )!;
+      final callouts = preview.blocks.where(
+        (block) =>
+            block.kind == PreviewBlockKind.admonition ||
+            block.kind == PreviewBlockKind.quote,
+      );
+
+      expect(callouts.map((block) => block.text), [
+        'Use safe mode with x < y.',
+        'Known limitation.',
+        'Data can be lost.',
+        'Neutral quotation.',
+      ]);
+      expect(
+        preview.blocks.where(
+          (block) => block.text == 'Use safe mode with x < y.',
+        ),
+        hasLength(1),
+      );
+      final tip = callouts.first;
+      expect(
+        tip.inlines.map((inline) => inline.kind),
+        containsAll([PreviewInlineKind.strong, PreviewInlineKind.math]),
+      );
+      expect(
+        tip.inlines
+            .singleWhere((inline) => inline.kind == PreviewInlineKind.math)
+            .text,
+        'x < y',
+      );
+    },
+  );
+
+  test('PDF export keeps admonitions semantic and quotes neutral', () {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: '''> Helpful.
+
+> Important.
+{style="note"}
+
+> Quoted.
+{style="quote"}
+''',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final exported = const MarkdownExportMapper().map(parsed.busyDocument);
+
+    expect(exported.blocks.map((block) => block.kind), [
+      MarkdownExportBlockKind.admonition,
+      MarkdownExportBlockKind.admonition,
+      MarkdownExportBlockKind.blockquote,
+    ]);
+    expect(exported.blocks[0].attributes['style'], 'tip');
+    expect(exported.blocks[1].attributes['style'], 'note');
+  });
+}
diff --git a/test/src/writerside_collapsible_test.dart b/test/src/writerside_collapsible_test.dart
new file mode 100644
index 00000000..024732d5
--- /dev/null
+++ b/test/src/writerside_collapsible_test.dart
@@ -0,0 +1,356 @@
+import 'dart:io';
+
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/editor/document_collapsible.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_editor.dart';
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/markdown/busymark_markdown_serializer.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/preview_model.dart';
+import 'package:busymark/src/workspace/workspace_service.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  const parser = MarkdownParser();
+  const previewBuilder = BusyMarkPreviewBuilder();
+
+  test('Writerside Markdown collapsible chapter owns its section', () {
+    const source = '''## Advanced {collapsible="true"}
+
+Hidden paragraph.
+
+### Nested
+
+Nested paragraph.
+
+## Next
+
+Visible paragraph.
+''';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final heading = parsed.busyDocument.blocks.first;
+    expect(busyMarkWritersideIsCollapsible(heading.attributes), isTrue);
+
+    final preview = previewBuilder.build(parsed.busyDocument);
+    expect(preview.blocks, hasLength(3));
+    expect(preview.blocks.first.text, 'Advanced');
+    expect(preview.blocks.first.children.map((block) => block.text), [
+      'Hidden paragraph.',
+      'Nested',
+      'Nested paragraph.',
+    ]);
+    expect(preview.blocks[1].text, 'Next');
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+      source,
+    );
+  });
+
+  test('ordinary Markdown keeps Writerside collapse syntax literal', () {
+    const source = '''## Advanced {collapsible="true"}
+
+Paragraph.
+''';
+    final parsed = parser.parse(
+      filePath: 'README.md',
+      source: source,
+      mode: MarkdownMode.commonMark,
+      validateLocalReferences: false,
+    );
+    final heading = parsed.busyDocument.blocks.first;
+    expect(heading.plainText, 'Advanced {collapsible="true"}');
+    expect(heading.attributes[busyMarkWritersideCollapsibleAttribute], isNull);
+    expect(previewBuilder.build(parsed.busyDocument).blocks, hasLength(2));
+  });
+
+  test('ordinary Markdown does not assign semantic Writerside collapse', () {
+    const source = '''<chapter title="Details" collapsible="true">
+  <p>Body.</p>
+</chapter>
+''';
+    final parsed = parser.parse(
+      filePath: 'README.md',
+      source: source,
+      mode: MarkdownMode.commonMark,
+      validateLocalReferences: false,
+    );
+
+    expect(
+      parsed.busyDocument.blocks.any(
+        (block) => busyMarkWritersideIsCollapsible(block.attributes),
+      ),
+      isFalse,
+    );
+    expect(
+      previewBuilder
+          .build(parsed.busyDocument)
+          .blocks
+          .any((block) => busyMarkWritersideIsCollapsible(block.attributes)),
+      isFalse,
+    );
+  });
+
+  test('Writerside fenced code consumes its collapsible attribute line', () {
+    const source = '''```kotlin
+data class Person(val name: String)
+```
+{collapsible="true" collapsed-title="Person.kt" default-state="expanded"}
+''';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final block = parsed.busyDocument.blocks.single;
+    expect(block.kind, BusyBlockKind.codeBlock);
+    expect(busyMarkWritersideIsCollapsible(block.attributes), isTrue);
+    expect(
+      block.attributes[busyMarkWritersideCollapsedTitleAttribute],
+      'Person.kt',
+    );
+    expect(busyMarkWritersideInitiallyExpanded(block.attributes), isTrue);
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+      source,
+    );
+  });
+
+  test('edited collapsible blocks serialize valid Writerside attributes', () {
+    final parsedHeading = parser.parse(
+      filePath: 'topic.md',
+      source: '## Before {collapsible="true" default-state="expanded"}\n',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final heading = parsedHeading.busyDocument.blocks.single.copyWith(
+      inlines: const [BusyInline(kind: BusyInlineKind.text, text: 'After')],
+      preserveRaw: false,
+      dirty: true,
+    );
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(
+        parsedHeading.busyDocument.copyWith(blocks: [heading]),
+      ),
+      '## After {collapsible="true" default-state="expanded"}\n',
+    );
+
+    final parsedCode = parser.parse(
+      filePath: 'topic.md',
+      source: '''```text
+before
+```
+{collapsible="true" collapsed-title="Output"}
+''',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final code = parsedCode.busyDocument.blocks.single.copyWith(
+      inlines: const [BusyInline(kind: BusyInlineKind.text, text: 'after')],
+      preserveRaw: false,
+      dirty: true,
+    );
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(
+        parsedCode.busyDocument.copyWith(blocks: [code]),
+      ),
+      '''```text
+after
+```
+{collapsible="true" collapsed-title="Output"}
+''',
+    );
+  });
+
+  test('ordinary fenced code does not consume a collapse attribute line', () {
+    const source = '''```text
+value
+```
+{collapsible="true"}
+''';
+    final parsed = parser.parse(
+      filePath: 'README.md',
+      source: source,
+      mode: MarkdownMode.commonMark,
+      validateLocalReferences: false,
+    );
+    expect(parsed.busyDocument.blocks, hasLength(2));
+    expect(parsed.busyDocument.blocks.last.plainText, '{collapsible="true"}');
+  });
+
+  test('semantic collapsible elements become structured preview content', () {
+    const source =
+        '''<chapter title="Details" collapsible="true" default-state="expanded">
+  <p>Chapter body.</p>
+</chapter>
+
+<procedure title="Build" collapsible="true">
+  <step><p>Compile.</p></step>
+  <step><p>Package.</p></step>
+</procedure>
+
+<code-block lang="kotlin" collapsible="true" collapsed-title="Main.kt">
+fun main() = Unit
+</code-block>
+
+<deflist collapsible="true">
+  <def title="Expanded" default-state="expanded"><p>First.</p></def>
+  <def title="Collapsed" default-state="collapsed"><p>Second.</p></def>
+</deflist>
+''';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final preview = previewBuilder.build(parsed.busyDocument).blocks;
+
+    final chapterSpan = parsed.busyDocument.blocks.first.sourceSpan!;
+    final chapterSource = source.substring(
+      chapterSpan.startOffset,
+      chapterSpan.endOffset,
+    );
+    expect(chapterSource, contains('<chapter title="Details"'));
+    expect(chapterSource, contains('Chapter body.'));
+    expect(preview.map((block) => block.kind), [
+      PreviewBlockKind.heading,
+      PreviewBlockKind.procedure,
+      PreviewBlockKind.code,
+      PreviewBlockKind.definitionList,
+    ]);
+    expect(preview[0].children.single.text, 'Chapter body.');
+    expect(preview[1].children, hasLength(2));
+    expect(preview[1].children.first.kind, PreviewBlockKind.list);
+    expect(preview[2].language, 'kotlin');
+    expect(preview[2].text, 'fun main() = Unit');
+    expect(preview[3].children, hasLength(2));
+    expect(
+      busyMarkWritersideInitiallyExpanded(preview[3].children.first.attributes),
+      isTrue,
+    );
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+      source,
+    );
+  });
+
+  test(
+    'Writerside XML topic preview keeps collapsible content nested',
+    () async {
+      final root = Directory.systemTemp.createTempSync('busymark-collapse-');
+      addTearDown(() => root.deleteSync(recursive: true));
+      final topics = Directory(p.join(root.path, 'topics'))..createSync();
+      File(p.join(root.path, 'writerside.cfg')).writeAsStringSync('''
+<ihp>
+  <module name="Collapse test"/>
+  <topics dir="topics"/>
+  <images dir="images"/>
+  <instance src="guide.tree"/>
+</ihp>
+''');
+      File(p.join(root.path, 'guide.tree')).writeAsStringSync('''
+<instance-profile id="guide" name="Guide" start-page="collapse.topic">
+  <toc-element topic="collapse.topic"/>
+</instance-profile>
+''');
+      const source = '''<topic id="collapse" title="Collapse">
+  <chapter title="Details" collapsible="true"><p>Chapter body.</p></chapter>
+  <procedure title="Build" collapsible="true"><step><p>Compile.</p></step></procedure>
+  <code-block lang="text" collapsible="true" collapsed-title="Output">value</code-block>
+  <deflist collapsible="true"><def title="Term"><p>Meaning.</p></def></deflist>
+</topic>''';
+      final topicPath = p.join(topics.path, 'collapse.topic');
+      File(topicPath).writeAsStringSync(source);
+
+      const service = WorkspaceService();
+      final workspace = await service.openPath(root.path);
+      final preview = service.buildPreview(
+        workspace.copyWith(activeFilePath: topicPath),
+        source,
+      )!;
+      final collapsibles = preview.blocks.where(
+        (block) => busyMarkWritersideIsCollapsible(block.attributes),
+      );
+
+      expect(collapsibles.map((block) => block.kind), [
+        PreviewBlockKind.heading,
+        PreviewBlockKind.procedure,
+        PreviewBlockKind.code,
+        PreviewBlockKind.definitionList,
+      ]);
+      expect(collapsibles.first.children.single.text, 'Chapter body.');
+      expect(collapsibles.last.children.single.text, 'Term');
+      expect(
+        busyMarkWritersideIsCollapsible(
+          collapsibles.last.children.single.attributes,
+        ),
+        isTrue,
+      );
+    },
+  );
+
+  testWidgets('shared collapse control honors default state and toggles', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: const Scaffold(
+          body: BusyMarkDocumentCollapsible(
+            header: Text('Details'),
+            kindLabel: 'Details',
+            child: Text('Hidden body'),
+          ),
+        ),
+      ),
+    );
+
+    expect(find.text('Hidden body'), findsNothing);
+    await tester.tap(find.text('Details'));
+    await tester.pump();
+    expect(find.text('Hidden body'), findsOneWidget);
+  });
+
+  testWidgets('WYSIWYG collapses only Writerside chapter content', (
+    tester,
+  ) async {
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: '''## Details {collapsible="true"}
+
+Hidden body.
+''',
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: BusyMarkWysiwygEditor(
+            document: parsed.busyDocument,
+            onSourceChanged: (_, _) {},
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.text('Details'), findsOneWidget);
+    expect(find.text('Hidden body.'), findsNothing);
+    await tester.tap(find.byType(IconButton).first);
+    await tester.pump();
+    expect(find.text('Hidden body.'), findsOneWidget);
+  });
+}
diff --git a/test/src/writerside_instance_service_test.dart b/test/src/writerside_instance_service_test.dart
index f6bbf858..02bb55a6 100644
--- a/test/src/writerside_instance_service_test.dart
+++ b/test/src/writerside_instance_service_test.dart
@@ -102,13 +102,25 @@ void main() {
       p.join(source.path, 'guide', 'images'),
     ).createSync(recursive: true);
     final first = File(p.join(source.path, 'guide', 'intro.md'))
-      ..writeAsStringSync('# Imported intro\n\n![Logo](images/logo.png)\n');
+      ..writeAsStringSync('''# Imported intro
+
+![Logo](images/logo.png)
+
+<video src="images/demo.mp4"
+       preview-src="images/demo.png"/>
+''');
     File(
       p.join(source.path, 'guide', 'other.md'),
     ).writeAsStringSync('# Other\n');
     File(
       p.join(source.path, 'guide', 'images', 'logo.png'),
     ).writeAsBytesSync([1, 2, 3]);
+    File(
+      p.join(source.path, 'guide', 'images', 'demo.mp4'),
+    ).writeAsBytesSync([4, 5, 6]);
+    File(
+      p.join(source.path, 'guide', 'images', 'demo.png'),
+    ).writeAsBytesSync([7, 8, 9]);
 
     final candidates = await instanceService.discoverMarkdownFiles(source.path);
     expect(candidates.map((candidate) => candidate.relativePath), [
@@ -143,6 +155,18 @@ void main() {
       ).readAsBytesSync(),
       [1, 2, 3],
     );
+    expect(
+      File(
+        p.join(root.path, 'topics', 'guide', 'images', 'demo.mp4'),
+      ).readAsBytesSync(),
+      [4, 5, 6],
+    );
+    expect(
+      File(
+        p.join(root.path, 'topics', 'guide', 'images', 'demo.png'),
+      ).readAsBytesSync(),
+      [7, 8, 9],
+    );
     expect(
       File(p.join(root.path, 'topics', 'guide', 'other.md')).existsSync(),
       isFalse,
diff --git a/test/src/writerside_math_diagram_test.dart b/test/src/writerside_math_diagram_test.dart
new file mode 100644
index 00000000..1f32f998
--- /dev/null
+++ b/test/src/writerside_math_diagram_test.dart
@@ -0,0 +1,374 @@
+import 'dart:io';
+
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/markdown/busymark_markdown_serializer.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/math_syntax.dart';
+import 'package:busymark/src/markdown/preview_model.dart';
+import 'package:busymark/src/visualization/visualization_models.dart';
+import 'package:busymark/src/workspace/workspace_service.dart';
+import 'package:busymark/src/writerside/writerside_diagram_source_loader.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  const parser = MarkdownParser();
+  const serializer = BusyMarkMarkdownSerializer();
+
+  test('Writerside math forms use semantic math nodes and round-trip', () {
+    const source = r'''# Math
+
+Inline <math>x &lt; y</math> and $z$.
+
+<code-block lang="tex">
+<![CDATA[\sum_{i=1}^n i < n^2]]>
+</code-block>
+
+```tex
+\mathbf{R}
+```
+
+$$
+\int_0^1 x\,dx
+$$
+''';
+    final parsed = parser.parse(
+      filePath: '/workspace/topics/math.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final blocks = parsed.busyDocument.blocks;
+    final displayMath = blocks
+        .where((block) => block.kind == BusyBlockKind.math)
+        .toList();
+    final inlineMath = blocks
+        .expand(_allInlines)
+        .where((inline) => inline.kind == BusyInlineKind.math)
+        .where(
+          (inline) => inline.attributes[busyMarkMathDisplayAttribute] != 'true',
+        )
+        .toList();
+
+    expect(displayMath, hasLength(3));
+    expect(
+      displayMath.map(
+        (block) => block.attributes[busyMarkMathSourceFormAttribute],
+      ),
+      [
+        BusyMathSourceForm.writersideTexElement.name,
+        BusyMathSourceForm.writersideTexFence.name,
+        BusyMathSourceForm.doubleDollarDisplay.name,
+      ],
+    );
+    expect(displayMath.first.plainText, r'\sum_{i=1}^n i < n^2');
+    expect(inlineMath.map((inline) => inline.text), ['x < y', 'z']);
+    expect(serializer.serialize(parsed.busyDocument), source);
+
+    final semantic = displayMath.first;
+    const editedExpression = r'\sum_{i=1}^n i > 0';
+    final edited = semantic.copyWith(
+      inlines: [
+        BusyInline(
+          kind: BusyInlineKind.math,
+          text: editedExpression,
+          attributes: {
+            ...semantic.inlines.single.attributes,
+            busyMarkMathExpressionAttribute: editedExpression,
+          },
+        ),
+      ],
+      attributes: {
+        ...semantic.attributes,
+        busyMarkMathExpressionAttribute: editedExpression,
+      },
+      dirty: true,
+    );
+    final editedSource = serializer.serialize(
+      parsed.busyDocument.copyWith(
+        blocks: [
+          for (final block in blocks) block.id == semantic.id ? edited : block,
+        ],
+      ),
+    );
+    expect(
+      editedSource,
+      contains(
+        '<code-block lang="tex">\n'
+        r'\sum_{i=1}^n i &gt; 0'
+        '\n</code-block>',
+      ),
+    );
+    final reparsed = parser.parse(
+      filePath: '/workspace/topics/math.md',
+      source: editedSource,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    expect(
+      reparsed.busyDocument.blocks
+          .where((block) => block.kind == BusyBlockKind.math)
+          .first
+          .plainText,
+      editedExpression,
+    );
+  });
+
+  test('ordinary Markdown does not reinterpret Writerside TeX forms', () {
+    const source = '''<code-block lang="tex">x</code-block>
+
+```tex
+x
+```
+''';
+    final parsed = parser.parse(
+      filePath: '/workspace/document.md',
+      source: source,
+      mode: MarkdownMode.commonMark,
+      validateLocalReferences: false,
+    );
+
+    expect(
+      parsed.busyDocument.blocks.where(
+        (block) => block.kind == BusyBlockKind.math,
+      ),
+      isEmpty,
+    );
+    expect(
+      parsed.busyDocument.blocks.where(
+        (block) => block.kind == BusyBlockKind.codeBlock,
+      ),
+      hasLength(1),
+    );
+    expect(parsed.busyDocument.blocks.first.kind, BusyBlockKind.htmlBlock);
+    expect(serializer.serialize(parsed.busyDocument), source);
+  });
+
+  test('Writerside semantic and fenced diagrams share visualizers', () {
+    const source = '''<code-block lang="Mermaid">
+flowchart LR
+  A --> B
+</code-block>
+
+<code-block lang="plantuml"><![CDATA[
+@startuml
+A -> B
+@enduml
+]]></code-block>
+
+<code-block lang="D2" src="graphs/architecture.d2"/>
+
+```mermaid
+flowchart TD
+  C --> D
+```
+
+```plantuml
+@startuml
+C -> D
+@enduml
+```
+
+```D2
+```
+{ src="graphs/architecture.d2" }
+''';
+    final parsed = parser.parse(
+      filePath: '/workspace/topics/diagrams.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final codeBlocks = parsed.busyDocument.blocks
+        .where((block) => block.kind == BusyBlockKind.codeBlock)
+        .toList();
+    final preview = const BusyMarkPreviewBuilder().build(parsed.busyDocument);
+    final diagrams = preview.blocks
+        .where((block) => block.visualization != null)
+        .toList();
+
+    expect(codeBlocks, hasLength(6));
+    expect(diagrams, hasLength(6));
+    expect(diagrams.map((block) => block.visualization!.kind), [
+      VisualizationRendererKind.mermaid,
+      VisualizationRendererKind.plantUml,
+      VisualizationRendererKind.d2,
+      VisualizationRendererKind.mermaid,
+      VisualizationRendererKind.plantUml,
+      VisualizationRendererKind.d2,
+    ]);
+    expect(codeBlocks[2].attributes['src'], 'graphs/architecture.d2');
+    expect(codeBlocks.last.attributes['src'], 'graphs/architecture.d2');
+    expect(
+      codeBlocks.last.rawSource,
+      contains('{ src="graphs/architecture.d2" }'),
+    );
+    expect(serializer.serialize(parsed.busyDocument), source);
+
+    final ordinary = parser.parse(
+      filePath: '/workspace/diagrams.md',
+      source: '''```D2
+```
+{ src="graphs/architecture.d2" }
+''',
+      mode: MarkdownMode.commonMark,
+      validateLocalReferences: false,
+    );
+    final ordinaryCode = ordinary.busyDocument.blocks.singleWhere(
+      (block) => block.kind == BusyBlockKind.codeBlock,
+    );
+    expect(ordinaryCode.attributes['src'], isNull);
+    expect(
+      ordinary.busyDocument.blocks.where(
+        (block) => block.kind == BusyBlockKind.paragraph,
+      ),
+      hasLength(1),
+    );
+  });
+
+  test(
+    'referenced diagram source is constrained to the Writerside root',
+    () async {
+      final root = await Directory.systemTemp.createTemp(
+        'busymark-writerside-diagram-',
+      );
+      final outside = await Directory.systemTemp.createTemp(
+        'busymark-writerside-outside-',
+      );
+      addTearDown(() async {
+        await root.delete(recursive: true);
+        await outside.delete(recursive: true);
+      });
+      final topics = Directory(p.join(root.path, 'topics'))..createSync();
+      final graphs = Directory(p.join(root.path, 'graphs'))..createSync();
+      final topicPath = p.join(topics.path, 'diagram.md');
+      File(topicPath).writeAsStringSync('# Diagram\n');
+      File(p.join(graphs.path, 'graph.d2')).writeAsStringSync('a -> b\n');
+      final outsideFile = File(p.join(outside.path, 'outside.d2'))
+        ..writeAsStringSync('secret\n');
+      const loader = WritersideDiagramSourceLoader();
+
+      expect(
+        await loader.load(
+          reference: '../graphs/graph.d2',
+          documentPath: topicPath,
+          workspaceRoot: root.path,
+        ),
+        'a -> b\n',
+      );
+      await expectLater(
+        loader.load(
+          reference: p.join('..', '..', p.basename(outside.path), 'outside.d2'),
+          documentPath: topicPath,
+          workspaceRoot: root.path,
+        ),
+        throwsA(
+          isA<WritersideDiagramSourceException>().having(
+            (error) => error.failure,
+            'failure',
+            WritersideDiagramSourceFailure.outsideWorkspace,
+          ),
+        ),
+      );
+      await Link(p.join(graphs.path, 'linked.d2')).create(outsideFile.path);
+      await expectLater(
+        loader.load(
+          reference: '../graphs/linked.d2',
+          documentPath: topicPath,
+          workspaceRoot: root.path,
+        ),
+        throwsA(
+          isA<WritersideDiagramSourceException>().having(
+            (error) => error.failure,
+            'failure',
+            WritersideDiagramSourceFailure.outsideWorkspace,
+          ),
+        ),
+      );
+      File(p.join(graphs.path, 'invalid.d2')).writeAsBytesSync([0xff]);
+      await expectLater(
+        loader.load(
+          reference: '../graphs/invalid.d2',
+          documentPath: topicPath,
+          workspaceRoot: root.path,
+        ),
+        throwsA(
+          isA<WritersideDiagramSourceException>().having(
+            (error) => error.failure,
+            'failure',
+            WritersideDiagramSourceFailure.invalidUtf8,
+          ),
+        ),
+      );
+      await expectLater(
+        const WritersideDiagramSourceLoader(maximumBytes: 4).load(
+          reference: '../graphs/graph.d2',
+          documentPath: topicPath,
+          workspaceRoot: root.path,
+        ),
+        throwsA(
+          isA<WritersideDiagramSourceException>().having(
+            (error) => error.failure,
+            'failure',
+            WritersideDiagramSourceFailure.tooLarge,
+          ),
+        ),
+      );
+    },
+  );
+
+  test(
+    'Writerside topic XML exposes TeX and diagrams to shared preview',
+    () async {
+      const service = WorkspaceService();
+      final workspace = await service.openPath(
+        'test/fixtures/writerside/basic_project',
+      );
+      final topicPath = p.normalize(
+        p.absolute('test/fixtures/writerside/basic_project/topics/math.topic'),
+      );
+      const source = r'''<topic title="Math" id="math">
+  <code-block lang="tex"><![CDATA[\mathbb{R}]]></code-block>
+  <code-block lang="mermaid">flowchart LR
+A --&gt; B</code-block>
+</topic>
+''';
+      final preview = service.buildPreview(
+        workspace.copyWith(activeFilePath: topicPath),
+        source,
+      )!;
+
+      final math = preview.blocks.singleWhere(
+        (block) => block.kind == PreviewBlockKind.math,
+      );
+      final diagram = preview.blocks.singleWhere(
+        (block) => block.visualization != null,
+      );
+      expect(math.text, r'\mathbb{R}');
+      expect(
+        math.attributes[busyMarkMathSourceFormAttribute],
+        BusyMathSourceForm.writersideTexElement.name,
+      );
+      expect(diagram.visualization!.kind, VisualizationRendererKind.mermaid);
+      expect(diagram.text, 'flowchart LR\nA --> B');
+    },
+  );
+}
+
+Iterable<BusyInline> _allInlines(BusyBlock block) sync* {
+  for (final inline in block.inlines) {
+    yield inline;
+    yield* _nestedInlines(inline);
+  }
+  for (final child in block.children) {
+    yield* _allInlines(child);
+  }
+}
+
+Iterable<BusyInline> _nestedInlines(BusyInline inline) sync* {
+  for (final child in inline.children) {
+    yield child;
+    yield* _nestedInlines(child);
+  }
+}
diff --git a/test/src/writerside_pdf_export_test.dart b/test/src/writerside_pdf_export_test.dart
index a65d8747..c7be3706 100644
--- a/test/src/writerside_pdf_export_test.dart
+++ b/test/src/writerside_pdf_export_test.dart
@@ -1,657 +1,272 @@
 import 'dart:io';
 
+import 'package:busymark/src/export/markdown_pdf_export_service.dart';
 import 'package:busymark/src/export/markdown_pdf_models.dart';
-import 'package:busymark/src/export/writerside_pdf_configuration.dart';
+import 'package:busymark/src/export/typst_compiler.dart';
 import 'package:busymark/src/export/writerside_pdf_export_service.dart';
 import 'package:busymark/src/export/writerside_pdf_models.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:path/path.dart' as p;
-import 'package:xml/xml.dart';
 
 void main() {
-  test('generated configuration contains every documented PDF option', () {
-    const codec = WritersidePdfConfigurationCodec();
-    final document = XmlDocument.parse(
-      codec.encode(
-        const WritersidePdfOptions(
-          orientation: MarkdownPdfOrientation.landscape,
-          layout: 'GNOME',
-          cover: WritersidePdfCoverOptions(
-            enabled: true,
-            title: 'Busy & Mark',
-            logoPath: '/host/logo.svg',
-            description: 'User <Guide>',
-            copyright: 'BusyStack © 2026',
-          ),
-          header: 'BusyMark guide',
-          footer: 'Confidential',
-          tocTitle: 'Contents',
-        ),
-        containerLogoPath: '/opt/sources/Writerside/images/logo.svg',
-      ),
-    );
-
-    final root = document.rootElement;
-    expect(root.name.local, 'pdf');
-    expect(root.getAttribute('landscape'), 'true');
-    expect(
-      root.getElement('cover-page')?.getElement('title')?.innerText,
-      'Busy & Mark',
-    );
-    expect(
-      root.getElement('cover-page')?.getElement('logo')?.innerText,
-      '/opt/sources/Writerside/images/logo.svg',
-    );
-    expect(
-      root.getElement('cover-page')?.getElement('description')?.innerText,
-      'User <Guide>',
-    );
-    expect(root.getElement('header')?.innerText, 'BusyMark guide');
-    expect(root.getElement('footer')?.innerText, 'Confidential');
-    expect(root.getElement('toc-title')?.innerText, 'Contents');
-    expect(root.getElement('layout')?.innerText, 'GNOME');
-  });
-
-  test('discovers PDF configurations and instance keymap layouts', () async {
-    final root = await Directory.systemTemp.createTemp(
-      'busymark-writerside-pdf-config-test-',
-    );
-    addTearDown(() => root.delete(recursive: true));
-    final cfg = await Directory(p.join(root.path, 'cfg')).create();
-    await File(p.join(cfg.path, 'PDF.xml')).writeAsString('<pdf/>');
-    await File(
-      p.join(cfg.path, 'not-pdf.xml'),
-    ).writeAsString('<buildprofiles/>');
-    await File(p.join(cfg.path, 'broken.xml')).writeAsString('<pdf>');
-    await File(p.join(cfg.path, 'buildprofiles.xml')).writeAsString('''
-<buildprofiles>
-  <shortcuts>
-    <layout name="Windows" display-name="Windows and Linux"/>
-    <layout name="macOS" display-name="macOS" instance="other"/>
-  </shortcuts>
-  <shortcuts instance="guide,reference">
-    <layout name="GNOME" display-name="Linux"/>
-  </shortcuts>
-</buildprofiles>
-''');
-    const codec = WritersidePdfConfigurationCodec();
-
-    final configurations = await codec.discover(
-      moduleRoot: root.path,
-      buildConfigDirectory: 'cfg',
-    );
-    final layouts = await codec.discoverLayouts(
-      moduleRoot: root.path,
-      buildConfigDirectory: 'cfg',
-      instanceId: 'guide',
-    );
-
-    expect(configurations, [p.join(cfg.path, 'PDF.xml')]);
-    expect(layouts.map((item) => item.name), ['Windows', 'GNOME']);
-    expect(layouts.map((item) => item.displayName), [
-      'Windows and Linux',
-      'Linux',
-    ]);
-  });
-
   test(
-    'generated export uses a private source copy and leaves sources unchanged',
+    'native export composes the selected instance without a container runtime',
     () async {
-      if (!Platform.isLinux) {
-        return;
-      }
-      final fixture = await _WritersideFixture.create(withConfig: false);
+      final fixture = await _WritersideFixture.create();
       addTearDown(fixture.dispose);
-      final runner = _FakeBuilderRunner();
-      final service = WritersidePdfExportService(
-        dockerLocator: const _FixedDockerLocator(),
-        commandRunner: runner,
-      );
+      final exporter = _RecordingMarkdownExporter();
+      final service = WritersidePdfExportService(markdownExporter: exporter);
       final destination = p.join(fixture.root.path, 'guide.pdf');
-      await Directory(p.join(fixture.root.path, '.git')).create();
-      await File(
-        p.join(fixture.root.path, '.git', 'config'),
-      ).writeAsString('[core]\n');
-      await File(
-        p.join(fixture.module.path, 'pdfSourceGUIDE.pdf'),
-      ).writeAsBytes(_validPdf);
-      await File(
-        p.join(fixture.module.path, 'images.dat'),
-      ).writeAsBytes([0, 1, 2]);
 
       final result = await service.export(
-        fixture.request(
+        WritersidePdfExportRequest(
+          moduleRoot: fixture.module.path,
+          instanceId: 'guide',
           destinationPath: destination,
-          options: const WritersidePdfOptions(
-            cover: WritersidePdfCoverOptions(enabled: true, title: 'Guide'),
+          overwrite: false,
+          options: const MarkdownPdfOptions(
+            pageSize: MarkdownPdfPageSize.letter,
+            orientation: MarkdownPdfOrientation.landscape,
           ),
         ),
       );
 
-      final arguments = runner.buildArguments!;
+      final request = exporter.request!;
       expect(result.destinationPath, destination);
-      expect(result.pageCount, 1);
-      expect(await File(destination).exists(), isTrue);
-      expect(
-        await Directory(p.join(fixture.module.path, 'cfg')).exists(),
-        isFalse,
-      );
-      expect(
-        await Directory(p.join(fixture.root.path, '.idea')).exists(),
-        isFalse,
-      );
-      expect(arguments, containsAllInOrder(['--network', 'none']));
-      expect(arguments, containsAllInOrder(['--shm-size', '1g']));
-      expect(arguments, contains('SOURCE_DIR=/opt/sources'));
-      expect(arguments, contains('MODULE_INSTANCE=Writerside/guide'));
-      expect(arguments, contains('PDF=BusyMark-PDF.xml'));
+      expect(result.pageCount, 3);
+      expect(request.mode, MarkdownMode.writersideMarkdown);
+      expect(request.workspaceRoot, fixture.module.path);
+      expect(request.options.pageSize, MarkdownPdfPageSize.letter);
+      expect(request.options.orientation, MarkdownPdfOrientation.landscape);
+      expect(request.source, contains('# BusyMark Guide'));
+      expect(request.source, contains('# Advanced'));
+      expect(request.source, contains('XML topic content.'));
+      expect(request.source, contains(r'$$'));
+      expect(request.source, contains('x < y'));
+      expect(request.source, contains('file://'));
       expect(
-        arguments,
-        contains(
-          '$writersideBuilderRepository:$writersideBuilderDefaultVersion',
-        ),
+        request.source.indexOf('# BusyMark Guide'),
+        lessThan(request.source.indexOf('# Advanced')),
       );
-      expect(runner.generatedConfiguration, contains('<title>Guide</title>'));
-      expect(runner.mountTargets, containsAll(['/opt/sources', '/opt/output']));
-      expect(runner.mountTargets, hasLength(2));
-      expect(runner.readOnlyMountTargets, isEmpty);
-      expect(runner.copiedGitMetadata, isFalse);
-      expect(runner.copiedStalePdfArtifact, isFalse);
-      expect(runner.copiedUnsupportedResource, isTrue);
-      expect(runner.calls.where((call) => call.first == 'pull'), isEmpty);
     },
   );
 
-  test(
-    'retries once when the builder process crashes before producing PDF',
-    () async {
-      if (!Platform.isLinux) {
-        return;
-      }
-      final fixture = await _WritersideFixture.create(withConfig: false);
-      addTearDown(fixture.dispose);
-      final runner = _FakeBuilderRunner(crashFirstBuild: true);
-      final service = WritersidePdfExportService(
-        dockerLocator: const _FixedDockerLocator(),
-        commandRunner: runner,
-      );
-      final destination = p.join(fixture.root.path, 'retried.pdf');
-
-      final result = await service.export(
-        fixture.request(destinationPath: destination),
-      );
-
-      expect(result.destinationPath, destination);
-      expect(runner.buildRunCount, 2);
-      expect(result.buildLog, contains('PDF generation retried.'));
-      expect(await File(destination).exists(), isTrue);
-    },
-  );
-
-  test(
-    'existing project PDF configuration is passed through unchanged',
-    () async {
-      if (!Platform.isLinux) {
-        return;
-      }
-      final fixture = await _WritersideFixture.create(withConfig: true);
-      addTearDown(fixture.dispose);
-      final runner = _FakeBuilderRunner();
-      final service = WritersidePdfExportService(
-        dockerLocator: const _FixedDockerLocator(),
-        commandRunner: runner,
-      );
-      final destination = p.join(fixture.root.path, 'configured.pdf');
+  test('pre-cancelled native export never starts PDF compilation', () async {
+    final fixture = await _WritersideFixture.create();
+    addTearDown(fixture.dispose);
+    final exporter = _RecordingMarkdownExporter();
+    final service = WritersidePdfExportService(markdownExporter: exporter);
+    final token = WritersidePdfCancellationToken()..cancel();
 
-      await service.export(
-        fixture.request(
-          destinationPath: destination,
-          configurationMode: WritersidePdfConfigurationMode.projectFile,
-          projectConfigurationPath: fixture.configurationFile.path,
-        ),
-      );
-
-      expect(runner.buildArguments, contains('PDF=Release-PDF.xml'));
-      expect(runner.mountTargets, containsAll(['/opt/sources', '/opt/output']));
-      expect(runner.mountTargets, hasLength(2));
-      expect(runner.readOnlyMountTargets, isEmpty);
-      expect(
-        await Directory(p.join(fixture.root.path, '.idea')).exists(),
-        isFalse,
-      );
-      expect(
-        await fixture.configurationFile.readAsString(),
-        '<pdf><toc-title>Release contents</toc-title></pdf>',
-      );
-    },
-  );
-
-  test(
-    'missing builder image is reported without starting a container',
-    () async {
-      final fixture = await _WritersideFixture.create(withConfig: false);
-      addTearDown(fixture.dispose);
-      final runner = _FakeBuilderRunner(imageAvailable: false);
-      final service = WritersidePdfExportService(
-        dockerLocator: const _FixedDockerLocator(),
-        commandRunner: runner,
-      );
-
-      await expectLater(
-        service.export(
-          fixture.request(
-            destinationPath: p.join(fixture.root.path, 'missing.pdf'),
-          ),
+    await expectLater(
+      service.export(
+        WritersidePdfExportRequest(
+          moduleRoot: fixture.module.path,
+          instanceId: 'guide',
+          destinationPath: p.join(fixture.root.path, 'cancelled.pdf'),
+          overwrite: false,
         ),
-        throwsA(
-          isA<WritersidePdfExportException>().having(
-            (error) => error.code,
-            'code',
-            WritersidePdfFailureCode.builderImageUnavailable,
-          ),
+        cancellationToken: token,
+      ),
+      throwsA(
+        isA<WritersidePdfExportException>().having(
+          (error) => error.code,
+          'code',
+          WritersidePdfFailureCode.cancelled,
         ),
-      );
-      expect(runner.buildArguments, isNull);
-    },
-  );
+      ),
+    );
+    expect(exporter.request, isNull);
+  });
 
-  test(
-    'pre-cancelled export reports the Writerside cancellation type',
-    () async {
-      final fixture = await _WritersideFixture.create(withConfig: false);
-      addTearDown(fixture.dispose);
-      final token = WritersidePdfCancellationToken()..cancel();
-      final service = WritersidePdfExportService(
-        dockerLocator: const _FixedDockerLocator(),
-        commandRunner: _FakeBuilderRunner(),
-      );
+  test('unknown Writerside instance is rejected before compilation', () async {
+    final fixture = await _WritersideFixture.create();
+    addTearDown(fixture.dispose);
+    final exporter = _RecordingMarkdownExporter();
+    final service = WritersidePdfExportService(markdownExporter: exporter);
 
-      await expectLater(
-        service.export(
-          fixture.request(
-            destinationPath: p.join(fixture.root.path, 'cancelled.pdf'),
-          ),
-          cancellationToken: token,
+    await expectLater(
+      service.export(
+        WritersidePdfExportRequest(
+          moduleRoot: fixture.module.path,
+          instanceId: 'missing',
+          destinationPath: p.join(fixture.root.path, 'missing.pdf'),
+          overwrite: false,
         ),
-        throwsA(
-          isA<WritersidePdfExportException>().having(
-            (error) => error.code,
-            'code',
-            WritersidePdfFailureCode.cancelled,
-          ),
+      ),
+      throwsA(
+        isA<WritersidePdfExportException>().having(
+          (error) => error.code,
+          'code',
+          WritersidePdfFailureCode.invalidRequest,
         ),
-      );
-    },
-  );
-
-  test(
-    'generated overlay rejects symlinks outside the selected source root',
-    () async {
-      final fixture = await _WritersideFixture.create(withConfig: false);
-      final outside = await Directory.systemTemp.createTemp(
-        'busymark-writerside-pdf-outside-test-',
-      );
-      addTearDown(fixture.dispose);
-      addTearDown(() => outside.delete(recursive: true));
-      await File(p.join(outside.path, 'private.txt')).writeAsString('private');
-      await Link(p.join(fixture.module.path, 'outside')).create(outside.path);
-      final runner = _FakeBuilderRunner();
-      final service = WritersidePdfExportService(
-        dockerLocator: const _FixedDockerLocator(),
-        commandRunner: runner,
-      );
+      ),
+    );
+    expect(exporter.request, isNull);
+  });
 
-      await expectLater(
-        service.export(
-          fixture.request(
-            destinationPath: p.join(fixture.root.path, 'unsafe.pdf'),
-          ),
+  test('native exporter failures use Writerside failure codes', () async {
+    final fixture = await _WritersideFixture.create();
+    addTearDown(fixture.dispose);
+    final service = WritersidePdfExportService(
+      markdownExporter: _RecordingMarkdownExporter(
+        failure: const MarkdownPdfExportException(
+          MarkdownPdfFailureCode.compilerUnavailable,
         ),
-        throwsA(
-          isA<WritersidePdfExportException>()
-              .having(
-                (error) => error.code,
-                'code',
-                WritersidePdfFailureCode.invalidRequest,
-              )
-              .having((error) => error.detail, 'detail', contains('symlink')),
-        ),
-      );
-      expect(runner.buildArguments, isNull);
-    },
-  );
-
-  test('builder runner force-stops a process after its timeout', () async {
-    if (!Platform.isLinux) {
-      return;
-    }
-    final root = await Directory.systemTemp.createTemp(
-      'busymark-writerside-pdf-timeout-test-',
+      ),
     );
-    addTearDown(() => root.delete(recursive: true));
-    final executable = File(p.join(root.path, 'slow-builder'));
-    await executable.writeAsString('''#!/bin/sh
-trap '' TERM
-while :; do :; done
-''');
-    final chmod = await Process.run('chmod', ['700', executable.path]);
-    expect(chmod.exitCode, 0);
-    final stopwatch = Stopwatch()..start();
 
     await expectLater(
-      const DartWritersideBuilderCommandRunner().run(
-        executable: executable.path,
-        arguments: const [],
-        timeout: const Duration(milliseconds: 100),
-        cancellationToken: WritersidePdfCancellationToken(),
+      service.export(
+        WritersidePdfExportRequest(
+          moduleRoot: fixture.module.path,
+          instanceId: 'guide',
+          destinationPath: p.join(fixture.root.path, 'unavailable.pdf'),
+          overwrite: false,
+        ),
       ),
       throwsA(
         isA<WritersidePdfExportException>().having(
           (error) => error.code,
           'code',
-          WritersidePdfFailureCode.timedOut,
+          WritersidePdfFailureCode.exporterUnavailable,
         ),
       ),
     );
-    expect(stopwatch.elapsed, lessThan(const Duration(seconds: 3)));
   });
 
   test(
-    'official builder exports the Writerside demo through Docker',
+    'native Writerside demo runs through the bundled PDF pipeline',
     () async {
       final output = await Directory.systemTemp.createTemp(
-        'busymark-writerside-pdf-integration-test-',
+        'busymark-writerside-native-pdf-',
       );
       addTearDown(() => output.delete(recursive: true));
       final module = Directory('demo/writerside-instances').absolute;
       final destination = p.join(output.path, 'writerside-demo.pdf');
-      const service = WritersidePdfExportService();
-
-      expect(
-        await service.isBuilderAvailable(writersideBuilderDefaultVersion),
-        isTrue,
-        reason:
-            'Install $writersideBuilderRepository:'
-            '$writersideBuilderDefaultVersion before running this test.',
-      );
-      final result = await service.export(
-        WritersidePdfExportRequest(
-          moduleRoot: module.path,
-          sourceRoot: module.parent.path,
-          moduleName: 'BusyMark Instance Demo',
-          buildConfigDirectory: 'cfg',
-          instanceId: 'guide',
-          destinationPath: destination,
-          overwrite: false,
-          builderVersion: writersideBuilderDefaultVersion,
-          configurationMode: WritersidePdfConfigurationMode.projectFile,
-          projectConfigurationPath: p.join(module.path, 'cfg', 'PDF.xml'),
+      const service = WritersidePdfExportService(
+        markdownExporter: MarkdownPdfExportService(
+          compilerLocator: TypstCompilerLocator(
+            environment: {'BUSYMARK_TYPST_PATH': '/bin/true'},
+          ),
+          commandRunner: _PdfWritingTypstRunner(),
         ),
       );
 
-      expect(await File(destination).length(), greaterThan(1024));
-      expect(result.pageCount, isNotNull);
-    },
-    skip: Platform.environment['BUSYMARK_WRITERSIDE_PDF_INTEGRATION'] == '1'
-        ? false
-        : 'Set BUSYMARK_WRITERSIDE_PDF_INTEGRATION=1 after installing the '
-              'official builder image.',
-    timeout: const Timeout(Duration(minutes: 16)),
-  );
-
-  test(
-    'official builder accepts generated BusyMark PDF settings',
-    () async {
-      final output = await Directory.systemTemp.createTemp(
-        'busymark-writerside-pdf-generated-integration-test-',
-      );
-      addTearDown(() => output.delete(recursive: true));
-      final module = Directory('demo/writerside-instances').absolute;
-      final destination = p.join(output.path, 'writerside-customized.pdf');
-      const service = WritersidePdfExportService();
-
-      expect(
-        await service.isBuilderAvailable(writersideBuilderDefaultVersion),
-        isTrue,
-        reason:
-            'Install $writersideBuilderRepository:'
-            '$writersideBuilderDefaultVersion before running this test.',
-      );
       final result = await service.export(
         WritersidePdfExportRequest(
           moduleRoot: module.path,
-          sourceRoot: module.parent.path,
-          moduleName: 'BusyMark Instance Demo',
-          buildConfigDirectory: 'cfg',
           instanceId: 'guide',
           destinationPath: destination,
           overwrite: false,
-          builderVersion: writersideBuilderDefaultVersion,
-          configurationMode: WritersidePdfConfigurationMode.generated,
-          options: WritersidePdfOptions(
-            orientation: MarkdownPdfOrientation.landscape,
-            cover: WritersidePdfCoverOptions(
-              enabled: true,
-              title: 'Customized BusyMark Guide',
-              logoPath: p.join(module.path, 'images', 'busymark-mark.svg'),
-              description: 'Generated configuration integration test',
-              copyright: 'BusyStack © 2026',
-            ),
-            header: 'BusyMark Writerside export',
-            footer: 'Generated by the official Writerside builder',
-            tocTitle: 'Customized contents',
-          ),
         ),
       );
 
       expect(await File(destination).length(), greaterThan(1024));
       expect(result.pageCount, isNotNull);
     },
-    skip: Platform.environment['BUSYMARK_WRITERSIDE_PDF_INTEGRATION'] == '1'
-        ? false
-        : 'Set BUSYMARK_WRITERSIDE_PDF_INTEGRATION=1 after installing the '
-              'official builder image.',
-    timeout: const Timeout(Duration(minutes: 16)),
   );
 }
 
 class _WritersideFixture {
-  _WritersideFixture({
-    required this.root,
-    required this.module,
-    required this.configurationFile,
-  });
+  const _WritersideFixture({required this.root, required this.module});
 
   final Directory root;
   final Directory module;
-  final File configurationFile;
 
-  static Future<_WritersideFixture> create({required bool withConfig}) async {
+  static Future<_WritersideFixture> create() async {
     final root = await Directory.systemTemp.createTemp(
-      'busymark-writerside-pdf-service-test-',
+      'busymark-writerside-native-service-',
     );
     final module = await Directory(p.join(root.path, 'Writerside')).create();
-    await File(
-      p.join(module.path, 'writerside.cfg'),
-    ).writeAsString('<ihp><instance src="guide.tree"/></ihp>');
-    await File(
-      p.join(module.path, 'guide.tree'),
-    ).writeAsString('<instance-profile id="guide" name="Guide"/>');
-    final topics = await Directory(p.join(module.path, 'topics')).create();
-    await File(p.join(topics.path, 'intro.md')).writeAsString('# Introduction');
-    final configurationFile = File(
-      p.join(module.path, 'cfg', 'Release-PDF.xml'),
-    );
-    if (withConfig) {
-      await configurationFile.parent.create();
-      await configurationFile.writeAsString(
-        '<pdf><toc-title>Release contents</toc-title></pdf>',
-      );
-    }
-    return _WritersideFixture(
-      root: root,
-      module: module,
-      configurationFile: configurationFile,
-    );
-  }
+    await Directory(p.join(module.path, 'topics')).create();
+    await Directory(p.join(module.path, 'images')).create();
+    await File(p.join(module.path, 'writerside.cfg')).writeAsString('''
+<ihp version="2026.2">
+  <module name="Native export test"/>
+  <topics dir="topics"/>
+  <images dir="images"/>
+  <vars src="v.list"/>
+  <instance src="guide.tree"/>
+</ihp>
+''');
+    await File(p.join(module.path, 'guide.tree')).writeAsString('''
+<instance-profile id="guide" name="Guide" start-page="intro.md">
+  <toc-element topic="intro.md"/>
+  <toc-element topic="advanced.topic"/>
+</instance-profile>
+''');
+    await File(p.join(module.path, 'v.list')).writeAsString('''
+<vars><var name="product" value="BusyMark Guide"/></vars>
+''');
+    await File(p.join(module.path, 'topics', 'intro.md')).writeAsString('''
+# %product%
+
+![Logo](logo.png)
 
-  WritersidePdfExportRequest request({
-    required String destinationPath,
-    WritersidePdfConfigurationMode configurationMode =
-        WritersidePdfConfigurationMode.generated,
-    String? projectConfigurationPath,
-    WritersidePdfOptions options = const WritersidePdfOptions(),
-  }) {
-    return WritersidePdfExportRequest(
-      moduleRoot: module.path,
-      sourceRoot: root.path,
-      moduleName: 'Writerside',
-      buildConfigDirectory: 'cfg',
-      instanceId: 'guide',
-      destinationPath: destinationPath,
-      overwrite: false,
-      builderVersion: writersideBuilderDefaultVersion,
-      configurationMode: configurationMode,
-      projectConfigurationPath: projectConfigurationPath,
-      options: options,
+Inline math: \$x^2\$.
+''');
+    await File(p.join(module.path, 'topics', 'advanced.topic')).writeAsString(
+      '''
+<topic id="advanced" title="Advanced">
+  <p>XML topic content.</p>
+  <math>x &lt; y</math>
+</topic>
+''',
     );
+    await File(
+      p.join(module.path, 'images', 'logo.png'),
+    ).writeAsBytes(const [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+    return _WritersideFixture(root: root, module: module);
   }
 
   Future<void> dispose() => root.delete(recursive: true);
 }
 
-class _FixedDockerLocator extends DockerExecutableLocator {
-  const _FixedDockerLocator();
+class _RecordingMarkdownExporter extends MarkdownPdfExportService {
+  _RecordingMarkdownExporter({this.failure});
+
+  final MarkdownPdfExportException? failure;
+  MarkdownPdfExportRequest? request;
 
   @override
-  String locate() => '/bin/true';
+  Future<MarkdownPdfExportResult> export(
+    MarkdownPdfExportRequest request, {
+    MarkdownPdfCancellationToken? cancellationToken,
+  }) async {
+    this.request = request;
+    if (failure case final error?) {
+      throw error;
+    }
+    cancellationToken?.throwIfCancelled();
+    return MarkdownPdfExportResult(
+      destinationPath: request.destinationPath,
+      pageCount: 3,
+      warnings: const [],
+    );
+  }
 }
 
-class _FakeBuilderRunner implements WritersideBuilderCommandRunner {
-  _FakeBuilderRunner({
-    this.imageAvailable = true,
-    this.crashFirstBuild = false,
-  });
-
-  final bool imageAvailable;
-  final bool crashFirstBuild;
-  final List<List<String>> calls = [];
-  List<String>? buildArguments;
-  String? generatedConfiguration;
-  final List<String> mountTargets = [];
-  final List<String> readOnlyMountTargets = [];
-  var buildRunCount = 0;
-  var copiedGitMetadata = false;
-  var copiedStalePdfArtifact = false;
-  var copiedUnsupportedResource = false;
+class _PdfWritingTypstRunner implements TypstCommandRunner {
+  const _PdfWritingTypstRunner();
 
   @override
-  Future<WritersideBuilderProcessResult> run({
+  Future<TypstProcessResult> compile({
     required String executable,
-    required List<String> arguments,
+    required Directory workingDirectory,
     required Duration timeout,
-    required WritersidePdfCancellationToken cancellationToken,
-    String? containerName,
+    required MarkdownPdfCancellationToken cancellationToken,
   }) async {
     cancellationToken.throwIfCancelled();
-    calls.add(List.unmodifiable(arguments));
-    if (arguments.first == 'version') {
-      return const WritersideBuilderProcessResult(
-        exitCode: 0,
-        stdout: '28.5.1',
-        stderr: '',
-      );
-    }
-    if (arguments.first == 'image') {
-      return WritersideBuilderProcessResult(
-        exitCode: imageAvailable ? 0 : 1,
-        stdout: imageAvailable ? 'sha256:test' : '',
-        stderr: imageAvailable ? '' : 'No such image',
-      );
-    }
-    if (arguments.first != 'run') {
-      return const WritersideBuilderProcessResult(
-        exitCode: 0,
-        stdout: '',
-        stderr: '',
-      );
-    }
-    buildRunCount++;
-    buildArguments = List.unmodifiable(arguments);
-    String? outputPath;
-    String? sourceOverlayPath;
-    for (var index = 0; index < arguments.length - 1; index++) {
-      if (arguments[index] != '--mount') {
-        continue;
-      }
-      final mount = _mountValues(arguments[index + 1]);
-      final target = mount['target']!;
-      mountTargets.add(target);
-      if (mount.containsKey('readonly')) {
-        readOnlyMountTargets.add(target);
-      }
-      if (target == '/opt/output') {
-        outputPath = mount['source'];
-      }
-      if (target == '/opt/sources' && !mount.containsKey('readonly')) {
-        sourceOverlayPath = mount['source'];
-      }
-    }
-    if (sourceOverlayPath != null) {
-      copiedGitMetadata = await Directory(
-        p.join(sourceOverlayPath, '.git'),
-      ).exists();
-      copiedStalePdfArtifact = await File(
-        p.join(sourceOverlayPath, 'Writerside', 'pdfSourceGUIDE.pdf'),
-      ).exists();
-      copiedUnsupportedResource = await File(
-        p.join(sourceOverlayPath, 'Writerside', 'images.dat'),
-      ).exists();
-      await File(
-        p.join(sourceOverlayPath, '.idea', 'workspace.xml'),
-      ).writeAsString('<project/>');
-    }
-    if (sourceOverlayPath != null &&
-        arguments.contains('PDF=BusyMark-PDF.xml')) {
-      generatedConfiguration = await File(
-        p.join(sourceOverlayPath, 'Writerside', 'cfg', 'BusyMark-PDF.xml'),
-      ).readAsString();
-    }
-    if (crashFirstBuild && buildRunCount == 1) {
-      return const WritersideBuilderProcessResult(
-        exitCode: 0,
-        stdout: '',
-        stderr: '*** stack smashing detected ***',
-      );
-    }
+    final bytes = <int>[
+      ...'%PDF-1.7\n1 0 obj\n<< /Type /Page >>\nendobj\n'.codeUnits,
+      ...List<int>.filled(1200, 0x20),
+      ...'\n%%EOF\n'.codeUnits,
+    ];
     await File(
-      p.join(outputPath!, 'pdfSourceGUIDE.pdf'),
-    ).writeAsBytes(_validPdf, flush: true);
-    return const WritersideBuilderProcessResult(
-      exitCode: 0,
-      stdout: 'PDF generated',
-      stderr: '',
-    );
-  }
-
-  Map<String, String> _mountValues(String specification) {
-    return {
-      for (final part in specification.split(','))
-        if (part.contains('='))
-          part.substring(0, part.indexOf('=')): part.substring(
-            part.indexOf('=') + 1,
-          )
-        else
-          part: '',
-    };
+      p.join(workingDirectory.path, 'output.pdf'),
+    ).writeAsBytes(bytes, flush: true);
+    return const TypstProcessResult(exitCode: 0, stdout: '', stderr: '');
   }
 }
-
-final _validPdf =
-    '''%PDF-1.7
-1 0 obj
-<< /Type /Page >>
-endobj
-%%EOF
-'''
-        .codeUnits;
diff --git a/test/src/writerside_project_creator_test.dart b/test/src/writerside_project_creator_test.dart
index 09d63a2a..f3c2e3de 100644
--- a/test/src/writerside_project_creator_test.dart
+++ b/test/src/writerside_project_creator_test.dart
@@ -54,6 +54,10 @@ void main() {
         ).existsSync(),
         isTrue,
       );
+      expect(
+        File(result.startTopicPath).readAsStringSync(),
+        '# Getting started\n',
+      );
 
       final module = await moduleService.load(result.rootPath);
 
diff --git a/test/src/writerside_test.dart b/test/src/writerside_test.dart
index 820fc06d..9f49ddcd 100644
--- a/test/src/writerside_test.dart
+++ b/test/src/writerside_test.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:path/path.dart' as p;
 import 'package:busymark/src/core/diagnostic.dart';
 import 'package:busymark/src/core/path_utils.dart';
+import 'package:busymark/src/markdown/preview_model.dart';
 import 'package:busymark/src/workspace/workspace_model.dart';
 import 'package:busymark/src/workspace/workspace_service.dart';
 import 'package:busymark/src/writerside/writerside_module_service.dart';
@@ -171,6 +172,31 @@ void main() {
     expect(instance.topicFileSet, containsAll(['intro.md', 'install.topic']));
   });
 
+  test(
+    'Writerside topic XML exposes semantic math to the shared preview',
+    () async {
+      final workspace = await workspaceService.openPath(
+        'test/fixtures/writerside/basic_project',
+      );
+      final topicPath = p.normalize(
+        p.absolute('test/fixtures/writerside/basic_project/topics/math.topic'),
+      );
+      final source = File(topicPath).readAsStringSync();
+      final preview = workspaceService.buildPreview(
+        workspace.copyWith(activeFilePath: topicPath),
+        source,
+      );
+
+      final math = preview!.blocks
+          .expand((block) => block.inlines)
+          .where((inline) => inline.kind == PreviewInlineKind.math)
+          .single;
+      expect(math.text, r'e^{i\pi}+1=0 \land x < y');
+      expect(math.attributes['mathSourceForm'], 'writersideElement');
+      expect(source, contains(r'<math>e^{i\pi}+1=0 \land x &lt; y</math>'));
+    },
+  );
+
   test(
     'loads basic Writerside project with topics and no missing topic diagnostics',
     () async {
diff --git a/test/src/writerside_toc_editor_test.dart b/test/src/writerside_toc_editor_test.dart
index cf6a05e8..81ee7f67 100644
--- a/test/src/writerside_toc_editor_test.dart
+++ b/test/src/writerside_toc_editor_test.dart
@@ -264,6 +264,54 @@ void main() {
     },
   );
 
+  test(
+    'removes multiple entries atomically against one tree snapshot',
+    () async {
+      final root = await tempModule();
+
+      await editor.removeEntries(targetFor(root), const [
+        WritersideTocRemovalRequest(entryPath: [0, 1]),
+        WritersideTocRemovalRequest(entryPath: [2]),
+      ]);
+
+      final tree = readTree(root);
+      expect(rootIds(tree), ['a', 'b']);
+      expect(childIds(byId(tree, 'a')), ['a1']);
+    },
+  );
+
+  test('batch removal handles a selected descendant and ancestor', () async {
+    final root = await tempModule();
+
+    await editor.removeEntries(targetFor(root), const [
+      WritersideTocRemovalRequest(entryPath: [0]),
+      WritersideTocRemovalRequest(entryPath: [0, 0]),
+    ]);
+
+    final tree = readTree(root);
+    expect(rootIds(tree), ['a1x', 'a2', 'b', 'c']);
+  });
+
+  test('moves multiple subtrees as an ordered group', () async {
+    final root = await tempModule();
+
+    await editor.moveSubtrees(
+      targetFor(root),
+      const WritersideTocBatchMoveRequest(
+        sources: [
+          WritersideTocMoveEntry(sourcePath: [0, 1]),
+          WritersideTocMoveEntry(sourcePath: [2]),
+        ],
+        placement: WritersideTopicCreatePlacement.sibling,
+        referencePath: [1],
+      ),
+    );
+
+    final tree = readTree(root);
+    expect(rootIds(tree), ['a', 'b', 'a2', 'c']);
+    expect(childIds(byId(tree, 'a')), ['a1']);
+  });
+
   test('rejects a tree outside the guarded module root', () async {
     final root = await tempModule();
     final outside = await Directory.systemTemp.createTemp(
diff --git a/test/src/writerside_video_player_host_test.dart b/test/src/writerside_video_player_host_test.dart
new file mode 100644
index 00000000..ad126458
--- /dev/null
+++ b/test/src/writerside_video_player_host_test.dart
@@ -0,0 +1,126 @@
+import 'dart:io';
+
+import 'package:busymark/src/editor/writerside_video_player_host.dart';
+import 'package:busymark/src/writerside/writerside_video.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  test(
+    'platform host sends reduced source and geometry over one channel',
+    () async {
+      const channel = MethodChannel(writersideVideoPlayerChannelName);
+      final calls = <MethodCall>[];
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(channel, (call) async {
+            calls.add(call);
+            return call.method == 'hide' ? null : true;
+          });
+      addTearDown(
+        () => TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+            .setMockMethodCallHandler(channel, null),
+      );
+      const host = PlatformWritersideVideoPlayerHost(channel: channel);
+      const rect = Rect.fromLTWH(12, 24, 640, 360);
+
+      expect(
+        await host.show(
+          const WritersideVideoPlayerRequest(
+            playerId: 'video-1',
+            source: WritersideVideoPlaybackSource(
+              kind: WritersideVideoPlaybackKind.youtube,
+              value: 'BeJu9bMPLGU',
+            ),
+            rect: rect,
+            miniPlayer: false,
+            playLabel: 'Play video',
+            pauseLabel: 'Pause video',
+            borderEffect: 'rounded',
+          ),
+        ),
+        isTrue,
+      );
+      expect(
+        await host.update('video-1', rect.shift(const Offset(1, 2))),
+        isTrue,
+      );
+      await host.hide('video-1');
+
+      expect(calls.map((call) => call.method), ['show', 'update', 'hide']);
+      expect(calls.first.arguments, {
+        'playerId': 'video-1',
+        'kind': 'youtube',
+        'value': 'BeJu9bMPLGU',
+        'x': 12.0,
+        'y': 24.0,
+        'width': 640.0,
+        'height': 360.0,
+        'miniPlayer': false,
+        'playLabel': 'Play video',
+        'pauseLabel': 'Pause video',
+        'borderEffect': 'rounded',
+      });
+    },
+  );
+
+  test('Linux player keeps interactive media in a restricted WebKit host', () {
+    final native = File('linux/runner/video_player_host.cc').readAsStringSync();
+    final application = File(
+      'linux/runner/my_application.cc',
+    ).readAsStringSync();
+    final cmake = File('linux/runner/CMakeLists.txt').readAsStringSync();
+    final renderHost = File(
+      'linux/runner/web_render_host.cc',
+    ).readAsStringSync();
+    final snap = File('snap/snapcraft.yaml').readAsStringSync();
+
+    expect(native, contains('webkit_web_context_new_ephemeral()'));
+    expect(native, contains('WEBKIT_COOKIE_POLICY_ACCEPT_NEVER'));
+    expect(native, contains('webkit_permission_request_deny(request)'));
+    expect(
+      native,
+      contains('webkit_settings_set_enable_media(settings, TRUE)'),
+    );
+    expect(
+      native,
+      contains('set_media_playback_requires_user_gesture(settings, FALSE)'),
+    );
+    expect(native, contains('autoplay=1'));
+    expect(native, contains('resource_load_started_cb'));
+    expect(
+      native,
+      contains('webkit_uri_request_set_uri(request, "about:blank")'),
+    );
+    expect(
+      native,
+      contains(
+        'soup_message_headers_replace(headers, "Referer", '
+        'kHostedPlayerBaseUri)',
+      ),
+    );
+    expect(native, contains('kHostedPlayerOriginParameter'));
+    expect(native, contains('"https://github.com/busystack/busymark/"'));
+    expect(native, isNot(contains('"send-request"')));
+    expect(native, contains('youtube-nocookie.com'));
+    expect(native, contains('jnn-pa.googleapis.com'));
+    expect(native, contains('yt3.ggpht.com'));
+    expect(native, contains('player.vimeo.com'));
+    expect(native, contains("connect-src 'none'"));
+    expect(native, isNot(contains('javascript:')));
+    expect(application, contains('busymark_video_player_host_new'));
+    expect(application, contains('gtk_overlay_new'));
+    expect(native, contains('gtk_overlay_add_overlay'));
+    expect(cmake, contains('video_player_host.cc'));
+
+    // Interactive video is separate from the offline generated-content host.
+    expect(
+      renderHost,
+      contains('webkit_settings_set_enable_media(settings, FALSE)'),
+    );
+    expect(snap, contains('confinement: strict'));
+    expect(snap, contains('gstreamer1.0-plugins-good'));
+    expect(snap, contains('gstreamer1.0-libav'));
+  });
+}
diff --git a/test/src/writerside_video_test.dart b/test/src/writerside_video_test.dart
new file mode 100644
index 00000000..4efd3b52
--- /dev/null
+++ b/test/src/writerside_video_test.dart
@@ -0,0 +1,411 @@
+import 'dart:io';
+
+import 'package:busymark/src/export/markdown_export_document.dart';
+import 'package:busymark/src/export/markdown_export_mapper.dart';
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/markdown/busymark_markdown_serializer.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/preview_model.dart';
+import 'package:busymark/src/writerside/writerside_parsers.dart';
+import 'package:busymark/src/writerside/writerside_module_service.dart';
+import 'package:busymark/src/writerside/writerside_video.dart';
+import 'package:busymark/src/workspace/workspace_service.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  const parser = MarkdownParser();
+
+  test('Writerside Markdown models video and preserves its exact source', () {
+    const source = '''# Video
+
+<video src="sample.mp4" preview-src="poster.png" width="640" height="360" mini-player="true" border-effect="rounded"/>
+
+After.
+''';
+
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final video = parsed.busyDocument.blocks.singleWhere(
+      (block) => block.kind == BusyBlockKind.video,
+    );
+
+    expect(video.attributes, containsPair('src', 'sample.mp4'));
+    expect(video.attributes, containsPair('preview-src', 'poster.png'));
+    expect(video.attributes, containsPair('width', '640'));
+    expect(video.attributes, containsPair('height', '360'));
+    expect(video.attributes, containsPair('mini-player', 'true'));
+    expect(video.attributes, containsPair('border-effect', 'rounded'));
+    expect(video.preserveRaw, isTrue);
+    expect(video.sourceSpan?.startLine, 3);
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+      source,
+    );
+
+    final preview = const MarkdownPreviewBuilder().build(parsed);
+    final previewVideo = preview.blocks.singleWhere(
+      (block) => block.kind == PreviewBlockKind.video,
+    );
+    expect(previewVideo.text, 'sample.mp4');
+    expect(previewVideo.attributes['preview-src'], 'poster.png');
+  });
+
+  test('video remains blocked raw HTML outside Writerside Markdown', () {
+    const source = '<video src="sample.mp4"/>\n';
+    final parsed = parser.parse(
+      filePath: 'README.md',
+      source: source,
+      validateLocalReferences: false,
+    );
+
+    expect(
+      parsed.busyDocument.blocks.where(
+        (block) => block.kind == BusyBlockKind.video,
+      ),
+      isEmpty,
+    );
+    expect(
+      parsed.diagnostics.map((diagnostic) => diagnostic.code),
+      contains('markdown.raw-html.unsafe'),
+    );
+  });
+
+  test('multiline Writerside video attributes remain one semantic block', () {
+    const source = '''# Video
+
+<video src="sample.mp4"
+       preview-src="sample.png"
+       width="640"
+       height="360"/>
+
+After.
+''';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final video = parsed.busyDocument.blocks.singleWhere(
+      (block) => block.kind == BusyBlockKind.video,
+    );
+
+    expect(video.attributes['src'], 'sample.mp4');
+    expect(video.attributes['preview-src'], 'sample.png');
+    expect(video.sourceSpan?.startLine, 3);
+    expect(video.sourceSpan?.endLine, 6);
+    expect(
+      const BusyMarkMarkdownSerializer().serialize(parsed.busyDocument),
+      source,
+    );
+  });
+
+  test('video markup inside an ordinary code fence is not interpreted', () {
+    const source = '''# Example
+
+```xml
+<video src="sample.mp4"/>
+```
+''';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+
+    expect(
+      parsed.busyDocument.blocks.where(
+        (block) => block.kind == BusyBlockKind.video,
+      ),
+      isEmpty,
+    );
+    expect(
+      parsed.busyDocument.blocks
+          .singleWhere((block) => block.kind == BusyBlockKind.codeBlock)
+          .plainText,
+      contains('<video'),
+    );
+  });
+
+  test('Writerside topic parser exposes video attributes', () {
+    const source = '''<topic id="sample" title="Sample">
+  <video src="https://youtu.be/BeJu9bMPLGU" width="720" mini-player="true" border-effect="line"/>
+</topic>''';
+    final topic = const WritersideTopicParser().parseXml(
+      filePath: 'sample.topic',
+      source: source,
+    );
+
+    expect(topic.videos, hasLength(1));
+    expect(topic.videos.single.source, 'https://youtu.be/BeJu9bMPLGU');
+    expect(topic.videos.single.width, '720');
+    expect(topic.videos.single.miniPlayer, isTrue);
+    expect(topic.videos.single.borderEffect, 'line');
+    expect(topic.semanticElementNames, contains('video'));
+  });
+
+  test('Writerside .topic preview creates a first-class video block', () async {
+    final root = Directory.systemTemp.createTempSync('busymark-video-topic-');
+    addTearDown(() => root.deleteSync(recursive: true));
+    final topics = Directory(p.join(root.path, 'topics'))..createSync();
+    File(p.join(root.path, 'writerside.cfg')).writeAsStringSync('''
+<ihp>
+  <module name="Video test"/>
+  <topics dir="topics"/>
+  <images dir="images"/>
+  <instance src="guide.tree"/>
+</ihp>
+''');
+    File(p.join(root.path, 'guide.tree')).writeAsStringSync('''
+<instance-profile id="guide" name="Guide" start-page="video.topic">
+  <toc-element topic="video.topic"/>
+</instance-profile>
+''');
+    const source = '''<topic id="video" title="Video">
+  <video src="https://vimeo.com/76979871" width="640" height="360" border-effect="rounded"/>
+</topic>''';
+    final topicPath = p.join(topics.path, 'video.topic');
+    File(topicPath).writeAsStringSync(source);
+
+    const service = WorkspaceService();
+    final workspace = await service.openPath(root.path);
+    final preview = service.buildPreview(
+      workspace.copyWith(activeFilePath: topicPath),
+      source,
+    );
+    final video = preview!.blocks.singleWhere(
+      (block) => block.kind == PreviewBlockKind.video,
+    );
+
+    expect(video.text, 'https://vimeo.com/76979871');
+    expect(video.attributes['width'], '640');
+    expect(video.attributes['height'], '360');
+    expect(video.attributes['border-effect'], 'rounded');
+  });
+
+  test('safe video resolver accepts documented hosts and local media', () {
+    final root = Directory.systemTemp.createTempSync('busymark-video-');
+    addTearDown(() => root.deleteSync(recursive: true));
+    final topics = Directory(p.join(root.path, 'topics'))..createSync();
+    final images = Directory(p.join(root.path, 'images'))..createSync();
+    final topic = File(p.join(topics.path, 'sample.md'))..writeAsStringSync('');
+    final video = File(p.join(images.path, 'sample.mp4'))
+      ..writeAsBytesSync([0, 0, 0, 0]);
+
+    expect(
+      resolveWritersideVideoUri(
+        source: 'https://youtu.be/BeJu9bMPLGU',
+        activeFilePath: topic.path,
+        workspaceRoot: topics.path,
+        writersideRoot: root.path,
+        imagesDir: 'images',
+      )?.host,
+      'youtu.be',
+    );
+    expect(
+      resolveWritersideVideoUri(
+        source: 'https://vimeo.com/76979871',
+        activeFilePath: topic.path,
+        workspaceRoot: topics.path,
+        writersideRoot: root.path,
+        imagesDir: 'images',
+      )?.host,
+      'vimeo.com',
+    );
+    for (final entry in {
+      'https://www.youtube.com/watch?v=BeJu9bMPLGU': (
+        WritersideVideoPlaybackKind.youtube,
+        'BeJu9bMPLGU',
+      ),
+      'https://www.youtube.com/embed/BeJu9bMPLGU': (
+        WritersideVideoPlaybackKind.youtube,
+        'BeJu9bMPLGU',
+      ),
+      'https://youtube.com/shorts/BeJu9bMPLGU': (
+        WritersideVideoPlaybackKind.youtube,
+        'BeJu9bMPLGU',
+      ),
+      'https://player.vimeo.com/video/76979871': (
+        WritersideVideoPlaybackKind.vimeo,
+        '76979871',
+      ),
+    }.entries) {
+      final playback = resolveWritersideHostedVideoSource(entry.key);
+      expect(playback?.kind, entry.value.$1, reason: entry.key);
+      expect(playback?.value, entry.value.$2, reason: entry.key);
+    }
+    expect(
+      resolveWritersideVideoUri(
+        source: 'sample.mp4',
+        activeFilePath: topic.path,
+        workspaceRoot: topics.path,
+        writersideRoot: root.path,
+        imagesDir: 'images',
+      )?.toFilePath(),
+      video.resolveSymbolicLinksSync(),
+    );
+    for (final unsafe in [
+      'http://youtu.be/BeJu9bMPLGU',
+      'https://example.com/sample.mp4',
+      'https://youtube.com/watch',
+      'https://youtube.com.evil.example/watch?v=BeJu9bMPLGU',
+      'https://user@youtube.com/watch?v=BeJu9bMPLGU',
+      'https://vimeo.com/not-a-video',
+      'javascript:alert(1)',
+      '/tmp/sample.mp4',
+      '../outside.mp4',
+      'sample.txt',
+    ]) {
+      expect(
+        resolveWritersideVideoUri(
+          source: unsafe,
+          activeFilePath: topic.path,
+          workspaceRoot: topics.path,
+          writersideRoot: root.path,
+          imagesDir: 'images',
+        ),
+        isNull,
+        reason: unsafe,
+      );
+    }
+  });
+
+  test(
+    'Writerside module reports invalid and incomplete video sources',
+    () async {
+      final root = Directory.systemTemp.createTempSync('busymark-video-diag-');
+      addTearDown(() => root.deleteSync(recursive: true));
+      final topics = Directory(p.join(root.path, 'topics'))..createSync();
+      final images = Directory(p.join(root.path, 'images'))..createSync();
+      File(p.join(images.path, 'no-poster.mp4')).writeAsBytesSync([0, 0, 0, 0]);
+      File(p.join(root.path, 'writerside.cfg')).writeAsStringSync('''
+<ihp>
+  <topics dir="topics"/>
+  <images dir="images"/>
+  <instance src="guide.tree"/>
+</ihp>
+''');
+      File(p.join(root.path, 'guide.tree')).writeAsStringSync('''
+<instance-profile id="guide" name="Guide" start-page="video.md">
+  <toc-element topic="video.md"/>
+</instance-profile>
+''');
+      File(p.join(topics.path, 'video.md')).writeAsStringSync('''# Video
+
+<video src="missing.mp4"/>
+
+<video src="no-poster.mp4"/>
+
+<video src="https://example.com/video.mp4"/>
+''');
+
+      final module = await const WritersideModuleService().load(root.path);
+      final codes = module.diagnostics.map((diagnostic) => diagnostic.code);
+
+      expect(codes, contains('writerside.video.missing-file'));
+      expect(codes, contains('writerside.video.missing-preview'));
+      expect(codes, contains('writerside.video.unsupported-source'));
+    },
+  );
+
+  test('local poster defaults to matching PNG and can be overridden', () {
+    expect(
+      writersideVideoPreviewSource('clips/demo.mp4', null),
+      'clips/demo.png',
+    );
+    expect(
+      writersideVideoPreviewSource('clips/demo.mp4', 'covers/demo.webp'),
+      'covers/demo.webp',
+    );
+    expect(
+      writersideVideoPreviewSource('https://youtu.be/BeJu9bMPLGU', null),
+      isEmpty,
+    );
+  });
+
+  test('hosted video posters resolve from trusted provider sources', () async {
+    expect(
+      await loadWritersideHostedVideoPoster(
+        const WritersideVideoPlaybackSource(
+          kind: WritersideVideoPlaybackKind.youtube,
+          value: 'BeJu9bMPLGU',
+        ),
+      ),
+      'https://i.ytimg.com/vi/BeJu9bMPLGU/hqdefault.jpg',
+    );
+    expect(
+      await loadWritersideHostedVideoPoster(
+        const WritersideVideoPlaybackSource(
+          kind: WritersideVideoPlaybackKind.youtube,
+          value: '../tracking',
+        ),
+      ),
+      isNull,
+    );
+
+    final client = MockClient((request) async {
+      expect(request.url.host, 'vimeo.com');
+      expect(request.url.path, '/api/oembed.json');
+      expect(request.url.queryParameters['url'], 'https://vimeo.com/76979871');
+      return http.Response(
+        '{"thumbnail_url":"https://i.vimeocdn.com/video/123_1280x720"}',
+        200,
+      );
+    });
+    expect(
+      await loadWritersideHostedVideoPoster(
+        const WritersideVideoPlaybackSource(
+          kind: WritersideVideoPlaybackKind.vimeo,
+          value: '76979871',
+        ),
+        client: client,
+      ),
+      'https://i.vimeocdn.com/video/123_1280x720',
+    );
+  });
+
+  test('Vimeo poster metadata cannot point images to another host', () async {
+    final client = MockClient(
+      (_) async => http.Response(
+        '{"thumbnail_url":"https://example.com/tracker.png"}',
+        200,
+      ),
+    );
+
+    expect(
+      await loadWritersideHostedVideoPoster(
+        const WritersideVideoPlaybackSource(
+          kind: WritersideVideoPlaybackKind.vimeo,
+          value: '76979871',
+        ),
+        client: client,
+      ),
+      isNull,
+    );
+  });
+
+  test('PDF export carries a first-class linked video poster', () {
+    const source = '<video src="demo.mp4" preview-src="demo.png"/>\n';
+    final parsed = parser.parse(
+      filePath: 'topic.md',
+      source: source,
+      mode: MarkdownMode.writersideMarkdown,
+      validateLocalReferences: false,
+    );
+    final exported = const MarkdownExportMapper().map(parsed.busyDocument);
+
+    expect(exported.blocks.single.kind, MarkdownExportBlockKind.video);
+    expect(exported.blocks.single.attributes['source'], 'demo.mp4');
+    expect(exported.blocks.single.attributes['preview'], 'demo.png');
+    expect(exported.imageDestinations, contains('demo.png'));
+  });
+}
diff --git a/test/src/writerside_video_widget_test.dart b/test/src/writerside_video_widget_test.dart
new file mode 100644
index 00000000..d3fe5c70
--- /dev/null
+++ b/test/src/writerside_video_widget_test.dart
@@ -0,0 +1,289 @@
+import 'dart:io';
+
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/app/busymark_glyphs.dart';
+import 'package:busymark/src/editor/writerside_video_player_host.dart';
+import 'package:busymark/src/editor/writerside_video_view.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_editor.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/writerside/writerside_video.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  testWidgets('video card embeds a supported YouTube source in place', (
+    tester,
+  ) async {
+    final host = _FakeVideoPlayerHost();
+    WritersideVideoPlaybackSource? posterRequest;
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: BusyMarkWritersideVideoView(
+            source: 'https://youtu.be/BeJu9bMPLGU',
+            previewSource: null,
+            activeFilePath: '/workspace/topics/video.md',
+            workspaceRoot: '/workspace/topics',
+            writersideRoot: '/workspace',
+            imagesDir: 'images',
+            allowRemoteImages: false,
+            playerHost: host,
+            hostedPosterLoader: (source) async {
+              posterRequest = source;
+              return 'https://i.ytimg.com/vi/${source.value}/hqdefault.jpg';
+            },
+          ),
+        ),
+      ),
+    );
+
+    expect(find.text('YouTube'), findsOneWidget);
+    expect(find.byIcon(BusyMarkGlyphs.play), findsOneWidget);
+    await tester.pump();
+    expect(posterRequest?.kind, WritersideVideoPlaybackKind.youtube);
+    final poster = tester.widget<Image>(find.byType(Image));
+    expect(
+      (poster.image as NetworkImage).url,
+      'https://i.ytimg.com/vi/BeJu9bMPLGU/hqdefault.jpg',
+    );
+    await tester.tap(find.byType(BusyMarkWritersideVideoView));
+    await tester.pump();
+    await tester.pump();
+
+    expect(host.shown, hasLength(1));
+    expect(host.shown.single.source.kind, WritersideVideoPlaybackKind.youtube);
+    expect(host.shown.single.source.value, 'BeJu9bMPLGU');
+    expect(host.shown.single.miniPlayer, isFalse);
+    expect(host.shown.single.rect.size, const Size(700, 393.75));
+    expect(find.text('YouTube'), findsNothing);
+    expect(find.byIcon(BusyMarkGlyphs.play), findsNothing);
+
+    await tester.pumpWidget(const SizedBox.shrink());
+    expect(host.hidden, contains(host.shown.single.playerId));
+  });
+
+  testWidgets('mini-player embeds Vimeo with the reduced video ID', (
+    tester,
+  ) async {
+    final host = _FakeVideoPlayerHost();
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: BusyMarkWritersideVideoView(
+            source: 'https://vimeo.com/76979871',
+            previewSource: null,
+            activeFilePath: '/workspace/topics/video.md',
+            workspaceRoot: '/workspace/topics',
+            writersideRoot: '/workspace',
+            imagesDir: 'images',
+            allowRemoteImages: false,
+            miniPlayer: true,
+            playerHost: host,
+            hostedPosterLoader: (_) async => null,
+          ),
+        ),
+      ),
+    );
+
+    expect(find.text('Vimeo'), findsNothing);
+    expect(find.byIcon(BusyMarkGlyphs.play), findsOneWidget);
+    await tester.tap(find.byType(BusyMarkWritersideVideoView));
+    await tester.pump();
+    await tester.pump();
+
+    expect(host.shown.single.source.kind, WritersideVideoPlaybackKind.vimeo);
+    expect(host.shown.single.source.value, '76979871');
+    expect(host.shown.single.miniPlayer, isTrue);
+    await tester.pumpWidget(const SizedBox.shrink());
+  });
+
+  testWidgets('local video player receives only a canonical media path', (
+    tester,
+  ) async {
+    final root = Directory.systemTemp.createTempSync('busymark-video-widget-');
+    addTearDown(() => root.deleteSync(recursive: true));
+    final topics = Directory(p.join(root.path, 'topics'))..createSync();
+    final images = Directory(p.join(root.path, 'images'))..createSync();
+    final topicPath = p.join(topics.path, 'video.md');
+    File(topicPath).writeAsStringSync('');
+    final video = File(p.join(images.path, 'demo.mp4'))
+      ..writeAsBytesSync([0, 0, 0, 0]);
+    final host = _FakeVideoPlayerHost();
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: BusyMarkWritersideVideoView(
+            source: 'demo.mp4',
+            previewSource: null,
+            activeFilePath: topicPath,
+            workspaceRoot: topics.path,
+            writersideRoot: root.path,
+            imagesDir: 'images',
+            allowRemoteImages: false,
+            playerHost: host,
+            width: 640,
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.byType(BusyMarkWritersideVideoView));
+    await tester.pump();
+    await tester.pump();
+
+    expect(
+      host.shown.single.source.kind,
+      WritersideVideoPlaybackKind.localFile,
+    );
+    expect(host.shown.single.source.value, video.resolveSymbolicLinksSync());
+    expect(host.shown.single.rect.size, const Size(640, 360));
+    await tester.pumpWidget(const SizedBox.shrink());
+  });
+
+  testWidgets('video dimensions preserve ratio and scale to available width', (
+    tester,
+  ) async {
+    Future<Size> render({double? width, double? height}) async {
+      final host = _FakeVideoPlayerHost();
+      await tester.pumpWidget(
+        MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: SizedBox(
+              width: 500,
+              child: BusyMarkWritersideVideoView(
+                key: ValueKey('video-$width-$height'),
+                source: 'https://youtu.be/BeJu9bMPLGU',
+                previewSource: null,
+                activeFilePath: '/workspace/topics/video.md',
+                workspaceRoot: '/workspace/topics',
+                writersideRoot: '/workspace',
+                imagesDir: 'images',
+                allowRemoteImages: false,
+                playerHost: host,
+                width: width,
+                height: height,
+              ),
+            ),
+          ),
+        ),
+      );
+      await tester.tap(find.byIcon(BusyMarkGlyphs.play));
+      await tester.pump();
+      await tester.pump();
+      return host.shown.single.rect.size;
+    }
+
+    expect(await render(width: 320), const Size(320, 180));
+    expect(await render(height: 180), const Size(320, 180));
+    expect(await render(width: 640, height: 400), const Size(500, 312.5));
+  });
+
+  testWidgets('failed native player leaves a usable poster fallback', (
+    tester,
+  ) async {
+    final host = _FakeVideoPlayerHost()..showResult = false;
+    var failures = 0;
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: BusyMarkWritersideVideoView(
+            source: 'https://youtu.be/BeJu9bMPLGU',
+            previewSource: null,
+            activeFilePath: '/workspace/topics/video.md',
+            workspaceRoot: '/workspace/topics',
+            writersideRoot: '/workspace',
+            imagesDir: 'images',
+            allowRemoteImages: false,
+            playerHost: host,
+            onOpenFailed: () => failures += 1,
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.byType(BusyMarkWritersideVideoView));
+    await tester.pump();
+    await tester.pump();
+
+    expect(failures, 1);
+    expect(find.byIcon(BusyMarkGlyphs.play), findsOneWidget);
+  });
+
+  testWidgets('WYSIWYG renders a Writerside video without rewriting source', (
+    tester,
+  ) async {
+    const source = '''# Video
+
+<video src="https://youtu.be/BeJu9bMPLGU" width="640"/>
+''';
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'topic.md',
+          source: source,
+          mode: MarkdownMode.writersideMarkdown,
+          validateLocalReferences: false,
+        )
+        .busyDocument;
+    var emitted = source;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SizedBox(
+            width: 900,
+            height: 600,
+            child: BusyMarkWysiwygEditor(
+              document: document,
+              onSourceChanged: (_, value) => emitted = value,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byType(BusyMarkWritersideVideoView), findsOneWidget);
+    expect(find.text('YouTube'), findsOneWidget);
+    expect(emitted, source);
+  });
+}
+
+class _FakeVideoPlayerHost implements WritersideVideoPlayerHost {
+  final shown = <WritersideVideoPlayerRequest>[];
+  final updates = <Rect>[];
+  final hidden = <String>[];
+  bool showResult = true;
+  bool updateResult = true;
+
+  @override
+  Future<void> hide(String playerId) async {
+    hidden.add(playerId);
+  }
+
+  @override
+  Future<bool> show(WritersideVideoPlayerRequest request) async {
+    shown.add(request);
+    return showResult;
+  }
+
+  @override
+  Future<bool> update(String playerId, Rect rect) async {
+    updates.add(rect);
+    return updateResult;
+  }
+}
diff --git a/test/src/wysiwyg_ai_test.dart b/test/src/wysiwyg_ai_test.dart
index b9a0a08d..fc99f554 100644
--- a/test/src/wysiwyg_ai_test.dart
+++ b/test/src/wysiwyg_ai_test.dart
@@ -62,7 +62,7 @@ void main() {
 
     final nestedFieldFinder = find.widgetWithText(
       TextField,
-      'Use %product% for docs. {style="note"}',
+      'Use %product% for docs.',
     );
     await tester.tap(nestedFieldFinder);
     final nestedField = tester.widget<TextField>(nestedFieldFinder);
diff --git a/test/src/wysiwyg_math_test.dart b/test/src/wysiwyg_math_test.dart
new file mode 100644
index 00000000..94e9de02
--- /dev/null
+++ b/test/src/wysiwyg_math_test.dart
@@ -0,0 +1,1146 @@
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/editor/document_list_marker.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_editor.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_document_controller.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_inline_controller.dart';
+import 'package:busymark/src/markdown/busymark_document.dart';
+import 'package:busymark/src/markdown/busymark_markdown_serializer.dart';
+import 'package:busymark/src/markdown/markdown_model.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:busymark/src/markdown/math_syntax.dart';
+import 'package:busymark/src/visualization/visualization_providers.dart';
+import 'package:busymark/src/visualization/visualization_renderer.dart';
+import 'package:busymark/src/visualization/web_render_host.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  test('inline math insertion preserves structural block kinds', () {
+    const cases = <(String, String, BusyBlockKind, String)>[
+      (
+        '# Energy\n',
+        r'$Energy$',
+        BusyBlockKind.heading,
+        r'# $Energy$'
+            '\n',
+      ),
+      (
+        '- Item\n',
+        r'$Item$',
+        BusyBlockKind.unorderedListItem,
+        r'- $Item$'
+            '\n',
+      ),
+      (
+        '3. Item\n',
+        r'$Item$',
+        BusyBlockKind.orderedListItem,
+        r'3. $Item$'
+            '\n',
+      ),
+      (
+        '- [ ] Task\n',
+        r'$Task$',
+        BusyBlockKind.taskListItem,
+        r'- [ ] $Task$'
+            '\n',
+      ),
+    ];
+
+    for (final (source, edit, kind, expected) in cases) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: source)
+          .busyDocument;
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+
+      controller.updateMathSource(document.blocks.single.id, edit);
+
+      expect(controller.document.blocks.single.kind, kind, reason: source);
+      expect(controller.markdown, expected, reason: source);
+    }
+  });
+
+  test('removing final formula leaves normal editing mode', () {
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'math.md',
+          source:
+              r'# Energy $E$'
+              '\n',
+        )
+        .busyDocument;
+    final controller = BusyMarkWysiwygDocumentController(document: document);
+
+    expect(controller.blockText(document.blocks.single.id), r'Energy $E$');
+    controller.updateMathSource(document.blocks.single.id, 'Energy');
+
+    final block = controller.document.blocks.single;
+    expect(block.kind, BusyBlockKind.heading);
+    expect(busyMarkWysiwygBlockContainsMath(block), isFalse);
+    expect(controller.blockText(block.id), 'Energy');
+    expect(block.attributes, isNot(contains('wysiwygMathSource')));
+  });
+
+  test('math source edits preserve nested list children', () {
+    const sources = [
+      '- Parent \$p\$\n  - Child \$x\$\n',
+      '1. Parent \$p\$\n   1. Child \$x\$\n',
+      '- [ ] Parent \$p\$\n  - [x] Child \$x\$\n',
+    ];
+
+    for (final source in sources) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: source)
+          .busyDocument;
+      final parent = document.blocks.single;
+      final child = parent.children.single;
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+
+      expect(busyMarkWysiwygBlockContainsMath(parent), isTrue, reason: source);
+      controller.updateMathSource(parent.id, r'Changed $q$');
+
+      final edited = controller.blockById(parent.id)!;
+      expect(edited.children, hasLength(1), reason: source);
+      expect(edited.children.single.id, child.id, reason: source);
+      expect(edited.children.single.plainText, child.plainText, reason: source);
+      expect(controller.markdown, contains(r'Child $x$'), reason: source);
+    }
+  });
+
+  test('descendant math does not put a plain list parent in source mode', () {
+    const sources = [
+      '- Parent\n  - Child \$x\$\n',
+      '1. Parent\n   1. Child \$x\$\n',
+      '- [ ] Parent\n  - [x] Child \$x\$\n',
+    ];
+
+    for (final source in sources) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: source)
+          .busyDocument;
+      final parent = document.blocks.single;
+      final child = parent.children.single;
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+
+      expect(busyMarkWysiwygBlockContainsMath(parent), isFalse, reason: source);
+      expect(
+        busyMarkWysiwygBlockDescendantsContainMath(parent),
+        isTrue,
+        reason: source,
+      );
+      expect(controller.blockText(parent.id), 'Parent', reason: source);
+      controller.updateBlockText(parent.id, 'Changed parent');
+
+      final edited = controller.blockById(parent.id)!;
+      expect(edited.children.single.id, child.id, reason: source);
+      expect(edited.children.single.plainText, child.plainText, reason: source);
+      expect(controller.markdown, contains(r'Child $x$'), reason: source);
+    }
+  });
+
+  test('first inline math insertion preserves unaffected inline AST', () {
+    const source =
+        '**Important** [documentation](docs.md) `code` '
+        '***nested*** velocity *after* ![diagram](image.png)\n';
+    final document = const MarkdownParser()
+        .parse(filePath: 'math.md', source: source)
+        .busyDocument;
+    final controller = BusyMarkWysiwygDocumentController(document: document);
+    final block = document.blocks.single;
+    final start = block.plainText.indexOf('velocity');
+
+    controller.insertInlineMath(block.id, start, start + 'velocity'.length);
+
+    final edited = controller.blockById(block.id)!;
+    final inlines = _flattenInlines(edited.inlines).toList();
+    expect(inlines.any((inline) => inline.kind == BusyInlineKind.strong), true);
+    expect(
+      inlines.any(
+        (inline) =>
+            inline.kind == BusyInlineKind.link &&
+            inline.destination == 'docs.md',
+      ),
+      true,
+    );
+    expect(
+      inlines.any(
+        (inline) => inline.kind == BusyInlineKind.code && inline.text == 'code',
+      ),
+      true,
+    );
+    expect(
+      inlines.any(
+        (inline) =>
+            inline.kind == BusyInlineKind.image &&
+            inline.destination == 'image.png',
+      ),
+      true,
+    );
+    expect(
+      inlines.any((inline) => inline.kind == BusyInlineKind.emphasis),
+      true,
+    );
+    expect(
+      _containsNestedKinds(
+            edited.inlines,
+            BusyInlineKind.strong,
+            BusyInlineKind.emphasis,
+          ) ||
+          _containsNestedKinds(
+            edited.inlines,
+            BusyInlineKind.emphasis,
+            BusyInlineKind.strong,
+          ),
+      true,
+    );
+    expect(
+      inlines.singleWhere((inline) => inline.kind == BusyInlineKind.math).text,
+      'velocity',
+    );
+    expect(controller.markdown, contains(r'$velocity$'));
+    expect(controller.markdown, contains('[documentation](docs.md)'));
+    expect(controller.markdown, contains('![diagram](image.png)'));
+  });
+
+  test('math edits retain explicit heading IDs', () {
+    const existingMath = '# Energy \$E=mc^2\$ {id="energy-equation"}\n';
+    final existingDocument = const MarkdownParser()
+        .parse(filePath: 'math.md', source: existingMath)
+        .busyDocument;
+    final existing = BusyMarkWysiwygDocumentController(
+      document: existingDocument,
+    );
+    existing.updateMathSource(
+      existingDocument.blocks.single.id,
+      r'Changed $E=mc^2$',
+    );
+    _expectExplicitHeadingId(existing, 'energy-equation');
+
+    const firstMath = '# Energy formula {id="energy-equation"}\n';
+    final firstDocument = const MarkdownParser()
+        .parse(filePath: 'math.md', source: firstMath)
+        .busyDocument;
+    final first = BusyMarkWysiwygDocumentController(document: firstDocument);
+    final firstBlock = firstDocument.blocks.single;
+    final formulaStart = firstBlock.plainText.indexOf('formula');
+    first.insertInlineMath(
+      firstBlock.id,
+      formulaStart,
+      formulaStart + 'formula'.length,
+    );
+    _expectExplicitHeadingId(first, 'energy-equation');
+
+    final removed = BusyMarkWysiwygDocumentController(
+      document: existingDocument,
+    );
+    removed.updateMathSource(existingDocument.blocks.single.id, 'Energy');
+    _expectExplicitHeadingId(removed, 'energy-equation');
+  });
+
+  test('first math insertion recalculates a generated heading ID', () {
+    final document = const MarkdownParser()
+        .parse(filePath: 'math.md', source: '# Old heading\n')
+        .busyDocument;
+    final controller = BusyMarkWysiwygDocumentController(document: document);
+    final heading = document.blocks.single;
+
+    controller.insertInlineMath(
+      heading.id,
+      heading.plainText.length,
+      heading.plainText.length,
+      fallbackExpression: ' New',
+    );
+
+    final edited = controller.document.blocks.single;
+    expect(edited.attributes['generatedId'], 'true');
+    expect(edited.attributes['id'], 'old-heading-new');
+    expect(controller.markdown, '# Old heading \$New\$\n');
+    _expectFreshInlineMath(controller.markdown, 'New');
+  });
+
+  test('inline math insertion always emits reparsable source', () {
+    final cases =
+        <
+          ({
+            String source,
+            String selected,
+            String expression,
+            BusyMathSourceForm form,
+            String expected,
+          })
+        >[
+          (
+            source: 'before velocity\n',
+            selected: ' velocity',
+            expression: 'velocity',
+            form: BusyMathSourceForm.dollarInline,
+            expected: 'before \$velocity\$\n',
+          ),
+          (
+            source: 'velocity after\n',
+            selected: 'velocity ',
+            expression: 'velocity',
+            form: BusyMathSourceForm.dollarInline,
+            expected: '\$velocity\$ after\n',
+          ),
+          (
+            source: 'x2\n',
+            selected: 'x',
+            expression: 'x',
+            form: BusyMathSourceForm.githubDollarBacktick,
+            expected: '\$`x`\$2\n',
+          ),
+        ];
+
+    for (final item in cases) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: item.source)
+          .busyDocument;
+      final block = document.blocks.single;
+      final start = block.plainText.indexOf(item.selected);
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+
+      final insertion = controller.insertInlineMath(
+        block.id,
+        start,
+        start + item.selected.length,
+      );
+
+      expect(insertion, isNotNull, reason: item.source);
+      expect(controller.markdown, item.expected, reason: item.source);
+      _expectFreshInlineMath(
+        controller.markdown,
+        item.expression,
+        form: item.form,
+      );
+    }
+
+    const backtickExpression = 'a`b';
+    final backtickDocument = BusyDocument(
+      filePath: 'math.md',
+      mode: MarkdownMode.commonMark,
+      blocks: const [
+        BusyBlock(
+          id: 'paragraph',
+          kind: BusyBlockKind.paragraph,
+          inlines: [
+            BusyInline(kind: BusyInlineKind.text, text: backtickExpression),
+          ],
+        ),
+      ],
+    );
+    final backtick = BusyMarkWysiwygDocumentController(
+      document: backtickDocument,
+    );
+    expect(
+      backtick.insertInlineMath('paragraph', 0, backtickExpression.length),
+      isNotNull,
+    );
+    expect(backtick.markdown, '\$`a`b`\$\n');
+    _expectFreshInlineMath(
+      backtick.markdown,
+      backtickExpression,
+      form: BusyMathSourceForm.githubDollarBacktick,
+    );
+  });
+
+  test('additional inline math uses the same reparsable insertion policy', () {
+    final document = const MarkdownParser()
+        .parse(filePath: 'math.md', source: 'before \$x\$ x2\n')
+        .busyDocument;
+    final block = document.blocks.single;
+    final controller = BusyMarkWysiwygDocumentController(document: document);
+    final source = controller.blockText(block.id);
+    final start = source.lastIndexOf('x');
+
+    final insertion = controller.buildInlineMathSourceInsertion(
+      block.id,
+      source,
+      start,
+      start + 1,
+    );
+
+    expect(insertion, isNotNull);
+    expect(insertion!.source, 'before \$x\$ \$`x`\$2');
+    controller.updateMathSource(block.id, insertion.source);
+    final reparsed = const MarkdownParser()
+        .parse(filePath: 'math.md', source: controller.markdown)
+        .busyDocument;
+    final math = _flattenDocumentInlines(
+      reparsed,
+    ).where((inline) => inline.kind == BusyInlineKind.math).toList();
+    expect(math.map((inline) => inline.text), ['x', 'x']);
+  });
+
+  test(
+    'inline math insertion rejects multiline selections without mutation',
+    () {
+      const text = 'first\nsecond';
+      const document = BusyDocument(
+        filePath: 'math.md',
+        mode: MarkdownMode.commonMark,
+        blocks: [
+          BusyBlock(
+            id: 'paragraph',
+            kind: BusyBlockKind.paragraph,
+            inlines: [BusyInline(kind: BusyInlineKind.text, text: text)],
+          ),
+        ],
+      );
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+
+      expect(controller.insertInlineMath('paragraph', 0, text.length), isNull);
+      expect(controller.blockById('paragraph')?.plainText, text);
+      expect(
+        _flattenInlines(
+          controller.document.blocks.single.inlines,
+        ).where((inline) => inline.kind == BusyInlineKind.math),
+        isEmpty,
+      );
+    },
+  );
+
+  test('inline math insertion preserves zero-width semantic inlines', () {
+    const cases = <(String, BusyInlineKind, String)>[
+      ('![](diagram.svg) velocity\n', BusyInlineKind.image, 'diagram.svg'),
+      ('velocity ![](diagram.svg)\n', BusyInlineKind.image, 'diagram.svg'),
+      ('[](docs.md) velocity\n', BusyInlineKind.link, 'docs.md'),
+    ];
+
+    for (final (source, semanticKind, destination) in cases) {
+      for (final collapsed in [false, true]) {
+        final document = const MarkdownParser()
+            .parse(filePath: 'math.md', source: source)
+            .busyDocument;
+        final block = document.blocks.single;
+        final start = block.plainText.indexOf('velocity');
+        final controller = BusyMarkWysiwygDocumentController(
+          document: document,
+        );
+
+        final insertion = controller.insertInlineMath(
+          block.id,
+          start,
+          collapsed ? start : start + 'velocity'.length,
+        );
+
+        expect(insertion, isNotNull, reason: '$source collapsed=$collapsed');
+        _expectSemanticInline(
+          controller.document,
+          semanticKind,
+          destination,
+          reason: '$source collapsed=$collapsed in memory',
+        );
+        final reparsed = const MarkdownParser()
+            .parse(filePath: 'math.md', source: controller.markdown)
+            .busyDocument;
+        _expectSemanticInline(
+          reparsed,
+          semanticKind,
+          destination,
+          reason: '$source collapsed=$collapsed after reparse',
+        );
+        expect(
+          _flattenDocumentInlines(
+            reparsed,
+          ).where((inline) => inline.kind == BusyInlineKind.math),
+          hasLength(1),
+          reason: '$source collapsed=$collapsed',
+        );
+      }
+    }
+  });
+
+  test('table-cell source editing retains and removes semantic math', () {
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'math.md',
+          source:
+              '| Formula |\n| --- |\n'
+              r'| before $x$ after |'
+              '\n',
+        )
+        .busyDocument;
+    final controller = BusyMarkWysiwygDocumentController(document: document);
+    final table = controller.document.blocks.single;
+    final cell = table.children[1].children.single;
+
+    controller.updateTableCellText(table.id, cell.id, r'before $y^2$ after');
+    var edited = controller.blockById(cell.id)!;
+    expect(busyMarkWysiwygBlockContainsMath(edited), isTrue);
+    expect(controller.markdown, contains(r'before $y^2$ after'));
+
+    controller.updateTableCellText(table.id, cell.id, 'plain text');
+    edited = controller.blockById(cell.id)!;
+    expect(busyMarkWysiwygBlockContainsMath(edited), isFalse);
+    expect(controller.markdown, contains('| plain text |'));
+  });
+
+  test('math source edits cannot discard additional Markdown blocks', () {
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'math.md',
+          source:
+              r'Before $x$ after.'
+              '\n',
+        )
+        .busyDocument;
+    final controller = BusyMarkWysiwygDocumentController(document: document);
+
+    controller.updateMathSource(
+      document.blocks.single.id,
+      r'Before $y$ after.'
+      '\n\n'
+      'A second paragraph.',
+    );
+
+    expect(controller.document.blocks, hasLength(2));
+    expect(controller.markdown, contains(r'Before $y$ after.'));
+    expect(controller.markdown, contains('A second paragraph.'));
+    expect(
+      busyMarkWysiwygBlockContainsMath(controller.document.blocks.last),
+      isFalse,
+    );
+  });
+
+  test('math source editing preserves escaped literal dollars', () {
+    const paragraphCases = [
+      r'Literal \$x\$ and formula $y$.',
+      r'**Literal \$x\$** and formula $y$.',
+      r'[Literal \$x\$](docs.md) and formula $y$.',
+    ];
+    for (final source in paragraphCases) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: '$source\n')
+          .busyDocument;
+      final block = document.blocks.single;
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+      final editable = controller.blockText(block.id);
+
+      expect(editable, contains(r'\$x\$'), reason: source);
+      controller.updateMathSource(
+        block.id,
+        editable.replaceFirst('formula', 'updated formula'),
+      );
+
+      _expectOnlyFormulaYAndLiteralX(controller.markdown, reason: source);
+    }
+
+    const tableSource =
+        '| Value |\n| --- |\n'
+        r'| Literal \$x\$ and $y$ |'
+        '\n';
+    final tableDocument = const MarkdownParser()
+        .parse(filePath: 'math.md', source: tableSource)
+        .busyDocument;
+    final tableController = BusyMarkWysiwygDocumentController(
+      document: tableDocument,
+    );
+    final table = tableDocument.blocks.single;
+    final cell = table.children[1].children.single;
+    final editableCell = busyMarkWysiwygEditableText(cell);
+    expect(editableCell, contains(r'\$x\$'));
+    tableController.updateTableCellText(
+      table.id,
+      cell.id,
+      '$editableCell updated',
+    );
+    _expectOnlyFormulaYAndLiteralX(
+      tableController.markdown,
+      reason: tableSource,
+    );
+  });
+
+  test('inline math insertion preserves the intended inline position', () {
+    const cases = [
+      (source: r'\$xx', selection: 2),
+      (source: r'$xx', selection: 1),
+      (source: r'xx$', selection: 1),
+    ];
+    for (final item in cases) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: '${item.source}\n')
+          .busyDocument;
+      final block = document.blocks.single;
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+      final insertion = controller.insertInlineMath(
+        block.id,
+        item.selection,
+        item.selection + 1,
+      );
+
+      expect(insertion, isNotNull, reason: item.source);
+      final inMemory = _inlineSemanticSignature(
+        controller.document.blocks.single.inlines,
+      );
+      final reopened = const MarkdownParser()
+          .parse(filePath: 'math.md', source: controller.markdown)
+          .busyDocument;
+      expect(
+        _inlineSemanticSignature(reopened.blocks.single.inlines),
+        inMemory,
+        reason: item.source,
+      );
+    }
+  });
+
+  test('source-mode math insertion preserves the intended inline position', () {
+    const cases = [
+      (
+        source: r'\$xx',
+        selection: 3,
+        expected: [r'text:$x::', 'math:x::dollarInline'],
+      ),
+      (
+        source: r'$z$ \$xx',
+        selection: 7,
+        expected: [
+          'math:z::dollarInline',
+          r'text: $x::',
+          'math:x::dollarInline',
+        ],
+      ),
+      (source: r'$xx', selection: 1, expected: <String>[]),
+      (
+        source: r'xx$',
+        selection: 1,
+        expected: ['text:x::', 'math:x::dollarInline', r'text:$::'],
+      ),
+    ];
+    for (final item in cases) {
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: '${item.source}\n')
+          .busyDocument;
+      final block = document.blocks.single;
+      final controller = BusyMarkWysiwygDocumentController(document: document);
+      final insertion = controller.buildInlineMathSourceInsertion(
+        block.id,
+        item.source,
+        item.selection,
+        item.selection + 1,
+      );
+
+      if (item.expected.isEmpty) {
+        expect(insertion, isNull, reason: item.source);
+        expect(controller.markdown, '${item.source}\n', reason: item.source);
+        continue;
+      }
+      expect(insertion, isNotNull, reason: item.source);
+      final directlyParsed = const MarkdownParser()
+          .parse(filePath: 'math.md', source: insertion!.source)
+          .busyDocument;
+      expect(
+        _inlineSemanticSignature(directlyParsed.blocks.single.inlines),
+        item.expected,
+        reason: item.source,
+      );
+      controller.updateMathSource(block.id, insertion.source);
+      final reopened = const MarkdownParser()
+          .parse(filePath: 'math.md', source: controller.markdown)
+          .busyDocument;
+      expect(
+        _inlineSemanticSignature(reopened.blocks.single.inlines),
+        _inlineSemanticSignature(directlyParsed.blocks.single.inlines),
+        reason: item.source,
+      );
+    }
+  });
+
+  testWidgets(
+    'WYSIWYG renders math, edits exact source, and reparses without corruption',
+    (tester) async {
+      const original =
+          r'Text before $x^2$ and text after.'
+          '\n';
+      final document = const MarkdownParser()
+          .parse(filePath: 'math.md', source: original)
+          .busyDocument;
+      var markdown = original;
+
+      await tester.pumpWidget(
+        ProviderScope(
+          overrides: [
+            webRenderHostProvider.overrideWithValue(_WysiwygMathHost()),
+          ],
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Scaffold(
+              body: SizedBox(
+                width: 900,
+                height: 600,
+                child: BusyMarkWysiwygEditor(
+                  document: document,
+                  onSourceChanged: (_, source) => markdown = source,
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+      await _pumpMath(tester);
+
+      expect(find.byType(SvgPicture), findsOneWidget);
+      expect(find.byType(TextField), findsNothing);
+
+      await tester.tap(
+        find.byKey(
+          ValueKey('wysiwyg-rendered-math-${document.blocks.single.id}'),
+        ),
+      );
+      await tester.pump();
+      final sourceField = tester.widget<TextField>(find.byType(TextField));
+      expect(sourceField.controller?.text, original.trimRight());
+
+      const edited = r'Changed before $\frac{a}{b}$ and after.';
+      await tester.enterText(find.byType(TextField), edited);
+      await tester.pump();
+      expect(markdown, '$edited\n');
+
+      await _sendUndo(tester);
+      expect(markdown, original);
+      await _sendRedo(tester);
+      expect(markdown, '$edited\n');
+
+      tester.widget<TextField>(find.byType(TextField)).focusNode?.unfocus();
+      await _pumpMath(tester);
+      expect(find.byType(SvgPicture), findsOneWidget);
+      expect(find.textContaining(r'\frac{a}{b}'), findsNothing);
+
+      await tester.tap(
+        find.byKey(
+          ValueKey('wysiwyg-rendered-math-${document.blocks.single.id}'),
+        ),
+      );
+      await tester.pump();
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller?.text,
+        edited,
+      );
+    },
+  );
+
+  testWidgets('WYSIWYG toolbar inserts inline and display math source', (
+    tester,
+  ) async {
+    final document = const MarkdownParser()
+        .parse(filePath: 'math.md', source: 'Velocity\n')
+        .busyDocument;
+    var markdown = document.source;
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          webRenderHostProvider.overrideWithValue(_WysiwygMathHost()),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: SizedBox(
+              width: 1100,
+              height: 600,
+              child: BusyMarkWysiwygEditor(
+                document: document,
+                onSourceChanged: (_, source) => markdown = source,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+    final controller = tester
+        .widget<TextField>(find.byType(TextField))
+        .controller!;
+    controller.selection = const TextSelection(baseOffset: 0, extentOffset: 8);
+
+    await tester.ensureVisible(find.byTooltip('Inline math'));
+    await tester.tap(find.byTooltip('Inline math'));
+    await tester.pump();
+    expect(
+      markdown,
+      r'$Velocity$'
+      '\n',
+    );
+
+    await tester.ensureVisible(find.byTooltip('Display math'));
+    await tester.tap(find.byTooltip('Display math'));
+    await tester.pump();
+    expect(markdown, contains('\$\$\nx\n\$\$'));
+  });
+
+  testWidgets('inline math toolbar preserves existing inline structure', (
+    tester,
+  ) async {
+    const source =
+        '**Important** [documentation](docs.md) `code` '
+        '***nested*** velocity *after* ![diagram](image.png)\n';
+    final document = const MarkdownParser()
+        .parse(filePath: 'math.md', source: source)
+        .busyDocument;
+    var markdown = source;
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          webRenderHostProvider.overrideWithValue(_WysiwygMathHost()),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: SizedBox(
+              width: 1100,
+              height: 600,
+              child: BusyMarkWysiwygEditor(
+                document: document,
+                onSourceChanged: (_, source) => markdown = source,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+    final field = find.byType(TextField);
+    final textController = tester.widget<TextField>(field).controller!;
+    final start = textController.text.indexOf('velocity');
+    textController.selection = TextSelection(
+      baseOffset: start,
+      extentOffset: start + 'velocity'.length,
+    );
+
+    await tester.ensureVisible(find.byTooltip('Inline math'));
+    await tester.tap(find.byTooltip('Inline math'));
+    await tester.pump();
+
+    expect(markdown, contains('**Important**'));
+    expect(markdown, contains('[documentation](docs.md)'));
+    expect(markdown, contains('`code`'));
+    expect(markdown, contains(r'$velocity$'));
+    expect(markdown, contains('*after*'));
+    expect(markdown, contains('![diagram](image.png)'));
+  });
+
+  testWidgets('rendered and focused math list items keep one marker', (
+    tester,
+  ) async {
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'math.md',
+          source:
+              r'- Item $x$'
+              '\n',
+        )
+        .busyDocument;
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          webRenderHostProvider.overrideWithValue(_WysiwygMathHost()),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: BusyMarkWysiwygEditor(
+              document: document,
+              onSourceChanged: (_, _) {},
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpMath(tester);
+    expect(find.byType(BusyMarkDocumentListMarker), findsOneWidget);
+
+    await tester.tap(
+      find.byKey(
+        ValueKey('wysiwyg-rendered-math-${document.blocks.single.id}'),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byType(BusyMarkDocumentListMarker), findsOneWidget);
+    expect(
+      tester.widget<TextField>(find.byType(TextField)).controller?.text,
+      r'Item $x$',
+    );
+  });
+
+  testWidgets('table math renders unfocused and edits delimiter source', (
+    tester,
+  ) async {
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'math.md',
+          source:
+              '| Formula |\n| --- |\n'
+              r'| before $x$ after |'
+              '\n',
+        )
+        .busyDocument;
+    final cell = document.blocks.single.children[1].children.single;
+    var markdown = document.source!;
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          webRenderHostProvider.overrideWithValue(_WysiwygMathHost()),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: BusyMarkWysiwygEditor(
+              document: document,
+              onSourceChanged: (_, source) => markdown = source,
+            ),
+          ),
+        ),
+      ),
+    );
+    await _pumpMath(tester);
+    final rendered = find.byKey(ValueKey('wysiwyg-rendered-math-${cell.id}'));
+    expect(rendered, findsOneWidget);
+
+    await tester.tap(rendered);
+    await tester.pump();
+    final field = find.byKey(ValueKey(cell.id));
+    expect(
+      tester.widget<TextField>(field).controller?.text,
+      r'before $x$ after',
+    );
+
+    await tester.enterText(field, r'before $y^2$ after');
+    await tester.pump();
+    expect(markdown, contains(r'| before $y^2$ after |'));
+  });
+
+  testWidgets('focused plain table cell stays editable after math is typed', (
+    tester,
+  ) async {
+    final document = const MarkdownParser()
+        .parse(
+          filePath: 'math.md',
+          source: '| Formula |\n| --- |\n| before |\n',
+        )
+        .busyDocument;
+    final cell = document.blocks.single.children[1].children.single;
+    var markdown = document.source!;
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          webRenderHostProvider.overrideWithValue(_WysiwygMathHost()),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: BusyMarkWysiwygEditor(
+              document: document,
+              onSourceChanged: (_, source) => markdown = source,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+    final field = find.byKey(ValueKey(cell.id));
+    await tester.tap(field);
+    await tester.enterText(field, r'before $x$');
+    await tester.pump();
+
+    expect(field, findsOneWidget);
+    expect(tester.widget<TextField>(field).focusNode?.hasFocus, isTrue);
+    await tester.enterText(field, r'before $x$ after');
+    await tester.pump();
+    expect(markdown, contains(r'| before $x$ after |'));
+
+    tester.widget<TextField>(field).focusNode?.unfocus();
+    await _pumpMath(tester);
+    expect(
+      find.byKey(ValueKey('wysiwyg-rendered-math-${cell.id}')),
+      findsOneWidget,
+    );
+  });
+}
+
+Iterable<BusyInline> _flattenInlines(List<BusyInline> inlines) sync* {
+  for (final inline in inlines) {
+    yield inline;
+    yield* _flattenInlines(inline.children);
+  }
+}
+
+Iterable<BusyInline> _flattenDocumentInlines(BusyDocument document) sync* {
+  Iterable<BusyInline> walkBlocks(Iterable<BusyBlock> blocks) sync* {
+    for (final block in blocks) {
+      yield* _flattenInlines(block.inlines);
+      yield* walkBlocks(block.children);
+    }
+  }
+
+  yield* walkBlocks(document.blocks);
+}
+
+void _expectFreshInlineMath(
+  String source,
+  String expression, {
+  BusyMathSourceForm? form,
+}) {
+  const parser = MarkdownParser();
+  const serializer = BusyMarkMarkdownSerializer();
+  final first = parser.parse(filePath: 'math.md', source: source).busyDocument;
+  final serialized = serializer.serialize(first);
+  final reopened = parser
+      .parse(filePath: 'math.md', source: serialized)
+      .busyDocument;
+  final math = _flattenDocumentInlines(
+    reopened,
+  ).where((inline) => inline.kind == BusyInlineKind.math).toList();
+  expect(math, hasLength(1), reason: source);
+  expect(math.single.text, expression, reason: source);
+  if (form != null) {
+    expect(
+      math.single.attributes[busyMarkMathSourceFormAttribute],
+      form.name,
+      reason: source,
+    );
+  }
+}
+
+void _expectOnlyFormulaYAndLiteralX(String source, {required String reason}) {
+  final reopened = const MarkdownParser()
+      .parse(filePath: 'math.md', source: source)
+      .busyDocument;
+  final inlines = _flattenDocumentInlines(reopened).toList();
+  final math = inlines
+      .where((inline) => inline.kind == BusyInlineKind.math)
+      .toList();
+  expect(math.map((inline) => inline.text), ['y'], reason: reason);
+  expect(
+    inlines
+        .where((inline) => inline.kind == BusyInlineKind.text)
+        .map((inline) => inline.text)
+        .join(),
+    contains(r'$x$'),
+    reason: reason,
+  );
+}
+
+List<String> _inlineSemanticSignature(List<BusyInline> inlines) {
+  final result = <String>[];
+  for (final inline in inlines) {
+    result.add(
+      '${inline.kind.name}:${inline.text}:${inline.destination ?? ''}:'
+      '${inline.attributes[busyMarkMathSourceFormAttribute] ?? ''}',
+    );
+    result.addAll(_inlineSemanticSignature(inline.children));
+    if (inline.children.isNotEmpty) {
+      result.add('/${inline.kind.name}');
+    }
+  }
+  return result;
+}
+
+void _expectSemanticInline(
+  BusyDocument document,
+  BusyInlineKind kind,
+  String destination, {
+  required String reason,
+}) {
+  final matches = _flattenDocumentInlines(document)
+      .where(
+        (inline) => inline.kind == kind && inline.destination == destination,
+      )
+      .toList();
+  expect(matches, hasLength(1), reason: reason);
+}
+
+bool _containsNestedKinds(
+  List<BusyInline> inlines,
+  BusyInlineKind outer,
+  BusyInlineKind inner,
+) {
+  for (final inline in inlines) {
+    if (inline.kind == outer &&
+        _flattenInlines(inline.children).any((child) => child.kind == inner)) {
+      return true;
+    }
+    if (_containsNestedKinds(inline.children, outer, inner)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void _expectExplicitHeadingId(
+  BusyMarkWysiwygDocumentController controller,
+  String id,
+) {
+  final heading = controller.document.blocks.single;
+  expect(heading.kind, BusyBlockKind.heading);
+  expect(heading.attributes['id'], id);
+  expect(heading.attributes['generatedId'], 'false');
+  expect(controller.markdown, contains('{id="$id"}'));
+}
+
+Future<void> _sendUndo(WidgetTester tester) async {
+  await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+  await tester.sendKeyDownEvent(LogicalKeyboardKey.keyZ);
+  await tester.sendKeyUpEvent(LogicalKeyboardKey.keyZ);
+  await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+  await tester.pump();
+}
+
+Future<void> _sendRedo(WidgetTester tester) async {
+  await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+  await tester.sendKeyDownEvent(LogicalKeyboardKey.shiftLeft);
+  await tester.sendKeyDownEvent(LogicalKeyboardKey.keyZ);
+  await tester.sendKeyUpEvent(LogicalKeyboardKey.keyZ);
+  await tester.sendKeyUpEvent(LogicalKeyboardKey.shiftLeft);
+  await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+  await tester.pump();
+}
+
+Future<void> _pumpMath(WidgetTester tester) async {
+  for (var attempt = 0; attempt < 20; attempt++) {
+    await tester.pump(const Duration(milliseconds: 10));
+    if (find.byType(SvgPicture).evaluate().isNotEmpty) return;
+  }
+}
+
+class _WysiwygMathHost implements WebRenderHost {
+  @override
+  Future<Map<Object?, Object?>> renderMathBatch({
+    required List<Map<String, Object?>> expressions,
+    required VisualizationCancellationToken cancellationToken,
+  }) async {
+    cancellationToken.throwIfCancelled();
+    return {
+      'results': [
+        for (final item in expressions)
+          {
+            'id': item['id'],
+            'svg': '''<svg xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 -10 20 14" style="vertical-align:-0.25ex">
+              <defs><path id="glyph" d="M0 0L10 10"/></defs>
+              <use href="#glyph" fill="currentColor"/>
+            </svg>''',
+            'width': 20,
+            'height': 14,
+            'depth': 2,
+          },
+      ],
+    };
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
diff --git a/test/src/wysiwyg_session_test.dart b/test/src/wysiwyg_session_test.dart
new file mode 100644
index 00000000..0a519a07
--- /dev/null
+++ b/test/src/wysiwyg_session_test.dart
@@ -0,0 +1,120 @@
+import 'package:busymark/l10n/generated/app_localizations.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_editor.dart';
+import 'package:busymark/src/editor/wysiwyg/wysiwyg_session_state.dart';
+import 'package:busymark/src/markdown/markdown_parser.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  const parser = MarkdownParser();
+
+  testWidgets('restores WYSIWYG selection from document session state', (
+    tester,
+  ) async {
+    final document = parser
+        .parse(filePath: 'one.md', source: 'Alpha beta\n')
+        .busyDocument;
+    final blockId = document.blocks.single.id;
+
+    await tester.pumpWidget(
+      _app(
+        BusyMarkWysiwygEditor(
+          document: document,
+          documentId: 'one',
+          initialSessionState: WysiwygEditorSessionState(
+            activeBlockId: blockId,
+            anchorBlockId: blockId,
+            anchorOffset: 1,
+            extentBlockId: blockId,
+            extentOffset: 5,
+          ),
+          onSourceChanged: (_, _) {},
+        ),
+      ),
+    );
+    await tester.pump();
+    await tester.pump();
+
+    final field = tester.widget<TextField>(find.byType(TextField).first);
+    expect(
+      field.controller?.selection,
+      const TextSelection(baseOffset: 1, extentOffset: 5),
+    );
+  });
+
+  testWidgets('reports the old document session before switching tabs', (
+    tester,
+  ) async {
+    final first = parser
+        .parse(filePath: 'one.md', source: 'First document\n')
+        .busyDocument;
+    final second = parser
+        .parse(filePath: 'two.md', source: 'Second document\n')
+        .busyDocument;
+    final sessions = <String, WysiwygEditorSessionState>{};
+
+    Widget editor(String id, dynamic document) => _app(
+      BusyMarkWysiwygEditor(
+        document: document,
+        documentId: id,
+        onSessionChanged: (documentId, state) {
+          sessions[documentId] = state;
+        },
+        onSourceChanged: (_, _) {},
+      ),
+    );
+
+    await tester.pumpWidget(editor('one', first));
+    await tester.pump();
+    final field = tester.widget<TextField>(find.byType(TextField).first);
+    field.controller!.selection = const TextSelection.collapsed(offset: 4);
+    await tester.pump();
+
+    await tester.pumpWidget(editor('two', second));
+    await tester.pump();
+
+    expect(sessions['one']?.activeBlockId, first.blocks.single.id);
+    expect(sessions['one']?.anchorOffset, 4);
+    expect(sessions['one']?.extentOffset, 4);
+  });
+
+  testWidgets('workspace mode delegates WYSIWYG undo to buffer history', (
+    tester,
+  ) async {
+    final document = parser
+        .parse(filePath: 'one.md', source: 'Original\n')
+        .busyDocument;
+    var undoCalls = 0;
+
+    await tester.pumpWidget(
+      _app(
+        BusyMarkWysiwygEditor(
+          document: document,
+          documentId: 'one',
+          useExternalUndoHistory: true,
+          onUndo: () => undoCalls++,
+          onSourceChanged: (_, _) {},
+        ),
+      ),
+    );
+    await tester.pump();
+    await tester.enterText(find.byType(TextField).first, 'Edited');
+    await tester.pump();
+
+    await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
+    await tester.sendKeyEvent(LogicalKeyboardKey.keyZ);
+    await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
+    await tester.pump();
+
+    expect(undoCalls, 1);
+  });
+}
+
+Widget _app(Widget child) {
+  return MaterialApp(
+    localizationsDelegates: AppLocalizations.localizationsDelegates,
+    supportedLocales: AppLocalizations.supportedLocales,
+    home: Scaffold(body: SizedBox(width: 900, height: 640, child: child)),
+  );
+}
diff --git a/test/src/wysiwyg_visualization_diagnostic_test.dart b/test/src/wysiwyg_visualization_diagnostic_test.dart
index 680f2659..98b585df 100644
--- a/test/src/wysiwyg_visualization_diagnostic_test.dart
+++ b/test/src/wysiwyg_visualization_diagnostic_test.dart
@@ -121,6 +121,7 @@ void main() {
                 onTableRowDeleted: (_) {},
                 onTableColumnInserted: (_, {required after}) {},
                 onTableColumnDeleted: (_) {},
+                onTableColumnAlignmentChanged: (_, _) {},
                 onTableDeleted: () {},
                 onImageEditRequested: () {},
                 onHtmlEditRequested: () {},
diff --git a/tools/build_install_snap_local.sh b/tools/build_install_snap_local.sh
index 03d0b08d..e78bf1bc 100755
--- a/tools/build_install_snap_local.sh
+++ b/tools/build_install_snap_local.sh
@@ -9,6 +9,7 @@ Build the Flutter Linux release, replace the payload in an installed snap
 scaffold, pack it, install it locally, and optionally run it.
 
 Options:
+  --no-install         Pack and verify the snap without replacing the installed snap.
   --no-run             Install the snap but do not run it.
   --skip-tests         Skip flutter analyze/test.
   --output FILE        Write the packed snap to FILE.
@@ -25,7 +26,8 @@ Options:
 
 Environment overrides are also supported:
   VERSION, OUT, SNAP_ROOT, SNAP_SCAFFOLD, SNAP_NAME, BINARY_NAME, APP_ID,
-  RUN_AFTER_INSTALL=0, SKIP_TESTS=1, BUNDLE_GIT=0, DART_DEFINE_FROM_FILE
+  INSTALL_AFTER_BUILD=0, RUN_AFTER_INSTALL=0, SKIP_TESTS=1, BUNDLE_GIT=0,
+  DART_DEFINE_FROM_FILE
 EOF
 }
 
@@ -147,11 +149,19 @@ stage_bundled_git_tools() {
     fail "failed to stage $SNAP_ROOT/usr/bin/setsid"
 }
 
+scaffold_has_bundled_git_tools() {
+  local tool
+  for tool in git setsid ssh scp sftp ssh-keyscan; do
+    [[ -x "$SNAP_ROOT/usr/bin/$tool" ]] || return 1
+  done
+}
+
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 cd "$PROJECT_ROOT"
 
 VERSION_ARG=""
+INSTALL_AFTER_BUILD="${INSTALL_AFTER_BUILD:-1}"
 RUN_AFTER_INSTALL="${RUN_AFTER_INSTALL:-1}"
 SKIP_TESTS="${SKIP_TESTS:-0}"
 BUNDLE_GIT="${BUNDLE_GIT:-1}"
@@ -164,6 +174,10 @@ fi
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
+    --no-install)
+      INSTALL_AFTER_BUILD=0
+      RUN_AFTER_INSTALL=0
+      ;;
     --no-run)
       RUN_AFTER_INSTALL=0
       ;;
@@ -330,7 +344,12 @@ if [[ -f "$METAINFO_SOURCE" ]]; then
 fi
 
 if [[ "$BUNDLE_GIT" == "1" ]]; then
-  stage_bundled_git_tools
+  if scaffold_has_bundled_git_tools; then
+    echo "== Stage bundled Git tools =="
+    echo "Retaining core24-compatible Git and OpenSSH tools from the snap scaffold"
+  else
+    stage_bundled_git_tools
+  fi
 else
   echo "== Stage bundled Git tools =="
   echo "Skipping bundled Git tools because BUNDLE_GIT=0"
@@ -491,17 +510,19 @@ def ensure_app_list_items(target: str, app: str, key: str, items: list[str]) ->
 
     key_end = app_end
     existing: set[str] = set()
+    item_indent = "      "
     for i in range(key_start + 1, app_end):
         if re.match(r"^    [A-Za-z0-9_-][^:]*:", lines[i]):
             key_end = i
             break
-        match = re.match(r"^\s*-\s+(.+?)\s*$", lines[i])
+        match = re.match(r"^(\s*)-\s+(.+?)\s*$", lines[i])
         if match:
-            existing.add(match.group(1))
+            item_indent = match.group(1)
+            existing.add(match.group(2))
 
     missing = [item for item in items if item not in existing]
     if missing:
-        lines[key_end:key_end] = [f"      - {item}\n" for item in missing]
+        lines[key_end:key_end] = [f"{item_indent}- {item}\n" for item in missing]
     return "".join(lines)
 
 
@@ -548,7 +569,7 @@ snap pack "$SNAP_ROOT" --filename="$OUT"
 
 echo "== Verify packed snap =="
 unsquashfs -cat "$OUT" meta/snap.yaml | grep '^version:'
-unsquashfs -ll "$OUT" | grep -F "$BINARY_NAME"
+unsquashfs -ll "$OUT" "$BINARY_NAME"
 PACKED_DESKTOP_MANIFEST="$(
   unsquashfs -ll "$OUT" |
     sed -nE 's#^.*squashfs-root/meta/gui/([^/]+\.desktop)$#\1#p' |
@@ -557,8 +578,8 @@ PACKED_DESKTOP_MANIFEST="$(
 [[ "$PACKED_DESKTOP_MANIFEST" == "${SNAP_NAME}.desktop" ]] ||
   fail "expected exactly one packed launcher: ${SNAP_NAME}.desktop"
 if [[ "$BUNDLE_GIT" == "1" ]]; then
-  unsquashfs -ll "$OUT" | grep -F "squashfs-root/usr/bin/git"
-  unsquashfs -ll "$OUT" | grep -F "squashfs-root/usr/bin/setsid"
+  unsquashfs -ll "$OUT" usr/bin/git
+  unsquashfs -ll "$OUT" usr/bin/setsid
 fi
 if [[ -d "$BUNDLE_DIR/lib" ]]; then
   while IFS= read -r plugin; do
@@ -569,18 +590,22 @@ fi
 ! unsquashfs -cat "$OUT" meta/snap.yaml | grep -q '^icon:'
 ! unsquashfs -cat "$OUT" meta/snap.yaml | grep -q '^[[:space:]]*desktop:'
 
-echo "== Install snap =="
-sudo snap remove --purge "$SNAP_NAME" 2>/dev/null || true
-sudo snap install --dangerous "./$OUT"
-
-echo "== Verify installed snap =="
-snap connections "$SNAP_NAME" || true
-snap info "$SNAP_NAME" | sed -n '/installed:/p;/tracking:/p'
-
 echo "Built snap: $OUT"
-if [[ "$RUN_AFTER_INSTALL" == "1" ]]; then
-  echo "== Running ${SNAP_NAME} =="
-  snap run "$SNAP_NAME"
+if [[ "$INSTALL_AFTER_BUILD" == "1" ]]; then
+  echo "== Install snap =="
+  sudo snap remove --purge "$SNAP_NAME" 2>/dev/null || true
+  sudo snap install --dangerous "./$OUT"
+
+  echo "== Verify installed snap =="
+  snap connections "$SNAP_NAME" || true
+  snap info "$SNAP_NAME" | sed -n '/installed:/p;/tracking:/p'
+
+  if [[ "$RUN_AFTER_INSTALL" == "1" ]]; then
+    echo "== Running ${SNAP_NAME} =="
+    snap run "$SNAP_NAME"
+  else
+    echo "Run skipped. Start it with: snap run $SNAP_NAME"
+  fi
 else
-  echo "Run skipped. Start it with: snap run $SNAP_NAME"
+  echo "Install skipped; the currently installed snap was not changed."
 fi
diff --git a/tools/fetch_visualization_web.sh b/tools/fetch_visualization_web.sh
index 7062e3d0..3240c4c4 100755
--- a/tools/fetch_visualization_web.sh
+++ b/tools/fetch_visualization_web.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 MERMAID_VERSION="11.16.1"
-MERMAID_SHA256="ebd9885111092c78cefc79a76f6c1dc34ed5b834b02ae8f338227ce79c003de4"
+MERMAID_SOURCE_SHA256="0ee99b3bb82766e5d6c34b8cc768b8530ce8f1aaa13790ae368aebeef3de9d11"
 PLANTUML_VERSION="1.2026.6"
 PLANTUML_SHA256="798f99592eb03a6446519d2becf78e6f1008d0d25c75d60b37a0f46e39e3c413"
 SCALAR_PARSER_VERSION="0.28.14"
@@ -14,6 +14,10 @@ SCALAR_JSON_MAGIC_VERSION="0.13.0"
 SCALAR_JSON_MAGIC_SHA256="f1adefc461f3594afd4ad16974820a5a88b271f7e8051045c2ac7a34eb974d33"
 YAML_VERSION="2.9.0"
 YAML_SHA256="008fa204cb1ba700e0272ba045abbf09a6ffe63456e8146ba97cac6c2ad1ef91"
+MATHJAX_VERSION="4.1.3"
+MATHJAX_SHA256="4611bed26b338dfc4b5757b8ed2d7ba82a85bcbd05d2729fb3465fba17b8896c"
+MATHJAX_NEWCM_VERSION="4.1.3"
+MATHJAX_NEWCM_SHA256="87d7b869c6a2a6169d9a53acc4eab6c846a9cbe11752738226461bb5070c8b88"
 ESBUILD_VERSION="0.28.2"
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
@@ -22,16 +26,20 @@ SOURCE_DIR="${SCRIPT_DIR}/visualization"
 OUTPUT_DIR="${1:-${PROJECT_DIR}/build/visualization/web}"
 SOURCE_FINGERPRINT="$({
   sha256sum \
+    "${BASH_SOURCE[0]}" \
     "${SOURCE_DIR}/package.json" \
     "${SOURCE_DIR}/package-lock.json" \
     "${SOURCE_DIR}/render_engines.js" \
+    "${SOURCE_DIR}/mathjax_renderer.js" \
+    "${SOURCE_DIR}/mermaid_math_disabled.js" \
+    "${SOURCE_DIR}/build_render_engines.js" \
     "${SOURCE_DIR}/reference.js" \
     "${SOURCE_DIR}/bootstrap.js" \
     "${SOURCE_DIR}/harness.html" \
     "${SOURCE_DIR}/reference.html" \
     "${SOURCE_DIR}/generate_notices.js"
 } | sha256sum | cut -d ' ' -f 1)"
-VERSION_FINGERPRINT="mermaid=${MERMAID_VERSION};plantuml=${PLANTUML_VERSION};scalar-parser=${SCALAR_PARSER_VERSION};scalar-reference=${SCALAR_REFERENCE_VERSION};scalar-json-magic=${SCALAR_JSON_MAGIC_VERSION};yaml=${YAML_VERSION};esbuild=${ESBUILD_VERSION};sources=${SOURCE_FINGERPRINT}"
+VERSION_FINGERPRINT="mermaid=${MERMAID_VERSION};plantuml=${PLANTUML_VERSION};scalar-parser=${SCALAR_PARSER_VERSION};scalar-reference=${SCALAR_REFERENCE_VERSION};scalar-json-magic=${SCALAR_JSON_MAGIC_VERSION};yaml=${YAML_VERSION};mathjax=${MATHJAX_VERSION};mathjax-newcm=${MATHJAX_NEWCM_VERSION};esbuild=${ESBUILD_VERSION};sources=${SOURCE_FINGERPRINT}"
 
 if [[ -f "${OUTPUT_DIR}/VERSION" ]] &&
    [[ "$(<"${OUTPUT_DIR}/VERSION")" == "${VERSION_FINGERPRINT}" ]] &&
@@ -61,6 +69,8 @@ TOOL_DIR="${TEMP_DIR}/tool"
 mkdir -p -- "${TOOL_DIR}"
 cp -- "${SOURCE_DIR}/package.json" "${SOURCE_DIR}/package-lock.json" "${TOOL_DIR}/"
 cp -- "${SOURCE_DIR}/render_engines.js" "${TOOL_DIR}/"
+cp -- "${SOURCE_DIR}/mathjax_renderer.js" "${TOOL_DIR}/"
+cp -- "${SOURCE_DIR}/build_render_engines.js" "${TOOL_DIR}/"
 npm ci \
   --prefix "${TOOL_DIR}" \
   --ignore-scripts \
@@ -83,9 +93,9 @@ verify_package() {
 }
 
 verify_package \
-  mermaid \
-  "https://registry.npmjs.org/mermaid/-/mermaid-${MERMAID_VERSION}.tgz" \
-  "${MERMAID_SHA256}"
+  mermaid-source \
+  "https://github.com/mermaid-js/mermaid/archive/refs/tags/mermaid@${MERMAID_VERSION}.tar.gz" \
+  "${MERMAID_SOURCE_SHA256}"
 verify_package \
   plantuml \
   "https://registry.npmjs.org/@plantuml/core/-/core-${PLANTUML_VERSION}.tgz" \
@@ -106,16 +116,25 @@ verify_package \
   yaml \
   "https://registry.npmjs.org/yaml/-/yaml-${YAML_VERSION}.tgz" \
   "${YAML_SHA256}"
+verify_package \
+  mathjax \
+  "https://registry.npmjs.org/@mathjax/src/-/src-${MATHJAX_VERSION}.tgz" \
+  "${MATHJAX_SHA256}"
+verify_package \
+  mathjax-newcm \
+  "https://registry.npmjs.org/@mathjax/mathjax-newcm-font/-/mathjax-newcm-font-${MATHJAX_NEWCM_VERSION}.tgz" \
+  "${MATHJAX_NEWCM_SHA256}"
 
 BUILD_DIR="${TEMP_DIR}/output"
 mkdir -p -- "${BUILD_DIR}"
-node "${TOOL_DIR}/node_modules/esbuild/bin/esbuild" \
+cp -R -- \
+  "${TEMP_DIR}/mermaid-source/mermaid-mermaid-${MERMAID_VERSION}/packages/mermaid" \
+  "${TOOL_DIR}/mermaid-source"
+node "${TOOL_DIR}/build_render_engines.js" \
   "${TOOL_DIR}/render_engines.js" \
-  --bundle \
-  --format=esm \
-  --platform=browser \
-  --target=safari16 \
-  --outfile="${BUILD_DIR}/render-engines.js"
+  "${BUILD_DIR}/render-engines.js" \
+  "${TOOL_DIR}/mermaid-source" \
+  "${SOURCE_DIR}/mermaid_math_disabled.js"
 
 install -m 0644 "${SOURCE_DIR}/harness.html" "${BUILD_DIR}/harness.html"
 install -m 0644 "${SOURCE_DIR}/reference.html" "${BUILD_DIR}/reference.html"
@@ -132,7 +151,11 @@ printf '%s\n' "${VERSION_FINGERPRINT}" > "${BUILD_DIR}/VERSION"
 LICENSE_DIR="${BUILD_DIR}/licenses"
 node "${SOURCE_DIR}/generate_notices.js" \
   "${TOOL_DIR}/node_modules" \
-  "${LICENSE_DIR}/npm"
+  "${LICENSE_DIR}/npm" \
+  "${TEMP_DIR}/mermaid-source/mermaid-mermaid-${MERMAID_VERSION}/packages/mermaid"
+install -D -m 0644 \
+  "${TEMP_DIR}/mermaid-source/mermaid-mermaid-${MERMAID_VERSION}/LICENSE" \
+  "${LICENSE_DIR}/mermaid/LICENSE"
 # @scalar/api-reference and @scalar/openapi-parser are released from the same
 # Scalar repository. The reference package omits LICENSE from its npm files;
 # preserve the repository's distributed MIT text from the parser package.
@@ -144,5 +167,8 @@ install -D -m 0644 \
   "${LICENSE_DIR}/package-lock.json"
 
 mkdir -p -- "${OUTPUT_DIR}"
+if [[ -d "${OUTPUT_DIR}/licenses" ]]; then
+  mv -- "${OUTPUT_DIR}/licenses" "${TEMP_DIR}/previous-licenses"
+fi
 cp -R -- "${BUILD_DIR}/." "${OUTPUT_DIR}/"
 echo "Prepared offline visualization web assets in ${OUTPUT_DIR}"
diff --git a/tools/visualization/build_render_engines.js b/tools/visualization/build_render_engines.js
new file mode 100644
index 00000000..94e4196f
--- /dev/null
+++ b/tools/visualization/build_render_engines.js
@@ -0,0 +1,144 @@
+import assert from 'node:assert'
+import { readFile } from 'node:fs/promises'
+import path from 'node:path'
+
+import Ajv2019 from 'ajv/dist/2019.js'
+import { build } from 'esbuild'
+import jison from 'jison'
+import { JSON_SCHEMA, load } from 'js-yaml'
+
+const [entryPoint, outfile, mermaidSource, disabledMathModule] = process.argv.slice(2)
+if (!entryPoint || !outfile || !mermaidSource || !disabledMathModule) {
+  throw new Error(
+    'Usage: build_render_engines.js ENTRY OUTFILE MERMAID_SOURCE DISABLED_MATH_MODULE',
+  )
+}
+
+const diagramConfigKeys = [
+  'flowchart',
+  'swimlane',
+  'sequence',
+  'gantt',
+  'journey',
+  'class',
+  'state',
+  'er',
+  'pie',
+  'quadrantChart',
+  'xyChart',
+  'requirement',
+  'mindmap',
+  'ishikawa',
+  'kanban',
+  'timeline',
+  'gitGraph',
+  'c4',
+  'sankey',
+  'block',
+  'packet',
+  'treeView',
+  'architecture',
+  'eventmodeling',
+  'radar',
+  'venn',
+  'cynefin',
+]
+
+function generateDefaults(schema) {
+  const ajv = new Ajv2019({
+    useDefaults: true,
+    allowUnionTypes: true,
+    strict: true,
+  })
+  ajv.addKeyword({ keyword: 'meta:enum', errors: false })
+  ajv.addKeyword({ keyword: 'tsType', errors: false })
+
+  assert.ok(schema.$defs)
+  const baseDiagramConfig = schema.$defs.BaseDiagramConfig
+  const defaults = {}
+  for (const key of diagramConfigKeys) {
+    const reference = schema.properties[key].$ref
+    const [root, definitions, definitionName] = reference.split('/')
+    assert.strictEqual(root, '#')
+    assert.strictEqual(definitions, '$defs')
+    const subSchema = {
+      $schema: schema.$schema,
+      $defs: schema.$defs,
+      ...schema.$defs[definitionName],
+    }
+    const validate = ajv.compile(subSchema)
+    defaults[key] = {}
+    for (const required of subSchema.required ?? []) {
+      if (
+        subSchema.properties[required] === undefined &&
+        baseDiagramConfig.properties[required]
+      ) {
+        defaults[key][required] = baseDiagramConfig.properties[required].default
+      }
+    }
+    if (!validate(defaults[key])) {
+      throw new Error(`Invalid Mermaid defaults for ${key}: ${JSON.stringify(validate.errors)}`)
+    }
+  }
+
+  const validate = ajv.compile(schema)
+  if (!validate(defaults)) {
+    throw new Error(`Invalid Mermaid defaults: ${JSON.stringify(validate.errors)}`)
+  }
+  return defaults
+}
+
+const jisonPlugin = {
+  name: 'jison',
+  setup(buildContext) {
+    buildContext.onLoad({ filter: /\.jison$/ }, async ({ path: filename }) => {
+      const source = await readFile(filename, 'utf8')
+      const parser = new jison.Generator(source, {
+        moduleType: 'js',
+        'token-stack': true,
+      })
+      const generated = parser.generate({ moduleMain: '() => {}' })
+      return {
+        contents: `${generated}\nparser.parser = parser;\nexport { parser };\nexport default parser;`,
+        loader: 'js',
+      }
+    })
+  },
+}
+
+const schemaPlugin = {
+  name: 'mermaid-config-schema',
+  setup(buildContext) {
+    buildContext.onLoad({ filter: /config\.schema\.yaml$/ }, async (args) => {
+      const source = await readFile(args.path, 'utf8')
+      const schema = load(source, { filename: args.path, schema: JSON_SCHEMA })
+      const value = args.suffix.includes('only-defaults') ? generateDefaults(schema) : schema
+      return { contents: `export default ${JSON.stringify(value)};`, loader: 'js' }
+    })
+  },
+}
+
+const mermaidManifest = JSON.parse(
+  await readFile(path.join(mermaidSource, 'package.json'), 'utf8'),
+)
+
+await build({
+  entryPoints: [entryPoint],
+  outfile,
+  bundle: true,
+  format: 'esm',
+  platform: 'browser',
+  target: 'safari16',
+  minify: true,
+  resolveExtensions: ['.ts', '.js', '.json', '.jison', '.yaml'],
+  alias: {
+    mermaid: path.join(mermaidSource, 'src', 'mermaid.ts'),
+    katex: disabledMathModule,
+  },
+  define: {
+    'injected.includeLargeFeatures': 'true',
+    'injected.version': JSON.stringify(String(mermaidManifest.version)),
+    'import.meta.vitest': 'undefined',
+  },
+  plugins: [jisonPlugin, schemaPlugin],
+})
diff --git a/tools/visualization/generate_notices.js b/tools/visualization/generate_notices.js
index ce2b76b4..e6566660 100644
--- a/tools/visualization/generate_notices.js
+++ b/tools/visualization/generate_notices.js
@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-const [nodeModulesRoot, outputRoot] = process.argv.slice(2)
+const [nodeModulesRoot, outputRoot, ...additionalPackageRoots] = process.argv.slice(2)
 if (!nodeModulesRoot || !outputRoot) {
   throw new Error('Usage: generate_notices.js NODE_MODULES OUTPUT')
 }
@@ -16,37 +16,44 @@ function visit(directory) {
       visit(child)
       continue
     }
-    const manifestPath = path.join(child, 'package.json')
-    if (!fs.existsSync(manifestPath)) continue
-    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'))
-    const name = String(manifest.name ?? entry.name)
-    const version = String(manifest.version ?? '')
-    const license = typeof manifest.license === 'string' ? manifest.license : 'SEE PACKAGE'
-    const homepage = typeof manifest.homepage === 'string'
-      ? manifest.homepage
-      : typeof manifest.repository?.url === 'string'
-        ? manifest.repository.url
-        : ''
-    const destination = path.join(outputRoot, name.replaceAll('/', '__'))
-    fs.mkdirSync(destination, { recursive: true })
-    const licenseFiles = fs.readdirSync(child).filter((filename) =>
-      /^(?:licen[cs]e|copying|notice)(?:\..*)?$/i.test(filename),
-    )
-    for (const filename of licenseFiles) {
-      fs.copyFileSync(path.join(child, filename), path.join(destination, filename))
-    }
-    fs.writeFileSync(
-      path.join(destination, 'PACKAGE'),
-      `${name}\n${version}\n${license}\n${homepage}\n`,
-    )
-    packages.push({ name, version, license, homepage })
-    const nested = path.join(child, 'node_modules')
-    if (fs.existsSync(nested)) visit(nested)
+    collectPackage(child, entry.name)
   }
 }
 
+function collectPackage(child, fallbackName) {
+  const manifestPath = path.join(child, 'package.json')
+  if (!fs.existsSync(manifestPath)) return
+  const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'))
+  const name = String(manifest.name ?? fallbackName)
+  const version = String(manifest.version ?? '')
+  const license = typeof manifest.license === 'string' ? manifest.license : 'SEE PACKAGE'
+  const homepage = typeof manifest.homepage === 'string'
+    ? manifest.homepage
+    : typeof manifest.repository?.url === 'string'
+      ? manifest.repository.url
+      : ''
+  const destination = path.join(outputRoot, name.replaceAll('/', '__'))
+  fs.mkdirSync(destination, { recursive: true })
+  const licenseFiles = fs.readdirSync(child).filter((filename) =>
+    /^(?:licen[cs]e|copying|notice)(?:\..*)?$/i.test(filename),
+  )
+  for (const filename of licenseFiles) {
+    fs.copyFileSync(path.join(child, filename), path.join(destination, filename))
+  }
+  fs.writeFileSync(
+    path.join(destination, 'PACKAGE'),
+    `${name}\n${version}\n${license}\n${homepage}\n`,
+  )
+  packages.push({ name, version, license, homepage })
+  const nested = path.join(child, 'node_modules')
+  if (fs.existsSync(nested)) visit(nested)
+}
+
 fs.mkdirSync(outputRoot, { recursive: true })
 visit(nodeModulesRoot)
+for (const packageRoot of additionalPackageRoots) {
+  collectPackage(packageRoot, path.basename(packageRoot))
+}
 packages.sort((left, right) => left.name.localeCompare(right.name) || left.version.localeCompare(right.version))
 fs.writeFileSync(
   path.join(outputRoot, 'THIRD_PARTY_NOTICES.md'),
diff --git a/tools/visualization/mathjax_renderer.js b/tools/visualization/mathjax_renderer.js
new file mode 100644
index 00000000..40935081
--- /dev/null
+++ b/tools/visualization/mathjax_renderer.js
@@ -0,0 +1,297 @@
+import { mathjax } from '@mathjax/src/js/mathjax.js'
+import { browserAdaptor } from '@mathjax/src/js/adaptors/browserAdaptor.js'
+import { RegisterHTMLHandler } from '@mathjax/src/js/handlers/html.js'
+import { TeX } from '@mathjax/src/js/input/tex.js'
+import { MapHandler } from '@mathjax/src/js/input/tex/MapHandler.js'
+import { NewcommandTables } from '@mathjax/src/js/input/tex/newcommand/NewcommandUtil.js'
+import { SVG } from '@mathjax/src/js/output/svg.js'
+import { SafeHandler } from '@mathjax/src/js/ui/safe/SafeHandler.js'
+import { MathJaxNewcmFont } from '@mathjax/mathjax-newcm-font/js/svg.js'
+
+import '@mathjax/src/js/input/tex/ams/AmsConfiguration.js'
+import '@mathjax/src/js/input/tex/newcommand/NewcommandConfiguration.js'
+import '@mathjax/src/js/input/tex/mathtools/MathtoolsConfiguration.js'
+import '@mathjax/src/js/input/tex/mhchem/MhchemConfiguration.js'
+import '@mathjax/src/js/input/tex/boldsymbol/BoldsymbolConfiguration.js'
+import '@mathjax/src/js/input/tex/braket/BraketConfiguration.js'
+import '@mathjax/src/js/input/tex/cancel/CancelConfiguration.js'
+import '@mathjax/src/js/input/tex/cases/CasesConfiguration.js'
+import '@mathjax/src/js/input/tex/empheq/EmpheqConfiguration.js'
+import '@mathjax/src/js/input/tex/gensymb/GensymbConfiguration.js'
+import '@mathjax/src/js/input/tex/units/UnitsConfiguration.js'
+import '@mathjax/src/js/input/tex/upgreek/UpgreekConfiguration.js'
+
+// NewCM's dynamic SVG tables are all statically included in BusyMark's one
+// deterministic bundle. MathJax still uses its asynchronous retry path, but
+// the loader below only activates already-bundled table registrations.
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/PUA.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/accents-b-i.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/accents.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/arabic.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/arrows.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/braille-d.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/braille.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/calligraphic.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/cherokee.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/cyrillic-ss.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/cyrillic.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/devanagari.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/double-struck.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/fraktur.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/greek-ss.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/greek.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/hebrew.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/latin-b.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/latin-bi.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/latin-i.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/latin.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/marrows.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/math.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/monospace-ex.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/monospace-l.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/monospace.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/mshapes.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/phonetics-ss.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/phonetics.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/sans-serif-b.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/sans-serif-bi.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/sans-serif-ex.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/sans-serif-i.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/sans-serif-r.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/sans-serif.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/script.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/shapes.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/symbols-b-i.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/symbols.js'
+import '@mathjax/mathjax-newcm-font/js/svg/dynamic/variants.js'
+
+export const mathJaxVersion = '4.1.3'
+export const mathJaxFontVersion = '4.1.3'
+export const mathPackageProfileVersion = 'busymark-math-v1'
+
+export const mathPackages = Object.freeze([
+  'base',
+  'ams',
+  'newcommand',
+  'mathtools',
+  'mhchem',
+  'boldsymbol',
+  'braket',
+  'cancel',
+  'cases',
+  'empheq',
+  'gensymb',
+  'units',
+  'upgreek',
+])
+
+const maximumExpressionCharacters = 16 * 1024
+const maximumBatchExpressions = 128
+const maximumBatchCharacters = 256 * 1024
+const maximumSvgBytes = 2 * 1024 * 1024
+
+const adaptor = browserAdaptor()
+const handler = RegisterHTMLHandler(adaptor)
+SafeHandler(handler)
+
+// Every dynamic font module above has already registered its setup callback.
+// No URL or filesystem resolution is permitted from TeX input.
+mathjax.asyncLoad = () => Promise.resolve()
+
+const tex = new TeX({
+  packages: mathPackages,
+  maxBuffer: 20 * 1024,
+  maxMacros: 500,
+  maxTemplateSubtitutions: 2000,
+  formatError: (_jax, error) => { throw error },
+})
+
+const svg = new SVG({
+  fontData: MathJaxNewcmFont,
+  fontCache: 'local',
+  localID: 'busymark-math',
+  useXlink: false,
+  displayOverflow: 'overflow',
+  linebreaks: {
+    inline: false,
+    width: '100%',
+    lineleading: 0.2,
+  },
+})
+
+const mathDocument = mathjax.document('', {
+  InputJax: tex,
+  OutputJax: svg,
+  safeOptions: {
+    allow: {
+      URLs: 'none',
+      classes: 'none',
+      cssIDs: 'none',
+      styles: 'none',
+    },
+    safeProtocols: {
+      http: false,
+      https: false,
+      file: false,
+      javascript: false,
+      data: false,
+    },
+  },
+})
+
+const mathReady = svg.font.loadDynamicFiles()
+
+function clearExpressionDefinitions() {
+  // The newcommand package intentionally stores definitions in three mutable
+  // maps.  BusyMark supports declarations within an expression, but formulas
+  // are independent document atoms: one expression must never provide macros
+  // or environments to a later expression.  These maps are part of the exact,
+  // pinned MathJax source API bundled above.
+  for (const name of [
+    NewcommandTables.NEW_DELIMITER,
+    NewcommandTables.NEW_COMMAND,
+    NewcommandTables.NEW_ENVIRONMENT,
+  ]) {
+    const map = MapHandler.getMap(name)
+    map?.map?.clear()
+  }
+}
+
+function finiteMetric(value, fallback, minimum, maximum) {
+  const number = Number(value)
+  return Number.isFinite(number)
+    ? Math.min(maximum, Math.max(minimum, number))
+    : fallback
+}
+
+function parseExLength(value, ex) {
+  const match = String(value ?? '').trim().match(/^(-?(?:\d+(?:\.\d*)?|\.\d+))(ex|em|px)?$/)
+  if (!match) return 0
+  const number = Number.parseFloat(match[1])
+  if (!Number.isFinite(number)) return 0
+  if (match[2] === 'em') return number * ex * 2
+  if (match[2] === 'px' || !match[2]) return number
+  return number * ex
+}
+
+function mathError(error) {
+  const detail = String(error?.message ?? error ?? 'Math rendering failed.').slice(0, 1000)
+  const lowered = detail.toLowerCase()
+  const resourceLimit = lowered.includes('maximum')
+    || lowered.includes('maxbuffer')
+    || lowered.includes('substitution')
+    || lowered.includes('recursion')
+    || lowered.includes('stack')
+  return {
+    code: resourceLimit ? 'math.resourceLimit' : 'math.invalidTex',
+    message: resourceLimit
+      ? 'The expression exceeded BusyMark’s math processing limits.'
+      : 'The expression contains unsupported or invalid TeX.',
+    detail,
+  }
+}
+
+async function renderExpression(item) {
+  const id = String(item?.id ?? '')
+  const expression = String(item?.expression ?? '')
+  if (!id || id.length > 128 || !/^[A-Za-z0-9_.:-]+$/.test(id)) {
+    return { id, error: { code: 'math.invalidRequest', message: 'The expression identifier is invalid.' } }
+  }
+  if (!expression || expression.length > maximumExpressionCharacters) {
+    return {
+      id,
+      error: {
+        code: expression ? 'math.resourceLimit' : 'math.invalidTex',
+        message: expression
+          ? 'The expression exceeds BusyMark’s size limit.'
+          : 'The expression is empty.',
+      },
+    }
+  }
+
+  const em = finiteMetric(item.em, 16, 4, 256)
+  const ex = finiteMetric(item.ex, em / 2, 2, 128)
+  const containerWidth = finiteMetric(item.containerWidth, 800, 32, 10000)
+  const localID = String(item.svgIdPrefix ?? `busymark-math-${id}`)
+    .replace(/[^A-Za-z0-9_.:-]/g, '-')
+    .slice(0, 128)
+  svg.options.localID = localID
+  try {
+    // convertPromise is the direct-document equivalent of tex2svgPromise and
+    // handles MathJax's asynchronous NewCM retry protocol.
+    const container = await mathDocument.convertPromise(expression, {
+      display: item.display === true,
+      em,
+      ex,
+      containerWidth,
+    })
+    const roots = adaptor.tags(container, 'svg')
+    const root = roots[0]
+    if (!root) throw new Error('MathJax did not return SVG output.')
+    const width = parseExLength(adaptor.getAttribute(root, 'width'), ex)
+    const height = parseExLength(adaptor.getAttribute(root, 'height'), ex)
+    const verticalAlign = adaptor.getStyle(root, 'vertical-align')
+    const depth = Math.max(0, -parseExLength(verticalAlign, ex))
+    adaptor.setStyle(root, 'vertical-align', '')
+    if (!adaptor.allStyles(root).trim()) adaptor.removeAttribute(root, 'style')
+    const standaloneSvg = adaptor.outerHTML(root)
+    if (new TextEncoder().encode(standaloneSvg).length > maximumSvgBytes) {
+      return {
+        id,
+        error: { code: 'math.resourceLimit', message: 'The rendered expression exceeds BusyMark’s output limit.' },
+      }
+    }
+    return {
+      id,
+      svg: standaloneSvg,
+      width,
+      height,
+      depth,
+      baseline: Math.max(0, height - depth),
+    }
+  } catch (error) {
+    return { id, error: mathError(error) }
+  } finally {
+    // TeX.reset clears accumulated equation counters, labels, IDs, and parse
+    // state.  Each Markdown math node is an independent render unit.
+    tex.reset(0)
+    clearExpressionDefinitions()
+  }
+}
+
+export async function renderMathBatch(request) {
+  const expressions = Array.isArray(request?.expressions) ? request.expressions : []
+  if (expressions.length === 0 || expressions.length > maximumBatchExpressions) {
+    return {
+      code: 'math.resourceLimit',
+      message: 'The math batch is empty or exceeds BusyMark’s expression limit.',
+      results: [],
+    }
+  }
+  const aggregate = expressions.reduce(
+    (total, item) => total + String(item?.expression ?? '').length,
+    0,
+  )
+  if (aggregate > maximumBatchCharacters) {
+    return {
+      code: 'math.resourceLimit',
+      message: 'The math batch exceeds BusyMark’s aggregate input limit.',
+      results: expressions.map((item) => ({
+        id: String(item?.id ?? ''),
+        error: { code: 'math.resourceLimit', message: 'The math batch is too large.' },
+      })),
+    }
+  }
+
+  await mathReady
+  const results = []
+  for (const expression of expressions) {
+    results.push(await renderExpression(expression))
+  }
+  return {
+    mathJaxVersion,
+    fontVersion: mathJaxFontVersion,
+    packageProfileVersion: mathPackageProfileVersion,
+    results,
+  }
+}
diff --git a/tools/visualization/mermaid_math_disabled.js b/tools/visualization/mermaid_math_disabled.js
new file mode 100644
index 00000000..592fcffe
--- /dev/null
+++ b/tools/visualization/mermaid_math_disabled.js
@@ -0,0 +1,9 @@
+// BusyMark owns mathematical document rendering through its semantic MathJax
+// path. Mermaid's optional dollar-label renderer is deliberately unavailable,
+// which prevents Mermaid's transitive alternate math engine from entering the
+// offline runtime bundle.
+export default Object.freeze({
+  renderToString() {
+    throw new Error('Math labels inside Mermaid diagrams are not supported.')
+  },
+})
diff --git a/tools/visualization/package-lock.json b/tools/visualization/package-lock.json
index a29e8d14..2ab96888 100644
--- a/tools/visualization/package-lock.json
+++ b/tools/visualization/package-lock.json
@@ -7,19 +7,43 @@
     "": {
       "name": "busymark-visualization-build",
       "version": "1.0.0",
-      "engines": {
-        "node": ">=22"
-      },
       "dependencies": {
+        "@braintree/sanitize-url": "7.1.2",
+        "@iconify/utils": "3.1.4",
+        "@mathjax/mathjax-newcm-font": "4.1.3",
+        "@mathjax/src": "4.1.3",
+        "@mermaid-js/parser": "1.2.0",
         "@plantuml/core": "1.2026.6",
         "@scalar/api-reference": "1.65.1",
         "@scalar/json-magic": "0.13.0",
         "@scalar/openapi-parser": "0.28.14",
-        "mermaid": "11.16.1",
+        "@types/d3": "7.4.3",
+        "@upsetjs/venn.js": "2.0.0",
+        "ajv": "8.20.0",
+        "cytoscape": "3.34.1",
+        "cytoscape-cose-bilkent": "4.1.0",
+        "cytoscape-fcose": "2.2.0",
+        "d3": "7.9.0",
+        "d3-sankey": "0.12.3",
+        "dagre-d3-es": "7.0.14",
+        "dayjs": "1.11.23",
+        "dompurify": "3.4.13",
+        "es-toolkit": "1.51.0",
+        "jison": "0.4.18",
+        "js-yaml": "4.1.1",
+        "khroma": "2.1.0",
+        "marked": "16.4.2",
+        "roughjs": "4.6.6",
+        "stylis": "4.4.0",
+        "ts-dedent": "2.3.0",
+        "uuid": "14.0.1",
         "yaml": "2.9.0"
       },
       "devDependencies": {
         "esbuild": "0.28.2"
+      },
+      "engines": {
+        "node": ">=22"
       }
     },
     "node_modules/@ai-sdk/gateway": {
@@ -990,6 +1014,24 @@
       "integrity": "sha512-FY+MKLBoTsLNJF/eLWaOsXGdz6uh3Iu1axjPf6TUq92IYumcTcXWHoS747JARLkcdlJ/Waiaxc5wQfFO8jC6NA==",
       "license": "MIT"
     },
+    "node_modules/@mathjax/mathjax-newcm-font": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@mathjax/mathjax-newcm-font/-/mathjax-newcm-font-4.1.3.tgz",
+      "integrity": "sha512-gzAB3dFHilHX1l5x2xUqRL+1jDQt3Fyza1DkEMVXWC4E8SvsGdlgEza47HYi2WhVcgfkvf4zgUGzuhbq3Pjlew==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@mathjax/src": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@mathjax/src/-/src-4.1.3.tgz",
+      "integrity": "sha512-rIrWquuBSoJuoMBdC/1qD+AUHTorlccPicoVy6P2xbUgnuDBpCcpbHtOAsB8L3hdCHtNBg92lF8e3Fz+pkcQbw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@mathjax/mathjax-newcm-font": "4.1.3",
+        "mhchemparser": "^4.2.1",
+        "mj-context-menu": "^1.0.0",
+        "speech-rule-engine": "5.0.0-rc.4"
+      }
+    },
     "node_modules/@mermaid-js/parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.0.tgz",
@@ -2110,6 +2152,15 @@
         "vue": "^3.5.0"
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.9.11",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.11.tgz",
+      "integrity": "sha512-tW8bcK3hsG0/uqSnNz6TK4BkcuZSezoU7DlnYssILmZDktPnSHHuDJJFM0AJv+13gz2r0iGdrj6qqKeUnxXEDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.6"
+      }
+    },
     "node_modules/ai": {
       "version": "6.0.33",
       "resolved": "https://registry.npmjs.org/ai/-/ai-6.0.33.tgz",
@@ -2175,6 +2226,22 @@
         }
       }
     },
+    "node_modules/amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+      "license": "BSD-3-Clause OR MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.2"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
     "node_modules/aria-hidden": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
@@ -2197,6 +2264,27 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
+      "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
@@ -2249,6 +2337,17 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/cjson": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.3.0.tgz",
+      "integrity": "sha512-bBRQcCIHzI1IVH59fR0bwGrFmi3Btb/JNwM/n401i1DnYgWndpsUBiQRAddLflkZage20A2d25OAWZZk0vBRlA==",
+      "dependencies": {
+        "jsonlint": "1.6.0"
+      },
+      "engines": {
+        "node": ">= 0.3.0"
+      }
+    },
     "node_modules/clsx": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -2258,6 +2357,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/colors": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz",
+      "integrity": "sha512-XjsuUwpDeY98+yz959OlUK6m7mLBM+1MEG5oaenfuQnNnrQk1WvtcvFgN3FNDP3f2NmZ211t0mNEfSEN1h0eIg==",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/comma-separated-tokens": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
@@ -2911,6 +3018,12 @@
         "@types/trusted-types": "^2.0.7"
       }
     },
+    "node_modules/ebnf-parser": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/ebnf-parser/-/ebnf-parser-0.1.10.tgz",
+      "integrity": "sha512-urvSxVQ6XJcoTpc+/x2pWhhuOX4aljCNQpwzw+ifZvV1andZkAmiJc3Rq1oGEAQmcjiLceyMXOy1l8ms8qs2fQ==",
+      "license": "MIT"
+    },
     "node_modules/entities": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
@@ -2989,12 +3102,60 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/escodegen": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz",
+      "integrity": "sha512-z9FWgKc48wjMlpzF5ymKS1AF8OIgnKLp9VyN7KbdtyrP/9lndwUFqCtMm+TAJmJf7KJFFYc4cFJfVTTGkKEwsA==",
+      "dependencies": {
+        "esprima": "~1.1.1",
+        "estraverse": "~1.5.0",
+        "esutils": "~1.0.0"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.1.33"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz",
+      "integrity": "sha512-qxxB994/7NtERxgXdFgLHIs9M6bhLXc6qtUmWZ3L8+gTQ9qaoyki2887P2IqAYsoENyr8SUbTutStDniOHSDHg==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+      "integrity": "sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "license": "MIT"
     },
+    "node_modules/esutils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+      "integrity": "sha512-x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/eventsource-parser": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.1.1.tgz",
@@ -3084,6 +3245,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/glob": {
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/guess-json-indent": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/guess-json-indent/-/guess-json-indent-3.0.1.tgz",
@@ -3529,12 +3707,61 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/jison": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/jison/-/jison-0.4.18.tgz",
+      "integrity": "sha512-FKkCiJvozgC7VTHhMJ00a0/IApSxhlGsFIshLW6trWJ8ONX2TQJBBz6DlcO1Gffy4w9LT+uL+PA+CVnUSJMF7w==",
+      "license": "MIT",
+      "dependencies": {
+        "cjson": "0.3.0",
+        "ebnf-parser": "0.1.10",
+        "escodegen": "1.3.x",
+        "esprima": "1.1.x",
+        "jison-lex": "0.3.x",
+        "JSONSelect": "0.4.0",
+        "lex-parser": "~0.1.3",
+        "nomnom": "1.5.2"
+      },
+      "bin": {
+        "jison": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/jison-lex": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/jison-lex/-/jison-lex-0.3.4.tgz",
+      "integrity": "sha512-EBh5wrXhls1cUwROd5DcDHR1sG7CdsCFSqY1027+YA1RGxz+BX2TDLAhdsQf40YEtFDGoiO0Qm8PpnBl2EzDJw==",
+      "dependencies": {
+        "lex-parser": "0.1.x",
+        "nomnom": "1.5.2"
+      },
+      "bin": {
+        "jison-lex": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/js-base64": {
       "version": "3.9.3",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.9.3.tgz",
       "integrity": "sha512-uwYQp+VJ38FVvtim6qNbit6e9uT6dwWQ4Y1+H9TxhW5hcHjpHwoxlR0nMpqUmIFOmu4VqMxwdJA88gIVuZJQ/g==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -3553,6 +3780,21 @@
       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
       "license": "MIT"
     },
+    "node_modules/jsonlint": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.0.tgz",
+      "integrity": "sha512-x6YLBe6NjdpmIeiklwQOxsZuYj/SOWkT33GlTpaG1UdFGjdWjPcxJ1CWZAX3wA7tarz8E2YHF6KiW5HTapPlXw==",
+      "dependencies": {
+        "JSV": ">= 4.0.x",
+        "nomnom": ">= 1.5.x"
+      },
+      "bin": {
+        "jsonlint": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/jsonpointer": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
@@ -3562,29 +3804,20 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/katex": {
-      "version": "0.16.47",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.47.tgz",
-      "integrity": "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg==",
-      "funding": [
-        "https://opencollective.com/katex",
-        "https://github.com/sponsors/katex"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^8.3.0"
-      },
-      "bin": {
-        "katex": "cli.js"
+    "node_modules/JSONSelect": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.4.0.tgz",
+      "integrity": "sha512-VRLR3Su35MH+XV2lrvh9O7qWoug/TUyj9tLDjn9rtpUCNnILLrHjgd/tB0KrhugCxUpj3UqoLqfYb3fLJdIQQQ==",
+      "engines": {
+        "node": ">=0.4.7"
       }
     },
-    "node_modules/katex/node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "license": "MIT",
+    "node_modules/JSV": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+      "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
       "engines": {
-        "node": ">= 12"
+        "node": "*"
       }
     },
     "node_modules/khroma": {
@@ -3610,6 +3843,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lex-parser": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/lex-parser/-/lex-parser-0.1.4.tgz",
+      "integrity": "sha512-DuAEISsr1H4LOpmFLkyMc8YStiRWZCO8hMsoXAXSbgyfvs2WQhSt0+/FBv3ZU/JBFZMGcE+FWzEBSzwUU7U27w==",
+      "license": "MIT"
+    },
     "node_modules/lodash-es": {
       "version": "4.18.1",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
@@ -3650,6 +3889,15 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "11.5.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
+      "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -3920,34 +4168,11 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/mermaid": {
-      "version": "11.16.1",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.16.1.tgz",
-      "integrity": "sha512-TQsq6u22fAn3rek5VOubrhKPo1g5hwC3FXUN9hiyupTckcYiGuuKGkNQrKYwGJkXUxZdojwRG46gsSCFZMDp4g==",
-      "license": "MIT",
-      "dependencies": {
-        "@braintree/sanitize-url": "^7.1.2",
-        "@iconify/utils": "^3.0.2",
-        "@mermaid-js/parser": "^1.2.0",
-        "@types/d3": "^7.4.3",
-        "@upsetjs/venn.js": "^2.0.0",
-        "cytoscape": "^3.33.3",
-        "cytoscape-cose-bilkent": "^4.1.0",
-        "cytoscape-fcose": "^2.2.0",
-        "d3": "^7.9.0",
-        "d3-sankey": "^0.12.3",
-        "dagre-d3-es": "7.0.14",
-        "dayjs": "^1.11.20",
-        "dompurify": "^3.3.3",
-        "es-toolkit": "^1.45.1",
-        "katex": "^0.16.45",
-        "khroma": "^2.1.0",
-        "marked": "^16.3.0",
-        "roughjs": "^4.6.6",
-        "stylis": "^4.3.6",
-        "ts-dedent": "^2.2.0",
-        "uuid": "^11.1.0 || ^12 || ^13 || ^14.0.0"
-      }
+    "node_modules/mhchemparser": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/mhchemparser/-/mhchemparser-4.2.1.tgz",
+      "integrity": "sha512-kYmyrCirqJf3zZ9t/0wGgRZ4/ZJw//VwaRVGA75C4nhE60vtnIzhl9J9ndkX/h6hxSN7pjg/cE0VxbnNM+bnDQ==",
+      "license": "Apache-2.0"
     },
     "node_modules/microdiff": {
       "version": "1.6.0",
@@ -4518,6 +4743,39 @@
       ],
       "license": "MIT"
     },
+    "node_modules/minimatch": {
+      "version": "10.2.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
+      "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.8"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mj-context-menu": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-1.0.0.tgz",
+      "integrity": "sha512-OSgBFQRCVhrZwRa9lhqnKcJU92dd/YXgBjup0uyeuj9bOaVsf4myOyrjU4PfhYkdDk6AqVUTov7v5uFMvIbduA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "rimraf": "^6.0.1"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -4548,6 +4806,19 @@
       "integrity": "sha512-vVdkelrLxaow/fdWDumzNBO+jwm6X8bxeLJc34THtpj70u0C5QBkcV6CRCu2X726km7XD45N0A3QtYCla4RvKw==",
       "license": "MIT"
     },
+    "node_modules/nomnom": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.5.2.tgz",
+      "integrity": "sha512-fiVbT7BqxiQqjlR9U3FDGOSERFCKoXVCdxV2FwZuNN7/cmJ42iQx35nUFOAFDcyvemu9Adp+IlsCGlKQYLmBKw==",
+      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
+      "dependencies": {
+        "colors": "0.5.x",
+        "underscore": "1.1.x"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/p-event": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/p-event/-/p-event-6.0.1.tgz",
@@ -4575,6 +4846,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/package-manager-detector": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.8.0.tgz",
@@ -4611,6 +4888,22 @@
       "integrity": "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==",
       "license": "MIT"
     },
+    "node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -5004,6 +5297,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/rimraf": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz",
+      "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "glob": "^13.0.3",
+        "package-json-from-dist": "^1.0.1"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/robust-predicates": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.3.tgz",
@@ -5040,6 +5352,18 @@
       "integrity": "sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==",
       "license": "MIT"
     },
+    "node_modules/source-map": {
+      "version": "0.1.43",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+      "optional": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -5059,6 +5383,29 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/speech-rule-engine": {
+      "version": "5.0.0-rc.4",
+      "resolved": "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-5.0.0-rc.4.tgz",
+      "integrity": "sha512-3dFcH2QtQNhtvUUc09TxoaEK4WG03B9Z57krFG9jocrKykKGu35BhIkWr0vgEAxZZomEWkeluff69y/EbYzP4Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.9.10",
+        "commander": "^14.0.3",
+        "wicked-good-xpath": "^1.3.0"
+      },
+      "bin": {
+        "sre": "bin/sre"
+      }
+    },
+    "node_modules/speech-rule-engine/node_modules/commander": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
+      "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/string-byte-length": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/string-byte-length/-/string-byte-length-3.0.1.tgz",
@@ -5270,6 +5617,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/underscore": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.1.7.tgz",
+      "integrity": "sha512-w4QtCHoLBXw1mjofIDoMyexaEdWGMedWNDhlWTtT1V1lCRqi65Pnoygkh6+WRdr+Bm8ldkBNkNeCsXGMlQS9HQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/undici-types": {
       "version": "7.18.2",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
@@ -5499,6 +5854,12 @@
       "integrity": "sha512-RiMReJrTAiA+mBjGONMnjVDP2u3p9R1vkcGz6gDIrOMT3oGuYwX2WRMYI9ipkphSuE5XKEhydbhNEJh4NY9mlw==",
       "license": "Apache-2.0"
     },
+    "node_modules/wicked-good-xpath": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz",
+      "integrity": "sha512-Gd9+TUn5nXdwj/hFsPVx5cuHHiF5Bwuc30jZ4+ronF1qHK5O7HD0sgmXWSEgwKquT3ClLoKPVbO6qGwVwLzvAw==",
+      "license": "MIT"
+    },
     "node_modules/yaml": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz",
diff --git a/tools/visualization/package.json b/tools/visualization/package.json
index 849263eb..61ae7d9f 100644
--- a/tools/visualization/package.json
+++ b/tools/visualization/package.json
@@ -7,11 +7,35 @@
     "node": ">=22"
   },
   "dependencies": {
+    "@braintree/sanitize-url": "7.1.2",
+    "@iconify/utils": "3.1.4",
+    "@mathjax/mathjax-newcm-font": "4.1.3",
+    "@mathjax/src": "4.1.3",
+    "@mermaid-js/parser": "1.2.0",
     "@plantuml/core": "1.2026.6",
     "@scalar/api-reference": "1.65.1",
     "@scalar/json-magic": "0.13.0",
     "@scalar/openapi-parser": "0.28.14",
-    "mermaid": "11.16.1",
+    "@types/d3": "7.4.3",
+    "@upsetjs/venn.js": "2.0.0",
+    "ajv": "8.20.0",
+    "cytoscape": "3.34.1",
+    "cytoscape-cose-bilkent": "4.1.0",
+    "cytoscape-fcose": "2.2.0",
+    "d3": "7.9.0",
+    "d3-sankey": "0.12.3",
+    "dagre-d3-es": "7.0.14",
+    "dayjs": "1.11.23",
+    "dompurify": "3.4.13",
+    "es-toolkit": "1.51.0",
+    "khroma": "2.1.0",
+    "jison": "0.4.18",
+    "js-yaml": "4.1.1",
+    "marked": "16.4.2",
+    "roughjs": "4.6.6",
+    "stylis": "4.4.0",
+    "ts-dedent": "2.3.0",
+    "uuid": "14.0.1",
     "yaml": "2.9.0"
   },
   "devDependencies": {
diff --git a/tools/visualization/render_engines.js b/tools/visualization/render_engines.js
index c7281570..52ed16b9 100644
--- a/tools/visualization/render_engines.js
+++ b/tools/visualization/render_engines.js
@@ -6,6 +6,7 @@ import { bundle } from '@scalar/json-magic/bundle'
 import { normalize, validate } from '@scalar/openapi-parser'
 import mermaid from 'mermaid'
 import { LineCounter, parseDocument } from 'yaml'
+import { renderMathBatch } from './mathjax_renderer.js'
 
 const httpMethods = new Set([
   'get',
@@ -500,6 +501,8 @@ async function handleRequest(request) {
       return renderMermaid(request.source, request.theme)
     case 'renderPlantUml':
       return renderPlantUml(request.source, request.theme)
+    case 'renderMathBatch':
+      return renderMathBatch(request)
     case 'inspectOpenApi': {
       try {
         const sourceMap = createSourceMap('document.openapi', request.source, true)
diff --git a/tools/visualization_smoke.py b/tools/visualization_smoke.py
index 74eb1488..7e2ebd92 100755
--- a/tools/visualization_smoke.py
+++ b/tools/visualization_smoke.py
@@ -240,6 +240,57 @@ def expect_svg(response: dict[str, object]) -> None:
         raise AssertionError(response.get("message", "SVG was not returned"))
 
 
+def expect_math_all_svg(response: dict[str, object]) -> None:
+    if response.get("mathJaxVersion") != "4.1.3":
+        raise AssertionError(f"Unexpected MathJax version: {response}")
+    if response.get("fontVersion") != "4.1.3":
+        raise AssertionError(f"Unexpected MathJax font version: {response}")
+    results = response.get("results")
+    if not isinstance(results, list) or not results:
+        raise AssertionError(f"MathJax returned no results: {response}")
+    for item in results:
+        if not isinstance(item, dict) or not isinstance(item.get("svg"), str):
+            raise AssertionError(f"MathJax did not return SVG: {item}")
+        if "<svg" not in item["svg"] or "<defs" not in item["svg"]:
+            raise AssertionError(f"MathJax SVG was not standalone: {item}")
+
+
+def expect_math_partial_failure(response: dict[str, object]) -> None:
+    results = response.get("results")
+    if not isinstance(results, list) or len(results) != 2:
+        raise AssertionError(f"Unexpected math batch: {response}")
+    if not isinstance(results[0], dict) or "<svg" not in results[0].get("svg", ""):
+        raise AssertionError(f"Valid expression did not render: {results[0]}")
+    if (
+        not isinstance(results[1], dict)
+        or not isinstance(results[1].get("error"), dict)
+        or results[1]["error"].get("code") != "math.invalidTex"
+    ):
+        raise AssertionError(f"Invalid expression did not fail locally: {results[1]}")
+
+
+def expect_math_error(response: dict[str, object]) -> None:
+    results = response.get("results")
+    if not isinstance(results, list) or len(results) != 1:
+        raise AssertionError(f"Unexpected math error batch: {response}")
+    error = results[0].get("error") if isinstance(results[0], dict) else None
+    if not isinstance(error, dict) or error.get("code") != "math.invalidTex":
+        raise AssertionError(f"Expression unexpectedly inherited TeX state: {response}")
+
+
+def expect_math_rejected(response: dict[str, object]) -> None:
+    results = response.get("results")
+    if not isinstance(results, list) or len(results) != 4:
+        raise AssertionError(f"Unexpected unsafe-math batch: {response}")
+    for item in results:
+        error = item.get("error") if isinstance(item, dict) else None
+        if not isinstance(error, dict) or error.get("code") not in {
+            "math.invalidTex",
+            "math.resourceLimit",
+        }:
+            raise AssertionError(f"Unsafe TeX was not rejected: {item}")
+
+
 def expect_openapi(response: dict[str, object]) -> None:
     reference = response.get("reference")
     if not isinstance(reference, dict) or not reference.get("valid"):
@@ -419,6 +470,203 @@ def main() -> int:
             },
             "validator": expect_svg,
         },
+        {
+            "name": "MathJax NewCM double-struck",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": "mathbb",
+                        "expression": r"\mathbb{R}",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-mathbb",
+                    }
+                ],
+            },
+            "validator": expect_math_all_svg,
+        },
+        {
+            "name": "MathJax NewCM sequential calligraphic",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": "mathcal",
+                        "expression": r"\mathcal{L}",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-mathcal",
+                    }
+                ],
+            },
+            "validator": expect_math_all_svg,
+        },
+        {
+            "name": "MathJax scientific package profile",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": "scientific",
+                        "expression": (
+                            r"\ce{2H2 + O2 -> 2H2O}\quad"
+                            r"\Braket{\psi|\phi}+\cancel{x}+\upalpha"
+                            r"+a\coloneqq b+\units{m}"
+                        ),
+                        "display": True,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-scientific",
+                    },
+                    {
+                        "id": "boldsymbol",
+                        "expression": r"\boldsymbol{\alpha}",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-boldsymbol",
+                    },
+                    {
+                        "id": "cases",
+                        "expression": r"f(x)=\begin{cases}x&x>0\\0&x\leq0\end{cases}",
+                        "display": True,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-cases",
+                    },
+                    {
+                        "id": "gensymb",
+                        "expression": r"90\degree",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-gensymb",
+                    },
+                    {
+                        "id": "empheq",
+                        "expression": r"\begin{empheq}{align}E&=mc^2\end{empheq}",
+                        "display": True,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-empheq",
+                    },
+                    {
+                        "id": "ams",
+                        "expression": r"\begin{align}a&=b\end{align}",
+                        "display": True,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-ams",
+                    },
+                ],
+            },
+            "validator": expect_math_all_svg,
+        },
+        {
+            "name": "MathJax partial failure",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": "valid",
+                        "expression": r"\sqrt{x^2+y^2}",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-valid",
+                    },
+                    {
+                        "id": "invalid",
+                        "expression": r"\frac{",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-invalid",
+                    },
+                ],
+            },
+            "validator": expect_math_partial_failure,
+        },
+        {
+            "name": "MathJax unsafe and dynamic commands",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": name,
+                        "expression": expression,
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": f"smoke-{name}",
+                    }
+                    for name, expression in [
+                        ("url", r"\href{javascript:alert(1)}{x}"),
+                        ("dynamic", r"\require{physics}"),
+                        ("style", r"\style{position:fixed}{x}"),
+                        ("recursive", r"\newcommand{\loop}{\loop}\loop"),
+                    ]
+                ],
+            },
+            "validator": expect_math_rejected,
+        },
+        {
+            "name": "MathJax local newcommand",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": "macro-definition",
+                        "expression": r"\newcommand{\busyisolated}{z}\busyisolated",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-macro-definition",
+                    }
+                ],
+            },
+            "validator": expect_math_all_svg,
+        },
+        {
+            "name": "MathJax expression isolation",
+            "uri": "busymark-render://app/harness.html",
+            "request": {
+                "operation": "renderMathBatch",
+                "expressions": [
+                    {
+                        "id": "macro-isolation",
+                        "expression": r"\busyisolated",
+                        "display": False,
+                        "em": 16,
+                        "ex": 8,
+                        "containerWidth": 720,
+                        "svgIdPrefix": "smoke-macro-isolation",
+                    }
+                ],
+            },
+            "validator": expect_math_error,
+        },
         *(
             [
                 {